diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml index 492145d4ea22..990ebe7522b3 100644 --- a/.github/workflows/cargo.yml +++ b/.github/workflows/cargo.yml @@ -39,6 +39,7 @@ jobs: name: test runs-on: ubuntu-latest strategy: + fail-fast: false matrix: crate: - ast_node diff --git a/Cargo.toml b/Cargo.toml index 5ec57afc54f1..71758d6fbe9f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" license = "Apache-2.0/MIT" name = "swc" repository = "https://github.com/swc-project/swc.git" -version = "0.5.0" +version = "0.6.0" [lib] name = "swc" @@ -27,12 +27,12 @@ serde_json = "1" sourcemap = "6" swc_atoms = {version = "0.2", path = "./atoms"} swc_common = {version = "0.10", path = "./common", features = ["sourcemap", "concurrent"]} -swc_ecma_ast = {version = "0.38.0", path = "./ecmascript/ast"} -swc_ecma_codegen = {version = "0.45.0", path = "./ecmascript/codegen"} -swc_ecma_ext_transforms = {version = "0.4.0", path = "./ecmascript/ext-transforms"} -swc_ecma_parser = {version = "0.47.0", path = "./ecmascript/parser"} -swc_ecma_preset_env = {version = "0.6.0", path = "./ecmascript/preset_env"} -swc_ecma_transforms = {version = "0.36.0", path = "./ecmascript/transforms", features = [ +swc_ecma_ast = {version = "0.39.0", path = "./ecmascript/ast"} +swc_ecma_codegen = {version = "0.46.0", path = "./ecmascript/codegen"} +swc_ecma_ext_transforms = {version = "0.5.0", path = "./ecmascript/ext-transforms"} +swc_ecma_parser = {version = "0.48.0", path = "./ecmascript/parser"} +swc_ecma_preset_env = {version = "0.7.0", path = "./ecmascript/preset_env"} +swc_ecma_transforms = {version = "0.37.0", path = "./ecmascript/transforms", features = [ "compat", "module", "optimization", @@ -40,8 +40,8 @@ swc_ecma_transforms = {version = "0.36.0", path = "./ecmascript/transforms", fea "react", "typescript", ]} -swc_ecma_utils = {version = "0.28.0", path = "./ecmascript/utils"} -swc_ecma_visit = {version = "0.24.0", path = "./ecmascript/visit"} +swc_ecma_utils = {version = "0.29.0", path = "./ecmascript/utils"} +swc_ecma_visit = {version = "0.25.0", path = "./ecmascript/visit"} swc_visit = {version = "0.2", path = "./visit"} [dev-dependencies] diff --git a/bundler/Cargo.toml b/bundler/Cargo.toml index 99d3a7d4056a..13c212bf3643 100644 --- a/bundler/Cargo.toml +++ b/bundler/Cargo.toml @@ -9,7 +9,7 @@ include = ["Cargo.toml", "build.rs", "src/**/*.rs", "src/**/*.js"] license = "Apache-2.0/MIT" name = "swc_bundler" repository = "https://github.com/swc-project/swc.git" -version = "0.23.0" +version = "0.24.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [features] @@ -31,19 +31,19 @@ relative-path = "1.2" retain_mut = "0.1.2" swc_atoms = {version = "0.2.4", path = "../atoms"} swc_common = {version = "0.10.0", path = "../common"} -swc_ecma_ast = {version = "0.38.0", path = "../ecmascript/ast"} -swc_ecma_codegen = {version = "0.45.0", path = "../ecmascript/codegen"} -swc_ecma_parser = {version = "0.47.0", path = "../ecmascript/parser"} -swc_ecma_transforms = {version = "0.36.0", path = "../ecmascript/transforms", features = ["optimization"]} -swc_ecma_utils = {version = "0.28.0", path = "../ecmascript/utils"} -swc_ecma_visit = {version = "0.24.0", path = "../ecmascript/visit"} +swc_ecma_ast = {version = "0.39.0", path = "../ecmascript/ast"} +swc_ecma_codegen = {version = "0.46.0", path = "../ecmascript/codegen"} +swc_ecma_parser = {version = "0.48.0", path = "../ecmascript/parser"} +swc_ecma_transforms = {version = "0.37.0", path = "../ecmascript/transforms", features = ["optimization"]} +swc_ecma_utils = {version = "0.29.0", path = "../ecmascript/utils"} +swc_ecma_visit = {version = "0.25.0", path = "../ecmascript/visit"} [dev-dependencies] hex = "0.4" ntest = "0.7.2" reqwest = {version = "0.10.8", features = ["blocking"]} sha-1 = "0.9" -swc_ecma_transforms = {version = "0.36.0", path = "../ecmascript/transforms", features = ["react", "typescript"]} +swc_ecma_transforms = {version = "0.37.0", path = "../ecmascript/transforms", features = ["react", "typescript"]} tempfile = "3.1.0" testing = {version = "0.10.0", path = "../testing"} url = "2.1.1" diff --git a/bundler/src/bundler/chunk/cjs.rs b/bundler/src/bundler/chunk/cjs.rs index 9c33e5114321..1dbb90cba30f 100644 --- a/bundler/src/bundler/chunk/cjs.rs +++ b/bundler/src/bundler/chunk/cjs.rs @@ -130,13 +130,17 @@ fn wrap_module( Param { span: DUMMY_SP, decorators: Default::default(), - pat: Pat::Ident(Ident::new("module".into(), DUMMY_SP.with_ctxt(local_ctxt))), + pat: Pat::Ident( + Ident::new("module".into(), DUMMY_SP.with_ctxt(local_ctxt)).into(), + ), }, // exports Param { span: DUMMY_SP, decorators: Default::default(), - pat: Pat::Ident(Ident::new("exports".into(), DUMMY_SP.with_ctxt(local_ctxt))), + pat: Pat::Ident( + Ident::new("exports".into(), DUMMY_SP.with_ctxt(local_ctxt)).into(), + ), }, ], decorators: vec![], @@ -168,7 +172,7 @@ fn wrap_module( declare: false, decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(load_var.clone()), + name: Pat::Ident(load_var.clone().into()), init: Some(Box::new(Expr::Call(CallExpr { span: DUMMY_SP, callee: Ident::new("__spack_require__".into(), DUMMY_SP.with_ctxt(helper_ctxt)) diff --git a/bundler/src/bundler/chunk/computed_key.rs b/bundler/src/bundler/chunk/computed_key.rs index c7524cec6555..c9fee561f849 100644 --- a/bundler/src/bundler/chunk/computed_key.rs +++ b/bundler/src/bundler/chunk/computed_key.rs @@ -104,11 +104,13 @@ where let decl = &var.decls[0]; match &decl.name { Pat::Ident(i) => { - if i.sym == js_word!("default") { + if i.id.sym == js_word!("default") { return Some(Stmt::Decl(Decl::Var(var))); } - if let Some(remapped) = ctx.transitive_remap.get(&i.span.ctxt) { + if let Some(remapped) = + ctx.transitive_remap.get(&i.id.span.ctxt) + { // Create // // const local = mod.local; @@ -116,18 +118,18 @@ where // let local_var = Ident::new( - i.sym.clone(), - i.span.with_ctxt(info.local_ctxt()), + i.id.sym.clone(), + i.id.span.with_ctxt(info.local_ctxt()), ); let var_decl = VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(local_var.clone()), + name: Pat::Ident(local_var.clone().into()), init: Some(Box::new(Expr::Member(MemberExpr { span: DUMMY_SP, obj: module_var_name.clone().as_obj(), prop: { - let mut prop = i.clone(); + let mut prop = i.id.clone(); prop.span.ctxt = SyntaxContext::empty(); Box::new(Expr::Ident(prop)) @@ -223,7 +225,7 @@ where decls: vec![VarDeclarator { span: DUMMY_SP, definite: false, - name: Pat::Ident(module_var_name.into_ident()), + name: Pat::Ident(module_var_name.into_ident().into()), init: Some(Box::new(module_expr)), }], }; diff --git a/bundler/src/bundler/chunk/export.rs b/bundler/src/bundler/chunk/export.rs index 33e19d636548..a058fa8654fe 100644 --- a/bundler/src/bundler/chunk/export.rs +++ b/bundler/src/bundler/chunk/export.rs @@ -211,7 +211,7 @@ fn unexprt_as_var(modules: &mut Modules, dep_export_ctxt: SyntaxContext) { { decls.push(VarDeclarator { span: n.span, - name: Pat::Ident(exported), + name: Pat::Ident(exported.into()), init: Some(Box::new(Expr::Ident(n.orig.clone()))), definite: true, }) @@ -223,10 +223,13 @@ fn unexprt_as_var(modules: &mut Modules, dep_export_ctxt: SyntaxContext) { decls.push(VarDeclarator { span: n.span, - name: Pat::Ident(Ident::new( - n.orig.sym.clone(), - n.orig.span.with_ctxt(dep_export_ctxt), - )), + name: Pat::Ident( + Ident::new( + n.orig.sym.clone(), + n.orig.span.with_ctxt(dep_export_ctxt), + ) + .into(), + ), init: Some(Box::new(Expr::Ident(n.orig.clone()))), definite: false, }) diff --git a/bundler/src/bundler/chunk/merge.rs b/bundler/src/bundler/chunk/merge.rs index c5c538a6e84c..5948a789546e 100644 --- a/bundler/src/bundler/chunk/merge.rs +++ b/bundler/src/bundler/chunk/merge.rs @@ -644,7 +644,7 @@ where let var_decl = &mut var.decls[0]; match &var_decl.name { - Pat::Ident(i) if id == *i => {} + Pat::Ident(i) if id == i.id => {} _ => continue, } @@ -1321,10 +1321,13 @@ where ModuleDecl::ExportDefaultDecl(ref mut export) => match &mut export.decl { DefaultDecl::Class(expr) => { let expr = expr.take(); - let export_name = Pat::Ident(Ident::new( - js_word!("default"), - export.span.with_ctxt(info.export_ctxt()), - )); + let export_name = Pat::Ident( + Ident::new( + js_word!("default"), + export.span.with_ctxt(info.export_ctxt()), + ) + .into(), + ); let (init, s) = match expr.ident { Some(name) => { @@ -1423,10 +1426,13 @@ where vars.push( VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(Ident::new( - js_word!("default"), - DUMMY_SP.with_ctxt(info.export_ctxt()), - )), + name: Pat::Ident( + Ident::new( + js_word!("default"), + DUMMY_SP.with_ctxt(info.export_ctxt()), + ) + .into(), + ), init: Some(export.expr.take()), definite: false, } @@ -1641,7 +1647,7 @@ impl VisitMut for ImportMetaHandler<'_, '_> { declare: false, decls: vec![VarDeclarator { span: n.span, - name: Pat::Ident(self.inline_ident.clone()), + name: Pat::Ident(self.inline_ident.clone().into()), init: Some(Box::new(Expr::Object(ObjectLit { span: n.span, props: key_value_props diff --git a/bundler/src/bundler/finalize.rs b/bundler/src/bundler/finalize.rs index 38eb470f6f35..ccc8b0738bfa 100644 --- a/bundler/src/bundler/finalize.rs +++ b/bundler/src/bundler/finalize.rs @@ -287,7 +287,7 @@ where )))); let var = VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(default_var), + name: Pat::Ident(default_var.into()), init: Some(export.expr), definite: false, }; diff --git a/bundler/src/bundler/keywords.rs b/bundler/src/bundler/keywords.rs index 86704df7f3b9..c0c17598a58e 100644 --- a/bundler/src/bundler/keywords.rs +++ b/bundler/src/bundler/keywords.rs @@ -78,7 +78,7 @@ impl VisitMut for KeywordRenamer { key: PropName::Ident(pat.key.take()), value: Box::new(Pat::Assign(AssignPat { span: pat.span, - left: Box::new(Pat::Ident(renamed)), + left: Box::new(Pat::Ident(renamed.into())), right: default.take(), type_ann: None, })), @@ -87,7 +87,7 @@ impl VisitMut for KeywordRenamer { None => { *n = ObjectPatProp::KeyValue(KeyValuePatProp { key: PropName::Ident(pat.key.take()), - value: Box::new(Pat::Ident(renamed)), + value: Box::new(Pat::Ident(renamed.into())), }) } } @@ -100,8 +100,8 @@ impl VisitMut for KeywordRenamer { fn visit_mut_pat(&mut self, n: &mut Pat) { match n { Pat::Ident(n) => { - if let Some(renamed) = self.renamed(&n) { - *n = renamed; + if let Some(renamed) = self.renamed(&n.id) { + *n = renamed.into(); } return; diff --git a/bundler/src/bundler/modules/sort/mod.rs b/bundler/src/bundler/modules/sort/mod.rs index eead41d82540..0d2843964258 100644 --- a/bundler/src/bundler/modules/sort/mod.rs +++ b/bundler/src/bundler/modules/sort/mod.rs @@ -543,7 +543,7 @@ impl Visit for InitializerFinder { fn visit_pat(&mut self, pat: &Pat, _: &dyn Node) { match pat { - Pat::Ident(i) if self.ident == *i => { + Pat::Ident(i) if self.ident == i.id => { self.found = true; } @@ -653,7 +653,7 @@ impl Visit for RequirementCalculartor { if self.in_var_decl && !self.in_assign_lhs { return; } - self.insert(i.into()); + self.insert((&i.id).into()); } _ => { pat.visit_children_with(self); diff --git a/bundler/src/util.rs b/bundler/src/util.rs index 3d6600cc5fd0..782c944f694d 100644 --- a/bundler/src/util.rs +++ b/bundler/src/util.rs @@ -53,7 +53,7 @@ pub(crate) trait ExprExt: Into { VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(Ident::new(lhs.0, DUMMY_SP.with_ctxt(lhs.1))), + name: Pat::Ident(Ident::new(lhs.0, DUMMY_SP.with_ctxt(lhs.1)).into()), init: Some(Box::new(init)), definite: false, } @@ -152,7 +152,7 @@ impl MapWithMut for ObjectPatProp { impl MapWithMut for PatOrExpr { fn dummy() -> Self { - PatOrExpr::Pat(Box::new(Pat::Ident(Ident::dummy()))) + PatOrExpr::Pat(Box::new(Pat::Ident(Ident::dummy().into()))) } } diff --git a/ecmascript/Cargo.toml b/ecmascript/Cargo.toml index 6aeedbe91eb7..a7e12d603ce7 100644 --- a/ecmascript/Cargo.toml +++ b/ecmascript/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" license = "Apache-2.0/MIT" name = "swc_ecmascript" repository = "https://github.com/swc-project/swc.git" -version = "0.22.0" +version = "0.23.0" [package.metadata.docs.rs] all-features = true @@ -27,12 +27,12 @@ react = ["swc_ecma_transforms/react"] typescript = ["swc_ecma_transforms/typescript"] [dependencies] -swc_ecma_ast = {version = "0.38.0", path = "./ast"} -swc_ecma_codegen = {version = "0.45.0", path = "./codegen", optional = true} -swc_ecma_dep_graph = {version = "0.15.0", path = "./dep-graph", optional = true} -swc_ecma_parser = {version = "0.47.0", path = "./parser", optional = true} -swc_ecma_transforms = {version = "0.36.0", path = "./transforms", optional = true} -swc_ecma_utils = {version = "0.28.0", path = "./utils", optional = true} -swc_ecma_visit = {version = "0.24.0", path = "./visit", optional = true} +swc_ecma_ast = {version = "0.39.0", path = "./ast"} +swc_ecma_codegen = {version = "0.46.0", path = "./codegen", optional = true} +swc_ecma_dep_graph = {version = "0.16.0", path = "./dep-graph", optional = true} +swc_ecma_parser = {version = "0.48.0", path = "./parser", optional = true} +swc_ecma_transforms = {version = "0.37.0", path = "./transforms", optional = true} +swc_ecma_utils = {version = "0.29.0", path = "./utils", optional = true} +swc_ecma_visit = {version = "0.25.0", path = "./visit", optional = true} [dev-dependencies] diff --git a/ecmascript/ast/Cargo.toml b/ecmascript/ast/Cargo.toml index cdf2d2d1cc2e..c020738b2d57 100644 --- a/ecmascript/ast/Cargo.toml +++ b/ecmascript/ast/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" license = "Apache-2.0/MIT" name = "swc_ecma_ast" repository = "https://github.com/swc-project/swc.git" -version = "0.38.0" +version = "0.39.0" [features] default = [] diff --git a/ecmascript/ast/src/ident.rs b/ecmascript/ast/src/ident.rs index a2ef49daac6f..0377fa171310 100644 --- a/ecmascript/ast/src/ident.rs +++ b/ecmascript/ast/src/ident.rs @@ -1,7 +1,28 @@ use crate::typescript::TsTypeAnn; +use serde::Deserialize; +use serde::Serialize; use swc_atoms::JsWord; +use swc_common::ast_node; use swc_common::EqIgnoreSpan; -use swc_common::{ast_node, Span}; +use swc_common::Span; +use swc_common::Spanned; + +/// Identifer used as a pattern. +#[derive(Spanned, Clone, Debug, PartialEq, Eq, Hash, EqIgnoreSpan, Serialize, Deserialize)] +#[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))] +pub struct BindingIdent { + #[span] + #[serde(flatten)] + pub id: Ident, + #[serde(default, rename = "typeAnnotation")] + pub type_ann: Option, +} + +impl From for BindingIdent { + fn from(id: Ident) -> Self { + Self { id, type_ann: None } + } +} /// Ident with span. #[ast_node("Identifier")] @@ -10,8 +31,7 @@ pub struct Ident { pub span: Span, #[serde(rename = "value")] pub sym: JsWord, - #[serde(default, rename = "typeAnnotation")] - pub type_ann: Option, + /// TypeScript only. Used in case of an optional parameter. #[serde(default)] pub optional: bool, @@ -27,13 +47,11 @@ impl arbitrary::Arbitrary for Ident { } let sym = sym.into(); - let type_ann = u.arbitrary()?; let optional = u.arbitrary()?; Ok(Self { span, sym, - type_ann, optional, }) } @@ -58,7 +76,6 @@ impl Ident { Ident { span, sym, - type_ann: None, optional: false, } } diff --git a/ecmascript/ast/src/lib.rs b/ecmascript/ast/src/lib.rs index d2059feb97f9..3d93715387aa 100644 --- a/ecmascript/ast/src/lib.rs +++ b/ecmascript/ast/src/lib.rs @@ -19,7 +19,7 @@ pub use self::{ TaggedTpl, ThisExpr, Tpl, TplElement, UnaryExpr, UpdateExpr, YieldExpr, }, function::{Function, Param, ParamOrTsParamProp}, - ident::{Ident, IdentExt, PrivateName}, + ident::{BindingIdent, Ident, IdentExt, PrivateName}, jsx::{ JSXAttr, JSXAttrName, JSXAttrOrSpread, JSXAttrValue, JSXClosingElement, JSXClosingFragment, JSXElement, JSXElementChild, JSXElementName, JSXEmptyExpr, JSXExpr, JSXExprContainer, diff --git a/ecmascript/ast/src/pat.rs b/ecmascript/ast/src/pat.rs index d16dbd381eae..a5a53e5b9b0d 100644 --- a/ecmascript/ast/src/pat.rs +++ b/ecmascript/ast/src/pat.rs @@ -1,14 +1,21 @@ +use crate::ident::BindingIdent; use crate::{expr::Expr, ident::Ident, prop::PropName, typescript::TsTypeAnn, Invalid}; use is_macro::Is; use swc_common::EqIgnoreSpan; use swc_common::{ast_node, Span}; +impl From for Pat { + fn from(i: Ident) -> Self { + BindingIdent::from(i).into() + } +} + #[ast_node] #[derive(Eq, Hash, Is, EqIgnoreSpan)] #[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))] pub enum Pat { #[tag("Identifier")] - Ident(Ident), + Ident(BindingIdent), #[tag("ArrayPattern")] Array(ArrayPat), diff --git a/ecmascript/ast/src/typescript.rs b/ecmascript/ast/src/typescript.rs index 0857608ec138..56f7258c41cf 100644 --- a/ecmascript/ast/src/typescript.rs +++ b/ecmascript/ast/src/typescript.rs @@ -1,5 +1,6 @@ #![allow(clippy::vec_box)] #![allow(missing_copy_implementations)] +use crate::BindingIdent; use crate::{ class::Decorator, expr::Expr, @@ -89,7 +90,7 @@ pub struct TsParamProp { #[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))] pub enum TsParamPropParam { #[tag("Identifier")] - Ident(Ident), + Ident(BindingIdent), #[tag("AssignmentPattern")] Assign(AssignPat), @@ -399,7 +400,7 @@ pub struct TsThisType { #[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))] pub enum TsFnParam { #[tag("Identifier")] - Ident(Ident), + Ident(BindingIdent), #[tag("ArrayPattern")] Array(ArrayPat), diff --git a/ecmascript/codegen/Cargo.toml b/ecmascript/codegen/Cargo.toml index 952a7ef43aea..92696c609862 100644 --- a/ecmascript/codegen/Cargo.toml +++ b/ecmascript/codegen/Cargo.toml @@ -7,7 +7,7 @@ include = ["Cargo.toml", "src/**/*.rs"] license = "Apache-2.0/MIT" name = "swc_ecma_codegen" repository = "https://github.com/swc-project/swc.git" -version = "0.45.1" +version = "0.46.0" [dependencies] bitflags = "1" @@ -15,9 +15,9 @@ num-bigint = {version = "0.2", features = ["serde"]} sourcemap = "6" swc_atoms = {version = "0.2", path = "../../atoms"} swc_common = {version = "0.10.0", path = "../../common"} -swc_ecma_ast = {version = "0.38.0", path = "../ast"} +swc_ecma_ast = {version = "0.39.0", path = "../ast"} swc_ecma_codegen_macros = {version = "0.5", path = "./macros"} -swc_ecma_parser = {version = "0.47.0", path = "../parser"} +swc_ecma_parser = {version = "0.48.0", path = "../parser"} [dev-dependencies] swc_common = {version = "0.10.0", path = "../../common", features = ["sourcemap"]} diff --git a/ecmascript/codegen/src/lib.rs b/ecmascript/codegen/src/lib.rs index 1e791a37e51b..cc8d8dd890de 100644 --- a/ecmascript/codegen/src/lib.rs +++ b/ecmascript/codegen/src/lib.rs @@ -1429,34 +1429,31 @@ impl<'a> Emitter<'a> { emit!(n.id) } + #[emitter] + fn emit_binding_ident(&mut self, ident: &BindingIdent) -> Result { + emit!(ident.id); + + if let Some(ty) = &ident.type_ann { + punct!(":"); + formatting_space!(); + emit!(ty); + } + + // Call emitList directly since it could be an array of + // TypeParameterDeclarations _or_ type arguments + + // emitList(node, node.typeArguments, ListFormat::TypeParameters); + } + #[emitter] fn emit_ident(&mut self, ident: &Ident) -> Result { // TODO: Use write_symbol when ident is a symbol. self.emit_leading_comments_of_pos(ident.span.lo())?; - let symbol: Option = None; - if let Some(sym) = symbol { - // self.wr.write_symbol( - // &get_text_of_node(, &ident, /* includeTrivia */ false), - // sym, - // )?; - unimplemented!() - } else { - // TODO: span - self.wr.write_symbol(ident.span, &ident.sym)?; - if ident.optional { - punct!("?"); - } - - if let Some(ty) = &ident.type_ann { - punct!(":"); - formatting_space!(); - emit!(ty); - } - - // self.wr - // .write(get_text_of_node(&self.cm, &ident, /* includeTrivia */ - // false).as_bytes())?; + // TODO: span + self.wr.write_symbol(ident.span, &ident.sym)?; + if ident.optional { + punct!("?"); } // Call emitList directly since it could be an array of diff --git a/ecmascript/dep-graph/Cargo.toml b/ecmascript/dep-graph/Cargo.toml index 3e133b424697..8a961393cac7 100644 --- a/ecmascript/dep-graph/Cargo.toml +++ b/ecmascript/dep-graph/Cargo.toml @@ -6,14 +6,14 @@ edition = "2018" license = "Apache-2.0/MIT" name = "swc_ecma_dep_graph" repository = "https://github.com/swc-project/swc.git" -version = "0.15.0" +version = "0.16.0" [dependencies] swc_atoms = {version = "0.2", path = "../../atoms"} swc_common = {version = "0.10.1", path = "../../common"} -swc_ecma_ast = {version = "0.38.0", path = "../ast"} -swc_ecma_visit = {version = "0.24.0", path = "../visit"} +swc_ecma_ast = {version = "0.39.0", path = "../ast"} +swc_ecma_visit = {version = "0.25.0", path = "../visit"} [dev-dependencies] -swc_ecma_parser = {version = "0.47.0", path = "../parser"} +swc_ecma_parser = {version = "0.48.0", path = "../parser"} testing = {version = "0.10.0", path = "../../testing"} diff --git a/ecmascript/ext-transforms/Cargo.toml b/ecmascript/ext-transforms/Cargo.toml index 38f20bf8f0ef..9403635bbacb 100644 --- a/ecmascript/ext-transforms/Cargo.toml +++ b/ecmascript/ext-transforms/Cargo.toml @@ -5,7 +5,7 @@ documentation = "https://swc.rs/rustdoc/swc_ecma_ext_transforms/" edition = "2018" license = "Apache-2.0/MIT" name = "swc_ecma_ext_transforms" -version = "0.4.0" +version = "0.5.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -13,7 +13,7 @@ version = "0.4.0" phf = {version = "0.8.0", features = ["macros"]} swc_atoms = {version = "0.2", path = "../../atoms"} swc_common = {version = "0.10", path = "../../common"} -swc_ecma_ast = {version = "0.38.0", path = "../ast"} -swc_ecma_parser = {version = "0.47.0", path = "../parser"} -swc_ecma_utils = {version = "0.28.0", path = "../utils"} -swc_ecma_visit = {version = "0.24.0", path = "../visit"} +swc_ecma_ast = {version = "0.39.0", path = "../ast"} +swc_ecma_parser = {version = "0.48.0", path = "../parser"} +swc_ecma_utils = {version = "0.29.0", path = "../utils"} +swc_ecma_visit = {version = "0.25.0", path = "../visit"} diff --git a/ecmascript/jsdoc/Cargo.toml b/ecmascript/jsdoc/Cargo.toml index 1fb3c328b0ed..b5b010956485 100644 --- a/ecmascript/jsdoc/Cargo.toml +++ b/ecmascript/jsdoc/Cargo.toml @@ -5,7 +5,7 @@ documentation = "https://swc.rs/rustdoc/jsdoc/" edition = "2018" license = "Apache-2.0/MIT" name = "jsdoc" -version = "0.15.0" +version = "0.16.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -18,7 +18,7 @@ swc_common = {version = "0.10.0", path = "../../common"} [dev-dependencies] anyhow = "1" dashmap = "3" -swc_ecma_ast = {version = "0.38.0", path = "../ast"} -swc_ecma_parser = {version = "0.47.0", path = "../parser"} +swc_ecma_ast = {version = "0.39.0", path = "../ast"} +swc_ecma_parser = {version = "0.48.0", path = "../parser"} testing = {version = "0.10.0", path = "../../testing"} walkdir = "2" diff --git a/ecmascript/parser/Cargo.toml b/ecmascript/parser/Cargo.toml index 61e8c5bf72d1..f1a125019c7d 100644 --- a/ecmascript/parser/Cargo.toml +++ b/ecmascript/parser/Cargo.toml @@ -7,7 +7,7 @@ include = ["Cargo.toml", "src/**/*.rs", "examples/**/*.rs"] license = "Apache-2.0/MIT" name = "swc_ecma_parser" repository = "https://github.com/swc-project/swc.git" -version = "0.47.2" +version = "0.48.0" [features] default = [] @@ -22,8 +22,8 @@ serde = {version = "1", features = ["derive"]} smallvec = "1" swc_atoms = {version = "0.2.3", path = "../../atoms"} swc_common = {version = "0.10.0", path = "../../common"} -swc_ecma_ast = {version = "0.38.0", path = "../ast"} -swc_ecma_visit = {version = "0.24.0", path = "../visit"} +swc_ecma_ast = {version = "0.39.0", path = "../ast"} +swc_ecma_visit = {version = "0.25.0", path = "../visit"} unicode-xid = "0.2" [dev-dependencies] diff --git a/ecmascript/parser/src/parser/class_and_fn.rs b/ecmascript/parser/src/parser/class_and_fn.rs index 7e9cfe02a182..dc0a6fa17591 100644 --- a/ecmascript/parser/src/parser/class_and_fn.rs +++ b/ecmascript/parser/src/parser/class_and_fn.rs @@ -1248,8 +1248,11 @@ fn is_constructor(key: &Either) -> bool { pub(crate) fn is_not_this(p: &Param) -> bool { match p.pat { - Pat::Ident(Ident { - sym: js_word!("this"), + Pat::Ident(BindingIdent { + id: Ident { + sym: js_word!("this"), + .. + }, .. }) => false, _ => true, diff --git a/ecmascript/parser/src/parser/expr.rs b/ecmascript/parser/src/parser/expr.rs index 1c6203f4146c..8489211a0a38 100644 --- a/ecmascript/parser/src/parser/expr.rs +++ b/ecmascript/parser/src/parser/expr.rs @@ -1341,7 +1341,7 @@ impl<'a, I: Tokens> Parser { let mut pat = self.reparse_expr_as_pat(PatType::BindingPat, arg.expr)?; if optional { match pat { - Pat::Ident(ref mut i) => i.optional = true, + Pat::Ident(ref mut i) => i.id.optional = true, _ => unreachable!(), } } @@ -1361,9 +1361,9 @@ impl<'a, I: Tokens> Parser { }); } match pat { - Pat::Ident(Ident { + Pat::Ident(BindingIdent { + id: Ident { ref mut span, .. }, ref mut type_ann, - ref mut span, .. }) | Pat::Array(ArrayPat { diff --git a/ecmascript/parser/src/parser/expr/tests.rs b/ecmascript/parser/src/parser/expr/tests.rs index 0d861248386c..62dc96640221 100644 --- a/ecmascript/parser/src/parser/expr/tests.rs +++ b/ecmascript/parser/src/parser/expr/tests.rs @@ -37,7 +37,7 @@ fn expr(s: &'static str) -> Box { fn regex_expr() -> Box { Box::new(Expr::Assign(AssignExpr { span, - left: PatOrExpr::Pat(Box::new(Pat::Ident(Ident::new("re".into(), span)))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(Ident::new("re".into(), span).into()))), op: AssignOp::Assign, right: Box::new(Expr::Lit(Lit::Regex(Regex { span, @@ -131,7 +131,7 @@ fn object_rest_pat() { props: vec![ObjectPatProp::Rest(RestPat { span, dot3_token: span, - arg: Box::new(Pat::Ident(Ident::new("a34".into(), span))), + arg: Box::new(Pat::Ident(Ident::new("a34".into(), span).into())), type_ann: None, })], type_ann: None @@ -152,7 +152,7 @@ fn object_spread() { expr("foo = {a, ...bar, b}"), Box::new(Expr::Assign(AssignExpr { span, - left: PatOrExpr::Pat(Box::new(Pat::Ident(Ident::new("foo".into(), span)))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(Ident::new("foo".into(), span).into()))), op: op!("="), right: Box::new(Expr::Object(ObjectLit { span, @@ -230,7 +230,7 @@ fn arrow_fn() { span, is_async: false, is_generator: false, - params: vec![Pat::Ident(Ident::new("a".into(), span))], + params: vec![Pat::Ident(Ident::new("a".into(), span).into())], body: BlockStmtOrExpr::Expr(expr("1")), return_type: None, type_params: None, @@ -248,7 +248,7 @@ fn arrow_fn_rest() { params: vec![Pat::Rest(RestPat { span, dot3_token: span, - arg: Box::new(Pat::Ident(Ident::new("a".into(), span))), + arg: Box::new(Pat::Ident(Ident::new("a".into(), span).into())), type_ann: None })], body: BlockStmtOrExpr::Expr(expr("1")), @@ -265,7 +265,7 @@ fn arrow_fn_no_paren() { span, is_async: false, is_generator: false, - params: vec![Pat::Ident(Ident::new("a".into(), span))], + params: vec![Pat::Ident(Ident::new("a".into(), span).into())], body: BlockStmtOrExpr::Expr(expr("1")), type_params: None, return_type: None, diff --git a/ecmascript/parser/src/parser/ident.rs b/ecmascript/parser/src/parser/ident.rs index 52fa7c3333cf..e22cd70154fa 100644 --- a/ecmascript/parser/src/parser/ident.rs +++ b/ecmascript/parser/src/parser/ident.rs @@ -142,11 +142,11 @@ pub(super) trait MaybeOptionalIdentParser { } impl MaybeOptionalIdentParser for Parser { fn parse_maybe_opt_binding_ident(&mut self) -> PResult { - self.parse_binding_ident() + self.parse_binding_ident().map(|i| i.id) } } impl MaybeOptionalIdentParser> for Parser { fn parse_maybe_opt_binding_ident(&mut self) -> PResult> { - self.parse_opt_binding_ident() + self.parse_opt_binding_ident().map(|opt| opt.map(|i| i.id)) } } diff --git a/ecmascript/parser/src/parser/pat.rs b/ecmascript/parser/src/parser/pat.rs index c7f6db03df5b..266b0fd54c61 100644 --- a/ecmascript/parser/src/parser/pat.rs +++ b/ecmascript/parser/src/parser/pat.rs @@ -6,7 +6,7 @@ use swc_atoms::js_word; use swc_common::Spanned; impl<'a, I: Tokens> Parser { - pub(super) fn parse_opt_binding_ident(&mut self) -> PResult> { + pub(super) fn parse_opt_binding_ident(&mut self) -> PResult> { trace_cur!(self, parse_opt_binding_ident); if is!(self, BindingIdent) || (self.input.syntax().typescript() && is!(self, "this")) { @@ -19,7 +19,7 @@ impl<'a, I: Tokens> Parser { /// babel: `parseBindingIdentifier` /// /// spec: `BindingIdentifier` - pub(super) fn parse_binding_ident(&mut self) -> PResult { + pub(super) fn parse_binding_ident(&mut self) -> PResult { trace_cur!(self, parse_binding_ident); // "yield" and "await" is **lexically** accepted. @@ -34,7 +34,7 @@ impl<'a, I: Tokens> Parser { self.emit_err(ident.span, SyntaxError::ExpectedIdent); } - Ok(ident) + Ok(ident.into()) } pub(super) fn parse_binding_pat_or_ident(&mut self) -> PResult { @@ -161,8 +161,12 @@ impl<'a, I: Tokens> Parser { if self.input.syntax().typescript() { if eat!(self, '?') { match pat { - Pat::Ident(Ident { - ref mut optional, .. + Pat::Ident(BindingIdent { + id: + Ident { + ref mut optional, .. + }, + .. }) | Pat::Array(ArrayPat { ref mut optional, .. @@ -195,9 +199,9 @@ impl<'a, I: Tokens> Parser { ref mut span, .. }) - | Pat::Ident(Ident { + | Pat::Ident(BindingIdent { ref mut type_ann, - ref mut span, + id: Ident { ref mut span, .. }, .. }) | Pat::Object(ObjectPat { @@ -812,7 +816,7 @@ mod tests { span, dot3_token: span, type_ann: None, - arg: Box::new(Pat::Ident(ident("tail"))), + arg: Box::new(Pat::Ident(ident("tail").into())), })) } @@ -824,17 +828,17 @@ mod tests { span, optional: false, elems: vec![ - Some(Pat::Ident(ident("a"))), + Some(Pat::Ident(ident("a").into())), Some(Pat::Array(ArrayPat { span, optional: false, - elems: vec![Some(Pat::Ident(ident("b")))], + elems: vec![Some(Pat::Ident(ident("b").into()))], type_ann: None })), Some(Pat::Array(ArrayPat { span, optional: false, - elems: vec![Some(Pat::Ident(ident("c")))], + elems: vec![Some(Pat::Ident(ident("c").into()))], type_ann: None })) ], @@ -852,17 +856,17 @@ mod tests { optional: false, elems: vec![ None, - Some(Pat::Ident(ident("a"))), + Some(Pat::Ident(ident("a").into())), Some(Pat::Array(ArrayPat { span, optional: false, - elems: vec![Some(Pat::Ident(ident("b")))], + elems: vec![Some(Pat::Ident(ident("b").into()))], type_ann: None })), Some(Pat::Array(ArrayPat { span, optional: false, - elems: vec![Some(Pat::Ident(ident("c")))], + elems: vec![Some(Pat::Ident(ident("c").into()))], type_ann: None })) ], @@ -879,18 +883,18 @@ mod tests { span, optional: false, elems: vec![ - Some(Pat::Ident(ident("a"))), + Some(Pat::Ident(ident("a").into())), None, Some(Pat::Array(ArrayPat { span, optional: false, - elems: vec![Some(Pat::Ident(ident("b")))], + elems: vec![Some(Pat::Ident(ident("b").into()))], type_ann: None })), Some(Pat::Array(ArrayPat { span, optional: false, - elems: vec![Some(Pat::Ident(ident("c")))], + elems: vec![Some(Pat::Ident(ident("c").into()))], type_ann: None })) ], @@ -924,7 +928,7 @@ mod tests { Some(Pat::Assign(AssignPat { type_ann: None, span, - left: Box::new(Pat::Ident(ident("a"))), + left: Box::new(Pat::Ident(ident("a").into())), right: Box::new(Expr::Lit(Lit::Num(Number { span, value: 1.0 }))) })) ], @@ -986,7 +990,7 @@ mod tests { span, dot3_token: span, type_ann: None, - arg: Box::new(Pat::Ident(ident("obj"))) + arg: Box::new(Pat::Ident(ident("obj").into())) })] }) ); @@ -1017,7 +1021,7 @@ mod tests { value: Box::new(Expr::Assign(AssignExpr { span, op: AssignOp::Assign, - left: PatOrExpr::Pat(Box::new(Pat::Ident(ident(assign_name)))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(ident(assign_name).into()))), right: Box::new(expr), })), }))) diff --git a/ecmascript/parser/src/parser/stmt.rs b/ecmascript/parser/src/parser/stmt.rs index d197cff6b532..c9817ed0a38e 100644 --- a/ecmascript/parser/src/parser/stmt.rs +++ b/ecmascript/parser/src/parser/stmt.rs @@ -601,7 +601,7 @@ impl<'a, I: Tokens> Parser { // self.emit_err(ty.span(), SyntaxError::TS1196); match &mut pat { - Pat::Ident(Ident { type_ann, .. }) + Pat::Ident(BindingIdent { type_ann, .. }) | Pat::Array(ArrayPat { type_ann, .. }) | Pat::Rest(RestPat { type_ann, .. }) | Pat::Object(ObjectPat { type_ann, .. }) @@ -746,7 +746,7 @@ impl<'a, I: Tokens> Parser { | Pat::Assign(AssignPat { ref mut type_ann, .. }) - | Pat::Ident(Ident { + | Pat::Ident(BindingIdent { ref mut type_ann, .. }) | Pat::Object(ObjectPat { @@ -1220,7 +1220,7 @@ mod tests { props: vec![ObjectPatProp::Rest(RestPat { span, dot3_token: span, - arg: Box::new(Pat::Ident(Ident::new("a34".into(), span))), + arg: Box::new(Pat::Ident(Ident::new("a34".into(), span).into())), type_ann: None })], type_ann: None, @@ -1260,7 +1260,7 @@ mod tests { decls: vec![VarDeclarator { span, init: None, - name: Pat::Ident(Ident::new("a".into(), span)), + name: Pat::Ident(Ident::new("a".into(), span).into()), definite: false, }], declare: false, @@ -1741,7 +1741,11 @@ export default function waitUntil(callback, options = {}) { span, type_ann: None, optional: false, - elems: vec![None, None, Some(Pat::Ident(Ident::new("t".into(), span)))] + elems: vec![ + None, + None, + Some(Pat::Ident(Ident::new("t".into(), span).into())) + ] }), init: Some(Box::new(Expr::Ident(Ident::new( "simple_array".into(), diff --git a/ecmascript/parser/src/parser/stmt/module_item.rs b/ecmascript/parser/src/parser/stmt/module_item.rs index ef22ccfc73cf..e9a25b9db9a9 100644 --- a/ecmascript/parser/src/parser/stmt/module_item.rs +++ b/ecmascript/parser/src/parser/stmt/module_item.rs @@ -170,7 +170,7 @@ impl<'a, I: Tokens> Parser { let orig_name = self.parse_ident_name()?; if eat!(self, "as") { - let local = self.parse_binding_ident()?; + let local = self.parse_binding_ident()?.id; return Ok(ImportSpecifier::Named(ImportNamedSpecifier { span: Span::new(start, local.span.hi(), Default::default()), local, @@ -207,7 +207,7 @@ impl<'a, I: Tokens> Parser { in_generator: false, ..self.ctx() }; - self.with_ctx(ctx).parse_binding_ident() + Ok(self.with_ctx(ctx).parse_binding_ident()?.id) } #[allow(clippy::cognitive_complexity)] diff --git a/ecmascript/parser/src/parser/typescript.rs b/ecmascript/parser/src/parser/typescript.rs index 120328bbeba9..d2286ba610af 100644 --- a/ecmascript/parser/src/parser/typescript.rs +++ b/ecmascript/parser/src/parser/typescript.rs @@ -1177,17 +1177,17 @@ impl Parser { expect!(self, '['); let ident_start = cur_pos!(self); - let mut id = self.parse_ident_name()?; + let mut id = self.parse_ident_name().map(BindingIdent::from)?; let type_ann_start = cur_pos!(self); if eat!(self, ',') { - self.emit_err(id.span, SyntaxError::TS1096); + self.emit_err(id.id.span, SyntaxError::TS1096); } else { expect!(self, ':'); } let type_ann = self.parse_ts_type_ann(/* eat_colon */ false, type_ann_start)?; - id.span = span!(self, ident_start); + id.id.span = span!(self, ident_start); id.type_ann = Some(type_ann); expect!(self, ']'); @@ -1512,11 +1512,11 @@ impl Parser { Pat::Rest(RestPat { span: span!(p, start), dot3_token, - arg: Box::new(Pat::Ident(ident)), + arg: Box::new(Pat::Ident(ident.into())), type_ann: None, }) } else { - Pat::Ident(ident) + Pat::Ident(ident.into()) })) }) } @@ -2563,7 +2563,7 @@ mod tests { declare: false, decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(Ident::new("t".into(), DUMMY_SP)), + name: Pat::Ident(Ident::new("t".into(), DUMMY_SP).into()), init: Some(Box::new(Expr::Unary(UnaryExpr { span: DUMMY_SP, op: op!(unary, "-"), diff --git a/ecmascript/parser/tests/common/mod.rs b/ecmascript/parser/tests/common/mod.rs index 452233c22310..c8be23c66bc3 100644 --- a/ecmascript/parser/tests/common/mod.rs +++ b/ecmascript/parser/tests/common/mod.rs @@ -44,7 +44,7 @@ impl Fold for Normalizer { if let Pat::Expr(expr) = node { match *expr { - Expr::Ident(i) => return Pat::Ident(i), + Expr::Ident(i) => return Pat::Ident(i.into()), _ => { node = Pat::Expr(expr); } @@ -59,7 +59,7 @@ impl Fold for Normalizer { match node { PatOrExpr::Expr(expr) => match *expr { - Expr::Ident(i) => PatOrExpr::Pat(Box::new(Pat::Ident(i))), + Expr::Ident(i) => PatOrExpr::Pat(Box::new(Pat::Ident(i.into()))), _ => PatOrExpr::Expr(expr), }, PatOrExpr::Pat(pat) => match *pat { diff --git a/ecmascript/parser/tests/jsx.rs b/ecmascript/parser/tests/jsx.rs index 20d269a44e90..6ee05df2f128 100644 --- a/ecmascript/parser/tests/jsx.rs +++ b/ecmascript/parser/tests/jsx.rs @@ -242,7 +242,7 @@ impl Fold for Normalizer { if let Pat::Expr(expr) = node { match *expr { - Expr::Ident(i) => return Pat::Ident(i), + Expr::Ident(i) => return Pat::Ident(i.into()), _ => { node = Pat::Expr(expr); } diff --git a/ecmascript/parser/tests/jsx/basic/1/input.js.json b/ecmascript/parser/tests/jsx/basic/1/input.js.json index 4644c8e806db..7bc8aa59a89c 100644 --- a/ecmascript/parser/tests/jsx/basic/1/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/1/input.js.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/jsx/basic/10/input.js.json b/ecmascript/parser/tests/jsx/basic/10/input.js.json index 299ed4a1453b..4ac5583577e6 100644 --- a/ecmascript/parser/tests/jsx/basic/10/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/10/input.js.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "span": { @@ -75,7 +74,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/jsx/basic/11/input.js.json b/ecmascript/parser/tests/jsx/basic/11/input.js.json index 0d28aa6fb42d..149043e1314f 100644 --- a/ecmascript/parser/tests/jsx/basic/11/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/11/input.js.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -69,7 +68,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/jsx/basic/12/input.js.json b/ecmascript/parser/tests/jsx/basic/12/input.js.json index 76662ea3e160..b0a0fdcb61e7 100644 --- a/ecmascript/parser/tests/jsx/basic/12/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/12/input.js.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -60,7 +59,6 @@ "ctxt": 0 }, "value": "br", - "typeAnnotation": null, "optional": false }, "span": { @@ -101,7 +99,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/jsx/basic/13/input.js.json b/ecmascript/parser/tests/jsx/basic/13/input.js.json index 04113c1b4bb4..f330349bcae6 100644 --- a/ecmascript/parser/tests/jsx/basic/13/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/13/input.js.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "LeftRight", - "typeAnnotation": null, "optional": false }, "span": { @@ -54,7 +53,6 @@ "ctxt": 0 }, "value": "left", - "typeAnnotation": null, "optional": false }, "value": { @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "span": { @@ -105,7 +102,6 @@ "ctxt": 0 }, "value": "right", - "typeAnnotation": null, "optional": false }, "value": { @@ -125,7 +121,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "span": { @@ -164,7 +159,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/jsx/basic/14/input.js.json b/ecmascript/parser/tests/jsx/basic/14/input.js.json index 3117957b20b2..6a355a1ba025 100644 --- a/ecmascript/parser/tests/jsx/basic/14/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/14/input.js.json @@ -32,7 +32,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -85,7 +82,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/jsx/basic/15/input.js.json b/ecmascript/parser/tests/jsx/basic/15/input.js.json index b82ce0de2f20..e6bcb525ef21 100644 --- a/ecmascript/parser/tests/jsx/basic/15/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/15/input.js.json @@ -34,7 +34,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -45,7 +44,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -57,7 +55,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -90,7 +87,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -101,7 +97,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -113,7 +108,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/jsx/basic/16/input.js.json b/ecmascript/parser/tests/jsx/basic/16/input.js.json index 9d1b14fb00cc..1b3b8ae4d44a 100644 --- a/ecmascript/parser/tests/jsx/basic/16/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/16/input.js.json @@ -45,7 +45,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -69,7 +68,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/jsx/basic/17/input.js.json b/ecmascript/parser/tests/jsx/basic/17/input.js.json index dd42f9f174e9..bf14b4523799 100644 --- a/ecmascript/parser/tests/jsx/basic/17/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/17/input.js.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -54,7 +53,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/jsx/basic/18/input.js.json b/ecmascript/parser/tests/jsx/basic/18/input.js.json index 7377653ac1ca..2c546755ec5f 100644 --- a/ecmascript/parser/tests/jsx/basic/18/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/18/input.js.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -54,7 +53,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } }, @@ -73,7 +71,6 @@ "ctxt": 0 }, "value": "post", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/jsx/basic/19/input.js.json b/ecmascript/parser/tests/jsx/basic/19/input.js.json index c7f3a9206f4e..da64fa6b14e3 100644 --- a/ecmascript/parser/tests/jsx/basic/19/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/19/input.js.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -54,7 +53,6 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, "optional": false }, "value": { @@ -87,7 +85,6 @@ "ctxt": 0 }, "value": "pre2", - "typeAnnotation": null, "optional": false }, "value": { @@ -120,7 +117,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } } @@ -144,7 +140,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/jsx/basic/2/input.js.json b/ecmascript/parser/tests/jsx/basic/2/input.js.json index c9eae4cf9610..c40f3bc23193 100644 --- a/ecmascript/parser/tests/jsx/basic/2/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/2/input.js.json @@ -32,7 +32,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "name": { @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "name": { @@ -81,7 +78,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/jsx/basic/20/input.js.json b/ecmascript/parser/tests/jsx/basic/20/input.js.json index 9ca159b1ba3c..00133495b053 100644 --- a/ecmascript/parser/tests/jsx/basic/20/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/20/input.js.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "span": { @@ -54,7 +53,6 @@ "ctxt": 0 }, "value": "aa", - "typeAnnotation": null, "optional": false }, "value": { @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "aa", - "typeAnnotation": null, "optional": false }, "property": { @@ -97,7 +94,6 @@ "ctxt": 0 }, "value": "bb", - "typeAnnotation": null, "optional": false }, "computed": false @@ -110,7 +106,6 @@ "ctxt": 0 }, "value": "cc", - "typeAnnotation": null, "optional": false }, "computed": false @@ -132,7 +127,6 @@ "ctxt": 0 }, "value": "bb", - "typeAnnotation": null, "optional": false }, "value": { @@ -164,7 +158,6 @@ "ctxt": 0 }, "value": "bb", - "typeAnnotation": null, "optional": false }, "property": { @@ -175,7 +168,6 @@ "ctxt": 0 }, "value": "cc", - "typeAnnotation": null, "optional": false }, "computed": false @@ -188,7 +180,6 @@ "ctxt": 0 }, "value": "dd", - "typeAnnotation": null, "optional": false }, "computed": false @@ -217,7 +208,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -252,7 +242,6 @@ "ctxt": 0 }, "value": "aa", - "typeAnnotation": null, "optional": false }, "property": { @@ -263,7 +252,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -285,7 +273,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -306,7 +293,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/jsx/basic/21/input.js.json b/ecmascript/parser/tests/jsx/basic/21/input.js.json index f698e52146fc..2f625d83f488 100644 --- a/ecmascript/parser/tests/jsx/basic/21/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/21/input.js.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -54,7 +53,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false } }, @@ -107,7 +104,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -126,7 +122,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -146,7 +141,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/jsx/basic/3/input.js.json b/ecmascript/parser/tests/jsx/basic/3/input.js.json index 0e2b07d2aaaa..212d8ac65f27 100644 --- a/ecmascript/parser/tests/jsx/basic/3/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/3/input.js.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "span": { @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "name": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } }, @@ -147,7 +143,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "span": { @@ -177,7 +172,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "span": { @@ -208,7 +202,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -229,7 +222,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/jsx/basic/4/input.js.json b/ecmascript/parser/tests/jsx/basic/4/input.js.json index 50d54ec322df..f31a654b38e7 100644 --- a/ecmascript/parser/tests/jsx/basic/4/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/4/input.js.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "span": { @@ -54,7 +53,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -161,7 +157,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/jsx/basic/5/input.js.json b/ecmascript/parser/tests/jsx/basic/5/input.js.json index 4644c8e806db..7bc8aa59a89c 100644 --- a/ecmascript/parser/tests/jsx/basic/5/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/5/input.js.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/jsx/basic/6/input.js.json b/ecmascript/parser/tests/jsx/basic/6/input.js.json index 9348626757c2..536b9cb6aaf4 100644 --- a/ecmascript/parser/tests/jsx/basic/6/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/6/input.js.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "日本語", - "typeAnnotation": null, "optional": false }, "span": { @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "日本語", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/jsx/basic/7/input.js.json b/ecmascript/parser/tests/jsx/basic/7/input.js.json index 3357e6751a43..ebf08e4cd6a7 100644 --- a/ecmascript/parser/tests/jsx/basic/7/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/7/input.js.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "AbC-def", - "typeAnnotation": null, "optional": false }, "span": { @@ -54,7 +53,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "value": { @@ -103,7 +101,6 @@ "ctxt": 0 }, "value": "AbC-def", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/jsx/basic/8/input.js.json b/ecmascript/parser/tests/jsx/basic/8/input.js.json index ec808af36213..343ce6236f38 100644 --- a/ecmascript/parser/tests/jsx/basic/8/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/8/input.js.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "span": { @@ -54,7 +53,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -99,7 +96,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "span": { @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/jsx/basic/asi/input.js.json b/ecmascript/parser/tests/jsx/basic/asi/input.js.json index 0773d3771c05..898ac6786417 100644 --- a/ecmascript/parser/tests/jsx/basic/asi/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/asi/input.js.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -92,7 +91,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/jsx/basic/custom/issue-517/input.js.json b/ecmascript/parser/tests/jsx/basic/custom/issue-517/input.js.json index a8880bc90cc1..82774613507b 100644 --- a/ecmascript/parser/tests/jsx/basic/custom/issue-517/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/custom/issue-517/input.js.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -69,7 +68,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/jsx/basic/custom/issue-542/input.js.json b/ecmascript/parser/tests/jsx/basic/custom/issue-542/input.js.json index 5f3939f762e7..56d6e8837a58 100644 --- a/ecmascript/parser/tests/jsx/basic/custom/issue-542/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/custom/issue-542/input.js.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "page", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -51,7 +51,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "span": { @@ -91,7 +90,6 @@ "ctxt": 0 }, "value": "em", - "typeAnnotation": null, "optional": false }, "span": { @@ -130,7 +128,6 @@ "ctxt": 0 }, "value": "em", - "typeAnnotation": null, "optional": false } } @@ -161,7 +158,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/jsx/basic/custom/issue-612-async-generator/issue.js.json b/ecmascript/parser/tests/jsx/basic/custom/issue-612-async-generator/issue.js.json index c1e0ce105a3a..6d1a35811a65 100644 --- a/ecmascript/parser/tests/jsx/basic/custom/issue-612-async-generator/issue.js.json +++ b/ecmascript/parser/tests/jsx/basic/custom/issue-612-async-generator/issue.js.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "agf", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/jsx/basic/custom/issue-614/input.js.json b/ecmascript/parser/tests/jsx/basic/custom/issue-614/input.js.json index fde1c17d3cf1..2ae9526aa1ba 100644 --- a/ecmascript/parser/tests/jsx/basic/custom/issue-614/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/custom/issue-614/input.js.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -51,7 +51,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "span": { @@ -75,7 +74,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "value": { @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/jsx/basic/custom/issue-615/input.js.json b/ecmascript/parser/tests/jsx/basic/custom/issue-615/input.js.json index ee5d60097293..97d26f7e5c64 100644 --- a/ecmascript/parser/tests/jsx/basic/custom/issue-615/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/custom/issue-615/input.js.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -51,7 +51,6 @@ "ctxt": 0 }, "value": "Test", - "typeAnnotation": null, "optional": false }, "span": { @@ -75,7 +74,6 @@ "ctxt": 0 }, "value": "attrib", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/jsx/basic/custom/issue-720/input.js.json b/ecmascript/parser/tests/jsx/basic/custom/issue-720/input.js.json index 3db42939902d..2b99a22438c5 100644 --- a/ecmascript/parser/tests/jsx/basic/custom/issue-720/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/custom/issue-720/input.js.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "main", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/jsx/basic/custom/tpl-space/input.js.json b/ecmascript/parser/tests/jsx/basic/custom/tpl-space/input.js.json index 4be047782d9d..13db31c10b04 100644 --- a/ecmascript/parser/tests/jsx/basic/custom/tpl-space/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/custom/tpl-space/input.js.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } ], diff --git a/ecmascript/parser/tests/jsx/basic/custom/tpl/input.js.json b/ecmascript/parser/tests/jsx/basic/custom/tpl/input.js.json index 77851ca7ac0d..bf88fa16fc52 100644 --- a/ecmascript/parser/tests/jsx/basic/custom/tpl/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/custom/tpl/input.js.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } ], diff --git a/ecmascript/parser/tests/jsx/basic/custom/unary-paren/input.js.json b/ecmascript/parser/tests/jsx/basic/custom/unary-paren/input.js.json index 40e099e0ea1d..9b295e379ae4 100644 --- a/ecmascript/parser/tests/jsx/basic/custom/unary-paren/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/custom/unary-paren/input.js.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false } } @@ -61,7 +60,6 @@ "ctxt": 0 }, "value": "App", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -105,8 +103,8 @@ "ctxt": 0 }, "value": "isLoading", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -152,7 +150,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -192,7 +189,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "span": { @@ -231,7 +227,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false } } @@ -268,7 +263,6 @@ "ctxt": 0 }, "value": "isLoading", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -295,7 +289,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -334,7 +327,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -364,7 +356,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -403,7 +394,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -437,7 +427,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -466,7 +455,6 @@ "ctxt": 0 }, "value": "App", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/jsx/basic/custom/unary/input.js.json b/ecmascript/parser/tests/jsx/basic/custom/unary/input.js.json index 26887362173f..aa1c2387adae 100644 --- a/ecmascript/parser/tests/jsx/basic/custom/unary/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/custom/unary/input.js.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false } } @@ -61,7 +60,6 @@ "ctxt": 0 }, "value": "App", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -105,8 +103,8 @@ "ctxt": 0 }, "value": "isLoading", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -152,7 +150,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -192,7 +189,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "span": { @@ -231,7 +227,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false } } @@ -268,7 +263,6 @@ "ctxt": 0 }, "value": "isLoading", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -288,7 +282,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -327,7 +320,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -349,7 +341,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -388,7 +379,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -421,7 +411,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -450,7 +439,6 @@ "ctxt": 0 }, "value": "App", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/jsx/basic/empty-expression-container/input.js.json b/ecmascript/parser/tests/jsx/basic/empty-expression-container/input.js.json index 2bf901178c70..51a52b76be3b 100644 --- a/ecmascript/parser/tests/jsx/basic/empty-expression-container/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/empty-expression-container/input.js.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "span": { @@ -75,7 +74,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/jsx/basic/entity/input.js.json b/ecmascript/parser/tests/jsx/basic/entity/input.js.json index 4c5a0ce16cd8..3d8468127bdc 100644 --- a/ecmascript/parser/tests/jsx/basic/entity/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/entity/input.js.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "span": { @@ -69,7 +68,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/jsx/basic/fragment-3/input.js.json b/ecmascript/parser/tests/jsx/basic/fragment-3/input.js.json index 1271d6d0a9a3..a224bd68ec70 100644 --- a/ecmascript/parser/tests/jsx/basic/fragment-3/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/fragment-3/input.js.json @@ -56,7 +56,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -95,7 +94,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false } } @@ -127,7 +125,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -166,7 +163,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/jsx/basic/fragment-5/input.js.json b/ecmascript/parser/tests/jsx/basic/fragment-5/input.js.json index 47ce7ba1d929..e3fbe6793662 100644 --- a/ecmascript/parser/tests/jsx/basic/fragment-5/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/fragment-5/input.js.json @@ -56,7 +56,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -84,7 +83,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -116,7 +114,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/jsx/basic/fragment-6/input.js.json b/ecmascript/parser/tests/jsx/basic/fragment-6/input.js.json index 9dd14dff5322..03d58a0c101c 100644 --- a/ecmascript/parser/tests/jsx/basic/fragment-6/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/fragment-6/input.js.json @@ -46,7 +46,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -85,7 +84,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/jsx/basic/issue-812/input.js.json b/ecmascript/parser/tests/jsx/basic/issue-812/input.js.json index 8f7e91254c15..922bc78d31a1 100644 --- a/ecmascript/parser/tests/jsx/basic/issue-812/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/issue-812/input.js.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "declare", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/jsx/basic/keyword-tag/input.js.json b/ecmascript/parser/tests/jsx/basic/keyword-tag/input.js.json index e1d8a80005c1..297cd1477335 100644 --- a/ecmascript/parser/tests/jsx/basic/keyword-tag/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/keyword-tag/input.js.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "var", - "typeAnnotation": null, "optional": false }, "span": { @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "var", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/jsx/basic/namespace-tag/input.js.json b/ecmascript/parser/tests/jsx/basic/namespace-tag/input.js.json index 39887cf15dfc..3ba5d894e68c 100644 --- a/ecmascript/parser/tests/jsx/basic/namespace-tag/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/namespace-tag/input.js.json @@ -32,7 +32,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "name": { @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false } }, @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "name": { @@ -97,7 +94,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false } }, @@ -128,7 +124,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "name": { @@ -139,7 +134,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/jsx/basic/nonentity-decimal/input.js.json b/ecmascript/parser/tests/jsx/basic/nonentity-decimal/input.js.json index 745d70fef21b..f8392e1effa2 100644 --- a/ecmascript/parser/tests/jsx/basic/nonentity-decimal/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/nonentity-decimal/input.js.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "span": { @@ -69,7 +68,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/jsx/basic/nonentity/input.js.json b/ecmascript/parser/tests/jsx/basic/nonentity/input.js.json index 64dd06262cfa..cf6a4f541e81 100644 --- a/ecmascript/parser/tests/jsx/basic/nonentity/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/nonentity/input.js.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "span": { @@ -69,7 +68,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/jsx/basic/yield-tag/input.js.json b/ecmascript/parser/tests/jsx/basic/yield-tag/input.js.json index cd675bb1399b..8782455409b9 100644 --- a/ecmascript/parser/tests/jsx/basic/yield-tag/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/yield-tag/input.js.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "it", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -66,7 +65,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "span": { @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/arrow-function/annotated/input.ts.json b/ecmascript/parser/tests/typescript/arrow-function/annotated/input.ts.json index d2345654505e..ec9aaacb3406 100644 --- a/ecmascript/parser/tests/typescript/arrow-function/annotated/input.ts.json +++ b/ecmascript/parser/tests/typescript/arrow-function/annotated/input.ts.json @@ -29,6 +29,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -45,8 +46,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -57,7 +57,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/arrow-function/async-await-null/input.ts.json b/ecmascript/parser/tests/typescript/arrow-function/async-await-null/input.ts.json index f1013b6eba84..3d1959e91b3a 100644 --- a/ecmascript/parser/tests/typescript/arrow-function/async-await-null/input.ts.json +++ b/ecmascript/parser/tests/typescript/arrow-function/async-await-null/input.ts.json @@ -62,7 +62,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/arrow-function/async-generic-false-positive/input.ts.json b/ecmascript/parser/tests/typescript/arrow-function/async-generic-false-positive/input.ts.json index b591cdba913c..e6be55297269 100644 --- a/ecmascript/parser/tests/typescript/arrow-function/async-generic-false-positive/input.ts.json +++ b/ecmascript/parser/tests/typescript/arrow-function/async-generic-false-positive/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "async", - "typeAnnotation": null, "optional": false }, "right": { @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "async", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -100,7 +98,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/arrow-function/async-generic/input.ts.json b/ecmascript/parser/tests/typescript/arrow-function/async-generic/input.ts.json index d8300c54dafe..59a3fe22062d 100644 --- a/ecmascript/parser/tests/typescript/arrow-function/async-generic/input.ts.json +++ b/ecmascript/parser/tests/typescript/arrow-function/async-generic/input.ts.json @@ -29,6 +29,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -51,13 +52,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -68,7 +67,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": true, @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -126,7 +123,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/arrow-function/async-rest/input.ts.json b/ecmascript/parser/tests/typescript/arrow-function/async-rest/input.ts.json index 6d02b3978bf2..c073099643f0 100644 --- a/ecmascript/parser/tests/typescript/arrow-function/async-rest/input.ts.json +++ b/ecmascript/parser/tests/typescript/arrow-function/async-rest/input.ts.json @@ -41,8 +41,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", diff --git a/ecmascript/parser/tests/typescript/arrow-function/async/input.ts.json b/ecmascript/parser/tests/typescript/arrow-function/async/input.ts.json index ad391f1010eb..308d465025ac 100644 --- a/ecmascript/parser/tests/typescript/arrow-function/async/input.ts.json +++ b/ecmascript/parser/tests/typescript/arrow-function/async/input.ts.json @@ -29,6 +29,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -45,8 +46,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "body": { @@ -57,7 +57,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": true, diff --git a/ecmascript/parser/tests/typescript/arrow-function/default-parameter-values/input.ts.json b/ecmascript/parser/tests/typescript/arrow-function/default-parameter-values/input.ts.json index 0862476b40d5..3c28caec243e 100644 --- a/ecmascript/parser/tests/typescript/arrow-function/default-parameter-values/input.ts.json +++ b/ecmascript/parser/tests/typescript/arrow-function/default-parameter-values/input.ts.json @@ -36,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -52,8 +53,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "right": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/arrow-function/destructuring/input.ts.json b/ecmascript/parser/tests/typescript/arrow-function/destructuring/input.ts.json index 37c8caf9f58c..713cd32551b2 100644 --- a/ecmascript/parser/tests/typescript/arrow-function/destructuring/input.ts.json +++ b/ecmascript/parser/tests/typescript/arrow-function/destructuring/input.ts.json @@ -44,7 +44,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/arrow-function/generic-tsx/input.ts.json b/ecmascript/parser/tests/typescript/arrow-function/generic-tsx/input.ts.json index 5e7186b90c50..73ad5355aa7b 100644 --- a/ecmascript/parser/tests/typescript/arrow-function/generic-tsx/input.ts.json +++ b/ecmascript/parser/tests/typescript/arrow-function/generic-tsx/input.ts.json @@ -29,6 +29,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -51,13 +52,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -68,7 +67,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -126,7 +123,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/arrow-function/generic/input.ts.json b/ecmascript/parser/tests/typescript/arrow-function/generic/input.ts.json index 25cecd96c0c2..a4d9f01f592c 100644 --- a/ecmascript/parser/tests/typescript/arrow-function/generic/input.ts.json +++ b/ecmascript/parser/tests/typescript/arrow-function/generic/input.ts.json @@ -29,6 +29,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -51,13 +52,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -68,7 +67,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -126,7 +123,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/arrow-function/inside-conditional-expr/input.ts.json b/ecmascript/parser/tests/typescript/arrow-function/inside-conditional-expr/input.ts.json index 6a7fd2e6a53e..a3433675356d 100644 --- a/ecmascript/parser/tests/typescript/arrow-function/inside-conditional-expr/input.ts.json +++ b/ecmascript/parser/tests/typescript/arrow-function/inside-conditional-expr/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "referrer", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -65,8 +64,8 @@ "ctxt": 0 }, "value": "specifier", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -81,7 +80,6 @@ "ctxt": 0 }, "value": "specifier", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/arrow-function/optional-parameter/input.ts.json b/ecmascript/parser/tests/typescript/arrow-function/optional-parameter/input.ts.json index 30737eb492f2..7f264368d216 100644 --- a/ecmascript/parser/tests/typescript/arrow-function/optional-parameter/input.ts.json +++ b/ecmascript/parser/tests/typescript/arrow-function/optional-parameter/input.ts.json @@ -29,6 +29,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -45,8 +46,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "body": { @@ -57,7 +57,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/arrow-function/predicate-types/input.ts.json b/ecmascript/parser/tests/typescript/arrow-function/predicate-types/input.ts.json index 7c9ffad1035c..b3fbd4ec4241 100644 --- a/ecmascript/parser/tests/typescript/arrow-function/predicate-types/input.ts.json +++ b/ecmascript/parser/tests/typescript/arrow-function/predicate-types/input.ts.json @@ -29,6 +29,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -45,8 +46,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "body": { @@ -84,7 +84,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { diff --git a/ecmascript/parser/tests/typescript/cast/as/input.ts.json b/ecmascript/parser/tests/typescript/cast/as/input.ts.json index c63ff36b1f8e..27d4f23fb32c 100644 --- a/ecmascript/parser/tests/typescript/cast/as/input.ts.json +++ b/ecmascript/parser/tests/typescript/cast/as/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -46,7 +45,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -83,7 +81,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -94,7 +91,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -132,7 +128,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -192,7 +187,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -220,7 +214,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/cast/assert-and-assign/input.ts.json b/ecmascript/parser/tests/typescript/cast/assert-and-assign/input.ts.json index 3634520dbc4d..f7c089b2f5f4 100644 --- a/ecmascript/parser/tests/typescript/cast/assert-and-assign/input.ts.json +++ b/ecmascript/parser/tests/typescript/cast/assert-and-assign/input.ts.json @@ -43,7 +43,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { diff --git a/ecmascript/parser/tests/typescript/cast/false-positive/input.ts.json b/ecmascript/parser/tests/typescript/cast/false-positive/input.ts.json index 4569e9fc3719..c40ca64f9fa4 100644 --- a/ecmascript/parser/tests/typescript/cast/false-positive/input.ts.json +++ b/ecmascript/parser/tests/typescript/cast/false-positive/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { diff --git a/ecmascript/parser/tests/typescript/cast/multiple-assert-and-assign/input.ts.json b/ecmascript/parser/tests/typescript/cast/multiple-assert-and-assign/input.ts.json index 944bebbaa858..4ad3d80e1cfd 100644 --- a/ecmascript/parser/tests/typescript/cast/multiple-assert-and-assign/input.ts.json +++ b/ecmascript/parser/tests/typescript/cast/multiple-assert-and-assign/input.ts.json @@ -50,7 +50,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { diff --git a/ecmascript/parser/tests/typescript/cast/need-parentheses/input.ts.json b/ecmascript/parser/tests/typescript/cast/need-parentheses/input.ts.json index e63341f9058a..15fcd0172f0a 100644 --- a/ecmascript/parser/tests/typescript/cast/need-parentheses/input.ts.json +++ b/ecmascript/parser/tests/typescript/cast/need-parentheses/input.ts.json @@ -42,7 +42,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -60,7 +59,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -75,7 +73,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -117,7 +114,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -135,7 +131,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -150,7 +145,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -185,7 +179,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -197,7 +190,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/cast/null-assertion-2/input.ts.json b/ecmascript/parser/tests/typescript/cast/null-assertion-2/input.ts.json index 21d78646c1e8..63f3a8d1d252 100644 --- a/ecmascript/parser/tests/typescript/cast/null-assertion-2/input.ts.json +++ b/ecmascript/parser/tests/typescript/cast/null-assertion-2/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/cast/null-assertion-3/input.ts.json b/ecmascript/parser/tests/typescript/cast/null-assertion-3/input.ts.json index 297c2c28c641..8bbb2c4447fe 100644 --- a/ecmascript/parser/tests/typescript/cast/null-assertion-3/input.ts.json +++ b/ecmascript/parser/tests/typescript/cast/null-assertion-3/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsNonNullExpression", @@ -56,7 +56,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/cast/null-assertion-and-assign-2/input.ts.json b/ecmascript/parser/tests/typescript/cast/null-assertion-and-assign-2/input.ts.json index 53d65baf130a..161d1bc57a8d 100644 --- a/ecmascript/parser/tests/typescript/cast/null-assertion-and-assign-2/input.ts.json +++ b/ecmascript/parser/tests/typescript/cast/null-assertion-and-assign-2/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/cast/null-assertion-and-assign/input.ts.json b/ecmascript/parser/tests/typescript/cast/null-assertion-and-assign/input.ts.json index 68e64bf78b4b..68834aecabbe 100644 --- a/ecmascript/parser/tests/typescript/cast/null-assertion-and-assign/input.ts.json +++ b/ecmascript/parser/tests/typescript/cast/null-assertion-and-assign/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/cast/null-assertion-false-positive/input.ts.json b/ecmascript/parser/tests/typescript/cast/null-assertion-false-positive/input.ts.json index ed258e33326c..e893cd37431a 100644 --- a/ecmascript/parser/tests/typescript/cast/null-assertion-false-positive/input.ts.json +++ b/ecmascript/parser/tests/typescript/cast/null-assertion-false-positive/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/cast/null-assertion-then-property-access/input.ts.json b/ecmascript/parser/tests/typescript/cast/null-assertion-then-property-access/input.ts.json index db67181a9a5d..039ec80a097d 100644 --- a/ecmascript/parser/tests/typescript/cast/null-assertion-then-property-access/input.ts.json +++ b/ecmascript/parser/tests/typescript/cast/null-assertion-then-property-access/input.ts.json @@ -35,7 +35,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/cast/null-assertion/input.ts.json b/ecmascript/parser/tests/typescript/cast/null-assertion/input.ts.json index 7aaf834ac74c..a31c31f9d9ea 100644 --- a/ecmascript/parser/tests/typescript/cast/null-assertion/input.ts.json +++ b/ecmascript/parser/tests/typescript/cast/null-assertion/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/cast/type-assertion-and-assign/input.ts.json b/ecmascript/parser/tests/typescript/cast/type-assertion-and-assign/input.ts.json index eb4825a49d65..7ce2687fc117 100644 --- a/ecmascript/parser/tests/typescript/cast/type-assertion-and-assign/input.ts.json +++ b/ecmascript/parser/tests/typescript/cast/type-assertion-and-assign/input.ts.json @@ -43,7 +43,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { diff --git a/ecmascript/parser/tests/typescript/class/abstract-false-positive/input.ts.json b/ecmascript/parser/tests/typescript/class/abstract-false-positive/input.ts.json index c2d4c667a569..a785e6a49566 100644 --- a/ecmascript/parser/tests/typescript/class/abstract-false-positive/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/abstract-false-positive/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "abstract", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/class/abstract/input.ts.json b/ecmascript/parser/tests/typescript/class/abstract/input.ts.json index d7e97563104a..ba4c23cee4c8 100644 --- a/ecmascript/parser/tests/typescript/class/abstract/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/abstract/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/class/constructor-with-modifier-names/input.ts.json b/ecmascript/parser/tests/typescript/class/constructor-with-modifier-names/input.ts.json index b92f00202549..d9cacb2ab208 100644 --- a/ecmascript/parser/tests/typescript/class/constructor-with-modifier-names/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/constructor-with-modifier-names/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,8 +60,8 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -82,8 +80,8 @@ "ctxt": 0 }, "value": "readonly", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -114,7 +112,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -134,6 +131,7 @@ "ctxt": 0 }, "value": "set", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -150,8 +148,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -170,6 +167,7 @@ "ctxt": 0 }, "value": "readonly", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -186,8 +184,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/class/constructor/input.ts.json b/ecmascript/parser/tests/typescript/class/constructor/input.ts.json index 0184c3339b4e..175ee2fd2198 100644 --- a/ecmascript/parser/tests/typescript/class/constructor/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/constructor/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -78,8 +77,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -98,6 +96,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -114,8 +113,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -138,7 +136,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -158,6 +155,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -174,8 +172,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -194,6 +191,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -210,8 +208,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -234,7 +231,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -254,6 +250,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -270,8 +267,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -290,6 +286,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -306,8 +303,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/class/declare/input.ts.json b/ecmascript/parser/tests/typescript/class/declare/input.ts.json index df6cb682765b..88ac859d6e59 100644 --- a/ecmascript/parser/tests/typescript/class/declare/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/declare/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -38,6 +37,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,8 +54,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -97,7 +96,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -127,7 +125,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -173,7 +170,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -211,7 +207,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/class/decorators/input.ts.json b/ecmascript/parser/tests/typescript/class/decorators/input.ts.json index 560cb1b25cff..de31bf80b8a4 100644 --- a/ecmascript/parser/tests/typescript/class/decorators/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/decorators/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -41,7 +40,6 @@ "ctxt": 0 }, "value": "dec", - "typeAnnotation": null, "optional": false } } @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -89,7 +86,6 @@ "ctxt": 0 }, "value": "dec", - "typeAnnotation": null, "optional": false } } @@ -104,6 +100,7 @@ "ctxt": 0 }, "value": "param", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -120,8 +117,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -152,7 +148,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -173,7 +168,6 @@ "ctxt": 0 }, "value": "dec", - "typeAnnotation": null, "optional": false } }, @@ -192,7 +186,6 @@ "ctxt": 0 }, "value": "dec2", - "typeAnnotation": null, "optional": false } } @@ -237,7 +230,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": null, @@ -259,7 +251,6 @@ "ctxt": 0 }, "value": "dec", - "typeAnnotation": null, "optional": false } } @@ -287,7 +278,6 @@ "ctxt": 0 }, "value": "prop2", - "typeAnnotation": null, "optional": false }, "function": { @@ -308,7 +298,6 @@ "ctxt": 0 }, "value": "dec", - "typeAnnotation": null, "optional": false } } @@ -371,7 +360,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -392,7 +380,6 @@ "ctxt": 0 }, "value": "dec", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/class/expression-extends-implements/input.ts.json b/ecmascript/parser/tests/typescript/class/expression-extends-implements/input.ts.json index c715c55a484c..f1c088bda6df 100644 --- a/ecmascript/parser/tests/typescript/class/expression-extends-implements/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/expression-extends-implements/input.ts.json @@ -45,7 +45,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -76,7 +75,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -101,7 +99,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "right": { @@ -112,7 +109,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false } }, @@ -139,7 +135,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -175,7 +170,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "span": { @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -231,7 +224,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -256,7 +248,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "right": { @@ -267,7 +258,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false } }, @@ -294,7 +284,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/class/expression-extends/input.ts.json b/ecmascript/parser/tests/typescript/class/expression-extends/input.ts.json index bcd0d708cd3d..e66ea1425c2c 100644 --- a/ecmascript/parser/tests/typescript/class/expression-extends/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/expression-extends/input.ts.json @@ -45,7 +45,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -76,7 +75,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -111,7 +109,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "span": { @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -167,7 +163,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/class/expression-generic/input.ts.json b/ecmascript/parser/tests/typescript/class/expression-generic/input.ts.json index 43c689ce4006..5b0f8c5b8ead 100644 --- a/ecmascript/parser/tests/typescript/class/expression-generic/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/expression-generic/input.ts.json @@ -55,7 +55,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -92,7 +91,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "span": { @@ -127,7 +125,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/class/expression-implements/input.ts.json b/ecmascript/parser/tests/typescript/class/expression-implements/input.ts.json index 211fc32cb2c9..6225c332db68 100644 --- a/ecmascript/parser/tests/typescript/class/expression-implements/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/expression-implements/input.ts.json @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "right": { @@ -63,7 +62,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false } }, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -126,7 +123,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "span": { @@ -158,7 +154,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "right": { @@ -169,7 +164,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false } }, @@ -196,7 +190,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/class/extends-implements/input.ts.json b/ecmascript/parser/tests/typescript/class/extends-implements/input.ts.json index 782e3b85654a..676131a23e40 100644 --- a/ecmascript/parser/tests/typescript/class/extends-implements/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/extends-implements/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -73,7 +71,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -98,7 +95,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "right": { @@ -109,7 +105,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false } }, @@ -136,7 +131,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/class/extends/input.ts.json b/ecmascript/parser/tests/typescript/class/extends/input.ts.json index dd8e0aa14e3b..c1040458f185 100644 --- a/ecmascript/parser/tests/typescript/class/extends/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/extends/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -73,7 +71,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/class/generic/input.ts.json b/ecmascript/parser/tests/typescript/class/generic/input.ts.json index d57d88f309ab..aa3764eaf556 100644 --- a/ecmascript/parser/tests/typescript/class/generic/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/generic/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,7 +51,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/class/get-generic/input.ts.json b/ecmascript/parser/tests/typescript/class/get-generic/input.ts.json index f162d981b7f1..494dc92f1461 100644 --- a/ecmascript/parser/tests/typescript/class/get-generic/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/get-generic/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "function": { @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/class/implements/input.ts.json b/ecmascript/parser/tests/typescript/class/implements/input.ts.json index 4328df269587..2b79a9ae3454 100644 --- a/ecmascript/parser/tests/typescript/class/implements/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/implements/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "right": { @@ -60,7 +58,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false } }, @@ -87,7 +84,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/class/index-signature/input.ts.json b/ecmascript/parser/tests/typescript/class/index-signature/input.ts.json index 8574fecb158a..7d2f8a7919eb 100644 --- a/ecmascript/parser/tests/typescript/class/index-signature/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/index-signature/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -38,6 +37,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,8 +54,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -93,6 +92,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -109,8 +109,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { diff --git a/ecmascript/parser/tests/typescript/class/members-with-modifier-names/input.ts.json b/ecmascript/parser/tests/typescript/class/members-with-modifier-names/input.ts.json index a3a10a8f8f9a..0fbaf0d5017c 100644 --- a/ecmascript/parser/tests/typescript/class/members-with-modifier-names/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/members-with-modifier-names/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "public", - "typeAnnotation": null, "optional": false }, "function": { @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "static", - "typeAnnotation": null, "optional": false }, "function": { @@ -150,7 +147,6 @@ "ctxt": 0 }, "value": "readonly", - "typeAnnotation": null, "optional": false }, "value": { @@ -188,7 +184,6 @@ "ctxt": 0 }, "value": "async", - "typeAnnotation": null, "optional": false }, "function": { @@ -225,7 +220,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/class/members-with-reserved-names/input.ts.json b/ecmascript/parser/tests/typescript/class/members-with-reserved-names/input.ts.json index d236549b5b47..e350a229db3c 100644 --- a/ecmascript/parser/tests/typescript/class/members-with-reserved-names/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/members-with-reserved-names/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "delete", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/class/method-computed/input.ts.json b/ecmascript/parser/tests/typescript/class/method-computed/input.ts.json index d02e552782ad..0533171c4feb 100644 --- a/ecmascript/parser/tests/typescript/class/method-computed/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/method-computed/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -138,7 +135,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -149,7 +145,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/class/method-generic/input.ts.json b/ecmascript/parser/tests/typescript/class/method-generic/input.ts.json index d953bdf43d41..4f6b5cbcaa7e 100644 --- a/ecmascript/parser/tests/typescript/class/method-generic/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/method-generic/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -85,13 +84,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -110,6 +107,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -132,13 +130,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } }, { @@ -169,8 +165,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -201,7 +197,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -251,7 +246,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -281,7 +275,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -323,7 +316,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -334,7 +326,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -382,7 +373,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -412,7 +402,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/class/method-no-body/input.ts.json b/ecmascript/parser/tests/typescript/class/method-no-body/input.ts.json index e7f53267e603..f1aac1a43ed0 100644 --- a/ecmascript/parser/tests/typescript/class/method-no-body/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/method-no-body/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/class/method-optional/input.ts.json b/ecmascript/parser/tests/typescript/class/method-optional/input.ts.json index 87aab4145a06..39dc77554175 100644 --- a/ecmascript/parser/tests/typescript/class/method-optional/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/method-optional/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": true }, "function": { diff --git a/ecmascript/parser/tests/typescript/class/method-return-type/input.ts.json b/ecmascript/parser/tests/typescript/class/method-return-type/input.ts.json index cc9838987294..2bae7e7645eb 100644 --- a/ecmascript/parser/tests/typescript/class/method-return-type/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/method-return-type/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "function": { @@ -209,7 +206,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "function": { @@ -319,7 +315,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/class/method-with-newline-with-body/input.ts.json b/ecmascript/parser/tests/typescript/class/method-with-newline-with-body/input.ts.json index c1e16952443d..bcf7b98c3169 100644 --- a/ecmascript/parser/tests/typescript/class/method-with-newline-with-body/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/method-with-newline-with-body/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/class/method-with-newline-without-body/input.ts.json b/ecmascript/parser/tests/typescript/class/method-with-newline-without-body/input.ts.json index b3758f51974e..36653affa773 100644 --- a/ecmascript/parser/tests/typescript/class/method-with-newline-without-body/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/method-with-newline-without-body/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/class/modifiers-accessors/input.ts.json b/ecmascript/parser/tests/typescript/class/modifiers-accessors/input.ts.json index 3152c20c6827..d55baa1c4924 100644 --- a/ecmascript/parser/tests/typescript/class/modifiers-accessors/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/modifiers-accessors/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "function": { @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "pua", - "typeAnnotation": null, "optional": false }, "function": { @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "pus", - "typeAnnotation": null, "optional": false }, "function": { @@ -246,7 +241,6 @@ "ctxt": 0 }, "value": "pu", - "typeAnnotation": null, "optional": false }, "function": { @@ -310,7 +304,6 @@ "ctxt": 0 }, "value": "po", - "typeAnnotation": null, "optional": false }, "function": { @@ -374,7 +367,6 @@ "ctxt": 0 }, "value": "pi", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/class/modifiers-methods-async/input.ts.json b/ecmascript/parser/tests/typescript/class/modifiers-methods-async/input.ts.json index 58c8ec395eff..b9b4129219ac 100644 --- a/ecmascript/parser/tests/typescript/class/modifiers-methods-async/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/modifiers-methods-async/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "function": { @@ -126,7 +123,6 @@ "ctxt": 0 }, "value": "pua", - "typeAnnotation": null, "optional": false }, "function": { @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "pus", - "typeAnnotation": null, "optional": false }, "function": { @@ -210,7 +205,6 @@ "ctxt": 0 }, "value": "pu", - "typeAnnotation": null, "optional": false }, "function": { @@ -256,7 +250,6 @@ "ctxt": 0 }, "value": "po", - "typeAnnotation": null, "optional": false }, "function": { @@ -302,7 +295,6 @@ "ctxt": 0 }, "value": "pi", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/class/modifiers-properties/input.ts.json b/ecmascript/parser/tests/typescript/class/modifiers-properties/input.ts.json index 2573c8704873..fa8d7965c0d1 100644 --- a/ecmascript/parser/tests/typescript/class/modifiers-properties/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/modifiers-properties/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "value": null, @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, "optional": true }, "value": null, @@ -118,7 +115,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -148,7 +144,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": null, @@ -178,7 +173,6 @@ "ctxt": 0 }, "value": "pu", - "typeAnnotation": null, "optional": false }, "value": null, @@ -208,7 +202,6 @@ "ctxt": 0 }, "value": "po", - "typeAnnotation": null, "optional": false }, "value": null, @@ -238,7 +231,6 @@ "ctxt": 0 }, "value": "pi", - "typeAnnotation": null, "optional": false }, "value": null, @@ -268,7 +260,6 @@ "ctxt": 0 }, "value": "ra", - "typeAnnotation": null, "optional": false }, "value": null, @@ -298,7 +289,6 @@ "ctxt": 0 }, "value": "ar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -328,7 +318,6 @@ "ctxt": 0 }, "value": "sr", - "typeAnnotation": null, "optional": false }, "value": null, @@ -358,7 +347,6 @@ "ctxt": 0 }, "value": "pur", - "typeAnnotation": null, "optional": false }, "value": null, @@ -388,7 +376,6 @@ "ctxt": 0 }, "value": "pua", - "typeAnnotation": null, "optional": false }, "value": null, @@ -418,7 +405,6 @@ "ctxt": 0 }, "value": "pus", - "typeAnnotation": null, "optional": false }, "value": null, @@ -448,7 +434,6 @@ "ctxt": 0 }, "value": "pura", - "typeAnnotation": null, "optional": false }, "value": null, @@ -478,7 +463,6 @@ "ctxt": 0 }, "value": "puar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -508,7 +492,6 @@ "ctxt": 0 }, "value": "pusr", - "typeAnnotation": null, "optional": false }, "value": null, @@ -538,7 +521,6 @@ "ctxt": 0 }, "value": "dpur", - "typeAnnotation": null, "optional": false }, "value": null, @@ -568,7 +550,6 @@ "ctxt": 0 }, "value": "dpisr", - "typeAnnotation": null, "optional": false }, "value": null, @@ -598,7 +579,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -628,7 +608,6 @@ "ctxt": 0 }, "value": "declare", - "typeAnnotation": null, "optional": false }, "value": null, diff --git a/ecmascript/parser/tests/typescript/class/properties/input.ts.json b/ecmascript/parser/tests/typescript/class/properties/input.ts.json index 9e2d3a47b9ac..f602b0cad51c 100644 --- a/ecmascript/parser/tests/typescript/class/properties/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/properties/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": true }, "value": null, @@ -102,7 +99,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -148,7 +144,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -202,7 +197,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -232,7 +226,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, diff --git a/ecmascript/parser/tests/typescript/class/property-computed/input.ts.json b/ecmascript/parser/tests/typescript/class/property-computed/input.ts.json index 262d3e6d5c30..30d03a7e458f 100644 --- a/ecmascript/parser/tests/typescript/class/property-computed/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/property-computed/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -60,7 +58,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -115,7 +112,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -126,7 +122,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/class/property-private/input.ts.json b/ecmascript/parser/tests/typescript/class/property-private/input.ts.json index 68462c82359a..f9dd73a6294e 100644 --- a/ecmascript/parser/tests/typescript/class/property-private/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/property-private/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -140,7 +137,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -197,7 +193,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/class/static/input.ts.json b/ecmascript/parser/tests/typescript/class/static/input.ts.json index 7bf5e46c39fd..fdb2f2494287 100644 --- a/ecmascript/parser/tests/typescript/class/static/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/static/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -118,7 +115,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/const/no-initializer/input.ts.json b/ecmascript/parser/tests/typescript/const/no-initializer/input.ts.json index 7091e4d029c7..8f9587bd81b0 100644 --- a/ecmascript/parser/tests/typescript/const/no-initializer/input.ts.json +++ b/ecmascript/parser/tests/typescript/const/no-initializer/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/custom/arrow/complex-tsc/input.ts.json b/ecmascript/parser/tests/typescript/custom/arrow/complex-tsc/input.ts.json index 22ee23066770..e00999075553 100644 --- a/ecmascript/parser/tests/typescript/custom/arrow/complex-tsc/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/arrow/complex-tsc/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "assertEachNode", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -63,7 +63,6 @@ "ctxt": 0 }, "value": "shouldAssert", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -84,7 +83,6 @@ "ctxt": 0 }, "value": "AssertionLevel", - "typeAnnotation": null, "optional": false }, "property": { @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Normal", - "typeAnnotation": null, "optional": false }, "computed": false @@ -120,6 +117,7 @@ "ctxt": 0 }, "value": "nodes", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -149,14 +147,12 @@ "ctxt": 0 }, "value": "Node", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, { "type": "Identifier", @@ -166,6 +162,7 @@ "ctxt": 0 }, "value": "test", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -189,6 +186,7 @@ "ctxt": 0 }, "value": "node", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -211,13 +209,11 @@ "ctxt": 0 }, "value": "Node", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -239,8 +235,7 @@ } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -250,6 +245,7 @@ "ctxt": 0 }, "value": "message", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -266,8 +262,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "body": { @@ -285,7 +280,6 @@ "ctxt": 0 }, "value": "assert", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -315,7 +309,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "right": { @@ -326,7 +319,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -345,7 +337,6 @@ "ctxt": 0 }, "value": "every", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -359,7 +350,6 @@ "ctxt": 0 }, "value": "nodes", - "typeAnnotation": null, "optional": false } }, @@ -373,7 +363,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } } @@ -400,7 +389,6 @@ "ctxt": 0 }, "value": "message", - "typeAnnotation": null, "optional": false }, "right": { @@ -452,7 +440,6 @@ "ctxt": 0 }, "value": "getFunctionName", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -466,7 +453,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } } @@ -567,7 +553,6 @@ "ctxt": 0 }, "value": "assertEachNode", - "typeAnnotation": null, "optional": false } } @@ -603,7 +588,6 @@ "ctxt": 0 }, "value": "noop", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/custom/arrow/complex/input.ts.json b/ecmascript/parser/tests/typescript/custom/arrow/complex/input.ts.json index d2c7588625f7..b83b5d4463bf 100644 --- a/ecmascript/parser/tests/typescript/custom/arrow/complex/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/arrow/complex/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "getTsConfigPropArrayElementValue", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -44,6 +43,7 @@ "ctxt": 0 }, "value": "tsConfigSourceFile", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -74,7 +74,6 @@ "ctxt": 0 }, "value": "TsConfigSourceFile", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -90,8 +89,7 @@ } ] } - }, - "optional": false + } } }, { @@ -110,6 +108,7 @@ "ctxt": 0 }, "value": "propKey", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -126,8 +125,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -146,6 +144,7 @@ "ctxt": 0 }, "value": "elementValue", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -162,8 +161,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -203,7 +201,6 @@ "ctxt": 0 }, "value": "firstDefined", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -224,7 +221,6 @@ "ctxt": 0 }, "value": "getTsConfigPropArray", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -238,7 +234,6 @@ "ctxt": 0 }, "value": "tsConfigSourceFile", - "typeAnnotation": null, "optional": false } }, @@ -252,7 +247,6 @@ "ctxt": 0 }, "value": "propKey", - "typeAnnotation": null, "optional": false } } @@ -278,8 +272,8 @@ "ctxt": 0 }, "value": "property", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -304,7 +298,6 @@ "ctxt": 0 }, "value": "isArrayLiteralExpression", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -325,7 +318,6 @@ "ctxt": 0 }, "value": "property", - "typeAnnotation": null, "optional": false }, "property": { @@ -336,7 +328,6 @@ "ctxt": 0 }, "value": "initializer", - "typeAnnotation": null, "optional": false }, "computed": false @@ -360,7 +351,6 @@ "ctxt": 0 }, "value": "find", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -388,7 +378,6 @@ "ctxt": 0 }, "value": "property", - "typeAnnotation": null, "optional": false }, "property": { @@ -399,7 +388,6 @@ "ctxt": 0 }, "value": "initializer", - "typeAnnotation": null, "optional": false }, "computed": false @@ -412,7 +400,6 @@ "ctxt": 0 }, "value": "elements", - "typeAnnotation": null, "optional": false }, "computed": false @@ -436,8 +423,8 @@ "ctxt": 0 }, "value": "element", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -463,7 +450,6 @@ "ctxt": 0 }, "value": "isStringLiteral", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -477,7 +463,6 @@ "ctxt": 0 }, "value": "element", - "typeAnnotation": null, "optional": false } } @@ -507,7 +492,6 @@ "ctxt": 0 }, "value": "element", - "typeAnnotation": null, "optional": false }, "property": { @@ -518,7 +502,6 @@ "ctxt": 0 }, "value": "text", - "typeAnnotation": null, "optional": false }, "computed": false @@ -531,7 +514,6 @@ "ctxt": 0 }, "value": "elementValue", - "typeAnnotation": null, "optional": false } } @@ -562,7 +544,6 @@ "ctxt": 0 }, "value": "element", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -587,7 +568,6 @@ "ctxt": 0 }, "value": "StringLiteral", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -608,7 +588,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -657,7 +636,6 @@ "ctxt": 0 }, "value": "StringLiteral", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/custom/const-enum/input.ts.json b/ecmascript/parser/tests/typescript/custom/const-enum/input.ts.json index 52d3c30549c7..5a9943213ff5 100644 --- a/ecmascript/parser/tests/typescript/custom/const-enum/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/const-enum/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -82,7 +79,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null diff --git a/ecmascript/parser/tests/typescript/custom/default-followed-by-type/arrow/input.ts.json b/ecmascript/parser/tests/typescript/custom/default-followed-by-type/arrow/input.ts.json index a63215e3d50d..4d8256281200 100644 --- a/ecmascript/parser/tests/typescript/custom/default-followed-by-type/arrow/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/default-followed-by-type/arrow/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -57,6 +57,7 @@ "ctxt": 0 }, "value": "greeting", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -73,8 +74,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "right": { "type": "StringLiteral", @@ -100,6 +100,7 @@ "ctxt": 0 }, "value": "target", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -116,8 +117,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -151,7 +151,6 @@ "ctxt": 0 }, "value": "greeting", - "typeAnnotation": null, "optional": false }, { @@ -162,7 +161,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false } ], diff --git a/ecmascript/parser/tests/typescript/custom/default-followed-by-type/function/input.ts.json b/ecmascript/parser/tests/typescript/custom/default-followed-by-type/function/input.ts.json index b486e1586580..719a0d92f149 100644 --- a/ecmascript/parser/tests/typescript/custom/default-followed-by-type/function/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/default-followed-by-type/function/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -44,6 +43,7 @@ "ctxt": 0 }, "value": "greeting", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,8 +60,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "right": { "type": "StringLiteral", @@ -96,6 +95,7 @@ "ctxt": 0 }, "value": "target", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -112,8 +112,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -154,7 +153,6 @@ "ctxt": 0 }, "value": "greeting", - "typeAnnotation": null, "optional": false }, { @@ -165,7 +163,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false } ], diff --git a/ecmascript/parser/tests/typescript/custom/dynamic-import-expr-ctx/input.ts.json b/ecmascript/parser/tests/typescript/custom/dynamic-import-expr-ctx/input.ts.json index 8c28f74b3ccf..f36426996478 100644 --- a/ecmascript/parser/tests/typescript/custom/dynamic-import-expr-ctx/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/dynamic-import-expr-ctx/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -63,7 +63,6 @@ "ctxt": 0 }, "value": "import", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -95,7 +94,6 @@ "ctxt": 0 }, "value": "from", - "typeAnnotation": null, "optional": false }, "computed": false @@ -117,7 +115,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -172,7 +169,6 @@ "ctxt": 0 }, "value": "import", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -204,7 +200,6 @@ "ctxt": 0 }, "value": "from", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/custom/dynamic-import-top-level/input.ts.json b/ecmascript/parser/tests/typescript/custom/dynamic-import-top-level/input.ts.json index dd72c37c05b1..a3e2f291e066 100644 --- a/ecmascript/parser/tests/typescript/custom/dynamic-import-top-level/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/dynamic-import-top-level/input.ts.json @@ -42,7 +42,6 @@ "ctxt": 0 }, "value": "import", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -74,7 +73,6 @@ "ctxt": 0 }, "value": "from", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/custom/import-meta-expr-ctx/input.ts.json b/ecmascript/parser/tests/typescript/custom/import-meta-expr-ctx/input.ts.json index b45e14701546..c4335a306bef 100644 --- a/ecmascript/parser/tests/typescript/custom/import-meta-expr-ctx/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/import-meta-expr-ctx/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -51,7 +51,6 @@ "ctxt": 0 }, "value": "import", - "typeAnnotation": null, "optional": false }, "property": { @@ -62,7 +61,6 @@ "ctxt": 0 }, "value": "meta", - "typeAnnotation": null, "optional": false } }, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "someProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -93,7 +90,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -136,7 +132,6 @@ "ctxt": 0 }, "value": "import", - "typeAnnotation": null, "optional": false }, "property": { @@ -147,7 +142,6 @@ "ctxt": 0 }, "value": "meta", - "typeAnnotation": null, "optional": false } }, @@ -159,7 +153,6 @@ "ctxt": 0 }, "value": "someProp", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/custom/import-meta-top-ctx/input.ts.json b/ecmascript/parser/tests/typescript/custom/import-meta-top-ctx/input.ts.json index 805d9157a1b2..9c7eceda0b60 100644 --- a/ecmascript/parser/tests/typescript/custom/import-meta-top-ctx/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/import-meta-top-ctx/input.ts.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "import", - "typeAnnotation": null, "optional": false }, "property": { @@ -41,7 +40,6 @@ "ctxt": 0 }, "value": "meta", - "typeAnnotation": null, "optional": false } }, @@ -53,7 +51,6 @@ "ctxt": 0 }, "value": "someProp", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/custom/import-type/typeof/as/input.ts.json b/ecmascript/parser/tests/typescript/custom/import-type/typeof/as/input.ts.json index 45fa11f72afc..849ae55de7f6 100644 --- a/ecmascript/parser/tests/typescript/custom/import-type/typeof/as/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/import-type/typeof/as/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "tty", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -56,7 +56,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/custom/import-type/typeof/simple/input.ts.json b/ecmascript/parser/tests/typescript/custom/import-type/typeof/simple/input.ts.json index f0e715a02803..91cd32a0427f 100644 --- a/ecmascript/parser/tests/typescript/custom/import-type/typeof/simple/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/import-type/typeof/simple/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -70,8 +71,7 @@ "typeArguments": null } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/custom/issue-196-01/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-196-01/input.ts.json index 4307dbea16d0..6abd9c5b08c4 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-196-01/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-196-01/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "Link", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -57,7 +56,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -99,7 +97,6 @@ "ctxt": 0 }, "value": "text", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/custom/issue-196-02/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-196-02/input.ts.json index 5748488df346..78e5a05e473c 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-196-02/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-196-02/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "Link", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "text", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "Link", - "typeAnnotation": null, "optional": false }, "exported": null diff --git a/ecmascript/parser/tests/typescript/custom/issue-236/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-236/input.ts.json index 353460502e83..338f0844b1ce 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-236/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-236/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "DirectiveIserviceIdPrefixController", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -44,6 +43,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,8 +60,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -80,6 +79,7 @@ "ctxt": 0 }, "value": "$scope", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,7 +104,6 @@ "ctxt": 0 }, "value": "angular", - "typeAnnotation": null, "optional": false }, "right": { @@ -115,14 +114,12 @@ "ctxt": 0 }, "value": "IScope", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } }, { @@ -141,6 +138,7 @@ "ctxt": 0 }, "value": "$attrs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -165,7 +163,6 @@ "ctxt": 0 }, "value": "angular", - "typeAnnotation": null, "optional": false }, "right": { @@ -176,14 +173,12 @@ "ctxt": 0 }, "value": "IAttributes", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } } ], @@ -239,7 +234,6 @@ "ctxt": 0 }, "value": "$scope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -252,7 +246,6 @@ "ctxt": 0 }, "value": "$scope", - "typeAnnotation": null, "optional": false } } @@ -295,7 +288,6 @@ "ctxt": 0 }, "value": "$attrs", - "typeAnnotation": null, "optional": false }, "computed": false @@ -308,7 +300,6 @@ "ctxt": 0 }, "value": "$attrs", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/custom/issue-259/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-259/input.ts.json index b3fdba053beb..009b5db4edfd 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-259/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-259/input.ts.json @@ -35,7 +35,6 @@ "ctxt": 0 }, "value": "router", - "typeAnnotation": null, "optional": false }, "property": { @@ -46,7 +45,6 @@ "ctxt": 0 }, "value": "on", - "typeAnnotation": null, "optional": false }, "computed": false @@ -102,8 +100,8 @@ "ctxt": 0 }, "value": "routerTransitionsPending", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", diff --git a/ecmascript/parser/tests/typescript/custom/issue-327-1/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-327-1/input.ts.json index dbcb473894df..9d5b1db34acc 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-327-1/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-327-1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -83,7 +83,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -94,7 +93,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -135,7 +133,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -146,7 +143,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -159,7 +155,6 @@ "ctxt": 0 }, "value": "bas", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/custom/issue-327-2/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-327-2/input.ts.json index 97443dd7dc47..a0d741959119 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-327-2/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-327-2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -83,7 +83,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -94,7 +93,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -135,7 +133,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -146,7 +143,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -159,7 +155,6 @@ "ctxt": 0 }, "value": "bas", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/custom/issue-338/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-338/input.ts.json index 211fa0adec4c..88def0c943ce 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-338/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-338/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "bas", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -69,7 +68,6 @@ "ctxt": 0 }, "value": "beep", - "typeAnnotation": null, "optional": false }, "right": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "delete", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/custom/issue-370/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-370/input.ts.json index 8ba9f81e01c7..04cb68199a0a 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-370/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-370/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,13 +54,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -77,8 +76,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -88,8 +87,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": true + "optional": true, + "typeAnnotation": null } ], "body": { diff --git a/ecmascript/parser/tests/typescript/custom/issue-374/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-374/input.ts.json index 0763e71be7e7..b8fde01831ad 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-374/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-374/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "someValue", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -93,6 +93,7 @@ "ctxt": 0 }, "value": "strLength", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -109,8 +110,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -141,7 +141,6 @@ "ctxt": 0 }, "value": "someValue", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -163,7 +162,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/custom/issue-401-const-assertion-array-ts/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-401-const-assertion-array-ts/input.ts.json index 00b2447f39f2..0231b48ace63 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-401-const-assertion-array-ts/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-401-const-assertion-array-ts/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsConstAssertion", diff --git a/ecmascript/parser/tests/typescript/custom/issue-401-const-assertion-array/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-401-const-assertion-array/input.ts.json index 73aa1b5f3196..04fe3f347234 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-401-const-assertion-array/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-401-const-assertion-array/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsConstAssertion", diff --git a/ecmascript/parser/tests/typescript/custom/issue-401-const-assertion-literal-ts/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-401-const-assertion-literal-ts/input.ts.json index cbb0ae14b8ed..a2f63557d20f 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-401-const-assertion-literal-ts/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-401-const-assertion-literal-ts/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsConstAssertion", diff --git a/ecmascript/parser/tests/typescript/custom/issue-401-const-assertion-literal/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-401-const-assertion-literal/input.ts.json index 26b73b6ac9fe..7bca35be77d6 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-401-const-assertion-literal/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-401-const-assertion-literal/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsConstAssertion", diff --git a/ecmascript/parser/tests/typescript/custom/issue-401-const-assertion-object-ts/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-401-const-assertion-object-ts/input.ts.json index f53eb0f01c9c..036e9fbee33f 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-401-const-assertion-object-ts/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-401-const-assertion-object-ts/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsConstAssertion", @@ -59,7 +59,6 @@ "ctxt": 0 }, "value": "text", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/custom/issue-401-const-assertion-object/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-401-const-assertion-object/input.ts.json index 45439c9575eb..b1942620a0ab 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-401-const-assertion-object/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-401-const-assertion-object/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsConstAssertion", @@ -59,7 +59,6 @@ "ctxt": 0 }, "value": "text", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/custom/issue-432-readonly-array/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-432-readonly-array/input.ts.json index 5c80c5e663d2..9180bf66a958 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-432-readonly-array/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-432-readonly-array/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -64,8 +65,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", diff --git a/ecmascript/parser/tests/typescript/custom/issue-433-1/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-433-1/input.ts.json index cda059d0fe85..571be45da081 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-433-1/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-433-1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -64,8 +64,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -76,7 +76,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/custom/issue-433-2/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-433-2/input.ts.json index 7fbf3221b717..577a47fd5706 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-433-2/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-433-2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "result2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -64,6 +64,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,8 +81,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -92,7 +92,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/custom/issue-461/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-461/input.ts.json index eaa3a3c59f57..33f5f52ba965 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-461/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-461/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -118,8 +118,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -148,7 +148,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/custom/issue-496/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-496/input.ts.json index cede5aba3c77..840470097b06 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-496/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-496/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "SomethingWithId", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "variant", - "typeAnnotation": null, "optional": false }, "value": null, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -115,6 +112,7 @@ "ctxt": 0 }, "value": "variant", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -131,8 +129,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -182,7 +179,6 @@ "ctxt": 0 }, "value": "variant", - "typeAnnotation": null, "optional": false }, "computed": false @@ -195,7 +191,6 @@ "ctxt": 0 }, "value": "variant", - "typeAnnotation": null, "optional": false } } @@ -220,7 +215,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "function": { @@ -276,7 +270,6 @@ "ctxt": 0 }, "value": "variant", - "typeAnnotation": null, "optional": false }, "computed": false @@ -289,7 +282,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/custom/issue-535/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-535/input.ts.json index 01da167ab40b..92a404046edd 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-535/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-535/input.ts.json @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "Test", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/custom/issue-538/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-538/input.ts.json index 863c47545fcc..790862393403 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-538/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-538/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "declare": true, diff --git a/ecmascript/parser/tests/typescript/custom/issue-612-async-generator/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-612-async-generator/input.ts.json index abe8639b036d..606eb8f85348 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-612-async-generator/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-612-async-generator/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "agf", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/custom/issue-623/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-623/input.ts.json index 72292cc739bd..7355a748d79f 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-623/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-623/input.ts.json @@ -54,7 +54,6 @@ "ctxt": 0 }, "value": "packageName", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/custom/issue-709-2/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-709-2/input.ts.json index 6edece265b12..d9c97a1d410b 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-709-2/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-709-2/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "EventInit", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -77,8 +75,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": true, diff --git a/ecmascript/parser/tests/typescript/custom/issue-709-3/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-709-3/input.ts.json index f56129b5597b..3ce88e4cccd3 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-709-3/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-709-3/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "EventInit", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -84,7 +82,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "value": null @@ -122,7 +119,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -181,7 +177,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/custom/issue-709/input.d.ts.json b/ecmascript/parser/tests/typescript/custom/issue-709/input.d.ts.json index cc6091e69610..3d2391e9611f 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-709/input.d.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-709/input.d.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "__event", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "EventInit", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -112,7 +109,6 @@ "ctxt": 0 }, "value": "bubbles", - "typeAnnotation": null, "optional": false }, "value": null @@ -132,7 +128,6 @@ "ctxt": 0 }, "value": "cancelable", - "typeAnnotation": null, "optional": false }, "value": null @@ -152,7 +147,6 @@ "ctxt": 0 }, "value": "composed", - "typeAnnotation": null, "optional": false }, "value": null @@ -190,7 +184,6 @@ "ctxt": 0 }, "value": "bubbles", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -251,7 +244,6 @@ "ctxt": 0 }, "value": "cancelable", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -312,7 +304,6 @@ "ctxt": 0 }, "value": "composed", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/custom/issue-716/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-716/input.ts.json index 908cee45c212..a1a94c52f9e1 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-716/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-716/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "params": [], @@ -143,7 +140,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "body": { @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -195,7 +190,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -221,7 +215,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -247,7 +240,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -273,7 +265,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "body": { @@ -299,7 +290,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -325,7 +315,6 @@ "ctxt": 0 }, "value": "asdf", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -351,7 +340,6 @@ "ctxt": 0 }, "value": "asdf", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -385,8 +373,8 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -449,7 +437,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } } @@ -484,7 +471,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/custom/issue-717/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-717/input.ts.json index 774e9fe02891..cb8a236b7d28 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-717/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-717/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "functionFlags", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "async", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -101,7 +100,6 @@ "ctxt": 0 }, "value": "async", - "typeAnnotation": null, "optional": false }, "consequent": { diff --git a/ecmascript/parser/tests/typescript/custom/issue-720/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-720/input.ts.json index 337d7218930e..a91a685f1b37 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-720/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-720/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "main", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/custom/ternary-paren/input.ts.json b/ecmascript/parser/tests/typescript/custom/ternary-paren/input.ts.json index 42e514e878ed..4fd48036f7b0 100644 --- a/ecmascript/parser/tests/typescript/custom/ternary-paren/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/ternary-paren/input.ts.json @@ -35,7 +35,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "consequent": { diff --git a/ecmascript/parser/tests/typescript/custom/ternary/input.ts.json b/ecmascript/parser/tests/typescript/custom/ternary/input.ts.json index 9dc0e05baa2f..1ad8f3050374 100644 --- a/ecmascript/parser/tests/typescript/custom/ternary/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/ternary/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "consequent": { diff --git a/ecmascript/parser/tests/typescript/custom/tsx-issue-573/input.tsx.json b/ecmascript/parser/tests/typescript/custom/tsx-issue-573/input.tsx.json index 955880aa3b1e..77c8f789b7a6 100644 --- a/ecmascript/parser/tests/typescript/custom/tsx-issue-573/input.tsx.json +++ b/ecmascript/parser/tests/typescript/custom/tsx-issue-573/input.tsx.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,6 +50,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -72,13 +73,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -89,7 +88,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -117,7 +115,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { diff --git a/ecmascript/parser/tests/typescript/custom/tsx-unary-paren/input.tsx.json b/ecmascript/parser/tests/typescript/custom/tsx-unary-paren/input.tsx.json index d51e913a6fde..600b1d8c797f 100644 --- a/ecmascript/parser/tests/typescript/custom/tsx-unary-paren/input.tsx.json +++ b/ecmascript/parser/tests/typescript/custom/tsx-unary-paren/input.tsx.json @@ -37,7 +37,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -82,7 +81,6 @@ "ctxt": 0 }, "value": "isLoading", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -109,7 +107,6 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false }, "span": { @@ -148,7 +145,6 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false } } @@ -178,7 +174,6 @@ "ctxt": 0 }, "value": "h3", - "typeAnnotation": null, "optional": false }, "span": { @@ -217,7 +212,6 @@ "ctxt": 0 }, "value": "h3", - "typeAnnotation": null, "optional": false } } @@ -251,7 +245,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/custom/tsx-unary/input.tsx.json b/ecmascript/parser/tests/typescript/custom/tsx-unary/input.tsx.json index 26887362173f..aa1c2387adae 100644 --- a/ecmascript/parser/tests/typescript/custom/tsx-unary/input.tsx.json +++ b/ecmascript/parser/tests/typescript/custom/tsx-unary/input.tsx.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false } } @@ -61,7 +60,6 @@ "ctxt": 0 }, "value": "App", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -105,8 +103,8 @@ "ctxt": 0 }, "value": "isLoading", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -152,7 +150,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -192,7 +189,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "span": { @@ -231,7 +227,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false } } @@ -268,7 +263,6 @@ "ctxt": 0 }, "value": "isLoading", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -288,7 +282,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -327,7 +320,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -349,7 +341,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -388,7 +379,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -421,7 +411,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -450,7 +439,6 @@ "ctxt": 0 }, "value": "App", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/custom/type-only/export/aliased/input.ts.json b/ecmascript/parser/tests/typescript/custom/type-only/export/aliased/input.ts.json index 9b93f2f9ada9..3d4b410d2c07 100644 --- a/ecmascript/parser/tests/typescript/custom/type-only/export/aliased/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/type-only/export/aliased/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "exported": { @@ -40,7 +39,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/custom/type-only/export/specific/input.ts.json b/ecmascript/parser/tests/typescript/custom/type-only/export/specific/input.ts.json index ab1946f46568..b4e2ef6eac0b 100644 --- a/ecmascript/parser/tests/typescript/custom/type-only/export/specific/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/type-only/export/specific/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "exported": null diff --git a/ecmascript/parser/tests/typescript/custom/type-only/import/aliased/input.ts.json b/ecmascript/parser/tests/typescript/custom/type-only/import/aliased/input.ts.json index d8ef8954b8fe..fd6e8040a5d8 100644 --- a/ecmascript/parser/tests/typescript/custom/type-only/import/aliased/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/type-only/import/aliased/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "imported": { @@ -40,7 +39,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/custom/type-only/import/default/input.ts.json b/ecmascript/parser/tests/typescript/custom/type-only/import/default/input.ts.json index b3ad69a15bc5..b7afa8d1ca04 100644 --- a/ecmascript/parser/tests/typescript/custom/type-only/import/default/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/type-only/import/default/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } } @@ -74,7 +73,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/custom/type-only/import/specific/input.ts.json b/ecmascript/parser/tests/typescript/custom/type-only/import/specific/input.ts.json index e711723a741e..63c4c4681c89 100644 --- a/ecmascript/parser/tests/typescript/custom/type-only/import/specific/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/type-only/import/specific/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "imported": null diff --git a/ecmascript/parser/tests/typescript/custom/yield-object-paren/input.ts.json b/ecmascript/parser/tests/typescript/custom/yield-object-paren/input.ts.json index 96be6bd4c0e7..40f96bf4575a 100644 --- a/ecmascript/parser/tests/typescript/custom/yield-object-paren/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/yield-object-paren/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "gen", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/custom/yield-object/input.ts.json b/ecmascript/parser/tests/typescript/custom/yield-object/input.ts.json index 4efa4eb1c1dd..ccead3bf047f 100644 --- a/ecmascript/parser/tests/typescript/custom/yield-object/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/yield-object/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "gen", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/declare/const/input.ts.json b/ecmascript/parser/tests/typescript/declare/const/input.ts.json index 7d535890efe0..f2966d4cb6ca 100644 --- a/ecmascript/parser/tests/typescript/declare/const/input.ts.json +++ b/ecmascript/parser/tests/typescript/declare/const/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -68,6 +68,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,8 +85,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/declare/destructure/input.ts.json b/ecmascript/parser/tests/typescript/declare/destructure/input.ts.json index e4b413ea32eb..1185a286ecf1 100644 --- a/ecmascript/parser/tests/typescript/declare/destructure/input.ts.json +++ b/ecmascript/parser/tests/typescript/declare/destructure/input.ts.json @@ -46,7 +46,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -66,7 +65,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -146,7 +143,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/declare/interface/input.ts.json b/ecmascript/parser/tests/typescript/declare/interface/input.ts.json index 5796714f61d6..097dd98616e5 100644 --- a/ecmascript/parser/tests/typescript/declare/interface/input.ts.json +++ b/ecmascript/parser/tests/typescript/declare/interface/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": true, diff --git a/ecmascript/parser/tests/typescript/declare/let/input.ts.json b/ecmascript/parser/tests/typescript/declare/let/input.ts.json index 6df346eb2ef9..6e435c790a4c 100644 --- a/ecmascript/parser/tests/typescript/declare/let/input.ts.json +++ b/ecmascript/parser/tests/typescript/declare/let/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/declare/var/input.ts.json b/ecmascript/parser/tests/typescript/declare/var/input.ts.json index 9b382d86fbe4..e9956dacbd62 100644 --- a/ecmascript/parser/tests/typescript/declare/var/input.ts.json +++ b/ecmascript/parser/tests/typescript/declare/var/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -64,6 +64,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,8 +81,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/decorators/parameter/input.ts.json b/ecmascript/parser/tests/typescript/decorators/parameter/input.ts.json index 64565de0b5a8..dadb27eef9ad 100644 --- a/ecmascript/parser/tests/typescript/decorators/parameter/input.ts.json +++ b/ecmascript/parser/tests/typescript/decorators/parameter/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Test", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false } } @@ -82,8 +79,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false } } @@ -124,8 +120,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -151,7 +147,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false } } @@ -176,8 +171,8 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -210,7 +205,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -238,7 +232,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false } } @@ -251,8 +244,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -278,7 +271,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false } }, @@ -297,7 +289,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false } } @@ -322,8 +313,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } diff --git a/ecmascript/parser/tests/typescript/decorators/type-arguments/input.ts.json b/ecmascript/parser/tests/typescript/decorators/type-arguments/input.ts.json index 9654c8592aef..963992e69d45 100644 --- a/ecmascript/parser/tests/typescript/decorators/type-arguments/input.ts.json +++ b/ecmascript/parser/tests/typescript/decorators/type-arguments/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Test", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "decorator", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/deno-8925/case1/input.ts.json b/ecmascript/parser/tests/typescript/deno-8925/case1/input.ts.json index b2b0f8359c9c..4b4320ce7eee 100644 --- a/ecmascript/parser/tests/typescript/deno-8925/case1/input.ts.json +++ b/ecmascript/parser/tests/typescript/deno-8925/case1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "𝒫", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -76,7 +76,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -87,7 +86,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -103,7 +101,6 @@ "ctxt": 0 }, "value": "𝒫", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/deno-8925/case2/input.ts.json b/ecmascript/parser/tests/typescript/deno-8925/case2/input.ts.json index ee1db9ce416b..1fb7daca4516 100644 --- a/ecmascript/parser/tests/typescript/deno-8925/case2/input.ts.json +++ b/ecmascript/parser/tests/typescript/deno-8925/case2/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "𝒫", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -84,7 +84,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -95,7 +94,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -111,7 +109,6 @@ "ctxt": 0 }, "value": "𝒫", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/deno-discord/2021-02-17/case1/input.tsx.json b/ecmascript/parser/tests/typescript/deno-discord/2021-02-17/case1/input.tsx.json index e7b0eceb686a..f1bc1367879e 100644 --- a/ecmascript/parser/tests/typescript/deno-discord/2021-02-17/case1/input.tsx.json +++ b/ecmascript/parser/tests/typescript/deno-discord/2021-02-17/case1/input.tsx.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -73,6 +72,7 @@ "ctxt": 0 }, "value": "path", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -89,8 +89,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -121,8 +120,8 @@ "ctxt": 0 }, "value": "middleware", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -153,7 +152,6 @@ "ctxt": 0 }, "value": "RouterMiddleware", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -179,7 +177,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -199,7 +196,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -244,7 +240,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -262,7 +257,6 @@ "ctxt": 0 }, "value": "RouteParams", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -282,7 +276,6 @@ "ctxt": 0 }, "value": "RP", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -303,7 +296,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -321,7 +313,6 @@ "ctxt": 0 }, "value": "State", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -341,7 +332,6 @@ "ctxt": 0 }, "value": "RS", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -371,7 +361,6 @@ "ctxt": 0 }, "value": "Router", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -404,7 +393,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -424,7 +412,6 @@ "ctxt": 0 }, "value": "RP", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -444,7 +431,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -479,7 +465,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -499,7 +484,6 @@ "ctxt": 0 }, "value": "RP", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -530,7 +514,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -550,7 +533,6 @@ "ctxt": 0 }, "value": "RS", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -570,7 +552,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -605,7 +586,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -625,7 +605,6 @@ "ctxt": 0 }, "value": "RS", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/deno-discord/2021-02-17/case2/input.tsx.json b/ecmascript/parser/tests/typescript/deno-discord/2021-02-17/case2/input.tsx.json index cfb2ef1a0548..0c8731465380 100644 --- a/ecmascript/parser/tests/typescript/deno-discord/2021-02-17/case2/input.tsx.json +++ b/ecmascript/parser/tests/typescript/deno-discord/2021-02-17/case2/input.tsx.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "delete", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -79,8 +78,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -99,6 +97,7 @@ "ctxt": 0 }, "value": "path", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -115,8 +114,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -147,8 +145,8 @@ "ctxt": 0 }, "value": "middleware", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -179,7 +177,6 @@ "ctxt": 0 }, "value": "RouterMiddleware", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -205,7 +202,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -225,7 +221,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -278,7 +273,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -296,7 +290,6 @@ "ctxt": 0 }, "value": "RouteParams", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -316,7 +309,6 @@ "ctxt": 0 }, "value": "RP", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -337,7 +329,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -355,7 +346,6 @@ "ctxt": 0 }, "value": "State", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -375,7 +365,6 @@ "ctxt": 0 }, "value": "RS", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -405,7 +394,6 @@ "ctxt": 0 }, "value": "Router", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -438,7 +426,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -458,7 +445,6 @@ "ctxt": 0 }, "value": "RP", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -478,7 +464,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -513,7 +498,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -533,7 +517,6 @@ "ctxt": 0 }, "value": "RP", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -564,7 +547,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -584,7 +566,6 @@ "ctxt": 0 }, "value": "RS", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -604,7 +585,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -639,7 +619,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -659,7 +638,6 @@ "ctxt": 0 }, "value": "RS", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/enum/const/input.ts.json b/ecmascript/parser/tests/typescript/enum/const/input.ts.json index e2d7c97d5552..b2b8bb0caad9 100644 --- a/ecmascript/parser/tests/typescript/enum/const/input.ts.json +++ b/ecmascript/parser/tests/typescript/enum/const/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [] diff --git a/ecmascript/parser/tests/typescript/enum/declare-const/input.ts.json b/ecmascript/parser/tests/typescript/enum/declare-const/input.ts.json index 8e3feed96a9b..223bdfd2e70d 100644 --- a/ecmascript/parser/tests/typescript/enum/declare-const/input.ts.json +++ b/ecmascript/parser/tests/typescript/enum/declare-const/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [] diff --git a/ecmascript/parser/tests/typescript/enum/declare/input.ts.json b/ecmascript/parser/tests/typescript/enum/declare/input.ts.json index a5b872620b15..de89af7d2da5 100644 --- a/ecmascript/parser/tests/typescript/enum/declare/input.ts.json +++ b/ecmascript/parser/tests/typescript/enum/declare/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [] diff --git a/ecmascript/parser/tests/typescript/enum/export-const/input.ts.json b/ecmascript/parser/tests/typescript/enum/export-const/input.ts.json index 76e2081e804d..5cfcc2208d2e 100644 --- a/ecmascript/parser/tests/typescript/enum/export-const/input.ts.json +++ b/ecmascript/parser/tests/typescript/enum/export-const/input.ts.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [] diff --git a/ecmascript/parser/tests/typescript/enum/export-declare-const/input.ts.json b/ecmascript/parser/tests/typescript/enum/export-declare-const/input.ts.json index e6ec01fca934..7838ece7d85b 100644 --- a/ecmascript/parser/tests/typescript/enum/export-declare-const/input.ts.json +++ b/ecmascript/parser/tests/typescript/enum/export-declare-const/input.ts.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [] diff --git a/ecmascript/parser/tests/typescript/enum/export/input.ts.json b/ecmascript/parser/tests/typescript/enum/export/input.ts.json index e75a9d6a5def..c16a020c7d09 100644 --- a/ecmascript/parser/tests/typescript/enum/export/input.ts.json +++ b/ecmascript/parser/tests/typescript/enum/export/input.ts.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [] diff --git a/ecmascript/parser/tests/typescript/enum/members-reserved-words/input.ts.json b/ecmascript/parser/tests/typescript/enum/members-reserved-words/input.ts.json index 8d3bd4a3adfd..467b5b4206bf 100644 --- a/ecmascript/parser/tests/typescript/enum/members-reserved-words/input.ts.json +++ b/ecmascript/parser/tests/typescript/enum/members-reserved-words/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "const", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "init": null diff --git a/ecmascript/parser/tests/typescript/enum/members-strings/input.ts.json b/ecmascript/parser/tests/typescript/enum/members-strings/input.ts.json index 8825245d26b2..868dbbd4568d 100644 --- a/ecmascript/parser/tests/typescript/enum/members-strings/input.ts.json +++ b/ecmascript/parser/tests/typescript/enum/members-strings/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ diff --git a/ecmascript/parser/tests/typescript/enum/members-trailing-comma-with-initializer/input.ts.json b/ecmascript/parser/tests/typescript/enum/members-trailing-comma-with-initializer/input.ts.json index 82cb5b40f10a..baf60cb74eb0 100644 --- a/ecmascript/parser/tests/typescript/enum/members-trailing-comma-with-initializer/input.ts.json +++ b/ecmascript/parser/tests/typescript/enum/members-trailing-comma-with-initializer/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": { diff --git a/ecmascript/parser/tests/typescript/enum/members-trailing-comma/input.ts.json b/ecmascript/parser/tests/typescript/enum/members-trailing-comma/input.ts.json index 227f8632e2a7..6ce4f9473ec0 100644 --- a/ecmascript/parser/tests/typescript/enum/members-trailing-comma/input.ts.json +++ b/ecmascript/parser/tests/typescript/enum/members-trailing-comma/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null diff --git a/ecmascript/parser/tests/typescript/enum/members/input.ts.json b/ecmascript/parser/tests/typescript/enum/members/input.ts.json index b3da7ca70cf9..c04cac3b5307 100644 --- a/ecmascript/parser/tests/typescript/enum/members/input.ts.json +++ b/ecmascript/parser/tests/typescript/enum/members/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": { diff --git a/ecmascript/parser/tests/typescript/eof-issue/input.tsx.json b/ecmascript/parser/tests/typescript/eof-issue/input.tsx.json index 20413cd65f37..584d31676b88 100644 --- a/ecmascript/parser/tests/typescript/eof-issue/input.tsx.json +++ b/ecmascript/parser/tests/typescript/eof-issue/input.tsx.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "Divider", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -58,7 +58,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/es2019/from-entries/input.ts.json b/ecmascript/parser/tests/typescript/es2019/from-entries/input.ts.json index d7057a6d91e3..84ede35f3ec5 100644 --- a/ecmascript/parser/tests/typescript/es2019/from-entries/input.ts.json +++ b/ecmascript/parser/tests/typescript/es2019/from-entries/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "ObjectConstructor", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "fromEntries", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -65,6 +63,7 @@ "ctxt": 0 }, "value": "entries", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -87,7 +86,6 @@ "ctxt": 0 }, "value": "Iterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -137,7 +135,6 @@ "ctxt": 0 }, "value": "PropertyKey", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -166,7 +163,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -178,8 +174,7 @@ ] } } - }, - "optional": false + } } ], "typeAnn": { @@ -212,7 +207,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -230,7 +224,6 @@ "ctxt": 0 }, "value": "PropertyKey", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -254,7 +247,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -284,7 +276,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -317,7 +308,6 @@ "ctxt": 0 }, "value": "fromEntries", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -331,6 +321,7 @@ "ctxt": 0 }, "value": "entries", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -353,7 +344,6 @@ "ctxt": 0 }, "value": "Iterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -393,8 +383,7 @@ ] } } - }, - "optional": false + } } ], "typeAnn": { diff --git a/ecmascript/parser/tests/typescript/export-default-interface/index.ts.json b/ecmascript/parser/tests/typescript/export-default-interface/index.ts.json index 925a3903528d..35931db4df0d 100644 --- a/ecmascript/parser/tests/typescript/export-default-interface/index.ts.json +++ b/ecmascript/parser/tests/typescript/export-default-interface/index.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/export/as-namespace/input.ts.json b/ecmascript/parser/tests/typescript/export/as-namespace/input.ts.json index 1f4115295655..5005a0c32ee2 100644 --- a/ecmascript/parser/tests/typescript/export/as-namespace/input.ts.json +++ b/ecmascript/parser/tests/typescript/export/as-namespace/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/export/declare/input.ts.json b/ecmascript/parser/tests/typescript/export/declare/input.ts.json index 5f08829c060c..9e4c5120283f 100644 --- a/ecmascript/parser/tests/typescript/export/declare/input.ts.json +++ b/ecmascript/parser/tests/typescript/export/declare/input.ts.json @@ -38,6 +38,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,8 +55,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,7 +80,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -131,7 +130,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -171,7 +169,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -211,7 +208,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -250,7 +246,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -288,7 +283,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/export/equals/input.ts.json b/ecmascript/parser/tests/typescript/export/equals/input.ts.json index 4d714f4186cd..18a81c38ad28 100644 --- a/ecmascript/parser/tests/typescript/export/equals/input.ts.json +++ b/ecmascript/parser/tests/typescript/export/equals/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/export/namespace-from/input.ts.json b/ecmascript/parser/tests/typescript/export/namespace-from/input.ts.json index fbf4f2223452..6916374dd389 100644 --- a/ecmascript/parser/tests/typescript/export/namespace-from/input.ts.json +++ b/ecmascript/parser/tests/typescript/export/namespace-from/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/export/nested-same-name/input.ts.json b/ecmascript/parser/tests/typescript/export/nested-same-name/input.ts.json index 67fc759f73af..fa35c37e78a2 100644 --- a/ecmascript/parser/tests/typescript/export/nested-same-name/input.ts.json +++ b/ecmascript/parser/tests/typescript/export/nested-same-name/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -79,7 +79,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { @@ -122,8 +121,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/function/annotated/input.ts.json b/ecmascript/parser/tests/typescript/function/annotated/input.ts.json index c6973342739f..42c9dc8d298e 100644 --- a/ecmascript/parser/tests/typescript/function/annotated/input.ts.json +++ b/ecmascript/parser/tests/typescript/function/annotated/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } } ], @@ -109,7 +107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -139,7 +136,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/function/anonymous/input.ts.json b/ecmascript/parser/tests/typescript/function/anonymous/input.ts.json index 85af886979cd..7d46699973ca 100644 --- a/ecmascript/parser/tests/typescript/function/anonymous/input.ts.json +++ b/ecmascript/parser/tests/typescript/function/anonymous/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -54,6 +54,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -76,13 +77,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } } ], @@ -126,7 +125,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -156,7 +154,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/function/declare/input.ts.json b/ecmascript/parser/tests/typescript/function/declare/input.ts.json index 24a38a402a9d..21b7bbed9e20 100644 --- a/ecmascript/parser/tests/typescript/function/declare/input.ts.json +++ b/ecmascript/parser/tests/typescript/function/declare/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -126,7 +123,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/function/export-default/input.ts.json b/ecmascript/parser/tests/typescript/function/export-default/input.ts.json index 42718ad092ee..54024bf69186 100644 --- a/ecmascript/parser/tests/typescript/function/export-default/input.ts.json +++ b/ecmascript/parser/tests/typescript/function/export-default/input.ts.json @@ -33,6 +33,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -49,8 +50,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], diff --git a/ecmascript/parser/tests/typescript/function/overloads/input.ts.json b/ecmascript/parser/tests/typescript/function/overloads/input.ts.json index 7e297af9fed5..c95a1db2d132 100644 --- a/ecmascript/parser/tests/typescript/function/overloads/input.ts.json +++ b/ecmascript/parser/tests/typescript/function/overloads/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -44,6 +43,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,8 +60,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -111,7 +110,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -132,6 +130,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -148,8 +147,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/function/predicate-types/input.ts.json b/ecmascript/parser/tests/typescript/function/predicate-types/input.ts.json index 230384c4a040..572508fe9ef2 100644 --- a/ecmascript/parser/tests/typescript/function/predicate-types/input.ts.json +++ b/ecmascript/parser/tests/typescript/function/predicate-types/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -99,7 +98,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -156,6 +154,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -172,8 +171,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -218,7 +216,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -253,7 +250,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -274,6 +270,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -290,8 +287,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -336,7 +332,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -369,7 +364,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -390,6 +384,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -406,8 +401,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -452,7 +446,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null diff --git a/ecmascript/parser/tests/typescript/import-assertions/dynamic-import/expr/input.ts.json b/ecmascript/parser/tests/typescript/import-assertions/dynamic-import/expr/input.ts.json index 1a13cbbbedcd..7b55964d524d 100644 --- a/ecmascript/parser/tests/typescript/import-assertions/dynamic-import/expr/input.ts.json +++ b/ecmascript/parser/tests/typescript/import-assertions/dynamic-import/expr/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "import", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "assert", - "typeAnnotation": null, "optional": false }, "value": { @@ -111,7 +108,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/import-assertions/dynamic-import/top/input.ts.json b/ecmascript/parser/tests/typescript/import-assertions/dynamic-import/top/input.ts.json index e98f55408226..bc8a5dff128a 100644 --- a/ecmascript/parser/tests/typescript/import-assertions/dynamic-import/top/input.ts.json +++ b/ecmascript/parser/tests/typescript/import-assertions/dynamic-import/top/input.ts.json @@ -42,7 +42,6 @@ "ctxt": 0 }, "value": "import", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -83,7 +82,6 @@ "ctxt": 0 }, "value": "assert", - "typeAnnotation": null, "optional": false }, "value": { @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "value": { @@ -139,7 +136,6 @@ "ctxt": 0 }, "value": "then", - "typeAnnotation": null, "optional": false }, "computed": false @@ -163,8 +159,8 @@ "ctxt": 0 }, "value": "lazy", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -189,7 +185,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -200,7 +195,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -216,7 +210,6 @@ "ctxt": 0 }, "value": "lazy", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/import-assertions/export/test1/input.ts.json b/ecmascript/parser/tests/typescript/import-assertions/export/test1/input.ts.json index 8e7fca1ca69d..1c2a750bfd76 100644 --- a/ecmascript/parser/tests/typescript/import-assertions/export/test1/input.ts.json +++ b/ecmascript/parser/tests/typescript/import-assertions/export/test1/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "val", - "typeAnnotation": null, "optional": false }, "exported": null @@ -68,7 +67,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/import-assertions/export/test2/input.tsx.json b/ecmascript/parser/tests/typescript/import-assertions/export/test2/input.tsx.json index 98d31cd55661..3e277bc2cbda 100644 --- a/ecmascript/parser/tests/typescript/import-assertions/export/test2/input.tsx.json +++ b/ecmascript/parser/tests/typescript/import-assertions/export/test2/input.tsx.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "val", - "typeAnnotation": null, "optional": false }, "exported": null @@ -68,7 +67,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/import-assertions/export/test3/input.ts.json b/ecmascript/parser/tests/typescript/import-assertions/export/test3/input.ts.json index 2fd8a9649241..c6d4bad04452 100644 --- a/ecmascript/parser/tests/typescript/import-assertions/export/test3/input.ts.json +++ b/ecmascript/parser/tests/typescript/import-assertions/export/test3/input.ts.json @@ -45,7 +45,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/import-assertions/stmt/test1/input.ts.json b/ecmascript/parser/tests/typescript/import-assertions/stmt/test1/input.ts.json index d1db70a7508b..cb95363bf2d8 100644 --- a/ecmascript/parser/tests/typescript/import-assertions/stmt/test1/input.ts.json +++ b/ecmascript/parser/tests/typescript/import-assertions/stmt/test1/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "json", - "typeAnnotation": null, "optional": false } } @@ -67,7 +66,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/import/equals-require/input.ts.json b/ecmascript/parser/tests/typescript/import/equals-require/input.ts.json index fc96fa1a1ffb..0399e3228e3b 100644 --- a/ecmascript/parser/tests/typescript/import/equals-require/input.ts.json +++ b/ecmascript/parser/tests/typescript/import/equals-require/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "moduleRef": { diff --git a/ecmascript/parser/tests/typescript/import/equals/input.ts.json b/ecmascript/parser/tests/typescript/import/equals/input.ts.json index 26cd1aa4c510..02eba578ecb2 100644 --- a/ecmascript/parser/tests/typescript/import/equals/input.ts.json +++ b/ecmascript/parser/tests/typescript/import/equals/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -36,7 +35,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "right": { @@ -47,7 +45,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/import/export-import-require/input.ts.json b/ecmascript/parser/tests/typescript/import/export-import-require/input.ts.json index cbbf2ccad9de..bd011e844946 100644 --- a/ecmascript/parser/tests/typescript/import/export-import-require/input.ts.json +++ b/ecmascript/parser/tests/typescript/import/export-import-require/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "moduleRef": { diff --git a/ecmascript/parser/tests/typescript/import/export-import/input.ts.json b/ecmascript/parser/tests/typescript/import/export-import/input.ts.json index 47da97b6dd13..0f7afe03aadc 100644 --- a/ecmascript/parser/tests/typescript/import/export-import/input.ts.json +++ b/ecmascript/parser/tests/typescript/import/export-import/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -36,7 +35,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "right": { @@ -47,7 +45,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/import/not-top-level/input.ts.json b/ecmascript/parser/tests/typescript/import/not-top-level/input.ts.json index e50dc5c4de14..e432f9decc89 100644 --- a/ecmascript/parser/tests/typescript/import/not-top-level/input.ts.json +++ b/ecmascript/parser/tests/typescript/import/not-top-level/input.ts.json @@ -60,7 +60,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/interface/call-signature/input.ts.json b/ecmascript/parser/tests/typescript/interface/call-signature/input.ts.json index 86ca31ac453c..71bf3dd7d61e 100644 --- a/ecmascript/parser/tests/typescript/interface/call-signature/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/call-signature/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,6 +50,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -67,8 +67,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { diff --git a/ecmascript/parser/tests/typescript/interface/construct-signature/input.ts.json b/ecmascript/parser/tests/typescript/interface/construct-signature/input.ts.json index 15a1043ba90f..312ff3d3b722 100644 --- a/ecmascript/parser/tests/typescript/interface/construct-signature/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/construct-signature/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,6 +50,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -67,8 +67,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { diff --git a/ecmascript/parser/tests/typescript/interface/export/input.ts.json b/ecmascript/parser/tests/typescript/interface/export/input.ts.json index ab48e5922615..a6f62bffcd68 100644 --- a/ecmascript/parser/tests/typescript/interface/export/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/export/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -67,7 +66,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/interface/extends/input.ts.json b/ecmascript/parser/tests/typescript/interface/extends/input.ts.json index 0d999f4eb17d..25eb6fbf0722 100644 --- a/ecmascript/parser/tests/typescript/interface/extends/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/extends/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "right": { @@ -55,7 +53,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false } }, @@ -82,7 +79,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/interface/generic/input.ts.json b/ecmascript/parser/tests/typescript/interface/generic/input.ts.json index 329b0e41d7f2..eafb1d86a945 100644 --- a/ecmascript/parser/tests/typescript/interface/generic/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/generic/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -84,7 +82,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/interface/index-signature/input.ts.json b/ecmascript/parser/tests/typescript/interface/index-signature/input.ts.json index 60e342c5288a..9cd407b31030 100644 --- a/ecmascript/parser/tests/typescript/interface/index-signature/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/index-signature/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { diff --git a/ecmascript/parser/tests/typescript/interface/method-computed/input.ts.json b/ecmascript/parser/tests/typescript/interface/method-computed/input.ts.json index f838cb67c71b..4ba322fd1068 100644 --- a/ecmascript/parser/tests/typescript/interface/method-computed/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/method-computed/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -119,7 +116,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/interface/method-generic/input.ts.json b/ecmascript/parser/tests/typescript/interface/method-generic/input.ts.json index ee082db0389f..2860074dfa03 100644 --- a/ecmascript/parser/tests/typescript/interface/method-generic/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/method-generic/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -108,7 +105,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -144,7 +140,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/interface/method-optional/input.ts.json b/ecmascript/parser/tests/typescript/interface/method-optional/input.ts.json index b67958ec3f40..c96b81ad138b 100644 --- a/ecmascript/parser/tests/typescript/interface/method-optional/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/method-optional/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/interface/method-plain/input.ts.json b/ecmascript/parser/tests/typescript/interface/method-plain/input.ts.json index edd9c25e1f02..0a2969fba391 100644 --- a/ecmascript/parser/tests/typescript/interface/method-plain/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/method-plain/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -76,7 +74,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,6 +87,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -106,8 +104,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "RestElement", @@ -129,8 +126,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", diff --git a/ecmascript/parser/tests/typescript/interface/modifiers/input.ts.json b/ecmascript/parser/tests/typescript/interface/modifiers/input.ts.json index b92a7c9b5607..258b7c1eb0ba 100644 --- a/ecmascript/parser/tests/typescript/interface/modifiers/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/modifiers/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/interface/properties/input.ts.json b/ecmascript/parser/tests/typescript/interface/properties/input.ts.json index 41b0267bc27c..a07d619a2d03 100644 --- a/ecmascript/parser/tests/typescript/interface/properties/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/properties/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -119,7 +116,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/interface/property-computed/input.ts.json b/ecmascript/parser/tests/typescript/interface/property-computed/input.ts.json index cb325ac9e395..11a20199f686 100644 --- a/ecmascript/parser/tests/typescript/interface/property-computed/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/property-computed/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -120,7 +117,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/interface/property-named-public/input.ts.json b/ecmascript/parser/tests/typescript/interface/property-named-public/input.ts.json index 06b8d2bcb72c..acf7dd1c283d 100644 --- a/ecmascript/parser/tests/typescript/interface/property-named-public/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/property-named-public/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "public", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/interface/reserved-method-name/input.ts.json b/ecmascript/parser/tests/typescript/interface/reserved-method-name/input.ts.json index 54c9ad5e8bf3..829b0661063c 100644 --- a/ecmascript/parser/tests/typescript/interface/reserved-method-name/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/reserved-method-name/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "catch", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/interface/separators/input.ts.json b/ecmascript/parser/tests/typescript/interface/separators/input.ts.json index 97332fc2e66a..7581e5d346ba 100644 --- a/ecmascript/parser/tests/typescript/interface/separators/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/separators/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Comma", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -137,7 +134,6 @@ "ctxt": 0 }, "value": "Semi", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -167,7 +163,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -209,7 +204,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -253,7 +247,6 @@ "ctxt": 0 }, "value": "Newline", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -283,7 +276,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -325,7 +317,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/issue-1066/case1/input.ts.json b/ecmascript/parser/tests/typescript/issue-1066/case1/input.ts.json index 24f0fa74501e..2b71f4ca0427 100644 --- a/ecmascript/parser/tests/typescript/issue-1066/case1/input.ts.json +++ b/ecmascript/parser/tests/typescript/issue-1066/case1/input.ts.json @@ -63,7 +63,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -74,7 +73,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/issue-1252/case1/input.tsx.json b/ecmascript/parser/tests/typescript/issue-1252/case1/input.tsx.json index a264bca70a54..5580e116d6e2 100644 --- a/ecmascript/parser/tests/typescript/issue-1252/case1/input.tsx.json +++ b/ecmascript/parser/tests/typescript/issue-1252/case1/input.tsx.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "then", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -57,6 +57,7 @@ "ctxt": 0 }, "value": "callback", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -92,8 +93,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -117,7 +118,6 @@ "ctxt": 0 }, "value": "TupleReturns", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -143,7 +143,6 @@ "ctxt": 0 }, "value": "Ws", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -177,15 +176,13 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "body": { @@ -221,6 +218,7 @@ "ctxt": 0 }, "value": "returns", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -243,13 +241,11 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -281,6 +277,7 @@ "ctxt": 0 }, "value": "called", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -297,8 +294,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -332,7 +328,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/issue-1299/ts/input.ts.json b/ecmascript/parser/tests/typescript/issue-1299/ts/input.ts.json index 74a52a9def25..16f02efd55b2 100644 --- a/ecmascript/parser/tests/typescript/issue-1299/ts/input.ts.json +++ b/ecmascript/parser/tests/typescript/issue-1299/ts/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "iteratorMapGenerator", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -61,6 +61,7 @@ "ctxt": 0 }, "value": "values", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -83,7 +84,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -109,7 +109,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -117,8 +116,7 @@ ] } } - }, - "optional": false + } } }, { @@ -137,6 +135,7 @@ "ctxt": 0 }, "value": "execute", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -159,7 +158,6 @@ "ctxt": 0 }, "value": "IteratorExecution", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -185,7 +183,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -205,7 +202,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -213,8 +209,7 @@ ] } } - }, - "optional": false + } } } ], @@ -258,7 +253,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -279,7 +273,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -309,7 +302,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -335,7 +327,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/issue-1299/tsx/input.tsx.json b/ecmascript/parser/tests/typescript/issue-1299/tsx/input.tsx.json index 74a52a9def25..16f02efd55b2 100644 --- a/ecmascript/parser/tests/typescript/issue-1299/tsx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/issue-1299/tsx/input.tsx.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "iteratorMapGenerator", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -61,6 +61,7 @@ "ctxt": 0 }, "value": "values", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -83,7 +84,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -109,7 +109,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -117,8 +116,7 @@ ] } } - }, - "optional": false + } } }, { @@ -137,6 +135,7 @@ "ctxt": 0 }, "value": "execute", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -159,7 +158,6 @@ "ctxt": 0 }, "value": "IteratorExecution", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -185,7 +183,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -205,7 +202,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -213,8 +209,7 @@ ] } } - }, - "optional": false + } } } ], @@ -258,7 +253,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -279,7 +273,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -309,7 +302,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -335,7 +327,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/issue-812/input.ts.json b/ecmascript/parser/tests/typescript/issue-812/input.ts.json index 658e037fefbf..4642fd82289d 100644 --- a/ecmascript/parser/tests/typescript/issue-812/input.ts.json +++ b/ecmascript/parser/tests/typescript/issue-812/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "declare", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/issue-814/case1/input.ts.json b/ecmascript/parser/tests/typescript/issue-814/case1/input.ts.json index 891e40f26223..bc1cc4fb6fef 100644 --- a/ecmascript/parser/tests/typescript/issue-814/case1/input.ts.json +++ b/ecmascript/parser/tests/typescript/issue-814/case1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "testing", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", diff --git a/ecmascript/parser/tests/typescript/issue-814/case2/input.ts.json b/ecmascript/parser/tests/typescript/issue-814/case2/input.ts.json index ca11ff7b4f18..10b6427587c0 100644 --- a/ecmascript/parser/tests/typescript/issue-814/case2/input.ts.json +++ b/ecmascript/parser/tests/typescript/issue-814/case2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "testing", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,6 +50,7 @@ "ctxt": 0 }, "value": "param", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -77,6 +77,7 @@ "ctxt": 0 }, "value": "other", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -93,8 +94,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { diff --git a/ecmascript/parser/tests/typescript/issue-818/case1/input.ts.json b/ecmascript/parser/tests/typescript/issue-818/case1/input.ts.json index e90b373c009c..a2b85b29e9ca 100644 --- a/ecmascript/parser/tests/typescript/issue-818/case1/input.ts.json +++ b/ecmascript/parser/tests/typescript/issue-818/case1/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -57,6 +57,7 @@ "ctxt": 0 }, "value": "str", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -92,8 +93,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -134,7 +134,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false }, "right": { @@ -145,7 +144,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -157,7 +155,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -168,7 +165,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/issue-818/case2/input.ts.json b/ecmascript/parser/tests/typescript/issue-818/case2/input.ts.json index abb8f2757a95..f5ac9f296c8f 100644 --- a/ecmascript/parser/tests/typescript/issue-818/case2/input.ts.json +++ b/ecmascript/parser/tests/typescript/issue-818/case2/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -57,6 +57,7 @@ "ctxt": 0 }, "value": "str", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -92,8 +93,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -134,7 +134,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false }, "right": { @@ -145,7 +144,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -157,7 +155,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -168,7 +165,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/issue-861/input.ts.json b/ecmascript/parser/tests/typescript/issue-861/input.ts.json index 2d18832b62f8..f772204d6b2e 100644 --- a/ecmascript/parser/tests/typescript/issue-861/input.ts.json +++ b/ecmascript/parser/tests/typescript/issue-861/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/issue-874/input.ts.json b/ecmascript/parser/tests/typescript/issue-874/input.ts.json index a4146bca8a66..10a0cc33dde0 100644 --- a/ecmascript/parser/tests/typescript/issue-874/input.ts.json +++ b/ecmascript/parser/tests/typescript/issue-874/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/issue-913/input.ts.json b/ecmascript/parser/tests/typescript/issue-913/input.ts.json index ffb4a80ddb2e..177794c47ccd 100644 --- a/ecmascript/parser/tests/typescript/issue-913/input.ts.json +++ b/ecmascript/parser/tests/typescript/issue-913/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "imported": null @@ -75,7 +74,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false } } @@ -120,7 +118,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "imported": null @@ -172,7 +169,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -183,7 +179,6 @@ "ctxt": 0 }, "value": "testPlan", - "typeAnnotation": null, "optional": false }, "computed": false @@ -253,7 +248,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -264,7 +258,6 @@ "ctxt": 0 }, "value": "testSuite", - "typeAnnotation": null, "optional": false }, "computed": false @@ -334,7 +327,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -345,7 +337,6 @@ "ctxt": 0 }, "value": "testCase", - "typeAnnotation": null, "optional": false }, "computed": false @@ -411,8 +402,8 @@ "ctxt": 0 }, "value": "server", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -443,7 +434,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "property": { @@ -454,7 +444,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false }, "computed": false @@ -467,7 +456,6 @@ "ctxt": 0 }, "value": "Server", - "typeAnnotation": null, "optional": false }, "computed": false @@ -493,7 +481,6 @@ "ctxt": 0 }, "value": "resources", - "typeAnnotation": null, "optional": false }, "value": { @@ -514,7 +501,6 @@ "ctxt": 0 }, "value": "ResourceWithMiddlewareBeforeClass", - "typeAnnotation": null, "optional": false } } @@ -556,8 +542,8 @@ "ctxt": 0 }, "value": "request", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -581,7 +567,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "property": { @@ -592,7 +577,6 @@ "ctxt": 0 }, "value": "mockRequest", - "typeAnnotation": null, "optional": false }, "computed": false @@ -647,8 +631,8 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -679,7 +663,6 @@ "ctxt": 0 }, "value": "server", - "typeAnnotation": null, "optional": false }, "property": { @@ -690,7 +673,6 @@ "ctxt": 0 }, "value": "handleHttpRequest", - "typeAnnotation": null, "optional": false }, "computed": false @@ -706,7 +688,6 @@ "ctxt": 0 }, "value": "request", - "typeAnnotation": null, "optional": false } } @@ -747,7 +728,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "property": { @@ -758,7 +738,6 @@ "ctxt": 0 }, "value": "assertResponseJsonEquals", - "typeAnnotation": null, "optional": false }, "computed": false @@ -788,7 +767,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "property": { @@ -799,7 +777,6 @@ "ctxt": 0 }, "value": "responseBody", - "typeAnnotation": null, "optional": false }, "computed": false @@ -815,7 +792,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false } } @@ -885,7 +861,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -896,7 +871,6 @@ "ctxt": 0 }, "value": "testCase", - "typeAnnotation": null, "optional": false }, "computed": false @@ -962,8 +936,8 @@ "ctxt": 0 }, "value": "server", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -994,7 +968,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "property": { @@ -1005,7 +978,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1018,7 +990,6 @@ "ctxt": 0 }, "value": "Server", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1044,7 +1015,6 @@ "ctxt": 0 }, "value": "resources", - "typeAnnotation": null, "optional": false }, "value": { @@ -1065,7 +1035,6 @@ "ctxt": 0 }, "value": "ResourceWithMiddlewareBeforeClass", - "typeAnnotation": null, "optional": false } } @@ -1107,8 +1076,8 @@ "ctxt": 0 }, "value": "request", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1132,7 +1101,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "property": { @@ -1143,7 +1111,6 @@ "ctxt": 0 }, "value": "mockRequest", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1203,7 +1170,6 @@ "ctxt": 0 }, "value": "headers", - "typeAnnotation": null, "optional": false }, "value": { @@ -1224,7 +1190,6 @@ "ctxt": 0 }, "value": "csrf_token", - "typeAnnotation": null, "optional": false }, "value": { @@ -1280,8 +1245,8 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -1312,7 +1277,6 @@ "ctxt": 0 }, "value": "server", - "typeAnnotation": null, "optional": false }, "property": { @@ -1323,7 +1287,6 @@ "ctxt": 0 }, "value": "handleHttpRequest", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1339,7 +1302,6 @@ "ctxt": 0 }, "value": "request", - "typeAnnotation": null, "optional": false } } @@ -1380,7 +1342,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "property": { @@ -1391,7 +1352,6 @@ "ctxt": 0 }, "value": "assertResponseJsonEquals", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1421,7 +1381,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "property": { @@ -1432,7 +1391,6 @@ "ctxt": 0 }, "value": "responseBody", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1448,7 +1406,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false } } @@ -1476,7 +1433,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -1554,7 +1510,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -1565,7 +1520,6 @@ "ctxt": 0 }, "value": "testSuite", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1635,7 +1589,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -1646,7 +1599,6 @@ "ctxt": 0 }, "value": "testCase", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1712,8 +1664,8 @@ "ctxt": 0 }, "value": "server", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1744,7 +1696,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "property": { @@ -1755,7 +1706,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1768,7 +1718,6 @@ "ctxt": 0 }, "value": "Server", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1794,7 +1743,6 @@ "ctxt": 0 }, "value": "resources", - "typeAnnotation": null, "optional": false }, "value": { @@ -1815,7 +1763,6 @@ "ctxt": 0 }, "value": "ResourceWithMultipleMiddlewareBeforeClass", - "typeAnnotation": null, "optional": false } } @@ -1857,8 +1804,8 @@ "ctxt": 0 }, "value": "request", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1882,7 +1829,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "property": { @@ -1893,7 +1839,6 @@ "ctxt": 0 }, "value": "mockRequest", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1953,7 +1898,6 @@ "ctxt": 0 }, "value": "headers", - "typeAnnotation": null, "optional": false }, "value": { @@ -1974,7 +1918,6 @@ "ctxt": 0 }, "value": "csrf_token", - "typeAnnotation": null, "optional": false }, "value": { @@ -2030,8 +1973,8 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -2062,7 +2005,6 @@ "ctxt": 0 }, "value": "server", - "typeAnnotation": null, "optional": false }, "property": { @@ -2073,7 +2015,6 @@ "ctxt": 0 }, "value": "handleHttpRequest", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2089,7 +2030,6 @@ "ctxt": 0 }, "value": "request", - "typeAnnotation": null, "optional": false } } @@ -2130,7 +2070,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "property": { @@ -2141,7 +2080,6 @@ "ctxt": 0 }, "value": "assertResponseJsonEquals", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2171,7 +2109,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "property": { @@ -2182,7 +2119,6 @@ "ctxt": 0 }, "value": "responseBody", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2198,7 +2134,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false } } @@ -2226,7 +2161,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -2287,7 +2221,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -2298,7 +2231,6 @@ "ctxt": 0 }, "value": "asserts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2311,7 +2243,6 @@ "ctxt": 0 }, "value": "assertEquals", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2355,7 +2286,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false }, "property": { @@ -2366,7 +2296,6 @@ "ctxt": 0 }, "value": "headers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2380,7 +2309,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2481,7 +2409,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -2492,7 +2419,6 @@ "ctxt": 0 }, "value": "testSuite", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2562,7 +2488,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -2573,7 +2498,6 @@ "ctxt": 0 }, "value": "testCase", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2639,8 +2563,8 @@ "ctxt": 0 }, "value": "server", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2671,7 +2595,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "property": { @@ -2682,7 +2605,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2695,7 +2617,6 @@ "ctxt": 0 }, "value": "Server", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2721,7 +2642,6 @@ "ctxt": 0 }, "value": "resources", - "typeAnnotation": null, "optional": false }, "value": { @@ -2742,7 +2662,6 @@ "ctxt": 0 }, "value": "ResourceWithMultipleMiddlewareAfterClass", - "typeAnnotation": null, "optional": false } } @@ -2784,8 +2703,8 @@ "ctxt": 0 }, "value": "request", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2809,7 +2728,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "property": { @@ -2820,7 +2738,6 @@ "ctxt": 0 }, "value": "mockRequest", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2880,7 +2797,6 @@ "ctxt": 0 }, "value": "headers", - "typeAnnotation": null, "optional": false }, "value": { @@ -2901,7 +2817,6 @@ "ctxt": 0 }, "value": "csrf_token", - "typeAnnotation": null, "optional": false }, "value": { @@ -2957,8 +2872,8 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -2989,7 +2904,6 @@ "ctxt": 0 }, "value": "server", - "typeAnnotation": null, "optional": false }, "property": { @@ -3000,7 +2914,6 @@ "ctxt": 0 }, "value": "handleHttpRequest", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3016,7 +2929,6 @@ "ctxt": 0 }, "value": "request", - "typeAnnotation": null, "optional": false } } @@ -3064,7 +2976,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -3075,7 +2986,6 @@ "ctxt": 0 }, "value": "asserts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3088,7 +2998,6 @@ "ctxt": 0 }, "value": "assertEquals", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3118,7 +3027,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "property": { @@ -3129,7 +3037,6 @@ "ctxt": 0 }, "value": "responseBody", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3145,7 +3052,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false } } @@ -3210,7 +3116,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -3221,7 +3126,6 @@ "ctxt": 0 }, "value": "asserts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3234,7 +3138,6 @@ "ctxt": 0 }, "value": "assertEquals", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3278,7 +3181,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false }, "property": { @@ -3289,7 +3191,6 @@ "ctxt": 0 }, "value": "headers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3303,7 +3204,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3387,7 +3287,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -3398,7 +3297,6 @@ "ctxt": 0 }, "value": "asserts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3411,7 +3309,6 @@ "ctxt": 0 }, "value": "assertEquals", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3455,7 +3352,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false }, "property": { @@ -3466,7 +3362,6 @@ "ctxt": 0 }, "value": "headers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3480,7 +3375,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3581,7 +3475,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -3592,7 +3485,6 @@ "ctxt": 0 }, "value": "testSuite", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3662,7 +3554,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -3673,7 +3564,6 @@ "ctxt": 0 }, "value": "testCase", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3739,8 +3629,8 @@ "ctxt": 0 }, "value": "server", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -3771,7 +3661,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "property": { @@ -3782,7 +3671,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3795,7 +3683,6 @@ "ctxt": 0 }, "value": "Server", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3821,7 +3708,6 @@ "ctxt": 0 }, "value": "resources", - "typeAnnotation": null, "optional": false }, "value": { @@ -3842,7 +3728,6 @@ "ctxt": 0 }, "value": "ResourceWithMiddlewareClass", - "typeAnnotation": null, "optional": false } } @@ -3884,8 +3769,8 @@ "ctxt": 0 }, "value": "request", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3909,7 +3794,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "property": { @@ -3920,7 +3804,6 @@ "ctxt": 0 }, "value": "mockRequest", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3980,7 +3863,6 @@ "ctxt": 0 }, "value": "headers", - "typeAnnotation": null, "optional": false }, "value": { @@ -4001,7 +3883,6 @@ "ctxt": 0 }, "value": "csrf_token", - "typeAnnotation": null, "optional": false }, "value": { @@ -4057,8 +3938,8 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -4089,7 +3970,6 @@ "ctxt": 0 }, "value": "server", - "typeAnnotation": null, "optional": false }, "property": { @@ -4100,7 +3980,6 @@ "ctxt": 0 }, "value": "handleHttpRequest", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4116,7 +3995,6 @@ "ctxt": 0 }, "value": "request", - "typeAnnotation": null, "optional": false } } @@ -4164,7 +4042,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -4175,7 +4052,6 @@ "ctxt": 0 }, "value": "asserts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4188,7 +4064,6 @@ "ctxt": 0 }, "value": "assertEquals", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4218,7 +4093,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "property": { @@ -4229,7 +4103,6 @@ "ctxt": 0 }, "value": "responseBody", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4245,7 +4118,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false } } @@ -4310,7 +4182,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -4321,7 +4192,6 @@ "ctxt": 0 }, "value": "asserts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4334,7 +4204,6 @@ "ctxt": 0 }, "value": "assertEquals", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4378,7 +4247,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false }, "property": { @@ -4389,7 +4257,6 @@ "ctxt": 0 }, "value": "headers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4403,7 +4270,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4487,7 +4353,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -4498,7 +4363,6 @@ "ctxt": 0 }, "value": "asserts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4511,7 +4375,6 @@ "ctxt": 0 }, "value": "assertEquals", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4555,7 +4418,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false }, "property": { @@ -4566,7 +4428,6 @@ "ctxt": 0 }, "value": "headers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4580,7 +4441,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4681,7 +4541,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -4692,7 +4551,6 @@ "ctxt": 0 }, "value": "testSuite", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4762,7 +4620,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -4773,7 +4630,6 @@ "ctxt": 0 }, "value": "testCase", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4839,8 +4695,8 @@ "ctxt": 0 }, "value": "server", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -4871,7 +4727,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "property": { @@ -4882,7 +4737,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4895,7 +4749,6 @@ "ctxt": 0 }, "value": "Server", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4921,7 +4774,6 @@ "ctxt": 0 }, "value": "resources", - "typeAnnotation": null, "optional": false }, "value": { @@ -4942,7 +4794,6 @@ "ctxt": 0 }, "value": "ResourceWithMiddlewareBeforeMethod", - "typeAnnotation": null, "optional": false } } @@ -4984,8 +4835,8 @@ "ctxt": 0 }, "value": "request", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5009,7 +4860,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "property": { @@ -5020,7 +4870,6 @@ "ctxt": 0 }, "value": "mockRequest", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5080,7 +4929,6 @@ "ctxt": 0 }, "value": "headers", - "typeAnnotation": null, "optional": false }, "value": { @@ -5101,7 +4949,6 @@ "ctxt": 0 }, "value": "csrf_token", - "typeAnnotation": null, "optional": false }, "value": { @@ -5157,8 +5004,8 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -5189,7 +5036,6 @@ "ctxt": 0 }, "value": "server", - "typeAnnotation": null, "optional": false }, "property": { @@ -5200,7 +5046,6 @@ "ctxt": 0 }, "value": "handleHttpRequest", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5216,7 +5061,6 @@ "ctxt": 0 }, "value": "request", - "typeAnnotation": null, "optional": false } } @@ -5257,7 +5101,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "property": { @@ -5268,7 +5111,6 @@ "ctxt": 0 }, "value": "assertResponseJsonEquals", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5298,7 +5140,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "property": { @@ -5309,7 +5150,6 @@ "ctxt": 0 }, "value": "responseBody", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5325,7 +5165,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false } } @@ -5353,7 +5192,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -5431,7 +5269,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -5442,7 +5279,6 @@ "ctxt": 0 }, "value": "testSuite", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5512,7 +5348,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -5523,7 +5358,6 @@ "ctxt": 0 }, "value": "testCase", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5589,8 +5423,8 @@ "ctxt": 0 }, "value": "server", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -5621,7 +5455,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "property": { @@ -5632,7 +5465,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5645,7 +5477,6 @@ "ctxt": 0 }, "value": "Server", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5671,7 +5502,6 @@ "ctxt": 0 }, "value": "resources", - "typeAnnotation": null, "optional": false }, "value": { @@ -5692,7 +5522,6 @@ "ctxt": 0 }, "value": "ResourceWithMultipleMiddlewareBeforeMethod", - "typeAnnotation": null, "optional": false } } @@ -5734,8 +5563,8 @@ "ctxt": 0 }, "value": "request", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5759,7 +5588,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "property": { @@ -5770,7 +5598,6 @@ "ctxt": 0 }, "value": "mockRequest", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5830,7 +5657,6 @@ "ctxt": 0 }, "value": "headers", - "typeAnnotation": null, "optional": false }, "value": { @@ -5851,7 +5677,6 @@ "ctxt": 0 }, "value": "csrf_token", - "typeAnnotation": null, "optional": false }, "value": { @@ -5907,8 +5732,8 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -5939,7 +5764,6 @@ "ctxt": 0 }, "value": "server", - "typeAnnotation": null, "optional": false }, "property": { @@ -5950,7 +5774,6 @@ "ctxt": 0 }, "value": "handleHttpRequest", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5966,7 +5789,6 @@ "ctxt": 0 }, "value": "request", - "typeAnnotation": null, "optional": false } } @@ -6007,7 +5829,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "property": { @@ -6018,7 +5839,6 @@ "ctxt": 0 }, "value": "assertResponseJsonEquals", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6048,7 +5868,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "property": { @@ -6059,7 +5878,6 @@ "ctxt": 0 }, "value": "responseBody", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6075,7 +5893,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false } } @@ -6103,7 +5920,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -6164,7 +5980,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -6175,7 +5990,6 @@ "ctxt": 0 }, "value": "asserts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6188,7 +6002,6 @@ "ctxt": 0 }, "value": "assertEquals", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6232,7 +6045,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false }, "property": { @@ -6243,7 +6055,6 @@ "ctxt": 0 }, "value": "headers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6257,7 +6068,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6358,7 +6168,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -6369,7 +6178,6 @@ "ctxt": 0 }, "value": "testSuite", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6439,7 +6247,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -6450,7 +6257,6 @@ "ctxt": 0 }, "value": "testCase", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6516,8 +6322,8 @@ "ctxt": 0 }, "value": "server", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -6548,7 +6354,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "property": { @@ -6559,7 +6364,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6572,7 +6376,6 @@ "ctxt": 0 }, "value": "Server", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6598,7 +6401,6 @@ "ctxt": 0 }, "value": "resources", - "typeAnnotation": null, "optional": false }, "value": { @@ -6619,7 +6421,6 @@ "ctxt": 0 }, "value": "ResourceWithMiddlewareAfterMethod", - "typeAnnotation": null, "optional": false } } @@ -6661,8 +6462,8 @@ "ctxt": 0 }, "value": "request", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6686,7 +6487,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "property": { @@ -6697,7 +6497,6 @@ "ctxt": 0 }, "value": "mockRequest", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6757,7 +6556,6 @@ "ctxt": 0 }, "value": "headers", - "typeAnnotation": null, "optional": false }, "value": { @@ -6778,7 +6576,6 @@ "ctxt": 0 }, "value": "csrf_token", - "typeAnnotation": null, "optional": false }, "value": { @@ -6834,8 +6631,8 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -6866,7 +6663,6 @@ "ctxt": 0 }, "value": "server", - "typeAnnotation": null, "optional": false }, "property": { @@ -6877,7 +6673,6 @@ "ctxt": 0 }, "value": "handleHttpRequest", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6893,7 +6688,6 @@ "ctxt": 0 }, "value": "request", - "typeAnnotation": null, "optional": false } } @@ -6941,7 +6735,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -6952,7 +6745,6 @@ "ctxt": 0 }, "value": "asserts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6965,7 +6757,6 @@ "ctxt": 0 }, "value": "assertEquals", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6995,7 +6786,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "property": { @@ -7006,7 +6796,6 @@ "ctxt": 0 }, "value": "responseBody", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7022,7 +6811,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false } } @@ -7087,7 +6875,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -7098,7 +6885,6 @@ "ctxt": 0 }, "value": "asserts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7111,7 +6897,6 @@ "ctxt": 0 }, "value": "assertEquals", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7155,7 +6940,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false }, "property": { @@ -7166,7 +6950,6 @@ "ctxt": 0 }, "value": "headers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7180,7 +6963,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7281,7 +7063,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -7292,7 +7073,6 @@ "ctxt": 0 }, "value": "testSuite", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7362,7 +7142,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -7373,7 +7152,6 @@ "ctxt": 0 }, "value": "testCase", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7439,8 +7217,8 @@ "ctxt": 0 }, "value": "server", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -7471,7 +7249,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "property": { @@ -7482,7 +7259,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7495,7 +7271,6 @@ "ctxt": 0 }, "value": "Server", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7521,7 +7296,6 @@ "ctxt": 0 }, "value": "resources", - "typeAnnotation": null, "optional": false }, "value": { @@ -7542,7 +7316,6 @@ "ctxt": 0 }, "value": "ResourceWithMultipleMiddlewareAfterMethod", - "typeAnnotation": null, "optional": false } } @@ -7584,8 +7357,8 @@ "ctxt": 0 }, "value": "request", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7609,7 +7382,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "property": { @@ -7620,7 +7392,6 @@ "ctxt": 0 }, "value": "mockRequest", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7680,7 +7451,6 @@ "ctxt": 0 }, "value": "headers", - "typeAnnotation": null, "optional": false }, "value": { @@ -7701,7 +7471,6 @@ "ctxt": 0 }, "value": "csrf_token", - "typeAnnotation": null, "optional": false }, "value": { @@ -7757,8 +7526,8 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -7789,7 +7558,6 @@ "ctxt": 0 }, "value": "server", - "typeAnnotation": null, "optional": false }, "property": { @@ -7800,7 +7568,6 @@ "ctxt": 0 }, "value": "handleHttpRequest", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7816,7 +7583,6 @@ "ctxt": 0 }, "value": "request", - "typeAnnotation": null, "optional": false } } @@ -7864,7 +7630,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -7875,7 +7640,6 @@ "ctxt": 0 }, "value": "asserts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7888,7 +7652,6 @@ "ctxt": 0 }, "value": "assertEquals", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7918,7 +7681,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "property": { @@ -7929,7 +7691,6 @@ "ctxt": 0 }, "value": "responseBody", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7945,7 +7706,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false } } @@ -8010,7 +7770,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -8021,7 +7780,6 @@ "ctxt": 0 }, "value": "asserts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8034,7 +7792,6 @@ "ctxt": 0 }, "value": "assertEquals", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8078,7 +7835,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false }, "property": { @@ -8089,7 +7845,6 @@ "ctxt": 0 }, "value": "headers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8103,7 +7858,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8187,7 +7941,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -8198,7 +7951,6 @@ "ctxt": 0 }, "value": "asserts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8211,7 +7963,6 @@ "ctxt": 0 }, "value": "assertEquals", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8255,7 +8006,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false }, "property": { @@ -8266,7 +8016,6 @@ "ctxt": 0 }, "value": "headers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8280,7 +8029,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8393,7 +8141,6 @@ "ctxt": 0 }, "value": "Rhum", - "typeAnnotation": null, "optional": false }, "property": { @@ -8404,7 +8151,6 @@ "ctxt": 0 }, "value": "run", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8428,7 +8174,6 @@ "ctxt": 0 }, "value": "IUser", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8458,7 +8203,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8497,7 +8241,6 @@ "ctxt": 0 }, "value": "CustomHeader", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8518,6 +8261,7 @@ "ctxt": 0 }, "value": "request", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8544,7 +8288,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "right": { @@ -8555,7 +8298,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false } }, @@ -8567,14 +8309,12 @@ "ctxt": 0 }, "value": "Request", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } }, { @@ -8593,6 +8333,7 @@ "ctxt": 0 }, "value": "response", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8619,7 +8360,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "right": { @@ -8630,7 +8370,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false } }, @@ -8642,14 +8381,12 @@ "ctxt": 0 }, "value": "Response", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } } ], @@ -8704,7 +8441,6 @@ "ctxt": 0 }, "value": "request", - "typeAnnotation": null, "optional": false }, "property": { @@ -8715,7 +8451,6 @@ "ctxt": 0 }, "value": "getHeaderParam", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8794,7 +8529,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "property": { @@ -8805,7 +8539,6 @@ "ctxt": 0 }, "value": "Exceptions", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8818,7 +8551,6 @@ "ctxt": 0 }, "value": "HttpMiddlewareException", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8878,7 +8610,6 @@ "ctxt": 0 }, "value": "SwapResponseToHtml", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8899,6 +8630,7 @@ "ctxt": 0 }, "value": "request", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8925,7 +8657,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "right": { @@ -8936,7 +8667,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false } }, @@ -8948,14 +8678,12 @@ "ctxt": 0 }, "value": "Request", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } }, { @@ -8974,6 +8702,7 @@ "ctxt": 0 }, "value": "response", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9000,7 +8729,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "right": { @@ -9011,7 +8739,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false } }, @@ -9023,14 +8750,12 @@ "ctxt": 0 }, "value": "Response", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } } ], @@ -9084,7 +8809,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false }, "property": { @@ -9095,7 +8819,6 @@ "ctxt": 0 }, "value": "headers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9108,7 +8831,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9182,7 +8904,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false }, "property": { @@ -9193,7 +8914,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9231,7 +8951,6 @@ "ctxt": 0 }, "value": "ResponseCustomHeaderAdded", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9252,6 +8971,7 @@ "ctxt": 0 }, "value": "request", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9278,7 +8998,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "right": { @@ -9289,7 +9008,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false } }, @@ -9301,14 +9019,12 @@ "ctxt": 0 }, "value": "Request", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } }, { @@ -9327,6 +9043,7 @@ "ctxt": 0 }, "value": "response", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9353,7 +9070,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "right": { @@ -9364,7 +9080,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false } }, @@ -9376,14 +9091,12 @@ "ctxt": 0 }, "value": "Response", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } } ], @@ -9437,7 +9150,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false }, "property": { @@ -9448,7 +9160,6 @@ "ctxt": 0 }, "value": "headers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9461,7 +9172,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9522,7 +9232,6 @@ "ctxt": 0 }, "value": "ResourceWithMiddlewareBeforeClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9568,7 +9277,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "property": { @@ -9579,7 +9287,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9592,7 +9299,6 @@ "ctxt": 0 }, "value": "Middleware", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9618,7 +9324,6 @@ "ctxt": 0 }, "value": "before_request", - "typeAnnotation": null, "optional": false }, "value": { @@ -9639,7 +9344,6 @@ "ctxt": 0 }, "value": "CustomHeader", - "typeAnnotation": null, "optional": false } } @@ -9670,7 +9374,6 @@ "ctxt": 0 }, "value": "paths", - "typeAnnotation": null, "optional": false }, "value": { @@ -9743,7 +9446,6 @@ "ctxt": 0 }, "value": "users", - "typeAnnotation": null, "optional": false }, "value": { @@ -9761,7 +9463,6 @@ "ctxt": 0 }, "value": "Map", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9817,7 +9518,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -9883,7 +9583,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -9943,7 +9642,6 @@ "ctxt": 0 }, "value": "IUser", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9977,7 +9675,6 @@ "ctxt": 0 }, "value": "GET", - "typeAnnotation": null, "optional": false }, "function": { @@ -10021,8 +9718,8 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -10061,7 +9758,6 @@ "ctxt": 0 }, "value": "request", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10074,7 +9770,6 @@ "ctxt": 0 }, "value": "getPathParam", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10119,7 +9814,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -10175,7 +9869,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10188,7 +9881,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10230,7 +9922,6 @@ "ctxt": 0 }, "value": "users", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10243,7 +9934,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10266,7 +9956,6 @@ "ctxt": 0 }, "value": "parseInt", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -10280,7 +9969,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false } } @@ -10327,7 +10015,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10369,7 +10056,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "property": { @@ -10380,7 +10066,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10393,7 +10078,6 @@ "ctxt": 0 }, "value": "Resource", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10413,7 +10097,6 @@ "ctxt": 0 }, "value": "ResourceWithMultipleMiddlewareBeforeClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10459,7 +10142,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "property": { @@ -10470,7 +10152,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10483,7 +10164,6 @@ "ctxt": 0 }, "value": "Middleware", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10509,7 +10189,6 @@ "ctxt": 0 }, "value": "before_request", - "typeAnnotation": null, "optional": false }, "value": { @@ -10530,7 +10209,6 @@ "ctxt": 0 }, "value": "ResponseCustomHeaderAdded", - "typeAnnotation": null, "optional": false } }, @@ -10544,7 +10222,6 @@ "ctxt": 0 }, "value": "CustomHeader", - "typeAnnotation": null, "optional": false } } @@ -10575,7 +10252,6 @@ "ctxt": 0 }, "value": "paths", - "typeAnnotation": null, "optional": false }, "value": { @@ -10648,7 +10324,6 @@ "ctxt": 0 }, "value": "users", - "typeAnnotation": null, "optional": false }, "value": { @@ -10666,7 +10341,6 @@ "ctxt": 0 }, "value": "Map", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -10722,7 +10396,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -10788,7 +10461,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -10848,7 +10520,6 @@ "ctxt": 0 }, "value": "IUser", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10882,7 +10553,6 @@ "ctxt": 0 }, "value": "GET", - "typeAnnotation": null, "optional": false }, "function": { @@ -10926,8 +10596,8 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -10966,7 +10636,6 @@ "ctxt": 0 }, "value": "request", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10979,7 +10648,6 @@ "ctxt": 0 }, "value": "getPathParam", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11024,7 +10692,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -11080,7 +10747,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11093,7 +10759,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11135,7 +10800,6 @@ "ctxt": 0 }, "value": "users", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11148,7 +10812,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11171,7 +10834,6 @@ "ctxt": 0 }, "value": "parseInt", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -11185,7 +10847,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false } } @@ -11232,7 +10893,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11274,7 +10934,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "property": { @@ -11285,7 +10944,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11298,7 +10956,6 @@ "ctxt": 0 }, "value": "Resource", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11318,7 +10975,6 @@ "ctxt": 0 }, "value": "ResourceWithMultipleMiddlewareAfterClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -11364,7 +11020,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "property": { @@ -11375,7 +11030,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11388,7 +11042,6 @@ "ctxt": 0 }, "value": "Middleware", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11414,7 +11067,6 @@ "ctxt": 0 }, "value": "after_request", - "typeAnnotation": null, "optional": false }, "value": { @@ -11435,7 +11087,6 @@ "ctxt": 0 }, "value": "SwapResponseToHtml", - "typeAnnotation": null, "optional": false } }, @@ -11449,7 +11100,6 @@ "ctxt": 0 }, "value": "ResponseCustomHeaderAdded", - "typeAnnotation": null, "optional": false } } @@ -11480,7 +11130,6 @@ "ctxt": 0 }, "value": "paths", - "typeAnnotation": null, "optional": false }, "value": { @@ -11553,7 +11202,6 @@ "ctxt": 0 }, "value": "users", - "typeAnnotation": null, "optional": false }, "value": { @@ -11571,7 +11219,6 @@ "ctxt": 0 }, "value": "Map", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -11627,7 +11274,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -11693,7 +11339,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -11753,7 +11398,6 @@ "ctxt": 0 }, "value": "IUser", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11787,7 +11431,6 @@ "ctxt": 0 }, "value": "GET", - "typeAnnotation": null, "optional": false }, "function": { @@ -11836,7 +11479,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11878,7 +11520,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "property": { @@ -11889,7 +11530,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11902,7 +11542,6 @@ "ctxt": 0 }, "value": "Resource", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11922,7 +11561,6 @@ "ctxt": 0 }, "value": "ResourceWithMiddlewareClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -11968,7 +11606,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "property": { @@ -11979,7 +11616,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11992,7 +11628,6 @@ "ctxt": 0 }, "value": "Middleware", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12018,7 +11653,6 @@ "ctxt": 0 }, "value": "before_request", - "typeAnnotation": null, "optional": false }, "value": { @@ -12039,7 +11673,6 @@ "ctxt": 0 }, "value": "SwapResponseToHtml", - "typeAnnotation": null, "optional": false } } @@ -12056,7 +11689,6 @@ "ctxt": 0 }, "value": "after_request", - "typeAnnotation": null, "optional": false }, "value": { @@ -12077,7 +11709,6 @@ "ctxt": 0 }, "value": "ResponseCustomHeaderAdded", - "typeAnnotation": null, "optional": false } } @@ -12108,7 +11739,6 @@ "ctxt": 0 }, "value": "paths", - "typeAnnotation": null, "optional": false }, "value": { @@ -12181,7 +11811,6 @@ "ctxt": 0 }, "value": "users", - "typeAnnotation": null, "optional": false }, "value": { @@ -12199,7 +11828,6 @@ "ctxt": 0 }, "value": "Map", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -12255,7 +11883,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -12321,7 +11948,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -12381,7 +12007,6 @@ "ctxt": 0 }, "value": "IUser", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12415,7 +12040,6 @@ "ctxt": 0 }, "value": "GET", - "typeAnnotation": null, "optional": false }, "function": { @@ -12464,7 +12088,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12506,7 +12129,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "property": { @@ -12517,7 +12139,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12530,7 +12151,6 @@ "ctxt": 0 }, "value": "Resource", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12550,7 +12170,6 @@ "ctxt": 0 }, "value": "ResourceWithMiddlewareBeforeMethod", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -12576,7 +12195,6 @@ "ctxt": 0 }, "value": "paths", - "typeAnnotation": null, "optional": false }, "value": { @@ -12649,7 +12267,6 @@ "ctxt": 0 }, "value": "users", - "typeAnnotation": null, "optional": false }, "value": { @@ -12667,7 +12284,6 @@ "ctxt": 0 }, "value": "Map", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -12723,7 +12339,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -12789,7 +12404,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -12849,7 +12463,6 @@ "ctxt": 0 }, "value": "IUser", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12883,7 +12496,6 @@ "ctxt": 0 }, "value": "GET", - "typeAnnotation": null, "optional": false }, "function": { @@ -12925,7 +12537,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "property": { @@ -12936,7 +12547,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12949,7 +12559,6 @@ "ctxt": 0 }, "value": "Middleware", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12975,7 +12584,6 @@ "ctxt": 0 }, "value": "before_request", - "typeAnnotation": null, "optional": false }, "value": { @@ -12996,7 +12604,6 @@ "ctxt": 0 }, "value": "CustomHeader", - "typeAnnotation": null, "optional": false } } @@ -13049,8 +12656,8 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -13089,7 +12696,6 @@ "ctxt": 0 }, "value": "request", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13102,7 +12708,6 @@ "ctxt": 0 }, "value": "getPathParam", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13147,7 +12752,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -13203,7 +12807,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13216,7 +12819,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13258,7 +12860,6 @@ "ctxt": 0 }, "value": "users", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13271,7 +12872,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13294,7 +12894,6 @@ "ctxt": 0 }, "value": "parseInt", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -13308,7 +12907,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false } } @@ -13355,7 +12953,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13397,7 +12994,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "property": { @@ -13408,7 +13004,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13421,7 +13016,6 @@ "ctxt": 0 }, "value": "Resource", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13441,7 +13035,6 @@ "ctxt": 0 }, "value": "ResourceWithMiddlewareAfterMethod", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -13467,7 +13060,6 @@ "ctxt": 0 }, "value": "paths", - "typeAnnotation": null, "optional": false }, "value": { @@ -13540,7 +13132,6 @@ "ctxt": 0 }, "value": "users", - "typeAnnotation": null, "optional": false }, "value": { @@ -13558,7 +13149,6 @@ "ctxt": 0 }, "value": "Map", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -13614,7 +13204,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -13680,7 +13269,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -13740,7 +13328,6 @@ "ctxt": 0 }, "value": "IUser", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13774,7 +13361,6 @@ "ctxt": 0 }, "value": "GET", - "typeAnnotation": null, "optional": false }, "function": { @@ -13816,7 +13402,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "property": { @@ -13827,7 +13412,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13840,7 +13424,6 @@ "ctxt": 0 }, "value": "Middleware", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13866,7 +13449,6 @@ "ctxt": 0 }, "value": "after_request", - "typeAnnotation": null, "optional": false }, "value": { @@ -13887,7 +13469,6 @@ "ctxt": 0 }, "value": "SwapResponseToHtml", - "typeAnnotation": null, "optional": false } } @@ -13945,7 +13526,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13987,7 +13567,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "property": { @@ -13998,7 +13577,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14011,7 +13589,6 @@ "ctxt": 0 }, "value": "Resource", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14031,7 +13608,6 @@ "ctxt": 0 }, "value": "ResourceWithMultipleMiddlewareBeforeMethod", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -14057,7 +13633,6 @@ "ctxt": 0 }, "value": "paths", - "typeAnnotation": null, "optional": false }, "value": { @@ -14130,7 +13705,6 @@ "ctxt": 0 }, "value": "users", - "typeAnnotation": null, "optional": false }, "value": { @@ -14148,7 +13722,6 @@ "ctxt": 0 }, "value": "Map", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -14204,7 +13777,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -14270,7 +13842,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -14330,7 +13901,6 @@ "ctxt": 0 }, "value": "IUser", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14364,7 +13934,6 @@ "ctxt": 0 }, "value": "GET", - "typeAnnotation": null, "optional": false }, "function": { @@ -14406,7 +13975,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "property": { @@ -14417,7 +13985,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14430,7 +13997,6 @@ "ctxt": 0 }, "value": "Middleware", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14456,7 +14022,6 @@ "ctxt": 0 }, "value": "before_request", - "typeAnnotation": null, "optional": false }, "value": { @@ -14477,7 +14042,6 @@ "ctxt": 0 }, "value": "ResponseCustomHeaderAdded", - "typeAnnotation": null, "optional": false } }, @@ -14491,7 +14055,6 @@ "ctxt": 0 }, "value": "CustomHeader", - "typeAnnotation": null, "optional": false } } @@ -14544,8 +14107,8 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -14584,7 +14147,6 @@ "ctxt": 0 }, "value": "request", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14597,7 +14159,6 @@ "ctxt": 0 }, "value": "getPathParam", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14642,7 +14203,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -14698,7 +14258,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14711,7 +14270,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14753,7 +14311,6 @@ "ctxt": 0 }, "value": "users", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14766,7 +14323,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14789,7 +14345,6 @@ "ctxt": 0 }, "value": "parseInt", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -14803,7 +14358,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false } } @@ -14850,7 +14404,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14892,7 +14445,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "property": { @@ -14903,7 +14455,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14916,7 +14467,6 @@ "ctxt": 0 }, "value": "Resource", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14936,7 +14486,6 @@ "ctxt": 0 }, "value": "ResourceWithMultipleMiddlewareAfterMethod", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -14962,7 +14511,6 @@ "ctxt": 0 }, "value": "paths", - "typeAnnotation": null, "optional": false }, "value": { @@ -15035,7 +14583,6 @@ "ctxt": 0 }, "value": "users", - "typeAnnotation": null, "optional": false }, "value": { @@ -15053,7 +14600,6 @@ "ctxt": 0 }, "value": "Map", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -15109,7 +14655,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -15175,7 +14720,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -15235,7 +14779,6 @@ "ctxt": 0 }, "value": "IUser", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -15269,7 +14812,6 @@ "ctxt": 0 }, "value": "GET", - "typeAnnotation": null, "optional": false }, "function": { @@ -15311,7 +14853,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "property": { @@ -15322,7 +14863,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15335,7 +14875,6 @@ "ctxt": 0 }, "value": "Middleware", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15361,7 +14900,6 @@ "ctxt": 0 }, "value": "after_request", - "typeAnnotation": null, "optional": false }, "value": { @@ -15382,7 +14920,6 @@ "ctxt": 0 }, "value": "SwapResponseToHtml", - "typeAnnotation": null, "optional": false } }, @@ -15396,7 +14933,6 @@ "ctxt": 0 }, "value": "ResponseCustomHeaderAdded", - "typeAnnotation": null, "optional": false } } @@ -15454,7 +14990,6 @@ "ctxt": 0 }, "value": "response", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15496,7 +15031,6 @@ "ctxt": 0 }, "value": "Drash", - "typeAnnotation": null, "optional": false }, "property": { @@ -15507,7 +15041,6 @@ "ctxt": 0 }, "value": "Http", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15520,7 +15053,6 @@ "ctxt": 0 }, "value": "Resource", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/issue-915/input.ts.json b/ecmascript/parser/tests/typescript/issue-915/input.ts.json index 81142550350a..7cf406a912d7 100644 --- a/ecmascript/parser/tests/typescript/issue-915/input.ts.json +++ b/ecmascript/parser/tests/typescript/issue-915/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "MultipartReader", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "newLine", - "typeAnnotation": null, "optional": false }, "value": { @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "encoder", - "typeAnnotation": null, "optional": false }, "property": { @@ -85,7 +82,6 @@ "ctxt": 0 }, "value": "encode", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/issue-944/input.ts.json b/ecmascript/parser/tests/typescript/issue-944/input.ts.json index e8470793facd..df006874f82e 100644 --- a/ecmascript/parser/tests/typescript/issue-944/input.ts.json +++ b/ecmascript/parser/tests/typescript/issue-944/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "CTest", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "myFunc", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/issue-947/input.ts.json b/ecmascript/parser/tests/typescript/issue-947/input.ts.json index 18e18f7b9d36..a20c8d4d6295 100644 --- a/ecmascript/parser/tests/typescript/issue-947/input.ts.json +++ b/ecmascript/parser/tests/typescript/issue-947/input.ts.json @@ -48,7 +48,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "myProp", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/module-namespace/body-declare/input.ts.json b/ecmascript/parser/tests/typescript/module-namespace/body-declare/input.ts.json index 86a7832e65d0..1ded4be60246 100644 --- a/ecmascript/parser/tests/typescript/module-namespace/body-declare/input.ts.json +++ b/ecmascript/parser/tests/typescript/module-namespace/body-declare/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { @@ -59,6 +58,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -75,8 +75,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/module-namespace/body-nested-declare/input.ts.json b/ecmascript/parser/tests/typescript/module-namespace/body-nested-declare/input.ts.json index 25a7ffa2af3a..ba1ba2bda27d 100644 --- a/ecmascript/parser/tests/typescript/module-namespace/body-nested-declare/input.ts.json +++ b/ecmascript/parser/tests/typescript/module-namespace/body-nested-declare/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "body": { @@ -87,6 +85,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -103,8 +102,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/module-namespace/body-nested/input.ts.json b/ecmascript/parser/tests/typescript/module-namespace/body-nested/input.ts.json index fee1f0d554cc..5d676ce5ef32 100644 --- a/ecmascript/parser/tests/typescript/module-namespace/body-nested/input.ts.json +++ b/ecmascript/parser/tests/typescript/module-namespace/body-nested/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/module-namespace/body/input.ts.json b/ecmascript/parser/tests/typescript/module-namespace/body/input.ts.json index 3d2a5a2f048d..b5cada87cc21 100644 --- a/ecmascript/parser/tests/typescript/module-namespace/body/input.ts.json +++ b/ecmascript/parser/tests/typescript/module-namespace/body/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { @@ -59,8 +58,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/module-namespace/global-in-module/input.ts.json b/ecmascript/parser/tests/typescript/module-namespace/global-in-module/input.ts.json index 0dd35d1fed39..31958dc4d393 100644 --- a/ecmascript/parser/tests/typescript/module-namespace/global-in-module/input.ts.json +++ b/ecmascript/parser/tests/typescript/module-namespace/global-in-module/input.ts.json @@ -54,7 +54,6 @@ "ctxt": 0 }, "value": "global", - "typeAnnotation": null, "optional": false }, "body": { @@ -90,6 +89,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -106,8 +106,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/module-namespace/head-declare/input.ts.json b/ecmascript/parser/tests/typescript/module-namespace/head-declare/input.ts.json index c6bb90c96238..f9a25a2603d7 100644 --- a/ecmascript/parser/tests/typescript/module-namespace/head-declare/input.ts.json +++ b/ecmascript/parser/tests/typescript/module-namespace/head-declare/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -137,7 +134,6 @@ "ctxt": 0 }, "value": "global", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/module-namespace/head-export/input.ts.json b/ecmascript/parser/tests/typescript/module-namespace/head-export/input.ts.json index 34e3a94740f9..0abbe37e8e4a 100644 --- a/ecmascript/parser/tests/typescript/module-namespace/head-export/input.ts.json +++ b/ecmascript/parser/tests/typescript/module-namespace/head-export/input.ts.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "body": { @@ -89,7 +87,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/module-namespace/head/input.ts.json b/ecmascript/parser/tests/typescript/module-namespace/head/input.ts.json index f5f52cc60d20..843151f5b510 100644 --- a/ecmascript/parser/tests/typescript/module-namespace/head/input.ts.json +++ b/ecmascript/parser/tests/typescript/module-namespace/head/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { @@ -53,7 +52,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -73,7 +71,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { @@ -93,7 +90,6 @@ "ctxt": 0 }, "value": "O", - "typeAnnotation": null, "optional": false }, "body": { @@ -125,7 +121,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/nullish-coalescing-operator/and-nullish/input.ts.json b/ecmascript/parser/tests/typescript/nullish-coalescing-operator/and-nullish/input.ts.json index d41d6eaa7e84..3e8efd484abc 100644 --- a/ecmascript/parser/tests/typescript/nullish-coalescing-operator/and-nullish/input.ts.json +++ b/ecmascript/parser/tests/typescript/nullish-coalescing-operator/and-nullish/input.ts.json @@ -44,7 +44,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -55,7 +54,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/nullish-coalescing-operator/associativity/input.ts.json b/ecmascript/parser/tests/typescript/nullish-coalescing-operator/associativity/input.ts.json index 7800a3cefa54..63e273434f6f 100644 --- a/ecmascript/parser/tests/typescript/nullish-coalescing-operator/associativity/input.ts.json +++ b/ecmascript/parser/tests/typescript/nullish-coalescing-operator/associativity/input.ts.json @@ -37,7 +37,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -60,7 +58,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/nullish-coalescing-operator/expression/input.ts.json b/ecmascript/parser/tests/typescript/nullish-coalescing-operator/expression/input.ts.json index df3e09a46024..73b975acd25b 100644 --- a/ecmascript/parser/tests/typescript/nullish-coalescing-operator/expression/input.ts.json +++ b/ecmascript/parser/tests/typescript/nullish-coalescing-operator/expression/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "right": { diff --git a/ecmascript/parser/tests/typescript/nullish-coalescing-operator/multiline/input.ts.json b/ecmascript/parser/tests/typescript/nullish-coalescing-operator/multiline/input.ts.json index df758f3bee2a..61a688c44f6c 100644 --- a/ecmascript/parser/tests/typescript/nullish-coalescing-operator/multiline/input.ts.json +++ b/ecmascript/parser/tests/typescript/nullish-coalescing-operator/multiline/input.ts.json @@ -37,7 +37,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -60,7 +58,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/nullish-coalescing-operator/nullish-and/input.ts.json b/ecmascript/parser/tests/typescript/nullish-coalescing-operator/nullish-and/input.ts.json index ca81dd243cc5..ef941652b5ae 100644 --- a/ecmascript/parser/tests/typescript/nullish-coalescing-operator/nullish-and/input.ts.json +++ b/ecmascript/parser/tests/typescript/nullish-coalescing-operator/nullish-and/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -55,7 +54,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -66,7 +64,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/nullish-coalescing-operator/nullish-or/input.ts.json b/ecmascript/parser/tests/typescript/nullish-coalescing-operator/nullish-or/input.ts.json index 32dad637a7fa..ed06a0a4a2a0 100644 --- a/ecmascript/parser/tests/typescript/nullish-coalescing-operator/nullish-or/input.ts.json +++ b/ecmascript/parser/tests/typescript/nullish-coalescing-operator/nullish-or/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -55,7 +54,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -66,7 +64,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/nullish-coalescing-operator/or-nullish/input.ts.json b/ecmascript/parser/tests/typescript/nullish-coalescing-operator/or-nullish/input.ts.json index 588f8f2fa0b3..d0439f54a54a 100644 --- a/ecmascript/parser/tests/typescript/nullish-coalescing-operator/or-nullish/input.ts.json +++ b/ecmascript/parser/tests/typescript/nullish-coalescing-operator/or-nullish/input.ts.json @@ -44,7 +44,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -55,7 +54,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/object/getter-prop/input.ts.json b/ecmascript/parser/tests/typescript/object/getter-prop/input.ts.json index 76bee6a876ce..99b82b119e1d 100644 --- a/ecmascript/parser/tests/typescript/object/getter-prop/input.ts.json +++ b/ecmascript/parser/tests/typescript/object/getter-prop/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -57,7 +57,6 @@ "ctxt": 0 }, "value": "prop1", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -125,7 +124,6 @@ "ctxt": 0 }, "value": "prop2", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, diff --git a/ecmascript/parser/tests/typescript/object/method-async-generator/input.ts.json b/ecmascript/parser/tests/typescript/object/method-async-generator/input.ts.json index b4e15b615407..9d325ffc66ae 100644 --- a/ecmascript/parser/tests/typescript/object/method-async-generator/input.ts.json +++ b/ecmascript/parser/tests/typescript/object/method-async-generator/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "params": [], @@ -96,7 +95,6 @@ "ctxt": 0 }, "value": "AsyncIterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -122,7 +120,6 @@ "ctxt": 0 }, "value": "DirEntry", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/optional-chaining/chaining-off-optionally-chained-keys-named-class-or-function/input.ts.json b/ecmascript/parser/tests/typescript/optional-chaining/chaining-off-optionally-chained-keys-named-class-or-function/input.ts.json index 36607f9a1538..77c46742c91b 100644 --- a/ecmascript/parser/tests/typescript/optional-chaining/chaining-off-optionally-chained-keys-named-class-or-function/input.ts.json +++ b/ecmascript/parser/tests/typescript/optional-chaining/chaining-off-optionally-chained-keys-named-class-or-function/input.ts.json @@ -47,7 +47,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "class", - "typeAnnotation": null, "optional": false }, "computed": false @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -119,7 +116,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "function", - "typeAnnotation": null, "optional": false }, "computed": false @@ -144,7 +139,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -210,7 +204,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -221,7 +214,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -235,7 +227,6 @@ "ctxt": 0 }, "value": "class", - "typeAnnotation": null, "optional": false }, "computed": false @@ -249,7 +240,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -308,7 +298,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -319,7 +308,6 @@ "ctxt": 0 }, "value": "function", - "typeAnnotation": null, "optional": false }, "computed": false @@ -333,7 +321,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/optional-chaining/class-contructor-call/input.ts.json b/ecmascript/parser/tests/typescript/optional-chaining/class-contructor-call/input.ts.json index a90479c51cf5..ecd592dbfaf3 100644 --- a/ecmascript/parser/tests/typescript/optional-chaining/class-contructor-call/input.ts.json +++ b/ecmascript/parser/tests/typescript/optional-chaining/class-contructor-call/input.ts.json @@ -54,7 +54,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -65,7 +64,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/optional-chaining/function-call/input.ts.json b/ecmascript/parser/tests/typescript/optional-chaining/function-call/input.ts.json index c21bda764c7a..13b7a2d92626 100644 --- a/ecmascript/parser/tests/typescript/optional-chaining/function-call/input.ts.json +++ b/ecmascript/parser/tests/typescript/optional-chaining/function-call/input.ts.json @@ -40,7 +40,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -82,7 +81,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -172,7 +168,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -183,7 +178,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "computed": false @@ -247,7 +241,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -258,7 +251,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "computed": false @@ -275,7 +267,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -289,7 +280,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -339,7 +329,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -350,7 +339,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/optional-chaining/member-access-bracket/input.ts.json b/ecmascript/parser/tests/typescript/optional-chaining/member-access-bracket/input.ts.json index a9f0d6924f21..a27d0e95940a 100644 --- a/ecmascript/parser/tests/typescript/optional-chaining/member-access-bracket/input.ts.json +++ b/ecmascript/parser/tests/typescript/optional-chaining/member-access-bracket/input.ts.json @@ -40,7 +40,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "expr", - "typeAnnotation": null, "optional": false }, "computed": true @@ -111,7 +109,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -122,7 +119,6 @@ "ctxt": 0 }, "value": "expr", - "typeAnnotation": null, "optional": false }, "computed": true @@ -136,7 +132,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "computed": true @@ -177,7 +172,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -246,7 +240,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -315,7 +308,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -326,7 +318,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -339,7 +330,6 @@ "ctxt": 0 }, "value": "expr", - "typeAnnotation": null, "optional": false }, "computed": true @@ -387,7 +377,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -398,7 +387,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/optional-chaining/member-access/input.ts.json b/ecmascript/parser/tests/typescript/optional-chaining/member-access/input.ts.json index 4db1297366a0..f7aa49580185 100644 --- a/ecmascript/parser/tests/typescript/optional-chaining/member-access/input.ts.json +++ b/ecmascript/parser/tests/typescript/optional-chaining/member-access/input.ts.json @@ -40,7 +40,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -111,7 +109,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -122,7 +119,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -136,7 +132,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -195,7 +189,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -208,7 +201,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/optional-chaining/optioanl-chain-expression/input.ts.json b/ecmascript/parser/tests/typescript/optional-chaining/optioanl-chain-expression/input.ts.json index a2d73468d567..5bc9280ffa3c 100644 --- a/ecmascript/parser/tests/typescript/optional-chaining/optioanl-chain-expression/input.ts.json +++ b/ecmascript/parser/tests/typescript/optional-chaining/optioanl-chain-expression/input.ts.json @@ -54,7 +54,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -65,7 +64,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -78,7 +76,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/optional-chaining/optional-constructor/input.ts.json b/ecmascript/parser/tests/typescript/optional-chaining/optional-constructor/input.ts.json index 5239c05b6412..dd6b41fb9c49 100644 --- a/ecmascript/parser/tests/typescript/optional-chaining/optional-constructor/input.ts.json +++ b/ecmascript/parser/tests/typescript/optional-chaining/optional-constructor/input.ts.json @@ -47,7 +47,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/optional-chaining/optional-super-property-class/input.ts.json b/ecmascript/parser/tests/typescript/optional-chaining/optional-super-property-class/input.ts.json index 063ccf5f3482..b09e658ee21d 100644 --- a/ecmascript/parser/tests/typescript/optional-chaining/optional-super-property-class/input.ts.json +++ b/ecmascript/parser/tests/typescript/optional-chaining/optional-super-property-class/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "function": { @@ -103,7 +101,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/optional-chaining/optional-super-property/input.ts.json b/ecmascript/parser/tests/typescript/optional-chaining/optional-super-property/input.ts.json index 4389e5ad6f16..e93f86e96e5e 100644 --- a/ecmascript/parser/tests/typescript/optional-chaining/optional-super-property/input.ts.json +++ b/ecmascript/parser/tests/typescript/optional-chaining/optional-super-property/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "params": [], @@ -112,7 +111,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/optional-chaining/optional-tagged-template-literals/input.ts.json b/ecmascript/parser/tests/typescript/optional-chaining/optional-tagged-template-literals/input.ts.json index f8db16cb124e..473e1ff3b8ae 100644 --- a/ecmascript/parser/tests/typescript/optional-chaining/optional-tagged-template-literals/input.ts.json +++ b/ecmascript/parser/tests/typescript/optional-chaining/optional-tagged-template-literals/input.ts.json @@ -47,7 +47,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/optional-chaining/parenthised-chain/input.ts.json b/ecmascript/parser/tests/typescript/optional-chaining/parenthised-chain/input.ts.json index f3c9401f1a82..6a7136d5901a 100644 --- a/ecmascript/parser/tests/typescript/optional-chaining/parenthised-chain/input.ts.json +++ b/ecmascript/parser/tests/typescript/optional-chaining/parenthised-chain/input.ts.json @@ -54,7 +54,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -65,7 +64,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -141,7 +138,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -152,7 +148,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -167,7 +162,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -262,7 +256,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -273,7 +266,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -288,7 +280,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -302,7 +293,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -315,7 +305,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/optional-chaining/separated-chaining/input.ts.json b/ecmascript/parser/tests/typescript/optional-chaining/separated-chaining/input.ts.json index 84638a6d09da..d7efa717579c 100644 --- a/ecmascript/parser/tests/typescript/optional-chaining/separated-chaining/input.ts.json +++ b/ecmascript/parser/tests/typescript/optional-chaining/separated-chaining/input.ts.json @@ -80,7 +80,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -91,7 +90,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -105,7 +103,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -118,7 +115,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false @@ -144,7 +139,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -213,7 +207,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -224,7 +217,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -237,7 +229,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -250,7 +241,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -264,7 +254,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false @@ -277,7 +266,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/optional-chaining/super-method-class/input.ts.json b/ecmascript/parser/tests/typescript/optional-chaining/super-method-class/input.ts.json index 2f53c706e064..525101a651c3 100644 --- a/ecmascript/parser/tests/typescript/optional-chaining/super-method-class/input.ts.json +++ b/ecmascript/parser/tests/typescript/optional-chaining/super-method-class/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -106,7 +104,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -127,7 +124,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/optional-chaining/type-arguments/input.ts.json b/ecmascript/parser/tests/typescript/optional-chaining/type-arguments/input.ts.json index 472a24d8d226..4cb0a423fc2a 100644 --- a/ecmascript/parser/tests/typescript/optional-chaining/type-arguments/input.ts.json +++ b/ecmascript/parser/tests/typescript/optional-chaining/type-arguments/input.ts.json @@ -54,7 +54,6 @@ "ctxt": 0 }, "value": "example", - "typeAnnotation": null, "optional": false }, "property": { @@ -65,7 +64,6 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -78,7 +76,6 @@ "ctxt": 0 }, "value": "greet", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/regression/destructuring-in-function-type/input.ts.json b/ecmascript/parser/tests/typescript/regression/destructuring-in-function-type/input.ts.json index edfc1b518ffb..57d1041afe58 100644 --- a/ecmascript/parser/tests/typescript/regression/destructuring-in-function-type/input.ts.json +++ b/ecmascript/parser/tests/typescript/regression/destructuring-in-function-type/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "MyType", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -57,7 +56,6 @@ "ctxt": 0 }, "value": "theme", - "typeAnnotation": null, "optional": false }, "value": null diff --git a/ecmascript/parser/tests/typescript/regression/is-default-export/input.ts.json b/ecmascript/parser/tests/typescript/regression/is-default-export/input.ts.json index 7f06768062a4..5023f4770e76 100644 --- a/ecmascript/parser/tests/typescript/regression/is-default-export/input.ts.json +++ b/ecmascript/parser/tests/typescript/regression/is-default-export/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -68,7 +67,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [] @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/regression/tsx-issue-7742/input.ts.json b/ecmascript/parser/tests/typescript/regression/tsx-issue-7742/input.ts.json index 2c7090580a2a..ae13200e584b 100644 --- a/ecmascript/parser/tests/typescript/regression/tsx-issue-7742/input.ts.json +++ b/ecmascript/parser/tests/typescript/regression/tsx-issue-7742/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -81,6 +79,7 @@ "ctxt": 0 }, "value": "bar", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -103,13 +102,11 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -163,7 +159,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/stack-size/input.ts.json b/ecmascript/parser/tests/typescript/stack-size/input.ts.json index 908cee45c212..a1a94c52f9e1 100644 --- a/ecmascript/parser/tests/typescript/stack-size/input.ts.json +++ b/ecmascript/parser/tests/typescript/stack-size/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "params": [], @@ -143,7 +140,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "body": { @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -195,7 +190,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -221,7 +215,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -247,7 +240,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -273,7 +265,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "body": { @@ -299,7 +290,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -325,7 +315,6 @@ "ctxt": 0 }, "value": "asdf", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -351,7 +340,6 @@ "ctxt": 0 }, "value": "asdf", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -385,8 +373,8 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -449,7 +437,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } } @@ -484,7 +471,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/template-literal-type/input.ts.json b/ecmascript/parser/tests/typescript/template-literal-type/input.ts.json index ab0014067427..df84c99b3020 100644 --- a/ecmascript/parser/tests/typescript/template-literal-type/input.ts.json +++ b/ecmascript/parser/tests/typescript/template-literal-type/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "MyAlias", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -99,7 +98,6 @@ "ctxt": 0 }, "value": "OtherAlias", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -242,7 +240,6 @@ "ctxt": 0 }, "value": "MultiLine", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -319,7 +316,6 @@ "ctxt": 0 }, "value": "WithTypes", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -443,7 +439,6 @@ "ctxt": 0 }, "value": "WithTypes2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -477,7 +472,6 @@ "ctxt": 0 }, "value": "MyAlias", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es2017/input.ts.json index 53666a1f689f..1d0d0171a8d2 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es2017/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "async", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -62,7 +62,6 @@ "ctxt": 0 }, "value": "async", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunction10_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunction10_es2017/input.ts.json index a9924942fc57..c5a7bd0f6fbc 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunction10_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunction10_es2017/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -75,6 +75,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -97,13 +98,11 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -137,7 +136,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunction1_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunction1_es2017/input.ts.json index a0f5729b9e6d..45d5df309999 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunction1_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunction1_es2017/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -76,7 +76,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunction2_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunction2_es2017/input.ts.json index dcd7744ac204..e8897f4c1ebf 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunction2_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunction2_es2017/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunction3_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunction3_es2017/input.ts.json index 23c18fe8d136..77bab74fd630 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunction3_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunction3_es2017/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -44,8 +43,8 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -55,7 +54,6 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunction4_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunction4_es2017/input.ts.json index 4bdaa823f580..01a1b348c6d2 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunction4_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunction4_es2017/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunctionCapturesArguments_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunctionCapturesArguments_es2017/input.ts.json index 1f9001c48592..0b66070c30c9 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunctionCapturesArguments_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunctionCapturesArguments_es2017/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -71,7 +69,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -121,8 +118,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -161,7 +158,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "property": { @@ -172,7 +168,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -199,7 +194,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunctionCapturesThis_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunctionCapturesThis_es2017/input.ts.json index 3c898bc1a972..e35d111ee1eb 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunctionCapturesThis_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunctionCapturesThis_es2017/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,8 +84,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunction_allowJs/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunction_allowJs/input.ts.json index bf6dba4d9b24..8d236ed44cda 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunction_allowJs/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncArrowFunction_allowJs/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -85,8 +85,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -139,8 +139,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -211,8 +211,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -230,8 +230,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -274,7 +274,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es2017/input.ts.json index e0d9cc938347..28535da377a8 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es2017/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "someOtherFunction", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -90,7 +89,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -140,8 +138,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -159,8 +157,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -185,7 +183,6 @@ "ctxt": 0 }, "value": "someOtherFunction", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -199,7 +196,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -241,8 +237,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -260,8 +256,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -286,7 +282,6 @@ "ctxt": 0 }, "value": "someOtherFunction", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -300,7 +295,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncAwaitIsolatedModules_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncAwaitIsolatedModules_es2017/input.ts.json index c17da1e145ef..86120a276c5b 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncAwaitIsolatedModules_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncAwaitIsolatedModules_es2017/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "imported": null @@ -77,6 +76,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -99,7 +99,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -122,8 +121,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -155,6 +153,7 @@ "ctxt": 0 }, "value": "mp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -177,7 +176,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -200,8 +198,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -218,7 +215,6 @@ "ctxt": 0 }, "value": "f0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -253,7 +249,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -298,7 +293,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -333,7 +327,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -378,7 +371,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -428,8 +420,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -484,8 +476,8 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -531,7 +523,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -585,8 +576,8 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -632,7 +623,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -686,8 +676,8 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -740,8 +730,8 @@ "ctxt": 0 }, "value": "f8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -785,7 +775,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -839,8 +828,8 @@ "ctxt": 0 }, "value": "f9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -884,7 +873,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -938,8 +926,8 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -957,7 +945,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "async": true, @@ -994,8 +981,8 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1013,7 +1000,6 @@ "ctxt": 0 }, "value": "mp", - "typeAnnotation": null, "optional": false }, "async": true, @@ -1050,8 +1036,8 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1069,7 +1055,6 @@ "ctxt": 0 }, "value": "mp", - "typeAnnotation": null, "optional": false }, "async": true, @@ -1097,7 +1082,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1151,8 +1135,8 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1170,7 +1154,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "async": true, @@ -1198,7 +1181,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1252,8 +1234,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1273,7 +1255,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1307,7 +1288,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1351,7 +1331,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1386,7 +1365,6 @@ "ctxt": 0 }, "value": "m3", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1430,7 +1408,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1471,7 +1448,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1497,7 +1473,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "function": { @@ -1543,7 +1518,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "function": { @@ -1588,7 +1562,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1634,7 +1607,6 @@ "ctxt": 0 }, "value": "m3", - "typeAnnotation": null, "optional": false }, "function": { @@ -1679,7 +1651,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1725,7 +1696,6 @@ "ctxt": 0 }, "value": "m4", - "typeAnnotation": null, "optional": false }, "function": { @@ -1771,7 +1741,6 @@ "ctxt": 0 }, "value": "m5", - "typeAnnotation": null, "optional": false }, "function": { @@ -1816,7 +1785,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1862,7 +1830,6 @@ "ctxt": 0 }, "value": "m6", - "typeAnnotation": null, "optional": false }, "function": { @@ -1907,7 +1874,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1962,7 +1928,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -1990,7 +1955,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncAwait_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncAwait_es2017/input.ts.json index 96c735cc1e47..553580a75ff0 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncAwait_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncAwait_es2017/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -71,7 +69,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -97,7 +94,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -131,6 +127,7 @@ "ctxt": 0 }, "value": "MyPromise", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -153,12 +150,10 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -190,6 +185,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -212,7 +208,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -235,8 +230,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -268,6 +262,7 @@ "ctxt": 0 }, "value": "mp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -290,7 +285,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -313,8 +307,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -331,7 +324,6 @@ "ctxt": 0 }, "value": "f0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -366,7 +358,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -411,7 +402,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -446,7 +436,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -491,7 +480,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -541,8 +529,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -597,8 +585,8 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -644,7 +632,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -698,8 +685,8 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -745,7 +732,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -799,8 +785,8 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -853,8 +839,8 @@ "ctxt": 0 }, "value": "f8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -898,7 +884,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -952,8 +937,8 @@ "ctxt": 0 }, "value": "f9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -997,7 +982,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1051,8 +1035,8 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1070,7 +1054,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "async": true, @@ -1107,8 +1090,8 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1126,7 +1109,6 @@ "ctxt": 0 }, "value": "mp", - "typeAnnotation": null, "optional": false }, "async": true, @@ -1163,8 +1145,8 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1182,7 +1164,6 @@ "ctxt": 0 }, "value": "mp", - "typeAnnotation": null, "optional": false }, "async": true, @@ -1210,7 +1191,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1264,8 +1244,8 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1283,7 +1263,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "async": true, @@ -1311,7 +1290,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1365,8 +1343,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1386,7 +1364,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1420,7 +1397,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1464,7 +1440,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1499,7 +1474,6 @@ "ctxt": 0 }, "value": "m3", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1543,7 +1517,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1584,7 +1557,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1610,7 +1582,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "function": { @@ -1656,7 +1627,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "function": { @@ -1701,7 +1671,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1747,7 +1716,6 @@ "ctxt": 0 }, "value": "m3", - "typeAnnotation": null, "optional": false }, "function": { @@ -1792,7 +1760,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1838,7 +1805,6 @@ "ctxt": 0 }, "value": "m4", - "typeAnnotation": null, "optional": false }, "function": { @@ -1884,7 +1850,6 @@ "ctxt": 0 }, "value": "m5", - "typeAnnotation": null, "optional": false }, "function": { @@ -1929,7 +1894,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1975,7 +1939,6 @@ "ctxt": 0 }, "value": "m6", - "typeAnnotation": null, "optional": false }, "function": { @@ -2020,7 +1983,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2075,7 +2037,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -2103,7 +2064,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2142,7 +2102,6 @@ "ctxt": 0 }, "value": "f14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2176,7 +2135,6 @@ "ctxt": 0 }, "value": "block", - "typeAnnotation": null, "optional": false }, "body": { @@ -2227,7 +2185,6 @@ "ctxt": 0 }, "value": "block", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncMethodWithSuperConflict_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncMethodWithSuperConflict_es6/input.ts.json index bda528880134..aaf525b30459 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncMethodWithSuperConflict_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncMethodWithSuperConflict_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -162,7 +158,6 @@ "ctxt": 0 }, "value": "simple", - "typeAnnotation": null, "optional": false }, "function": { @@ -206,8 +201,8 @@ "ctxt": 0 }, "value": "_super", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NullLiteral", @@ -246,8 +241,8 @@ "ctxt": 0 }, "value": "_superIndex", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NullLiteral", @@ -298,7 +293,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -344,7 +338,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -427,8 +420,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -453,7 +446,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -487,8 +479,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -553,7 +545,6 @@ "ctxt": 0 }, "value": "advanced", - "typeAnnotation": null, "optional": false }, "function": { @@ -597,8 +588,8 @@ "ctxt": 0 }, "value": "_super", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NullLiteral", @@ -637,8 +628,8 @@ "ctxt": 0 }, "value": "_superIndex", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NullLiteral", @@ -677,8 +668,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -743,7 +734,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -826,8 +816,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -852,7 +842,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -886,8 +875,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -962,7 +951,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -975,7 +963,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -1034,7 +1021,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -1079,7 +1065,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -1105,7 +1090,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1131,7 +1115,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } ] @@ -1179,7 +1162,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -1234,7 +1216,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } ] @@ -1264,7 +1245,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncMethodWithSuper_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncMethodWithSuper_es2017/input.ts.json index 2634aaf010ce..c9f51cef7a1c 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncMethodWithSuper_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncMethodWithSuper_es2017/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -162,7 +158,6 @@ "ctxt": 0 }, "value": "simple", - "typeAnnotation": null, "optional": false }, "function": { @@ -218,7 +213,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -264,7 +258,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -347,8 +340,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -373,7 +366,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -407,8 +399,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -473,7 +465,6 @@ "ctxt": 0 }, "value": "advanced", - "typeAnnotation": null, "optional": false }, "function": { @@ -517,8 +508,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -583,7 +574,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -666,8 +656,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -692,7 +682,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -726,8 +715,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -802,7 +791,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -815,7 +803,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -874,7 +861,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -919,7 +905,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -945,7 +930,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -971,7 +955,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } ] @@ -1019,7 +1002,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -1074,7 +1056,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } ] @@ -1104,7 +1085,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncUseStrict_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncUseStrict_es2017/input.ts.json index f417fd41009d..9a08503224f3 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncUseStrict_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/asyncUseStrict_es2017/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -209,8 +207,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -235,7 +233,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -247,7 +244,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -282,7 +278,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitBinaryExpression/awaitBinaryExpression1_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitBinaryExpression/awaitBinaryExpression1_es2017/input.ts.json index b775ca208dfe..949f622dcfd9 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitBinaryExpression/awaitBinaryExpression1_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitBinaryExpression/awaitBinaryExpression1_es2017/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -186,7 +184,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -229,7 +226,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -270,7 +266,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -302,8 +297,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -328,7 +323,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -340,7 +334,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -370,7 +363,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -404,7 +396,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitBinaryExpression/awaitBinaryExpression2_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitBinaryExpression/awaitBinaryExpression2_es2017/input.ts.json index 9b687f720d58..4c1703ac21ef 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitBinaryExpression/awaitBinaryExpression2_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitBinaryExpression/awaitBinaryExpression2_es2017/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -186,7 +184,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -229,7 +226,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -270,7 +266,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -302,8 +297,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -328,7 +323,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -340,7 +334,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -370,7 +363,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -404,7 +396,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitBinaryExpression/awaitBinaryExpression3_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitBinaryExpression/awaitBinaryExpression3_es2017/input.ts.json index de8bbe955ca7..43a66f6639ac 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitBinaryExpression/awaitBinaryExpression3_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitBinaryExpression/awaitBinaryExpression3_es2017/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -186,7 +184,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -229,7 +226,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -270,7 +266,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -302,8 +297,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -328,7 +323,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -340,7 +334,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -370,7 +363,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -404,7 +396,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitBinaryExpression/awaitBinaryExpression4_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitBinaryExpression/awaitBinaryExpression4_es2017/input.ts.json index d0d142098c46..61e342ee4ed2 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitBinaryExpression/awaitBinaryExpression4_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitBinaryExpression/awaitBinaryExpression4_es2017/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -186,7 +184,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -229,7 +226,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -270,7 +266,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -302,8 +297,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -335,7 +330,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -347,7 +341,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } ] @@ -379,7 +372,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -413,7 +405,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitBinaryExpression/awaitBinaryExpression5_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitBinaryExpression/awaitBinaryExpression5_es2017/input.ts.json index 5410ff351454..4729fc72e1f3 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitBinaryExpression/awaitBinaryExpression5_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitBinaryExpression/awaitBinaryExpression5_es2017/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -186,7 +184,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -229,7 +226,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -270,7 +266,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -302,6 +297,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -333,7 +329,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -361,8 +356,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -399,7 +393,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -410,7 +403,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -430,7 +422,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -458,7 +449,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -492,7 +482,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression1_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression1_es2017/input.ts.json index 60b86191094f..5604867cfa6a 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression1_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression1_es2017/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -164,6 +162,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,8 +179,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -200,6 +198,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +215,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -236,6 +234,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -252,8 +251,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -310,6 +308,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,7 +340,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,6 +353,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +370,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -382,6 +380,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,8 +397,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -409,6 +407,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -425,8 +424,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -450,8 +448,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +480,7 @@ "ctxt": 0 }, "value": "pfn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,7 +503,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -540,6 +537,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +554,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -567,6 +564,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +581,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -594,6 +591,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,8 +608,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -638,8 +635,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,6 +667,7 @@ "ctxt": 0 }, "value": "po", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -693,7 +690,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -728,7 +724,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -742,6 +737,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,8 +754,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -769,6 +764,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,8 +781,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -796,6 +791,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -812,8 +808,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -840,8 +835,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -858,7 +852,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -901,7 +894,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -944,7 +936,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -985,7 +976,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1017,8 +1007,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1035,7 +1025,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1049,7 +1038,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1063,7 +1051,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1077,7 +1064,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1110,7 +1096,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1144,7 +1129,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression2_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression2_es2017/input.ts.json index d34f9b80d1d9..2777e56bd81a 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression2_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression2_es2017/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -164,6 +162,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,8 +179,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -200,6 +198,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +215,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -236,6 +234,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -252,8 +251,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -310,6 +308,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,7 +340,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,6 +353,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +370,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -382,6 +380,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,8 +397,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -409,6 +407,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -425,8 +424,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -450,8 +448,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +480,7 @@ "ctxt": 0 }, "value": "pfn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,7 +503,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -540,6 +537,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +554,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -567,6 +564,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +581,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -594,6 +591,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,8 +608,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -638,8 +635,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,6 +667,7 @@ "ctxt": 0 }, "value": "po", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -693,7 +690,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -728,7 +724,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -742,6 +737,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,8 +754,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -769,6 +764,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,8 +781,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -796,6 +791,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -812,8 +808,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -840,8 +835,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -858,7 +852,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -901,7 +894,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -944,7 +936,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -985,7 +976,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1017,8 +1007,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1035,7 +1025,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1056,7 +1045,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1071,7 +1059,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1085,7 +1072,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1118,7 +1104,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1152,7 +1137,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression3_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression3_es2017/input.ts.json index a7e8ca9ae658..cbd332731cb5 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression3_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression3_es2017/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -164,6 +162,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,8 +179,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -200,6 +198,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +215,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -236,6 +234,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -252,8 +251,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -310,6 +308,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,7 +340,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,6 +353,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +370,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -382,6 +380,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,8 +397,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -409,6 +407,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -425,8 +424,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -450,8 +448,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +480,7 @@ "ctxt": 0 }, "value": "pfn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,7 +503,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -540,6 +537,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +554,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -567,6 +564,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +581,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -594,6 +591,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,8 +608,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -638,8 +635,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,6 +667,7 @@ "ctxt": 0 }, "value": "po", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -693,7 +690,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -728,7 +724,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -742,6 +737,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,8 +754,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -769,6 +764,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,8 +781,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -796,6 +791,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -812,8 +808,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -840,8 +835,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -858,7 +852,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -901,7 +894,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -944,7 +936,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -985,7 +976,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1017,8 +1007,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1035,7 +1025,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1049,7 +1038,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1070,7 +1058,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1085,7 +1072,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1118,7 +1104,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1152,7 +1137,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression4_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression4_es2017/input.ts.json index 783f0ebc8cb3..863572b30d02 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression4_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression4_es2017/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -164,6 +162,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,8 +179,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -200,6 +198,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +215,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -236,6 +234,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -252,8 +251,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -310,6 +308,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,7 +340,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,6 +353,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +370,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -382,6 +380,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,8 +397,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -409,6 +407,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -425,8 +424,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -450,8 +448,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +480,7 @@ "ctxt": 0 }, "value": "pfn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,7 +503,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -540,6 +537,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +554,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -567,6 +564,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +581,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -594,6 +591,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,8 +608,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -638,8 +635,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,6 +667,7 @@ "ctxt": 0 }, "value": "po", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -693,7 +690,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -728,7 +724,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -742,6 +737,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,8 +754,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -769,6 +764,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,8 +781,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -796,6 +791,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -812,8 +808,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -840,8 +835,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -858,7 +852,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -901,7 +894,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -944,7 +936,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -985,7 +976,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1017,8 +1007,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1049,7 +1039,6 @@ "ctxt": 0 }, "value": "pfn", - "typeAnnotation": null, "optional": false } } @@ -1065,7 +1054,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1079,7 +1067,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1093,7 +1080,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1126,7 +1112,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1160,7 +1145,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression5_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression5_es2017/input.ts.json index 00bfdf307322..b4cc61320d7e 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression5_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression5_es2017/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -164,6 +162,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,8 +179,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -200,6 +198,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +215,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -236,6 +234,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -252,8 +251,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -310,6 +308,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,7 +340,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,6 +353,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +370,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -382,6 +380,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,8 +397,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -409,6 +407,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -425,8 +424,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -450,8 +448,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +480,7 @@ "ctxt": 0 }, "value": "pfn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,7 +503,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -540,6 +537,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +554,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -567,6 +564,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +581,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -594,6 +591,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,8 +608,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -638,8 +635,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,6 +667,7 @@ "ctxt": 0 }, "value": "po", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -693,7 +690,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -728,7 +724,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -742,6 +737,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,8 +754,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -769,6 +764,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,8 +781,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -796,6 +791,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -812,8 +808,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -840,8 +835,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -858,7 +852,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -901,7 +894,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -944,7 +936,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -985,7 +976,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1017,8 +1007,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1042,7 +1032,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -1053,7 +1042,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1069,7 +1057,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1083,7 +1070,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1097,7 +1083,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1130,7 +1115,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1164,7 +1148,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression6_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression6_es2017/input.ts.json index f98df5c4d186..354489944e63 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression6_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression6_es2017/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -164,6 +162,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,8 +179,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -200,6 +198,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +215,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -236,6 +234,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -252,8 +251,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -310,6 +308,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,7 +340,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,6 +353,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +370,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -382,6 +380,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,8 +397,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -409,6 +407,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -425,8 +424,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -450,8 +448,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +480,7 @@ "ctxt": 0 }, "value": "pfn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,7 +503,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -540,6 +537,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +554,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -567,6 +564,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +581,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -594,6 +591,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,8 +608,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -638,8 +635,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,6 +667,7 @@ "ctxt": 0 }, "value": "po", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -693,7 +690,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -728,7 +724,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -742,6 +737,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,8 +754,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -769,6 +764,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,8 +781,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -796,6 +791,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -812,8 +808,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -840,8 +835,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -858,7 +852,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -901,7 +894,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -944,7 +936,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -985,7 +976,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1017,8 +1007,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1042,7 +1032,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -1053,7 +1042,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1076,7 +1064,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1091,7 +1078,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1105,7 +1091,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1138,7 +1123,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1172,7 +1156,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression7_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression7_es2017/input.ts.json index 5dd90f072606..d4d335b1f495 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression7_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression7_es2017/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -164,6 +162,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,8 +179,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -200,6 +198,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +215,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -236,6 +234,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -252,8 +251,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -310,6 +308,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,7 +340,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,6 +353,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +370,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -382,6 +380,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,8 +397,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -409,6 +407,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -425,8 +424,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -450,8 +448,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +480,7 @@ "ctxt": 0 }, "value": "pfn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,7 +503,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -540,6 +537,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +554,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -567,6 +564,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +581,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -594,6 +591,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,8 +608,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -638,8 +635,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,6 +667,7 @@ "ctxt": 0 }, "value": "po", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -693,7 +690,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -728,7 +724,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -742,6 +737,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,8 +754,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -769,6 +764,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,8 +781,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -796,6 +791,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -812,8 +808,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -840,8 +835,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -858,7 +852,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -901,7 +894,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -944,7 +936,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -985,7 +976,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1017,8 +1007,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1042,7 +1032,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -1053,7 +1042,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1069,7 +1057,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1090,7 +1077,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1105,7 +1091,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1138,7 +1123,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1172,7 +1156,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression8_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression8_es2017/input.ts.json index 3c2a4f074858..81f1ed0951c4 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression8_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitCallExpression/awaitCallExpression8_es2017/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -164,6 +162,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,8 +179,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -200,6 +198,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +215,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -236,6 +234,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -252,8 +251,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -310,6 +308,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,7 +340,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,6 +353,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +370,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -382,6 +380,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,8 +397,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -409,6 +407,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -425,8 +424,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -450,8 +448,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +480,7 @@ "ctxt": 0 }, "value": "pfn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,7 +503,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -540,6 +537,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +554,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -567,6 +564,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +581,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -594,6 +591,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,8 +608,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -638,8 +635,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,6 +667,7 @@ "ctxt": 0 }, "value": "po", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -693,7 +690,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -728,7 +724,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -742,6 +737,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,8 +754,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -769,6 +764,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,8 +781,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -796,6 +791,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -812,8 +808,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -840,8 +835,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -858,7 +852,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -901,7 +894,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -944,7 +936,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -985,7 +976,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1017,8 +1007,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1056,7 +1046,6 @@ "ctxt": 0 }, "value": "po", - "typeAnnotation": null, "optional": false } } @@ -1069,7 +1058,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1085,7 +1073,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1099,7 +1086,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1113,7 +1099,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1146,7 +1131,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1180,7 +1164,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitClassExpression_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitClassExpression_es2017/input.ts.json index b193ea4a09ec..bb173a4724a8 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitClassExpression_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitClassExpression_es2017/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -58,6 +57,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,7 +80,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -106,15 +105,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -131,7 +128,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -160,7 +156,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -193,7 +188,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -230,7 +224,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitInheritedPromise_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitInheritedPromise_es2017/input.ts.json index e2d97a808c74..d46a16b26242 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitInheritedPromise_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/awaitInheritedPromise_es2017/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -101,6 +99,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -123,13 +122,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -146,7 +143,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -187,7 +183,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/await_unaryExpression_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/await_unaryExpression_es2017/input.ts.json index 7cf1eafd185d..00c9244f24bc 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/await_unaryExpression_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/await_unaryExpression_es2017/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +85,6 @@ "ctxt": 0 }, "value": "bar1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -156,7 +154,6 @@ "ctxt": 0 }, "value": "bar3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -226,7 +223,6 @@ "ctxt": 0 }, "value": "bar4", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/await_unaryExpression_es2017_1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/await_unaryExpression_es2017_1/input.ts.json index 1f13513a586c..cee4621db71a 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/await_unaryExpression_es2017_1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/await_unaryExpression_es2017_1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +85,6 @@ "ctxt": 0 }, "value": "bar1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -156,7 +154,6 @@ "ctxt": 0 }, "value": "bar2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -226,7 +223,6 @@ "ctxt": 0 }, "value": "bar3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -296,7 +292,6 @@ "ctxt": 0 }, "value": "bar4", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/await_unaryExpression_es2017_2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/await_unaryExpression_es2017_2/input.ts.json index 9f6e3aec2a38..56680b5db595 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/await_unaryExpression_es2017_2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/await_unaryExpression_es2017_2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "bar1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +85,6 @@ "ctxt": 0 }, "value": "bar2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -156,7 +154,6 @@ "ctxt": 0 }, "value": "bar3", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration11_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration11_es2017/input.ts.json index 1e4d539ba058..49e14471b9cb 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration11_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration11_es2017/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -61,7 +60,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration13_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration13_es2017/input.ts.json index ee44f429a912..07944d888987 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration13_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration13_es2017/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,6 +59,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -82,13 +82,11 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -122,7 +120,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration14_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration14_es2017/input.ts.json index 24889b84a10f..f3f28eaa87f2 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration14_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration14_es2017/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration1_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration1_es2017/input.ts.json index 097ace7a4cf0..b69c2da4c454 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration1_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration1_es2017/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -61,7 +60,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration2_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration2_es2017/input.ts.json index 3dadca457ace..ff75e61c7ed0 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration2_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration2_es2017/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration3_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration3_es2017/input.ts.json index 23c18fe8d136..77bab74fd630 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration3_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration3_es2017/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -44,8 +43,8 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -55,7 +54,6 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration4_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration4_es2017/input.ts.json index 1fa1aa23dd05..ca27ad71dba4 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration4_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration4_es2017/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration8_es2017/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration8_es2017/input.ts.json index 49723dbe54a0..0d4fb331966b 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration8_es2017/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es2017/functionDeclarations/asyncFunctionDeclaration8_es2017/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -59,7 +59,6 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, "optional": false } }, @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncAliasReturnType_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncAliasReturnType_es5/input.ts.json index 9177ed0ef47a..767e6afb153f 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncAliasReturnType_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncAliasReturnType_es5/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "PromiseAlias", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -71,7 +69,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -97,7 +94,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -116,7 +112,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -161,7 +156,6 @@ "ctxt": 0 }, "value": "PromiseAlias", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es5/input.ts.json index 9e43481ba38e..1f430a89605b 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "async", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -62,7 +62,6 @@ "ctxt": 0 }, "value": "async", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunction10_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunction10_es5/input.ts.json index 3bc40a7da053..5d112c42c8f1 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunction10_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunction10_es5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -75,6 +75,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -97,13 +98,11 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -137,7 +136,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunction11_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunction11_es5/input.ts.json index ff11c0de957d..d589489d0809 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunction11_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunction11_es5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -73,8 +71,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -147,7 +145,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "property": { @@ -158,7 +155,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "computed": false @@ -193,8 +189,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunction1_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunction1_es5/input.ts.json index 23c5ec3e1982..445cea7902c8 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunction1_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunction1_es5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -76,7 +76,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunction2_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunction2_es5/input.ts.json index ecaabad63df9..7a43dc9df51b 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunction2_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunction2_es5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunction3_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunction3_es5/input.ts.json index 5015993c979d..e1cb3ccdb1b0 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunction3_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunction3_es5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -44,8 +43,8 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -55,7 +54,6 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunction4_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunction4_es5/input.ts.json index f25265c77d3e..20139e241e30 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunction4_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunction4_es5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunctionCapturesArguments_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunctionCapturesArguments_es5/input.ts.json index a3b60f01f9ff..77f0817d8f1c 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunctionCapturesArguments_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunctionCapturesArguments_es5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -71,7 +69,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -121,8 +118,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -161,7 +158,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "property": { @@ -172,7 +168,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -199,7 +194,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunctionCapturesThis_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunctionCapturesThis_es5/input.ts.json index 8bb582de59ff..2b01dede01cd 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunctionCapturesThis_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncArrowFunctionCapturesThis_es5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,8 +84,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es5/input.ts.json index 74ff5a18eb4c..c5698ba4069f 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "someOtherFunction", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -90,7 +89,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -140,8 +138,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -159,8 +157,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -185,7 +183,6 @@ "ctxt": 0 }, "value": "someOtherFunction", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -199,7 +196,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -241,8 +237,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -260,8 +256,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -286,7 +282,6 @@ "ctxt": 0 }, "value": "someOtherFunction", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -300,7 +295,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncAwaitIsolatedModules_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncAwaitIsolatedModules_es5/input.ts.json index b16b5e5a6180..ca079985c6a2 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncAwaitIsolatedModules_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncAwaitIsolatedModules_es5/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "imported": null @@ -77,6 +76,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -99,7 +99,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -122,8 +121,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -155,6 +153,7 @@ "ctxt": 0 }, "value": "mp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -177,7 +176,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -200,8 +198,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -218,7 +215,6 @@ "ctxt": 0 }, "value": "f0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -253,7 +249,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -298,7 +293,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -333,7 +327,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -378,7 +371,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -428,8 +420,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -484,8 +476,8 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -531,7 +523,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -585,8 +576,8 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -632,7 +623,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -686,8 +676,8 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -740,8 +730,8 @@ "ctxt": 0 }, "value": "f8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -785,7 +775,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -839,8 +828,8 @@ "ctxt": 0 }, "value": "f9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -884,7 +873,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -938,8 +926,8 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -957,7 +945,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "async": true, @@ -994,8 +981,8 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1013,7 +1000,6 @@ "ctxt": 0 }, "value": "mp", - "typeAnnotation": null, "optional": false }, "async": true, @@ -1050,8 +1036,8 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1069,7 +1055,6 @@ "ctxt": 0 }, "value": "mp", - "typeAnnotation": null, "optional": false }, "async": true, @@ -1097,7 +1082,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1151,8 +1135,8 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1170,7 +1154,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "async": true, @@ -1198,7 +1181,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1252,8 +1234,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1273,7 +1255,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1307,7 +1288,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1351,7 +1331,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1386,7 +1365,6 @@ "ctxt": 0 }, "value": "m3", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1430,7 +1408,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1471,7 +1448,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1497,7 +1473,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "function": { @@ -1543,7 +1518,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "function": { @@ -1588,7 +1562,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1634,7 +1607,6 @@ "ctxt": 0 }, "value": "m3", - "typeAnnotation": null, "optional": false }, "function": { @@ -1679,7 +1651,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1725,7 +1696,6 @@ "ctxt": 0 }, "value": "m4", - "typeAnnotation": null, "optional": false }, "function": { @@ -1771,7 +1741,6 @@ "ctxt": 0 }, "value": "m5", - "typeAnnotation": null, "optional": false }, "function": { @@ -1816,7 +1785,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1862,7 +1830,6 @@ "ctxt": 0 }, "value": "m6", - "typeAnnotation": null, "optional": false }, "function": { @@ -1907,7 +1874,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1962,7 +1928,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -1990,7 +1955,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncAwaitNestedClasses_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncAwaitNestedClasses_es5/input.ts.json index 95cfd09c996e..ec4db0e7487a 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncAwaitNestedClasses_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncAwaitNestedClasses_es5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "value": { @@ -55,7 +53,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "span": { @@ -80,7 +77,6 @@ "ctxt": 0 }, "value": "func2", - "typeAnnotation": null, "optional": false }, "function": { @@ -121,7 +117,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -143,8 +138,8 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -177,7 +172,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -235,7 +229,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -281,7 +274,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "value": { @@ -294,7 +286,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "span": { @@ -319,7 +310,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "function": { @@ -374,7 +364,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "property": { @@ -385,7 +374,6 @@ "ctxt": 0 }, "value": "func2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -494,7 +482,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -505,7 +492,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -518,7 +504,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "computed": false @@ -531,7 +516,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncAwait_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncAwait_es5/input.ts.json index bee4efb52751..993cfea37eb1 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncAwait_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncAwait_es5/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -71,7 +69,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -97,7 +94,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -131,6 +127,7 @@ "ctxt": 0 }, "value": "MyPromise", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -153,12 +150,10 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -190,6 +185,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -212,7 +208,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -235,8 +230,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -268,6 +262,7 @@ "ctxt": 0 }, "value": "mp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -290,7 +285,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -313,8 +307,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -331,7 +324,6 @@ "ctxt": 0 }, "value": "f0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -366,7 +358,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -411,7 +402,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -446,7 +436,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -491,7 +480,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -541,8 +529,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -597,8 +585,8 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -644,7 +632,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -698,8 +685,8 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -745,7 +732,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -799,8 +785,8 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -853,8 +839,8 @@ "ctxt": 0 }, "value": "f8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -898,7 +884,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -952,8 +937,8 @@ "ctxt": 0 }, "value": "f9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -997,7 +982,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1051,8 +1035,8 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1070,7 +1054,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "async": true, @@ -1107,8 +1090,8 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1126,7 +1109,6 @@ "ctxt": 0 }, "value": "mp", - "typeAnnotation": null, "optional": false }, "async": true, @@ -1163,8 +1145,8 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1182,7 +1164,6 @@ "ctxt": 0 }, "value": "mp", - "typeAnnotation": null, "optional": false }, "async": true, @@ -1210,7 +1191,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1264,8 +1244,8 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1283,7 +1263,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "async": true, @@ -1311,7 +1290,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1365,8 +1343,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1386,7 +1364,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1420,7 +1397,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1464,7 +1440,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1499,7 +1474,6 @@ "ctxt": 0 }, "value": "m3", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1543,7 +1517,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1584,7 +1557,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1610,7 +1582,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "function": { @@ -1656,7 +1627,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "function": { @@ -1701,7 +1671,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1747,7 +1716,6 @@ "ctxt": 0 }, "value": "m3", - "typeAnnotation": null, "optional": false }, "function": { @@ -1792,7 +1760,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1838,7 +1805,6 @@ "ctxt": 0 }, "value": "m4", - "typeAnnotation": null, "optional": false }, "function": { @@ -1884,7 +1850,6 @@ "ctxt": 0 }, "value": "m5", - "typeAnnotation": null, "optional": false }, "function": { @@ -1929,7 +1894,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1975,7 +1939,6 @@ "ctxt": 0 }, "value": "m6", - "typeAnnotation": null, "optional": false }, "function": { @@ -2020,7 +1983,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2075,7 +2037,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -2103,7 +2064,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2142,7 +2102,6 @@ "ctxt": 0 }, "value": "f14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2176,7 +2135,6 @@ "ctxt": 0 }, "value": "block", - "typeAnnotation": null, "optional": false }, "body": { @@ -2227,7 +2185,6 @@ "ctxt": 0 }, "value": "block", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncImportedPromise_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncImportedPromise_es5/input.ts.json index 58e9caa56aae..c631704a3444 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncImportedPromise_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncImportedPromise_es5/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Task", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -133,7 +129,6 @@ "ctxt": 0 }, "value": "Task", - "typeAnnotation": null, "optional": false }, "imported": null @@ -166,7 +161,6 @@ "ctxt": 0 }, "value": "Test", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -192,7 +186,6 @@ "ctxt": 0 }, "value": "example", - "typeAnnotation": null, "optional": false }, "function": { @@ -247,7 +240,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -277,7 +269,6 @@ "ctxt": 0 }, "value": "Task", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -303,7 +294,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncMethodWithSuper_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncMethodWithSuper_es5/input.ts.json index 4ed3a517796c..6c5aafc3b938 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncMethodWithSuper_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncMethodWithSuper_es5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -162,7 +158,6 @@ "ctxt": 0 }, "value": "simple", - "typeAnnotation": null, "optional": false }, "function": { @@ -218,7 +213,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -264,7 +258,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -347,8 +340,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -373,7 +366,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -407,8 +399,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -473,7 +465,6 @@ "ctxt": 0 }, "value": "advanced", - "typeAnnotation": null, "optional": false }, "function": { @@ -517,8 +508,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -583,7 +574,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -666,8 +656,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -692,7 +682,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -726,8 +715,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -802,7 +791,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -815,7 +803,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -874,7 +861,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -919,7 +905,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -945,7 +930,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -971,7 +955,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } ] @@ -1019,7 +1002,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -1074,7 +1056,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } ] @@ -1104,7 +1085,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncMultiFile_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncMultiFile_es5/input.ts.json index 3dfe7bfb495b..6ab0b517bc15 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncMultiFile_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncMultiFile_es5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncUseStrict_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncUseStrict_es5/input.ts.json index 8313b514f6a6..741680e80cc6 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/asyncUseStrict_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/asyncUseStrict_es5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -209,8 +207,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -235,7 +233,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -247,7 +244,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -282,7 +278,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitBinaryExpression/awaitBinaryExpression1_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitBinaryExpression/awaitBinaryExpression1_es5/input.ts.json index b571e22473ec..1559b95c8146 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitBinaryExpression/awaitBinaryExpression1_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitBinaryExpression/awaitBinaryExpression1_es5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -186,7 +184,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -229,7 +226,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -270,7 +266,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -302,8 +297,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -328,7 +323,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -340,7 +334,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -370,7 +363,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -404,7 +396,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitBinaryExpression/awaitBinaryExpression2_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitBinaryExpression/awaitBinaryExpression2_es5/input.ts.json index 76c1177f6b0f..f0855ee2e542 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitBinaryExpression/awaitBinaryExpression2_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitBinaryExpression/awaitBinaryExpression2_es5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -186,7 +184,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -229,7 +226,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -270,7 +266,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -302,8 +297,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -328,7 +323,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -340,7 +334,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -370,7 +363,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -404,7 +396,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitBinaryExpression/awaitBinaryExpression3_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitBinaryExpression/awaitBinaryExpression3_es5/input.ts.json index f7b784e838ef..b4943fe29921 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitBinaryExpression/awaitBinaryExpression3_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitBinaryExpression/awaitBinaryExpression3_es5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -186,7 +184,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -229,7 +226,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -270,7 +266,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -302,8 +297,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -328,7 +323,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -340,7 +334,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -370,7 +363,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -404,7 +396,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitBinaryExpression/awaitBinaryExpression4_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitBinaryExpression/awaitBinaryExpression4_es5/input.ts.json index 96157607cc19..ef1577c6b1e9 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitBinaryExpression/awaitBinaryExpression4_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitBinaryExpression/awaitBinaryExpression4_es5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -186,7 +184,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -229,7 +226,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -270,7 +266,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -302,8 +297,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -335,7 +330,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -347,7 +341,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } ] @@ -379,7 +372,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -413,7 +405,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitBinaryExpression/awaitBinaryExpression5_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitBinaryExpression/awaitBinaryExpression5_es5/input.ts.json index 2bf6c63a42f6..4a8d3ea8b842 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitBinaryExpression/awaitBinaryExpression5_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitBinaryExpression/awaitBinaryExpression5_es5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -186,7 +184,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -229,7 +226,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -270,7 +266,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -302,6 +297,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -333,7 +329,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -361,8 +356,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -399,7 +393,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -410,7 +403,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -430,7 +422,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -458,7 +449,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -492,7 +482,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression1_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression1_es5/input.ts.json index 97d442b60f23..47e6a0f57ac1 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression1_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression1_es5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -164,6 +162,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,8 +179,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -200,6 +198,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +215,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -236,6 +234,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -252,8 +251,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -310,6 +308,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,7 +340,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,6 +353,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +370,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -382,6 +380,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,8 +397,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -409,6 +407,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -425,8 +424,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -450,8 +448,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +480,7 @@ "ctxt": 0 }, "value": "pfn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,7 +503,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -540,6 +537,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +554,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -567,6 +564,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +581,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -594,6 +591,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,8 +608,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -638,8 +635,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,6 +667,7 @@ "ctxt": 0 }, "value": "po", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -693,7 +690,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -728,7 +724,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -742,6 +737,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,8 +754,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -769,6 +764,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,8 +781,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -796,6 +791,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -812,8 +808,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -840,8 +835,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -858,7 +852,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -901,7 +894,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -944,7 +936,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -985,7 +976,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1017,8 +1007,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1035,7 +1025,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1049,7 +1038,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1063,7 +1051,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1077,7 +1064,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1110,7 +1096,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1144,7 +1129,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression2_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression2_es5/input.ts.json index 54b9eb5c52c9..255099c081e6 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression2_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression2_es5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -164,6 +162,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,8 +179,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -200,6 +198,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +215,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -236,6 +234,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -252,8 +251,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -310,6 +308,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,7 +340,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,6 +353,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +370,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -382,6 +380,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,8 +397,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -409,6 +407,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -425,8 +424,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -450,8 +448,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +480,7 @@ "ctxt": 0 }, "value": "pfn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,7 +503,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -540,6 +537,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +554,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -567,6 +564,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +581,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -594,6 +591,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,8 +608,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -638,8 +635,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,6 +667,7 @@ "ctxt": 0 }, "value": "po", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -693,7 +690,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -728,7 +724,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -742,6 +737,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,8 +754,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -769,6 +764,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,8 +781,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -796,6 +791,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -812,8 +808,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -840,8 +835,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -858,7 +852,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -901,7 +894,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -944,7 +936,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -985,7 +976,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1017,8 +1007,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1035,7 +1025,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1056,7 +1045,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1071,7 +1059,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1085,7 +1072,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1118,7 +1104,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1152,7 +1137,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression3_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression3_es5/input.ts.json index b3fd0cdf4b58..0a1d1da6ca43 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression3_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression3_es5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -164,6 +162,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,8 +179,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -200,6 +198,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +215,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -236,6 +234,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -252,8 +251,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -310,6 +308,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,7 +340,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,6 +353,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +370,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -382,6 +380,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,8 +397,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -409,6 +407,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -425,8 +424,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -450,8 +448,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +480,7 @@ "ctxt": 0 }, "value": "pfn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,7 +503,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -540,6 +537,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +554,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -567,6 +564,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +581,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -594,6 +591,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,8 +608,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -638,8 +635,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,6 +667,7 @@ "ctxt": 0 }, "value": "po", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -693,7 +690,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -728,7 +724,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -742,6 +737,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,8 +754,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -769,6 +764,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,8 +781,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -796,6 +791,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -812,8 +808,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -840,8 +835,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -858,7 +852,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -901,7 +894,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -944,7 +936,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -985,7 +976,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1017,8 +1007,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1035,7 +1025,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1049,7 +1038,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1070,7 +1058,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1085,7 +1072,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1118,7 +1104,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1152,7 +1137,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression4_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression4_es5/input.ts.json index 1fb189bb5a65..bdd80cd728e5 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression4_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression4_es5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -164,6 +162,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,8 +179,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -200,6 +198,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +215,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -236,6 +234,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -252,8 +251,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -310,6 +308,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,7 +340,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,6 +353,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +370,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -382,6 +380,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,8 +397,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -409,6 +407,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -425,8 +424,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -450,8 +448,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +480,7 @@ "ctxt": 0 }, "value": "pfn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,7 +503,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -540,6 +537,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +554,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -567,6 +564,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +581,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -594,6 +591,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,8 +608,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -638,8 +635,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,6 +667,7 @@ "ctxt": 0 }, "value": "po", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -693,7 +690,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -728,7 +724,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -742,6 +737,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,8 +754,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -769,6 +764,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,8 +781,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -796,6 +791,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -812,8 +808,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -840,8 +835,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -858,7 +852,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -901,7 +894,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -944,7 +936,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -985,7 +976,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1017,8 +1007,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1049,7 +1039,6 @@ "ctxt": 0 }, "value": "pfn", - "typeAnnotation": null, "optional": false } } @@ -1065,7 +1054,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1079,7 +1067,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1093,7 +1080,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1126,7 +1112,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1160,7 +1145,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression5_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression5_es5/input.ts.json index efa432ed7a29..cb649ff2e367 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression5_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression5_es5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -164,6 +162,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,8 +179,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -200,6 +198,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +215,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -236,6 +234,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -252,8 +251,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -310,6 +308,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,7 +340,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,6 +353,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +370,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -382,6 +380,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,8 +397,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -409,6 +407,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -425,8 +424,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -450,8 +448,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +480,7 @@ "ctxt": 0 }, "value": "pfn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,7 +503,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -540,6 +537,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +554,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -567,6 +564,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +581,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -594,6 +591,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,8 +608,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -638,8 +635,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,6 +667,7 @@ "ctxt": 0 }, "value": "po", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -693,7 +690,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -728,7 +724,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -742,6 +737,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,8 +754,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -769,6 +764,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,8 +781,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -796,6 +791,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -812,8 +808,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -840,8 +835,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -858,7 +852,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -901,7 +894,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -944,7 +936,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -985,7 +976,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1017,8 +1007,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1042,7 +1032,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -1053,7 +1042,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1069,7 +1057,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1083,7 +1070,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1097,7 +1083,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1130,7 +1115,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1164,7 +1148,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression6_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression6_es5/input.ts.json index 57199a816c53..a769f98fbd9f 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression6_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression6_es5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -164,6 +162,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,8 +179,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -200,6 +198,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +215,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -236,6 +234,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -252,8 +251,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -310,6 +308,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,7 +340,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,6 +353,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +370,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -382,6 +380,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,8 +397,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -409,6 +407,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -425,8 +424,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -450,8 +448,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +480,7 @@ "ctxt": 0 }, "value": "pfn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,7 +503,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -540,6 +537,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +554,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -567,6 +564,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +581,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -594,6 +591,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,8 +608,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -638,8 +635,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,6 +667,7 @@ "ctxt": 0 }, "value": "po", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -693,7 +690,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -728,7 +724,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -742,6 +737,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,8 +754,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -769,6 +764,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,8 +781,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -796,6 +791,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -812,8 +808,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -840,8 +835,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -858,7 +852,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -901,7 +894,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -944,7 +936,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -985,7 +976,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1017,8 +1007,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1042,7 +1032,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -1053,7 +1042,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1076,7 +1064,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1091,7 +1078,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1105,7 +1091,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1138,7 +1123,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1172,7 +1156,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression7_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression7_es5/input.ts.json index ec50912e73dc..789eef9bbdb5 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression7_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression7_es5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -164,6 +162,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,8 +179,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -200,6 +198,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +215,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -236,6 +234,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -252,8 +251,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -310,6 +308,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,7 +340,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,6 +353,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +370,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -382,6 +380,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,8 +397,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -409,6 +407,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -425,8 +424,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -450,8 +448,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +480,7 @@ "ctxt": 0 }, "value": "pfn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,7 +503,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -540,6 +537,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +554,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -567,6 +564,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +581,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -594,6 +591,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,8 +608,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -638,8 +635,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,6 +667,7 @@ "ctxt": 0 }, "value": "po", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -693,7 +690,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -728,7 +724,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -742,6 +737,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,8 +754,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -769,6 +764,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,8 +781,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -796,6 +791,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -812,8 +808,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -840,8 +835,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -858,7 +852,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -901,7 +894,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -944,7 +936,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -985,7 +976,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1017,8 +1007,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1042,7 +1032,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -1053,7 +1042,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1069,7 +1057,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1090,7 +1077,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1105,7 +1091,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1138,7 +1123,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1172,7 +1156,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression8_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression8_es5/input.ts.json index 226d33a4b151..73d352b0ffae 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression8_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitCallExpression/awaitCallExpression8_es5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -164,6 +162,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,8 +179,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -200,6 +198,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +215,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -236,6 +234,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -252,8 +251,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -310,6 +308,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,7 +340,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,6 +353,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +370,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -382,6 +380,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,8 +397,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -409,6 +407,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -425,8 +424,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -450,8 +448,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +480,7 @@ "ctxt": 0 }, "value": "pfn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,7 +503,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -540,6 +537,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +554,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -567,6 +564,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +581,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -594,6 +591,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,8 +608,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -638,8 +635,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,6 +667,7 @@ "ctxt": 0 }, "value": "po", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -693,7 +690,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -728,7 +724,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -742,6 +737,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,8 +754,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -769,6 +764,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,8 +781,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -796,6 +791,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -812,8 +808,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -840,8 +835,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -858,7 +852,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -901,7 +894,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -944,7 +936,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -985,7 +976,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1017,8 +1007,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1056,7 +1046,6 @@ "ctxt": 0 }, "value": "po", - "typeAnnotation": null, "optional": false } } @@ -1069,7 +1058,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1085,7 +1073,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1099,7 +1086,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1113,7 +1099,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1146,7 +1131,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1180,7 +1164,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitClassExpression_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitClassExpression_es5/input.ts.json index 1646cdb3e213..eb0b1faadbf8 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitClassExpression_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitClassExpression_es5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -58,6 +57,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,7 +80,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -106,15 +105,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -131,7 +128,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -160,7 +156,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -193,7 +188,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -230,7 +224,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitUnion_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitUnion_es5/input.ts.json index 1ea65687b720..3d2066cf5abe 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/awaitUnion_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/awaitUnion_es5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -99,6 +99,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -129,7 +130,6 @@ "ctxt": 0 }, "value": "PromiseLike", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -167,7 +167,6 @@ "ctxt": 0 }, "value": "PromiseLike", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -192,8 +191,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -225,6 +223,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -247,7 +246,6 @@ "ctxt": 0 }, "value": "PromiseLike", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -289,8 +287,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -322,6 +319,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -361,7 +359,6 @@ "ctxt": 0 }, "value": "PromiseLike", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -386,8 +383,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -419,6 +415,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -458,7 +455,6 @@ "ctxt": 0 }, "value": "PromiseLike", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -502,8 +498,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -520,7 +515,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -564,8 +558,8 @@ "ctxt": 0 }, "value": "await_a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -582,7 +576,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -615,8 +608,8 @@ "ctxt": 0 }, "value": "await_b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -633,7 +626,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -666,8 +658,8 @@ "ctxt": 0 }, "value": "await_c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -684,7 +676,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -717,8 +708,8 @@ "ctxt": 0 }, "value": "await_d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -735,7 +726,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -768,8 +758,8 @@ "ctxt": 0 }, "value": "await_e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -786,7 +776,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration11_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration11_es5/input.ts.json index b15d2873ff20..16715b48a0af 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration11_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration11_es5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -61,7 +60,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration13_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration13_es5/input.ts.json index cbf32a0d27a7..bf3b5269b28c 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration13_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration13_es5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,6 +59,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -82,13 +82,11 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -122,7 +120,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration14_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration14_es5/input.ts.json index a330bc17b236..3230d9f30e74 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration14_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration14_es5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration1_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration1_es5/input.ts.json index a913ecfca611..830d9b800e39 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration1_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration1_es5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -61,7 +60,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration2_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration2_es5/input.ts.json index f1a2a9a84b4d..a897940745a2 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration2_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration2_es5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration3_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration3_es5/input.ts.json index 5015993c979d..e1cb3ccdb1b0 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration3_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration3_es5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -44,8 +43,8 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -55,7 +54,6 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration4_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration4_es5/input.ts.json index 8fe64df84ee0..bac27baf16b1 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration4_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration4_es5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration8_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration8_es5/input.ts.json index 7e98cf98fa92..253609782aee 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration8_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclaration8_es5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -59,7 +59,6 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, "optional": false } }, @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclarationCapturesArguments_es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclarationCapturesArguments_es5/input.ts.json index 0a7fd62345aa..1256af1f0441 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclarationCapturesArguments_es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es5/functionDeclarations/asyncFunctionDeclarationCapturesArguments_es5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -71,7 +69,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -106,7 +103,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -161,7 +157,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "property": { @@ -172,7 +167,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -199,7 +193,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncAliasReturnType_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncAliasReturnType_es6/input.ts.json index 47bfb7be564a..8238a9ca2b11 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncAliasReturnType_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncAliasReturnType_es6/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "PromiseAlias", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -71,7 +69,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -97,7 +94,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -116,7 +112,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -161,7 +156,6 @@ "ctxt": 0 }, "value": "PromiseAlias", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es6/input.ts.json index 53666a1f689f..1d0d0171a8d2 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "async", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -62,7 +62,6 @@ "ctxt": 0 }, "value": "async", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunction10_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunction10_es6/input.ts.json index b8980517b8a1..ed5b6176c303 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunction10_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunction10_es6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -75,6 +75,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -97,13 +98,11 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -137,7 +136,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunction1_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunction1_es6/input.ts.json index cef850a89a89..fc44d80f3d76 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunction1_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunction1_es6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -76,7 +76,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunction2_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunction2_es6/input.ts.json index 96e7328afc67..5478d8a9e295 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunction2_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunction2_es6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunction3_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunction3_es6/input.ts.json index e37cdd12f06f..300b406d58e6 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunction3_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunction3_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -44,8 +43,8 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -55,7 +54,6 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunction4_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunction4_es6/input.ts.json index 15553aadb897..38c223254cfa 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunction4_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunction4_es6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunctionCapturesArguments_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunctionCapturesArguments_es6/input.ts.json index 67676052c557..887517eafc33 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunctionCapturesArguments_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunctionCapturesArguments_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -71,7 +69,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -121,8 +118,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -161,7 +158,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "property": { @@ -172,7 +168,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -199,7 +194,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunctionCapturesThis_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunctionCapturesThis_es6/input.ts.json index 97cae7896460..0f1804ba780e 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunctionCapturesThis_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncArrowFunctionCapturesThis_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,8 +84,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es6/input.ts.json index ac6ff5d93cb7..4ece9e7a5d56 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncArrowFunction/asyncUnParenthesizedArrowFunction_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "someOtherFunction", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -90,7 +89,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -140,8 +138,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -159,8 +157,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -185,7 +183,6 @@ "ctxt": 0 }, "value": "someOtherFunction", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -199,7 +196,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -241,8 +237,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -260,8 +256,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -286,7 +282,6 @@ "ctxt": 0 }, "value": "someOtherFunction", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -300,7 +295,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncAwaitIsolatedModules_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncAwaitIsolatedModules_es6/input.ts.json index 57094a769164..8a9ee27a2c7c 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncAwaitIsolatedModules_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncAwaitIsolatedModules_es6/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "imported": null @@ -77,6 +76,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -99,7 +99,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -122,8 +121,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -155,6 +153,7 @@ "ctxt": 0 }, "value": "mp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -177,7 +176,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -200,8 +198,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -218,7 +215,6 @@ "ctxt": 0 }, "value": "f0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -253,7 +249,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -298,7 +293,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -333,7 +327,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -378,7 +371,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -428,8 +420,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -484,8 +476,8 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -531,7 +523,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -585,8 +576,8 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -632,7 +623,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -686,8 +676,8 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -740,8 +730,8 @@ "ctxt": 0 }, "value": "f8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -785,7 +775,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -839,8 +828,8 @@ "ctxt": 0 }, "value": "f9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -884,7 +873,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -938,8 +926,8 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -957,7 +945,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "async": true, @@ -994,8 +981,8 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1013,7 +1000,6 @@ "ctxt": 0 }, "value": "mp", - "typeAnnotation": null, "optional": false }, "async": true, @@ -1050,8 +1036,8 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1069,7 +1055,6 @@ "ctxt": 0 }, "value": "mp", - "typeAnnotation": null, "optional": false }, "async": true, @@ -1097,7 +1082,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1151,8 +1135,8 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1170,7 +1154,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "async": true, @@ -1198,7 +1181,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1252,8 +1234,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1273,7 +1255,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1307,7 +1288,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1351,7 +1331,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1386,7 +1365,6 @@ "ctxt": 0 }, "value": "m3", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1430,7 +1408,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1471,7 +1448,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1497,7 +1473,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "function": { @@ -1543,7 +1518,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "function": { @@ -1588,7 +1562,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1634,7 +1607,6 @@ "ctxt": 0 }, "value": "m3", - "typeAnnotation": null, "optional": false }, "function": { @@ -1679,7 +1651,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1725,7 +1696,6 @@ "ctxt": 0 }, "value": "m4", - "typeAnnotation": null, "optional": false }, "function": { @@ -1771,7 +1741,6 @@ "ctxt": 0 }, "value": "m5", - "typeAnnotation": null, "optional": false }, "function": { @@ -1816,7 +1785,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1862,7 +1830,6 @@ "ctxt": 0 }, "value": "m6", - "typeAnnotation": null, "optional": false }, "function": { @@ -1907,7 +1874,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1962,7 +1928,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -1990,7 +1955,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncAwait_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncAwait_es6/input.ts.json index d7a5dcb32700..ba162c8cc4b5 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncAwait_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncAwait_es6/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -71,7 +69,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -97,7 +94,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -131,6 +127,7 @@ "ctxt": 0 }, "value": "MyPromise", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -153,12 +150,10 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -190,6 +185,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -212,7 +208,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -235,8 +230,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -268,6 +262,7 @@ "ctxt": 0 }, "value": "mp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -290,7 +285,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -313,8 +307,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -331,7 +324,6 @@ "ctxt": 0 }, "value": "f0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -366,7 +358,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -411,7 +402,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -446,7 +436,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -491,7 +480,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -541,8 +529,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -597,8 +585,8 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -644,7 +632,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -698,8 +685,8 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -745,7 +732,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -799,8 +785,8 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -853,8 +839,8 @@ "ctxt": 0 }, "value": "f8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -898,7 +884,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -952,8 +937,8 @@ "ctxt": 0 }, "value": "f9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -997,7 +982,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1051,8 +1035,8 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1070,7 +1054,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "async": true, @@ -1107,8 +1090,8 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1126,7 +1109,6 @@ "ctxt": 0 }, "value": "mp", - "typeAnnotation": null, "optional": false }, "async": true, @@ -1163,8 +1145,8 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1182,7 +1164,6 @@ "ctxt": 0 }, "value": "mp", - "typeAnnotation": null, "optional": false }, "async": true, @@ -1210,7 +1191,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1264,8 +1244,8 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1283,7 +1263,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "async": true, @@ -1311,7 +1290,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1365,8 +1343,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1386,7 +1364,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1420,7 +1397,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1464,7 +1440,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1499,7 +1474,6 @@ "ctxt": 0 }, "value": "m3", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1543,7 +1517,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1584,7 +1557,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1610,7 +1582,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "function": { @@ -1656,7 +1627,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "function": { @@ -1701,7 +1671,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1747,7 +1716,6 @@ "ctxt": 0 }, "value": "m3", - "typeAnnotation": null, "optional": false }, "function": { @@ -1792,7 +1760,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1838,7 +1805,6 @@ "ctxt": 0 }, "value": "m4", - "typeAnnotation": null, "optional": false }, "function": { @@ -1884,7 +1850,6 @@ "ctxt": 0 }, "value": "m5", - "typeAnnotation": null, "optional": false }, "function": { @@ -1929,7 +1894,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1975,7 +1939,6 @@ "ctxt": 0 }, "value": "m6", - "typeAnnotation": null, "optional": false }, "function": { @@ -2020,7 +1983,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2075,7 +2037,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -2103,7 +2064,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2142,7 +2102,6 @@ "ctxt": 0 }, "value": "f14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2176,7 +2135,6 @@ "ctxt": 0 }, "value": "block", - "typeAnnotation": null, "optional": false }, "body": { @@ -2227,7 +2185,6 @@ "ctxt": 0 }, "value": "block", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncImportedPromise_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncImportedPromise_es6/input.ts.json index aa4589c24dca..0a37f2d9a5a3 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncImportedPromise_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncImportedPromise_es6/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Task", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -133,7 +129,6 @@ "ctxt": 0 }, "value": "Task", - "typeAnnotation": null, "optional": false }, "imported": null @@ -166,7 +161,6 @@ "ctxt": 0 }, "value": "Test", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -192,7 +186,6 @@ "ctxt": 0 }, "value": "example", - "typeAnnotation": null, "optional": false }, "function": { @@ -247,7 +240,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -277,7 +269,6 @@ "ctxt": 0 }, "value": "Task", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -303,7 +294,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncMethodWithSuper_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncMethodWithSuper_es6/input.ts.json index 7a731ce7087a..feb09ba4eae7 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncMethodWithSuper_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncMethodWithSuper_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -162,7 +158,6 @@ "ctxt": 0 }, "value": "simple", - "typeAnnotation": null, "optional": false }, "function": { @@ -218,7 +213,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -264,7 +258,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -347,8 +340,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -373,7 +366,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -407,8 +399,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -473,7 +465,6 @@ "ctxt": 0 }, "value": "advanced", - "typeAnnotation": null, "optional": false }, "function": { @@ -517,8 +508,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -583,7 +574,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -666,8 +656,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -692,7 +682,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -726,8 +715,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -802,7 +791,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -815,7 +803,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -874,7 +861,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -919,7 +905,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -945,7 +930,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -971,7 +955,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } ] @@ -1019,7 +1002,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -1074,7 +1056,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } ] @@ -1134,7 +1115,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1271,7 +1251,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1384,7 +1363,6 @@ "ctxt": 0 }, "value": "property_access_only_read_only", - "typeAnnotation": null, "optional": false }, "function": { @@ -1440,7 +1418,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1474,8 +1451,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1500,7 +1477,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1561,7 +1537,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1628,7 +1603,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1671,7 +1645,6 @@ "ctxt": 0 }, "value": "property_access_only_write_only", - "typeAnnotation": null, "optional": false }, "function": { @@ -1715,8 +1688,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1782,7 +1755,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1795,7 +1767,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -1840,7 +1811,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -1866,7 +1836,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1892,7 +1861,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } ] @@ -1953,7 +1921,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1966,7 +1933,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -2030,7 +1996,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2043,7 +2008,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -2082,7 +2046,6 @@ "ctxt": 0 }, "value": "element_access_only_read_only", - "typeAnnotation": null, "optional": false }, "function": { @@ -2175,8 +2138,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2381,7 +2344,6 @@ "ctxt": 0 }, "value": "element_access_only_write_only", - "typeAnnotation": null, "optional": false }, "function": { @@ -2425,8 +2387,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -2508,7 +2470,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -2553,7 +2514,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -2608,7 +2568,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } ] @@ -2685,7 +2644,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -2765,7 +2723,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -2804,7 +2761,6 @@ "ctxt": 0 }, "value": "property_access_only_read_only_in_generator", - "typeAnnotation": null, "optional": false }, "function": { @@ -2860,7 +2816,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2894,8 +2849,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2920,7 +2875,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2981,7 +2935,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3048,7 +3001,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3091,7 +3043,6 @@ "ctxt": 0 }, "value": "property_access_only_write_only_in_generator", - "typeAnnotation": null, "optional": false }, "function": { @@ -3135,8 +3086,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -3202,7 +3153,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3215,7 +3165,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -3260,7 +3209,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -3286,7 +3234,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3312,7 +3259,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } ] @@ -3373,7 +3319,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3386,7 +3331,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -3450,7 +3394,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3463,7 +3406,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -3502,7 +3444,6 @@ "ctxt": 0 }, "value": "element_access_only_read_only_in_generator", - "typeAnnotation": null, "optional": false }, "function": { @@ -3595,8 +3536,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3801,7 +3742,6 @@ "ctxt": 0 }, "value": "element_access_only_write_only_in_generator", - "typeAnnotation": null, "optional": false }, "function": { @@ -3845,8 +3785,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -3928,7 +3868,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -3973,7 +3912,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -4028,7 +3966,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } ] @@ -4105,7 +4042,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -4185,7 +4121,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -4218,7 +4153,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncMultiFile_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncMultiFile_es6/input.ts.json index 082fcd639dba..2eb7cae3b806 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncMultiFile_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncMultiFile_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncUseStrict_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncUseStrict_es6/input.ts.json index 1b181f291c89..3b93b40dd4a9 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncUseStrict_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncUseStrict_es6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -209,8 +207,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -235,7 +233,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -247,7 +244,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -282,7 +278,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncWithVarShadowing_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncWithVarShadowing_es6/input.ts.json index 2c16acc0dfb2..ac4ec954e600 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/asyncWithVarShadowing_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/asyncWithVarShadowing_es6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -65,7 +65,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,8 +85,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -130,8 +129,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -155,7 +154,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -176,8 +174,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -220,8 +218,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -241,8 +239,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -266,7 +264,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -287,8 +284,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -331,8 +328,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -356,7 +353,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -377,8 +373,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -421,8 +417,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -432,7 +428,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -456,7 +451,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -477,8 +471,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -536,7 +530,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -553,7 +546,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -577,7 +569,6 @@ "ctxt": 0 }, "value": "fn6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -598,8 +589,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -657,7 +648,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -677,7 +667,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null @@ -694,7 +683,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -718,7 +706,6 @@ "ctxt": 0 }, "value": "fn7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -739,8 +726,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -798,7 +785,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -809,7 +795,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -825,7 +810,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -849,7 +833,6 @@ "ctxt": 0 }, "value": "fn8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -870,8 +853,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -924,7 +907,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -935,8 +917,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -951,7 +933,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -975,7 +956,6 @@ "ctxt": 0 }, "value": "fn9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -996,8 +976,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1050,7 +1030,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -1076,7 +1055,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -1098,7 +1076,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1122,7 +1099,6 @@ "ctxt": 0 }, "value": "fn10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1143,8 +1119,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1197,7 +1173,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -1230,7 +1205,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -1247,7 +1221,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1265,7 +1238,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1289,7 +1261,6 @@ "ctxt": 0 }, "value": "fn11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1310,8 +1281,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1374,8 +1345,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1391,7 +1362,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1415,7 +1385,6 @@ "ctxt": 0 }, "value": "fn12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1436,8 +1405,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1488,8 +1457,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1503,7 +1472,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1527,7 +1495,6 @@ "ctxt": 0 }, "value": "fn13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1548,8 +1515,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1607,8 +1574,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1618,7 +1585,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1635,7 +1601,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1659,7 +1624,6 @@ "ctxt": 0 }, "value": "fn14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1680,8 +1644,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1733,8 +1697,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1748,7 +1712,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1772,7 +1735,6 @@ "ctxt": 0 }, "value": "fn15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1793,8 +1755,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1857,8 +1819,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1874,7 +1836,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1898,7 +1859,6 @@ "ctxt": 0 }, "value": "fn16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1919,8 +1879,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1979,8 +1939,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1998,7 +1958,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2022,7 +1981,6 @@ "ctxt": 0 }, "value": "fn17", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2043,8 +2001,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -2110,8 +2068,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -2125,7 +2083,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -2142,7 +2099,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2166,7 +2122,6 @@ "ctxt": 0 }, "value": "fn18", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2202,7 +2157,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -2252,8 +2206,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -2277,7 +2231,6 @@ "ctxt": 0 }, "value": "fn19", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2306,8 +2259,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -2354,8 +2307,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -2379,7 +2332,6 @@ "ctxt": 0 }, "value": "fn20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2400,8 +2352,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -2452,8 +2404,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -2479,7 +2431,6 @@ "ctxt": 0 }, "value": "fn21", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2500,8 +2451,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -2534,7 +2485,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -2570,8 +2520,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -2599,7 +2549,6 @@ "ctxt": 0 }, "value": "fn22", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2620,8 +2569,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -2654,7 +2603,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -2699,8 +2647,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -2727,7 +2675,6 @@ "ctxt": 0 }, "value": "fn23", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2748,8 +2695,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -2807,8 +2754,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -2832,8 +2779,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -2864,7 +2811,6 @@ "ctxt": 0 }, "value": "fn24", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2885,8 +2831,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -2935,8 +2881,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -2971,8 +2917,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -3001,7 +2947,6 @@ "ctxt": 0 }, "value": "fn25", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3022,8 +2967,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -3072,8 +3017,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -3108,8 +3053,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -3138,7 +3083,6 @@ "ctxt": 0 }, "value": "fn26", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3159,8 +3103,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -3224,7 +3168,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -3266,8 +3209,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -3296,7 +3239,6 @@ "ctxt": 0 }, "value": "fn27", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3317,8 +3259,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -3386,8 +3328,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -3414,7 +3356,6 @@ "ctxt": 0 }, "value": "fn28", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3435,8 +3376,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -3469,7 +3410,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "body": { @@ -3505,8 +3445,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -3533,7 +3473,6 @@ "ctxt": 0 }, "value": "fn29", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3554,8 +3493,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -3588,7 +3527,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "body": { @@ -3624,8 +3562,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -3652,7 +3590,6 @@ "ctxt": 0 }, "value": "fn30", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3673,8 +3610,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -3724,8 +3661,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -3735,7 +3672,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3771,7 +3707,6 @@ "ctxt": 0 }, "value": "fn31", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3792,8 +3727,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -3858,7 +3793,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -3875,7 +3809,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3911,7 +3844,6 @@ "ctxt": 0 }, "value": "fn32", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3932,8 +3864,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -3994,8 +3926,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -4022,7 +3954,6 @@ "ctxt": 0 }, "value": "fn33", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4043,6 +3974,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4059,8 +3991,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -4110,8 +4041,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -4126,7 +4057,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "body": { @@ -4156,7 +4086,6 @@ "ctxt": 0 }, "value": "fn34", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4177,8 +4106,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -4228,8 +4157,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -4244,7 +4173,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "body": { @@ -4280,8 +4208,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -4308,7 +4236,6 @@ "ctxt": 0 }, "value": "fn35", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4329,8 +4256,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -4381,8 +4308,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -4397,7 +4324,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "body": { @@ -4427,7 +4353,6 @@ "ctxt": 0 }, "value": "fn36", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4448,8 +4373,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -4515,7 +4440,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -4537,7 +4461,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "body": { @@ -4567,7 +4490,6 @@ "ctxt": 0 }, "value": "fn37", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4588,8 +4510,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -4640,8 +4562,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -4656,7 +4578,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "body": { @@ -4692,8 +4613,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -4720,7 +4641,6 @@ "ctxt": 0 }, "value": "fn38", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4741,8 +4661,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -4775,7 +4695,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -4794,7 +4713,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "consequent": [ @@ -4823,8 +4741,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -4852,7 +4770,6 @@ "ctxt": 0 }, "value": "fn39", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4873,8 +4790,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -4907,7 +4824,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "body": { @@ -4943,8 +4859,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -4966,7 +4882,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -4990,7 +4905,6 @@ "ctxt": 0 }, "value": "fn40", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5011,8 +4925,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -5087,8 +5001,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitBinaryExpression/awaitBinaryExpression1_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitBinaryExpression/awaitBinaryExpression1_es6/input.ts.json index 160dbc11095d..4db7e2e36e4f 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitBinaryExpression/awaitBinaryExpression1_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitBinaryExpression/awaitBinaryExpression1_es6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -186,7 +184,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -229,7 +226,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -270,7 +266,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -302,8 +297,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -328,7 +323,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -340,7 +334,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -370,7 +363,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -404,7 +396,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitBinaryExpression/awaitBinaryExpression2_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitBinaryExpression/awaitBinaryExpression2_es6/input.ts.json index 973173f6ba39..7e14b79b0b90 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitBinaryExpression/awaitBinaryExpression2_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitBinaryExpression/awaitBinaryExpression2_es6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -186,7 +184,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -229,7 +226,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -270,7 +266,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -302,8 +297,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -328,7 +323,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -340,7 +334,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -370,7 +363,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -404,7 +396,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitBinaryExpression/awaitBinaryExpression3_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitBinaryExpression/awaitBinaryExpression3_es6/input.ts.json index 3411cabfa2f9..4151c4e0baf3 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitBinaryExpression/awaitBinaryExpression3_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitBinaryExpression/awaitBinaryExpression3_es6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -186,7 +184,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -229,7 +226,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -270,7 +266,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -302,8 +297,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -328,7 +323,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -340,7 +334,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -370,7 +363,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -404,7 +396,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitBinaryExpression/awaitBinaryExpression4_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitBinaryExpression/awaitBinaryExpression4_es6/input.ts.json index d631ba563415..1b69fdd7d75e 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitBinaryExpression/awaitBinaryExpression4_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitBinaryExpression/awaitBinaryExpression4_es6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -186,7 +184,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -229,7 +226,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -270,7 +266,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -302,8 +297,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -335,7 +330,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -347,7 +341,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } ] @@ -379,7 +372,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -413,7 +405,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitBinaryExpression/awaitBinaryExpression5_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitBinaryExpression/awaitBinaryExpression5_es6/input.ts.json index 312a2bf9d0b3..e535ac983dc3 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitBinaryExpression/awaitBinaryExpression5_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitBinaryExpression/awaitBinaryExpression5_es6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -186,7 +184,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -229,7 +226,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -270,7 +266,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -302,6 +297,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -333,7 +329,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -361,8 +356,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -399,7 +393,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -410,7 +403,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -430,7 +422,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -458,7 +449,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -492,7 +482,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression1_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression1_es6/input.ts.json index 86fc09c7f8d6..a5755314abe3 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression1_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression1_es6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -164,6 +162,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,8 +179,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -200,6 +198,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +215,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -236,6 +234,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -252,8 +251,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -310,6 +308,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,7 +340,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,6 +353,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +370,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -382,6 +380,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,8 +397,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -409,6 +407,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -425,8 +424,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -450,8 +448,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +480,7 @@ "ctxt": 0 }, "value": "pfn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,7 +503,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -540,6 +537,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +554,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -567,6 +564,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +581,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -594,6 +591,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,8 +608,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -638,8 +635,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,6 +667,7 @@ "ctxt": 0 }, "value": "po", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -693,7 +690,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -728,7 +724,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -742,6 +737,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,8 +754,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -769,6 +764,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,8 +781,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -796,6 +791,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -812,8 +808,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -840,8 +835,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -858,7 +852,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -901,7 +894,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -944,7 +936,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -985,7 +976,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1017,8 +1007,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1035,7 +1025,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1049,7 +1038,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1063,7 +1051,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1077,7 +1064,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1110,7 +1096,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1144,7 +1129,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression2_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression2_es6/input.ts.json index 1086fa61cef2..2d936f3b1fe8 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression2_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression2_es6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -164,6 +162,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,8 +179,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -200,6 +198,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +215,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -236,6 +234,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -252,8 +251,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -310,6 +308,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,7 +340,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,6 +353,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +370,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -382,6 +380,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,8 +397,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -409,6 +407,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -425,8 +424,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -450,8 +448,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +480,7 @@ "ctxt": 0 }, "value": "pfn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,7 +503,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -540,6 +537,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +554,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -567,6 +564,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +581,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -594,6 +591,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,8 +608,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -638,8 +635,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,6 +667,7 @@ "ctxt": 0 }, "value": "po", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -693,7 +690,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -728,7 +724,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -742,6 +737,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,8 +754,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -769,6 +764,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,8 +781,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -796,6 +791,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -812,8 +808,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -840,8 +835,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -858,7 +852,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -901,7 +894,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -944,7 +936,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -985,7 +976,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1017,8 +1007,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1035,7 +1025,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1056,7 +1045,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1071,7 +1059,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1085,7 +1072,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1118,7 +1104,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1152,7 +1137,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression3_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression3_es6/input.ts.json index bcd2d17fd642..6bec05a7805a 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression3_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression3_es6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -164,6 +162,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,8 +179,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -200,6 +198,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +215,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -236,6 +234,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -252,8 +251,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -310,6 +308,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,7 +340,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,6 +353,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +370,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -382,6 +380,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,8 +397,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -409,6 +407,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -425,8 +424,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -450,8 +448,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +480,7 @@ "ctxt": 0 }, "value": "pfn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,7 +503,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -540,6 +537,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +554,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -567,6 +564,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +581,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -594,6 +591,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,8 +608,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -638,8 +635,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,6 +667,7 @@ "ctxt": 0 }, "value": "po", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -693,7 +690,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -728,7 +724,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -742,6 +737,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,8 +754,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -769,6 +764,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,8 +781,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -796,6 +791,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -812,8 +808,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -840,8 +835,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -858,7 +852,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -901,7 +894,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -944,7 +936,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -985,7 +976,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1017,8 +1007,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1035,7 +1025,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1049,7 +1038,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1070,7 +1058,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1085,7 +1072,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1118,7 +1104,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1152,7 +1137,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression4_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression4_es6/input.ts.json index 458551fa1df4..273397328af6 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression4_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression4_es6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -164,6 +162,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,8 +179,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -200,6 +198,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +215,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -236,6 +234,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -252,8 +251,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -310,6 +308,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,7 +340,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,6 +353,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +370,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -382,6 +380,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,8 +397,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -409,6 +407,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -425,8 +424,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -450,8 +448,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +480,7 @@ "ctxt": 0 }, "value": "pfn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,7 +503,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -540,6 +537,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +554,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -567,6 +564,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +581,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -594,6 +591,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,8 +608,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -638,8 +635,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,6 +667,7 @@ "ctxt": 0 }, "value": "po", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -693,7 +690,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -728,7 +724,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -742,6 +737,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,8 +754,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -769,6 +764,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,8 +781,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -796,6 +791,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -812,8 +808,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -840,8 +835,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -858,7 +852,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -901,7 +894,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -944,7 +936,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -985,7 +976,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1017,8 +1007,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1049,7 +1039,6 @@ "ctxt": 0 }, "value": "pfn", - "typeAnnotation": null, "optional": false } } @@ -1065,7 +1054,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1079,7 +1067,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1093,7 +1080,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1126,7 +1112,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1160,7 +1145,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression5_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression5_es6/input.ts.json index 485f2f9e37ad..099f411b29ac 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression5_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression5_es6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -164,6 +162,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,8 +179,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -200,6 +198,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +215,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -236,6 +234,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -252,8 +251,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -310,6 +308,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,7 +340,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,6 +353,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +370,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -382,6 +380,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,8 +397,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -409,6 +407,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -425,8 +424,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -450,8 +448,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +480,7 @@ "ctxt": 0 }, "value": "pfn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,7 +503,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -540,6 +537,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +554,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -567,6 +564,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +581,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -594,6 +591,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,8 +608,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -638,8 +635,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,6 +667,7 @@ "ctxt": 0 }, "value": "po", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -693,7 +690,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -728,7 +724,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -742,6 +737,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,8 +754,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -769,6 +764,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,8 +781,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -796,6 +791,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -812,8 +808,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -840,8 +835,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -858,7 +852,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -901,7 +894,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -944,7 +936,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -985,7 +976,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1017,8 +1007,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1042,7 +1032,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -1053,7 +1042,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1069,7 +1057,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1083,7 +1070,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1097,7 +1083,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1130,7 +1115,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1164,7 +1148,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression6_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression6_es6/input.ts.json index c745b2b35828..e29f2fd3b4f4 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression6_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression6_es6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -164,6 +162,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,8 +179,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -200,6 +198,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +215,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -236,6 +234,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -252,8 +251,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -310,6 +308,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,7 +340,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,6 +353,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +370,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -382,6 +380,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,8 +397,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -409,6 +407,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -425,8 +424,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -450,8 +448,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +480,7 @@ "ctxt": 0 }, "value": "pfn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,7 +503,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -540,6 +537,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +554,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -567,6 +564,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +581,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -594,6 +591,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,8 +608,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -638,8 +635,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,6 +667,7 @@ "ctxt": 0 }, "value": "po", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -693,7 +690,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -728,7 +724,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -742,6 +737,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,8 +754,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -769,6 +764,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,8 +781,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -796,6 +791,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -812,8 +808,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -840,8 +835,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -858,7 +852,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -901,7 +894,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -944,7 +936,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -985,7 +976,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1017,8 +1007,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1042,7 +1032,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -1053,7 +1042,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1076,7 +1064,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1091,7 +1078,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1105,7 +1091,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1138,7 +1123,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1172,7 +1156,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression7_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression7_es6/input.ts.json index 1744774b999c..658480a67725 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression7_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression7_es6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -164,6 +162,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,8 +179,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -200,6 +198,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +215,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -236,6 +234,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -252,8 +251,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -310,6 +308,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,7 +340,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,6 +353,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +370,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -382,6 +380,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,8 +397,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -409,6 +407,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -425,8 +424,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -450,8 +448,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +480,7 @@ "ctxt": 0 }, "value": "pfn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,7 +503,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -540,6 +537,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +554,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -567,6 +564,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +581,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -594,6 +591,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,8 +608,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -638,8 +635,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,6 +667,7 @@ "ctxt": 0 }, "value": "po", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -693,7 +690,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -728,7 +724,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -742,6 +737,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,8 +754,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -769,6 +764,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,8 +781,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -796,6 +791,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -812,8 +808,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -840,8 +835,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -858,7 +852,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -901,7 +894,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -944,7 +936,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -985,7 +976,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1017,8 +1007,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1042,7 +1032,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -1053,7 +1042,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1069,7 +1057,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1090,7 +1077,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1105,7 +1091,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1138,7 +1123,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1172,7 +1156,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression8_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression8_es6/input.ts.json index 449ef3f7eea2..24131d05c7d9 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression8_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitCallExpression/awaitCallExpression8_es6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,8 +125,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -164,6 +162,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,8 +179,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -200,6 +198,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +215,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -236,6 +234,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -252,8 +251,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -310,6 +308,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,7 +340,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,6 +353,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +370,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -382,6 +380,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,8 +397,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -409,6 +407,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -425,8 +424,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -450,8 +448,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +480,7 @@ "ctxt": 0 }, "value": "pfn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,7 +503,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -540,6 +537,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +554,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -567,6 +564,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +581,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -594,6 +591,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,8 +608,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -638,8 +635,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,6 +667,7 @@ "ctxt": 0 }, "value": "po", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -693,7 +690,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -728,7 +724,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -742,6 +737,7 @@ "ctxt": 0 }, "value": "arg0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,8 +754,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -769,6 +764,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,8 +781,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -796,6 +791,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -812,8 +808,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -840,8 +835,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -858,7 +852,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -901,7 +894,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -944,7 +936,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -985,7 +976,6 @@ "ctxt": 0 }, "value": "before", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1017,8 +1007,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1056,7 +1046,6 @@ "ctxt": 0 }, "value": "po", - "typeAnnotation": null, "optional": false } } @@ -1069,7 +1058,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1085,7 +1073,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1099,7 +1086,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1113,7 +1099,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1146,7 +1131,6 @@ "ctxt": 0 }, "value": "after", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1180,7 +1164,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitClassExpression_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitClassExpression_es6/input.ts.json index f3184c0eb8bc..f83007da561c 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitClassExpression_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitClassExpression_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -58,6 +57,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,7 +80,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -106,15 +105,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -131,7 +128,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -160,7 +156,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -193,7 +188,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -230,7 +224,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitUnion_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitUnion_es6/input.ts.json index cc6e84e3b4d3..6b90b1554850 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/awaitUnion_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/awaitUnion_es6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -99,6 +99,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -129,7 +130,6 @@ "ctxt": 0 }, "value": "PromiseLike", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -167,7 +167,6 @@ "ctxt": 0 }, "value": "PromiseLike", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -192,8 +191,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -225,6 +223,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -247,7 +246,6 @@ "ctxt": 0 }, "value": "PromiseLike", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -289,8 +287,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -322,6 +319,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -361,7 +359,6 @@ "ctxt": 0 }, "value": "PromiseLike", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -386,8 +383,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -419,6 +415,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -458,7 +455,6 @@ "ctxt": 0 }, "value": "PromiseLike", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -502,8 +498,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -520,7 +515,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -564,8 +558,8 @@ "ctxt": 0 }, "value": "await_a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -582,7 +576,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -615,8 +608,8 @@ "ctxt": 0 }, "value": "await_b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -633,7 +626,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -666,8 +658,8 @@ "ctxt": 0 }, "value": "await_c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -684,7 +676,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -717,8 +708,8 @@ "ctxt": 0 }, "value": "await_d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -735,7 +726,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -768,8 +758,8 @@ "ctxt": 0 }, "value": "await_e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -786,7 +776,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/await_unaryExpression_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/await_unaryExpression_es6/input.ts.json index 14f21aeb7735..77b498d9de59 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/await_unaryExpression_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/await_unaryExpression_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +85,6 @@ "ctxt": 0 }, "value": "bar1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -156,7 +154,6 @@ "ctxt": 0 }, "value": "bar3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -226,7 +223,6 @@ "ctxt": 0 }, "value": "bar4", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/await_unaryExpression_es6_1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/await_unaryExpression_es6_1/input.ts.json index d2c48a5f0271..8ad1f61f91f9 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/await_unaryExpression_es6_1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/await_unaryExpression_es6_1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +85,6 @@ "ctxt": 0 }, "value": "bar1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -156,7 +154,6 @@ "ctxt": 0 }, "value": "bar2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -226,7 +223,6 @@ "ctxt": 0 }, "value": "bar3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -296,7 +292,6 @@ "ctxt": 0 }, "value": "bar4", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/await_unaryExpression_es6_2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/await_unaryExpression_es6_2/input.ts.json index 618fa9bd6955..edf3f8b645c5 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/await_unaryExpression_es6_2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/await_unaryExpression_es6_2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "bar1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +85,6 @@ "ctxt": 0 }, "value": "bar2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -156,7 +154,6 @@ "ctxt": 0 }, "value": "bar3", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration11_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration11_es6/input.ts.json index 4dc7992cd4d5..e1dd67b3aed7 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration11_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration11_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -61,7 +60,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration13_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration13_es6/input.ts.json index e3e082c11254..64243e1f8bf9 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration13_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration13_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,6 +59,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -82,13 +82,11 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -122,7 +120,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration14_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration14_es6/input.ts.json index 15dc5c74ffcc..18b266f23dff 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration14_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration14_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration1_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration1_es6/input.ts.json index a66bbd84a3a1..7e0a7907d5d6 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration1_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration1_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -61,7 +60,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration2_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration2_es6/input.ts.json index 38409a001076..8fddad616ef0 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration2_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration2_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration3_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration3_es6/input.ts.json index e37cdd12f06f..300b406d58e6 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration3_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration3_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -44,8 +43,8 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -55,7 +54,6 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration4_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration4_es6/input.ts.json index be16e0ed1583..7b0207c8c9fc 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration4_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration4_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration8_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration8_es6/input.ts.json index 9e1b68dd1fb9..f32f3f09b83d 100644 --- a/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration8_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/async/es6/functionDeclarations/asyncFunctionDeclaration8_es6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -59,7 +59,6 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, "optional": false } }, @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractAsIdentifier/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractAsIdentifier/input.ts.json index 739c9adff05a..8dd025fbb8f2 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractAsIdentifier/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractAsIdentifier/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "abstract", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -120,7 +118,6 @@ "ctxt": 0 }, "value": "abstract", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractAssignabilityConstructorFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractAssignabilityConstructorFunction/input.ts.json index 659164691289..928246cde939 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractAssignabilityConstructorFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractAssignabilityConstructorFunction/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,6 +57,7 @@ "ctxt": 0 }, "value": "AAA", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,7 +96,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -104,8 +103,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -135,8 +133,8 @@ "ctxt": 0 }, "value": "AAA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -146,7 +144,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } @@ -174,8 +171,8 @@ "ctxt": 0 }, "value": "AAA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractClinterfaceAssignability/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractClinterfaceAssignability/input.ts.json index 3310ae7ae181..533e7b786b92 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractClinterfaceAssignability/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractClinterfaceAssignability/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "IConstructor", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -139,7 +136,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -163,7 +159,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -205,7 +200,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -234,7 +228,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -270,6 +263,7 @@ "ctxt": 0 }, "value": "I", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -292,13 +286,11 @@ "ctxt": 0 }, "value": "IConstructor", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -315,7 +307,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -341,7 +332,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -387,7 +377,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -450,6 +439,7 @@ "ctxt": 0 }, "value": "AA", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -472,12 +462,10 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -507,8 +495,8 @@ "ctxt": 0 }, "value": "AA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -518,7 +506,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false } } @@ -548,6 +535,7 @@ "ctxt": 0 }, "value": "AAA", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -570,12 +558,10 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -605,8 +591,8 @@ "ctxt": 0 }, "value": "AAA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -616,7 +602,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractConstructorAssignability/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractConstructorAssignability/input.ts.json index 3e595a595163..22af819f8782 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractConstructorAssignability/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractConstructorAssignability/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": true, @@ -80,7 +77,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -99,7 +95,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -132,6 +127,7 @@ "ctxt": 0 }, "value": "AA", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -154,12 +150,10 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -169,7 +163,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "definite": false @@ -201,6 +194,7 @@ "ctxt": 0 }, "value": "BB", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -223,12 +217,10 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -238,7 +230,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "definite": false @@ -270,6 +261,7 @@ "ctxt": 0 }, "value": "CC", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -292,12 +284,10 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -307,7 +297,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "definite": false @@ -336,7 +325,6 @@ "ctxt": 0 }, "value": "AA", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -365,7 +353,6 @@ "ctxt": 0 }, "value": "BB", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -394,7 +381,6 @@ "ctxt": 0 }, "value": "CC", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractExtends/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractExtends/input.ts.json index 7b9c6768cc5b..8961aabe5c7f 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractExtends/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractExtends/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -148,7 +144,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": true, @@ -166,7 +161,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -185,7 +179,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -203,7 +196,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -222,7 +214,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": true, @@ -240,7 +231,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -266,7 +256,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -306,7 +295,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractFactoryFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractFactoryFunction/input.ts.json index a5d43485d201..4dc010dbc513 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractFactoryFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractFactoryFunction/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": true, @@ -80,7 +77,6 @@ "ctxt": 0 }, "value": "NewA", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -101,6 +97,7 @@ "ctxt": 0 }, "value": "Factory", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -123,12 +120,10 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -168,7 +163,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -192,7 +186,6 @@ "ctxt": 0 }, "value": "NewB", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -213,6 +206,7 @@ "ctxt": 0 }, "value": "Factory", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -235,12 +229,10 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -280,7 +272,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -316,7 +307,6 @@ "ctxt": 0 }, "value": "NewA", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -330,7 +320,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } @@ -360,7 +349,6 @@ "ctxt": 0 }, "value": "NewA", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -374,7 +362,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } } @@ -404,7 +391,6 @@ "ctxt": 0 }, "value": "NewB", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -418,7 +404,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } @@ -448,7 +433,6 @@ "ctxt": 0 }, "value": "NewB", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -462,7 +446,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractGeneric/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractGeneric/input.ts.json index ec2ade2d0bee..bdacbb2ceda8 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractGeneric/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractGeneric/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -99,7 +96,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -136,7 +132,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -164,7 +159,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -185,6 +179,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -207,13 +202,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -261,7 +254,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -282,7 +274,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -301,7 +292,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": true, @@ -328,7 +318,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -359,7 +348,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -378,7 +366,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -397,7 +384,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -424,7 +410,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -455,7 +440,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -474,7 +458,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -493,7 +476,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -529,7 +511,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -555,7 +536,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -604,7 +584,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -632,7 +611,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -659,7 +637,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -690,7 +667,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -709,7 +685,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -735,7 +710,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -756,6 +730,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -778,13 +753,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -823,7 +796,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -850,7 +822,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -881,7 +852,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -900,7 +870,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -926,7 +895,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -975,7 +943,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1009,7 +976,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -1030,6 +996,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1052,13 +1019,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1097,7 +1062,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1124,7 +1088,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1155,7 +1118,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractImportInstantiation/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractImportInstantiation/input.ts.json index 3d82b1630102..5f3312fbaa04 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractImportInstantiation/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractImportInstantiation/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -91,7 +89,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -118,7 +115,6 @@ "ctxt": 0 }, "value": "myA", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "right": { @@ -142,7 +137,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } @@ -169,7 +163,6 @@ "ctxt": 0 }, "value": "myA", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractInAModule/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractInAModule/input.ts.json index fd234e5ecd83..fd3b3f1781ee 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractInAModule/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractInAModule/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -105,7 +102,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -157,7 +152,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -195,7 +189,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -206,7 +199,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractInheritance/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractInheritance/input.ts.json index e2d957e96a2f..9ba356d4c8bb 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractInheritance/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractInheritance/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": true, @@ -80,7 +77,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -99,7 +95,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -117,7 +112,6 @@ "ctxt": 0 }, "value": "AA", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -143,7 +137,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -183,7 +176,6 @@ "ctxt": 0 }, "value": "BB", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -202,7 +194,6 @@ "ctxt": 0 }, "value": "AA", - "typeAnnotation": null, "optional": false }, "isAbstract": true, @@ -220,7 +211,6 @@ "ctxt": 0 }, "value": "CC", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -239,7 +229,6 @@ "ctxt": 0 }, "value": "AA", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -257,7 +246,6 @@ "ctxt": 0 }, "value": "DD", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -276,7 +264,6 @@ "ctxt": 0 }, "value": "BB", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -294,7 +281,6 @@ "ctxt": 0 }, "value": "EE", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -313,7 +299,6 @@ "ctxt": 0 }, "value": "BB", - "typeAnnotation": null, "optional": false }, "isAbstract": true, @@ -331,7 +316,6 @@ "ctxt": 0 }, "value": "FF", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -350,7 +334,6 @@ "ctxt": 0 }, "value": "CC", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -368,7 +351,6 @@ "ctxt": 0 }, "value": "GG", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -387,7 +369,6 @@ "ctxt": 0 }, "value": "CC", - "typeAnnotation": null, "optional": false }, "isAbstract": true, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractInstantiations1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractInstantiations1/input.ts.json index ee4b2ca432e1..c5c656129aba 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractInstantiations1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractInstantiations1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -80,7 +77,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -99,7 +95,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": true, @@ -129,7 +124,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -158,7 +152,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -200,7 +193,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -229,7 +221,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -261,6 +252,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -283,13 +275,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -321,6 +311,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -343,13 +334,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -381,6 +370,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -403,13 +393,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -439,8 +427,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -457,7 +445,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -488,8 +475,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -506,7 +493,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -537,8 +523,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -555,7 +541,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration/input.ts.json index c2ccf935c1bf..d5b96b499279 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "CM", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "CM", - "typeAnnotation": null, "optional": false }, "body": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "MC", - "typeAnnotation": null, "optional": false }, "body": { @@ -103,7 +100,6 @@ "ctxt": 0 }, "value": "MC", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "CI", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -162,7 +157,6 @@ "ctxt": 0 }, "value": "CI", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -193,7 +187,6 @@ "ctxt": 0 }, "value": "IC", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -219,7 +212,6 @@ "ctxt": 0 }, "value": "IC", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -246,7 +238,6 @@ "ctxt": 0 }, "value": "CC1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -273,7 +264,6 @@ "ctxt": 0 }, "value": "CC1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -300,7 +290,6 @@ "ctxt": 0 }, "value": "CC2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -327,7 +316,6 @@ "ctxt": 0 }, "value": "CC2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -354,7 +342,6 @@ "ctxt": 0 }, "value": "DCI", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -386,7 +373,6 @@ "ctxt": 0 }, "value": "DCI", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -417,7 +403,6 @@ "ctxt": 0 }, "value": "DIC", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -443,7 +428,6 @@ "ctxt": 0 }, "value": "DIC", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -470,7 +454,6 @@ "ctxt": 0 }, "value": "DCC1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -497,7 +480,6 @@ "ctxt": 0 }, "value": "DCC1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -524,7 +506,6 @@ "ctxt": 0 }, "value": "DCC2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -551,7 +532,6 @@ "ctxt": 0 }, "value": "DCC2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -590,7 +570,6 @@ "ctxt": 0 }, "value": "CM", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -619,7 +598,6 @@ "ctxt": 0 }, "value": "MC", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -648,7 +626,6 @@ "ctxt": 0 }, "value": "CI", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -677,7 +654,6 @@ "ctxt": 0 }, "value": "IC", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -706,7 +682,6 @@ "ctxt": 0 }, "value": "CC1", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -735,7 +710,6 @@ "ctxt": 0 }, "value": "CC2", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -764,7 +738,6 @@ "ctxt": 0 }, "value": "DCI", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -793,7 +766,6 @@ "ctxt": 0 }, "value": "DIC", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -822,7 +794,6 @@ "ctxt": 0 }, "value": "DCC1", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -851,7 +822,6 @@ "ctxt": 0 }, "value": "DCC2", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractOverloads/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractOverloads/input.ts.json index e0392d831d90..c9dc119f9049 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractOverloads/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractOverloads/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -172,7 +168,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -210,7 +205,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -248,7 +242,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -286,7 +279,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -324,7 +316,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -362,7 +353,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -400,7 +390,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -446,7 +435,6 @@ "ctxt": 0 }, "value": "qux", - "typeAnnotation": null, "optional": false }, "function": { @@ -486,7 +474,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -512,7 +499,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -566,7 +552,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -604,7 +589,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -650,7 +634,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -688,7 +671,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractOverrideWithAbstract/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractOverrideWithAbstract/input.ts.json index e116f041bb34..8889eb3ccb80 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractOverrideWithAbstract/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractOverrideWithAbstract/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -148,7 +144,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": true, @@ -166,7 +161,6 @@ "ctxt": 0 }, "value": "AA", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -192,7 +186,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -238,7 +231,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -278,7 +270,6 @@ "ctxt": 0 }, "value": "BB", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -304,7 +295,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -342,7 +332,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -382,7 +371,6 @@ "ctxt": 0 }, "value": "AA", - "typeAnnotation": null, "optional": false }, "isAbstract": true, @@ -400,7 +388,6 @@ "ctxt": 0 }, "value": "CC", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -419,7 +406,6 @@ "ctxt": 0 }, "value": "BB", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -437,7 +423,6 @@ "ctxt": 0 }, "value": "DD", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -463,7 +448,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -503,7 +487,6 @@ "ctxt": 0 }, "value": "BB", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractSingleLineDecl/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractSingleLineDecl/input.ts.json index 3ac30d3bef95..ec60b02c8968 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractSingleLineDecl/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractSingleLineDecl/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -138,7 +134,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -167,7 +162,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractSuperCalls/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractSuperCalls/input.ts.json index 53a708ff73d1..7869eb7fb184 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractSuperCalls/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractSuperCalls/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -172,7 +168,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -228,7 +223,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -265,7 +259,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -314,7 +307,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -342,7 +334,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": true, @@ -360,7 +351,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -386,7 +376,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -450,7 +439,6 @@ "ctxt": 0 }, "value": "qux", - "typeAnnotation": null, "optional": false }, "function": { @@ -514,7 +502,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -545,7 +532,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -580,7 +566,6 @@ "ctxt": 0 }, "value": "norf", - "typeAnnotation": null, "optional": false }, "function": { @@ -636,7 +621,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -667,7 +651,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -685,7 +668,6 @@ "ctxt": 0 }, "value": "AA", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -711,7 +693,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -775,7 +756,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -831,7 +811,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -870,7 +849,6 @@ "ctxt": 0 }, "value": "BB", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -896,7 +874,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -928,7 +905,6 @@ "ctxt": 0 }, "value": "AA", - "typeAnnotation": null, "optional": false }, "isAbstract": true, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractUsingAbstractMethod1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractUsingAbstractMethod1/input.ts.json index ccce77e4462e..6afcb365a08f 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractUsingAbstractMethod1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAbstractKeyword/classAbstractUsingAbstractMethod1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -98,7 +96,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -124,7 +121,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -200,7 +195,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -226,7 +220,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -274,7 +267,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": true, @@ -307,8 +299,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -325,7 +317,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -364,7 +355,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -375,7 +365,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -407,8 +396,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -425,7 +414,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -462,7 +450,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -473,7 +460,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAndInterfaceMerge.d/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAndInterfaceMerge.d/input.ts.json index 372b2b0cff4e..94ae1f442d17 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAndInterfaceMerge.d/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAndInterfaceMerge.d/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -143,7 +139,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -169,7 +164,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -195,7 +189,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -227,7 +220,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -291,7 +282,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -329,7 +319,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -362,7 +351,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAndInterfaceMergeConflictingMembers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAndInterfaceMergeConflictingMembers/input.ts.json index 4ed968dd7464..b0e7a43f370b 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAndInterfaceMergeConflictingMembers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAndInterfaceMergeConflictingMembers/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -125,7 +122,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -243,7 +237,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -273,7 +266,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -312,7 +304,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -338,7 +329,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -391,7 +381,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -421,7 +410,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAndInterfaceWithSameName/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAndInterfaceWithSameName/input.ts.json index 92eee4727f88..b0621b1a9b85 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAndInterfaceWithSameName/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAndInterfaceWithSameName/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -125,7 +122,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -171,7 +167,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -192,7 +187,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -218,7 +212,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -271,7 +264,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -301,7 +293,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAndVariableWithSameName/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAndVariableWithSameName/input.ts.json index dd2ddfb2bded..ffd3a4f8e79c 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAndVariableWithSameName/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classAndVariableWithSameName/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -105,8 +103,8 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -143,7 +141,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -164,7 +161,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -190,7 +186,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -253,8 +248,8 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classBody/classWithEmptyBody/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classBody/classWithEmptyBody/input.ts.json index 3fa7c3dc2418..0a24eea4b378 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classBody/classWithEmptyBody/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classBody/classWithEmptyBody/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,6 +57,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,13 +80,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -118,6 +116,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -134,8 +133,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -145,7 +143,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "definite": false @@ -175,8 +172,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -212,8 +209,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -233,7 +230,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -278,8 +274,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -315,7 +311,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -341,7 +336,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -407,6 +401,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -429,13 +424,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -467,6 +460,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -483,8 +477,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -494,7 +487,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "definite": false @@ -524,8 +516,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -561,8 +553,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -582,7 +574,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -627,8 +618,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classExtendingBuiltinType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classExtendingBuiltinType/input.ts.json index 4c3aa95cf060..4370442a9893 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classExtendingBuiltinType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classExtendingBuiltinType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -35,7 +34,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -53,7 +51,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -72,7 +69,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -90,7 +86,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -109,7 +104,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -127,7 +121,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -146,7 +139,6 @@ "ctxt": 0 }, "value": "Boolean", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -164,7 +156,6 @@ "ctxt": 0 }, "value": "C5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -183,7 +174,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -201,7 +191,6 @@ "ctxt": 0 }, "value": "C6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -220,7 +209,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -238,7 +226,6 @@ "ctxt": 0 }, "value": "C7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -257,7 +244,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -275,7 +261,6 @@ "ctxt": 0 }, "value": "C8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -294,7 +279,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -312,7 +296,6 @@ "ctxt": 0 }, "value": "C9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -331,7 +314,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -349,7 +331,6 @@ "ctxt": 0 }, "value": "C10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -368,7 +349,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classExtendingClassLikeType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classExtendingClassLikeType/input.ts.json index 8e258fe5b512..95a1e5c22804 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classExtendingClassLikeType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classExtendingClassLikeType/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -102,7 +99,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -155,7 +150,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -184,7 +178,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -205,7 +198,6 @@ "ctxt": 0 }, "value": "D0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -224,7 +216,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -274,7 +265,6 @@ "ctxt": 0 }, "value": "BaseConstructor", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -304,6 +294,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -320,8 +311,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -331,6 +321,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -347,8 +338,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -373,7 +363,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -424,6 +413,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -446,13 +436,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -477,7 +465,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -503,7 +490,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -523,7 +509,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -555,7 +540,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -580,6 +564,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -602,13 +587,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -618,6 +601,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -640,13 +624,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -671,7 +653,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -697,7 +678,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -717,7 +697,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -749,7 +728,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -774,6 +752,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -796,13 +775,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -812,6 +789,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -834,13 +812,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -865,7 +841,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -891,7 +866,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -911,7 +885,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -943,7 +916,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -964,7 +936,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -986,7 +957,6 @@ "ctxt": 0 }, "value": "getBase", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1023,7 +993,6 @@ "ctxt": 0 }, "value": "BaseConstructor", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1040,7 +1009,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1066,7 +1034,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1177,7 +1144,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1236,7 +1202,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1278,7 +1243,6 @@ "ctxt": 0 }, "value": "getBase", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1299,7 +1263,6 @@ "ctxt": 0 }, "value": "D2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1325,7 +1288,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1465,7 +1427,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1519,7 +1480,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1556,7 +1516,6 @@ "ctxt": 0 }, "value": "getBase", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1595,7 +1554,6 @@ "ctxt": 0 }, "value": "D3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1621,7 +1579,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1727,7 +1684,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1786,7 +1742,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1823,7 +1778,6 @@ "ctxt": 0 }, "value": "getBase", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1871,7 +1825,6 @@ "ctxt": 0 }, "value": "D4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1897,7 +1850,6 @@ "ctxt": 0 }, "value": "getBase", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1959,7 +1911,6 @@ "ctxt": 0 }, "value": "BadBaseConstructor", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1989,6 +1940,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2005,8 +1957,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2031,7 +1982,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2082,6 +2032,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2098,8 +2049,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2124,7 +2074,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2172,7 +2121,6 @@ "ctxt": 0 }, "value": "getBadBase", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2209,7 +2157,6 @@ "ctxt": 0 }, "value": "BadBaseConstructor", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2226,7 +2173,6 @@ "ctxt": 0 }, "value": "D5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2252,7 +2198,6 @@ "ctxt": 0 }, "value": "getBadBase", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classExtendingNonConstructor/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classExtendingNonConstructor/input.ts.json index 6b24ab8c1ba7..cda52c5fd9c5 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classExtendingNonConstructor/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classExtendingNonConstructor/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -65,7 +65,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -122,7 +121,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -155,7 +153,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -174,7 +171,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -192,7 +188,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -227,7 +222,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -262,7 +256,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -297,7 +290,6 @@ "ctxt": 0 }, "value": "C5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -337,7 +329,6 @@ "ctxt": 0 }, "value": "C6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -356,7 +347,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -374,7 +364,6 @@ "ctxt": 0 }, "value": "C7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -393,7 +382,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classExtendingNull/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classExtendingNull/input.ts.json index 8a257af6ea1c..a6f4178708db 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classExtendingNull/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classExtendingNull/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -118,7 +115,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -165,7 +161,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -191,7 +186,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classAppearsToHaveMembersOfObject/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classAppearsToHaveMembersOfObject/input.ts.json index acbbecbe02af..2acc77acfcd2 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classAppearsToHaveMembersOfObject/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classAppearsToHaveMembersOfObject/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -105,6 +103,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -127,13 +126,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -165,8 +162,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -190,7 +187,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -201,7 +197,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -238,8 +233,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -263,7 +258,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -274,7 +268,6 @@ "ctxt": 0 }, "value": "hasOwnProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -329,6 +322,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -351,13 +345,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -367,7 +359,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "definite": false @@ -399,6 +390,7 @@ "ctxt": 0 }, "value": "o2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -415,8 +407,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -426,7 +417,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendingClass/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendingClass/input.ts.json index 0a2c761ed360..b414afbe21b7 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendingClass/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendingClass/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false }, "function": { @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "function": { @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -208,7 +203,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -248,7 +242,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -281,6 +274,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -303,13 +297,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -341,8 +333,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -359,7 +351,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -370,7 +361,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -404,8 +394,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -422,7 +412,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -433,7 +422,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -467,8 +455,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -492,7 +480,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -503,7 +490,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false }, "computed": false @@ -540,8 +526,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -565,7 +551,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "property": { @@ -576,7 +561,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "computed": false @@ -598,7 +582,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -624,7 +607,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -650,7 +632,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -681,7 +662,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false }, "function": { @@ -702,6 +682,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -724,13 +705,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -775,7 +754,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "function": { @@ -796,6 +774,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -818,13 +797,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -868,7 +845,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -910,7 +886,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -931,7 +906,6 @@ "ctxt": 0 }, "value": "D2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -957,7 +931,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -997,7 +970,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1024,7 +996,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1055,7 +1026,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1089,6 +1059,7 @@ "ctxt": 0 }, "value": "d2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1111,7 +1082,6 @@ "ctxt": 0 }, "value": "D2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1134,8 +1104,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1167,8 +1136,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1185,7 +1154,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1196,7 +1164,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1230,8 +1197,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1248,7 +1215,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1259,7 +1225,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1293,8 +1258,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1318,7 +1283,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1329,7 +1293,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1384,8 +1347,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1409,7 +1372,6 @@ "ctxt": 0 }, "value": "D2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1420,7 +1382,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendsItself/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendsItself/input.ts.json index fdc79362513a..9b58a56fe9f4 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendsItself/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendsItself/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -35,7 +34,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -53,7 +51,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -72,7 +69,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -99,7 +95,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -130,7 +125,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -149,7 +143,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -168,7 +161,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -195,7 +187,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly/input.ts.json index d6319cf6779c..92167fe68fb4 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -82,7 +80,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -126,7 +122,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -166,7 +161,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -184,7 +178,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -210,7 +203,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -250,7 +242,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -268,7 +259,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -294,7 +284,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -320,7 +309,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -345,7 +333,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -372,7 +359,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -403,7 +389,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -422,7 +407,6 @@ "ctxt": 0 }, "value": "D2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -448,7 +432,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -474,7 +457,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -499,7 +481,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -526,7 +507,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -557,7 +537,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -576,7 +555,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -602,7 +580,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -628,7 +605,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -653,7 +629,6 @@ "ctxt": 0 }, "value": "D2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -680,7 +655,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -711,7 +685,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly2/input.ts.json index f379b6988972..49b125278b38 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -89,7 +87,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "computed": false @@ -127,7 +123,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -155,7 +150,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -181,7 +175,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -221,7 +214,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -250,7 +242,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { @@ -278,7 +269,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -304,7 +294,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -351,7 +340,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -362,7 +350,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "computed": false @@ -393,7 +380,6 @@ "ctxt": 0 }, "value": "O", - "typeAnnotation": null, "optional": false }, "body": { @@ -414,7 +400,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -440,7 +425,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -466,7 +450,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -498,7 +481,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "property": { @@ -509,7 +491,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -538,7 +519,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -569,7 +549,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -595,7 +574,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "body": { @@ -623,7 +601,6 @@ "ctxt": 0 }, "value": "D2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -649,7 +626,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -675,7 +651,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -700,7 +675,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -727,7 +701,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -758,7 +731,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -788,7 +760,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "body": { @@ -816,7 +787,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -842,7 +812,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -868,7 +837,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -900,7 +868,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "property": { @@ -911,7 +878,6 @@ "ctxt": 0 }, "value": "D2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -940,7 +906,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -971,7 +936,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly3/input.ts.json index ade3c7c3bf57..07d8b30457d2 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -82,7 +80,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -126,7 +122,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -166,7 +161,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -184,7 +178,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -210,7 +203,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -250,7 +242,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -268,7 +259,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -294,7 +284,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -320,7 +309,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -345,7 +333,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -372,7 +359,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -403,7 +389,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -422,7 +407,6 @@ "ctxt": 0 }, "value": "D2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -448,7 +432,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -474,7 +457,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -499,7 +481,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -526,7 +507,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -557,7 +537,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -576,7 +555,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -602,7 +580,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -628,7 +605,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -653,7 +629,6 @@ "ctxt": 0 }, "value": "D2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -680,7 +655,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -711,7 +685,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendsShadowedConstructorFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendsShadowedConstructorFunction/input.ts.json index 4d0817373333..a4af02461e63 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendsShadowedConstructorFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendsShadowedConstructorFunction/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -97,7 +95,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -133,8 +130,8 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -159,7 +156,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -185,7 +181,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -225,7 +220,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendsValidConstructorFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendsValidConstructorFunction/input.ts.json index 1284df9e8b8f..2d183b656af4 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendsValidConstructorFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classExtendsValidConstructorFunction/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -66,8 +65,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -84,7 +83,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -123,7 +120,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classIsSubtypeOfBaseType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classIsSubtypeOfBaseType/input.ts.json index 7acaf1740e94..5eca79e88efe 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classIsSubtypeOfBaseType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/classIsSubtypeOfBaseType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -157,7 +152,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -192,7 +186,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -234,7 +227,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -282,7 +274,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -319,7 +310,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -361,7 +351,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -387,7 +376,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -422,7 +410,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -470,7 +457,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -507,7 +493,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/constructorFunctionTypeIsAssignableToBaseType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/constructorFunctionTypeIsAssignableToBaseType/input.ts.json index b098934fda61..6db9d5cb8bd4 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/constructorFunctionTypeIsAssignableToBaseType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/constructorFunctionTypeIsAssignableToBaseType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -106,7 +103,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -144,7 +140,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -170,7 +165,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -205,7 +199,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -253,7 +246,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -271,7 +263,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -297,7 +288,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -332,7 +322,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -380,7 +369,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/constructorFunctionTypeIsAssignableToBaseType2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/constructorFunctionTypeIsAssignableToBaseType2/input.ts.json index b4956a6123c2..4b403d582554 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/constructorFunctionTypeIsAssignableToBaseType2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/constructorFunctionTypeIsAssignableToBaseType2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -106,7 +103,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -142,7 +138,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -162,6 +157,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -184,13 +180,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -223,7 +217,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -249,7 +242,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -284,7 +276,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -338,7 +329,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -358,6 +348,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -374,8 +365,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -420,7 +410,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -442,7 +431,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -460,7 +448,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -486,7 +473,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -521,7 +507,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -575,7 +560,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -595,6 +579,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -611,8 +596,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -657,7 +641,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -696,7 +679,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/derivedTypeDoesNotRequireExtendsClause/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/derivedTypeDoesNotRequireExtendsClause/input.ts.json index ac86b7f0768b..d08cb3cbaf29 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/derivedTypeDoesNotRequireExtendsClause/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classHeritageSpecification/derivedTypeDoesNotRequireExtendsClause/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +158,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -210,7 +205,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -236,7 +230,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -276,7 +269,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -309,6 +301,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -331,13 +324,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -369,6 +360,7 @@ "ctxt": 0 }, "value": "d1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -391,13 +383,11 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -429,6 +419,7 @@ "ctxt": 0 }, "value": "d2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -451,13 +442,11 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -487,8 +476,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -498,7 +487,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } } @@ -526,8 +514,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -537,7 +525,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -567,6 +554,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -596,14 +584,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -623,7 +609,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -637,7 +622,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classImplementsMergedClassInterface/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classImplementsMergedClassInterface/input.ts.json index 844d2bc70ded..3fb08a9fc735 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classImplementsMergedClassInterface/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classImplementsMergedClassInterface/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -125,7 +122,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -195,7 +190,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -212,7 +206,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -238,7 +231,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -290,7 +282,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -307,7 +298,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -333,7 +323,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -385,7 +374,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -402,7 +390,6 @@ "ctxt": 0 }, "value": "C5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -428,7 +415,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -474,7 +460,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -526,7 +511,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeArguments": null diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classInsideBlock/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classInsideBlock/input.ts.json index a6ea667807e5..98278c94b72f 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classInsideBlock/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classInsideBlock/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -45,7 +44,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classWithPredefinedTypesAsNames/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classWithPredefinedTypesAsNames/input.ts.json index 1b4a8954176a..4a4918e92021 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classWithPredefinedTypesAsNames/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classWithPredefinedTypesAsNames/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "any", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "boolean", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -97,7 +94,6 @@ "ctxt": 0 }, "value": "string", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classWithSemicolonClassElement1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classWithSemicolonClassElement1/input.ts.json index 482381f5ebd1..0b07f73a9748 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classWithSemicolonClassElement1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classWithSemicolonClassElement1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classWithSemicolonClassElement2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classWithSemicolonClassElement2/input.ts.json index 839b789998d7..18e48b39c5ab 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classWithSemicolonClassElement2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/classWithSemicolonClassElement2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/declaredClassMergedwithSelf/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/declaredClassMergedwithSelf/input.ts.json index 79bd5fb865dc..bf49ea12c01a 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/declaredClassMergedwithSelf/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/declaredClassMergedwithSelf/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -102,7 +99,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -128,7 +124,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -155,7 +150,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -182,7 +176,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": true, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/mergeClassInterfaceAndModule/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/mergeClassInterfaceAndModule/input.ts.json index 46a7bd5423b7..c10d55d39344 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/mergeClassInterfaceAndModule/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/mergeClassInterfaceAndModule/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "body": { @@ -104,7 +101,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -136,7 +132,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -169,7 +164,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "body": { @@ -192,7 +186,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -226,7 +219,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "body": { @@ -254,7 +246,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -287,7 +278,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "body": { @@ -310,7 +300,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -342,7 +331,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/mergedClassInterface/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/mergedClassInterface/input.ts.json index 927ec68a689b..2dc3df89e7e4 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/mergedClassInterface/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/mergedClassInterface/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -105,7 +102,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -132,7 +128,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -164,7 +159,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -195,7 +189,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -221,7 +214,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -253,7 +245,6 @@ "ctxt": 0 }, "value": "C5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -283,7 +274,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -322,7 +312,6 @@ "ctxt": 0 }, "value": "C5", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -348,7 +337,6 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, "optional": false }, "value": null, @@ -401,7 +389,6 @@ "ctxt": 0 }, "value": "C5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -431,7 +418,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -475,7 +461,6 @@ "ctxt": 0 }, "value": "C5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -505,7 +490,6 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -559,6 +543,7 @@ "ctxt": 0 }, "value": "c5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -581,13 +566,11 @@ "ctxt": 0 }, "value": "C5", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -616,7 +599,6 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, "optional": false }, "property": { @@ -627,7 +609,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -655,7 +636,6 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, "optional": false }, "property": { @@ -666,7 +646,6 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -694,7 +673,6 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, "optional": false }, "property": { @@ -705,7 +683,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -733,7 +710,6 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, "optional": false }, "property": { @@ -744,7 +720,6 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -760,7 +735,6 @@ "ctxt": 0 }, "value": "C6", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -792,7 +766,6 @@ "ctxt": 0 }, "value": "C7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -823,7 +796,6 @@ "ctxt": 0 }, "value": "C6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -849,7 +821,6 @@ "ctxt": 0 }, "value": "C7", - "typeAnnotation": null, "optional": false }, "declare": true, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/mergedInheritedClassInterface/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/mergedInheritedClassInterface/input.ts.json index 407172b677cf..0b71d393952a 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/mergedInheritedClassInterface/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/mergedInheritedClassInterface/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "BaseInterface", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "required", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "optional", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -132,7 +129,6 @@ "ctxt": 0 }, "value": "BaseClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -158,7 +154,6 @@ "ctxt": 0 }, "value": "baseMethod", - "typeAnnotation": null, "optional": false }, "function": { @@ -204,7 +199,6 @@ "ctxt": 0 }, "value": "baseNumber", - "typeAnnotation": null, "optional": false }, "value": null, @@ -257,7 +251,6 @@ "ctxt": 0 }, "value": "Child", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -278,7 +271,6 @@ "ctxt": 0 }, "value": "BaseInterface", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -308,7 +300,6 @@ "ctxt": 0 }, "value": "additional", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -347,7 +338,6 @@ "ctxt": 0 }, "value": "Child", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -373,7 +363,6 @@ "ctxt": 0 }, "value": "classNumber", - "typeAnnotation": null, "optional": false }, "value": null, @@ -419,7 +408,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -459,7 +447,6 @@ "ctxt": 0 }, "value": "BaseClass", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -482,7 +469,6 @@ "ctxt": 0 }, "value": "ChildNoBaseClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -503,7 +489,6 @@ "ctxt": 0 }, "value": "BaseInterface", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -533,7 +518,6 @@ "ctxt": 0 }, "value": "additional2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -572,7 +556,6 @@ "ctxt": 0 }, "value": "ChildNoBaseClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -598,7 +581,6 @@ "ctxt": 0 }, "value": "classString", - "typeAnnotation": null, "optional": false }, "value": null, @@ -644,7 +626,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "function": { @@ -692,7 +673,6 @@ "ctxt": 0 }, "value": "Grandchild", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -711,7 +691,6 @@ "ctxt": 0 }, "value": "ChildNoBaseClass", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -744,6 +723,7 @@ "ctxt": 0 }, "value": "child", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -766,13 +746,11 @@ "ctxt": 0 }, "value": "Child", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -801,7 +779,6 @@ "ctxt": 0 }, "value": "child", - "typeAnnotation": null, "optional": false }, "property": { @@ -812,7 +789,6 @@ "ctxt": 0 }, "value": "required", - "typeAnnotation": null, "optional": false }, "computed": false @@ -840,7 +816,6 @@ "ctxt": 0 }, "value": "child", - "typeAnnotation": null, "optional": false }, "property": { @@ -851,7 +826,6 @@ "ctxt": 0 }, "value": "optional", - "typeAnnotation": null, "optional": false }, "computed": false @@ -879,7 +853,6 @@ "ctxt": 0 }, "value": "child", - "typeAnnotation": null, "optional": false }, "property": { @@ -890,7 +863,6 @@ "ctxt": 0 }, "value": "additional", - "typeAnnotation": null, "optional": false }, "computed": false @@ -918,7 +890,6 @@ "ctxt": 0 }, "value": "child", - "typeAnnotation": null, "optional": false }, "property": { @@ -929,7 +900,6 @@ "ctxt": 0 }, "value": "baseNumber", - "typeAnnotation": null, "optional": false }, "computed": false @@ -957,7 +927,6 @@ "ctxt": 0 }, "value": "child", - "typeAnnotation": null, "optional": false }, "property": { @@ -968,7 +937,6 @@ "ctxt": 0 }, "value": "classNumber", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1003,7 +971,6 @@ "ctxt": 0 }, "value": "child", - "typeAnnotation": null, "optional": false }, "property": { @@ -1014,7 +981,6 @@ "ctxt": 0 }, "value": "baseMethod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1052,7 +1018,6 @@ "ctxt": 0 }, "value": "child", - "typeAnnotation": null, "optional": false }, "property": { @@ -1063,7 +1028,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1097,6 +1061,7 @@ "ctxt": 0 }, "value": "grandchild", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1119,13 +1084,11 @@ "ctxt": 0 }, "value": "Grandchild", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1154,7 +1117,6 @@ "ctxt": 0 }, "value": "grandchild", - "typeAnnotation": null, "optional": false }, "property": { @@ -1165,7 +1127,6 @@ "ctxt": 0 }, "value": "required", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1193,7 +1154,6 @@ "ctxt": 0 }, "value": "grandchild", - "typeAnnotation": null, "optional": false }, "property": { @@ -1204,7 +1164,6 @@ "ctxt": 0 }, "value": "optional", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1232,7 +1191,6 @@ "ctxt": 0 }, "value": "grandchild", - "typeAnnotation": null, "optional": false }, "property": { @@ -1243,7 +1201,6 @@ "ctxt": 0 }, "value": "additional2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1271,7 +1228,6 @@ "ctxt": 0 }, "value": "grandchild", - "typeAnnotation": null, "optional": false }, "property": { @@ -1282,7 +1238,6 @@ "ctxt": 0 }, "value": "classString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1317,7 +1272,6 @@ "ctxt": 0 }, "value": "grandchild", - "typeAnnotation": null, "optional": false }, "property": { @@ -1328,7 +1282,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/modifierOnClassDeclarationMemberInFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/modifierOnClassDeclarationMemberInFunction/input.ts.json index 56d97f760402..30fb86c351b8 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/modifierOnClassDeclarationMemberInFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classDeclarations/modifierOnClassDeclarationMemberInFunction/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -45,7 +44,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -71,7 +69,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -155,7 +151,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classExpression1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classExpression1/input.ts.json index 45e9cefa7fb0..1adb1545d5e7 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classExpression1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classExpression1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ClassExpression", @@ -44,7 +44,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classExpression2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classExpression2/input.ts.json index 2f5b19de1497..c5f9dc011a75 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classExpression2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classExpression2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,8 +57,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ClassExpression", @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "span": { @@ -89,7 +87,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classExpression3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classExpression3/input.ts.json index 7399c1e51846..09a5a3804e45 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classExpression3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classExpression3/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ClassExpression", @@ -59,7 +59,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -108,7 +107,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -157,7 +155,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -226,8 +223,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -244,7 +241,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -276,7 +272,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -287,7 +282,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -315,7 +309,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -326,7 +319,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -354,7 +346,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -365,7 +356,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classExpression4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classExpression4/input.ts.json index eceb1cfafa20..71a5ecef89d1 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classExpression4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classExpression4/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ClassExpression", @@ -59,7 +59,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -100,7 +99,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -156,8 +154,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -195,7 +193,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -210,7 +207,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classExpression5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classExpression5/input.ts.json index bacfa9e69d22..eee18da26f43 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classExpression5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classExpression5/input.ts.json @@ -59,7 +59,6 @@ "ctxt": 0 }, "value": "hi", - "typeAnnotation": null, "optional": false }, "function": { @@ -131,7 +130,6 @@ "ctxt": 0 }, "value": "hi", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classWithStaticFieldInParameterBindingPattern.2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classWithStaticFieldInParameterBindingPattern.2/input.ts.json index 11fc0b3e3c8b..283b83d3f8df 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classWithStaticFieldInParameterBindingPattern.2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classWithStaticFieldInParameterBindingPattern.2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -111,7 +110,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -143,7 +141,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -159,7 +156,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -180,8 +176,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -238,8 +234,8 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -283,8 +279,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -382,7 +378,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -414,7 +409,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -430,7 +424,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -451,8 +444,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -490,8 +483,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -501,7 +494,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -540,8 +532,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classWithStaticFieldInParameterBindingPattern.3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classWithStaticFieldInParameterBindingPattern.3/input.ts.json index 61363e09eb1c..724b67a68afe 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classWithStaticFieldInParameterBindingPattern.3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classWithStaticFieldInParameterBindingPattern.3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -111,7 +110,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -143,7 +141,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -159,7 +156,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -180,8 +176,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -238,8 +234,8 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -283,8 +279,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -382,7 +378,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -414,7 +409,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -430,7 +424,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -451,8 +444,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -490,8 +483,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -501,7 +494,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -540,8 +532,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classWithStaticFieldInParameterBindingPattern/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classWithStaticFieldInParameterBindingPattern/input.ts.json index 0b8f34524f8c..7ed7dab3999f 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classWithStaticFieldInParameterBindingPattern/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classWithStaticFieldInParameterBindingPattern/input.ts.json @@ -84,7 +84,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -122,7 +121,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -143,8 +141,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classWithStaticFieldInParameterInitializer.2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classWithStaticFieldInParameterInitializer.2/input.ts.json index 9fbf492f3771..43fb9572e2f2 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classWithStaticFieldInParameterInitializer.2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classWithStaticFieldInParameterInitializer.2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -77,8 +76,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ClassExpression", @@ -105,7 +104,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -137,7 +135,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -181,8 +178,8 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -226,8 +223,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -291,8 +288,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ClassExpression", @@ -319,7 +316,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -351,7 +347,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -376,8 +371,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -387,7 +382,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -426,8 +420,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classWithStaticFieldInParameterInitializer.3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classWithStaticFieldInParameterInitializer.3/input.ts.json index f6ce356c685d..fd02805a371d 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classWithStaticFieldInParameterInitializer.3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classWithStaticFieldInParameterInitializer.3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -77,8 +76,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ClassExpression", @@ -105,7 +104,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -137,7 +135,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -181,8 +178,8 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -226,8 +223,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -291,8 +288,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ClassExpression", @@ -319,7 +316,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -351,7 +347,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -376,8 +371,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -387,7 +382,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -426,8 +420,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classWithStaticFieldInParameterInitializer/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classWithStaticFieldInParameterInitializer/input.ts.json index f0ccf0baa42b..4f40090477f4 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classWithStaticFieldInParameterInitializer/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/classWithStaticFieldInParameterInitializer/input.ts.json @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ClassExpression", @@ -78,7 +78,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/extendClassExpressionFromModule/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/extendClassExpressionFromModule/input.ts.json index 06f5672eb99b..4eac789d6a7d 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/extendClassExpressionFromModule/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/extendClassExpressionFromModule/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -120,8 +117,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -131,7 +128,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -148,7 +144,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -167,7 +162,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/genericClassExpressionInFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/genericClassExpressionInFunction/input.ts.json index a78e30b0f004..3b5a89e9c258 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/genericClassExpressionInFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/genericClassExpressionInFunction/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "genericVar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -175,7 +170,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -203,7 +197,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -260,7 +252,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -286,7 +277,6 @@ "ctxt": 0 }, "value": "anon", - "typeAnnotation": null, "optional": false }, "value": { @@ -307,7 +297,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -335,7 +324,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -381,7 +369,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -402,7 +389,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -438,7 +424,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "span": { @@ -456,7 +441,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -483,7 +467,6 @@ "ctxt": 0 }, "value": "TInner", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -514,7 +497,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -551,7 +533,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -571,7 +552,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -597,7 +577,6 @@ "ctxt": 0 }, "value": "namae", - "typeAnnotation": null, "optional": false }, "value": null, @@ -644,7 +623,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -683,7 +661,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -709,7 +686,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -770,7 +746,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -802,7 +777,6 @@ "ctxt": 0 }, "value": "anon", - "typeAnnotation": null, "optional": false }, "computed": false @@ -838,8 +812,8 @@ "ctxt": 0 }, "value": "b3Number", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -856,7 +830,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -894,7 +867,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -920,7 +892,6 @@ "ctxt": 0 }, "value": "nom", - "typeAnnotation": null, "optional": false }, "value": null, @@ -960,7 +931,6 @@ "ctxt": 0 }, "value": "b3Number", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1011,8 +981,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1029,7 +999,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1064,8 +1033,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1082,7 +1051,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1117,8 +1085,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1135,7 +1103,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1175,7 +1142,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1186,7 +1152,6 @@ "ctxt": 0 }, "value": "genericVar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1232,7 +1197,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "property": { @@ -1243,7 +1207,6 @@ "ctxt": 0 }, "value": "genericVar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1289,7 +1252,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -1300,7 +1262,6 @@ "ctxt": 0 }, "value": "genericVar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/modifierOnClassExpressionMemberInFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/modifierOnClassExpressionMemberInFunction/input.ts.json index c81601c2dd63..bb3a920f4365 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/modifierOnClassExpressionMemberInFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/classExpressions/modifierOnClassExpressionMemberInFunction/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ClassExpression", @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "span": { @@ -98,7 +96,6 @@ "ctxt": 0 }, "value": "prop1", - "typeAnnotation": null, "optional": false }, "value": { @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "prop2", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/automaticConstructors/classWithoutExplicitConstructor/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/automaticConstructors/classWithoutExplicitConstructor/input.ts.json index 255290d29032..fc492ad69e33 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/automaticConstructors/classWithoutExplicitConstructor/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/automaticConstructors/classWithoutExplicitConstructor/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -140,8 +137,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -158,7 +155,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -193,8 +189,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -211,7 +207,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -243,7 +238,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -269,7 +263,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -307,7 +300,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -340,7 +332,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -382,7 +373,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -400,7 +390,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -437,8 +426,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -455,7 +444,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -490,8 +478,8 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -508,7 +496,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/automaticConstructors/derivedClassWithoutExplicitConstructor/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/automaticConstructors/derivedClassWithoutExplicitConstructor/input.ts.json index e1d20ab4ca2d..bc7035ecb857 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/automaticConstructors/derivedClassWithoutExplicitConstructor/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/automaticConstructors/derivedClassWithoutExplicitConstructor/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -100,6 +97,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -116,8 +114,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -167,7 +164,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -180,7 +176,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -207,7 +202,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -233,7 +227,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -271,7 +264,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -308,7 +300,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -341,8 +332,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -359,7 +350,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -394,8 +384,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -412,7 +402,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -445,7 +434,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -471,7 +459,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -497,7 +484,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -528,7 +514,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -548,6 +533,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -570,13 +556,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -626,7 +610,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -639,7 +622,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -675,7 +657,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -696,7 +677,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -722,7 +702,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -760,7 +739,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -793,7 +771,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -818,7 +795,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -845,7 +821,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -863,7 +838,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -895,7 +869,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -929,8 +902,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -947,7 +920,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -982,8 +954,8 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1000,7 +972,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1021,7 +992,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/automaticConstructors/derivedClassWithoutExplicitConstructor2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/automaticConstructors/derivedClassWithoutExplicitConstructor2/input.ts.json index c43be3f143c5..4a2da4eb66eb 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/automaticConstructors/derivedClassWithoutExplicitConstructor2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/automaticConstructors/derivedClassWithoutExplicitConstructor2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -100,6 +97,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -116,8 +114,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -136,6 +133,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -152,8 +150,7 @@ }, "kind": "number" } - }, - "optional": true + } } }, { @@ -172,6 +169,7 @@ "ctxt": 0 }, "value": "z", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -188,8 +186,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -212,7 +209,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -232,6 +228,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -248,8 +245,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -268,6 +264,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -284,8 +281,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -308,7 +304,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -328,6 +323,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -344,8 +340,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -395,7 +390,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -408,7 +402,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -435,7 +428,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -461,7 +453,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -499,7 +490,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -536,7 +526,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -569,8 +558,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -587,7 +576,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -622,8 +610,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -640,7 +628,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -688,8 +675,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -706,7 +693,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -766,8 +752,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -784,7 +770,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -841,7 +826,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -867,7 +851,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -893,7 +876,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -924,7 +906,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -944,6 +925,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -966,13 +948,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -991,6 +971,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1013,13 +994,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } }, { @@ -1038,6 +1017,7 @@ "ctxt": 0 }, "value": "z", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1060,13 +1040,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } } ], @@ -1089,7 +1067,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1109,6 +1086,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1131,13 +1109,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1156,6 +1132,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1178,13 +1155,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } } ], @@ -1207,7 +1182,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1227,6 +1201,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1249,13 +1224,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1305,7 +1278,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1318,7 +1290,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1354,7 +1325,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1375,7 +1345,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1401,7 +1370,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1439,7 +1407,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1472,7 +1439,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1497,7 +1463,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1524,7 +1489,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1542,7 +1506,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1574,7 +1537,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1608,8 +1570,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1626,7 +1588,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1661,8 +1622,8 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1679,7 +1640,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1700,7 +1660,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1739,8 +1698,8 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1757,7 +1716,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1778,7 +1736,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1802,7 +1759,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1841,8 +1797,8 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1859,7 +1815,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1880,7 +1835,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1904,7 +1858,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1928,7 +1881,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/automaticConstructors/derivedClassWithoutExplicitConstructor3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/automaticConstructors/derivedClassWithoutExplicitConstructor3/input.ts.json index 6fd065918121..e72a523a85db 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/automaticConstructors/derivedClassWithoutExplicitConstructor3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/automaticConstructors/derivedClassWithoutExplicitConstructor3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -100,6 +97,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -116,8 +114,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -167,7 +164,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -180,7 +176,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -207,7 +202,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -233,7 +227,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -276,7 +269,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -296,6 +288,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -312,8 +305,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -332,6 +324,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -348,8 +341,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -438,7 +430,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -451,7 +442,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -470,7 +460,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -488,7 +477,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -514,7 +502,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -552,7 +539,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -589,7 +575,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -622,8 +607,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -640,7 +625,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -675,8 +659,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -693,7 +677,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -741,8 +724,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -759,7 +742,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -814,7 +796,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -840,7 +821,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -866,7 +846,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -897,7 +876,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -917,6 +895,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -939,13 +918,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -995,7 +972,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1008,7 +984,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1044,7 +1019,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1065,7 +1039,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1091,7 +1064,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1124,7 +1096,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1155,7 +1126,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1175,6 +1145,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1197,13 +1168,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1222,6 +1191,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1244,13 +1214,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1339,7 +1307,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1352,7 +1319,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1371,7 +1337,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1398,7 +1363,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1419,7 +1383,6 @@ "ctxt": 0 }, "value": "D2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1445,7 +1408,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1483,7 +1445,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1516,7 +1477,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1541,7 +1501,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1568,7 +1527,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1586,7 +1544,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1618,7 +1575,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1652,8 +1608,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1670,7 +1626,6 @@ "ctxt": 0 }, "value": "D2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1705,8 +1660,8 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1723,7 +1678,6 @@ "ctxt": 0 }, "value": "D2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1744,7 +1698,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1783,8 +1736,8 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1801,7 +1754,6 @@ "ctxt": 0 }, "value": "D2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1822,7 +1774,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1846,7 +1797,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorAccessibility/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorAccessibility/input.ts.json index 2cf99bdc9743..211a4a9285a0 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorAccessibility/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorAccessibility/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -64,6 +62,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,8 +79,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -114,7 +112,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -140,7 +137,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -162,6 +158,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -178,8 +175,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -212,7 +208,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -238,7 +233,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -260,6 +254,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -276,8 +271,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -325,8 +319,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -343,7 +337,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -391,8 +384,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -409,7 +402,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -457,8 +449,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -475,7 +467,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -515,7 +506,6 @@ "ctxt": 0 }, "value": "Generic", - "typeAnnotation": null, "optional": false }, "body": { @@ -536,7 +526,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -562,7 +551,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -584,6 +572,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -606,13 +595,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -654,7 +641,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -675,7 +661,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -701,7 +686,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -723,6 +707,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -745,13 +730,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -793,7 +776,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -814,7 +796,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -840,7 +821,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -862,6 +842,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -884,13 +865,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -932,7 +911,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -968,8 +946,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -986,7 +964,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1034,8 +1011,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1052,7 +1029,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1100,8 +1076,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1118,7 +1094,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorAccessibility2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorAccessibility2/input.ts.json index fd6bf700516c..e977cd213d70 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorAccessibility2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorAccessibility2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "BaseA", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -64,6 +62,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,8 +79,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -112,7 +110,6 @@ "ctxt": 0 }, "value": "createInstance", - "typeAnnotation": null, "optional": false }, "function": { @@ -153,7 +150,6 @@ "ctxt": 0 }, "value": "BaseA", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -203,7 +199,6 @@ "ctxt": 0 }, "value": "BaseB", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -229,7 +224,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -251,6 +245,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -267,8 +262,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -299,7 +293,6 @@ "ctxt": 0 }, "value": "createInstance", - "typeAnnotation": null, "optional": false }, "function": { @@ -340,7 +333,6 @@ "ctxt": 0 }, "value": "BaseB", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -390,7 +382,6 @@ "ctxt": 0 }, "value": "BaseC", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -416,7 +407,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -438,6 +428,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -454,8 +445,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -486,7 +476,6 @@ "ctxt": 0 }, "value": "createInstance", - "typeAnnotation": null, "optional": false }, "function": { @@ -527,7 +516,6 @@ "ctxt": 0 }, "value": "BaseC", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -575,7 +563,6 @@ "ctxt": 0 }, "value": "staticInstance", - "typeAnnotation": null, "optional": false }, "function": { @@ -616,7 +603,6 @@ "ctxt": 0 }, "value": "BaseC", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -666,7 +652,6 @@ "ctxt": 0 }, "value": "DerivedA", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -692,7 +677,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -714,6 +698,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -730,8 +715,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -776,7 +760,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -804,7 +787,6 @@ "ctxt": 0 }, "value": "createInstance", - "typeAnnotation": null, "optional": false }, "function": { @@ -845,7 +827,6 @@ "ctxt": 0 }, "value": "DerivedA", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -893,7 +874,6 @@ "ctxt": 0 }, "value": "createBaseInstance", - "typeAnnotation": null, "optional": false }, "function": { @@ -934,7 +914,6 @@ "ctxt": 0 }, "value": "BaseA", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -982,7 +961,6 @@ "ctxt": 0 }, "value": "staticBaseInstance", - "typeAnnotation": null, "optional": false }, "function": { @@ -1023,7 +1001,6 @@ "ctxt": 0 }, "value": "BaseA", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1065,7 +1042,6 @@ "ctxt": 0 }, "value": "BaseA", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1083,7 +1059,6 @@ "ctxt": 0 }, "value": "DerivedB", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1109,7 +1084,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1131,6 +1105,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1147,8 +1122,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1193,7 +1167,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1221,7 +1194,6 @@ "ctxt": 0 }, "value": "createInstance", - "typeAnnotation": null, "optional": false }, "function": { @@ -1262,7 +1234,6 @@ "ctxt": 0 }, "value": "DerivedB", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1310,7 +1281,6 @@ "ctxt": 0 }, "value": "createBaseInstance", - "typeAnnotation": null, "optional": false }, "function": { @@ -1351,7 +1321,6 @@ "ctxt": 0 }, "value": "BaseB", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1399,7 +1368,6 @@ "ctxt": 0 }, "value": "staticBaseInstance", - "typeAnnotation": null, "optional": false }, "function": { @@ -1440,7 +1408,6 @@ "ctxt": 0 }, "value": "BaseB", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1482,7 +1449,6 @@ "ctxt": 0 }, "value": "BaseB", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1500,7 +1466,6 @@ "ctxt": 0 }, "value": "DerivedC", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1526,7 +1491,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1548,6 +1512,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1564,8 +1529,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1610,7 +1574,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1638,7 +1601,6 @@ "ctxt": 0 }, "value": "createInstance", - "typeAnnotation": null, "optional": false }, "function": { @@ -1679,7 +1641,6 @@ "ctxt": 0 }, "value": "DerivedC", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1727,7 +1688,6 @@ "ctxt": 0 }, "value": "createBaseInstance", - "typeAnnotation": null, "optional": false }, "function": { @@ -1768,7 +1728,6 @@ "ctxt": 0 }, "value": "BaseC", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1816,7 +1775,6 @@ "ctxt": 0 }, "value": "staticBaseInstance", - "typeAnnotation": null, "optional": false }, "function": { @@ -1857,7 +1815,6 @@ "ctxt": 0 }, "value": "BaseC", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1899,7 +1856,6 @@ "ctxt": 0 }, "value": "BaseC", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1932,8 +1888,8 @@ "ctxt": 0 }, "value": "ba", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1950,7 +1906,6 @@ "ctxt": 0 }, "value": "BaseA", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1998,8 +1953,8 @@ "ctxt": 0 }, "value": "bb", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2016,7 +1971,6 @@ "ctxt": 0 }, "value": "BaseB", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2064,8 +2018,8 @@ "ctxt": 0 }, "value": "bc", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2082,7 +2036,6 @@ "ctxt": 0 }, "value": "BaseC", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2130,8 +2083,8 @@ "ctxt": 0 }, "value": "da", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2148,7 +2101,6 @@ "ctxt": 0 }, "value": "DerivedA", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2196,8 +2148,8 @@ "ctxt": 0 }, "value": "db", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2214,7 +2166,6 @@ "ctxt": 0 }, "value": "DerivedB", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2262,8 +2213,8 @@ "ctxt": 0 }, "value": "dc", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2280,7 +2231,6 @@ "ctxt": 0 }, "value": "DerivedC", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorAccessibility3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorAccessibility3/input.ts.json index be0f770b212e..736105e23472 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorAccessibility3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorAccessibility3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -64,6 +62,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,8 +79,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -114,7 +112,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -140,7 +137,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -162,6 +158,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -178,8 +175,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -212,7 +208,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -238,7 +233,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -260,6 +254,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -276,8 +271,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -310,7 +304,6 @@ "ctxt": 0 }, "value": "Qux", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -336,7 +329,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -358,6 +350,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -374,8 +367,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -423,8 +415,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -434,7 +426,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "definite": false @@ -464,8 +455,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -475,7 +466,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false } } @@ -503,8 +493,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -514,7 +504,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false } } @@ -542,8 +531,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -553,7 +542,6 @@ "ctxt": 0 }, "value": "Qux", - "typeAnnotation": null, "optional": false } } @@ -583,8 +571,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -594,7 +582,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "definite": false @@ -624,8 +611,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -635,7 +622,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } } @@ -663,8 +649,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -674,7 +660,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false } } @@ -702,8 +687,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -713,7 +698,6 @@ "ctxt": 0 }, "value": "Qux", - "typeAnnotation": null, "optional": false } } @@ -743,8 +727,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -754,7 +738,6 @@ "ctxt": 0 }, "value": "Qux", - "typeAnnotation": null, "optional": false }, "definite": false @@ -784,8 +767,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -795,7 +778,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } } @@ -823,8 +805,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -834,7 +816,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false } } @@ -862,8 +843,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -873,7 +854,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorAccessibility4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorAccessibility4/input.ts.json index f4f1eedc079a..0b89365147e1 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorAccessibility4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorAccessibility4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -73,7 +71,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -102,7 +99,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -128,7 +124,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -169,7 +164,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -206,7 +200,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -225,7 +218,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -263,7 +255,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -289,7 +280,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -320,7 +310,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -349,7 +338,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -375,7 +363,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -416,7 +403,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -453,7 +439,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -472,7 +457,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorAccessibility5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorAccessibility5/input.ts.json index 93d0eed5d258..cedcaee1bfb3 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorAccessibility5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorAccessibility5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -75,7 +73,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -101,7 +98,6 @@ "ctxt": 0 }, "value": "make", - "typeAnnotation": null, "optional": false }, "function": { @@ -142,7 +138,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -171,7 +166,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -189,7 +183,6 @@ "ctxt": 0 }, "value": "Unrelated", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -215,7 +208,6 @@ "ctxt": 0 }, "value": "fake", - "typeAnnotation": null, "optional": false }, "function": { @@ -256,7 +248,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorOverloadsAccessibility/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorOverloadsAccessibility/input.ts.json index 9ab17676794b..4f516d267b12 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorOverloadsAccessibility/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorOverloadsAccessibility/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -78,8 +77,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -102,7 +100,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -122,6 +119,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -138,8 +136,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -162,7 +159,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -182,6 +178,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -198,8 +195,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -222,7 +218,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -255,7 +250,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -281,7 +275,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -301,6 +294,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -317,8 +311,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -341,7 +334,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -361,6 +353,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -377,8 +370,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -401,7 +393,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -434,7 +425,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -460,7 +450,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -480,6 +469,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -496,8 +486,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -520,7 +509,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -540,6 +528,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +545,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -580,7 +568,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -613,7 +600,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -639,7 +625,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -659,6 +644,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -675,8 +661,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -699,7 +684,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -719,6 +703,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -735,8 +720,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -759,7 +743,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorParametersAccessibility/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorParametersAccessibility/input.ts.json index 1e8ac7e853e9..2cb7a1084367 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorParametersAccessibility/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorParametersAccessibility/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -64,6 +62,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,8 +79,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -129,6 +127,7 @@ "ctxt": 0 }, "value": "c1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -151,13 +150,11 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -186,7 +183,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "property": { @@ -197,7 +193,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -213,7 +208,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -239,7 +233,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -261,6 +254,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -277,8 +271,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -326,6 +319,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -348,13 +342,11 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -383,7 +375,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "property": { @@ -394,7 +385,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -410,7 +400,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -436,7 +425,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -458,6 +446,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -474,8 +463,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -523,6 +511,7 @@ "ctxt": 0 }, "value": "c3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -545,13 +534,11 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -580,7 +567,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "property": { @@ -591,7 +577,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -607,7 +592,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -633,7 +617,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -653,6 +636,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -669,8 +653,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -715,7 +698,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -753,7 +735,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -773,7 +754,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorParametersAccessibility2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorParametersAccessibility2/input.ts.json index f32de3ab3c09..efd696392675 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorParametersAccessibility2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorParametersAccessibility2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -64,6 +62,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,8 +79,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -129,6 +127,7 @@ "ctxt": 0 }, "value": "c1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -151,13 +150,11 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -186,7 +183,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "property": { @@ -197,7 +193,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -213,7 +208,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -239,7 +233,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -261,6 +254,7 @@ "ctxt": 0 }, "value": "p", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -277,8 +271,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -326,6 +319,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -348,13 +342,11 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -383,7 +375,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "property": { @@ -394,7 +385,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -410,7 +400,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -436,7 +425,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -458,6 +446,7 @@ "ctxt": 0 }, "value": "p", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -474,8 +463,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -523,6 +511,7 @@ "ctxt": 0 }, "value": "c3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -545,13 +534,11 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -580,7 +567,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "property": { @@ -591,7 +577,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -607,7 +592,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -633,7 +617,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -653,6 +636,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -669,8 +653,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -715,7 +698,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -753,7 +735,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -773,7 +754,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorParametersAccessibility3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorParametersAccessibility3/input.ts.json index e886d062f732..fa543bbef330 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorParametersAccessibility3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classConstructorParametersAccessibility3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -64,6 +62,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,8 +79,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -114,7 +112,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -140,7 +137,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -162,6 +158,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -178,8 +175,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -224,7 +220,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -262,7 +257,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -282,7 +276,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -315,6 +308,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -337,13 +331,11 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -372,7 +364,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -383,7 +374,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classWithTwoConstructorDefinitions/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classWithTwoConstructorDefinitions/input.ts.json index 553b3d647373..7c017b96654c 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classWithTwoConstructorDefinitions/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/classWithTwoConstructorDefinitions/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -73,7 +71,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -93,8 +90,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -127,7 +124,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -153,7 +149,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -173,6 +168,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -195,13 +191,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -232,7 +226,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -252,6 +245,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -274,13 +268,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -299,6 +291,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -321,13 +314,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -369,7 +360,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorDefaultValuesReferencingThis/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorDefaultValuesReferencingThis/input.ts.json index 406ea8dd39c0..f528d68ad751 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorDefaultValuesReferencingThis/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorDefaultValuesReferencingThis/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -69,8 +67,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ThisExpression", @@ -113,7 +111,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -139,7 +136,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -166,8 +162,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ThisExpression", @@ -219,7 +215,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -240,7 +235,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -266,7 +260,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -295,8 +288,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ThisExpression", @@ -348,7 +341,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorImplementationWithDefaultValues/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorImplementationWithDefaultValues/input.ts.json index 50ff06c55fb1..32a77d285198 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorImplementationWithDefaultValues/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorImplementationWithDefaultValues/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,8 +60,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -113,8 +110,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -162,8 +159,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -173,7 +170,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -202,7 +198,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -228,7 +223,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -248,8 +242,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -272,7 +266,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -299,6 +292,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -321,13 +315,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "right": { "type": "NullLiteral", @@ -374,8 +366,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -385,7 +377,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -423,7 +414,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -444,7 +434,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -470,7 +459,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -490,8 +478,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -514,7 +502,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -541,6 +528,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -563,13 +551,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "right": { "type": "NullLiteral", @@ -616,8 +602,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -627,7 +613,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -665,7 +650,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -683,7 +667,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorImplementationWithDefaultValues2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorImplementationWithDefaultValues2/input.ts.json index 8de1a36b76fa..38b34989754c 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorImplementationWithDefaultValues2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorImplementationWithDefaultValues2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,8 +60,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -115,6 +112,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -131,8 +129,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "right": { "type": "NumericLiteral", @@ -180,8 +177,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -191,7 +188,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -220,7 +216,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -246,7 +241,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -266,6 +260,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -288,13 +283,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -313,6 +306,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -335,13 +329,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -364,7 +356,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -391,6 +382,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -413,13 +405,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "right": { "type": "NumericLiteral", @@ -458,6 +448,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -480,13 +471,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "right": { "type": "Identifier", @@ -496,7 +485,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -536,8 +524,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -547,7 +535,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -585,7 +572,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -606,7 +592,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -627,7 +612,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -653,7 +637,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -673,8 +656,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -697,7 +680,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -724,6 +706,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -746,13 +729,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "right": { "type": "NewExpression", @@ -769,7 +750,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -812,8 +792,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -823,7 +803,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -861,7 +840,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -879,7 +857,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorOverloadsWithDefaultValues/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorOverloadsWithDefaultValues/input.ts.json index 76520a806249..7b0f6746aacf 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorOverloadsWithDefaultValues/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorOverloadsWithDefaultValues/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -115,8 +112,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -150,7 +147,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -183,7 +179,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -209,7 +204,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -255,7 +249,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -282,8 +275,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -317,7 +310,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -359,7 +351,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorOverloadsWithOptionalParameters/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorOverloadsWithOptionalParameters/input.ts.json index 9404fd435901..f79b9f37fd10 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorOverloadsWithOptionalParameters/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorOverloadsWithOptionalParameters/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -108,8 +105,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": true + "optional": true, + "typeAnnotation": null } }, { @@ -128,6 +125,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -152,8 +150,7 @@ "kind": "any" } } - }, - "optional": true + } } } ], @@ -176,7 +173,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -209,7 +205,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -235,7 +230,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -281,7 +275,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -301,8 +294,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": true + "optional": true, + "typeAnnotation": null } }, { @@ -321,6 +314,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -345,8 +339,7 @@ "kind": "any" } } - }, - "optional": true + } } } ], @@ -369,7 +362,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -411,7 +403,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorParameterProperties/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorParameterProperties/input.ts.json index 5d4bed15b3b0..89be502aed89 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorParameterProperties/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorParameterProperties/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -110,6 +107,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -126,8 +124,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -148,6 +145,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -164,8 +162,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -213,6 +210,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -235,13 +233,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -273,8 +269,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -291,7 +287,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -302,7 +297,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -336,8 +330,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -354,7 +348,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -365,7 +358,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -399,8 +391,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -417,7 +409,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -428,7 +419,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -447,7 +437,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -473,7 +462,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -499,7 +487,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -530,7 +517,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -550,6 +536,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -572,13 +559,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -599,6 +584,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -621,13 +607,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -648,6 +632,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -670,13 +655,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -718,7 +701,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -754,6 +736,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -776,7 +759,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -799,8 +781,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -832,8 +813,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -850,7 +831,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -861,7 +841,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -895,8 +874,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -913,7 +892,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -924,7 +902,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -958,8 +935,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -976,7 +953,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -987,7 +963,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1021,8 +996,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1039,7 +1014,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -1050,7 +1024,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorParameterProperties2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorParameterProperties2/input.ts.json index 6a3fe9a7fa1b..e44dcc6ff4c4 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorParameterProperties2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/constructorParameterProperties2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -108,6 +105,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -124,8 +122,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -173,6 +170,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -195,13 +193,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -233,8 +229,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -251,7 +247,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -262,7 +257,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -281,7 +275,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -307,7 +300,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -353,7 +345,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -375,6 +366,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -391,8 +383,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -440,6 +431,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -462,13 +454,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -500,8 +490,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -518,7 +508,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -529,7 +518,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -548,7 +536,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -574,7 +561,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -620,7 +606,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -642,6 +627,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -658,8 +644,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -707,6 +692,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -729,13 +715,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -767,8 +751,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -785,7 +769,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "property": { @@ -796,7 +779,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -815,7 +797,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -841,7 +822,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -887,7 +867,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -909,6 +888,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -925,8 +905,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -974,6 +953,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -996,13 +976,11 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1034,8 +1012,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1052,7 +1030,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { @@ -1063,7 +1040,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/declarationEmitReadonly/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/declarationEmitReadonly/input.ts.json index 56c5475ee59a..f11a4aa87596 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/declarationEmitReadonly/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/declarationEmitReadonly/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -64,6 +62,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,8 +79,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/readonlyConstructorAssignment/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/readonlyConstructorAssignment/input.ts.json index fd97e6c1f93c..6291d543cb1e 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/readonlyConstructorAssignment/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/readonlyConstructorAssignment/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -64,6 +62,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,8 +79,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -131,7 +129,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -169,7 +166,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -195,7 +191,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -215,6 +210,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -231,8 +227,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -277,7 +272,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -323,7 +317,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -353,7 +346,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -371,7 +363,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -397,7 +388,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -419,6 +409,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -435,8 +426,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -481,7 +471,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -527,7 +516,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -557,7 +545,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -575,7 +562,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -601,7 +587,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -623,6 +608,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -639,8 +625,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -690,7 +675,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -728,7 +712,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -754,7 +737,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -776,6 +758,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -792,8 +775,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -838,7 +820,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -884,7 +865,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -914,7 +894,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/readonlyInAmbientClass/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/readonlyInAmbientClass/input.ts.json index d7b3a5b53b80..49832b147ceb 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/readonlyInAmbientClass/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorParameters/readonlyInAmbientClass/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -64,6 +62,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,8 +79,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -125,6 +122,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -141,8 +139,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorWithAssignableReturnExpression/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorWithAssignableReturnExpression/input.ts.json index a0b4852360c4..7c3430107823 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorWithAssignableReturnExpression/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorWithAssignableReturnExpression/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -119,7 +116,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -165,7 +161,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -216,7 +211,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -242,7 +236,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -288,7 +281,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -325,7 +317,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -363,7 +354,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -389,7 +379,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -415,7 +404,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -446,7 +434,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -483,7 +470,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -530,7 +516,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -551,7 +536,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -577,7 +561,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -603,7 +586,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -634,7 +616,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -671,7 +652,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -704,7 +684,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -745,7 +724,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorWithExpressionLessReturn/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorWithExpressionLessReturn/input.ts.json index d7f1928a11dd..0ec8281d8c7e 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorWithExpressionLessReturn/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/constructorWithExpressionLessReturn/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -85,7 +83,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -111,7 +108,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -157,7 +153,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -200,7 +195,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -226,7 +220,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -248,6 +241,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -264,8 +258,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -308,7 +301,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -334,7 +326,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -356,6 +347,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -378,13 +370,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -436,7 +426,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/quotedConstructors/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/quotedConstructors/input.ts.json index 9c73256fa58b..90866b953406 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/quotedConstructors/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/quotedConstructors/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +85,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -97,7 +95,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -140,7 +137,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -210,7 +206,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -221,7 +216,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -264,7 +258,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -349,7 +342,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -360,7 +352,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -484,7 +475,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -495,7 +485,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -557,8 +546,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -621,7 +610,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -691,7 +679,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -702,7 +689,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/superCalls/derivedClassConstructorWithoutSuperCall/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/superCalls/derivedClassConstructorWithoutSuperCall/input.ts.json index 77637fd4e666..46a90a032a20 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/superCalls/derivedClassConstructorWithoutSuperCall/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/superCalls/derivedClassConstructorWithoutSuperCall/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -141,7 +137,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -159,7 +154,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -185,7 +179,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -211,7 +204,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -253,7 +245,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -274,7 +265,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -300,7 +290,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -337,8 +326,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -389,7 +378,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -416,7 +404,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -447,7 +434,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -466,7 +452,6 @@ "ctxt": 0 }, "value": "Derived3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -492,7 +477,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -529,8 +513,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -601,7 +585,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -628,7 +611,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -659,7 +641,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -678,7 +659,6 @@ "ctxt": 0 }, "value": "Derived4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -704,7 +684,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -741,8 +720,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -780,7 +759,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -807,7 +785,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -838,7 +815,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/superCalls/emitStatementsBeforeSuperCall/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/superCalls/emitStatementsBeforeSuperCall/input.ts.json index 95e59b2371f9..d5b7c7799572 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/superCalls/emitStatementsBeforeSuperCall/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/superCalls/emitStatementsBeforeSuperCall/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "Sub", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -91,6 +88,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -107,8 +105,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -149,7 +146,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -160,7 +156,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -233,7 +228,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false }, "value": { @@ -265,7 +259,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -283,7 +276,6 @@ "ctxt": 0 }, "value": "Test", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -309,7 +301,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": null, @@ -355,7 +346,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -377,6 +367,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -393,8 +384,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -487,7 +477,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -517,7 +506,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/superCalls/emitStatementsBeforeSuperCallWithDefineFields/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/superCalls/emitStatementsBeforeSuperCallWithDefineFields/input.ts.json index 546d060e4b90..95abecfb90e4 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/superCalls/emitStatementsBeforeSuperCallWithDefineFields/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/superCalls/emitStatementsBeforeSuperCallWithDefineFields/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "Sub", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -91,6 +88,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -107,8 +105,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -149,7 +146,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -160,7 +156,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -233,7 +228,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false }, "value": { @@ -265,7 +259,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -283,7 +276,6 @@ "ctxt": 0 }, "value": "Test", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -309,7 +301,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": null, @@ -355,7 +346,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -377,6 +367,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -393,8 +384,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -487,7 +477,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -517,7 +506,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/superCalls/superCallInConstructorWithNoBaseType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/superCalls/superCallInConstructorWithNoBaseType/input.ts.json index b7bf51cc8cec..98b9f4497a0b 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/superCalls/superCallInConstructorWithNoBaseType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/constructorDeclarations/superCalls/superCallInConstructorWithNoBaseType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -102,7 +100,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -150,6 +146,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -172,13 +169,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -247,7 +242,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/classPropertyAsPrivate/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/classPropertyAsPrivate/input.ts.json index 777608257909..3454eb5c5aed 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/classPropertyAsPrivate/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/classPropertyAsPrivate/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -151,7 +148,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -172,8 +168,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -218,7 +214,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -264,7 +259,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -310,7 +304,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "function": { @@ -373,7 +366,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "function": { @@ -394,8 +386,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -440,7 +432,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -503,6 +494,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -525,13 +517,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -560,7 +550,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -571,7 +560,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -599,7 +587,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -610,7 +597,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -646,7 +632,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -657,7 +642,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -702,7 +686,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -713,7 +696,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -744,7 +726,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -755,7 +736,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -790,7 +770,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -801,7 +780,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -840,7 +818,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -851,7 +828,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -896,7 +872,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -907,7 +882,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/classPropertyAsProtected/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/classPropertyAsProtected/input.ts.json index b4ac15ca1173..bd422161d54f 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/classPropertyAsProtected/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/classPropertyAsProtected/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -151,7 +148,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -172,8 +168,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -218,7 +214,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -264,7 +259,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -310,7 +304,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "function": { @@ -373,7 +366,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "function": { @@ -394,8 +386,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -440,7 +432,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -503,6 +494,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -525,13 +517,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -560,7 +550,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -571,7 +560,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -599,7 +587,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -610,7 +597,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -646,7 +632,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -657,7 +642,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -702,7 +686,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -713,7 +696,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -744,7 +726,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -755,7 +736,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -790,7 +770,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -801,7 +780,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -840,7 +818,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -851,7 +828,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -896,7 +872,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -907,7 +882,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/classPropertyIsPublicByDefault/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/classPropertyIsPublicByDefault/input.ts.json index 13a0f4e40d3d..ed103eebf34b 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/classPropertyIsPublicByDefault/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/classPropertyIsPublicByDefault/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -151,7 +148,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -172,8 +168,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -218,7 +214,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -264,7 +259,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -310,7 +304,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "function": { @@ -373,7 +366,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "function": { @@ -394,8 +386,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -440,7 +432,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -503,6 +494,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -525,13 +517,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -560,7 +550,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -571,7 +560,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -599,7 +587,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -610,7 +597,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -646,7 +632,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -657,7 +642,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -702,7 +686,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -713,7 +696,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -744,7 +726,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -755,7 +736,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -790,7 +770,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -801,7 +780,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -840,7 +818,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -851,7 +828,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -896,7 +872,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -907,7 +882,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/privateClassPropertyAccessibleWithinClass/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/privateClassPropertyAccessibleWithinClass/input.ts.json index ce749937d173..811d3aeb829b 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/privateClassPropertyAccessibleWithinClass/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/privateClassPropertyAccessibleWithinClass/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -137,7 +134,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -171,7 +167,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -192,8 +187,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -249,7 +244,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -277,7 +271,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -312,7 +305,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -361,7 +353,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -395,7 +386,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -441,7 +431,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -490,7 +479,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -524,7 +512,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -545,8 +532,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -602,7 +589,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -630,7 +616,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -665,7 +650,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -714,7 +698,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -748,7 +731,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -804,7 +786,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -843,7 +824,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -869,7 +849,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -915,7 +894,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -972,7 +950,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1027,7 +1004,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -1048,8 +1024,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1128,7 +1104,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1156,7 +1131,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1199,7 +1173,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -1256,7 +1229,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1295,7 +1267,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1341,7 +1312,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -1398,7 +1368,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1453,7 +1422,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -1474,8 +1442,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1554,7 +1522,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1582,7 +1549,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1625,7 +1591,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -1682,7 +1647,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1721,7 +1685,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -1785,7 +1748,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/privateClassPropertyAccessibleWithinNestedClass/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/privateClassPropertyAccessibleWithinNestedClass/input.ts.json index b8be02f679f0..34b6f5476be5 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/privateClassPropertyAccessibleWithinNestedClass/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/privateClassPropertyAccessibleWithinNestedClass/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -137,7 +134,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -171,7 +167,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -192,8 +187,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -249,7 +244,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -277,7 +271,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -312,7 +305,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -361,7 +353,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -395,7 +386,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -441,7 +431,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -490,7 +479,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -524,7 +512,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -545,8 +532,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -602,7 +589,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -630,7 +616,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -665,7 +650,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -714,7 +698,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -748,7 +731,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -804,7 +786,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -841,7 +822,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -870,7 +850,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -896,7 +875,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -940,6 +918,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -962,13 +941,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1000,8 +977,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1018,7 +995,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1029,7 +1005,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1063,8 +1038,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1081,7 +1056,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1092,7 +1066,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1126,8 +1099,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1144,7 +1117,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1155,7 +1127,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1189,8 +1160,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1207,7 +1178,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1218,7 +1188,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1252,8 +1221,8 @@ "ctxt": 0 }, "value": "sx1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1270,7 +1239,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -1281,7 +1249,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1315,8 +1282,8 @@ "ctxt": 0 }, "value": "sx2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1333,7 +1300,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -1344,7 +1310,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1378,8 +1343,8 @@ "ctxt": 0 }, "value": "sx3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1396,7 +1361,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -1407,7 +1371,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1441,8 +1404,8 @@ "ctxt": 0 }, "value": "sx4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1459,7 +1422,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -1470,7 +1432,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1504,8 +1465,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1522,7 +1483,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1557,8 +1517,8 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1575,7 +1535,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -1586,7 +1545,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1620,8 +1578,8 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1638,7 +1596,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -1649,7 +1606,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1683,8 +1639,8 @@ "ctxt": 0 }, "value": "y3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1701,7 +1657,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -1712,7 +1667,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1746,8 +1700,8 @@ "ctxt": 0 }, "value": "y4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1764,7 +1718,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -1775,7 +1728,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/privateProtectedMembersAreNotAccessibleDestructuring/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/privateProtectedMembersAreNotAccessibleDestructuring/input.ts.json index fa5af7d6b01d..19d888895772 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/privateProtectedMembersAreNotAccessibleDestructuring/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/privateProtectedMembersAreNotAccessibleDestructuring/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "priv", - "typeAnnotation": null, "optional": false }, "value": null, @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "prot", - "typeAnnotation": null, "optional": false }, "value": null, @@ -102,7 +99,6 @@ "ctxt": 0 }, "value": "privateMethod", - "typeAnnotation": null, "optional": false }, "function": { @@ -148,7 +144,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -202,7 +197,6 @@ "ctxt": 0 }, "value": "priv", - "typeAnnotation": null, "optional": false }, "value": { @@ -213,8 +207,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -227,7 +221,6 @@ "ctxt": 0 }, "value": "prot", - "typeAnnotation": null, "optional": false }, "value": { @@ -238,8 +231,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -298,7 +291,6 @@ "ctxt": 0 }, "value": "priv", - "typeAnnotation": null, "optional": false }, "value": null @@ -318,7 +310,6 @@ "ctxt": 0 }, "value": "prot", - "typeAnnotation": null, "optional": false }, "value": null @@ -342,7 +333,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -382,7 +372,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -408,7 +397,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "function": { @@ -462,7 +450,6 @@ "ctxt": 0 }, "value": "priv", - "typeAnnotation": null, "optional": false }, "value": { @@ -473,8 +460,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -528,7 +515,6 @@ "ctxt": 0 }, "value": "prot", - "typeAnnotation": null, "optional": false }, "value": { @@ -539,8 +525,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -581,7 +567,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -614,8 +599,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -632,7 +617,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -682,7 +666,6 @@ "ctxt": 0 }, "value": "priv", - "typeAnnotation": null, "optional": false }, "value": null @@ -699,7 +682,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "definite": false @@ -746,7 +728,6 @@ "ctxt": 0 }, "value": "prot", - "typeAnnotation": null, "optional": false }, "value": null @@ -763,7 +744,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "definite": false @@ -810,7 +790,6 @@ "ctxt": 0 }, "value": "privateMethod", - "typeAnnotation": null, "optional": false }, "value": null @@ -827,7 +806,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "definite": false @@ -869,7 +847,6 @@ "ctxt": 0 }, "value": "priv", - "typeAnnotation": null, "optional": false }, "value": { @@ -880,8 +857,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -894,7 +871,6 @@ "ctxt": 0 }, "value": "prot", - "typeAnnotation": null, "optional": false }, "value": { @@ -905,8 +881,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -919,7 +895,6 @@ "ctxt": 0 }, "value": "privateMethod", - "typeAnnotation": null, "optional": false }, "value": { @@ -930,8 +905,8 @@ "ctxt": 0 }, "value": "pm", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -946,7 +921,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "definite": false @@ -963,7 +937,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -999,7 +972,6 @@ "ctxt": 0 }, "value": "priv", - "typeAnnotation": null, "optional": false }, "value": null @@ -1019,7 +991,6 @@ "ctxt": 0 }, "value": "prot", - "typeAnnotation": null, "optional": false }, "value": null @@ -1039,7 +1010,6 @@ "ctxt": 0 }, "value": "privateMethod", - "typeAnnotation": null, "optional": false }, "value": null @@ -1068,7 +1038,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/privateStaticMemberAccessibility/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/privateStaticMemberAccessibility/input.ts.json index 137f89289260..ffc5870ed827 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/privateStaticMemberAccessibility/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/privateStaticMemberAccessibility/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -134,7 +130,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "property": { @@ -145,7 +140,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -176,7 +170,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": { @@ -202,7 +195,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "property": { @@ -213,7 +205,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -243,7 +234,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/privateStaticNotAccessibleInClodule/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/privateStaticNotAccessibleInClodule/input.ts.json index 8d4b05b41496..df3aeff31005 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/privateStaticNotAccessibleInClodule/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/privateStaticNotAccessibleInClodule/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -143,7 +140,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "body": { @@ -186,8 +182,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -204,7 +200,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -215,7 +210,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/privateStaticNotAccessibleInClodule2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/privateStaticNotAccessibleInClodule2/input.ts.json index a0b794772521..0f27c80d48da 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/privateStaticNotAccessibleInClodule2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/privateStaticNotAccessibleInClodule2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -162,7 +158,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -202,7 +197,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -227,7 +221,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "body": { @@ -270,8 +263,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -288,7 +281,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "property": { @@ -299,7 +291,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinClass/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinClass/input.ts.json index 58c58dcbde0d..549660fcdddb 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinClass/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinClass/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -137,7 +134,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -171,7 +167,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -192,8 +187,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -249,7 +244,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -277,7 +271,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -312,7 +305,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -361,7 +353,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -395,7 +386,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -441,7 +431,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -490,7 +479,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -524,7 +512,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -545,8 +532,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -602,7 +589,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -630,7 +616,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -665,7 +650,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -714,7 +698,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -748,7 +731,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -804,7 +786,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -843,7 +824,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -869,7 +849,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -915,7 +894,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -972,7 +950,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1027,7 +1004,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -1048,8 +1024,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1128,7 +1104,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1156,7 +1131,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1199,7 +1173,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -1256,7 +1229,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1295,7 +1267,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1341,7 +1312,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -1398,7 +1368,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1453,7 +1422,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -1474,8 +1442,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1554,7 +1522,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1582,7 +1549,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1625,7 +1591,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -1682,7 +1647,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1721,7 +1685,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -1785,7 +1748,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedClass/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedClass/input.ts.json index 8bdefd182ab9..4154e10ecd16 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedClass/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedClass/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -137,7 +134,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -171,7 +167,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -192,8 +187,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -249,7 +244,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -277,7 +271,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -312,7 +305,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -361,7 +353,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -395,7 +386,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -441,7 +431,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -490,7 +479,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -524,7 +512,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -545,8 +532,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -602,7 +589,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -630,7 +616,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -665,7 +650,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -714,7 +698,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -748,7 +731,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -804,7 +786,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -841,7 +822,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -870,7 +850,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -896,7 +875,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -940,6 +918,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -962,13 +941,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1000,8 +977,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1018,7 +995,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1029,7 +1005,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1063,8 +1038,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1081,7 +1056,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1092,7 +1066,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1126,8 +1099,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1144,7 +1117,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1155,7 +1127,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1189,8 +1160,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1207,7 +1178,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1218,7 +1188,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1252,8 +1221,8 @@ "ctxt": 0 }, "value": "sx1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1270,7 +1239,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -1281,7 +1249,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1315,8 +1282,8 @@ "ctxt": 0 }, "value": "sx2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1333,7 +1300,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -1344,7 +1310,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1378,8 +1343,8 @@ "ctxt": 0 }, "value": "sx3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1396,7 +1361,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -1407,7 +1371,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1441,8 +1404,8 @@ "ctxt": 0 }, "value": "sx4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1459,7 +1422,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -1470,7 +1432,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1504,8 +1465,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1522,7 +1483,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1557,8 +1517,8 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1575,7 +1535,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -1586,7 +1545,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1620,8 +1578,8 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1638,7 +1596,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -1649,7 +1606,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1683,8 +1639,8 @@ "ctxt": 0 }, "value": "y3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1701,7 +1657,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -1712,7 +1667,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1746,8 +1700,8 @@ "ctxt": 0 }, "value": "y4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1764,7 +1718,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -1775,7 +1728,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass/input.ts.json index 12e41466e064..54b792170841 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -162,7 +158,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -211,7 +206,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -245,7 +239,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -266,8 +259,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -323,7 +316,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -351,7 +343,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -386,7 +377,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -435,7 +425,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -469,7 +458,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -518,7 +506,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -552,7 +539,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -573,8 +559,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -630,7 +616,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -658,7 +643,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -693,7 +677,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -742,7 +725,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -776,7 +758,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -832,7 +813,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -869,7 +849,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -898,7 +877,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -924,7 +902,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -968,8 +945,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -986,7 +963,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1021,8 +997,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1039,7 +1015,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1050,7 +1025,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1084,8 +1058,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1102,7 +1076,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1113,7 +1086,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1147,8 +1119,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1165,7 +1137,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1176,7 +1147,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1210,8 +1180,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1228,7 +1198,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1239,7 +1208,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1273,8 +1241,8 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1291,7 +1259,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1302,7 +1269,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1336,8 +1302,8 @@ "ctxt": 0 }, "value": "sc1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1354,7 +1320,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -1365,7 +1330,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1399,8 +1363,8 @@ "ctxt": 0 }, "value": "sc2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1417,7 +1381,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -1428,7 +1391,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1462,8 +1424,8 @@ "ctxt": 0 }, "value": "sc3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1480,7 +1442,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -1491,7 +1452,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1525,8 +1485,8 @@ "ctxt": 0 }, "value": "sc4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1543,7 +1503,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -1554,7 +1513,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1605,7 +1563,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1623,7 +1580,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1649,7 +1605,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1689,7 +1644,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1/input.ts.json index 545c8f42108c..405354fd7b98 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -117,7 +114,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -143,7 +139,6 @@ "ctxt": 0 }, "value": "methoda", - "typeAnnotation": null, "optional": false }, "function": { @@ -187,6 +182,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -209,13 +205,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -247,6 +241,7 @@ "ctxt": 0 }, "value": "d1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -269,13 +264,11 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -307,6 +300,7 @@ "ctxt": 0 }, "value": "d2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -329,13 +323,11 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -367,6 +359,7 @@ "ctxt": 0 }, "value": "d3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -389,13 +382,11 @@ "ctxt": 0 }, "value": "Derived3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -427,6 +418,7 @@ "ctxt": 0 }, "value": "d4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -449,13 +441,11 @@ "ctxt": 0 }, "value": "Derived4", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -484,7 +474,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -495,7 +484,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -523,7 +511,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "property": { @@ -534,7 +521,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -562,7 +548,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "property": { @@ -573,7 +558,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -601,7 +585,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "property": { @@ -612,7 +595,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -640,7 +622,6 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, "optional": false }, "property": { @@ -651,7 +632,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -707,7 +687,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -733,7 +712,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "function": { @@ -762,7 +740,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -788,7 +765,6 @@ "ctxt": 0 }, "value": "method1b", - "typeAnnotation": null, "optional": false }, "function": { @@ -832,6 +808,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -854,13 +831,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -892,6 +867,7 @@ "ctxt": 0 }, "value": "d1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -914,13 +890,11 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -952,6 +926,7 @@ "ctxt": 0 }, "value": "d2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -974,13 +949,11 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1012,6 +985,7 @@ "ctxt": 0 }, "value": "d3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1034,13 +1008,11 @@ "ctxt": 0 }, "value": "Derived3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1072,6 +1044,7 @@ "ctxt": 0 }, "value": "d4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1094,13 +1067,11 @@ "ctxt": 0 }, "value": "Derived4", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1129,7 +1100,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1140,7 +1110,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1168,7 +1137,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1179,7 +1147,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1207,7 +1174,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1218,7 +1184,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1246,7 +1211,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1257,7 +1221,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1285,7 +1248,6 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, "optional": false }, "property": { @@ -1296,7 +1258,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1344,7 +1305,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1362,7 +1322,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1388,7 +1347,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "function": { @@ -1417,7 +1375,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1443,7 +1400,6 @@ "ctxt": 0 }, "value": "method2c", - "typeAnnotation": null, "optional": false }, "function": { @@ -1487,6 +1443,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1509,13 +1466,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1547,6 +1502,7 @@ "ctxt": 0 }, "value": "d1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1569,13 +1525,11 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1607,6 +1561,7 @@ "ctxt": 0 }, "value": "d2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1629,13 +1584,11 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1667,6 +1620,7 @@ "ctxt": 0 }, "value": "d3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1689,13 +1643,11 @@ "ctxt": 0 }, "value": "Derived3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1727,6 +1679,7 @@ "ctxt": 0 }, "value": "d4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1749,13 +1702,11 @@ "ctxt": 0 }, "value": "Derived4", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1784,7 +1735,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1795,7 +1745,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1823,7 +1772,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1834,7 +1782,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1862,7 +1809,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1873,7 +1819,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1901,7 +1846,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1912,7 +1856,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1940,7 +1883,6 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, "optional": false }, "property": { @@ -1951,7 +1893,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1999,7 +1940,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2017,7 +1957,6 @@ "ctxt": 0 }, "value": "Derived3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2043,7 +1982,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2089,7 +2027,6 @@ "ctxt": 0 }, "value": "method3", - "typeAnnotation": null, "optional": false }, "function": { @@ -2118,7 +2055,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2144,7 +2080,6 @@ "ctxt": 0 }, "value": "method3d", - "typeAnnotation": null, "optional": false }, "function": { @@ -2188,6 +2123,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2210,13 +2146,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2248,6 +2182,7 @@ "ctxt": 0 }, "value": "d1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2270,13 +2205,11 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2308,6 +2241,7 @@ "ctxt": 0 }, "value": "d2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2330,13 +2264,11 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2368,6 +2300,7 @@ "ctxt": 0 }, "value": "d3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2390,13 +2323,11 @@ "ctxt": 0 }, "value": "Derived3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2428,6 +2359,7 @@ "ctxt": 0 }, "value": "d4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2450,13 +2382,11 @@ "ctxt": 0 }, "value": "Derived4", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2485,7 +2415,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2496,7 +2425,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2524,7 +2452,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2535,7 +2462,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2563,7 +2489,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2574,7 +2499,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2602,7 +2526,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "property": { @@ -2613,7 +2536,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2641,7 +2563,6 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, "optional": false }, "property": { @@ -2652,7 +2573,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2700,7 +2620,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2718,7 +2637,6 @@ "ctxt": 0 }, "value": "Derived4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2744,7 +2662,6 @@ "ctxt": 0 }, "value": "method4", - "typeAnnotation": null, "optional": false }, "function": { @@ -2773,7 +2690,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2799,7 +2715,6 @@ "ctxt": 0 }, "value": "method4e", - "typeAnnotation": null, "optional": false }, "function": { @@ -2843,6 +2758,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2865,13 +2781,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2903,6 +2817,7 @@ "ctxt": 0 }, "value": "d1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2925,13 +2840,11 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2963,6 +2876,7 @@ "ctxt": 0 }, "value": "d2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2985,13 +2899,11 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3023,6 +2935,7 @@ "ctxt": 0 }, "value": "d3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3045,13 +2958,11 @@ "ctxt": 0 }, "value": "Derived3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3083,6 +2994,7 @@ "ctxt": 0 }, "value": "d4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3105,13 +3017,11 @@ "ctxt": 0 }, "value": "Derived4", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3140,7 +3050,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -3151,7 +3060,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3179,7 +3087,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "property": { @@ -3190,7 +3097,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3218,7 +3124,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "property": { @@ -3229,7 +3134,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3257,7 +3161,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "property": { @@ -3268,7 +3171,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3296,7 +3198,6 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, "optional": false }, "property": { @@ -3307,7 +3208,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3355,7 +3255,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -3388,6 +3287,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3410,13 +3310,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3448,6 +3346,7 @@ "ctxt": 0 }, "value": "d1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3470,13 +3369,11 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3508,6 +3405,7 @@ "ctxt": 0 }, "value": "d2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3530,13 +3428,11 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3568,6 +3464,7 @@ "ctxt": 0 }, "value": "d3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3590,13 +3487,11 @@ "ctxt": 0 }, "value": "Derived3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3628,6 +3523,7 @@ "ctxt": 0 }, "value": "d4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3650,13 +3546,11 @@ "ctxt": 0 }, "value": "Derived4", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3685,7 +3579,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -3696,7 +3589,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3724,7 +3616,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "property": { @@ -3735,7 +3626,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3763,7 +3653,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "property": { @@ -3774,7 +3663,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3802,7 +3690,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "property": { @@ -3813,7 +3700,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3841,7 +3727,6 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, "optional": false }, "property": { @@ -3852,7 +3737,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass/input.ts.json index c7858ea96513..48690ee94f26 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -162,7 +158,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -211,7 +206,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -245,7 +239,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -266,8 +259,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -323,7 +316,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -351,7 +343,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -386,7 +377,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -435,7 +425,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -469,7 +458,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -525,7 +513,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -562,7 +549,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -611,7 +597,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -645,7 +630,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -666,8 +650,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -723,7 +707,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -751,7 +734,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -786,7 +768,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -835,7 +816,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -869,7 +849,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -925,7 +904,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -956,7 +934,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2/input.ts.json index 97eb26c3b696..d17c9e6d9047 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -132,6 +129,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -154,13 +152,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -192,6 +188,7 @@ "ctxt": 0 }, "value": "d1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -214,13 +211,11 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -252,6 +247,7 @@ "ctxt": 0 }, "value": "d2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -274,13 +270,11 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -312,6 +306,7 @@ "ctxt": 0 }, "value": "d3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -334,13 +329,11 @@ "ctxt": 0 }, "value": "Derived3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -372,6 +365,7 @@ "ctxt": 0 }, "value": "d4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -394,13 +388,11 @@ "ctxt": 0 }, "value": "Derived4", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -429,7 +421,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -440,7 +431,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -468,7 +458,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "property": { @@ -479,7 +468,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -507,7 +495,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "property": { @@ -518,7 +505,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -546,7 +532,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "property": { @@ -557,7 +542,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -585,7 +569,6 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, "optional": false }, "property": { @@ -596,7 +579,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -632,7 +614,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -658,7 +639,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "function": { @@ -702,6 +682,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -724,13 +705,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -762,6 +741,7 @@ "ctxt": 0 }, "value": "d1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -784,13 +764,11 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -822,6 +800,7 @@ "ctxt": 0 }, "value": "d2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -844,13 +823,11 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -882,6 +859,7 @@ "ctxt": 0 }, "value": "d3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -904,13 +882,11 @@ "ctxt": 0 }, "value": "Derived3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -942,6 +918,7 @@ "ctxt": 0 }, "value": "d4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -964,13 +941,11 @@ "ctxt": 0 }, "value": "Derived4", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -999,7 +974,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1010,7 +984,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1038,7 +1011,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1049,7 +1021,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1077,7 +1048,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1088,7 +1058,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1116,7 +1085,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1127,7 +1095,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1155,7 +1122,6 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, "optional": false }, "property": { @@ -1166,7 +1132,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1194,7 +1159,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1212,7 +1176,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1238,7 +1201,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "function": { @@ -1282,6 +1244,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1304,13 +1267,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1342,6 +1303,7 @@ "ctxt": 0 }, "value": "d1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1364,13 +1326,11 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1402,6 +1362,7 @@ "ctxt": 0 }, "value": "d2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1424,13 +1385,11 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1462,6 +1421,7 @@ "ctxt": 0 }, "value": "d3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1484,13 +1444,11 @@ "ctxt": 0 }, "value": "Derived3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1522,6 +1480,7 @@ "ctxt": 0 }, "value": "d4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1544,13 +1503,11 @@ "ctxt": 0 }, "value": "Derived4", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1579,7 +1536,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1590,7 +1546,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1618,7 +1573,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1629,7 +1583,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1657,7 +1610,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1668,7 +1620,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1696,7 +1647,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1707,7 +1657,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1735,7 +1684,6 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, "optional": false }, "property": { @@ -1746,7 +1694,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1774,7 +1721,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1792,7 +1738,6 @@ "ctxt": 0 }, "value": "Derived3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1818,7 +1763,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1864,7 +1808,6 @@ "ctxt": 0 }, "value": "method3", - "typeAnnotation": null, "optional": false }, "function": { @@ -1908,6 +1851,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1930,13 +1874,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1968,6 +1910,7 @@ "ctxt": 0 }, "value": "d1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1990,13 +1933,11 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2028,6 +1969,7 @@ "ctxt": 0 }, "value": "d2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2050,13 +1992,11 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2088,6 +2028,7 @@ "ctxt": 0 }, "value": "d3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2110,13 +2051,11 @@ "ctxt": 0 }, "value": "Derived3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2148,6 +2087,7 @@ "ctxt": 0 }, "value": "d4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2170,13 +2110,11 @@ "ctxt": 0 }, "value": "Derived4", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2205,7 +2143,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2216,7 +2153,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2244,7 +2180,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2255,7 +2190,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2283,7 +2217,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2294,7 +2227,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2322,7 +2254,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "property": { @@ -2333,7 +2264,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2361,7 +2291,6 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, "optional": false }, "property": { @@ -2372,7 +2301,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2400,7 +2328,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2418,7 +2345,6 @@ "ctxt": 0 }, "value": "Derived4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2444,7 +2370,6 @@ "ctxt": 0 }, "value": "method4", - "typeAnnotation": null, "optional": false }, "function": { @@ -2488,6 +2413,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2510,13 +2436,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2548,6 +2472,7 @@ "ctxt": 0 }, "value": "d1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2570,13 +2495,11 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2608,6 +2531,7 @@ "ctxt": 0 }, "value": "d2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2630,13 +2554,11 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2668,6 +2590,7 @@ "ctxt": 0 }, "value": "d3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2690,13 +2613,11 @@ "ctxt": 0 }, "value": "Derived3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2728,6 +2649,7 @@ "ctxt": 0 }, "value": "d4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2750,13 +2672,11 @@ "ctxt": 0 }, "value": "Derived4", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2785,7 +2705,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2796,7 +2715,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2824,7 +2742,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2835,7 +2752,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2863,7 +2779,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2874,7 +2789,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2902,7 +2816,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "property": { @@ -2913,7 +2826,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2941,7 +2853,6 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, "optional": false }, "property": { @@ -2952,7 +2863,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2980,7 +2890,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -3013,6 +2922,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3035,13 +2945,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3073,6 +2981,7 @@ "ctxt": 0 }, "value": "d1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3095,13 +3004,11 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3133,6 +3040,7 @@ "ctxt": 0 }, "value": "d2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3155,13 +3063,11 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3193,6 +3099,7 @@ "ctxt": 0 }, "value": "d3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3215,13 +3122,11 @@ "ctxt": 0 }, "value": "Derived3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3253,6 +3158,7 @@ "ctxt": 0 }, "value": "d4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3275,13 +3181,11 @@ "ctxt": 0 }, "value": "Derived4", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3310,7 +3214,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -3321,7 +3224,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3349,7 +3251,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "property": { @@ -3360,7 +3261,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3388,7 +3288,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "property": { @@ -3399,7 +3298,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3427,7 +3325,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "property": { @@ -3438,7 +3335,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3466,7 +3362,6 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, "optional": false }, "property": { @@ -3477,7 +3372,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass3/input.ts.json index e8f320ede796..562427dc1bd3 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -137,7 +134,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -173,7 +169,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -199,7 +194,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "function": { @@ -248,7 +242,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -284,7 +277,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -312,7 +304,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedInstanceMemberAccessibility/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedInstanceMemberAccessibility/input.ts.json index aaadc4cd1cee..8da6ae0b5f2f 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedInstanceMemberAccessibility/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedInstanceMemberAccessibility/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -175,7 +172,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -201,7 +197,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -247,7 +242,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "function": { @@ -291,8 +285,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -317,7 +311,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -351,8 +344,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -384,7 +377,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -421,8 +413,8 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -447,7 +439,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -481,8 +472,8 @@ "ctxt": 0 }, "value": "t4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -507,7 +498,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -541,8 +531,8 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -567,7 +557,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -601,8 +590,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -634,7 +623,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -671,8 +659,8 @@ "ctxt": 0 }, "value": "s3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -697,7 +685,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -731,8 +718,8 @@ "ctxt": 0 }, "value": "s4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -757,7 +744,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -791,6 +777,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -813,13 +800,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -851,8 +836,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -869,7 +854,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -880,7 +864,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -914,8 +897,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -939,7 +922,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -950,7 +932,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -987,8 +968,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1005,7 +986,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1016,7 +996,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1050,8 +1029,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1068,7 +1047,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1079,7 +1057,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1113,6 +1090,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1135,13 +1113,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1173,8 +1149,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1191,7 +1167,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1202,7 +1177,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1236,8 +1210,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1261,7 +1235,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1272,7 +1245,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1309,8 +1281,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1327,7 +1299,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1338,7 +1309,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1372,8 +1342,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1390,7 +1360,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1401,7 +1370,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1435,6 +1403,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1457,13 +1426,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1495,8 +1462,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1513,7 +1480,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1524,7 +1490,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1558,8 +1523,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1583,7 +1548,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1594,7 +1558,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1631,8 +1594,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1649,7 +1612,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1660,7 +1622,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1694,8 +1655,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1712,7 +1673,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1723,7 +1683,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1754,7 +1713,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1772,7 +1730,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1798,7 +1755,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1838,7 +1794,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedStaticClassPropertyAccessibleWithinSubclass/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedStaticClassPropertyAccessibleWithinSubclass/input.ts.json index 872ba87e724b..4227d612a30d 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedStaticClassPropertyAccessibleWithinSubclass/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedStaticClassPropertyAccessibleWithinSubclass/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "staticMethod", - "typeAnnotation": null, "optional": false }, "function": { @@ -129,7 +126,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "property": { @@ -140,7 +136,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -168,7 +163,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "property": { @@ -179,7 +173,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -207,7 +200,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "property": { @@ -218,7 +210,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -246,7 +237,6 @@ "ctxt": 0 }, "value": "Derived3", - "typeAnnotation": null, "optional": false }, "property": { @@ -257,7 +247,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -293,7 +282,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -319,7 +307,6 @@ "ctxt": 0 }, "value": "staticMethod1", - "typeAnnotation": null, "optional": false }, "function": { @@ -360,7 +347,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "property": { @@ -371,7 +357,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -399,7 +384,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "property": { @@ -410,7 +394,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -438,7 +421,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "property": { @@ -449,7 +431,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -477,7 +458,6 @@ "ctxt": 0 }, "value": "Derived3", - "typeAnnotation": null, "optional": false }, "property": { @@ -488,7 +468,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -516,7 +495,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -534,7 +512,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -560,7 +537,6 @@ "ctxt": 0 }, "value": "staticMethod2", - "typeAnnotation": null, "optional": false }, "function": { @@ -601,7 +577,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "property": { @@ -612,7 +587,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -640,7 +614,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "property": { @@ -651,7 +624,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -679,7 +651,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "property": { @@ -690,7 +661,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -718,7 +688,6 @@ "ctxt": 0 }, "value": "Derived3", - "typeAnnotation": null, "optional": false }, "property": { @@ -729,7 +698,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -757,7 +725,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -775,7 +742,6 @@ "ctxt": 0 }, "value": "Derived3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -801,7 +767,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -847,7 +812,6 @@ "ctxt": 0 }, "value": "staticMethod3", - "typeAnnotation": null, "optional": false }, "function": { @@ -888,7 +852,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "property": { @@ -899,7 +862,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -927,7 +889,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "property": { @@ -938,7 +899,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -966,7 +926,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "property": { @@ -977,7 +936,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1005,7 +963,6 @@ "ctxt": 0 }, "value": "Derived3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1016,7 +973,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1044,7 +1000,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1074,7 +1029,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "property": { @@ -1085,7 +1039,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1113,7 +1066,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1124,7 +1076,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1152,7 +1103,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1163,7 +1113,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1191,7 +1140,6 @@ "ctxt": 0 }, "value": "Derived3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1202,7 +1150,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedStaticClassPropertyAccessibleWithinSubclass2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedStaticClassPropertyAccessibleWithinSubclass2/input.ts.json index 887810f272e3..dd70f27c7831 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedStaticClassPropertyAccessibleWithinSubclass2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedStaticClassPropertyAccessibleWithinSubclass2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "staticMethod", - "typeAnnotation": null, "optional": false }, "function": { @@ -137,7 +134,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -173,7 +169,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -199,7 +194,6 @@ "ctxt": 0 }, "value": "staticMethod1", - "typeAnnotation": null, "optional": false }, "function": { @@ -248,7 +242,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -284,7 +277,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -312,7 +304,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -330,7 +321,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -356,7 +346,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -402,7 +391,6 @@ "ctxt": 0 }, "value": "staticMethod3", - "typeAnnotation": null, "optional": false }, "function": { @@ -451,7 +439,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -487,7 +474,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -515,7 +501,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedStaticNotAccessibleInClodule/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedStaticNotAccessibleInClodule/input.ts.json index 87c13defd694..65eeb31f3eaa 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedStaticNotAccessibleInClodule/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/accessibility/protectedStaticNotAccessibleInClodule/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -143,7 +140,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "body": { @@ -186,8 +182,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -204,7 +200,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -215,7 +210,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -257,8 +251,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -275,7 +269,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -286,7 +279,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/classTypes/indexersInClassType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/classTypes/indexersInClassType/input.ts.json index bc371db1f4a4..3474fe0d8d85 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/classTypes/indexersInClassType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/classTypes/indexersInClassType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -38,6 +37,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,8 +54,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -80,7 +79,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -104,6 +102,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -120,8 +119,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -146,7 +144,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -198,7 +195,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -278,7 +274,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -358,8 +353,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -376,7 +371,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -411,8 +405,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -436,7 +430,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -447,7 +440,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -484,8 +476,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -502,7 +494,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -545,8 +536,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -563,7 +554,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -574,7 +564,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/classTypes/instancePropertiesInheritedIntoClassType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/classTypes/instancePropertiesInheritedIntoClassType/input.ts.json index fbeed3fd38dd..a94db14c5d2b 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/classTypes/instancePropertiesInheritedIntoClassType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/classTypes/instancePropertiesInheritedIntoClassType/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "NonGeneric", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -180,7 +176,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -201,8 +196,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -247,7 +242,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -310,7 +304,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -332,6 +325,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -348,8 +342,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -370,6 +363,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -386,8 +380,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -420,7 +413,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -446,7 +438,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": null, @@ -486,7 +477,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -519,8 +509,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -537,7 +527,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -597,8 +586,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -622,7 +611,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -633,7 +621,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -670,8 +657,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -688,7 +675,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -699,7 +685,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -733,8 +718,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -751,7 +736,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -762,7 +746,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -801,7 +784,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -812,7 +794,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -853,8 +834,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -878,7 +859,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -889,7 +869,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -921,7 +900,6 @@ "ctxt": 0 }, "value": "Generic", - "typeAnnotation": null, "optional": false }, "body": { @@ -942,7 +920,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -968,7 +945,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -994,7 +970,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1025,7 +1000,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -1088,7 +1062,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -1109,6 +1082,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1131,13 +1105,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1182,7 +1154,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -1245,7 +1216,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1267,6 +1237,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1289,13 +1260,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1316,6 +1285,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1338,13 +1308,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1386,7 +1354,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1407,7 +1374,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1428,7 +1394,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1454,7 +1419,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1480,7 +1444,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1505,7 +1468,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1532,7 +1494,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1553,7 +1514,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1584,7 +1544,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1604,7 +1563,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1638,8 +1596,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1656,7 +1614,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1721,8 +1678,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1746,7 +1703,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -1757,7 +1713,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1794,8 +1749,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1812,7 +1767,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -1823,7 +1777,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1857,8 +1810,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1875,7 +1828,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -1886,7 +1838,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1925,7 +1876,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -1936,7 +1886,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1982,8 +1931,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2007,7 +1956,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -2018,7 +1966,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/classTypes/instancePropertyInClassType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/classTypes/instancePropertyInClassType/input.ts.json index 0b25c92a2a0a..47420b0082cc 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/classTypes/instancePropertyInClassType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/classTypes/instancePropertyInClassType/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "NonGeneric", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -180,7 +176,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -201,8 +196,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -247,7 +242,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -310,7 +304,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -332,6 +325,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -348,8 +342,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -370,6 +363,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -386,8 +380,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -435,8 +428,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -453,7 +446,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -513,8 +505,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -538,7 +530,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -549,7 +540,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -586,8 +576,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -604,7 +594,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -615,7 +604,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -649,8 +637,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -667,7 +655,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -678,7 +665,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -717,7 +703,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -728,7 +713,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -769,8 +753,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -794,7 +778,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -805,7 +788,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -837,7 +819,6 @@ "ctxt": 0 }, "value": "Generic", - "typeAnnotation": null, "optional": false }, "body": { @@ -858,7 +839,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -884,7 +864,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -910,7 +889,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -941,7 +919,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -1004,7 +981,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -1025,6 +1001,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1047,13 +1024,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1098,7 +1073,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -1161,7 +1135,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1183,6 +1156,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1205,13 +1179,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1232,6 +1204,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1254,13 +1227,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1302,7 +1273,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1323,7 +1293,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1359,8 +1328,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1377,7 +1346,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1442,8 +1410,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1467,7 +1435,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1478,7 +1445,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1515,8 +1481,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1533,7 +1499,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -1544,7 +1509,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1578,8 +1542,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1596,7 +1560,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -1607,7 +1570,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1646,7 +1608,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -1657,7 +1618,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1703,8 +1663,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1728,7 +1688,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1739,7 +1698,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/classTypes/staticPropertyNotInClassType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/classTypes/staticPropertyNotInClassType/input.ts.json index 45bc1dfd9e18..01b90dcf7637 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/classTypes/staticPropertyNotInClassType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/classTypes/staticPropertyNotInClassType/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "NonGeneric", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -133,7 +130,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -197,7 +193,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -218,8 +213,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -264,7 +259,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -286,6 +280,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -302,8 +297,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -324,6 +318,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -340,8 +335,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -372,7 +366,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -427,7 +420,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "body": { @@ -470,8 +462,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -520,8 +512,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -538,7 +530,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -598,8 +589,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -623,7 +614,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -634,7 +624,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -671,8 +660,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -689,7 +678,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -700,7 +688,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -734,8 +721,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -752,7 +739,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -763,7 +749,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -797,8 +782,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -815,7 +800,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -826,7 +810,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -855,7 +838,6 @@ "ctxt": 0 }, "value": "Generic", - "typeAnnotation": null, "optional": false }, "body": { @@ -876,7 +858,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -902,7 +883,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -965,7 +945,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -1029,7 +1008,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -1050,8 +1028,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1096,7 +1074,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1118,6 +1095,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1140,13 +1118,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1167,6 +1143,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1189,13 +1166,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1226,7 +1201,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1252,7 +1226,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1294,7 +1267,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1315,7 +1287,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1343,7 +1314,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "body": { @@ -1386,8 +1356,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -1436,8 +1406,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1454,7 +1424,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1519,8 +1488,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1544,7 +1513,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1555,7 +1523,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1592,8 +1559,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1610,7 +1577,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1621,7 +1587,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1655,8 +1620,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1673,7 +1638,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1684,7 +1648,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1718,8 +1681,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1736,7 +1699,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1747,7 +1709,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/constructorFunctionTypes/classWithBaseClassButNoConstructor/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/constructorFunctionTypes/classWithBaseClassButNoConstructor/input.ts.json index d7e814fce1d4..2f03c70f708f 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/constructorFunctionTypes/classWithBaseClassButNoConstructor/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/constructorFunctionTypes/classWithBaseClassButNoConstructor/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -78,8 +77,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -112,7 +110,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -138,7 +135,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -178,7 +174,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -211,8 +206,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -222,7 +217,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "definite": false @@ -254,8 +248,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -272,7 +266,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -307,8 +300,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -325,7 +318,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -358,7 +350,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -384,7 +375,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -404,6 +394,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -426,13 +417,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -474,7 +463,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -495,7 +483,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -516,7 +503,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -542,7 +528,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -568,7 +553,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -593,7 +577,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -620,7 +603,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -641,7 +623,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -672,7 +653,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -692,7 +672,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -726,8 +705,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -737,7 +716,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "definite": false @@ -769,8 +747,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -787,7 +765,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -822,8 +799,8 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -840,7 +817,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -873,7 +849,6 @@ "ctxt": 0 }, "value": "D2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -899,7 +874,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -925,7 +899,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -950,7 +923,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -977,7 +949,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -998,7 +969,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1061,8 +1031,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1072,7 +1042,6 @@ "ctxt": 0 }, "value": "D2", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1104,8 +1073,8 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1122,7 +1091,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1157,8 +1125,8 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1175,7 +1143,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1208,7 +1175,6 @@ "ctxt": 0 }, "value": "D3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1234,7 +1200,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1274,7 +1239,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1334,8 +1298,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1345,7 +1309,6 @@ "ctxt": 0 }, "value": "D3", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1377,8 +1340,8 @@ "ctxt": 0 }, "value": "d5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1395,7 +1358,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1430,8 +1392,8 @@ "ctxt": 0 }, "value": "d6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1448,7 +1410,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/constructorFunctionTypes/classWithConstructors/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/constructorFunctionTypes/classWithConstructors/input.ts.json index 4f5683c1068d..34ab96cf5b46 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/constructorFunctionTypes/classWithConstructors/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/constructorFunctionTypes/classWithConstructors/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "NonGeneric", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -90,6 +87,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -106,8 +104,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -155,8 +152,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -173,7 +170,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -208,8 +204,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -226,7 +222,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -264,7 +259,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -290,7 +284,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -310,6 +303,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -326,8 +320,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -350,7 +343,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -370,6 +362,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -386,8 +379,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -410,7 +402,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -430,6 +421,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -446,8 +438,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -495,8 +486,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -513,7 +504,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -548,8 +538,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -566,7 +556,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -619,8 +608,8 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -637,7 +626,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -670,7 +658,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -689,7 +676,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -722,8 +708,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -740,7 +726,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -775,8 +760,8 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -793,7 +778,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -841,8 +825,8 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -859,7 +843,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -907,7 +890,6 @@ "ctxt": 0 }, "value": "Generics", - "typeAnnotation": null, "optional": false }, "body": { @@ -928,7 +910,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -954,7 +935,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -974,6 +954,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -996,13 +977,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1044,7 +1023,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1080,8 +1058,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1098,7 +1076,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1133,8 +1110,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1151,7 +1128,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1189,7 +1165,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1215,7 +1190,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1235,6 +1209,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1257,13 +1232,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1286,7 +1259,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1306,6 +1278,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1328,13 +1301,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1353,6 +1324,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1375,13 +1347,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1404,7 +1374,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1424,6 +1393,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1440,8 +1410,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1483,7 +1452,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1504,7 +1472,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1540,8 +1507,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1558,7 +1525,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1593,8 +1559,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1611,7 +1577,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1664,8 +1629,8 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1682,7 +1647,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1727,7 +1691,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1746,7 +1709,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1773,7 +1735,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1794,7 +1755,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1825,7 +1785,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1845,7 +1804,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1879,8 +1837,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1897,7 +1855,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1932,8 +1889,8 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1950,7 +1907,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1998,8 +1954,8 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2016,7 +1972,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/constructorFunctionTypes/classWithNoConstructorOrBaseClass/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/constructorFunctionTypes/classWithNoConstructorOrBaseClass/input.ts.json index 58ecf269e3b9..5d9741133f26 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/constructorFunctionTypes/classWithNoConstructorOrBaseClass/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/constructorFunctionTypes/classWithNoConstructorOrBaseClass/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -105,8 +103,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -123,7 +121,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -158,8 +155,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -169,7 +166,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "definite": false @@ -186,7 +182,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -212,7 +207,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -238,7 +232,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -269,7 +262,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -295,7 +287,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -337,7 +328,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -358,7 +348,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -394,8 +383,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -412,7 +401,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -447,8 +435,8 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -465,7 +453,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -527,8 +514,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -538,7 +525,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/constructorFunctionTypes/classWithStaticMembers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/constructorFunctionTypes/classWithStaticMembers/input.ts.json index 272d798bd9fc..0f95a41368e1 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/constructorFunctionTypes/classWithStaticMembers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/constructorFunctionTypes/classWithStaticMembers/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -105,7 +103,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -169,7 +166,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -190,8 +186,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -236,7 +232,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -258,6 +253,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -274,8 +270,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -296,6 +291,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -312,8 +308,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -344,7 +339,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -407,8 +401,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -432,7 +426,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -443,7 +436,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -480,8 +472,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -498,7 +490,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -509,7 +500,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -543,8 +533,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -561,7 +551,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -572,7 +561,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -591,7 +579,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -617,7 +604,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -657,7 +643,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -690,8 +675,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -715,7 +700,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "property": { @@ -726,7 +710,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -763,8 +746,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -781,7 +764,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -792,7 +774,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -826,8 +807,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -844,7 +825,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -855,7 +835,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/constructorFunctionTypes/constructorHasPrototypeProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/constructorFunctionTypes/constructorHasPrototypeProperty/input.ts.json index 088dd5fe9999..748667ad9c48 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/constructorFunctionTypes/constructorHasPrototypeProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/constructorFunctionTypes/constructorHasPrototypeProperty/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "NonGeneric", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -118,7 +115,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -144,7 +140,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -217,8 +211,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -235,7 +229,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -246,7 +239,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -277,7 +269,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -288,7 +279,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -319,8 +309,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -337,7 +327,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "property": { @@ -348,7 +337,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -379,7 +367,6 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, "optional": false }, "property": { @@ -390,7 +377,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -416,7 +402,6 @@ "ctxt": 0 }, "value": "Generic", - "typeAnnotation": null, "optional": false }, "body": { @@ -437,7 +422,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -463,7 +447,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -489,7 +472,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -520,7 +502,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -546,7 +527,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -588,7 +568,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -609,7 +588,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -630,7 +608,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -656,7 +633,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -682,7 +658,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -713,7 +688,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": null, @@ -739,7 +713,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -764,7 +737,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -791,7 +763,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -812,7 +783,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -843,7 +813,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -863,7 +832,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -897,8 +865,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -915,7 +883,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -926,7 +893,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -960,8 +926,8 @@ "ctxt": 0 }, "value": "ra", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -978,7 +944,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -989,7 +954,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1023,8 +987,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1041,7 +1005,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "property": { @@ -1052,7 +1015,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1086,8 +1048,8 @@ "ctxt": 0 }, "value": "rb", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1104,7 +1066,6 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1115,7 +1076,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassFunctionOverridesBaseClassAccessor/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassFunctionOverridesBaseClassAccessor/input.ts.json index bff9c977ef23..99e223f801a7 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassFunctionOverridesBaseClassAccessor/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassFunctionOverridesBaseClassAccessor/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -106,7 +104,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -127,8 +124,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -175,7 +172,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -201,7 +197,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -259,7 +254,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassIncludesInheritedMembers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassIncludesInheritedMembers/input.ts.json index 67986b46a213..45660479fe36 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassIncludesInheritedMembers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassIncludesInheritedMembers/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "function": { @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "function": { @@ -203,7 +199,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "function": { @@ -224,8 +219,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -270,7 +265,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "value": null, @@ -316,7 +310,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "function": { @@ -362,7 +355,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "function": { @@ -431,7 +423,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "function": { @@ -452,8 +443,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -498,7 +489,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -518,8 +508,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -552,7 +542,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -571,7 +560,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -604,6 +592,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -626,13 +615,11 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -649,7 +636,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -697,8 +683,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -715,7 +701,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -726,7 +711,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -760,8 +744,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -785,7 +769,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -796,7 +779,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -833,8 +815,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -851,7 +833,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -862,7 +843,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -901,7 +881,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -912,7 +891,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -958,8 +936,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -976,7 +954,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "property": { @@ -987,7 +964,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1021,8 +997,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1046,7 +1022,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "property": { @@ -1057,7 +1032,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1094,8 +1068,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1112,7 +1086,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "property": { @@ -1123,7 +1096,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1162,7 +1134,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "property": { @@ -1173,7 +1144,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1204,7 +1174,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1226,6 +1195,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1242,8 +1212,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1268,7 +1237,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1292,6 +1260,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1308,8 +1277,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1334,7 +1302,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1364,7 +1331,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1383,7 +1349,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1416,6 +1381,7 @@ "ctxt": 0 }, "value": "d2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1438,13 +1404,11 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1476,8 +1440,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1494,7 +1458,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1542,8 +1505,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1560,7 +1523,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesIndexersWithAssignmentCompatibility/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesIndexersWithAssignmentCompatibility/input.ts.json index 72c44a4bc82a..e32740b9b3a1 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesIndexersWithAssignmentCompatibility/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesIndexersWithAssignmentCompatibility/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -38,6 +37,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,8 +54,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -80,7 +79,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -110,7 +108,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -132,6 +129,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -148,8 +146,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -185,7 +182,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -203,7 +199,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -225,6 +220,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -241,8 +237,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -267,7 +262,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -297,7 +291,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -319,6 +312,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -335,8 +329,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -372,7 +365,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesPrivates/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesPrivates/input.ts.json index c0f2377d4ac3..2178243cb058 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesPrivates/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesPrivates/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -133,7 +130,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -159,7 +155,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -194,7 +189,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -236,7 +230,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -284,7 +277,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -302,7 +294,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -328,7 +319,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -363,7 +353,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -419,7 +408,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -445,7 +433,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -480,7 +467,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -522,7 +508,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -570,7 +555,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesProtectedMembers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesProtectedMembers/input.ts.json index 8316128cb2b9..de992e5df003 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesProtectedMembers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesProtectedMembers/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,8 +90,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -123,6 +122,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -154,7 +154,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -196,7 +195,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -224,8 +222,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -242,7 +239,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -268,7 +264,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -294,7 +289,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -324,7 +318,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "function": { @@ -345,6 +338,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -367,12 +361,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -417,7 +409,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "function": { @@ -451,7 +442,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -483,7 +473,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "function": { @@ -504,6 +493,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -526,12 +516,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -576,7 +564,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -603,6 +590,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -625,12 +613,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } ], "typeParams": null, @@ -678,7 +664,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "value": null, @@ -704,7 +689,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -734,7 +718,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "function": { @@ -755,6 +738,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -777,12 +761,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -827,7 +809,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "function": { @@ -861,7 +842,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -893,7 +873,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "function": { @@ -914,6 +893,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -936,12 +916,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -986,7 +964,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1013,6 +990,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1035,12 +1013,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } ], "typeParams": null, @@ -1088,7 +1064,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1108,6 +1083,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1130,12 +1106,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1168,7 +1142,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1194,7 +1167,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1220,7 +1192,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1250,7 +1221,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "function": { @@ -1271,6 +1241,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1293,12 +1264,10 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1343,7 +1312,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "function": { @@ -1377,7 +1345,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1409,7 +1376,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "function": { @@ -1430,6 +1396,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1452,12 +1419,10 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1502,7 +1467,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1529,6 +1493,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1551,12 +1516,10 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } ], "typeParams": null, @@ -1604,7 +1567,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1630,7 +1592,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1660,7 +1621,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "function": { @@ -1681,6 +1641,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1703,12 +1664,10 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1753,7 +1712,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "function": { @@ -1787,7 +1745,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1819,7 +1776,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "function": { @@ -1840,6 +1796,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1862,12 +1819,10 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1912,7 +1867,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1939,6 +1893,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1961,12 +1916,10 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } ], "typeParams": null, @@ -2014,7 +1967,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2034,6 +1986,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2056,12 +2009,10 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2106,7 +2057,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2128,7 +2078,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesProtectedMembers2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesProtectedMembers2/input.ts.json index 6540bc278173..19b28636b3b9 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesProtectedMembers2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesProtectedMembers2/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,8 +90,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -123,6 +122,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -154,7 +154,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -196,7 +195,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -224,8 +222,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -242,7 +239,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -268,7 +264,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -294,7 +289,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -324,7 +318,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "function": { @@ -345,6 +338,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -367,12 +361,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -417,7 +409,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "function": { @@ -451,7 +442,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -483,7 +473,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "function": { @@ -504,6 +493,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -526,12 +516,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -576,7 +564,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -603,6 +590,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -625,12 +613,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } ], "typeParams": null, @@ -678,7 +664,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "value": null, @@ -704,7 +689,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -734,7 +718,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "function": { @@ -755,6 +738,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -777,12 +761,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -827,7 +809,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "function": { @@ -861,7 +842,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -893,7 +873,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "function": { @@ -914,6 +893,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -936,12 +916,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -986,7 +964,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1013,6 +990,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1035,12 +1013,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } ], "typeParams": null, @@ -1088,7 +1064,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1108,6 +1083,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1130,12 +1106,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1168,7 +1142,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1194,7 +1167,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1220,7 +1192,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1250,7 +1221,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "function": { @@ -1271,6 +1241,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1293,12 +1264,10 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1343,7 +1312,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "function": { @@ -1377,7 +1345,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1409,7 +1376,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "function": { @@ -1430,6 +1396,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1452,12 +1419,10 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1502,7 +1467,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1529,6 +1493,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1551,12 +1516,10 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } ], "typeParams": null, @@ -1604,7 +1567,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1630,7 +1592,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1660,7 +1621,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "function": { @@ -1681,6 +1641,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1703,12 +1664,10 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1753,7 +1712,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "function": { @@ -1787,7 +1745,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1819,7 +1776,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "function": { @@ -1840,6 +1796,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1862,12 +1819,10 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1912,7 +1867,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1939,6 +1893,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1961,12 +1916,10 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } ], "typeParams": null, @@ -2014,7 +1967,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2034,6 +1986,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2056,12 +2009,10 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2106,7 +2057,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2128,7 +2078,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2161,6 +2110,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2183,13 +2133,11 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -2206,7 +2154,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2220,7 +2167,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -2256,8 +2202,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2274,7 +2220,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -2285,7 +2230,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2319,8 +2263,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2344,7 +2288,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -2355,7 +2298,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2371,7 +2313,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -2407,8 +2348,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2425,7 +2366,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -2436,7 +2376,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2470,8 +2409,8 @@ "ctxt": 0 }, "value": "r3a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2488,7 +2427,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -2499,7 +2437,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2538,7 +2475,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -2549,7 +2485,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2562,7 +2497,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -2592,8 +2526,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2610,7 +2544,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "property": { @@ -2621,7 +2554,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2655,8 +2587,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2680,7 +2612,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "property": { @@ -2691,7 +2622,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2707,7 +2637,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -2743,8 +2672,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2761,7 +2690,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "property": { @@ -2772,7 +2700,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2806,8 +2733,8 @@ "ctxt": 0 }, "value": "r6a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2824,7 +2751,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "property": { @@ -2835,7 +2761,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2874,7 +2799,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "property": { @@ -2885,7 +2809,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2898,7 +2821,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -2913,7 +2835,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2935,6 +2856,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2951,8 +2873,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2977,7 +2898,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3001,6 +2921,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3017,8 +2938,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3043,7 +2963,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3072,7 +2991,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3094,6 +3012,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3110,8 +3029,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3136,7 +3054,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3159,6 +3076,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3175,8 +3093,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3201,7 +3118,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -3222,7 +3138,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -3255,6 +3170,7 @@ "ctxt": 0 }, "value": "d2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3277,13 +3193,11 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3315,8 +3229,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3333,7 +3247,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "property": { @@ -3381,8 +3294,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3399,7 +3312,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesProtectedMembers3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesProtectedMembers3/input.ts.json index 4557ef512d81..ce348d9c1d5f 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesProtectedMembers3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesProtectedMembers3/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,8 +90,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -123,6 +122,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -154,7 +154,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -196,7 +195,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -224,8 +222,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -242,7 +239,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -268,7 +264,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -294,7 +289,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -324,7 +318,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "function": { @@ -345,6 +338,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -367,12 +361,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -417,7 +409,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "function": { @@ -451,7 +442,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -483,7 +473,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "function": { @@ -504,6 +493,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -526,12 +516,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -576,7 +564,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -603,6 +590,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -625,12 +613,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } ], "typeParams": null, @@ -678,7 +664,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "value": null, @@ -704,7 +689,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -734,7 +718,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "function": { @@ -755,6 +738,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -777,12 +761,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -827,7 +809,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "function": { @@ -861,7 +842,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -893,7 +873,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "function": { @@ -914,6 +893,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -936,12 +916,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -986,7 +964,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1013,6 +990,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1035,12 +1013,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } ], "typeParams": null, @@ -1088,7 +1064,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1108,6 +1083,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1130,12 +1106,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1168,7 +1142,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1194,7 +1167,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1220,7 +1192,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1250,7 +1221,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1270,6 +1240,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1292,12 +1263,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1342,7 +1311,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1364,7 +1332,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1382,7 +1349,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1408,7 +1374,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "function": { @@ -1429,6 +1394,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1451,12 +1417,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1501,7 +1465,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1521,6 +1484,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1543,12 +1507,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1593,7 +1555,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1615,7 +1576,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1633,7 +1593,6 @@ "ctxt": 0 }, "value": "Derived3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1659,7 +1618,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "function": { @@ -1693,7 +1651,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1725,7 +1682,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1745,6 +1701,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1767,12 +1724,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1817,7 +1772,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1839,7 +1793,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1857,7 +1810,6 @@ "ctxt": 0 }, "value": "Derived4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1883,7 +1835,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "function": { @@ -1904,6 +1855,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1926,12 +1878,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1976,7 +1926,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1996,6 +1945,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2018,12 +1968,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2068,7 +2016,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2090,7 +2037,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2108,7 +2054,6 @@ "ctxt": 0 }, "value": "Derived5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2134,7 +2079,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2161,6 +2105,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2183,12 +2128,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } ], "typeParams": null, @@ -2236,7 +2179,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2256,6 +2198,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2278,12 +2221,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2328,7 +2269,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2350,7 +2290,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2368,7 +2307,6 @@ "ctxt": 0 }, "value": "Derived6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2394,7 +2332,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2420,7 +2357,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2450,7 +2386,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2470,6 +2405,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2492,12 +2428,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2542,7 +2476,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2564,7 +2497,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2582,7 +2514,6 @@ "ctxt": 0 }, "value": "Derived7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2608,7 +2539,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "function": { @@ -2629,6 +2559,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2651,12 +2582,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2701,7 +2630,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2721,6 +2649,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2743,12 +2672,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2793,7 +2720,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2815,7 +2741,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2833,7 +2758,6 @@ "ctxt": 0 }, "value": "Derived8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2859,7 +2783,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "function": { @@ -2893,7 +2816,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2925,7 +2847,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2945,6 +2866,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2967,12 +2889,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3017,7 +2937,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3039,7 +2958,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -3057,7 +2975,6 @@ "ctxt": 0 }, "value": "Derived9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3083,7 +3000,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "function": { @@ -3104,6 +3020,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3126,12 +3043,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3176,7 +3091,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -3196,6 +3110,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3218,12 +3133,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3268,7 +3181,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3290,7 +3202,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -3308,7 +3219,6 @@ "ctxt": 0 }, "value": "Derived10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3334,7 +3244,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3361,6 +3270,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3383,12 +3293,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } ], "typeParams": null, @@ -3436,7 +3344,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -3456,6 +3363,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3478,12 +3386,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3528,7 +3434,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3550,7 +3455,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesProtectedMembers4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesProtectedMembers4/input.ts.json index 0ac93a635b8c..2628d3487553 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesProtectedMembers4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesProtectedMembers4/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,8 +90,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -123,6 +122,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -154,7 +154,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -196,7 +195,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -224,8 +222,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -242,7 +239,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -268,7 +264,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -294,7 +289,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -326,7 +320,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -352,7 +345,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -378,7 +370,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -402,7 +393,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -420,7 +410,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -446,7 +435,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -472,7 +460,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -496,7 +483,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesPublicMembers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesPublicMembers/input.ts.json index 3a485a6a44f6..2bc2919ad0fc 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesPublicMembers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesPublicMembers/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,8 +90,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -123,6 +122,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -154,7 +154,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -196,7 +195,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -224,8 +222,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -242,7 +239,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -268,7 +264,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -294,7 +289,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -324,7 +318,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "function": { @@ -345,6 +338,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -367,12 +361,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -417,7 +409,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "function": { @@ -451,7 +442,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -483,7 +473,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "function": { @@ -504,6 +493,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -526,12 +516,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -576,7 +564,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -603,6 +590,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -625,12 +613,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } ], "typeParams": null, @@ -678,7 +664,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "value": null, @@ -704,7 +689,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -734,7 +718,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "function": { @@ -755,6 +738,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -777,12 +761,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -827,7 +809,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "function": { @@ -861,7 +842,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -893,7 +873,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "function": { @@ -914,6 +893,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -936,12 +916,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -986,7 +964,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1013,6 +990,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1035,12 +1013,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } ], "typeParams": null, @@ -1088,7 +1064,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1108,6 +1083,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1130,12 +1106,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1168,7 +1142,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1194,7 +1167,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1220,7 +1192,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1250,7 +1221,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "function": { @@ -1271,6 +1241,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1293,12 +1264,10 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1343,7 +1312,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "function": { @@ -1377,7 +1345,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1409,7 +1376,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "function": { @@ -1430,6 +1396,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1452,12 +1419,10 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1502,7 +1467,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1529,6 +1493,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1551,12 +1516,10 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } ], "typeParams": null, @@ -1604,7 +1567,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1630,7 +1592,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1660,7 +1621,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "function": { @@ -1681,6 +1641,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1703,12 +1664,10 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1753,7 +1712,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "function": { @@ -1787,7 +1745,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1819,7 +1776,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "function": { @@ -1840,6 +1796,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1862,12 +1819,10 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1912,7 +1867,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1939,6 +1893,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1961,12 +1916,10 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } ], "typeParams": null, @@ -2014,7 +1967,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2034,6 +1986,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2056,12 +2009,10 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2106,7 +2057,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2128,7 +2078,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2161,6 +2110,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2183,13 +2133,11 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -2206,7 +2154,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2220,7 +2167,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -2256,8 +2202,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2274,7 +2220,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -2285,7 +2230,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2319,8 +2263,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2344,7 +2288,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -2355,7 +2298,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2371,7 +2313,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -2407,8 +2348,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2425,7 +2366,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -2436,7 +2376,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2470,8 +2409,8 @@ "ctxt": 0 }, "value": "r3a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2488,7 +2427,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -2499,7 +2437,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2538,7 +2475,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -2549,7 +2485,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2562,7 +2497,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -2592,8 +2526,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2610,7 +2544,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "property": { @@ -2621,7 +2554,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2655,8 +2587,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2680,7 +2612,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "property": { @@ -2691,7 +2622,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2707,7 +2637,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -2743,8 +2672,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2761,7 +2690,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "property": { @@ -2772,7 +2700,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2806,8 +2733,8 @@ "ctxt": 0 }, "value": "r6a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2824,7 +2751,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "property": { @@ -2835,7 +2761,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2874,7 +2799,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "property": { @@ -2885,7 +2809,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2898,7 +2821,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -2913,7 +2835,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2935,6 +2856,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2951,8 +2873,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2977,7 +2898,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3001,6 +2921,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3017,8 +2938,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3043,7 +2963,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3072,7 +2991,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3094,6 +3012,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3110,8 +3029,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3136,7 +3054,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3159,6 +3076,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3175,8 +3093,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3201,7 +3118,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -3222,7 +3138,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -3255,6 +3170,7 @@ "ctxt": 0 }, "value": "d2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3277,13 +3193,11 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3315,8 +3229,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3333,7 +3247,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "property": { @@ -3381,8 +3294,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3399,7 +3312,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesWithoutSubtype/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesWithoutSubtype/input.ts.json index 29f4a8518dc2..6b0b813449cc 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesWithoutSubtype/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassOverridesWithoutSubtype/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -133,7 +130,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -159,7 +155,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -194,7 +189,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -242,7 +236,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -260,7 +253,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -286,7 +278,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -321,7 +312,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -377,7 +367,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -403,7 +392,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -438,7 +426,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -486,7 +473,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassTransitivity/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassTransitivity/input.ts.json index 2a6d081ca486..9276c10b8890 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassTransitivity/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassTransitivity/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -79,8 +78,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -127,7 +125,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -153,7 +150,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -193,7 +189,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -211,7 +206,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -237,7 +231,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -258,6 +251,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -274,8 +268,7 @@ }, "kind": "string" } - }, - "optional": true + } } } ], @@ -314,7 +307,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -347,6 +339,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -369,13 +362,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -407,6 +398,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -429,13 +421,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -467,6 +457,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -489,13 +480,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -525,8 +514,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -536,7 +525,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -566,8 +554,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -591,7 +579,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -602,7 +589,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -652,8 +638,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -677,7 +663,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "property": { @@ -688,7 +673,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassTransitivity2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassTransitivity2/input.ts.json index d29a4df65f6e..35ba74316f2d 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassTransitivity2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassTransitivity2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -79,8 +78,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -99,6 +97,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -115,8 +114,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -163,7 +161,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -189,7 +186,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -210,6 +206,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -226,8 +223,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -266,7 +262,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -284,7 +279,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -310,7 +304,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -331,6 +324,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -347,8 +341,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -367,6 +360,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -383,8 +377,7 @@ }, "kind": "string" } - }, - "optional": true + } } } ], @@ -423,7 +416,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -456,6 +448,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -478,13 +471,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -516,6 +507,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -538,13 +530,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -576,6 +566,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -598,13 +589,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -634,8 +623,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -645,7 +634,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -675,8 +663,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -700,7 +688,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -711,7 +698,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -773,8 +759,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -798,7 +784,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "property": { @@ -809,7 +794,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassTransitivity3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassTransitivity3/input.ts.json index 786a8a6af07a..159640b82095 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassTransitivity3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassTransitivity3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -85,13 +84,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -110,6 +107,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -132,13 +130,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -194,7 +190,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -215,7 +210,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -241,7 +235,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -262,6 +255,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -284,13 +278,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -329,7 +321,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -356,7 +347,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -387,7 +377,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -406,7 +395,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -432,7 +420,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -453,6 +440,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -475,13 +463,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -500,6 +486,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -516,8 +503,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -556,7 +542,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -583,7 +568,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -614,7 +598,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -648,6 +631,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -670,7 +654,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -693,8 +676,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -726,6 +708,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -748,7 +731,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -771,8 +753,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -804,6 +785,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -826,7 +808,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -849,8 +830,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -880,8 +860,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -891,7 +871,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -921,8 +900,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -946,7 +925,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -957,7 +935,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1029,8 +1006,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1054,7 +1031,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "property": { @@ -1065,7 +1041,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassTransitivity4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassTransitivity4/input.ts.json index 88f514b469fd..7cff6ece0681 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassTransitivity4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassTransitivity4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -79,8 +78,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -127,7 +125,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -153,7 +150,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -193,7 +189,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -211,7 +206,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -237,7 +231,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -258,6 +251,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -274,8 +268,7 @@ }, "kind": "string" } - }, - "optional": true + } } } ], @@ -314,7 +307,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -347,6 +339,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -369,13 +362,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -407,6 +398,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -429,13 +421,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -467,6 +457,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -489,13 +480,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -525,8 +514,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -536,7 +525,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -566,8 +554,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -591,7 +579,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -602,7 +589,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -652,8 +638,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -677,7 +663,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "property": { @@ -688,7 +673,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassWithAny/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassWithAny/input.ts.json index d58bc0097930..294207279800 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassWithAny/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassWithAny/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "function": { @@ -168,7 +165,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -248,7 +244,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -294,7 +289,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "function": { @@ -374,7 +368,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -456,7 +449,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -482,7 +474,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -528,7 +519,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "function": { @@ -607,7 +597,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -687,7 +676,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -733,7 +721,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "function": { @@ -812,7 +799,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -885,7 +871,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -903,7 +888,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -929,7 +913,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -975,7 +958,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "function": { @@ -1060,7 +1042,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -1145,7 +1126,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1191,7 +1171,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "function": { @@ -1276,7 +1255,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -1355,7 +1333,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1388,6 +1365,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1410,13 +1388,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1448,6 +1424,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1470,13 +1447,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1508,6 +1483,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1530,13 +1506,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1566,8 +1540,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1577,7 +1551,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -1605,8 +1578,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1616,7 +1589,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -1646,8 +1618,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1671,7 +1643,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1682,7 +1653,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassWithPrivateInstanceShadowingProtectedInstance/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassWithPrivateInstanceShadowingProtectedInstance/input.ts.json index ac0a9905e8f6..9c673c6e11ce 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassWithPrivateInstanceShadowingProtectedInstance/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassWithPrivateInstanceShadowingProtectedInstance/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -173,7 +170,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -237,7 +233,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -258,8 +253,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -306,7 +301,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -332,7 +326,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -378,7 +371,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -463,7 +455,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -527,7 +518,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -548,8 +538,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -588,7 +578,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassWithPrivateInstanceShadowingPublicInstance/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassWithPrivateInstanceShadowingPublicInstance/input.ts.json index 8b7711d5cbd5..f3388f2eae88 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassWithPrivateInstanceShadowingPublicInstance/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassWithPrivateInstanceShadowingPublicInstance/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -173,7 +170,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -237,7 +233,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -258,8 +253,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -306,7 +301,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -332,7 +326,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -378,7 +371,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -463,7 +455,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -527,7 +518,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -548,8 +538,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -588,7 +578,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -621,8 +610,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -639,7 +628,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "property": { @@ -650,7 +638,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -684,8 +671,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -702,7 +689,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "property": { @@ -713,7 +699,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -747,8 +732,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -772,7 +757,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "property": { @@ -783,7 +767,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -820,8 +803,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -845,7 +828,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "property": { @@ -856,7 +838,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -893,8 +874,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -911,7 +892,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "property": { @@ -922,7 +902,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -961,7 +940,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "property": { @@ -972,7 +950,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1013,8 +990,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1031,7 +1008,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "property": { @@ -1042,7 +1018,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1081,7 +1056,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "property": { @@ -1092,7 +1066,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingProtectedStatic/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingProtectedStatic/input.ts.json index 8ff757a36969..77a520c36423 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingProtectedStatic/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingProtectedStatic/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -173,7 +170,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -237,7 +233,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -258,8 +253,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -306,7 +301,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -332,7 +326,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -378,7 +371,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -463,7 +455,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -527,7 +518,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -548,8 +538,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -588,7 +578,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingPublicStatic/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingPublicStatic/input.ts.json index bb976111205c..0edda346a7e1 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingPublicStatic/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingPublicStatic/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -173,7 +170,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -237,7 +233,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -258,8 +253,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -306,7 +301,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -332,7 +326,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -378,7 +371,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -463,7 +455,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -527,7 +518,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -548,8 +538,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -588,7 +578,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -621,8 +610,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -639,7 +628,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "property": { @@ -650,7 +638,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -684,8 +671,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -702,7 +689,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "property": { @@ -713,7 +699,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -747,8 +732,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -772,7 +757,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "property": { @@ -783,7 +767,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -820,8 +803,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -845,7 +828,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "property": { @@ -856,7 +838,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -893,8 +874,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -911,7 +892,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "property": { @@ -922,7 +902,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -961,7 +940,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "property": { @@ -972,7 +950,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1013,8 +990,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1031,7 +1008,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "property": { @@ -1042,7 +1018,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1081,7 +1056,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "property": { @@ -1092,7 +1066,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedGenericClassWithAny/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedGenericClassWithAny/input.ts.json index 7905c3c00ba4..0df8a8bb7dc8 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedGenericClassWithAny/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/inheritanceAndOverriding/derivedGenericClassWithAny/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -99,7 +96,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "function": { @@ -161,7 +157,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -189,7 +184,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -251,7 +245,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -290,7 +283,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -319,7 +311,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -345,7 +336,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -391,7 +381,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "function": { @@ -470,7 +459,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -550,7 +538,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -596,7 +583,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "function": { @@ -675,7 +661,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -748,7 +733,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -784,7 +768,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -810,7 +793,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -836,7 +818,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -867,7 +848,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "function": { @@ -935,7 +915,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -963,7 +942,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -1031,7 +1009,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1053,7 +1030,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1080,7 +1056,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1124,6 +1099,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1146,7 +1122,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1169,8 +1144,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1202,6 +1176,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1224,13 +1199,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1262,6 +1235,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1284,7 +1258,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1307,8 +1280,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1338,8 +1310,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1349,7 +1321,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -1377,8 +1348,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1388,7 +1359,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -1418,8 +1388,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1443,7 +1413,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1454,7 +1423,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/instanceAndStaticMembers/typeOfThisInInstanceMember/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/instanceAndStaticMembers/typeOfThisInInstanceMember/input.ts.json index 48f24f44371c..22b7dadf6255 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/instanceAndStaticMembers/typeOfThisInInstanceMember/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/instanceAndStaticMembers/typeOfThisInInstanceMember/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -142,7 +139,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -162,6 +158,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -178,8 +175,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -216,8 +212,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -253,7 +249,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -264,7 +259,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -292,7 +286,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -303,7 +296,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -331,7 +323,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -342,7 +333,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -373,8 +363,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -398,7 +388,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -409,7 +398,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -441,7 +429,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -521,6 +508,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -543,13 +531,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -581,8 +567,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -599,7 +585,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -610,7 +595,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -644,8 +628,8 @@ "ctxt": 0 }, "value": "ra", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -676,7 +660,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -687,7 +670,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -700,7 +682,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -713,7 +694,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -747,8 +727,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -765,7 +745,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -776,7 +755,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -810,8 +788,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -835,7 +813,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -846,7 +823,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -883,8 +859,8 @@ "ctxt": 0 }, "value": "rs", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -904,7 +880,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false } }, @@ -918,7 +893,6 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, "optional": false } }, @@ -932,7 +906,6 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, "optional": false } } @@ -971,7 +944,6 @@ "ctxt": 0 }, "value": "rs", - "typeAnnotation": null, "optional": false }, "property": { @@ -982,7 +954,6 @@ "ctxt": 0 }, "value": "forEach", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1006,8 +977,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1040,7 +1011,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1051,7 +1021,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1079,7 +1048,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1090,7 +1058,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1118,7 +1085,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1129,7 +1095,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/instanceAndStaticMembers/typeOfThisInInstanceMember2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/instanceAndStaticMembers/typeOfThisInInstanceMember2/input.ts.json index 77600f0cb232..4068e74949e0 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/instanceAndStaticMembers/typeOfThisInInstanceMember2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/instanceAndStaticMembers/typeOfThisInInstanceMember2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -142,7 +139,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -162,6 +158,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -184,13 +181,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -227,8 +222,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -264,7 +259,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -275,7 +269,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -303,7 +296,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -314,7 +306,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -342,7 +333,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -353,7 +343,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -384,8 +373,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -409,7 +398,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -420,7 +408,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -452,7 +439,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -515,7 +501,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -541,7 +526,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -583,7 +567,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -619,6 +602,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -641,7 +625,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -664,8 +647,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -697,8 +679,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -715,7 +697,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -726,7 +707,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -760,8 +740,8 @@ "ctxt": 0 }, "value": "ra", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -792,7 +772,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -803,7 +782,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -816,7 +794,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -829,7 +806,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -863,8 +839,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -881,7 +857,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -892,7 +867,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -926,8 +900,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -951,7 +925,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -962,7 +935,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -999,8 +971,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1017,7 +989,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1028,7 +999,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1062,8 +1032,8 @@ "ctxt": 0 }, "value": "rs", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1083,7 +1053,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false } }, @@ -1097,7 +1066,6 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, "optional": false } }, @@ -1111,7 +1079,6 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, "optional": false } } @@ -1150,7 +1117,6 @@ "ctxt": 0 }, "value": "rs", - "typeAnnotation": null, "optional": false }, "property": { @@ -1161,7 +1127,6 @@ "ctxt": 0 }, "value": "forEach", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1185,8 +1150,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1219,7 +1184,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1230,7 +1194,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1258,7 +1221,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1269,7 +1231,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1297,7 +1258,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1308,7 +1268,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1336,7 +1295,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1347,7 +1305,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/instanceAndStaticMembers/typeOfThisInStaticMembers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/instanceAndStaticMembers/typeOfThisInStaticMembers/input.ts.json index 52abe8cbdb58..12eec398bd78 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/instanceAndStaticMembers/typeOfThisInStaticMembers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/instanceAndStaticMembers/typeOfThisInStaticMembers/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -78,8 +77,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -110,7 +108,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +153,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -200,8 +196,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -276,8 +272,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -301,7 +297,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -312,7 +307,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -349,8 +343,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -375,7 +369,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -386,7 +379,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -430,8 +422,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -455,7 +447,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -466,7 +457,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -503,8 +493,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -521,7 +511,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -554,7 +543,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -580,7 +568,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "value": null, @@ -626,7 +613,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -646,6 +632,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -662,8 +649,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -694,7 +680,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -740,7 +725,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -784,8 +768,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -854,7 +838,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -890,8 +873,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -915,7 +898,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "property": { @@ -926,7 +908,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -963,8 +944,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -989,7 +970,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1000,7 +980,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1044,8 +1023,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1069,7 +1048,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1080,7 +1058,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1117,8 +1094,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1135,7 +1112,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/instanceAndStaticMembers/typeOfThisInStaticMembers2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/instanceAndStaticMembers/typeOfThisInStaticMembers2/input.ts.json index 668c7cb85436..9929b1a1a812 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/instanceAndStaticMembers/typeOfThisInStaticMembers2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/instanceAndStaticMembers/typeOfThisInStaticMembers2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -107,7 +104,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -155,7 +151,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/instanceAndStaticMembers/typeOfThisInstanceMemberNarrowedWithLoopAntecedent/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/instanceAndStaticMembers/typeOfThisInstanceMemberNarrowedWithLoopAntecedent/input.ts.json index 884c516e0d2f..4214a0f84735 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/instanceAndStaticMembers/typeOfThisInstanceMemberNarrowedWithLoopAntecedent/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/instanceAndStaticMembers/typeOfThisInstanceMemberNarrowedWithLoopAntecedent/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "State", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -113,7 +111,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -165,7 +162,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -220,7 +216,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -261,7 +256,6 @@ "ctxt": 0 }, "value": "SomeClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -287,7 +281,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "value": null, @@ -313,7 +306,6 @@ "ctxt": 0 }, "value": "State", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -344,7 +336,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -426,7 +417,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "computed": false @@ -439,7 +429,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false @@ -490,7 +479,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "computed": false @@ -503,7 +491,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -556,6 +543,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -572,8 +560,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -605,7 +592,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "computed": false @@ -618,7 +604,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false @@ -661,7 +646,6 @@ "ctxt": 0 }, "value": "SomeClass2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -687,7 +671,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "value": null, @@ -713,7 +696,6 @@ "ctxt": 0 }, "value": "State", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -744,7 +726,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -788,8 +769,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -819,7 +800,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "body": { @@ -877,7 +857,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "computed": false @@ -890,7 +869,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -955,7 +933,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "computed": false @@ -968,7 +945,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1003,6 +979,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1019,8 +996,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "OptionalChainingExpression", @@ -1064,7 +1040,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1077,7 +1052,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameAmbientNoImplicitAny/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameAmbientNoImplicitAny/input.ts.json index 48a18ad54c7b..afadee04da84 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameAmbientNoImplicitAny/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameAmbientNoImplicitAny/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false } }, @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -114,7 +111,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameAndAny/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameAndAny/input.ts.json index 6b817eeb4567..9dcd540fdfef 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameAndAny/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameAndAny/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -87,7 +85,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -108,6 +105,7 @@ "ctxt": 0 }, "value": "thing", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -124,8 +122,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -165,7 +162,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false }, "property": { @@ -183,7 +179,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -212,7 +207,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false }, "property": { @@ -230,7 +224,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameAndIndexSignature/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameAndIndexSignature/input.ts.json index 9c24c1909454..07498a9644fe 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameAndIndexSignature/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameAndIndexSignature/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -38,6 +37,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,8 +54,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -104,7 +103,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -205,7 +203,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -225,6 +222,7 @@ "ctxt": 0 }, "value": "message", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -241,8 +239,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -299,7 +296,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameAndObjectRestSpread/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameAndObjectRestSpread/input.ts.json index 4fc92391ad78..16d1da468e4e 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameAndObjectRestSpread/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameAndObjectRestSpread/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false } }, @@ -87,7 +85,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -108,6 +105,7 @@ "ctxt": 0 }, "value": "other", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -130,13 +128,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -179,8 +175,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -205,7 +201,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false } } @@ -237,7 +232,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -255,7 +249,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false } }, @@ -307,8 +300,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -324,7 +317,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "definite": false @@ -353,7 +345,6 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, "optional": false }, "property": { @@ -371,7 +362,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameAndStaticInitializer/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameAndStaticInitializer/input.ts.json index a24e2c473ecf..2a33b79224cf 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameAndStaticInitializer/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameAndStaticInitializer/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -87,7 +85,6 @@ "ctxt": 0 }, "value": "inst", - "typeAnnotation": null, "optional": false }, "value": { @@ -105,7 +102,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -144,7 +140,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameBadSuper/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameBadSuper/input.ts.json index 7a65fe1dab88..e99b6920bbad 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameBadSuper/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameBadSuper/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -84,7 +82,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -114,7 +111,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -192,7 +188,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameBadSuperUseDefineForClassFields/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameBadSuperUseDefineForClassFields/input.ts.json index a83caac9a52d..ba90aee8435d 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameBadSuperUseDefineForClassFields/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameBadSuperUseDefineForClassFields/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -84,7 +82,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -114,7 +111,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -192,7 +188,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameCircularReference/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameCircularReference/input.ts.json index ad663ea2424d..32a4cba1ae9a 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameCircularReference/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameCircularReference/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -83,7 +81,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false } }, @@ -121,7 +118,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false } }, @@ -155,7 +151,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameComputedPropertyName1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameComputedPropertyName1/input.ts.json index 7322a2d274aa..a7b3f8d83473 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameComputedPropertyName1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameComputedPropertyName1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -99,7 +97,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -152,7 +149,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -202,7 +198,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -255,7 +250,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -298,7 +292,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -355,7 +348,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -422,7 +414,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -464,7 +455,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "function": { @@ -508,6 +498,7 @@ "ctxt": 0 }, "value": "data", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -530,7 +521,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -562,8 +552,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -583,7 +572,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -611,7 +599,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -639,7 +626,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -667,7 +653,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -695,7 +680,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": { @@ -783,7 +767,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -798,8 +781,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -841,7 +824,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -856,8 +838,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -899,7 +881,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -914,8 +895,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -957,7 +938,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -972,8 +952,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1023,7 +1003,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -1053,8 +1032,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1069,7 +1048,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1105,7 +1083,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -1116,7 +1093,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1132,7 +1108,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1146,7 +1121,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1160,7 +1134,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1174,7 +1147,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -1188,7 +1160,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -1221,8 +1192,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1239,7 +1210,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "property": { @@ -1272,7 +1242,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1309,8 +1278,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1327,7 +1296,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "property": { @@ -1360,7 +1328,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1397,8 +1364,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1415,7 +1382,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "property": { @@ -1448,7 +1414,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1485,8 +1450,8 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1503,7 +1468,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "property": { @@ -1536,7 +1500,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -1573,8 +1536,8 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1591,7 +1554,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "property": { @@ -1624,7 +1586,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -1665,7 +1626,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -1676,7 +1636,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1692,7 +1651,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -1706,7 +1664,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -1720,7 +1677,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } }, @@ -1734,7 +1690,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } } @@ -1798,7 +1753,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1812,7 +1766,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameComputedPropertyName2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameComputedPropertyName2/input.ts.json index ad2ed1e28e93..df4d3194176b 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameComputedPropertyName2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameComputedPropertyName2/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "getX", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,6 +55,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -76,13 +78,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -104,8 +104,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -122,7 +121,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -155,7 +153,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -223,8 +220,8 @@ "ctxt": 0 }, "value": "getX", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -242,6 +239,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -264,13 +262,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -288,7 +284,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -306,7 +301,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -400,7 +394,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -411,7 +404,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -434,7 +426,6 @@ "ctxt": 0 }, "value": "getX", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -455,7 +446,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameComputedPropertyName3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameComputedPropertyName3/input.ts.json index 54a7cb55cf48..4ccfedeb3d28 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameComputedPropertyName3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameComputedPropertyName3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false } }, @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -99,8 +96,8 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -157,7 +154,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false } }, @@ -171,7 +167,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false } } @@ -196,7 +191,6 @@ "ctxt": 0 }, "value": "getValue", - "typeAnnotation": null, "optional": false }, "function": { @@ -217,8 +211,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -261,8 +255,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -286,7 +280,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -319,7 +312,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -371,7 +363,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -389,7 +380,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false } }, @@ -435,7 +425,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -468,7 +457,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -532,7 +520,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -553,7 +540,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -571,7 +557,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false } }, @@ -632,7 +617,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -643,7 +627,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -680,7 +663,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -712,7 +694,6 @@ "ctxt": 0 }, "value": "getValue", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameConstructorSignature/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameConstructorSignature/input.ts.json index 7bdd679b8791..a92d404fd490 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameConstructorSignature/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameConstructorSignature/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -123,7 +120,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -153,7 +149,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "function": { @@ -209,7 +204,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -230,7 +224,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -272,8 +265,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -290,7 +283,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -325,8 +317,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -343,7 +335,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -383,7 +374,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "property": { @@ -394,7 +384,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -445,7 +434,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -489,7 +477,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameDeclaration/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameDeclaration/input.ts.json index a7613b1476ed..574525ae7dfe 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameDeclaration/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameDeclaration/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -102,7 +100,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false } }, @@ -140,7 +137,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -186,7 +182,6 @@ "ctxt": 0 }, "value": "qux", - "typeAnnotation": null, "optional": false }, "value": { @@ -224,7 +219,6 @@ "ctxt": 0 }, "value": "quux", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameDeclarationMerging/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameDeclarationMerging/input.ts.json index 98336fb8852a..ddf13369e0c6 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameDeclarationMerging/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameDeclarationMerging/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -84,7 +82,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -114,7 +111,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -158,8 +154,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -176,7 +172,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -208,7 +203,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -226,7 +220,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -258,6 +251,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -280,13 +274,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -303,7 +295,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -335,7 +326,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -353,7 +343,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -395,7 +384,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -439,7 +427,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameDuplicateField/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameDuplicateField/input.ts.json index 53a2b0d36c75..d9d6eb2d8fb6 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameDuplicateField/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameDuplicateField/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -99,7 +97,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameField/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameField/input.ts.json index 5e4a4da9fc79..8fa2e89df443 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameField/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameField/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false } }, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -115,6 +112,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -131,8 +129,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -189,7 +186,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false } }, @@ -203,7 +199,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldAccess/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldAccess/input.ts.json index 604948bf7a8b..624f4d202fc7 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldAccess/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldAccess/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "myField", - "typeAnnotation": null, "optional": false } }, @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -133,7 +130,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -144,7 +140,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -182,7 +177,6 @@ "ctxt": 0 }, "value": "myField", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldAssignment/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldAssignment/input.ts.json index eef94be7d8aa..f1fc912021be 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldAssignment/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldAssignment/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -87,7 +85,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -206,7 +202,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -268,7 +263,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -330,7 +324,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -392,7 +385,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -454,7 +446,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -516,7 +507,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -578,7 +568,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -640,7 +629,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -702,7 +690,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -764,7 +751,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -826,7 +812,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -888,7 +873,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -949,7 +933,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -960,7 +943,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -983,7 +965,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -1044,7 +1025,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1055,7 +1035,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1078,7 +1057,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -1139,7 +1117,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1150,7 +1127,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1173,7 +1149,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -1234,7 +1209,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1245,7 +1219,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1268,7 +1241,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -1329,7 +1301,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1340,7 +1311,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1363,7 +1333,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -1424,7 +1393,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1435,7 +1403,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1458,7 +1425,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -1519,7 +1485,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1530,7 +1495,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1553,7 +1517,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -1614,7 +1577,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1625,7 +1587,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1648,7 +1609,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -1709,7 +1669,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1720,7 +1679,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1743,7 +1701,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -1804,7 +1761,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1815,7 +1771,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1838,7 +1793,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -1899,7 +1853,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1910,7 +1863,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1933,7 +1885,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -1994,7 +1945,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -2005,7 +1955,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2028,7 +1977,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -2089,7 +2037,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -2100,7 +2047,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2123,7 +2069,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -2160,7 +2105,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "function": { @@ -2201,7 +2145,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldCallExpression/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldCallExpression/input.ts.json index dd3c110d4ae5..7d02680dee0e 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldCallExpression/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldCallExpression/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "fieldFunc", - "typeAnnotation": null, "optional": false } }, @@ -109,7 +107,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -164,7 +161,6 @@ "ctxt": 0 }, "value": "fieldFunc2", - "typeAnnotation": null, "optional": false } }, @@ -188,8 +184,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -220,8 +216,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -272,7 +268,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -310,7 +305,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "function": { @@ -373,7 +367,6 @@ "ctxt": 0 }, "value": "fieldFunc", - "typeAnnotation": null, "optional": false } }, @@ -408,8 +401,8 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -441,7 +434,6 @@ "ctxt": 0 }, "value": "fieldFunc", - "typeAnnotation": null, "optional": false } }, @@ -473,7 +465,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -524,7 +515,6 @@ "ctxt": 0 }, "value": "fieldFunc", - "typeAnnotation": null, "optional": false } }, @@ -559,8 +549,8 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -644,7 +634,6 @@ "ctxt": 0 }, "value": "fieldFunc2", - "typeAnnotation": null, "optional": false } }, @@ -677,7 +666,6 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, "optional": false } }, @@ -722,8 +710,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -762,7 +750,6 @@ "ctxt": 0 }, "value": "fieldFunc2", - "typeAnnotation": null, "optional": false } }, @@ -795,7 +782,6 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, "optional": false } }, @@ -843,8 +829,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -883,7 +869,6 @@ "ctxt": 0 }, "value": "fieldFunc2", - "typeAnnotation": null, "optional": false } }, @@ -1079,7 +1064,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1102,7 +1086,6 @@ "ctxt": 0 }, "value": "fieldFunc2", - "typeAnnotation": null, "optional": false } }, @@ -1272,7 +1255,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "function": { @@ -1313,7 +1295,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldClassExpression/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldClassExpression/input.ts.json index be414d631db4..0e8aa4a471b1 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldClassExpression/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldClassExpression/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -78,7 +76,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -119,7 +116,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -177,7 +172,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "value": { @@ -239,7 +233,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false } }, @@ -253,7 +246,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "span": { @@ -278,7 +270,6 @@ "ctxt": 0 }, "value": "otherClass", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldDestructuredBinding/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldDestructuredBinding/input.ts.json index 076e1d12a22d..73f2bfc597bd 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldDestructuredBinding/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldDestructuredBinding/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -87,7 +85,6 @@ "ctxt": 0 }, "value": "otherObject", - "typeAnnotation": null, "optional": false }, "value": { @@ -105,7 +102,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -137,7 +133,6 @@ "ctxt": 0 }, "value": "testObject", - "typeAnnotation": null, "optional": false }, "function": { @@ -181,7 +176,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -204,7 +198,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -248,7 +241,6 @@ "ctxt": 0 }, "value": "testArray", - "typeAnnotation": null, "optional": false }, "function": { @@ -337,7 +329,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -374,6 +365,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -390,8 +382,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -438,7 +429,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -471,7 +461,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -493,7 +482,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -532,7 +520,6 @@ "ctxt": 0 }, "value": "testObject", - "typeAnnotation": null, "optional": false }, "computed": false @@ -603,7 +590,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -617,8 +603,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -654,7 +640,6 @@ "ctxt": 0 }, "value": "testArray", - "typeAnnotation": null, "optional": false }, "computed": false @@ -705,7 +690,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -738,7 +722,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -755,7 +738,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -796,7 +778,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -829,7 +810,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -852,7 +832,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -936,7 +915,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -980,7 +958,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -1083,7 +1060,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1123,7 +1099,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -1151,7 +1126,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1199,7 +1173,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -1243,7 +1216,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1321,7 +1293,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -1413,7 +1384,6 @@ "ctxt": 0 }, "value": "otherObject", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1433,7 +1403,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -1485,7 +1454,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "function": { @@ -1506,6 +1474,7 @@ "ctxt": 0 }, "value": "_a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1528,13 +1497,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1590,7 +1557,6 @@ "ctxt": 0 }, "value": "_a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1608,7 +1574,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldInitializer/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldInitializer/input.ts.json index 81e607d82efe..58753632b52e 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldInitializer/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldInitializer/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false } }, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "uninitialized", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldUnaryMutation/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldUnaryMutation/input.ts.json index 14753c9bc17c..62b6ac6e700e 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldUnaryMutation/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameFieldUnaryMutation/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -103,7 +101,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -161,7 +158,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -215,7 +211,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -269,7 +264,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -323,7 +317,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -356,8 +349,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -398,7 +391,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -434,8 +426,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -476,7 +468,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -512,8 +503,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -554,7 +545,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -590,8 +580,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -632,7 +622,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -688,7 +677,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -742,7 +730,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -797,7 +784,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -859,7 +845,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -913,7 +898,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -968,7 +952,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -1005,7 +988,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "function": { @@ -1077,7 +1059,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1100,7 +1081,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -1161,7 +1141,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1184,7 +1163,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -1245,7 +1223,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1268,7 +1245,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -1329,7 +1305,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1352,7 +1327,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -1385,8 +1359,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1434,7 +1408,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1457,7 +1430,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -1493,8 +1465,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1542,7 +1514,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1565,7 +1536,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -1601,8 +1571,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1650,7 +1620,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1673,7 +1642,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -1709,8 +1677,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1758,7 +1726,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1781,7 +1748,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -1844,7 +1810,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1867,7 +1832,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -1928,7 +1892,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1951,7 +1914,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -2013,7 +1975,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2036,7 +1997,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -2105,7 +2065,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2128,7 +2087,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -2189,7 +2147,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2212,7 +2169,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -2274,7 +2230,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2297,7 +2252,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false } }, @@ -2342,7 +2296,6 @@ "ctxt": 0 }, "value": "getInstance", - "typeAnnotation": null, "optional": false }, "function": { @@ -2383,7 +2336,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameImplicitDeclaration/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameImplicitDeclaration/input.ts.json index 3bbe23698779..2f30f3875e1d 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameImplicitDeclaration/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameImplicitDeclaration/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -91,7 +89,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameInLhsReceiverExpression/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameInLhsReceiverExpression/input.ts.json index ff26efa37e44..48391aac1ceb 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameInLhsReceiverExpression/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameInLhsReceiverExpression/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Test", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -87,7 +85,6 @@ "ctxt": 0 }, "value": "something", - "typeAnnotation": null, "optional": false }, "function": { @@ -108,6 +105,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -134,6 +132,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -150,8 +149,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -176,7 +174,6 @@ "ctxt": 0 }, "value": "Test", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -191,8 +188,7 @@ } ] } - }, - "optional": false + } } } ], @@ -247,7 +243,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -303,7 +298,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -341,7 +335,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": { @@ -388,7 +381,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -410,7 +402,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -464,7 +455,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -520,7 +510,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -558,7 +547,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": { @@ -605,7 +593,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -627,7 +614,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameNestedClassNameConflict/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameNestedClassNameConflict/input.ts.json index 84d6d353eaf1..2b3ce9f9fb75 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameNestedClassNameConflict/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameNestedClassNameConflict/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -117,7 +114,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -150,7 +146,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameUnused/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameUnused/input.ts.json index b97ab24e20bd..0d811a174a17 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameUnused/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNameUnused/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "used", - "typeAnnotation": null, "optional": false } }, @@ -106,7 +104,6 @@ "ctxt": 0 }, "value": "unused", - "typeAnnotation": null, "optional": false } }, @@ -149,7 +146,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -190,7 +186,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -201,7 +196,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -239,7 +233,6 @@ "ctxt": 0 }, "value": "used", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesAndFields/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesAndFields/input.ts.json index 2477f3e4d63a..cc219a1368a8 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesAndFields/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesAndFields/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -152,7 +149,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -191,7 +187,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -224,7 +219,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -270,7 +264,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -353,7 +346,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -389,7 +381,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesAndkeyof/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesAndkeyof/input.ts.json index a528869d3044..cbf895aeebb9 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesAndkeyof/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesAndkeyof/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -87,7 +85,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -125,7 +122,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -171,7 +167,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -198,7 +193,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesAssertion/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesAssertion/input.ts.json index 89d2c98239ae..a780ae8bec5a 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesAssertion/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesAssertion/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false } }, @@ -69,8 +67,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -112,7 +110,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -161,7 +158,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -202,6 +198,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -218,8 +215,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "typeParams": null, @@ -246,7 +242,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -294,7 +289,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "function": { @@ -315,6 +309,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -331,8 +326,7 @@ }, "kind": "unknown" } - }, - "optional": false + } } } ], @@ -394,7 +388,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false } }, @@ -411,7 +404,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -434,7 +426,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesUnique-1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesUnique-1/input.ts.json index 5eeb133d1463..fd37791b0d62 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesUnique-1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesUnique-1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -97,7 +95,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -130,7 +127,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -193,6 +189,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -215,13 +212,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -238,7 +233,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesUnique-2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesUnique-2/input.ts.json index d55554c3ef37..754d08f0b216 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesUnique-2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesUnique-2/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "copy", - "typeAnnotation": null, "optional": false }, "function": { @@ -107,6 +104,7 @@ "ctxt": 0 }, "value": "other", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -143,13 +141,11 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeArguments": null } - }, - "optional": false + } } } ], @@ -189,7 +185,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "property": { @@ -207,7 +202,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -252,7 +246,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -285,7 +278,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -331,7 +323,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "imported": { @@ -342,7 +333,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } } @@ -387,7 +377,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "imported": { @@ -398,7 +387,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } } @@ -445,8 +433,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -463,7 +451,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -498,8 +485,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -516,7 +503,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -555,7 +541,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -566,7 +551,6 @@ "ctxt": 0 }, "value": "copy", - "typeAnnotation": null, "optional": false }, "computed": false @@ -582,7 +566,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesUnique-4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesUnique-4/input.ts.json index 3b77fb3b3584..03a8b234b545 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesUnique-4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesUnique-4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "A1", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -110,6 +107,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -132,13 +130,11 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -155,7 +151,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -188,7 +183,6 @@ "ctxt": 0 }, "value": "something", - "typeAnnotation": null, "optional": false } }, @@ -251,6 +245,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -273,13 +268,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -289,7 +282,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesUnique-5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesUnique-5/input.ts.json index 5596537d8a8b..7491c5575dbb 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesUnique-5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesUnique-5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -102,7 +100,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -123,7 +120,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -149,7 +145,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -182,7 +177,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -245,6 +239,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -267,13 +262,11 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -290,7 +283,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesUseBeforeDef/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesUseBeforeDef/input.ts.json index 0eb4007786cf..66f8a66eb8e7 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesUseBeforeDef/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/members/privateNames/privateNamesUseBeforeDef/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -83,7 +81,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false } }, @@ -121,7 +118,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false } }, @@ -161,7 +157,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -194,7 +189,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -228,7 +222,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false } }, @@ -266,7 +259,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false } }, @@ -300,7 +292,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/methodDeclarations/optionalMethodDeclarations/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/methodDeclarations/optionalMethodDeclarations/input.ts.json index d4e5e9db258d..9890bcb1a4cc 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/methodDeclarations/optionalMethodDeclarations/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/methodDeclarations/optionalMethodDeclarations/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": true }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/classes/mixinAbstractClasses.2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/mixinAbstractClasses.2/input.ts.json index 4af73753966c..43ac9201906b 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/mixinAbstractClasses.2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/mixinAbstractClasses.2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Mixin", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "mixinMethod", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -89,7 +87,6 @@ "ctxt": 0 }, "value": "Mixin", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,6 +107,7 @@ "ctxt": 0 }, "value": "baseClass", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -132,13 +130,11 @@ "ctxt": 0 }, "value": "TBaseClass", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -166,7 +162,6 @@ "ctxt": 0 }, "value": "MixinClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -192,7 +187,6 @@ "ctxt": 0 }, "value": "mixinMethod", - "typeAnnotation": null, "optional": false }, "function": { @@ -232,7 +226,6 @@ "ctxt": 0 }, "value": "baseClass", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -254,7 +247,6 @@ "ctxt": 0 }, "value": "Mixin", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -276,7 +268,6 @@ "ctxt": 0 }, "value": "MixinClass", - "typeAnnotation": null, "optional": false } } @@ -307,7 +298,6 @@ "ctxt": 0 }, "value": "TBaseClass", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -338,8 +328,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -414,7 +404,6 @@ "ctxt": 0 }, "value": "TBaseClass", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -454,8 +443,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -499,7 +488,6 @@ "ctxt": 0 }, "value": "Mixin", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -522,7 +510,6 @@ "ctxt": 0 }, "value": "AbstractBase", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -548,7 +535,6 @@ "ctxt": 0 }, "value": "abstractBaseMethod", - "typeAnnotation": null, "optional": false }, "function": { @@ -619,8 +605,8 @@ "ctxt": 0 }, "value": "MixedBase", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -637,7 +623,6 @@ "ctxt": 0 }, "value": "Mixin", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -651,7 +636,6 @@ "ctxt": 0 }, "value": "AbstractBase", - "typeAnnotation": null, "optional": false } } @@ -672,7 +656,6 @@ "ctxt": 0 }, "value": "DerivedFromAbstract", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -691,7 +674,6 @@ "ctxt": 0 }, "value": "MixedBase", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -721,7 +703,6 @@ "ctxt": 0 }, "value": "MixedBase", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/classes/mixinAbstractClasses/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/mixinAbstractClasses/input.ts.json index 3ca0e312c0e9..9dd91c10bf7c 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/mixinAbstractClasses/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/mixinAbstractClasses/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Mixin", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "mixinMethod", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -89,7 +87,6 @@ "ctxt": 0 }, "value": "Mixin", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,6 +107,7 @@ "ctxt": 0 }, "value": "baseClass", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -132,13 +130,11 @@ "ctxt": 0 }, "value": "TBaseClass", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -166,7 +162,6 @@ "ctxt": 0 }, "value": "MixinClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -192,7 +187,6 @@ "ctxt": 0 }, "value": "mixinMethod", - "typeAnnotation": null, "optional": false }, "function": { @@ -232,7 +226,6 @@ "ctxt": 0 }, "value": "baseClass", - "typeAnnotation": null, "optional": false }, "isAbstract": true, @@ -254,7 +247,6 @@ "ctxt": 0 }, "value": "Mixin", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -276,7 +268,6 @@ "ctxt": 0 }, "value": "MixinClass", - "typeAnnotation": null, "optional": false } } @@ -307,7 +298,6 @@ "ctxt": 0 }, "value": "TBaseClass", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -338,8 +328,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -414,7 +404,6 @@ "ctxt": 0 }, "value": "TBaseClass", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -454,8 +443,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -499,7 +488,6 @@ "ctxt": 0 }, "value": "Mixin", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -522,7 +510,6 @@ "ctxt": 0 }, "value": "ConcreteBase", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -548,7 +535,6 @@ "ctxt": 0 }, "value": "baseMethod", - "typeAnnotation": null, "optional": false }, "function": { @@ -596,7 +582,6 @@ "ctxt": 0 }, "value": "AbstractBase", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -622,7 +607,6 @@ "ctxt": 0 }, "value": "abstractBaseMethod", - "typeAnnotation": null, "optional": false }, "function": { @@ -678,7 +662,6 @@ "ctxt": 0 }, "value": "DerivedFromConcrete", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -704,7 +687,6 @@ "ctxt": 0 }, "value": "Mixin", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -718,7 +700,6 @@ "ctxt": 0 }, "value": "ConcreteBase", - "typeAnnotation": null, "optional": false } } @@ -755,8 +736,8 @@ "ctxt": 0 }, "value": "wasConcrete", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -773,7 +754,6 @@ "ctxt": 0 }, "value": "DerivedFromConcrete", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -812,7 +792,6 @@ "ctxt": 0 }, "value": "wasConcrete", - "typeAnnotation": null, "optional": false }, "property": { @@ -823,7 +802,6 @@ "ctxt": 0 }, "value": "baseMethod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -861,7 +839,6 @@ "ctxt": 0 }, "value": "wasConcrete", - "typeAnnotation": null, "optional": false }, "property": { @@ -872,7 +849,6 @@ "ctxt": 0 }, "value": "mixinMethod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -891,7 +867,6 @@ "ctxt": 0 }, "value": "DerivedFromAbstract", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -917,7 +892,6 @@ "ctxt": 0 }, "value": "abstractBaseMethod", - "typeAnnotation": null, "optional": false }, "function": { @@ -964,7 +938,6 @@ "ctxt": 0 }, "value": "Mixin", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -978,7 +951,6 @@ "ctxt": 0 }, "value": "AbstractBase", - "typeAnnotation": null, "optional": false } } @@ -1015,8 +987,8 @@ "ctxt": 0 }, "value": "wasAbstract", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1033,7 +1005,6 @@ "ctxt": 0 }, "value": "DerivedFromAbstract", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1072,7 +1043,6 @@ "ctxt": 0 }, "value": "wasAbstract", - "typeAnnotation": null, "optional": false }, "property": { @@ -1083,7 +1053,6 @@ "ctxt": 0 }, "value": "abstractBaseMethod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1121,7 +1090,6 @@ "ctxt": 0 }, "value": "wasAbstract", - "typeAnnotation": null, "optional": false }, "property": { @@ -1132,7 +1100,6 @@ "ctxt": 0 }, "value": "mixinMethod", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/mixinAbstractClassesReturnTypeInference/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/mixinAbstractClassesReturnTypeInference/input.ts.json index cd94f2ca9e7d..922c83cb9921 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/mixinAbstractClassesReturnTypeInference/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/mixinAbstractClassesReturnTypeInference/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Mixin1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "mixinMethod", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -89,7 +87,6 @@ "ctxt": 0 }, "value": "AbstractBase", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -115,7 +112,6 @@ "ctxt": 0 }, "value": "abstractBaseMethod", - "typeAnnotation": null, "optional": false }, "function": { @@ -171,7 +167,6 @@ "ctxt": 0 }, "value": "Mixin2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -192,6 +187,7 @@ "ctxt": 0 }, "value": "baseClass", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -214,13 +210,11 @@ "ctxt": 0 }, "value": "TBase", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -248,7 +242,6 @@ "ctxt": 0 }, "value": "MixinClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -274,7 +267,6 @@ "ctxt": 0 }, "value": "mixinMethod", - "typeAnnotation": null, "optional": false }, "function": { @@ -336,7 +328,6 @@ "ctxt": 0 }, "value": "staticMixinMethod", - "typeAnnotation": null, "optional": false }, "function": { @@ -392,7 +383,6 @@ "ctxt": 0 }, "value": "baseClass", - "typeAnnotation": null, "optional": false }, "isAbstract": true, @@ -414,7 +404,6 @@ "ctxt": 0 }, "value": "Mixin1", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -436,7 +425,6 @@ "ctxt": 0 }, "value": "MixinClass", - "typeAnnotation": null, "optional": false } } @@ -467,7 +455,6 @@ "ctxt": 0 }, "value": "TBase", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -498,8 +485,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -564,7 +551,6 @@ "ctxt": 0 }, "value": "DerivedFromAbstract2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -590,7 +576,6 @@ "ctxt": 0 }, "value": "abstractBaseMethod", - "typeAnnotation": null, "optional": false }, "function": { @@ -637,7 +622,6 @@ "ctxt": 0 }, "value": "Mixin2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -651,7 +635,6 @@ "ctxt": 0 }, "value": "AbstractBase", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/abstractProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/abstractProperty/input.ts.json index c30e35177597..312a987bef43 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/abstractProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/abstractProperty/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -147,7 +143,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -178,7 +173,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -218,7 +212,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -244,7 +237,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -281,7 +273,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -299,7 +290,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -325,7 +315,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -396,7 +385,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideMethod/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideMethod/input.ts.json index 4d7736e6731c..7494f3319b45 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideMethod/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideMethod/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -187,7 +183,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty/input.ts.json index ab4d31d6ec3e..c8a80b0bc5c2 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -87,7 +85,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -113,7 +110,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "function": { @@ -176,7 +172,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -194,7 +189,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -220,7 +214,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -260,7 +253,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -286,7 +278,6 @@ "ctxt": 0 }, "value": "_secret", - "typeAnnotation": null, "optional": false }, "value": { @@ -324,7 +315,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "function": { @@ -373,7 +363,6 @@ "ctxt": 0 }, "value": "_secret", - "typeAnnotation": null, "optional": false }, "computed": false @@ -407,7 +396,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "function": { @@ -428,8 +416,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -485,7 +473,6 @@ "ctxt": 0 }, "value": "_secret", - "typeAnnotation": null, "optional": false }, "computed": false @@ -498,7 +485,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -525,7 +511,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty2/input.ts.json index bea4419a727e..2cecbfabb92b 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -82,7 +80,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -108,7 +105,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -172,7 +168,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -193,8 +188,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -241,7 +236,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -252,7 +246,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -276,7 +269,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } ], @@ -384,7 +376,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -417,8 +408,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -435,7 +426,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -474,7 +464,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -485,7 +474,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -508,7 +496,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -519,7 +506,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty3/input.ts.json index 25c4573dfe03..96fa067539e4 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Animal", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "sound", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Lion", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "_sound", - "typeAnnotation": null, "optional": false }, "value": { @@ -159,7 +155,6 @@ "ctxt": 0 }, "value": "sound", - "typeAnnotation": null, "optional": false }, "function": { @@ -208,7 +203,6 @@ "ctxt": 0 }, "value": "_sound", - "typeAnnotation": null, "optional": false }, "computed": false @@ -242,7 +236,6 @@ "ctxt": 0 }, "value": "sound", - "typeAnnotation": null, "optional": false }, "function": { @@ -263,8 +256,8 @@ "ctxt": 0 }, "value": "val", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -320,7 +313,6 @@ "ctxt": 0 }, "value": "_sound", - "typeAnnotation": null, "optional": false }, "computed": false @@ -333,7 +325,6 @@ "ctxt": 0 }, "value": "val", - "typeAnnotation": null, "optional": false } } @@ -360,7 +351,6 @@ "ctxt": 0 }, "value": "Animal", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty4/input.ts.json index 0f4e3eb2999f..3f7e7b285393 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Animal", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "sound", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Lion", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "_sound", - "typeAnnotation": null, "optional": false }, "value": { @@ -159,7 +155,6 @@ "ctxt": 0 }, "value": "sound", - "typeAnnotation": null, "optional": false }, "function": { @@ -208,7 +203,6 @@ "ctxt": 0 }, "value": "_sound", - "typeAnnotation": null, "optional": false }, "computed": false @@ -258,7 +252,6 @@ "ctxt": 0 }, "value": "sound", - "typeAnnotation": null, "optional": false }, "function": { @@ -279,6 +272,7 @@ "ctxt": 0 }, "value": "val", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -295,8 +289,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -352,7 +345,6 @@ "ctxt": 0 }, "value": "_sound", - "typeAnnotation": null, "optional": false }, "computed": false @@ -365,7 +357,6 @@ "ctxt": 0 }, "value": "val", - "typeAnnotation": null, "optional": false } } @@ -392,7 +383,6 @@ "ctxt": 0 }, "value": "Animal", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty5/input.ts.json index 3f6d22ec9eef..ba170c153c83 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty5/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -142,7 +138,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -169,7 +164,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -195,7 +189,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "function": { @@ -259,7 +252,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "function": { @@ -280,8 +272,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -320,7 +312,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty6/input.ts.json index 5e08155aba4d..32293fd1e274 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -87,7 +85,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -113,7 +110,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "function": { @@ -176,7 +172,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -194,7 +189,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -220,7 +214,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -260,7 +253,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -286,7 +278,6 @@ "ctxt": 0 }, "value": "_secret", - "typeAnnotation": null, "optional": false }, "value": { @@ -324,7 +315,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "function": { @@ -373,7 +363,6 @@ "ctxt": 0 }, "value": "_secret", - "typeAnnotation": null, "optional": false }, "computed": false @@ -407,7 +396,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "function": { @@ -428,8 +416,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -485,7 +473,6 @@ "ctxt": 0 }, "value": "_secret", - "typeAnnotation": null, "optional": false }, "computed": false @@ -498,7 +485,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -525,7 +511,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty7/input.ts.json index b431f9c9c2f3..ad6119c0ea4c 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/accessorsOverrideProperty7/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -87,7 +85,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -113,7 +110,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "function": { @@ -176,7 +172,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/assignParameterPropertyToPropertyDeclarationESNext/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/assignParameterPropertyToPropertyDeclarationESNext/input.ts.json index b6060813897d..479a415f1a68 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/assignParameterPropertyToPropertyDeclarationESNext/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/assignParameterPropertyToPropertyDeclarationESNext/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "qux", - "typeAnnotation": null, "optional": false }, "value": { @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -99,7 +96,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -125,7 +121,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -156,7 +151,6 @@ "ctxt": 0 }, "value": "quiz", - "typeAnnotation": null, "optional": false }, "value": { @@ -182,7 +176,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -213,7 +206,6 @@ "ctxt": 0 }, "value": "quench", - "typeAnnotation": null, "optional": false }, "value": { @@ -246,7 +238,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -280,7 +271,6 @@ "ctxt": 0 }, "value": "quanch", - "typeAnnotation": null, "optional": false }, "value": { @@ -313,7 +303,6 @@ "ctxt": 0 }, "value": "m3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -347,7 +336,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "function": { @@ -396,7 +384,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -430,7 +417,6 @@ "ctxt": 0 }, "value": "m3", - "typeAnnotation": null, "optional": false }, "value": { @@ -483,7 +469,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -505,6 +490,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -521,8 +507,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -553,7 +538,6 @@ "ctxt": 0 }, "value": "quim", - "typeAnnotation": null, "optional": false }, "value": { @@ -579,7 +563,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -610,7 +593,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -636,7 +618,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -667,7 +648,6 @@ "ctxt": 0 }, "value": "quid", - "typeAnnotation": null, "optional": false }, "value": { @@ -693,7 +673,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -724,7 +703,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "function": { @@ -773,7 +751,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -809,7 +786,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -835,7 +811,6 @@ "ctxt": 0 }, "value": "quill", - "typeAnnotation": null, "optional": false }, "value": { @@ -861,7 +836,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -886,7 +860,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -904,7 +877,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -930,7 +902,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -972,7 +943,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1000,7 +970,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1037,7 +1006,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "value": { @@ -1080,7 +1048,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1102,6 +1069,7 @@ "ctxt": 0 }, "value": "foo2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1118,8 +1086,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1152,7 +1119,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1178,7 +1144,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "value": { @@ -1206,7 +1171,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "value": { @@ -1232,7 +1196,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1257,7 +1220,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1291,7 +1253,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "value": { @@ -1331,7 +1292,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1357,7 +1317,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "value": { @@ -1385,7 +1344,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "value": { @@ -1411,7 +1369,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1436,7 +1393,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1470,7 +1426,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1492,6 +1447,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1508,8 +1464,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/constructorParameterShadowsOuterScopes/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/constructorParameterShadowsOuterScopes/input.ts.json index 1b8a053f4e02..46a9ae834889 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/constructorParameterShadowsOuterScopes/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/constructorParameterShadowsOuterScopes/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -57,7 +57,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -83,7 +82,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -123,7 +120,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -143,6 +139,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -159,8 +156,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -195,8 +191,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -246,8 +242,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -272,7 +268,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -298,7 +293,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -309,7 +303,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -338,7 +331,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -358,6 +350,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -374,8 +367,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -412,8 +404,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/constructorParameterShadowsOuterScopes2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/constructorParameterShadowsOuterScopes2/input.ts.json index b2a69bce2e9f..4fc0837348b4 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/constructorParameterShadowsOuterScopes2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/constructorParameterShadowsOuterScopes2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -57,7 +57,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -83,7 +82,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -123,7 +120,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -143,6 +139,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -159,8 +156,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -208,8 +204,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -234,7 +230,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -260,7 +255,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -271,7 +265,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -300,7 +293,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -320,6 +312,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -336,8 +329,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -374,8 +366,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -417,7 +409,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -443,7 +434,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -454,7 +444,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -483,7 +472,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -503,6 +491,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -519,8 +508,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/defineProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/defineProperty/input.ts.json index 89388fdf9507..8d041fc5fef3 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/defineProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/defineProperty/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,8 +61,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -91,7 +91,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -117,7 +116,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -143,7 +141,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -174,7 +171,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -204,7 +200,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -275,7 +270,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -313,7 +307,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -359,7 +352,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -381,6 +373,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -397,8 +390,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -429,7 +421,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -455,7 +446,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -486,7 +476,6 @@ "ctxt": 0 }, "value": "notEmitted", - "typeAnnotation": null, "optional": false }, "value": null, @@ -518,7 +507,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -544,7 +532,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -576,7 +563,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -602,7 +588,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -632,7 +617,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -658,7 +642,6 @@ "ctxt": 0 }, "value": "ka", - "typeAnnotation": null, "optional": false }, "computed": false @@ -689,7 +672,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -711,6 +693,7 @@ "ctxt": 0 }, "value": "ka", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -727,8 +710,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -786,7 +768,6 @@ "ctxt": 0 }, "value": "ki", - "typeAnnotation": null, "optional": false }, "value": { @@ -812,7 +793,6 @@ "ctxt": 0 }, "value": "ka", - "typeAnnotation": null, "optional": false }, "computed": false @@ -837,7 +817,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/definePropertyOutputES3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/definePropertyOutputES3/input.ts.json index 8058060037a6..4e54d8fcef43 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/definePropertyOutputES3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/definePropertyOutputES3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/initializerReferencingConstructorLocals/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/initializerReferencingConstructorLocals/input.ts.json index fe0e496de097..c01b29f10ac5 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/initializerReferencingConstructorLocals/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/initializerReferencingConstructorLocals/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -53,7 +51,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -82,7 +79,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -108,7 +104,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -138,7 +133,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -164,7 +158,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -195,7 +188,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -223,7 +215,6 @@ "ctxt": 0 }, "value": "this", - "typeAnnotation": null, "optional": false }, "right": { @@ -234,7 +225,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -265,7 +255,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -285,8 +274,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -321,8 +310,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -357,7 +346,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -383,7 +371,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -394,7 +381,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -423,7 +409,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -449,7 +434,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -479,7 +463,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -505,7 +488,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -536,7 +518,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -564,7 +545,6 @@ "ctxt": 0 }, "value": "this", - "typeAnnotation": null, "optional": false }, "right": { @@ -575,7 +555,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -606,7 +585,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -626,6 +604,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -648,13 +627,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -689,8 +666,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -734,7 +711,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/initializerReferencingConstructorParameters/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/initializerReferencingConstructorParameters/input.ts.json index dd5abcc7910c..5c32197cef3f 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/initializerReferencingConstructorParameters/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/initializerReferencingConstructorParameters/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -53,7 +51,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -82,7 +79,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -108,7 +104,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -138,7 +133,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -158,8 +152,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -192,7 +186,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -218,7 +211,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -229,7 +221,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -258,7 +249,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -284,7 +274,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -314,7 +303,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -336,8 +324,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -370,7 +358,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -396,7 +383,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -422,7 +408,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -453,7 +438,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -481,7 +465,6 @@ "ctxt": 0 }, "value": "this", - "typeAnnotation": null, "optional": false }, "right": { @@ -492,7 +475,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -523,7 +505,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -545,8 +526,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -579,7 +560,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -605,7 +585,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -631,7 +610,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -662,7 +640,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -673,7 +650,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -702,7 +678,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -724,6 +699,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -746,13 +722,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -794,7 +768,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/instanceMemberInitialization/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/instanceMemberInitialization/input.ts.json index baa895dc3f2a..2dc22c24ec26 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/instanceMemberInitialization/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/instanceMemberInitialization/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -97,8 +95,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -115,7 +113,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -155,7 +152,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -166,7 +162,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -207,8 +202,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -225,7 +220,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -260,8 +254,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -286,7 +280,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -297,7 +290,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -317,7 +309,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "property": { @@ -328,7 +319,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -348,7 +338,6 @@ "ctxt": 0 }, "value": "MyMap", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -374,7 +363,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -396,6 +384,7 @@ "ctxt": 0 }, "value": "Map_", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -459,7 +448,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -480,7 +468,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -491,8 +478,7 @@ } ] } - }, - "optional": false + } } } ], @@ -523,7 +509,6 @@ "ctxt": 0 }, "value": "store", - "typeAnnotation": null, "optional": false }, "value": { @@ -556,7 +541,6 @@ "ctxt": 0 }, "value": "Map_", - "typeAnnotation": null, "optional": false }, "computed": false @@ -585,7 +569,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -605,7 +588,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -650,7 +632,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -671,7 +652,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/instanceMemberWithComputedPropertyName/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/instanceMemberWithComputedPropertyName/input.ts.json index 42488bec30d4..156ec87ef6e5 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/instanceMemberWithComputedPropertyName/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/instanceMemberWithComputedPropertyName/input.ts.json @@ -53,8 +53,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -79,7 +79,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -105,7 +104,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -143,7 +141,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -195,7 +192,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -215,7 +211,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -242,7 +237,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -265,7 +259,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/instanceMemberWithComputedPropertyName2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/instanceMemberWithComputedPropertyName2/input.ts.json index 8416bd148abf..8426ec051c04 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/instanceMemberWithComputedPropertyName2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/instanceMemberWithComputedPropertyName2/input.ts.json @@ -53,8 +53,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -79,7 +79,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -105,7 +104,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberAccessorDeclarations/accessorWithES3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberAccessorDeclarations/accessorWithES3/input.ts.json index 80af9fbc5979..4b63bf5adf4c 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberAccessorDeclarations/accessorWithES3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberAccessorDeclarations/accessorWithES3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -155,8 +151,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -218,8 +214,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -244,7 +240,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -307,8 +302,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -333,7 +328,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "param": { @@ -344,8 +338,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberAccessorDeclarations/accessorWithES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberAccessorDeclarations/accessorWithES5/input.ts.json index ca2514712b26..21b13529c0c6 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberAccessorDeclarations/accessorWithES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberAccessorDeclarations/accessorWithES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -155,8 +151,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -218,8 +214,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -244,7 +240,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -307,8 +302,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -333,7 +328,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "param": { @@ -344,8 +338,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberAccessorDeclarations/accessorWithMismatchedAccessibilityModifiers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberAccessorDeclarations/accessorWithMismatchedAccessibilityModifiers/input.ts.json index 3b87f75b3a02..bb2b1f14c965 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberAccessorDeclarations/accessorWithMismatchedAccessibilityModifiers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberAccessorDeclarations/accessorWithMismatchedAccessibilityModifiers/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -106,7 +104,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -127,8 +124,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -175,7 +172,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -201,7 +197,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -265,7 +260,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -286,8 +280,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -334,7 +328,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -360,7 +353,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -381,8 +373,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -427,7 +419,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -493,7 +484,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -519,7 +509,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -540,8 +529,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -586,7 +575,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberAccessorDeclarations/accessorsAreNotContextuallyTyped/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberAccessorDeclarations/accessorsAreNotContextuallyTyped/input.ts.json index 9e7652d17d0f..7ab410f5f4ff 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberAccessorDeclarations/accessorsAreNotContextuallyTyped/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberAccessorDeclarations/accessorsAreNotContextuallyTyped/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -86,6 +85,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,8 +102,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -125,8 +124,7 @@ } } } - }, - "optional": false + } } } ], @@ -171,7 +169,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -213,6 +210,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -229,8 +227,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -298,6 +295,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -320,13 +318,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -358,8 +354,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -383,7 +379,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -394,7 +389,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberAccessorDeclarations/ambientAccessors/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberAccessorDeclarations/ambientAccessors/input.ts.json index c1c7b26dced5..0d26dfc5aaea 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberAccessorDeclarations/ambientAccessors/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberAccessorDeclarations/ambientAccessors/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -117,6 +114,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -133,8 +131,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -171,7 +168,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "function": { @@ -225,7 +221,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "function": { @@ -246,6 +241,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -262,8 +258,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -300,7 +295,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -354,7 +348,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -375,6 +368,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -391,8 +385,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -429,7 +422,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -483,7 +475,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -504,6 +495,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -520,8 +512,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberAccessorDeclarations/typeOfThisInAccessor/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberAccessorDeclarations/typeOfThisInAccessor/input.ts.json index b5829f6b721f..e28d2b1235f9 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberAccessorDeclarations/typeOfThisInAccessor/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberAccessorDeclarations/typeOfThisInAccessor/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,8 +84,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -146,7 +144,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -190,8 +187,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -252,7 +249,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -278,7 +274,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -304,7 +299,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -335,7 +329,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -379,8 +372,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -439,7 +432,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -483,8 +475,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -554,7 +546,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -590,8 +581,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -616,7 +607,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -653,8 +643,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess/input.ts.json index c864ce7f2c58..604df02de72f 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -94,7 +93,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -122,8 +120,7 @@ } ] } - }, - "optional": false + } } } ], @@ -193,7 +190,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -246,7 +242,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -272,7 +267,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -293,6 +287,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -324,7 +319,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -366,7 +360,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -394,8 +387,7 @@ } ] } - }, - "optional": false + } } } ], @@ -465,7 +457,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -507,7 +498,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -558,7 +548,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -602,8 +591,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -635,7 +624,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -661,7 +649,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -709,8 +696,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -742,7 +729,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -768,7 +754,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -791,7 +776,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -839,8 +823,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -872,7 +856,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -898,7 +881,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -921,7 +903,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -966,7 +947,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/instanceMemberAssignsToClassPrototype/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/instanceMemberAssignsToClassPrototype/input.ts.json index 10c85080ffad..6cf59416c118 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/instanceMemberAssignsToClassPrototype/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/instanceMemberAssignsToClassPrototype/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -98,7 +96,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -122,7 +118,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -179,7 +174,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -200,6 +194,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +211,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -272,7 +266,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -283,7 +276,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -296,7 +288,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -362,7 +353,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -373,7 +363,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -386,7 +375,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -407,8 +395,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -419,7 +407,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -466,7 +453,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -477,7 +463,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -490,7 +475,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -511,6 +495,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -527,8 +512,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionOverloadMixingStaticAndInstance/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionOverloadMixingStaticAndInstance/input.ts.json index 4cd39ac5e4c8..cd8da26e713c 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionOverloadMixingStaticAndInstance/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionOverloadMixingStaticAndInstance/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -120,7 +117,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -224,7 +218,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -250,7 +243,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -271,6 +263,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -293,13 +286,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -336,7 +327,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -357,6 +347,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -373,8 +364,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -422,7 +412,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -443,7 +432,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -469,7 +457,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -490,6 +477,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -506,8 +494,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -544,7 +531,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -565,6 +551,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -587,13 +574,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -641,7 +626,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPrivateOverloads/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPrivateOverloads/input.ts.json index b809b5118e4a..87199f427346 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPrivateOverloads/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPrivateOverloads/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -79,8 +78,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -117,7 +115,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -138,6 +135,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -154,8 +152,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -174,6 +171,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -190,8 +188,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -228,7 +225,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -249,6 +245,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -265,8 +262,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -285,6 +281,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -301,8 +298,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -347,7 +343,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -368,6 +363,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -397,8 +393,7 @@ } } } - }, - "optional": false + } } } ], @@ -435,7 +430,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -456,6 +450,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -472,8 +467,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -510,7 +504,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -531,6 +524,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -547,8 +541,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -567,6 +560,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +577,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -621,7 +614,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -642,6 +634,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -658,8 +651,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -678,6 +670,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -694,8 +687,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -740,7 +732,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -761,6 +752,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -777,8 +769,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -815,7 +806,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -836,6 +826,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -852,8 +843,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -872,6 +862,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -888,8 +879,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -926,7 +916,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -947,6 +936,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -963,8 +953,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -983,6 +972,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -999,8 +989,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -1045,7 +1034,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -1066,6 +1054,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1095,8 +1084,7 @@ } } } - }, - "optional": false + } } } ], @@ -1133,7 +1121,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -1154,6 +1141,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1170,8 +1158,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1208,7 +1195,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -1229,6 +1215,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1245,8 +1232,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -1265,6 +1251,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1281,8 +1268,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1319,7 +1305,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -1340,6 +1325,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1356,8 +1342,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -1376,6 +1361,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1392,8 +1378,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -1440,7 +1425,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1466,7 +1450,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -1487,6 +1470,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1503,8 +1487,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1541,7 +1524,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -1562,6 +1544,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1584,13 +1567,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1609,6 +1590,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1631,13 +1613,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1674,7 +1654,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -1695,6 +1674,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1711,8 +1691,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -1731,6 +1710,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1747,8 +1727,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -1793,7 +1772,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -1814,6 +1792,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1843,8 +1822,7 @@ } } } - }, - "optional": false + } } } ], @@ -1881,7 +1859,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -1902,6 +1879,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1918,8 +1896,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1956,7 +1933,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -1977,6 +1953,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1999,13 +1976,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2024,6 +1999,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2046,13 +2022,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2089,7 +2063,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -2110,6 +2083,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2126,8 +2100,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -2146,6 +2119,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2162,8 +2136,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -2208,7 +2181,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -2229,6 +2201,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2245,8 +2218,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -2283,7 +2255,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -2304,6 +2275,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2320,8 +2292,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -2340,6 +2311,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2356,8 +2328,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -2394,7 +2365,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -2415,6 +2385,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2431,8 +2402,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -2451,6 +2421,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2467,8 +2438,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -2513,7 +2483,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -2534,6 +2503,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2563,8 +2533,7 @@ } } } - }, - "optional": false + } } } ], @@ -2601,7 +2570,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -2622,6 +2590,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2638,8 +2607,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -2676,7 +2644,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -2697,6 +2664,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2713,8 +2681,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -2733,6 +2700,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2749,8 +2717,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -2787,7 +2754,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -2808,6 +2774,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2824,8 +2791,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -2844,6 +2810,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2860,8 +2827,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -2917,7 +2883,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2953,6 +2918,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2975,13 +2941,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3013,8 +2977,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3038,7 +3002,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3049,7 +3012,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3099,6 +3061,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3121,7 +3084,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3144,8 +3106,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3177,8 +3138,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3202,7 +3163,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -3213,7 +3173,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3263,8 +3222,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3288,7 +3247,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -3299,7 +3257,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3349,8 +3306,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3374,7 +3331,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "property": { @@ -3385,7 +3341,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPublicOverloads/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPublicOverloads/input.ts.json index 7a8e66e1ae8f..fc1be25e28c3 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPublicOverloads/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPublicOverloads/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -79,8 +78,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -117,7 +115,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -138,6 +135,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -154,8 +152,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -174,6 +171,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -190,8 +188,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -228,7 +225,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -249,6 +245,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -265,8 +262,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -285,6 +281,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -301,8 +298,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -347,7 +343,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -368,6 +363,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -397,8 +393,7 @@ } } } - }, - "optional": false + } } } ], @@ -435,7 +430,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -456,6 +450,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -472,8 +467,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -510,7 +504,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -531,6 +524,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -547,8 +541,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -567,6 +560,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +577,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -621,7 +614,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -642,6 +634,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -658,8 +651,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -678,6 +670,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -694,8 +687,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -740,7 +732,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -761,6 +752,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -777,8 +769,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -815,7 +806,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -836,6 +826,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -852,8 +843,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -872,6 +862,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -888,8 +879,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -926,7 +916,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -947,6 +936,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -963,8 +953,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -983,6 +972,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -999,8 +989,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -1045,7 +1034,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -1066,6 +1054,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1095,8 +1084,7 @@ } } } - }, - "optional": false + } } } ], @@ -1133,7 +1121,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -1154,6 +1141,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1170,8 +1158,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1208,7 +1195,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -1229,6 +1215,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1245,8 +1232,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -1265,6 +1251,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1281,8 +1268,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1319,7 +1305,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -1340,6 +1325,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1356,8 +1342,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -1376,6 +1361,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1392,8 +1378,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -1440,7 +1425,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1466,7 +1450,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -1487,6 +1470,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1503,8 +1487,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1541,7 +1524,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -1562,6 +1544,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1584,13 +1567,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1609,6 +1590,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1631,13 +1613,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1674,7 +1654,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -1695,6 +1674,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1711,8 +1691,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -1731,6 +1710,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1747,8 +1727,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -1793,7 +1772,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -1814,6 +1792,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1843,8 +1822,7 @@ } } } - }, - "optional": false + } } } ], @@ -1881,7 +1859,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -1902,6 +1879,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1918,8 +1896,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1956,7 +1933,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -1977,6 +1953,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1999,13 +1976,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2024,6 +1999,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2046,13 +2022,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2089,7 +2063,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -2110,6 +2083,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2126,8 +2100,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -2146,6 +2119,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2162,8 +2136,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -2208,7 +2181,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -2229,6 +2201,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2245,8 +2218,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -2283,7 +2255,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -2304,6 +2275,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2320,8 +2292,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -2340,6 +2311,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2356,8 +2328,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -2394,7 +2365,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -2415,6 +2385,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2431,8 +2402,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -2451,6 +2421,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2467,8 +2438,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -2513,7 +2483,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -2534,6 +2503,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2563,8 +2533,7 @@ } } } - }, - "optional": false + } } } ], @@ -2601,7 +2570,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -2622,6 +2590,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2638,8 +2607,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -2676,7 +2644,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -2697,6 +2664,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2713,8 +2681,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -2733,6 +2700,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2749,8 +2717,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -2787,7 +2754,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -2808,6 +2774,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2824,8 +2791,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -2844,6 +2810,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2860,8 +2827,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -2917,7 +2883,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPublicPrivateOverloads/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPublicPrivateOverloads/input.ts.json index 31d8b6e56253..a3bde29b5eb3 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPublicPrivateOverloads/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPublicPrivateOverloads/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -79,8 +78,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -117,7 +115,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -138,6 +135,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -154,8 +152,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -174,6 +171,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -190,8 +188,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -228,7 +225,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -249,6 +245,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -265,8 +262,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -285,6 +281,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -301,8 +298,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -347,7 +343,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -368,6 +363,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -397,8 +393,7 @@ } } } - }, - "optional": false + } } } ], @@ -435,7 +430,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -456,6 +450,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -472,8 +467,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -510,7 +504,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -531,6 +524,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -547,8 +541,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -567,6 +560,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +577,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -621,7 +614,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -642,6 +634,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -658,8 +651,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -678,6 +670,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -694,8 +687,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -740,7 +732,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -761,6 +752,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -777,8 +769,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -815,7 +806,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -836,6 +826,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -852,8 +843,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -872,6 +862,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -888,8 +879,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -926,7 +916,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -947,6 +936,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -963,8 +953,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -983,6 +972,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -999,8 +989,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -1045,7 +1034,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -1066,6 +1054,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1082,8 +1071,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1120,7 +1108,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -1141,6 +1128,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1157,8 +1145,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -1177,6 +1164,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1193,8 +1181,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1231,7 +1218,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -1252,6 +1238,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1268,8 +1255,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -1288,6 +1274,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1304,8 +1291,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -1350,7 +1336,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -1371,6 +1356,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1400,8 +1386,7 @@ } } } - }, - "optional": false + } } } ], @@ -1438,7 +1423,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -1459,6 +1443,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1475,8 +1460,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1513,7 +1497,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -1534,6 +1517,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1550,8 +1534,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -1570,6 +1553,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1586,8 +1570,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1624,7 +1607,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -1645,6 +1627,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1661,8 +1644,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -1681,6 +1663,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1697,8 +1680,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -1743,7 +1725,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -1764,6 +1745,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1793,8 +1775,7 @@ } } } - }, - "optional": false + } } } ], @@ -1831,7 +1812,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -1852,6 +1832,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1868,8 +1849,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1906,7 +1886,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -1927,6 +1906,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1943,8 +1923,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -1963,6 +1942,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1979,8 +1959,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -2017,7 +1996,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -2038,6 +2016,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2054,8 +2033,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -2074,6 +2052,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2090,8 +2069,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -2138,7 +2116,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2164,7 +2141,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -2185,6 +2161,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2201,8 +2178,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -2239,7 +2215,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -2260,6 +2235,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2282,13 +2258,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2307,6 +2281,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2329,13 +2304,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2372,7 +2345,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -2393,6 +2365,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2409,8 +2382,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -2429,6 +2401,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2445,8 +2418,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -2491,7 +2463,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -2512,6 +2483,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2541,8 +2513,7 @@ } } } - }, - "optional": false + } } } ], @@ -2579,7 +2550,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -2600,6 +2570,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2616,8 +2587,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -2654,7 +2624,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -2675,6 +2644,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2697,13 +2667,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2722,6 +2690,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2744,13 +2713,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2787,7 +2754,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -2808,6 +2774,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2824,8 +2791,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -2844,6 +2810,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2860,8 +2827,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -2906,7 +2872,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -2927,6 +2892,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2943,8 +2909,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -2981,7 +2946,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -3002,6 +2966,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3018,8 +2983,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -3038,6 +3002,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3054,8 +3019,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -3092,7 +3056,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -3113,6 +3076,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3129,8 +3093,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -3149,6 +3112,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3165,8 +3129,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -3211,7 +3174,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -3232,6 +3194,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3248,8 +3211,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -3286,7 +3248,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -3307,6 +3268,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3323,8 +3285,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -3343,6 +3304,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3359,8 +3321,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -3397,7 +3358,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -3418,6 +3378,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3434,8 +3395,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -3454,6 +3414,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3470,8 +3431,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -3516,7 +3476,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -3537,6 +3496,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3566,8 +3526,7 @@ } } } - }, - "optional": false + } } } ], @@ -3604,7 +3563,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -3625,6 +3583,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3641,8 +3600,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -3679,7 +3637,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -3700,6 +3657,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3716,8 +3674,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -3736,6 +3693,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3752,8 +3710,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -3790,7 +3747,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -3811,6 +3767,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3827,8 +3784,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -3847,6 +3803,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3863,8 +3820,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -3909,7 +3865,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -3930,6 +3885,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3946,8 +3902,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -3984,7 +3939,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -4005,6 +3959,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4021,8 +3976,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -4041,6 +3995,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4057,8 +4012,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -4095,7 +4049,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -4116,6 +4069,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4132,8 +4086,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -4152,6 +4105,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4168,8 +4122,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -4225,7 +4178,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4261,6 +4213,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4283,13 +4236,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -4321,8 +4272,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4346,7 +4297,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4357,7 +4307,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4407,6 +4356,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4429,7 +4379,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4452,8 +4401,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4485,8 +4433,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4510,7 +4458,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -4521,7 +4468,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/staticFactory1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/staticFactory1/input.ts.json index eea4552ac5c7..9ffa2efb0ae7 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/staticFactory1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/staticFactory1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -106,7 +104,6 @@ "ctxt": 0 }, "value": "create", - "typeAnnotation": null, "optional": false }, "function": { @@ -181,7 +178,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -207,7 +203,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -265,7 +260,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -298,8 +292,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -323,7 +317,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "property": { @@ -334,7 +327,6 @@ "ctxt": 0 }, "value": "create", - "typeAnnotation": null, "optional": false }, "computed": false @@ -375,7 +367,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -386,7 +377,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/staticMemberAssignsToConstructorFunctionMembers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/staticMemberAssignsToConstructorFunctionMembers/input.ts.json index 00054f20d87b..50a32171713b 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/staticMemberAssignsToConstructorFunctionMembers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/staticMemberAssignsToConstructorFunctionMembers/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -91,7 +89,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -102,7 +99,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -159,7 +155,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -180,6 +175,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -196,8 +192,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -245,7 +240,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -256,7 +250,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -315,7 +308,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -326,7 +318,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -347,8 +338,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -359,7 +350,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -399,7 +389,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -410,7 +399,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -431,6 +419,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -447,8 +436,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/typeOfThisInMemberFunctions/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/typeOfThisInMemberFunctions/input.ts.json index 9567d7798aee..69451a00863e 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/typeOfThisInMemberFunctions/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/memberFunctionDeclarations/typeOfThisInMemberFunctions/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,8 +84,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -129,7 +127,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -173,8 +170,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -218,7 +215,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -244,7 +240,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -270,7 +265,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -301,7 +295,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -345,8 +338,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -388,7 +381,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -432,8 +424,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -486,7 +478,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -507,7 +498,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -533,7 +523,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -559,7 +548,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -590,7 +578,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -634,8 +621,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -677,7 +664,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -721,8 +707,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -775,7 +761,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -793,7 +778,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/optionalMethod/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/optionalMethod/input.ts.json index 20a42ce82e47..023f54662ea7 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/optionalMethod/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/optionalMethod/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": true }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/optionalProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/optionalProperty/input.ts.json index 6fe85bfe0846..6dd17deff1fc 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/optionalProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/optionalProperty/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": true }, "value": null, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/overrideInterfaceProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/overrideInterfaceProperty/input.ts.json index 9aa4e030d651..63fea2bbe3d2 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/overrideInterfaceProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/overrideInterfaceProperty/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Mup", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -102,7 +99,6 @@ "ctxt": 0 }, "value": "size", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "MupConstructor", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "Mup", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -241,6 +235,7 @@ "ctxt": 0 }, "value": "entries", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -317,7 +312,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -346,7 +340,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -369,8 +362,7 @@ } ] } - }, - "optional": true + } } ], "typeAnnotation": { @@ -395,7 +387,6 @@ "ctxt": 0 }, "value": "Mup", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -421,7 +412,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -441,7 +431,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -473,7 +462,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -494,7 +482,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -519,7 +506,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -548,7 +534,6 @@ "ctxt": 0 }, "value": "Mup", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -611,6 +596,7 @@ "ctxt": 0 }, "value": "Mup", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -633,13 +619,11 @@ "ctxt": 0 }, "value": "MupConstructor", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -656,7 +640,6 @@ "ctxt": 0 }, "value": "Sizz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -682,7 +665,6 @@ "ctxt": 0 }, "value": "size", - "typeAnnotation": null, "optional": false }, "function": { @@ -740,7 +722,6 @@ "ctxt": 0 }, "value": "Mup", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -758,7 +739,6 @@ "ctxt": 0 }, "value": "Kasizz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -784,7 +764,6 @@ "ctxt": 0 }, "value": "size", - "typeAnnotation": null, "optional": false }, "value": { @@ -825,7 +804,6 @@ "ctxt": 0 }, "value": "Mup", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyAndAccessorWithSameName/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyAndAccessorWithSameName/input.ts.json index 74cd92e09ad0..1b346928e7ac 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyAndAccessorWithSameName/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyAndAccessorWithSameName/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -154,7 +151,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -180,7 +176,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -226,7 +221,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -247,8 +241,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -295,7 +289,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -321,7 +314,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -367,7 +359,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -431,7 +422,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -452,8 +442,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyAndFunctionWithSameName/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyAndFunctionWithSameName/input.ts.json index a8ea91a73ccf..6284a90499d7 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyAndFunctionWithSameName/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyAndFunctionWithSameName/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -154,7 +151,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -180,7 +176,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -226,7 +221,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -247,8 +241,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyNamedPrototype/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyNamedPrototype/input.ts.json index af31d5086d3f..b1b726f2ba87 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyNamedPrototype/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyNamedPrototype/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "value": null, @@ -114,7 +111,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyOverridesAccessors/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyOverridesAccessors/input.ts.json index e387339afd7a..7f5b06af298c 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyOverridesAccessors/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyOverridesAccessors/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "function": { @@ -113,7 +111,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -139,7 +136,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -176,7 +172,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -194,7 +189,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -220,7 +214,6 @@ "ctxt": 0 }, "value": "_secret", - "typeAnnotation": null, "optional": false }, "value": { @@ -258,7 +251,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "function": { @@ -307,7 +299,6 @@ "ctxt": 0 }, "value": "_secret", - "typeAnnotation": null, "optional": false }, "computed": false @@ -341,7 +332,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "function": { @@ -362,8 +352,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -419,7 +409,6 @@ "ctxt": 0 }, "value": "_secret", - "typeAnnotation": null, "optional": false }, "computed": false @@ -432,7 +421,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -467,7 +455,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -493,7 +480,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -525,7 +511,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyOverridesAccessors2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyOverridesAccessors2/input.ts.json index 2e92f07012e1..c1ff3c289f76 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyOverridesAccessors2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyOverridesAccessors2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -106,7 +104,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -127,8 +124,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -175,7 +172,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -186,7 +182,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -210,7 +205,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } ], @@ -326,7 +320,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -352,7 +345,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -384,7 +376,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -417,8 +408,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -435,7 +426,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -474,7 +464,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -485,7 +474,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -508,7 +496,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -519,7 +506,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyOverridesAccessors3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyOverridesAccessors3/input.ts.json index 33f2a5a43a72..d8fe698881f9 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyOverridesAccessors3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyOverridesAccessors3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Animal", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "_sound", - "typeAnnotation": null, "optional": false }, "value": { @@ -85,7 +83,6 @@ "ctxt": 0 }, "value": "sound", - "typeAnnotation": null, "optional": false }, "function": { @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "_sound", - "typeAnnotation": null, "optional": false }, "computed": false @@ -168,7 +164,6 @@ "ctxt": 0 }, "value": "sound", - "typeAnnotation": null, "optional": false }, "function": { @@ -189,8 +184,8 @@ "ctxt": 0 }, "value": "val", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -246,7 +241,6 @@ "ctxt": 0 }, "value": "_sound", - "typeAnnotation": null, "optional": false }, "computed": false @@ -259,7 +253,6 @@ "ctxt": 0 }, "value": "val", - "typeAnnotation": null, "optional": false } } @@ -292,7 +285,6 @@ "ctxt": 0 }, "value": "makeSound", - "typeAnnotation": null, "optional": false }, "function": { @@ -340,7 +332,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -351,7 +342,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -382,7 +372,6 @@ "ctxt": 0 }, "value": "_sound", - "typeAnnotation": null, "optional": false }, "computed": false @@ -437,8 +426,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -455,7 +444,6 @@ "ctxt": 0 }, "value": "Animal", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -494,7 +482,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -505,7 +492,6 @@ "ctxt": 0 }, "value": "makeSound", - "typeAnnotation": null, "optional": false }, "computed": false @@ -524,7 +510,6 @@ "ctxt": 0 }, "value": "Lion", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -550,7 +535,6 @@ "ctxt": 0 }, "value": "sound", - "typeAnnotation": null, "optional": false }, "value": { @@ -587,7 +571,6 @@ "ctxt": 0 }, "value": "Animal", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -620,8 +603,8 @@ "ctxt": 0 }, "value": "lion", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -638,7 +621,6 @@ "ctxt": 0 }, "value": "Lion", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -677,7 +659,6 @@ "ctxt": 0 }, "value": "lion", - "typeAnnotation": null, "optional": false }, "property": { @@ -688,7 +669,6 @@ "ctxt": 0 }, "value": "makeSound", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyOverridesAccessors4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyOverridesAccessors4/input.ts.json index 591b5de58b4b..314f165f4a0a 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyOverridesAccessors4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyOverridesAccessors4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Animal", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "sound", - "typeAnnotation": null, "optional": false }, "function": { @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "sound", - "typeAnnotation": null, "optional": false }, "function": { @@ -117,6 +114,7 @@ "ctxt": 0 }, "value": "val", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -133,8 +131,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -173,7 +170,6 @@ "ctxt": 0 }, "value": "Lion", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -199,7 +195,6 @@ "ctxt": 0 }, "value": "sound", - "typeAnnotation": null, "optional": false }, "value": { @@ -236,7 +231,6 @@ "ctxt": 0 }, "value": "Animal", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyOverridesAccessors5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyOverridesAccessors5/input.ts.json index fec1d451189f..08868d0d6e14 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyOverridesAccessors5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyOverridesAccessors5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "function": { @@ -113,7 +111,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -139,7 +136,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -161,6 +157,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -177,8 +174,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -230,7 +226,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyOverridesMethod/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyOverridesMethod/input.ts.json index c8515a06ada6..fa657d392406 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyOverridesMethod/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/propertyOverridesMethod/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": { @@ -161,7 +157,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/staticAndNonStaticPropertiesSameName/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/staticAndNonStaticPropertiesSameName/input.ts.json index e9439eaecf19..22267de5c36c 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/staticAndNonStaticPropertiesSameName/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/staticAndNonStaticPropertiesSameName/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -180,7 +176,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/staticMemberInitialization/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/staticMemberInitialization/input.ts.json index 4b9aa18991a4..7f8f00a2743d 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/staticMemberInitialization/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/staticMemberInitialization/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -97,8 +95,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -115,7 +113,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -150,8 +147,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -168,7 +165,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -179,7 +175,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/staticPropertyAndFunctionWithSameName/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/staticPropertyAndFunctionWithSameName/input.ts.json index 554b44a1dbd9..7d1e64e7fc9b 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/staticPropertyAndFunctionWithSameName/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/staticPropertyAndFunctionWithSameName/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": null, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -162,7 +158,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": null, @@ -208,7 +203,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/staticPropertyNameConflictsInAmbientContext/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/staticPropertyNameConflictsInAmbientContext/input.ts.json index f100732be966..e4e3d9502d17 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/staticPropertyNameConflictsInAmbientContext/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/staticPropertyNameConflictsInAmbientContext/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "StaticName", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "StaticNameFn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -162,7 +158,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "function": { @@ -216,7 +211,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "function": { @@ -272,7 +266,6 @@ "ctxt": 0 }, "value": "StaticLength", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -298,7 +291,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "value": null, @@ -344,7 +336,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "value": null, @@ -392,7 +383,6 @@ "ctxt": 0 }, "value": "StaticLengthFn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -418,7 +408,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "function": { @@ -472,7 +461,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "function": { @@ -528,7 +516,6 @@ "ctxt": 0 }, "value": "StaticPrototype", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -554,7 +541,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "value": null, @@ -600,7 +586,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "value": null, @@ -648,7 +633,6 @@ "ctxt": 0 }, "value": "StaticPrototypeFn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -674,7 +658,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "value": null, @@ -720,7 +703,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "function": { @@ -776,7 +758,6 @@ "ctxt": 0 }, "value": "StaticCaller", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -802,7 +783,6 @@ "ctxt": 0 }, "value": "caller", - "typeAnnotation": null, "optional": false }, "value": null, @@ -848,7 +828,6 @@ "ctxt": 0 }, "value": "caller", - "typeAnnotation": null, "optional": false }, "value": null, @@ -896,7 +875,6 @@ "ctxt": 0 }, "value": "StaticCallerFn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -922,7 +900,6 @@ "ctxt": 0 }, "value": "caller", - "typeAnnotation": null, "optional": false }, "function": { @@ -976,7 +953,6 @@ "ctxt": 0 }, "value": "caller", - "typeAnnotation": null, "optional": false }, "function": { @@ -1032,7 +1008,6 @@ "ctxt": 0 }, "value": "StaticArguments", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1058,7 +1033,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1104,7 +1078,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1152,7 +1125,6 @@ "ctxt": 0 }, "value": "StaticArgumentsFn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1178,7 +1150,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "function": { @@ -1232,7 +1203,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/strictPropertyInitialization/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/strictPropertyInitialization/input.ts.json index 2f319beb6f25..8583c5f55bea 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/strictPropertyInitialization/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/strictPropertyInitialization/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -153,7 +150,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -218,7 +214,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": true }, "value": null, @@ -271,7 +266,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -324,7 +318,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -396,7 +389,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false } }, @@ -468,7 +460,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -516,7 +507,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -542,7 +532,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -588,7 +577,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -653,7 +641,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -718,7 +705,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": true }, "value": null, @@ -771,7 +757,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -824,7 +809,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -896,7 +880,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false } }, @@ -968,7 +951,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -1016,7 +998,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1042,7 +1023,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1088,7 +1068,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1153,7 +1132,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1218,7 +1196,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": true }, "value": null, @@ -1266,7 +1243,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1292,7 +1268,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1330,7 +1305,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1384,7 +1358,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -1450,7 +1423,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -1495,7 +1467,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -1556,7 +1527,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -1617,7 +1587,6 @@ "ctxt": 0 }, "value": "C5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1643,7 +1612,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1696,7 +1664,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1742,7 +1709,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1792,7 +1758,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1853,7 +1818,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1892,7 +1856,6 @@ "ctxt": 0 }, "value": "C6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1918,7 +1881,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1971,7 +1933,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2017,7 +1978,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2037,6 +1997,7 @@ "ctxt": 0 }, "value": "cond", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2053,8 +2014,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -2081,7 +2041,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -2143,7 +2102,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2204,7 +2162,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2243,7 +2200,6 @@ "ctxt": 0 }, "value": "C7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2269,7 +2225,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2322,7 +2277,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2368,7 +2322,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2388,6 +2341,7 @@ "ctxt": 0 }, "value": "cond", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2404,8 +2358,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -2432,7 +2385,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -2481,7 +2433,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2542,7 +2493,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2610,7 +2560,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2671,7 +2620,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2710,7 +2658,6 @@ "ctxt": 0 }, "value": "C8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2736,7 +2683,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2877,7 +2823,6 @@ "ctxt": 0 }, "value": "C9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2903,7 +2848,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2949,7 +2893,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3014,7 +2957,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3079,7 +3021,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": true }, "value": null, @@ -3127,7 +3068,6 @@ "ctxt": 0 }, "value": "C10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3153,7 +3093,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3199,7 +3138,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3245,7 +3183,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": true }, "value": null, @@ -3298,7 +3235,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -3344,7 +3280,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -3381,8 +3316,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3407,7 +3342,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3454,7 +3388,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3482,7 +3415,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3527,7 +3459,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3562,7 +3493,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -3608,7 +3538,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3621,7 +3550,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3671,7 +3599,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -3685,7 +3612,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3715,8 +3641,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3741,7 +3667,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3772,7 +3697,6 @@ "ctxt": 0 }, "value": "someValue", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3815,7 +3739,6 @@ "ctxt": 0 }, "value": "C11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3841,7 +3764,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3894,7 +3816,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3940,7 +3861,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -3990,7 +3910,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4010,7 +3929,6 @@ "ctxt": 0 }, "value": "someValue", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4063,7 +3981,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4084,7 +4001,6 @@ "ctxt": 0 }, "value": "someValue", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/thisInInstanceMemberInitializer/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/thisInInstanceMemberInitializer/input.ts.json index 17a8f7d56391..33ea1559880b 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/thisInInstanceMemberInitializer/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/thisInInstanceMemberInitializer/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -107,7 +104,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -144,7 +140,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -170,7 +165,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -212,7 +206,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/thisPropertyOverridesAccessors/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/thisPropertyOverridesAccessors/input.ts.json index ab4854cafe1a..7140ee8dfba8 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/thisPropertyOverridesAccessors/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/thisPropertyOverridesAccessors/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "function": { @@ -106,7 +104,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "function": { @@ -127,8 +124,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -175,7 +172,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -201,7 +197,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -277,7 +272,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -307,7 +301,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/twoAccessorsWithSameName2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/twoAccessorsWithSameName2/input.ts.json index 752d574bc750..c0c1e63c2911 100644 --- a/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/twoAccessorsWithSameName2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/classes/propertyMemberDeclarations/twoAccessorsWithSameName2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -106,7 +104,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -172,7 +169,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -198,7 +194,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -219,8 +214,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -265,7 +260,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -286,8 +280,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -334,7 +328,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -360,7 +353,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -424,7 +416,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -445,8 +436,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/declarationEmit/typePredicates/declarationEmitIdentifierPredicates01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/declarationEmit/typePredicates/declarationEmitIdentifierPredicates01/input.ts.json index 79730dbf9194..b3987f1ee929 100644 --- a/ecmascript/parser/tests/typescript/tsc/declarationEmit/typePredicates/declarationEmitIdentifierPredicates01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/declarationEmit/typePredicates/declarationEmitIdentifierPredicates01/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -44,6 +43,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,8 +60,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -110,7 +109,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -158,7 +156,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { diff --git a/ecmascript/parser/tests/typescript/tsc/declarationEmit/typePredicates/declarationEmitIdentifierPredicatesWithPrivateName01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/declarationEmit/typePredicates/declarationEmitIdentifierPredicatesWithPrivateName01/input.ts.json index 90de6a3c012f..50abab14722d 100644 --- a/ecmascript/parser/tests/typescript/tsc/declarationEmit/typePredicates/declarationEmitIdentifierPredicatesWithPrivateName01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/declarationEmit/typePredicates/declarationEmitIdentifierPredicatesWithPrivateName01/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -97,7 +95,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -118,6 +115,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -134,8 +132,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -191,7 +188,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -202,7 +198,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -252,7 +247,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -277,7 +271,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/declarationEmit/typePredicates/declarationEmitThisPredicates01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/declarationEmit/typePredicates/declarationEmitThisPredicates01/input.ts.json index 33e53600d8c5..8856493ecf35 100644 --- a/ecmascript/parser/tests/typescript/tsc/declarationEmit/typePredicates/declarationEmitThisPredicates01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/declarationEmit/typePredicates/declarationEmitThisPredicates01/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -99,7 +97,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false } } @@ -154,7 +151,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -194,7 +190,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -213,7 +208,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/declarationEmit/typePredicates/declarationEmitThisPredicates02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/declarationEmit/typePredicates/declarationEmitThisPredicates02/input.ts.json index cad5f5800c41..0556c567b888 100644 --- a/ecmascript/parser/tests/typescript/tsc/declarationEmit/typePredicates/declarationEmitThisPredicates02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/declarationEmit/typePredicates/declarationEmitThisPredicates02/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -100,7 +98,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -142,7 +139,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -204,8 +200,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -225,7 +221,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "params": [], @@ -268,8 +263,8 @@ "ctxt": 0 }, "value": "dis", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -318,7 +313,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -374,7 +368,6 @@ "ctxt": 0 }, "value": "dis", - "typeAnnotation": null, "optional": false }, "property": { @@ -385,7 +378,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -422,7 +414,6 @@ "ctxt": 0 }, "value": "dis", - "typeAnnotation": null, "optional": false }, "property": { @@ -433,7 +424,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -471,7 +461,6 @@ "ctxt": 0 }, "value": "dis", - "typeAnnotation": null, "optional": false }, "property": { @@ -482,7 +471,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -548,7 +536,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/declarationEmit/typePredicates/declarationEmitThisPredicatesWithPrivateName01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/declarationEmit/typePredicates/declarationEmitThisPredicatesWithPrivateName01/input.ts.json index 1f2d4cbb363c..dda83b042345 100644 --- a/ecmascript/parser/tests/typescript/tsc/declarationEmit/typePredicates/declarationEmitThisPredicatesWithPrivateName01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/declarationEmit/typePredicates/declarationEmitThisPredicatesWithPrivateName01/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -99,7 +97,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false } } @@ -154,7 +151,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -187,7 +183,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -206,7 +201,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/declarationEmit/typePredicates/declarationEmitThisPredicatesWithPrivateName02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/declarationEmit/typePredicates/declarationEmitThisPredicatesWithPrivateName02/input.ts.json index df16c4a02618..7037841d8bb2 100644 --- a/ecmascript/parser/tests/typescript/tsc/declarationEmit/typePredicates/declarationEmitThisPredicatesWithPrivateName02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/declarationEmit/typePredicates/declarationEmitThisPredicatesWithPrivateName02/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -135,7 +132,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -196,8 +192,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -217,7 +213,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "params": [], @@ -260,8 +255,8 @@ "ctxt": 0 }, "value": "dis", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -310,7 +305,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -366,7 +360,6 @@ "ctxt": 0 }, "value": "dis", - "typeAnnotation": null, "optional": false }, "property": { @@ -377,7 +370,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -414,7 +406,6 @@ "ctxt": 0 }, "value": "dis", - "typeAnnotation": null, "optional": false }, "property": { @@ -425,7 +416,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -463,7 +453,6 @@ "ctxt": 0 }, "value": "dis", - "typeAnnotation": null, "optional": false }, "property": { @@ -474,7 +463,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -540,7 +528,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/emitter/es2015/asyncGenerators/emitter.asyncGenerators.classMethods.es2015/input.ts.json b/ecmascript/parser/tests/typescript/tsc/emitter/es2015/asyncGenerators/emitter.asyncGenerators.classMethods.es2015/input.ts.json index f20ca3d987c2..82789bda160c 100644 --- a/ecmascript/parser/tests/typescript/tsc/emitter/es2015/asyncGenerators/emitter.asyncGenerators.classMethods.es2015/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/emitter/es2015/asyncGenerators/emitter.asyncGenerators.classMethods.es2015/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -160,8 +156,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -207,7 +203,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -233,7 +228,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -277,8 +271,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -332,7 +326,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -358,7 +351,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -402,8 +394,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -470,7 +462,6 @@ "ctxt": 0 }, "value": "C5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -496,7 +487,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -540,8 +530,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -655,7 +645,6 @@ "ctxt": 0 }, "value": "C6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -681,7 +670,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -725,8 +713,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -779,7 +767,6 @@ "ctxt": 0 }, "value": "C7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -805,7 +792,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -871,7 +857,6 @@ "ctxt": 0 }, "value": "C8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -897,7 +882,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "function": { @@ -943,7 +927,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -999,7 +982,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1038,7 +1020,6 @@ "ctxt": 0 }, "value": "B9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1064,7 +1045,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "function": { @@ -1112,7 +1092,6 @@ "ctxt": 0 }, "value": "C9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1138,7 +1117,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -1194,7 +1172,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1225,7 +1202,6 @@ "ctxt": 0 }, "value": "B9", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/emitter/es2015/asyncGenerators/emitter.asyncGenerators.functionDeclarations.es2015/input.ts.json b/ecmascript/parser/tests/typescript/tsc/emitter/es2015/asyncGenerators/emitter.asyncGenerators.functionDeclarations.es2015/input.ts.json index 3c1efb746869..bbf9e550cf0c 100644 --- a/ecmascript/parser/tests/typescript/tsc/emitter/es2015/asyncGenerators/emitter.asyncGenerators.functionDeclarations.es2015/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/emitter/es2015/asyncGenerators/emitter.asyncGenerators.functionDeclarations.es2015/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -95,8 +93,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -129,7 +127,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -173,8 +170,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -215,7 +212,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -259,8 +255,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -314,7 +310,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -358,8 +353,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -460,7 +455,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -504,8 +498,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -545,7 +539,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/emitter/es2015/asyncGenerators/emitter.asyncGenerators.functionExpressions.es2015/input.ts.json b/ecmascript/parser/tests/typescript/tsc/emitter/es2015/asyncGenerators/emitter.asyncGenerators.functionExpressions.es2015/input.ts.json index cd0b40a03ab4..d8089e76c481 100644 --- a/ecmascript/parser/tests/typescript/tsc/emitter/es2015/asyncGenerators/emitter.asyncGenerators.functionExpressions.es2015/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/emitter/es2015/asyncGenerators/emitter.asyncGenerators.functionExpressions.es2015/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -87,8 +87,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -133,8 +133,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -186,8 +186,8 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -232,8 +232,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -293,8 +293,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -339,8 +339,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -413,8 +413,8 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -459,8 +459,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -580,8 +580,8 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -626,8 +626,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -686,8 +686,8 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/emitter/es2015/asyncGenerators/emitter.asyncGenerators.objectLiteralMethods.es2015/input.ts.json b/ecmascript/parser/tests/typescript/tsc/emitter/es2015/asyncGenerators/emitter.asyncGenerators.objectLiteralMethods.es2015/input.ts.json index ae00eb9ce4e6..40813fce20f0 100644 --- a/ecmascript/parser/tests/typescript/tsc/emitter/es2015/asyncGenerators/emitter.asyncGenerators.objectLiteralMethods.es2015/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/emitter/es2015/asyncGenerators/emitter.asyncGenerators.objectLiteralMethods.es2015/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "o1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -107,8 +106,8 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -128,7 +127,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -171,8 +169,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -226,8 +224,8 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -247,7 +245,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -290,8 +287,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -353,8 +350,8 @@ "ctxt": 0 }, "value": "o4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -374,7 +371,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -417,8 +413,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -493,8 +489,8 @@ "ctxt": 0 }, "value": "o5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -514,7 +510,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -557,8 +552,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -680,8 +675,8 @@ "ctxt": 0 }, "value": "o6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -701,7 +696,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -744,8 +738,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -806,8 +800,8 @@ "ctxt": 0 }, "value": "o7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -827,7 +821,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/emitter/es2018/asyncGenerators/emitter.asyncGenerators.classMethods.es2018/input.ts.json b/ecmascript/parser/tests/typescript/tsc/emitter/es2018/asyncGenerators/emitter.asyncGenerators.classMethods.es2018/input.ts.json index f20ca3d987c2..82789bda160c 100644 --- a/ecmascript/parser/tests/typescript/tsc/emitter/es2018/asyncGenerators/emitter.asyncGenerators.classMethods.es2018/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/emitter/es2018/asyncGenerators/emitter.asyncGenerators.classMethods.es2018/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -160,8 +156,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -207,7 +203,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -233,7 +228,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -277,8 +271,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -332,7 +326,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -358,7 +351,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -402,8 +394,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -470,7 +462,6 @@ "ctxt": 0 }, "value": "C5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -496,7 +487,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -540,8 +530,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -655,7 +645,6 @@ "ctxt": 0 }, "value": "C6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -681,7 +670,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -725,8 +713,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -779,7 +767,6 @@ "ctxt": 0 }, "value": "C7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -805,7 +792,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -871,7 +857,6 @@ "ctxt": 0 }, "value": "C8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -897,7 +882,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "function": { @@ -943,7 +927,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -999,7 +982,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1038,7 +1020,6 @@ "ctxt": 0 }, "value": "B9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1064,7 +1045,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "function": { @@ -1112,7 +1092,6 @@ "ctxt": 0 }, "value": "C9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1138,7 +1117,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -1194,7 +1172,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1225,7 +1202,6 @@ "ctxt": 0 }, "value": "B9", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/emitter/es2018/asyncGenerators/emitter.asyncGenerators.functionDeclarations.es2018/input.ts.json b/ecmascript/parser/tests/typescript/tsc/emitter/es2018/asyncGenerators/emitter.asyncGenerators.functionDeclarations.es2018/input.ts.json index 3c1efb746869..bbf9e550cf0c 100644 --- a/ecmascript/parser/tests/typescript/tsc/emitter/es2018/asyncGenerators/emitter.asyncGenerators.functionDeclarations.es2018/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/emitter/es2018/asyncGenerators/emitter.asyncGenerators.functionDeclarations.es2018/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -95,8 +93,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -129,7 +127,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -173,8 +170,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -215,7 +212,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -259,8 +255,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -314,7 +310,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -358,8 +353,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -460,7 +455,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -504,8 +498,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -545,7 +539,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/emitter/es2018/asyncGenerators/emitter.asyncGenerators.functionExpressions.es2018/input.ts.json b/ecmascript/parser/tests/typescript/tsc/emitter/es2018/asyncGenerators/emitter.asyncGenerators.functionExpressions.es2018/input.ts.json index cd0b40a03ab4..d8089e76c481 100644 --- a/ecmascript/parser/tests/typescript/tsc/emitter/es2018/asyncGenerators/emitter.asyncGenerators.functionExpressions.es2018/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/emitter/es2018/asyncGenerators/emitter.asyncGenerators.functionExpressions.es2018/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -87,8 +87,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -133,8 +133,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -186,8 +186,8 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -232,8 +232,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -293,8 +293,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -339,8 +339,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -413,8 +413,8 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -459,8 +459,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -580,8 +580,8 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -626,8 +626,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -686,8 +686,8 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/emitter/es2018/asyncGenerators/emitter.asyncGenerators.objectLiteralMethods.es2018/input.ts.json b/ecmascript/parser/tests/typescript/tsc/emitter/es2018/asyncGenerators/emitter.asyncGenerators.objectLiteralMethods.es2018/input.ts.json index ae00eb9ce4e6..40813fce20f0 100644 --- a/ecmascript/parser/tests/typescript/tsc/emitter/es2018/asyncGenerators/emitter.asyncGenerators.objectLiteralMethods.es2018/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/emitter/es2018/asyncGenerators/emitter.asyncGenerators.objectLiteralMethods.es2018/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "o1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -107,8 +106,8 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -128,7 +127,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -171,8 +169,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -226,8 +224,8 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -247,7 +245,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -290,8 +287,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -353,8 +350,8 @@ "ctxt": 0 }, "value": "o4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -374,7 +371,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -417,8 +413,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -493,8 +489,8 @@ "ctxt": 0 }, "value": "o5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -514,7 +510,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -557,8 +552,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -680,8 +675,8 @@ "ctxt": 0 }, "value": "o6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -701,7 +696,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -744,8 +738,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -806,8 +800,8 @@ "ctxt": 0 }, "value": "o7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -827,7 +821,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/emitter/es2019/noCatchBinding/emitter.noCatchBinding.es2019/input.ts.json b/ecmascript/parser/tests/typescript/tsc/emitter/es2019/noCatchBinding/emitter.noCatchBinding.es2019/input.ts.json index 8a2707e433a9..ed57c9d40bb5 100644 --- a/ecmascript/parser/tests/typescript/tsc/emitter/es2019/noCatchBinding/emitter.noCatchBinding.es2019/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/emitter/es2019/noCatchBinding/emitter.noCatchBinding.es2019/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/emitter/es5/asyncGenerators/emitter.asyncGenerators.classMethods.es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/emitter/es5/asyncGenerators/emitter.asyncGenerators.classMethods.es5/input.ts.json index 9f691109b1de..47e579e2d139 100644 --- a/ecmascript/parser/tests/typescript/tsc/emitter/es5/asyncGenerators/emitter.asyncGenerators.classMethods.es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/emitter/es5/asyncGenerators/emitter.asyncGenerators.classMethods.es5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -160,8 +156,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -207,7 +203,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -233,7 +228,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -277,8 +271,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -332,7 +326,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -358,7 +351,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -402,8 +394,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -470,7 +462,6 @@ "ctxt": 0 }, "value": "C5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -496,7 +487,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -540,8 +530,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -655,7 +645,6 @@ "ctxt": 0 }, "value": "C6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -681,7 +670,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -725,8 +713,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -779,7 +767,6 @@ "ctxt": 0 }, "value": "C7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -805,7 +792,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -871,7 +857,6 @@ "ctxt": 0 }, "value": "C8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -897,7 +882,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "function": { @@ -943,7 +927,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -999,7 +982,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1038,7 +1020,6 @@ "ctxt": 0 }, "value": "B9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1064,7 +1045,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "function": { @@ -1112,7 +1092,6 @@ "ctxt": 0 }, "value": "C9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1138,7 +1117,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -1194,7 +1172,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1225,7 +1202,6 @@ "ctxt": 0 }, "value": "B9", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/emitter/es5/asyncGenerators/emitter.asyncGenerators.functionDeclarations.es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/emitter/es5/asyncGenerators/emitter.asyncGenerators.functionDeclarations.es5/input.ts.json index 0608c7265a5e..1a01404fba57 100644 --- a/ecmascript/parser/tests/typescript/tsc/emitter/es5/asyncGenerators/emitter.asyncGenerators.functionDeclarations.es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/emitter/es5/asyncGenerators/emitter.asyncGenerators.functionDeclarations.es5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -95,8 +93,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -129,7 +127,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -173,8 +170,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -215,7 +212,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -259,8 +255,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -314,7 +310,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -358,8 +353,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -460,7 +455,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -504,8 +498,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -545,7 +539,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/emitter/es5/asyncGenerators/emitter.asyncGenerators.functionExpressions.es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/emitter/es5/asyncGenerators/emitter.asyncGenerators.functionExpressions.es5/input.ts.json index fe83fe77d51c..bf63e995d0b3 100644 --- a/ecmascript/parser/tests/typescript/tsc/emitter/es5/asyncGenerators/emitter.asyncGenerators.functionExpressions.es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/emitter/es5/asyncGenerators/emitter.asyncGenerators.functionExpressions.es5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -87,8 +87,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -133,8 +133,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -186,8 +186,8 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -232,8 +232,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -293,8 +293,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -339,8 +339,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -413,8 +413,8 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -459,8 +459,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -580,8 +580,8 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -626,8 +626,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -686,8 +686,8 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/emitter/es5/asyncGenerators/emitter.asyncGenerators.objectLiteralMethods.es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/emitter/es5/asyncGenerators/emitter.asyncGenerators.objectLiteralMethods.es5/input.ts.json index c18b157a591d..47e78d4a2176 100644 --- a/ecmascript/parser/tests/typescript/tsc/emitter/es5/asyncGenerators/emitter.asyncGenerators.objectLiteralMethods.es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/emitter/es5/asyncGenerators/emitter.asyncGenerators.objectLiteralMethods.es5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "o1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -107,8 +106,8 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -128,7 +127,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -171,8 +169,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -226,8 +224,8 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -247,7 +245,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -290,8 +287,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -353,8 +350,8 @@ "ctxt": 0 }, "value": "o4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -374,7 +371,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -417,8 +413,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -493,8 +489,8 @@ "ctxt": 0 }, "value": "o5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -514,7 +510,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -557,8 +552,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -680,8 +675,8 @@ "ctxt": 0 }, "value": "o6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -701,7 +696,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -744,8 +738,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -806,8 +800,8 @@ "ctxt": 0 }, "value": "o7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -827,7 +821,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace1/input.ts.json index bdabf23a3867..c54ee7f26a52 100644 --- a/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace1/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -87,8 +87,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -127,7 +127,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } } @@ -171,7 +170,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -182,7 +180,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -210,7 +207,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -221,7 +217,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -250,7 +245,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -301,7 +295,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -312,7 +305,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "computed": false @@ -325,7 +317,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -360,7 +351,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -371,7 +361,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "computed": false @@ -384,7 +373,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace2/input.ts.json index f9875f5bdea5..8255d1de5967 100644 --- a/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace2/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -87,8 +87,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -127,7 +127,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } } @@ -171,7 +170,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -182,7 +180,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -210,7 +207,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -221,7 +217,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -250,7 +245,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -301,7 +295,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -312,7 +305,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "computed": false @@ -325,7 +317,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -360,7 +351,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -371,7 +361,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "computed": false @@ -384,7 +373,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace3/input.ts.json index 288548be8d14..3a3b07018745 100644 --- a/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace3/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -87,8 +87,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -127,7 +127,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } } @@ -171,7 +170,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -182,7 +180,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -210,7 +207,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -221,7 +217,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -252,8 +247,8 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -273,7 +268,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -296,7 +290,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -337,7 +330,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -348,7 +340,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -376,7 +367,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -387,7 +377,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -416,7 +405,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -467,7 +455,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -478,7 +465,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "computed": false @@ -491,7 +477,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -526,7 +511,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -537,7 +521,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "computed": false @@ -550,7 +533,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace4/input.ts.json index 1f9e77203360..e587f3183223 100644 --- a/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace4/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -87,8 +87,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -127,7 +127,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false } } @@ -172,7 +171,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } } @@ -209,7 +207,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } }, @@ -236,7 +233,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -281,7 +277,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false } } @@ -325,7 +320,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -336,7 +330,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -364,7 +357,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "property": { @@ -375,7 +367,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -403,7 +394,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -414,7 +404,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -442,7 +431,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "property": { @@ -453,7 +441,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace_exportAssignment/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace_exportAssignment/input.ts.json index cc1975416c38..2ef37594208a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace_exportAssignment/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace_exportAssignment/input.ts.json @@ -46,7 +46,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace_missingEmitHelpers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace_missingEmitHelpers/input.ts.json index dc21378048a2..a6fcc28b1801 100644 --- a/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace_missingEmitHelpers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace_missingEmitHelpers/input.ts.json @@ -41,7 +41,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace_nonExistent/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace_nonExistent/input.ts.json index bdd0e06e586c..c58b015ea1b3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace_nonExistent/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es2020/modules/exportAsNamespace_nonExistent/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit1/input.ts.json index bfc5b03457f9..a88c5ff694d2 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -60,7 +58,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit10/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit10/input.ts.json index 5fb70ea1329d..a6e73587065c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit10/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit10/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -71,7 +71,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -82,7 +81,6 @@ "ctxt": 0 }, "value": "isConcatSpreadable", - "typeAnnotation": null, "optional": false }, "computed": false @@ -151,7 +149,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -162,7 +159,6 @@ "ctxt": 0 }, "value": "isConcatSpreadable", - "typeAnnotation": null, "optional": false }, "computed": false @@ -176,8 +172,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit11/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit11/input.ts.json index 7e13f17b8e15..dad5f144d4f3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit11/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit11/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -60,7 +58,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -114,7 +111,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -125,7 +121,6 @@ "ctxt": 0 }, "value": "isConcatSpreadable", - "typeAnnotation": null, "optional": false }, "computed": false @@ -188,7 +183,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -199,7 +193,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false @@ -285,7 +278,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -296,7 +288,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false @@ -320,8 +311,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit12/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit12/input.ts.json index b98b9af27bbc..6823ead027a1 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit12/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit12/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -82,7 +80,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -115,7 +112,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -126,7 +122,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -154,7 +149,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -199,7 +193,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -210,7 +203,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false @@ -234,6 +226,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -256,13 +249,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -321,7 +312,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -332,7 +322,6 @@ "ctxt": 0 }, "value": "isConcatSpreadable", - "typeAnnotation": null, "optional": false }, "computed": false @@ -369,7 +358,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -400,7 +388,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -442,7 +429,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -453,7 +439,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false @@ -490,7 +475,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -536,7 +520,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -547,7 +530,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false @@ -571,6 +553,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -593,13 +576,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit13/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit13/input.ts.json index f95f3a557a77..8c4cd665ff14 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit13/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit13/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false @@ -153,7 +150,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "toStringTag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -188,8 +183,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit14/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit14/input.ts.json index d598483bb4be..6fd696f39ea5 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit14/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit14/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false @@ -153,7 +150,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "toStringTag", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit2/input.ts.json index 48a671d0fbbd..7b3c31b3e7d1 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -60,7 +58,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit3/input.ts.json index 877aa4d40053..419370d92b71 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false @@ -91,6 +88,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -107,8 +105,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -159,7 +156,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -170,7 +166,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false @@ -194,6 +189,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -210,8 +206,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -262,7 +257,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -273,7 +267,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false @@ -297,6 +290,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -313,8 +307,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit4/input.ts.json index e87d58b3848b..e84198114b4f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false @@ -153,7 +150,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false @@ -188,8 +183,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit5/input.ts.json index 36a7dd6ad2fa..8ba349ba1d64 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit5/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "isConcatSpreadable", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit6/input.ts.json index e5d3f1a5ad57..f625abfb614b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit6/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "isConcatSpreadable", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit7/input.ts.json index dea85e191d82..c7a7c791fddd 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit7/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -69,7 +70,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -80,7 +80,6 @@ "ctxt": 0 }, "value": "isConcatSpreadable", - "typeAnnotation": null, "optional": false }, "computed": false @@ -110,8 +109,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit8/input.ts.json index 515791fb19a6..ea4e73975d87 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit8/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -66,7 +66,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -77,7 +76,6 @@ "ctxt": 0 }, "value": "isConcatSpreadable", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit9/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit9/input.ts.json index d8ce05fa7e87..6345a2576017 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit9/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolDeclarationEmit9/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -66,7 +66,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -77,7 +76,6 @@ "ctxt": 0 }, "value": "isConcatSpreadable", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty1/input.ts.json index c6c7db3c0dc1..9e20558bc71d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty1/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "symbol" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,8 +80,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -108,7 +108,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -139,7 +138,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -186,7 +184,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty10/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty10/input.ts.json index 5f204fe0e0ad..b073841d0bf8 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty10/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty10/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -60,7 +58,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -97,7 +94,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -123,7 +119,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -168,7 +163,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -205,7 +199,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -216,7 +209,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -256,7 +248,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -299,6 +290,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -321,13 +313,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -357,8 +347,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -375,7 +365,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -408,6 +397,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -430,13 +420,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -446,7 +434,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty11/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty11/input.ts.json index 3b9c83ce0811..a6b6116d4143 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty11/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty11/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -85,7 +83,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -96,7 +93,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -136,7 +132,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -179,6 +174,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -201,13 +197,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -237,8 +231,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -255,7 +249,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -288,6 +281,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -310,13 +304,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -326,7 +318,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty12/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty12/input.ts.json index c5b707161871..3acfd0fe34d0 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty12/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty12/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -60,7 +58,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -97,7 +94,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -142,7 +138,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -179,7 +174,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -190,7 +184,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -230,7 +223,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -273,6 +265,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -295,13 +288,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -331,8 +322,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -349,7 +340,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -382,6 +372,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -404,13 +395,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -420,7 +409,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty13/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty13/input.ts.json index fb12d7d92965..2ca91f428abc 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty13/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty13/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -60,7 +58,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -97,7 +94,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -123,7 +119,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -168,7 +163,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -205,7 +199,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -216,7 +209,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -256,7 +248,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -284,7 +275,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -305,6 +295,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -327,13 +318,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -369,7 +358,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -386,7 +374,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -407,6 +394,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -423,8 +411,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -466,7 +453,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -487,6 +473,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -509,13 +496,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -551,7 +536,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -568,7 +552,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -589,6 +572,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -605,8 +589,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -660,7 +643,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -681,7 +663,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -717,6 +698,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -739,13 +721,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -774,7 +754,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -788,7 +767,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty14/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty14/input.ts.json index a2f8c882b10f..3736698dfa5d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty14/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty14/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -60,7 +58,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -97,7 +94,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -123,7 +119,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -168,7 +163,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -205,7 +199,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -216,7 +209,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -256,7 +248,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -284,7 +275,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -305,6 +295,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -327,13 +318,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -369,7 +358,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -386,7 +374,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -407,6 +394,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -423,8 +411,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -466,7 +453,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -487,6 +473,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -509,13 +496,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -551,7 +536,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -568,7 +552,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -589,6 +572,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -605,8 +589,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -660,7 +643,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -681,7 +663,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -717,6 +698,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -739,13 +721,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -774,7 +754,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -788,7 +767,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty15/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty15/input.ts.json index 971b02194c1d..3308da5694da 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty15/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty15/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -85,7 +83,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -96,7 +93,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -136,7 +132,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -164,7 +159,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -185,6 +179,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -207,13 +202,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -249,7 +242,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -266,7 +258,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -287,6 +278,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -303,8 +295,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -346,7 +337,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -367,6 +357,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -389,13 +380,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -431,7 +420,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -448,7 +436,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -469,6 +456,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -485,8 +473,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -540,7 +527,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -561,7 +547,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -597,6 +582,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -619,13 +605,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -654,7 +638,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -668,7 +651,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty16/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty16/input.ts.json index 79f3eace9941..40344645915f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty16/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty16/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -60,7 +58,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -97,7 +94,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -142,7 +138,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -179,7 +174,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -190,7 +184,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -230,7 +223,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -279,6 +270,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -301,13 +293,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -343,7 +333,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -360,7 +349,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -381,6 +369,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -397,8 +386,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -440,7 +428,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -461,6 +448,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -483,13 +471,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -525,7 +511,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -542,7 +527,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -563,6 +547,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -579,8 +564,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -634,7 +618,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -655,7 +638,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -691,6 +673,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -713,13 +696,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -748,7 +729,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -762,7 +742,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty18/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty18/input.ts.json index 580d52837c4e..5484fd6a4b41 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty18/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty18/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -66,7 +66,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -77,7 +76,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -117,7 +115,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "toStringTag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -207,7 +203,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -218,7 +213,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false @@ -232,6 +226,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -248,8 +243,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "body": { "type": "BlockStatement", @@ -292,8 +286,8 @@ "ctxt": 0 }, "value": "it", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -310,7 +304,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -328,7 +321,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -339,7 +331,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -375,8 +366,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -400,7 +391,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -418,7 +408,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -429,7 +418,6 @@ "ctxt": 0 }, "value": "toStringTag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -473,7 +461,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -491,7 +478,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -502,7 +488,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty19/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty19/input.ts.json index 7af781f9c06e..0dd54e868d79 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty19/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty19/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -66,7 +66,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -77,7 +76,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -101,7 +99,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -140,7 +137,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -151,7 +147,6 @@ "ctxt": 0 }, "value": "toStringTag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -197,7 +192,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -208,7 +202,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -253,8 +246,8 @@ "ctxt": 0 }, "value": "it", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -271,7 +264,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -289,7 +281,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -300,7 +291,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -336,8 +326,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -361,7 +351,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -379,7 +368,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -390,7 +378,6 @@ "ctxt": 0 }, "value": "toStringTag", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty2/input.ts.json index c8b70f33e793..11d2e77c16ad 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -84,8 +83,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -112,7 +111,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -143,7 +141,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -190,7 +187,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty20/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty20/input.ts.json index a5af8ad01082..bc9c58f4a9ef 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty20/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty20/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -101,6 +98,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -117,8 +115,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -166,7 +163,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -177,7 +173,6 @@ "ctxt": 0 }, "value": "toStringTag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -193,6 +188,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -209,8 +205,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -260,6 +255,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -282,13 +278,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -322,7 +316,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -333,7 +326,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -355,8 +347,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -367,7 +359,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "async": false, @@ -400,7 +391,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -411,7 +401,6 @@ "ctxt": 0 }, "value": "toStringTag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -434,8 +423,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -468,7 +457,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty21/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty21/input.ts.json index fa99a4474445..7eefb8e3be4e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty21/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty21/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -120,7 +116,6 @@ "ctxt": 0 }, "value": "unscopables", - "typeAnnotation": null, "optional": false }, "computed": false @@ -151,7 +146,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -182,7 +176,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -193,7 +186,6 @@ "ctxt": 0 }, "value": "isConcatSpreadable", - "typeAnnotation": null, "optional": false }, "computed": false @@ -224,7 +216,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -245,7 +236,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -266,6 +256,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -288,7 +279,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -314,7 +304,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -334,7 +323,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -342,8 +330,7 @@ ] } } - }, - "optional": false + } } } ], @@ -379,7 +366,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -400,7 +386,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -439,7 +424,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -468,7 +452,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -492,7 +475,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -521,7 +503,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -555,7 +536,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -593,7 +573,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -604,7 +583,6 @@ "ctxt": 0 }, "value": "isConcatSpreadable", - "typeAnnotation": null, "optional": false }, "computed": false @@ -649,7 +627,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -660,7 +637,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false @@ -700,7 +676,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -711,7 +686,6 @@ "ctxt": 0 }, "value": "unscopables", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty22/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty22/input.ts.json index 5841d7b224ca..e15803aa1578 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty22/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty22/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -120,7 +116,6 @@ "ctxt": 0 }, "value": "unscopables", - "typeAnnotation": null, "optional": false }, "computed": false @@ -136,6 +131,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -158,13 +154,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -189,7 +183,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -210,7 +203,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -231,6 +223,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -253,13 +246,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -278,6 +269,7 @@ "ctxt": 0 }, "value": "p2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -300,7 +292,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -326,7 +317,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -346,7 +336,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -354,8 +343,7 @@ ] } } - }, - "optional": false + } } } ], @@ -391,7 +379,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -412,7 +399,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -442,7 +428,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -471,7 +456,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -526,7 +510,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -537,7 +520,6 @@ "ctxt": 0 }, "value": "unscopables", - "typeAnnotation": null, "optional": false }, "computed": false @@ -559,8 +541,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -578,7 +560,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -589,7 +570,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty23/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty23/input.ts.json index 376ee7fc26cb..a669127b8339 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty23/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty23/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -168,7 +164,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -179,7 +174,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false @@ -252,7 +246,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty24/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty24/input.ts.json index a885e59ccb1c..a9392c45629e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty24/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty24/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -168,7 +164,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -179,7 +174,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false @@ -257,7 +251,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty25/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty25/input.ts.json index 8d7726aa57a8..79fbb792a0ff 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty25/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty25/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -168,7 +164,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -179,7 +174,6 @@ "ctxt": 0 }, "value": "toStringTag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -257,7 +251,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty26/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty26/input.ts.json index e097583a1c5a..00ab624b0738 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty26/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty26/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "toStringTag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -141,7 +138,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -181,7 +177,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -192,7 +187,6 @@ "ctxt": 0 }, "value": "toStringTag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -258,7 +252,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty27/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty27/input.ts.json index 5cccf0d7c505..f19386f57cd0 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty27/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty27/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "toStringTag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -176,7 +172,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -187,7 +182,6 @@ "ctxt": 0 }, "value": "toStringTag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -253,7 +247,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty28/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty28/input.ts.json index c909b147ce5f..c8ea8fec212f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty28/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty28/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "toStringTag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -114,7 +111,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -165,7 +161,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -217,6 +211,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -239,13 +234,11 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -277,8 +270,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -309,7 +302,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -327,7 +319,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -338,7 +329,6 @@ "ctxt": 0 }, "value": "toStringTag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -356,7 +346,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty3/input.ts.json index 5e4dbef9d5f2..20d21cd5a663 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty3/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -42,7 +42,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "definite": false @@ -74,8 +73,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -102,7 +101,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -133,7 +131,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -180,7 +177,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty35/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty35/input.ts.json index 65808c54aba1..aaf162e65e98 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty35/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty35/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "toStringTag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -108,7 +105,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -157,7 +153,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -194,7 +189,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -205,7 +199,6 @@ "ctxt": 0 }, "value": "toStringTag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -244,7 +237,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -293,7 +285,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -314,7 +305,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -334,7 +324,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeArguments": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty36/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty36/input.ts.json index 6208c8b93137..a9a7c80defb7 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty36/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty36/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -66,7 +66,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -77,7 +76,6 @@ "ctxt": 0 }, "value": "isConcatSpreadable", - "typeAnnotation": null, "optional": false }, "computed": false @@ -117,7 +115,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "isConcatSpreadable", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty37/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty37/input.ts.json index 74ea6e911ba7..5334d85e7ea3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty37/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty37/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "isConcatSpreadable", - "typeAnnotation": null, "optional": false }, "computed": false @@ -120,7 +117,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "isConcatSpreadable", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty38/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty38/input.ts.json index ecccaef4d5f3..0df66cd7b6cf 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty38/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty38/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "isConcatSpreadable", - "typeAnnotation": null, "optional": false }, "computed": false @@ -115,7 +112,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -152,7 +148,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -163,7 +158,6 @@ "ctxt": 0 }, "value": "isConcatSpreadable", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty39/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty39/input.ts.json index 6dde271fd580..f2f4f94f0a88 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty39/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty39/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -91,6 +88,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -107,8 +105,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -175,7 +172,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -186,7 +182,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -210,6 +205,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -226,8 +222,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -294,7 +289,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -305,7 +299,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -329,6 +322,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -345,8 +339,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -379,7 +372,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -425,7 +417,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -436,7 +427,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -460,6 +450,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -476,8 +467,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -510,7 +500,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty4/input.ts.json index 0c116e953c01..ce707f6ca5b8 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty4/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -66,7 +66,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -107,7 +106,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -164,7 +162,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty40/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty40/input.ts.json index d8afaa569d2c..9b771b61a65b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty40/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty40/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -91,6 +88,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -107,8 +105,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -175,7 +172,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -186,7 +182,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -210,6 +205,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -226,8 +222,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -294,7 +289,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -305,7 +299,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -329,6 +322,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -345,8 +339,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -379,7 +372,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -428,8 +420,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -446,7 +438,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -485,7 +476,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -503,7 +493,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -514,7 +503,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -572,7 +560,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -590,7 +577,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -601,7 +587,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty41/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty41/input.ts.json index a5577bf3e2f7..3af5a38d8a0c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty41/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty41/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -91,6 +88,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -107,8 +105,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -153,7 +150,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -218,7 +214,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -229,7 +224,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -253,6 +247,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -282,8 +277,7 @@ } } } - }, - "optional": false + } } } ], @@ -328,7 +322,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -370,7 +363,6 @@ "ctxt": 0 }, "value": "hello", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -435,7 +427,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -446,7 +437,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -470,6 +460,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -486,8 +477,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -520,7 +510,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -569,8 +558,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -587,7 +576,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -626,7 +614,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -644,7 +631,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -655,7 +641,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -713,7 +698,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -731,7 +715,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -742,7 +725,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty42/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty42/input.ts.json index c008e1ebe14a..0d317169a48f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty42/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty42/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -91,6 +88,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -107,8 +105,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -175,7 +172,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -186,7 +182,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -210,6 +205,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -226,8 +222,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -294,7 +289,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -305,7 +299,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -329,6 +322,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -345,8 +339,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -379,7 +372,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty43/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty43/input.ts.json index f314be21e518..633ed6bb5309 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty43/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty43/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -91,6 +88,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -107,8 +105,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -175,7 +172,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -186,7 +182,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -210,6 +205,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -226,8 +222,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty44/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty44/input.ts.json index d11a2edbf5fb..ba977abea610 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty44/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty44/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "hasInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -153,7 +150,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "hasInstance", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty45/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty45/input.ts.json index 61364a403908..a6f9ee738d25 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty45/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty45/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "hasInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -153,7 +150,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty46/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty46/input.ts.json index 512e22a9d93a..fec89c3fa444 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty46/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty46/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "hasInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -153,7 +150,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "hasInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -188,8 +183,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -270,7 +265,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -292,7 +286,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -303,7 +296,6 @@ "ctxt": 0 }, "value": "hasInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -365,7 +357,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -387,7 +378,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -398,7 +388,6 @@ "ctxt": 0 }, "value": "hasInstance", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty47/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty47/input.ts.json index 399a2070fa80..ef76efc81cc7 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty47/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty47/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "hasInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -153,7 +150,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "hasInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -188,6 +183,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -204,8 +200,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -286,7 +281,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -308,7 +302,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -319,7 +312,6 @@ "ctxt": 0 }, "value": "hasInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -381,7 +373,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -403,7 +394,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -414,7 +404,6 @@ "ctxt": 0 }, "value": "hasInstance", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty48/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty48/input.ts.json index 6bbea0b216fa..42b74e288296 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty48/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty48/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -59,8 +58,8 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -77,7 +76,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -117,7 +115,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty49/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty49/input.ts.json index 90521c24b165..b6565bf2f53c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty49/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty49/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -66,8 +65,8 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -85,7 +84,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -125,7 +123,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty5/input.ts.json index 7d64590faa69..7abe5fa88e4d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -66,7 +66,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -77,7 +76,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -117,7 +115,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false @@ -184,7 +180,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -195,7 +190,6 @@ "ctxt": 0 }, "value": "toStringTag", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty50/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty50/input.ts.json index 6c03447395ff..dc00ad0faf43 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty50/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty50/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -75,7 +73,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -115,7 +112,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -126,7 +122,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty51/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty51/input.ts.json index a16030a864e8..4f650d78890b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty51/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty51/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "body": { @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -114,7 +111,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -125,7 +121,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty52/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty52/input.ts.json index ade0b3c4fb2a..1f17bf8ab231 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty52/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty52/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -66,7 +66,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -77,7 +76,6 @@ "ctxt": 0 }, "value": "nonsense", - "typeAnnotation": null, "optional": false }, "computed": false @@ -122,8 +120,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -158,7 +156,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -176,7 +173,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -187,7 +183,6 @@ "ctxt": 0 }, "value": "nonsense", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty53/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty53/input.ts.json index 35eac028b1b7..d12c5835511c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty53/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty53/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -66,7 +66,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -77,7 +76,6 @@ "ctxt": 0 }, "value": "for", - "typeAnnotation": null, "optional": false }, "computed": false @@ -121,7 +119,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -139,7 +136,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -150,7 +146,6 @@ "ctxt": 0 }, "value": "for", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty54/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty54/input.ts.json index 072e2bbd3211..4d0833c94ccb 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty54/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty54/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -66,7 +66,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -77,7 +76,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty55/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty55/input.ts.json index 571bc6a5527d..a36ada06aa41 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty55/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty55/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -66,7 +66,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -77,7 +76,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -116,7 +114,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -152,6 +149,7 @@ "ctxt": 0 }, "value": "Symbol", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -174,13 +172,11 @@ "ctxt": 0 }, "value": "SymbolConstructor", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -209,7 +205,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -227,7 +222,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -238,7 +232,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty56/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty56/input.ts.json index c619d7a42711..92f792f5ee86 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty56/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty56/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -66,7 +66,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -77,7 +76,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -116,7 +114,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -152,6 +149,7 @@ "ctxt": 0 }, "value": "Symbol", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -168,8 +166,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -198,7 +195,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -216,7 +212,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty57/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty57/input.ts.json index 66ef911b5eed..ca5d4d5f51e7 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty57/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty57/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -66,7 +66,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -77,7 +76,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -121,7 +119,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -139,7 +136,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty58/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty58/input.ts.json index 073b29ea80e9..79926d69a8b8 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty58/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty58/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "SymbolConstructor", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -105,8 +103,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -140,7 +138,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -151,7 +148,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty59/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty59/input.ts.json index ce15e88bd3a5..19a3afc35ea4 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty59/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty59/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "keyFor", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty6/input.ts.json index edb024d2d6b4..c30b1f277807 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -60,7 +58,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -107,7 +104,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -118,7 +114,6 @@ "ctxt": 0 }, "value": "unscopables", - "typeAnnotation": null, "optional": false }, "computed": false @@ -180,7 +175,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -191,7 +185,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false @@ -254,7 +247,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -265,7 +257,6 @@ "ctxt": 0 }, "value": "toStringTag", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty60/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty60/input.ts.json index b1ea1a72dfce..772f530ed30f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty60/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty60/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "toStringTag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -108,6 +105,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -124,8 +122,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -170,7 +167,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -207,7 +203,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -218,7 +213,6 @@ "ctxt": 0 }, "value": "toStringTag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -257,6 +251,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -273,8 +268,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -329,6 +323,7 @@ "ctxt": 0 }, "value": "mySymbol", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -354,8 +349,7 @@ "kind": "symbol" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -377,7 +371,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -407,7 +400,6 @@ "ctxt": 0 }, "value": "mySymbol", - "typeAnnotation": null, "optional": false }, "computed": true, @@ -444,6 +436,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -460,8 +453,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -506,7 +498,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -536,7 +527,6 @@ "ctxt": 0 }, "value": "mySymbol", - "typeAnnotation": null, "optional": false }, "computed": true, @@ -573,6 +563,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -589,8 +580,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty8/input.ts.json index 4d811746d6c3..a7c5befce4eb 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty8/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "unscopables", - "typeAnnotation": null, "optional": false }, "computed": false @@ -120,7 +117,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty9/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty9/input.ts.json index d01890ae0586..02bbac7aac5e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty9/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolProperty9/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -60,7 +58,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -97,7 +94,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -123,7 +119,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -168,7 +163,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -205,7 +199,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -216,7 +209,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -256,7 +248,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -299,6 +290,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -321,13 +313,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -357,8 +347,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -375,7 +365,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -408,6 +397,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -430,13 +420,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -446,7 +434,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType1/input.ts.json index d8fc8c95344c..50dd0305ccf6 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType1/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false } } @@ -78,7 +76,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "right": { @@ -96,7 +93,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -149,7 +145,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false } } @@ -202,7 +196,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "right": { @@ -235,7 +228,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType10/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType10/input.ts.json index 5eb9fccbd2a5..d140a13fb155 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType10/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType10/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -56,7 +56,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +66,6 @@ "ctxt": 0 }, "value": "for", - "typeAnnotation": null, "optional": false }, "computed": false @@ -120,7 +118,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -131,7 +128,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -159,7 +155,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -170,7 +165,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -198,7 +192,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -209,7 +202,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -237,7 +229,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -283,7 +274,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType11/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType11/input.ts.json index 5349a123b325..025d609f7fd4 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType11/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType11/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -56,7 +56,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +66,6 @@ "ctxt": 0 }, "value": "for", - "typeAnnotation": null, "optional": false }, "computed": false @@ -120,7 +118,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -131,7 +128,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -159,7 +155,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -205,7 +200,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -233,7 +227,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -244,7 +237,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -272,7 +264,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -326,7 +317,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType12/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType12/input.ts.json index 280080a26229..87663e932aae 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType12/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType12/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -56,7 +56,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +66,6 @@ "ctxt": 0 }, "value": "for", - "typeAnnotation": null, "optional": false }, "computed": false @@ -122,8 +120,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -166,8 +164,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -177,7 +175,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -205,8 +202,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -242,8 +239,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -253,7 +250,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -281,8 +277,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -318,8 +314,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -329,7 +325,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -357,8 +352,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -394,8 +389,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -405,7 +400,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -433,8 +427,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -470,8 +464,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -512,8 +506,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -523,7 +517,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -551,8 +544,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -562,7 +555,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -590,8 +582,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -627,8 +619,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -638,7 +630,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -666,8 +657,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -703,8 +694,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -714,7 +705,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -742,8 +732,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -779,8 +769,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -790,7 +780,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -818,8 +807,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -855,8 +844,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -866,7 +855,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -894,8 +882,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -931,8 +919,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -942,7 +930,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -970,8 +957,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1007,8 +994,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1018,7 +1005,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -1046,8 +1032,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1083,8 +1069,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -1109,7 +1095,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -1120,7 +1105,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType13/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType13/input.ts.json index f9b8b15fc4ad..133afc90e0a8 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType13/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType13/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -84,6 +83,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -100,8 +100,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -123,8 +122,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -160,8 +159,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -171,7 +170,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "body": { @@ -216,8 +214,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -232,7 +230,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType14/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType14/input.ts.json index 265fea1594c8..6cbe2b896e6c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType14/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType14/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType15/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType15/input.ts.json index 58047f336c30..d098ab0167e8 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType15/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType15/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "sym", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "symbol" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "symObj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,13 +103,11 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -138,8 +137,8 @@ "ctxt": 0 }, "value": "symObj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -149,7 +148,6 @@ "ctxt": 0 }, "value": "sym", - "typeAnnotation": null, "optional": false } } @@ -177,8 +175,8 @@ "ctxt": 0 }, "value": "sym", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -188,7 +186,6 @@ "ctxt": 0 }, "value": "symObj", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType16/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType16/input.ts.json index be9935180dec..c1acaae64bed 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType16/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType16/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "newSymbolProp", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -105,6 +103,7 @@ "ctxt": 0 }, "value": "sym", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,8 +120,7 @@ }, "kind": "symbol" } - }, - "optional": false + } }, "init": null, "definite": false @@ -151,7 +149,6 @@ "ctxt": 0 }, "value": "sym", - "typeAnnotation": null, "optional": false }, "property": { @@ -162,7 +159,6 @@ "ctxt": 0 }, "value": "newSymbolProp", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType17/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType17/input.ts.json index add7298b5642..1adc30b60253 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType17/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType17/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -89,6 +87,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -128,15 +127,13 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -158,7 +155,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -193,7 +189,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -235,7 +230,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -264,7 +258,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType18/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType18/input.ts.json index a063696c5d65..a0b4084b4a07 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType18/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType18/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -89,6 +87,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -128,15 +127,13 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -158,7 +155,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -193,7 +189,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -235,7 +230,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -264,7 +258,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType19/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType19/input.ts.json index 4b3f2535aec3..fe84517a6633 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType19/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType19/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [] @@ -53,6 +52,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -92,15 +92,13 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -122,7 +120,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -157,7 +154,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -199,7 +195,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -228,7 +223,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType2/input.ts.json index 4de387b4834d..1dcddfb7c024 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType2/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "isConcatSpreadable", - "typeAnnotation": null, "optional": false }, "computed": false @@ -107,7 +105,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -118,7 +115,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType20/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType20/input.ts.json index e51647d5a1e3..3f34dfde324d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType20/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType20/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType3/input.ts.json index f54e92b81ed2..11f0222a460e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType3/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -89,7 +88,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -100,7 +98,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -137,7 +134,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -148,7 +144,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false @@ -185,7 +180,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -196,7 +190,6 @@ "ctxt": 0 }, "value": "toStringTag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -227,7 +220,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -256,7 +248,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -291,7 +282,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -329,7 +319,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -367,7 +356,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -405,7 +393,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -458,7 +445,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType4/input.ts.json index a3aa7a36af69..ea954d9a1b72 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType4/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -56,7 +56,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +66,6 @@ "ctxt": 0 }, "value": "for", - "typeAnnotation": null, "optional": false }, "computed": false @@ -121,7 +119,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -150,7 +147,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType5/input.ts.json index 00492941b268..70a9384fa916 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -56,7 +56,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +66,6 @@ "ctxt": 0 }, "value": "for", - "typeAnnotation": null, "optional": false }, "computed": false @@ -120,7 +118,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -131,7 +128,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -159,7 +155,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -170,7 +165,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -198,7 +192,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -209,7 +202,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -237,7 +229,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -283,7 +274,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType6/input.ts.json index c17173be9fe7..c2ec5fbe855c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -56,7 +56,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +66,6 @@ "ctxt": 0 }, "value": "for", - "typeAnnotation": null, "optional": false }, "computed": false @@ -122,6 +120,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -138,8 +137,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -169,7 +167,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -180,7 +177,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -208,7 +204,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -219,7 +214,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -247,7 +241,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -289,7 +282,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -300,7 +292,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -328,7 +319,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -379,7 +369,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -407,7 +396,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -418,7 +406,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -455,7 +442,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -483,7 +469,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -529,7 +514,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -572,7 +556,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -659,7 +642,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType7/input.ts.json index 2e20958c3e95..a3aadacf9aed 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType7/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -56,7 +56,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +66,6 @@ "ctxt": 0 }, "value": "for", - "typeAnnotation": null, "optional": false }, "computed": false @@ -120,7 +118,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -131,7 +128,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -159,7 +155,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -196,7 +191,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -207,7 +201,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -235,7 +228,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -272,7 +264,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -283,7 +274,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -311,7 +301,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType8/input.ts.json index fffaf1ab9c7d..24889518796b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType8/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -56,7 +56,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +66,6 @@ "ctxt": 0 }, "value": "for", - "typeAnnotation": null, "optional": false }, "computed": false @@ -120,7 +118,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -131,7 +128,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -159,7 +155,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -196,7 +191,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -207,7 +201,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -235,7 +228,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -272,7 +264,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -283,7 +274,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -311,7 +301,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -348,7 +337,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -359,7 +347,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -387,7 +374,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -448,7 +434,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -502,7 +487,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -524,7 +508,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType9/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType9/input.ts.json index 20f79139d86d..390ceaac989a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType9/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/Symbols/symbolType9/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -56,7 +56,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +66,6 @@ "ctxt": 0 }, "value": "for", - "typeAnnotation": null, "optional": false }, "computed": false @@ -120,7 +118,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -131,7 +128,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -159,7 +155,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -196,7 +191,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -207,7 +201,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -244,7 +237,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -272,7 +264,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -283,7 +274,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -311,7 +301,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -348,7 +337,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -359,7 +347,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -396,7 +383,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunction/input.ts.json index 17ae8c7f9dc4..2cde45e010e3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunction/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -85,8 +85,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -104,6 +104,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -120,8 +121,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -131,6 +131,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -147,8 +148,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -194,8 +194,8 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -213,6 +213,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -229,8 +230,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -240,6 +240,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -256,8 +257,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -279,8 +279,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -328,8 +328,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -347,6 +347,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -363,8 +364,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -374,6 +374,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -390,8 +391,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "AssignmentPattern", @@ -408,8 +408,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -451,7 +451,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -472,6 +471,7 @@ "ctxt": 0 }, "value": "func", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -506,8 +506,7 @@ } } } - }, - "optional": false + } } } ], @@ -553,7 +552,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -608,7 +606,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionAsIs/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionAsIs/input.ts.json index 3501dc1c68f2..85975032236e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionAsIs/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionAsIs/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "arrow1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -97,8 +97,8 @@ "ctxt": 0 }, "value": "arrow2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -116,8 +116,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -163,8 +163,8 @@ "ctxt": 0 }, "value": "arrow3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -182,8 +182,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -193,8 +193,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionAsIsES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionAsIsES6/input.ts.json index fe15059fbe5b..6343b0c6880d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionAsIsES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionAsIsES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "arrow1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -97,8 +97,8 @@ "ctxt": 0 }, "value": "arrow2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -116,8 +116,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -163,8 +163,8 @@ "ctxt": 0 }, "value": "arrow3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -182,8 +182,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -193,8 +193,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionES6/input.ts.json index e7604b690330..e483967a2ee9 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -85,8 +85,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -104,6 +104,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -120,8 +121,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -131,6 +131,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -147,8 +148,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -194,8 +194,8 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -213,6 +213,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -229,8 +230,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -240,6 +240,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -256,8 +257,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -279,8 +279,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -328,8 +328,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -347,6 +347,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -363,8 +364,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -374,6 +374,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -390,8 +391,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "AssignmentPattern", @@ -408,8 +408,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -451,7 +451,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -472,6 +471,7 @@ "ctxt": 0 }, "value": "func", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -506,8 +506,7 @@ } } } - }, - "optional": false + } } } ], @@ -553,7 +552,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -608,7 +606,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -684,8 +681,8 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -711,8 +708,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -762,8 +759,8 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -801,8 +798,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -854,8 +851,8 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -882,8 +879,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -933,8 +930,8 @@ "ctxt": 0 }, "value": "p4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -973,8 +970,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1026,8 +1023,8 @@ "ctxt": 0 }, "value": "p5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1060,8 +1057,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1122,8 +1119,8 @@ "ctxt": 0 }, "value": "p6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1156,7 +1153,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -1209,8 +1205,8 @@ "ctxt": 0 }, "value": "p7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1238,7 +1234,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1264,7 +1259,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -1322,8 +1316,8 @@ "ctxt": 0 }, "value": "p8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1356,7 +1350,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1417,8 +1410,8 @@ "ctxt": 0 }, "value": "p9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1446,7 +1439,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1479,7 +1471,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1514,7 +1505,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1580,8 +1570,8 @@ "ctxt": 0 }, "value": "p10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1622,7 +1612,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": null @@ -1642,7 +1631,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionThisCapturing/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionThisCapturing/input.ts.json index 5804a9a475bb..304f21b24038 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionThisCapturing/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionThisCapturing/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -88,7 +88,6 @@ "ctxt": 0 }, "value": "age", - "typeAnnotation": null, "optional": false }, "computed": false @@ -140,8 +139,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -159,6 +158,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -175,8 +175,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -225,7 +224,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -238,7 +236,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -264,7 +261,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -285,6 +281,7 @@ "ctxt": 0 }, "value": "func", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -319,8 +316,7 @@ } } } - }, - "optional": false + } } } ], @@ -366,7 +362,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -426,7 +421,6 @@ "ctxt": 0 }, "value": "age", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionThisCapturingES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionThisCapturingES6/input.ts.json index 8b4bb582a157..8edd11defb29 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionThisCapturingES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionThisCapturingES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -88,7 +88,6 @@ "ctxt": 0 }, "value": "age", - "typeAnnotation": null, "optional": false }, "computed": false @@ -140,8 +139,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -159,6 +158,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -175,8 +175,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -225,7 +224,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -238,7 +236,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -264,7 +261,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -285,6 +281,7 @@ "ctxt": 0 }, "value": "func", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -319,8 +316,7 @@ } } } - }, - "optional": false + } } } ], @@ -366,7 +362,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -426,7 +421,6 @@ "ctxt": 0 }, "value": "age", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments01/input.ts.json index 76993ad73880..7ba211717a58 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments01/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -75,8 +75,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -93,7 +93,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "property": { @@ -147,8 +146,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -193,8 +192,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -237,8 +236,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -255,7 +254,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "property": { @@ -305,7 +303,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -372,8 +369,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -390,7 +387,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "property": { @@ -433,7 +429,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -454,6 +449,7 @@ "ctxt": 0 }, "value": "inputFunc", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -488,8 +484,7 @@ } } } - }, - "optional": false + } } } ], @@ -535,7 +530,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -582,8 +576,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -600,7 +594,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "property": { @@ -640,7 +633,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -684,8 +676,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -702,7 +694,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "property": { @@ -760,7 +751,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -804,8 +794,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -822,7 +812,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments01_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments01_ES6/input.ts.json index 76993ad73880..7ba211717a58 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments01_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments01_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -75,8 +75,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -93,7 +93,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "property": { @@ -147,8 +146,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -193,8 +192,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -237,8 +236,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -255,7 +254,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "property": { @@ -305,7 +303,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -372,8 +369,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -390,7 +387,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "property": { @@ -433,7 +429,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -454,6 +449,7 @@ "ctxt": 0 }, "value": "inputFunc", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -488,8 +484,7 @@ } } } - }, - "optional": false + } } } ], @@ -535,7 +530,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -582,8 +576,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -600,7 +594,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "property": { @@ -640,7 +633,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -684,8 +676,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -702,7 +694,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "property": { @@ -760,7 +751,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -804,8 +794,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -822,7 +812,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments02/input.ts.json index edaf7e825b78..6167f19ff7be 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments02/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,7 +50,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments02_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments02_ES6/input.ts.json index edaf7e825b78..6167f19ff7be 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments02_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments02_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,7 +50,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments03/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments03/input.ts.json index e817a776d895..e71ec7170643 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments03/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments03/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -64,8 +64,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -83,7 +83,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments03_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments03_ES6/input.ts.json index e817a776d895..e71ec7170643 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments03_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments03_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -64,8 +64,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -83,7 +83,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments04/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments04/input.ts.json index 08661f30e593..15c3cd381a2f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments04/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments04/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -93,8 +92,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -112,7 +111,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments04_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments04_ES6/input.ts.json index 08661f30e593..15c3cd381a2f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments04_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments04_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -93,8 +92,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -112,7 +111,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments05/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments05/input.ts.json index 191441d4dc13..531742259d98 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments05/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments05/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -81,8 +80,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -100,7 +99,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments05_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments05_ES6/input.ts.json index 191441d4dc13..531742259d98 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments05_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments05_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -81,8 +80,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -100,7 +99,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments06/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments06/input.ts.json index bd55e110cc25..1f284eeeac0e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments06/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments06/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -81,8 +80,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -108,7 +107,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments06_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments06_ES6/input.ts.json index bd55e110cc25..1f284eeeac0e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments06_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments06_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -81,8 +80,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -108,7 +107,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments07/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments07/input.ts.json index 155d99adc680..28ad5b14d607 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments07/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments07/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -81,8 +80,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -100,8 +99,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -120,7 +119,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments07_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments07_ES6/input.ts.json index 155d99adc680..28ad5b14d607 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments07_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments07_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -81,8 +80,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -100,8 +99,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -120,7 +119,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments08/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments08/input.ts.json index 14d9fc86d914..1572fe13c518 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments08/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments08/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -81,8 +80,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -108,8 +107,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -120,7 +119,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments08_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments08_ES6/input.ts.json index 14d9fc86d914..1572fe13c518 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments08_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments08_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -81,8 +80,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -108,8 +107,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -120,7 +119,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments09/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments09/input.ts.json index cb1e130e4c5d..b548303096bd 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments09/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments09/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "_arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -81,8 +80,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -108,7 +107,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments09_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments09_ES6/input.ts.json index cb1e130e4c5d..b548303096bd 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments09_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments09_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "_arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -81,8 +80,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -108,7 +107,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments10/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments10/input.ts.json index 85c0b584bdcc..7e7f84bcbbd2 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments10/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments10/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "_arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -101,8 +100,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -128,7 +127,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments10_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments10_ES6/input.ts.json index 85c0b584bdcc..7e7f84bcbbd2 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments10_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments10_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "_arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -101,8 +100,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -128,7 +127,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments11/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments11/input.ts.json index 076419657faa..f31c5d92bbac 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments11/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments11/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -81,8 +80,8 @@ "ctxt": 0 }, "value": "_arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -122,8 +121,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -149,7 +148,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments11_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments11_ES6/input.ts.json index 076419657faa..f31c5d92bbac 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments11_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments11_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -81,8 +80,8 @@ "ctxt": 0 }, "value": "_arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -122,8 +121,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -149,7 +148,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments13/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments13/input.ts.json index 5a46370860e2..ad34960b7305 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments13/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments13/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "_arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -101,8 +100,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -120,8 +119,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -140,7 +139,6 @@ "ctxt": 0 }, "value": "_arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments13_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments13_ES6/input.ts.json index 5a46370860e2..ad34960b7305 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments13_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments13_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "_arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -101,8 +100,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -120,8 +119,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -140,7 +139,6 @@ "ctxt": 0 }, "value": "_arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments14/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments14/input.ts.json index 4b72e35b79c7..149de8633723 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments14/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments14/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -75,7 +73,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -116,8 +113,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -155,7 +152,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments14_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments14_ES6/input.ts.json index 043090d8f00d..7c71ba4a7e07 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments14_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments14_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -75,7 +73,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -116,8 +113,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -155,7 +152,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments15/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments15/input.ts.json index 35cf2b7ac7cb..02dcefbab54c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments15/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments15/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -110,7 +109,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -121,7 +119,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -162,8 +159,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -201,7 +198,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments15_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments15_ES6/input.ts.json index 35cf2b7ac7cb..02dcefbab54c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments15_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments15_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -110,7 +109,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -121,7 +119,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -162,8 +159,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -201,7 +198,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments16/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments16/input.ts.json index 6b6ed7714a82..b1c6aa085941 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments16/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments16/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -110,7 +109,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -121,7 +119,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -167,7 +164,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "property": { @@ -216,8 +212,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments16_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments16_ES6/input.ts.json index 6b6ed7714a82..b1c6aa085941 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments16_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments16_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -110,7 +109,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -121,7 +119,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -167,7 +164,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "property": { @@ -216,8 +212,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments17/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments17/input.ts.json index 29a186a5cded..b1bdfe280b98 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments17/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments17/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -75,7 +74,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "value": null @@ -102,7 +100,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "value": { @@ -155,7 +152,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -166,7 +162,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -212,7 +207,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "property": { @@ -261,8 +255,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments17_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments17_ES6/input.ts.json index 29a186a5cded..b1bdfe280b98 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments17_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments17_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -75,7 +74,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "value": null @@ -102,7 +100,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "value": { @@ -155,7 +152,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -166,7 +162,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -212,7 +207,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "property": { @@ -261,8 +255,8 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments18/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments18/input.ts.json index 8c7c292beceb..a66581add8b7 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments18/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments18/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +69,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "value": { @@ -81,8 +79,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -105,7 +103,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false } ] @@ -143,7 +140,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -154,7 +150,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -193,7 +188,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments18_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments18_ES6/input.ts.json index 8c7c292beceb..a66581add8b7 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments18_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments18_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +69,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "value": { @@ -81,8 +79,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -105,7 +103,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false } ] @@ -143,7 +140,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -154,7 +150,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -193,7 +188,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments19/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments19/input.ts.json index 24e0fa4b01a3..9b08da22fbeb 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments19/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments19/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -45,7 +44,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -89,8 +87,8 @@ "ctxt": 0 }, "value": "_arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -115,7 +113,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -159,8 +156,8 @@ "ctxt": 0 }, "value": "capture", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -178,7 +175,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, @@ -212,7 +208,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -226,7 +221,6 @@ "ctxt": 0 }, "value": "_arguments", - "typeAnnotation": null, "optional": false } } @@ -258,7 +252,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -279,6 +272,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -295,8 +289,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments19_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments19_ES6/input.ts.json index 24e0fa4b01a3..9b08da22fbeb 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments19_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionWhenUsingArguments19_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -45,7 +44,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -89,8 +87,8 @@ "ctxt": 0 }, "value": "_arguments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -115,7 +113,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -159,8 +156,8 @@ "ctxt": 0 }, "value": "capture", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -178,7 +175,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "async": false, @@ -212,7 +208,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -226,7 +221,6 @@ "ctxt": 0 }, "value": "_arguments", - "typeAnnotation": null, "optional": false } } @@ -258,7 +252,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -279,6 +272,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -295,8 +289,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionsAsIs/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionsAsIs/input.ts.json index 3501dc1c68f2..85975032236e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionsAsIs/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionsAsIs/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "arrow1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -97,8 +97,8 @@ "ctxt": 0 }, "value": "arrow2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -116,8 +116,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -163,8 +163,8 @@ "ctxt": 0 }, "value": "arrow3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -182,8 +182,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -193,8 +193,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionsAsIsES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionsAsIsES6/input.ts.json index fe15059fbe5b..6343b0c6880d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionsAsIsES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/arrowFunction/emitArrowFunctionsAsIsES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "arrow1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -97,8 +97,8 @@ "ctxt": 0 }, "value": "arrow2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -116,8 +116,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -163,8 +163,8 @@ "ctxt": 0 }, "value": "arrow3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -182,8 +182,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -193,8 +193,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/binaryAndOctalIntegerLiteral/binaryIntegerLiteral/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/binaryAndOctalIntegerLiteral/binaryIntegerLiteral/input.ts.json index 4bed388eddfb..41690e532ad4 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/binaryAndOctalIntegerLiteral/binaryIntegerLiteral/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/binaryAndOctalIntegerLiteral/binaryIntegerLiteral/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "bin1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "bin2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -113,8 +113,8 @@ "ctxt": 0 }, "value": "bin3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -154,8 +154,8 @@ "ctxt": 0 }, "value": "bin4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -195,8 +195,8 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -242,7 +242,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -253,7 +252,6 @@ "ctxt": 0 }, "value": "bin1", - "typeAnnotation": null, "optional": false } }, @@ -265,7 +263,6 @@ "ctxt": 0 }, "value": "bin1", - "typeAnnotation": null, "optional": false }, { @@ -278,7 +275,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -343,8 +339,8 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -390,7 +386,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -401,7 +396,6 @@ "ctxt": 0 }, "value": "bin2", - "typeAnnotation": null, "optional": false } }, @@ -413,7 +407,6 @@ "ctxt": 0 }, "value": "bin2", - "typeAnnotation": null, "optional": false }, { @@ -426,7 +419,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -488,7 +480,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -525,7 +516,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -562,7 +552,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -604,7 +593,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -646,7 +634,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -688,7 +675,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -730,7 +716,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -772,7 +757,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -814,7 +798,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -851,7 +834,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -888,7 +870,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -930,7 +911,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -972,7 +952,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1014,7 +993,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1056,7 +1034,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1098,7 +1075,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1135,7 +1111,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1177,7 +1152,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/binaryAndOctalIntegerLiteral/binaryIntegerLiteralES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/binaryAndOctalIntegerLiteral/binaryIntegerLiteralES6/input.ts.json index b95657b98e36..cac5797ec12c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/binaryAndOctalIntegerLiteral/binaryIntegerLiteralES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/binaryAndOctalIntegerLiteral/binaryIntegerLiteralES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "bin1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "bin2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -113,8 +113,8 @@ "ctxt": 0 }, "value": "bin3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -154,8 +154,8 @@ "ctxt": 0 }, "value": "bin4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -195,8 +195,8 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -242,7 +242,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -253,7 +252,6 @@ "ctxt": 0 }, "value": "bin1", - "typeAnnotation": null, "optional": false } }, @@ -265,7 +263,6 @@ "ctxt": 0 }, "value": "bin1", - "typeAnnotation": null, "optional": false }, { @@ -278,7 +275,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -343,8 +339,8 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -390,7 +386,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -401,7 +396,6 @@ "ctxt": 0 }, "value": "bin2", - "typeAnnotation": null, "optional": false } }, @@ -413,7 +407,6 @@ "ctxt": 0 }, "value": "bin2", - "typeAnnotation": null, "optional": false }, { @@ -426,7 +419,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -488,7 +480,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -525,7 +516,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -562,7 +552,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -604,7 +593,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -646,7 +634,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -688,7 +675,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -730,7 +716,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -772,7 +757,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -814,7 +798,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -851,7 +834,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -888,7 +870,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -930,7 +911,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -972,7 +952,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1014,7 +993,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1056,7 +1034,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1098,7 +1075,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1135,7 +1111,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1177,7 +1152,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/binaryAndOctalIntegerLiteral/octalIntegerLiteral/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/binaryAndOctalIntegerLiteral/octalIntegerLiteral/input.ts.json index 6106f61df027..9ac7e885e998 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/binaryAndOctalIntegerLiteral/octalIntegerLiteral/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/binaryAndOctalIntegerLiteral/octalIntegerLiteral/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "oct1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "oct2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -113,8 +113,8 @@ "ctxt": 0 }, "value": "oct3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -154,8 +154,8 @@ "ctxt": 0 }, "value": "oct4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -195,8 +195,8 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -242,7 +242,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -265,7 +264,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -276,7 +274,6 @@ "ctxt": 0 }, "value": "oct1", - "typeAnnotation": null, "optional": false } }, @@ -288,7 +285,6 @@ "ctxt": 0 }, "value": "oct1", - "typeAnnotation": null, "optional": false }, { @@ -343,8 +339,8 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -390,7 +386,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -413,7 +408,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -424,7 +418,6 @@ "ctxt": 0 }, "value": "oct2", - "typeAnnotation": null, "optional": false } }, @@ -436,7 +429,6 @@ "ctxt": 0 }, "value": "oct2", - "typeAnnotation": null, "optional": false }, { @@ -488,7 +480,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -525,7 +516,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -567,7 +557,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -609,7 +598,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -646,7 +634,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -688,7 +675,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -730,7 +716,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -772,7 +757,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -814,7 +798,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -851,7 +834,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -893,7 +875,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -935,7 +916,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -972,7 +952,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1014,7 +993,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1056,7 +1034,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1098,7 +1075,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1135,7 +1111,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1177,7 +1152,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/binaryAndOctalIntegerLiteral/octalIntegerLiteralES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/binaryAndOctalIntegerLiteral/octalIntegerLiteralES6/input.ts.json index 6106f61df027..9ac7e885e998 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/binaryAndOctalIntegerLiteral/octalIntegerLiteralES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/binaryAndOctalIntegerLiteral/octalIntegerLiteralES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "oct1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "oct2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -113,8 +113,8 @@ "ctxt": 0 }, "value": "oct3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -154,8 +154,8 @@ "ctxt": 0 }, "value": "oct4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -195,8 +195,8 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -242,7 +242,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -265,7 +264,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -276,7 +274,6 @@ "ctxt": 0 }, "value": "oct1", - "typeAnnotation": null, "optional": false } }, @@ -288,7 +285,6 @@ "ctxt": 0 }, "value": "oct1", - "typeAnnotation": null, "optional": false }, { @@ -343,8 +339,8 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -390,7 +386,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -413,7 +408,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -424,7 +418,6 @@ "ctxt": 0 }, "value": "oct2", - "typeAnnotation": null, "optional": false } }, @@ -436,7 +429,6 @@ "ctxt": 0 }, "value": "oct2", - "typeAnnotation": null, "optional": false }, { @@ -488,7 +480,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -525,7 +516,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -567,7 +557,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -609,7 +598,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -646,7 +634,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -688,7 +675,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -730,7 +716,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -772,7 +757,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -814,7 +798,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -851,7 +834,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -893,7 +875,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -935,7 +916,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -972,7 +952,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1014,7 +993,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1056,7 +1034,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1098,7 +1075,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1135,7 +1111,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1177,7 +1152,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/classWithSemicolonClassElementES61/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/classWithSemicolonClassElementES61/input.ts.json index 7d0bdd9365d5..0a07b96aaa5d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/classWithSemicolonClassElementES61/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/classWithSemicolonClassElementES61/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/classWithSemicolonClassElementES62/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/classWithSemicolonClassElementES62/input.ts.json index 5833180ea848..0323d77c678f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/classWithSemicolonClassElementES62/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/classWithSemicolonClassElementES62/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationOverloadInES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationOverloadInES6/input.ts.json index d35204343e41..e5e6fc26314e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationOverloadInES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationOverloadInES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -78,8 +77,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -102,7 +100,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -122,6 +119,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -138,8 +136,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -172,7 +169,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -198,7 +194,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -218,6 +213,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -234,8 +230,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -258,7 +253,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -278,6 +272,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -294,8 +289,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -321,8 +315,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithConstructorInES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithConstructorInES6/input.ts.json index ace5e06db66f..700432fee02e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithConstructorInES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithConstructorInES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -108,6 +105,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -124,8 +122,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -156,7 +153,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -177,6 +173,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -193,8 +190,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -231,7 +227,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -279,7 +274,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -305,7 +299,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -351,7 +344,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -410,7 +402,6 @@ "ctxt": 0 }, "value": "_bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -456,7 +447,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -476,6 +466,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -492,8 +483,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -519,8 +509,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -567,8 +557,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -620,7 +610,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -656,7 +645,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -689,8 +677,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -745,7 +733,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -766,6 +753,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -782,8 +770,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -802,6 +789,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -818,8 +806,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -867,7 +854,6 @@ "ctxt": 0 }, "value": "_bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithExtensionAndTypeArgumentInES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithExtensionAndTypeArgumentInES6/input.ts.json index 9e926aedfdad..447d068ea76a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithExtensionAndTypeArgumentInES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithExtensionAndTypeArgumentInES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,13 +83,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -132,7 +129,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -153,7 +149,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -172,7 +167,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -208,7 +202,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -234,7 +227,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -254,6 +246,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -270,8 +263,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -294,7 +286,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -314,6 +305,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -330,8 +322,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -376,7 +367,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -398,7 +388,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithExtensionInES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithExtensionInES6/input.ts.json index 1809ffd63a90..11ebfd8d9ba2 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithExtensionInES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithExtensionInES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -79,8 +78,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -106,8 +104,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -165,7 +163,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -191,7 +188,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -237,7 +233,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -258,6 +253,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -274,8 +270,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -294,6 +289,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -310,8 +306,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -366,7 +361,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -382,7 +376,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -396,7 +389,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -426,7 +418,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -444,7 +435,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -470,7 +460,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -528,7 +517,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -584,7 +572,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -621,7 +608,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -677,7 +663,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -738,7 +723,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithGetterSetterInES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithGetterSetterInES6/input.ts.json index 078eab5b6551..1585c3e6c349 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithGetterSetterInES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithGetterSetterInES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "_name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "function": { @@ -137,7 +134,6 @@ "ctxt": 0 }, "value": "_name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -187,7 +183,6 @@ "ctxt": 0 }, "value": "name2", - "typeAnnotation": null, "optional": false }, "function": { @@ -544,6 +539,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -560,8 +556,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -638,6 +633,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -654,8 +650,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -700,7 +695,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -721,6 +715,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -737,8 +732,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -783,7 +777,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -804,6 +797,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -820,8 +814,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -898,6 +891,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -914,8 +908,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithLiteralPropertyNameInES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithLiteralPropertyNameInES6/input.ts.json index 41bed9262ae9..1d8f343118fb 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithLiteralPropertyNameInES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithLiteralPropertyNameInES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -343,7 +342,6 @@ "ctxt": 0 }, "value": "interface", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithMethodInES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithMethodInES6/input.ts.json index 8e8d7459d881..4fbc6f03f47f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithMethodInES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithMethodInES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "_bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -223,6 +220,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -239,8 +237,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -317,6 +314,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -333,8 +331,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -413,7 +410,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -462,7 +458,6 @@ "ctxt": 0 }, "value": "_bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -512,7 +507,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -533,6 +527,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -549,8 +544,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -569,6 +563,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -585,8 +580,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -759,6 +753,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -775,8 +770,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -853,6 +847,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -869,8 +864,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -949,7 +943,6 @@ "ctxt": 0 }, "value": "staticMethod", - "typeAnnotation": null, "optional": false }, "function": { @@ -993,8 +986,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1042,7 +1035,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1074,7 +1066,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -1095,6 +1086,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1111,8 +1103,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1157,7 +1148,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -1178,6 +1168,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1194,8 +1185,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithPropertyAccessInHeritageClause1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithPropertyAccessInHeritageClause1/input.ts.json index 3df416877836..57c04f509e11 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithPropertyAccessInHeritageClause1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithPropertyAccessInHeritageClause1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -87,7 +85,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "value": { @@ -98,7 +95,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } } @@ -122,7 +118,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -162,7 +157,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -177,7 +171,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithPropertyAssignmentInES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithPropertyAssignmentInES6/input.ts.json index 44822b6a5f8e..d2c71c9993a3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithPropertyAssignmentInES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithPropertyAssignmentInES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -103,7 +101,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -129,7 +126,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -188,7 +184,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -234,7 +229,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -284,7 +278,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -322,7 +315,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -348,7 +340,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -396,7 +387,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -414,7 +404,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -440,7 +429,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -494,7 +482,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "value": null, @@ -540,7 +527,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -616,7 +602,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "computed": false @@ -651,7 +636,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithStaticPropertyAssignmentInES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithStaticPropertyAssignmentInES6/input.ts.json index 50a451001c45..8e0c1704a3f1 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithStaticPropertyAssignmentInES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithStaticPropertyAssignmentInES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -103,7 +101,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -129,7 +126,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -167,7 +163,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithSuperMethodCall01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithSuperMethodCall01/input.ts.json index f993c83706fd..4c36f67e1613 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithSuperMethodCall01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithSuperMethodCall01/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Parent", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -160,8 +156,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -201,7 +197,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -240,7 +235,6 @@ "ctxt": 0 }, "value": "Parent", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithThisKeywordInES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithThisKeywordInES6/input.ts.json index b83bad27b610..a61ff59e4205 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithThisKeywordInES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithThisKeywordInES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -130,7 +127,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -166,7 +162,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "function": { @@ -187,6 +182,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -203,8 +199,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -249,7 +244,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -297,7 +291,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "property": { @@ -308,7 +301,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -339,7 +331,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -377,7 +368,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "function": { @@ -426,7 +416,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -460,7 +449,6 @@ "ctxt": 0 }, "value": "bX", - "typeAnnotation": null, "optional": false }, "function": { @@ -481,6 +469,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -497,8 +486,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -554,7 +542,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -567,7 +554,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithTypeArgumentAndOverloadInES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithTypeArgumentAndOverloadInES6/input.ts.json index 2233e7209d27..1cc58c3eb9af 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithTypeArgumentAndOverloadInES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithTypeArgumentAndOverloadInES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -99,7 +96,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "value": null, @@ -125,7 +121,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -156,7 +151,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -176,6 +170,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -192,8 +187,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -216,7 +210,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -236,6 +229,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -252,8 +246,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -272,6 +265,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -294,13 +288,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -323,7 +315,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -343,6 +334,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -365,13 +357,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -421,7 +411,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -434,7 +423,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -459,7 +447,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -480,6 +467,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -502,13 +490,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -545,7 +531,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -566,6 +551,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -582,8 +568,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -620,7 +605,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -641,6 +625,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -657,8 +642,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -695,7 +679,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -744,7 +727,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -777,7 +759,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -805,7 +786,6 @@ "ctxt": 0 }, "value": "BB", - "typeAnnotation": null, "optional": false }, "function": { @@ -854,7 +834,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -887,7 +866,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -915,7 +893,6 @@ "ctxt": 0 }, "value": "BBWith", - "typeAnnotation": null, "optional": false }, "function": { @@ -936,6 +913,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -958,13 +936,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1020,7 +996,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1033,7 +1008,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1077,7 +1051,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithTypeArgumentInES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithTypeArgumentInES6/input.ts.json index 946300ca1739..cac9bd370907 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithTypeArgumentInES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/emitClassDeclarationWithTypeArgumentInES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -99,7 +96,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "value": null, @@ -125,7 +121,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -156,7 +151,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -176,6 +170,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -198,13 +193,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -254,7 +247,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -267,7 +259,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -292,7 +283,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -341,7 +331,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -374,7 +363,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -402,7 +390,6 @@ "ctxt": 0 }, "value": "BB", - "typeAnnotation": null, "optional": false }, "function": { @@ -451,7 +438,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -484,7 +470,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -512,7 +497,6 @@ "ctxt": 0 }, "value": "BBWith", - "typeAnnotation": null, "optional": false }, "function": { @@ -533,6 +517,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -555,13 +540,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -617,7 +600,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -630,7 +612,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -674,7 +655,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/exportDefaultClassWithStaticPropertyAssignmentsInES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/exportDefaultClassWithStaticPropertyAssignmentsInES6/input.ts.json index f4ad1e3d6630..7e44311d048c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/exportDefaultClassWithStaticPropertyAssignmentsInES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/exportDefaultClassWithStaticPropertyAssignmentsInES6/input.ts.json @@ -38,7 +38,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/superCallBeforeThisAccessing1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/superCallBeforeThisAccessing1/input.ts.json index 5bca0e9fbb18..e62bee25eb8f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/superCallBeforeThisAccessing1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/superCallBeforeThisAccessing1/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "Factory", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -65,7 +65,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -91,7 +90,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -111,8 +109,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -145,7 +143,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -171,7 +168,6 @@ "ctxt": 0 }, "value": "_t", - "typeAnnotation": null, "optional": false }, "value": null, @@ -201,7 +197,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -246,7 +241,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -279,8 +273,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -300,7 +294,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "value": { @@ -326,7 +319,6 @@ "ctxt": 0 }, "value": "_t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -363,8 +355,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -388,7 +380,6 @@ "ctxt": 0 }, "value": "Factory", - "typeAnnotation": null, "optional": false }, "property": { @@ -399,7 +390,6 @@ "ctxt": 0 }, "value": "create", - "typeAnnotation": null, "optional": false }, "computed": false @@ -415,7 +405,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -440,7 +429,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/superCallBeforeThisAccessing2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/superCallBeforeThisAccessing2/input.ts.json index 18a9e8561ae3..87955a861094 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/superCallBeforeThisAccessing2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/superCallBeforeThisAccessing2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,8 +60,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -122,7 +119,6 @@ "ctxt": 0 }, "value": "_t", - "typeAnnotation": null, "optional": false }, "value": null, @@ -152,7 +148,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -235,7 +230,6 @@ "ctxt": 0 }, "value": "_t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -267,7 +261,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/superCallBeforeThisAccessing5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/superCallBeforeThisAccessing5/input.ts.json index 0ffe2d4e87a4..6e8bd009c5f3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/superCallBeforeThisAccessing5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/superCallBeforeThisAccessing5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "_t", - "typeAnnotation": null, "optional": false }, "value": null, @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -114,7 +111,6 @@ "ctxt": 0 }, "value": "_t", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/superCallBeforeThisAccessing8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/superCallBeforeThisAccessing8/input.ts.json index 4c7ac33513b2..e358cdb9e30b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/superCallBeforeThisAccessing8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/superCallBeforeThisAccessing8/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,8 +60,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -122,7 +119,6 @@ "ctxt": 0 }, "value": "_t", - "typeAnnotation": null, "optional": false }, "value": null, @@ -152,7 +148,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -189,8 +184,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -210,7 +205,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "value": { @@ -239,7 +233,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -257,7 +250,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "value": { @@ -283,7 +275,6 @@ "ctxt": 0 }, "value": "_t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -309,7 +300,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/superCallFromClassThatHasNoBaseTypeButWithSameSymbolInterface/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/superCallFromClassThatHasNoBaseTypeButWithSameSymbolInterface/input.ts.json index 8b204855d91e..802a6d91477c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/superCallFromClassThatHasNoBaseTypeButWithSameSymbolInterface/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classDeclaration/superCallFromClassThatHasNoBaseTypeButWithSameSymbolInterface/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -112,7 +109,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classExpressions/classExpressionES61/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classExpressions/classExpressionES61/input.ts.json index 99662ef91f2a..4280d639786e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classExpressions/classExpressionES61/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classExpressions/classExpressionES61/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ClassExpression", @@ -44,7 +44,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classExpressions/classExpressionES62/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classExpressions/classExpressionES62/input.ts.json index e3c24bacb17f..efb47769fee1 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classExpressions/classExpressionES62/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classExpressions/classExpressionES62/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,8 +57,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ClassExpression", @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "span": { @@ -89,7 +87,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classExpressions/classExpressionES63/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classExpressions/classExpressionES63/input.ts.json index bd9be92cedd2..f767eb0764c3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classExpressions/classExpressionES63/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classExpressions/classExpressionES63/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ClassExpression", @@ -59,7 +59,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -108,7 +107,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -157,7 +155,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -226,8 +223,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -244,7 +241,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -276,7 +272,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -287,7 +282,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -315,7 +309,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -326,7 +319,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -354,7 +346,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -365,7 +356,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classExpressions/typeArgumentInferenceWithClassExpression1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classExpressions/typeArgumentInferenceWithClassExpression1/input.ts.json index 84ef0a820a44..9ed26d835df6 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classExpressions/typeArgumentInferenceWithClassExpression1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classExpressions/typeArgumentInferenceWithClassExpression1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -44,8 +43,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ClassExpression", @@ -72,7 +71,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": null, @@ -98,7 +96,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -154,7 +151,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -185,7 +181,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -215,7 +210,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -251,7 +245,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -282,7 +275,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": { @@ -329,7 +321,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classExpressions/typeArgumentInferenceWithClassExpression2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classExpressions/typeArgumentInferenceWithClassExpression2/input.ts.json index 8cef45c1763f..8c8969154019 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classExpressions/typeArgumentInferenceWithClassExpression2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classExpressions/typeArgumentInferenceWithClassExpression2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -44,8 +43,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ClassExpression", @@ -72,7 +71,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": null, @@ -98,7 +96,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -154,7 +151,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -185,7 +181,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -215,7 +210,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -251,7 +245,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -282,7 +275,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": { @@ -329,7 +321,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/classExpressions/typeArgumentInferenceWithClassExpression3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/classExpressions/typeArgumentInferenceWithClassExpression3/input.ts.json index 1743fd22c82e..e5a94d9c2274 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/classExpressions/typeArgumentInferenceWithClassExpression3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/classExpressions/typeArgumentInferenceWithClassExpression3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -44,8 +43,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ClassExpression", @@ -72,7 +71,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": null, @@ -98,7 +96,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -154,7 +151,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -185,7 +181,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -215,7 +210,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -251,7 +245,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -282,7 +275,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": { @@ -329,7 +321,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames10_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames10_ES5/input.ts.json index 423405bac2dc..62b64a1ea502 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames10_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames10_ES5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,8 +178,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -206,7 +206,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -248,7 +247,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } }, @@ -298,7 +296,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -309,7 +306,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -360,7 +356,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -371,7 +366,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -422,7 +416,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -550,7 +543,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -736,7 +728,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames10_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames10_ES6/input.ts.json index 423405bac2dc..62b64a1ea502 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames10_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames10_ES6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,8 +178,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -206,7 +206,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -248,7 +247,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } }, @@ -298,7 +296,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -309,7 +306,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -360,7 +356,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -371,7 +366,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -422,7 +416,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -550,7 +543,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -736,7 +728,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames11_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames11_ES5/input.ts.json index 806ebb865175..ecce8b448f89 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames11_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames11_ES5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,8 +178,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -211,7 +211,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -266,7 +265,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } }, @@ -278,8 +276,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -321,7 +319,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -332,7 +329,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -396,7 +392,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -407,7 +402,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -420,8 +414,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -463,7 +457,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -534,8 +527,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -622,7 +615,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -634,8 +626,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -788,8 +780,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -831,7 +823,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames11_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames11_ES6/input.ts.json index 806ebb865175..ecce8b448f89 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames11_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames11_ES6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,8 +178,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -211,7 +211,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -266,7 +265,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } }, @@ -278,8 +276,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -321,7 +319,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -332,7 +329,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -396,7 +392,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -407,7 +402,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -420,8 +414,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -463,7 +457,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -534,8 +527,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -622,7 +615,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -634,8 +626,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -788,8 +780,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -831,7 +823,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames13_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames13_ES5/input.ts.json index d6c37ab30237..9777ad7deb16 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames13_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames13_ES5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -163,7 +163,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -196,7 +195,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -250,7 +248,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } }, @@ -312,7 +309,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -323,7 +319,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -386,7 +381,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -397,7 +391,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -460,7 +453,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -624,7 +616,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -846,7 +837,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames13_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames13_ES6/input.ts.json index d6c37ab30237..9777ad7deb16 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames13_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames13_ES6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -163,7 +163,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -196,7 +195,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -250,7 +248,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } }, @@ -312,7 +309,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -323,7 +319,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -386,7 +381,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -397,7 +391,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -460,7 +453,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -624,7 +616,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -846,7 +837,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames14_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames14_ES5/input.ts.json index eb0d2a33b1e5..1cc51e61ad3e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames14_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames14_ES5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -65,7 +65,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -98,7 +97,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -308,7 +306,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames14_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames14_ES6/input.ts.json index eb0d2a33b1e5..1cc51e61ad3e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames14_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames14_ES6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -65,7 +65,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -98,7 +97,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -308,7 +306,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames15_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames15_ES5/input.ts.json index 12ffe811a788..b4c404406362 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames15_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames15_ES5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -99,6 +99,7 @@ "ctxt": 0 }, "value": "p2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -142,8 +143,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -175,6 +175,7 @@ "ctxt": 0 }, "value": "p3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -210,8 +211,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -228,7 +228,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -261,7 +260,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false } }, @@ -315,7 +313,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false } }, @@ -369,7 +366,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames15_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames15_ES6/input.ts.json index 12ffe811a788..b4c404406362 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames15_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames15_ES6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -99,6 +99,7 @@ "ctxt": 0 }, "value": "p2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -142,8 +143,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -175,6 +175,7 @@ "ctxt": 0 }, "value": "p3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -210,8 +211,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -228,7 +228,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -261,7 +260,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false } }, @@ -315,7 +313,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false } }, @@ -369,7 +366,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames16_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames16_ES5/input.ts.json index 16fcfe5d84ee..87053c97a19b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames16_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames16_ES5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -163,7 +163,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -196,7 +195,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -268,7 +266,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } }, @@ -290,8 +287,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -351,7 +348,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -362,7 +358,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -443,7 +438,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -454,7 +448,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -477,8 +470,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -538,7 +531,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -636,8 +628,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -759,7 +751,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -781,8 +772,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -980,8 +971,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1041,7 +1032,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames16_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames16_ES6/input.ts.json index 16fcfe5d84ee..87053c97a19b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames16_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames16_ES6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -163,7 +163,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -196,7 +195,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -268,7 +266,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } }, @@ -290,8 +287,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -351,7 +348,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -362,7 +358,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -443,7 +438,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -454,7 +448,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -477,8 +470,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -538,7 +531,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -636,8 +628,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -759,7 +751,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -781,8 +772,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -980,8 +971,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1041,7 +1032,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames17_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames17_ES5/input.ts.json index 5fbc557d355a..6f6a6b58ade5 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames17_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames17_ES5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -65,7 +65,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -98,7 +97,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -190,8 +188,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -333,8 +331,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -386,7 +384,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -477,8 +474,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames17_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames17_ES6/input.ts.json index 5fbc557d355a..6f6a6b58ade5 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames17_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames17_ES6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -65,7 +65,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -98,7 +97,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -190,8 +188,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -333,8 +331,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -386,7 +384,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -477,8 +474,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames18_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames18_ES5/input.ts.json index ca6237504ab7..b2fc93ac21f7 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames18_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames18_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -103,7 +102,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames18_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames18_ES6/input.ts.json index ca6237504ab7..b2fc93ac21f7 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames18_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames18_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -103,7 +102,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames19_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames19_ES5/input.ts.json index b7cd52635cdc..a036c39e2a3f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames19_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames19_ES5/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -59,8 +58,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -102,7 +101,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames19_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames19_ES6/input.ts.json index b7cd52635cdc..a036c39e2a3f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames19_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames19_ES6/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -59,8 +58,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -102,7 +101,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames1_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames1_ES5/input.ts.json index 80acee7dae0f..f16587599731 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames1_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames1_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -163,6 +163,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -179,8 +180,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "body": { "type": "BlockStatement", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames1_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames1_ES6/input.ts.json index 80acee7dae0f..f16587599731 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames1_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames1_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -163,6 +163,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -179,8 +180,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "body": { "type": "BlockStatement", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames20_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames20_ES5/input.ts.json index ab571a4b4104..38b6b855cc94 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames20_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames20_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -74,7 +74,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames20_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames20_ES6/input.ts.json index ab571a4b4104..38b6b855cc94 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames20_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames20_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -74,7 +74,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames21_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames21_ES5/input.ts.json index f1e5ffef7211..fcfec6aa2aca 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames21_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames21_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -135,7 +133,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames21_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames21_ES6/input.ts.json index f1e5ffef7211..fcfec6aa2aca 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames21_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames21_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -135,7 +133,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames22_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames22_ES5/input.ts.json index bddcf130bca2..4f0609c7f284 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames22_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames22_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,8 +84,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -136,7 +134,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames22_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames22_ES6/input.ts.json index bddcf130bca2..4f0609c7f284 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames22_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames22_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,8 +84,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -136,7 +134,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames23_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames23_ES5/input.ts.json index af08acd628b1..49af21c8a041 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames23_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames23_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -159,7 +157,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames23_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames23_ES6/input.ts.json index af08acd628b1..49af21c8a041 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames23_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames23_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -159,7 +157,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames24_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames24_ES5/input.ts.json index 96fabe0bcb95..dca8764dbdf9 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames24_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames24_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -163,7 +160,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -209,7 +205,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames24_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames24_ES6/input.ts.json index cb6455133cf8..5ce9dbeafdf2 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames24_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames24_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -163,7 +160,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -209,7 +205,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames25_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames25_ES5/input.ts.json index c382866318b1..0a68ca7d41c0 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames25_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames25_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -178,8 +174,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -228,7 +224,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -303,7 +298,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames25_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames25_ES6/input.ts.json index c382866318b1..0a68ca7d41c0 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames25_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames25_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -178,8 +174,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -228,7 +224,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -303,7 +298,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames26_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames26_ES5/input.ts.json index 290ec9833fb5..969b44f982b5 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames26_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames26_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -187,7 +184,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -257,7 +253,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames26_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames26_ES6/input.ts.json index 953b452a1790..4b8f4254f01e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames26_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames26_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -187,7 +184,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -257,7 +253,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames27_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames27_ES5/input.ts.json index 211bfb87561d..372e47e29a1b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames27_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames27_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -156,7 +154,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames27_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames27_ES6/input.ts.json index 211bfb87561d..372e47e29a1b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames27_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames27_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -156,7 +154,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames28_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames28_ES5/input.ts.json index 9a26edef5fef..4c27b59cf6ec 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames28_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames28_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -132,8 +129,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -244,7 +241,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames28_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames28_ES6/input.ts.json index 9a26edef5fef..4c27b59cf6ec 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames28_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames28_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -132,8 +129,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -244,7 +241,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames29_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames29_ES5/input.ts.json index 513184dbbb1b..1b73d2deee0d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames29_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames29_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -109,8 +107,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -159,7 +157,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames29_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames29_ES6/input.ts.json index 513184dbbb1b..1b73d2deee0d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames29_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames29_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -109,8 +107,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -159,7 +157,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames2_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames2_ES5/input.ts.json index ad518c560af7..89d4cb238526 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames2_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames2_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "methodName", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -77,8 +77,8 @@ "ctxt": 0 }, "value": "accessorName", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -108,7 +108,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -141,7 +140,6 @@ "ctxt": 0 }, "value": "methodName", - "typeAnnotation": null, "optional": false } }, @@ -195,7 +193,6 @@ "ctxt": 0 }, "value": "methodName", - "typeAnnotation": null, "optional": false } }, @@ -249,7 +246,6 @@ "ctxt": 0 }, "value": "accessorName", - "typeAnnotation": null, "optional": false } }, @@ -303,7 +299,6 @@ "ctxt": 0 }, "value": "accessorName", - "typeAnnotation": null, "optional": false } }, @@ -325,8 +320,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -378,7 +373,6 @@ "ctxt": 0 }, "value": "accessorName", - "typeAnnotation": null, "optional": false } }, @@ -432,7 +426,6 @@ "ctxt": 0 }, "value": "accessorName", - "typeAnnotation": null, "optional": false } }, @@ -454,8 +447,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames2_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames2_ES6/input.ts.json index ad518c560af7..89d4cb238526 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames2_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames2_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "methodName", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -77,8 +77,8 @@ "ctxt": 0 }, "value": "accessorName", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -108,7 +108,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -141,7 +140,6 @@ "ctxt": 0 }, "value": "methodName", - "typeAnnotation": null, "optional": false } }, @@ -195,7 +193,6 @@ "ctxt": 0 }, "value": "methodName", - "typeAnnotation": null, "optional": false } }, @@ -249,7 +246,6 @@ "ctxt": 0 }, "value": "accessorName", - "typeAnnotation": null, "optional": false } }, @@ -303,7 +299,6 @@ "ctxt": 0 }, "value": "accessorName", - "typeAnnotation": null, "optional": false } }, @@ -325,8 +320,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -378,7 +373,6 @@ "ctxt": 0 }, "value": "accessorName", - "typeAnnotation": null, "optional": false } }, @@ -432,7 +426,6 @@ "ctxt": 0 }, "value": "accessorName", - "typeAnnotation": null, "optional": false } }, @@ -454,8 +447,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames30_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames30_ES5/input.ts.json index 99166d3e5e6a..2cea4db01ae1 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames30_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames30_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -155,8 +152,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -275,7 +272,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames30_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames30_ES6/input.ts.json index 99166d3e5e6a..2cea4db01ae1 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames30_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames30_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -155,8 +152,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -275,7 +272,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames31_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames31_ES5/input.ts.json index a6f16241b3ac..eaaf346c483b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames31_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames31_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -201,8 +197,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -251,7 +247,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -334,7 +329,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames31_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames31_ES6/input.ts.json index a6f16241b3ac..eaaf346c483b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames31_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames31_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -201,8 +197,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -251,7 +247,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -334,7 +329,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames32_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames32_ES5/input.ts.json index 70491f9d56c7..dd83d9952aae 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames32_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames32_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -84,7 +83,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -130,7 +127,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -208,7 +204,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -235,7 +230,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -298,7 +292,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames32_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames32_ES6/input.ts.json index 70491f9d56c7..dd83d9952aae 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames32_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames32_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -84,7 +83,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -130,7 +127,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -208,7 +204,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -235,7 +230,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -298,7 +292,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames33_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames33_ES5/input.ts.json index 0b2b872a3cc7..848ebe6ed37c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames33_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames33_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -84,7 +83,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -130,7 +127,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -174,8 +170,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -209,7 +205,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -236,7 +231,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -328,7 +322,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames33_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames33_ES6/input.ts.json index 0b2b872a3cc7..848ebe6ed37c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames33_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames33_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -84,7 +83,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -130,7 +127,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -174,8 +170,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -209,7 +205,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -236,7 +231,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -328,7 +322,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames34_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames34_ES5/input.ts.json index d820554ca8b6..01c11affe59b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames34_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames34_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -84,7 +83,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -130,7 +127,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -174,8 +170,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -209,7 +205,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -236,7 +231,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -328,7 +322,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames34_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames34_ES6/input.ts.json index d820554ca8b6..01c11affe59b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames34_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames34_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -84,7 +83,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -130,7 +127,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -174,8 +170,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -209,7 +205,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -236,7 +231,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -328,7 +322,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames36_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames36_ES5/input.ts.json index 440e40251e7e..8295730c3264 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames36_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames36_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +157,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,6 +178,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -200,8 +195,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -226,7 +220,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -306,7 +299,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -373,6 +365,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -395,13 +388,11 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames36_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames36_ES6/input.ts.json index 440e40251e7e..8295730c3264 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames36_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames36_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +157,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,6 +178,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -200,8 +195,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -226,7 +220,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -306,7 +299,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -373,6 +365,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -395,13 +388,11 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames37_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames37_ES5/input.ts.json index ca181ab2bc4b..a609a9bdc83e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames37_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames37_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +157,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,6 +178,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -200,8 +195,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -226,7 +220,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -306,7 +299,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -373,6 +365,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -395,13 +388,11 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames37_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames37_ES6/input.ts.json index ca181ab2bc4b..a609a9bdc83e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames37_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames37_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +157,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,6 +178,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -200,8 +195,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -226,7 +220,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -306,7 +299,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -373,6 +365,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -395,13 +388,11 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames38_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames38_ES5/input.ts.json index f5c0e80d4587..a6108d7c60db 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames38_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames38_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +157,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,6 +178,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -200,8 +195,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -226,7 +220,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -319,7 +312,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -399,6 +391,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -421,13 +414,11 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames38_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames38_ES6/input.ts.json index f5c0e80d4587..a6108d7c60db 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames38_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames38_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +157,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,6 +178,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -200,8 +195,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -226,7 +220,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -319,7 +312,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -399,6 +391,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -421,13 +414,11 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames39_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames39_ES5/input.ts.json index a511088bcbd3..9ec5340485a7 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames39_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames39_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +157,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,6 +178,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -200,8 +195,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -226,7 +220,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -319,7 +312,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -399,6 +391,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -421,13 +414,11 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames39_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames39_ES6/input.ts.json index a511088bcbd3..9ec5340485a7 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames39_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames39_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +157,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,6 +178,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -200,8 +195,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -226,7 +220,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -319,7 +312,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -399,6 +391,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -421,13 +414,11 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames40_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames40_ES5/input.ts.json index 06b26dc4310b..3878a55d0e96 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames40_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames40_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +157,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,6 +178,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -200,8 +195,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -242,7 +236,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -324,7 +317,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -411,7 +403,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames40_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames40_ES6/input.ts.json index 06b26dc4310b..3878a55d0e96 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames40_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames40_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +157,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,6 +178,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -200,8 +195,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -242,7 +236,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -324,7 +317,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -411,7 +403,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames41_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames41_ES5/input.ts.json index 178ab6f7235b..9cf7682e5726 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames41_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames41_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +157,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,6 +178,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -200,8 +195,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -242,7 +236,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -324,7 +317,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames41_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames41_ES6/input.ts.json index 178ab6f7235b..9cf7682e5726 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames41_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames41_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +157,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,6 +178,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -200,8 +195,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -242,7 +236,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -324,7 +317,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames42_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames42_ES5/input.ts.json index cc056de6f596..ee9d02c95366 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames42_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames42_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +157,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,6 +178,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -200,8 +195,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -226,7 +220,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -283,7 +276,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames42_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames42_ES6/input.ts.json index cc056de6f596..ee9d02c95366 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames42_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames42_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +157,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,6 +178,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -200,8 +195,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -226,7 +220,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -283,7 +276,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames43_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames43_ES5/input.ts.json index 26fa626100fa..cee9a0532ef0 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames43_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames43_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +157,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,6 +178,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -200,8 +195,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -226,7 +220,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -256,7 +249,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -334,7 +326,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -401,6 +392,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -423,13 +415,11 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -468,7 +458,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames43_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames43_ES6/input.ts.json index 26fa626100fa..cee9a0532ef0 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames43_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames43_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +157,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,6 +178,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -200,8 +195,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -226,7 +220,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -256,7 +249,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -334,7 +326,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -401,6 +392,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -423,13 +415,11 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -468,7 +458,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames44_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames44_ES5/input.ts.json index 8541a3899122..d03e62cc5d36 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames44_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames44_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +157,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,6 +178,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -200,8 +195,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -226,7 +220,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -306,7 +299,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -343,7 +335,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -401,6 +392,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -423,13 +415,11 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -468,7 +458,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames44_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames44_ES6/input.ts.json index 8541a3899122..d03e62cc5d36 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames44_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames44_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +157,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,6 +178,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -200,8 +195,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -226,7 +220,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -306,7 +299,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -343,7 +335,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -401,6 +392,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -423,13 +415,11 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -468,7 +458,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames45_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames45_ES5/input.ts.json index 8b5b2d8b025a..4813a87c472e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames45_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames45_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +157,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -240,7 +234,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -277,7 +270,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -299,6 +291,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -315,8 +308,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -341,7 +333,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -401,6 +392,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -423,13 +415,11 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -468,7 +458,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames45_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames45_ES6/input.ts.json index 8b5b2d8b025a..4813a87c472e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames45_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames45_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +157,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -240,7 +234,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -277,7 +270,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -299,6 +291,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -315,8 +308,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -341,7 +333,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -401,6 +392,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -423,13 +415,11 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -468,7 +458,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames46_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames46_ES5/input.ts.json index 3b45f7351169..25d0b4c95275 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames46_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames46_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames46_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames46_ES6/input.ts.json index 3b45f7351169..25d0b4c95275 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames46_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames46_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames47_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames47_ES5/input.ts.json index 206a3d4db318..66747f1f65ef 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames47_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames47_ES5/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "init": null @@ -66,7 +64,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "members": [ @@ -85,7 +82,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "init": null @@ -117,8 +113,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -160,7 +156,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "property": { @@ -171,7 +166,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -191,7 +185,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "property": { @@ -202,7 +195,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames47_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames47_ES6/input.ts.json index 206a3d4db318..66747f1f65ef 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames47_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames47_ES6/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "init": null @@ -66,7 +64,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "members": [ @@ -85,7 +82,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "init": null @@ -117,8 +113,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -160,7 +156,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "property": { @@ -171,7 +166,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -191,7 +185,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "property": { @@ -202,7 +195,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames48_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames48_ES5/input.ts.json index 88eefe67d828..767f55b0fdfe 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames48_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames48_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "extractIndexer", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -63,6 +63,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -79,8 +80,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -105,7 +105,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -120,8 +119,7 @@ } ] } - }, - "optional": false + } } } ], @@ -157,7 +155,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -187,7 +184,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -211,7 +207,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -230,7 +225,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "init": null @@ -262,6 +256,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -278,8 +273,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -308,7 +302,6 @@ "ctxt": 0 }, "value": "extractIndexer", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -339,7 +332,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -387,7 +379,6 @@ "ctxt": 0 }, "value": "extractIndexer", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -425,7 +416,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -436,7 +426,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -486,7 +475,6 @@ "ctxt": 0 }, "value": "extractIndexer", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames48_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames48_ES6/input.ts.json index 88eefe67d828..767f55b0fdfe 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames48_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames48_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "extractIndexer", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -63,6 +63,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -79,8 +80,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -105,7 +105,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -120,8 +119,7 @@ } ] } - }, - "optional": false + } } } ], @@ -157,7 +155,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -187,7 +184,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -211,7 +207,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -230,7 +225,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "init": null @@ -262,6 +256,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -278,8 +273,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -308,7 +302,6 @@ "ctxt": 0 }, "value": "extractIndexer", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -339,7 +332,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -387,7 +379,6 @@ "ctxt": 0 }, "value": "extractIndexer", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -425,7 +416,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -436,7 +426,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -486,7 +475,6 @@ "ctxt": 0 }, "value": "extractIndexer", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames4_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames4_ES5/input.ts.json index bf27fde92f24..4c88e6914417 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames4_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames4_ES5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,8 +178,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -206,7 +206,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -237,7 +236,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } }, @@ -249,7 +247,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } }, @@ -278,7 +275,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -289,7 +285,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -329,7 +324,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -340,7 +334,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -380,7 +373,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -393,7 +385,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -477,7 +468,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -630,7 +620,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames4_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames4_ES6/input.ts.json index bf27fde92f24..4c88e6914417 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames4_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames4_ES6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,8 +178,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -206,7 +206,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -237,7 +236,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } }, @@ -249,7 +247,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } }, @@ -278,7 +275,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -289,7 +285,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -329,7 +324,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -340,7 +334,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -380,7 +373,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -393,7 +385,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -477,7 +468,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -630,7 +620,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames51_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames51_ES5/input.ts.json index 5e39f6b2bbae..9bd46e1b2b91 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames51_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames51_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,6 +59,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -82,13 +82,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -120,6 +118,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -142,13 +141,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -180,8 +177,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -208,7 +205,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -239,7 +235,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false } }, @@ -286,7 +281,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -307,7 +301,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -333,7 +326,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames51_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames51_ES6/input.ts.json index 71157433921a..33f5a0dd826f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames51_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames51_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,6 +59,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -82,13 +82,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -120,6 +118,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -142,13 +141,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -180,8 +177,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -208,7 +205,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -239,7 +235,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false } }, @@ -286,7 +281,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -307,7 +301,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -333,7 +326,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames5_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames5_ES5/input.ts.json index 231ea368d1cd..6c58980c87e3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames5_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames5_ES5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,8 +80,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -108,7 +108,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -226,7 +225,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -238,7 +236,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames5_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames5_ES6/input.ts.json index 231ea368d1cd..6c58980c87e3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames5_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames5_ES6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,8 +80,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -108,7 +108,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -226,7 +225,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -238,7 +236,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames6_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames6_ES5/input.ts.json index 381dc6f6dbcf..e1a4bcde8bfe 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames6_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames6_ES5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -99,6 +99,7 @@ "ctxt": 0 }, "value": "p2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -142,8 +143,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -175,6 +175,7 @@ "ctxt": 0 }, "value": "p3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -210,8 +211,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -243,8 +243,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -271,7 +271,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false } }, @@ -302,7 +301,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false } }, @@ -333,7 +331,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames6_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames6_ES6/input.ts.json index 381dc6f6dbcf..e1a4bcde8bfe 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames6_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames6_ES6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -99,6 +99,7 @@ "ctxt": 0 }, "value": "p2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -142,8 +143,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -175,6 +175,7 @@ "ctxt": 0 }, "value": "p3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -210,8 +211,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -243,8 +243,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -271,7 +271,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false } }, @@ -302,7 +301,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false } }, @@ -333,7 +331,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames7_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames7_ES5/input.ts.json index 6553ea6c69b6..c36c0f5a0ff9 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames7_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames7_ES5/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "init": null @@ -74,8 +72,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -109,7 +107,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -120,7 +117,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames7_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames7_ES6/input.ts.json index 6553ea6c69b6..c36c0f5a0ff9 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames7_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames7_ES6/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "init": null @@ -74,8 +72,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -109,7 +107,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -120,7 +117,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames8_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames8_ES5/input.ts.json index 637be14eee11..9fa3d82ffc37 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames8_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames8_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,6 +59,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -82,13 +82,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -120,6 +118,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -142,13 +141,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -180,8 +177,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -208,7 +205,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -239,7 +235,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -286,7 +281,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -307,7 +301,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames8_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames8_ES6/input.ts.json index 637be14eee11..9fa3d82ffc37 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames8_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames8_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,6 +59,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -82,13 +82,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -120,6 +118,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -142,13 +141,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -180,8 +177,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -208,7 +205,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -239,7 +235,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -286,7 +281,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -307,7 +301,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames9_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames9_ES5/input.ts.json index 57f4361397c0..ac2794e1256a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames9_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames9_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -96,7 +95,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -117,6 +115,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -133,8 +132,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -176,7 +174,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -197,6 +194,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -219,13 +217,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -261,7 +257,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -291,7 +286,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -308,7 +302,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -329,8 +322,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -395,8 +388,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -430,7 +423,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -489,7 +481,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -543,7 +534,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames9_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames9_ES6/input.ts.json index 57f4361397c0..ac2794e1256a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames9_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNames9_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -96,7 +95,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -117,6 +115,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -133,8 +132,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -176,7 +174,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -197,6 +194,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -219,13 +217,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -261,7 +257,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -291,7 +286,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -308,7 +302,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -329,8 +322,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -395,8 +388,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -430,7 +423,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -489,7 +481,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -543,7 +534,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType10_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType10_ES5/input.ts.json index 5dbc4160b706..27dc9489ca2a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType10_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType10_ES5/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -118,6 +117,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -140,13 +140,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType10_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType10_ES6/input.ts.json index 5dbc4160b706..27dc9489ca2a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType10_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType10_ES6/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -118,6 +117,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -140,13 +140,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType1_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType1_ES5/input.ts.json index a8113be03e28..d6eeefad26e5 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType1_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType1_ES5/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -89,6 +88,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -105,8 +105,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -147,6 +146,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -163,8 +163,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -190,6 +189,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -206,8 +206,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "typeParams": null, @@ -265,6 +264,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -287,13 +287,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -362,8 +360,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -403,7 +401,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -414,7 +411,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -485,8 +481,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -504,7 +500,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -515,7 +510,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType1_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType1_ES6/input.ts.json index a8113be03e28..d6eeefad26e5 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType1_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType1_ES6/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -89,6 +88,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -105,8 +105,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -147,6 +146,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -163,8 +163,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -190,6 +189,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -206,8 +206,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "typeParams": null, @@ -265,6 +264,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -287,13 +287,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -362,8 +360,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -403,7 +401,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -414,7 +411,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -485,8 +481,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -504,7 +500,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -515,7 +510,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType2_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType2_ES5/input.ts.json index 73557543b835..bf0f88980636 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType2_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType2_ES5/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -89,6 +88,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -105,8 +105,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "typeParams": null, @@ -147,6 +146,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -163,8 +163,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -190,6 +189,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -206,8 +206,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -265,6 +264,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -287,13 +287,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -353,8 +351,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -394,7 +392,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -405,7 +402,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -467,8 +463,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -486,7 +482,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -497,7 +492,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType2_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType2_ES6/input.ts.json index 73557543b835..bf0f88980636 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType2_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType2_ES6/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -89,6 +88,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -105,8 +105,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "typeParams": null, @@ -147,6 +146,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -163,8 +163,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -190,6 +189,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -206,8 +206,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -265,6 +264,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -287,13 +287,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -353,8 +351,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -394,7 +392,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -405,7 +402,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -467,8 +463,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -486,7 +482,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -497,7 +492,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType3_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType3_ES5/input.ts.json index e282a9cb5045..51785be6cee2 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType3_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType3_ES5/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -89,6 +88,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -105,8 +105,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -164,6 +163,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -186,13 +186,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -252,8 +250,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -293,7 +291,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -304,7 +301,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -366,8 +362,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -385,7 +381,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -396,7 +391,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType3_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType3_ES6/input.ts.json index e282a9cb5045..51785be6cee2 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType3_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType3_ES6/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -89,6 +88,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -105,8 +105,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -164,6 +163,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -186,13 +186,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -252,8 +250,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -293,7 +291,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -304,7 +301,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -366,8 +362,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -385,7 +381,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -396,7 +391,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType4_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType4_ES5/input.ts.json index c8df066c301d..87edf31ff312 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType4_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType4_ES5/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -101,6 +100,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -117,8 +117,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -173,6 +172,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -195,13 +195,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType4_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType4_ES6/input.ts.json index c8df066c301d..87edf31ff312 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType4_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType4_ES6/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -101,6 +100,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -117,8 +117,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -173,6 +172,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -195,13 +195,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType5_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType5_ES5/input.ts.json index 0203eadd7d06..4bf1dcb6c6c5 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType5_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType5_ES5/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -101,6 +100,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -117,8 +117,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -173,6 +172,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -195,13 +195,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType5_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType5_ES6/input.ts.json index 0203eadd7d06..4bf1dcb6c6c5 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType5_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType5_ES6/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -101,6 +100,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -117,8 +117,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -173,6 +172,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -195,13 +195,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType6_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType6_ES5/input.ts.json index 983dc39b74a5..ff6275b776ab 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType6_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType6_ES5/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -76,6 +74,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -92,8 +91,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -118,7 +116,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -165,6 +161,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -187,7 +184,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -213,7 +209,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -221,8 +216,7 @@ ] } } - }, - "optional": false + } } } ], @@ -258,7 +252,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -288,7 +281,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -317,7 +309,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -341,7 +332,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType6_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType6_ES6/input.ts.json index 983dc39b74a5..ff6275b776ab 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType6_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType6_ES6/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -76,6 +74,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -92,8 +91,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -118,7 +116,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -165,6 +161,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -187,7 +184,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -213,7 +209,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -221,8 +216,7 @@ ] } } - }, - "optional": false + } } } ], @@ -258,7 +252,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -288,7 +281,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -317,7 +309,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -341,7 +332,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType7_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType7_ES5/input.ts.json index f8f97f1d61f3..4229e1ee0213 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType7_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType7_ES5/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -76,6 +74,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -92,8 +91,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -118,7 +116,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -149,7 +146,6 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -176,7 +172,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -204,6 +199,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -220,8 +216,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -246,7 +241,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -272,7 +266,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -293,6 +286,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -315,7 +309,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -341,7 +334,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -349,8 +341,7 @@ ] } } - }, - "optional": false + } } } ], @@ -386,7 +377,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -416,7 +406,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -433,7 +422,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -454,6 +442,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -476,7 +465,6 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -502,7 +490,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -510,8 +497,7 @@ ] } } - }, - "optional": false + } } } ], @@ -547,7 +533,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -577,7 +562,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -606,7 +590,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -843,7 +826,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -867,7 +849,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType7_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType7_ES6/input.ts.json index f8f97f1d61f3..4229e1ee0213 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType7_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType7_ES6/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -76,6 +74,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -92,8 +91,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -118,7 +116,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -149,7 +146,6 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -176,7 +172,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -204,6 +199,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -220,8 +216,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -246,7 +241,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -272,7 +266,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -293,6 +286,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -315,7 +309,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -341,7 +334,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -349,8 +341,7 @@ ] } } - }, - "optional": false + } } } ], @@ -386,7 +377,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -416,7 +406,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -433,7 +422,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -454,6 +442,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -476,7 +465,6 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -502,7 +490,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -510,8 +497,7 @@ ] } } - }, - "optional": false + } } } ], @@ -547,7 +533,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -577,7 +562,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -606,7 +590,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -843,7 +826,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -867,7 +849,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType8_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType8_ES5/input.ts.json index 232451b16fc1..b0b1b951453f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType8_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType8_ES5/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -101,6 +100,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -117,8 +117,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -173,6 +172,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -195,13 +195,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType8_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType8_ES6/input.ts.json index 232451b16fc1..b0b1b951453f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType8_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType8_ES6/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -101,6 +100,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -117,8 +117,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -173,6 +172,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -195,13 +195,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType9_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType9_ES5/input.ts.json index 232c08befda5..265955007d5f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType9_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType9_ES5/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -101,6 +100,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -117,8 +117,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -173,6 +172,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -195,13 +195,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType9_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType9_ES6/input.ts.json index 232c08befda5..265955007d5f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType9_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesContextualType9_ES6/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -101,6 +100,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -117,8 +117,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -173,6 +172,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -195,13 +195,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit1_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit1_ES5/input.ts.json index c381c811a71f..6fe5160345c5 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit1_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit1_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -275,8 +274,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit1_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit1_ES6/input.ts.json index c381c811a71f..6fe5160345c5 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit1_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit1_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -275,8 +274,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit2_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit2_ES5/input.ts.json index 7484b3972d10..c85e5afad735 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit2_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit2_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -275,8 +274,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit2_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit2_ES6/input.ts.json index 7484b3972d10..c85e5afad735 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit2_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit2_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -275,8 +274,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit5_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit5_ES5/input.ts.json index 1cd67327d97c..e6d81305f197 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit5_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit5_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -308,8 +308,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit5_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit5_ES6/input.ts.json index 1cd67327d97c..e6d81305f197 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit5_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit5_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -308,8 +308,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit6_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit6_ES5/input.ts.json index ceff6cb9f839..9aa961f4e178 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit6_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit6_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit6_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit6_ES6/input.ts.json index ceff6cb9f839..9aa961f4e178 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit6_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesDeclarationEmit6_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesSourceMap1_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesSourceMap1_ES5/input.ts.json index a3daad8f8eac..bfc558ecaccc 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesSourceMap1_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesSourceMap1_ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesSourceMap1_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesSourceMap1_ES6/input.ts.json index 5c953cfe0cc9..b7d21ec14940 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesSourceMap1_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesSourceMap1_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesSourceMap2_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesSourceMap2_ES5/input.ts.json index 8ea278121652..d18effe0b4fc 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesSourceMap2_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesSourceMap2_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesSourceMap2_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesSourceMap2_ES6/input.ts.json index d4497f83565c..19738dc56f7e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesSourceMap2_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesSourceMap2_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesWithStaticProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesWithStaticProperty/input.ts.json index 143ef3cd8a2e..419f6908c94b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesWithStaticProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/computedProperties/computedPropertyNamesWithStaticProperty/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "staticProp", - "typeAnnotation": null, "optional": false }, "value": { @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -105,7 +102,6 @@ "ctxt": 0 }, "value": "staticProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -191,7 +187,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -202,7 +197,6 @@ "ctxt": 0 }, "value": "staticProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -226,6 +220,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -242,8 +237,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -286,8 +280,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -297,7 +291,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -346,7 +339,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -357,7 +349,6 @@ "ctxt": 0 }, "value": "staticProp", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersFunction/input.ts.json index 7e185d00e50d..df5e26844150 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersFunction/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -80,8 +79,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -126,7 +125,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -147,6 +145,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -163,8 +162,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -190,8 +188,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -233,8 +231,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -270,7 +268,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -298,8 +295,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -344,7 +341,6 @@ "ctxt": 0 }, "value": "bar1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -372,8 +368,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -415,8 +411,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersFunctionES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersFunctionES6/input.ts.json index b093fe42e9ce..b4322c43a16e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersFunctionES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersFunctionES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -80,8 +79,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -126,7 +125,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -147,6 +145,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -163,8 +162,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -190,8 +188,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -233,8 +231,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -270,7 +268,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -298,8 +295,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -344,7 +341,6 @@ "ctxt": 0 }, "value": "bar1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -372,8 +368,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -415,8 +411,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersFunctionExpression/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersFunctionExpression/input.ts.json index 9517b7f13c93..e9d15fbbb0ca 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersFunctionExpression/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersFunctionExpression/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "lambda1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -57,8 +57,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -120,8 +120,8 @@ "ctxt": 0 }, "value": "lambda2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -139,6 +139,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -155,8 +156,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "AssignmentPattern", @@ -173,8 +173,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -236,8 +236,8 @@ "ctxt": 0 }, "value": "lambda3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -255,6 +255,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -271,8 +272,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "AssignmentPattern", @@ -289,8 +289,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -328,8 +328,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -377,8 +377,8 @@ "ctxt": 0 }, "value": "lambda4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -403,8 +403,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -442,8 +442,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -491,8 +491,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -521,8 +521,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -569,8 +569,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -625,8 +625,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -669,8 +669,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -707,8 +707,8 @@ "ctxt": 0 }, "value": "boo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -750,8 +750,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -810,8 +810,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -847,6 +847,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -863,8 +864,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -890,8 +890,8 @@ "ctxt": 0 }, "value": "boo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -933,8 +933,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersFunctionExpressionES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersFunctionExpressionES6/input.ts.json index 6899d1bb40a0..2eea2fb256d9 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersFunctionExpressionES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersFunctionExpressionES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "lambda1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -57,8 +57,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -120,8 +120,8 @@ "ctxt": 0 }, "value": "lambda2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -139,6 +139,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -155,8 +156,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "AssignmentPattern", @@ -173,8 +173,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -236,8 +236,8 @@ "ctxt": 0 }, "value": "lambda3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -255,6 +255,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -271,8 +272,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "AssignmentPattern", @@ -289,8 +289,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -328,8 +328,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -377,8 +377,8 @@ "ctxt": 0 }, "value": "lambda4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -403,8 +403,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -442,8 +442,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -491,8 +491,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -521,8 +521,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -569,8 +569,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -625,8 +625,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -669,8 +669,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -707,8 +707,8 @@ "ctxt": 0 }, "value": "boo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -750,8 +750,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -810,8 +810,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -847,6 +847,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -863,8 +864,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -890,8 +890,8 @@ "ctxt": 0 }, "value": "boo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -933,8 +933,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersFunctionProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersFunctionProperty/input.ts.json index fb86b7c1b873..66845e535250 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersFunctionProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersFunctionProperty/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "func1", - "typeAnnotation": null, "optional": false }, "params": [ @@ -79,8 +78,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -122,8 +121,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -159,7 +158,6 @@ "ctxt": 0 }, "value": "func2", - "typeAnnotation": null, "optional": false }, "params": [ @@ -186,8 +184,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -237,7 +235,6 @@ "ctxt": 0 }, "value": "func3", - "typeAnnotation": null, "optional": false }, "params": [ @@ -257,6 +254,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -273,8 +271,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -293,6 +290,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -309,8 +307,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -336,8 +333,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -387,7 +384,6 @@ "ctxt": 0 }, "value": "func4", - "typeAnnotation": null, "optional": false }, "params": [ @@ -407,6 +403,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -423,8 +420,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -443,6 +439,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -459,8 +456,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -486,8 +482,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -534,8 +530,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersFunctionPropertyES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersFunctionPropertyES6/input.ts.json index 2eb2195062c3..42693be3b139 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersFunctionPropertyES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersFunctionPropertyES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "func1", - "typeAnnotation": null, "optional": false }, "params": [ @@ -79,8 +78,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -122,8 +121,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -159,7 +158,6 @@ "ctxt": 0 }, "value": "func2", - "typeAnnotation": null, "optional": false }, "params": [ @@ -186,8 +184,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -237,7 +235,6 @@ "ctxt": 0 }, "value": "func3", - "typeAnnotation": null, "optional": false }, "params": [ @@ -257,6 +254,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -273,8 +271,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -293,6 +290,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -309,8 +307,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -336,8 +333,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -387,7 +384,6 @@ "ctxt": 0 }, "value": "func4", - "typeAnnotation": null, "optional": false }, "params": [ @@ -407,6 +403,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -423,8 +420,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -443,6 +439,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -459,8 +456,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -486,8 +482,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -534,8 +530,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersMethod/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersMethod/input.ts.json index 09723b7e59c2..83fb466cacd4 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersMethod/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersMethod/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -78,8 +77,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -98,6 +96,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -114,8 +113,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -134,6 +132,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -150,8 +149,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -177,8 +175,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -225,7 +223,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -246,6 +243,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -262,8 +260,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -289,8 +286,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -346,7 +343,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "function": { @@ -367,6 +363,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -383,8 +380,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -410,8 +406,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -453,8 +449,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -501,7 +497,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -529,8 +524,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -586,7 +581,6 @@ "ctxt": 0 }, "value": "boo", - "typeAnnotation": null, "optional": false }, "function": { @@ -614,8 +608,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -657,8 +651,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -707,7 +701,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -733,7 +726,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -760,8 +752,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -810,7 +802,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -836,7 +827,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -863,8 +853,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -911,8 +901,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersMethodES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersMethodES6/input.ts.json index 54293749e112..25038cdd910f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersMethodES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/defaultParameters/emitDefaultParametersMethodES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -78,8 +77,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -98,6 +96,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -114,8 +113,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -134,6 +132,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -150,8 +149,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -177,8 +175,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -225,7 +223,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -246,6 +243,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -262,8 +260,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -289,8 +286,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -346,7 +343,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "function": { @@ -367,6 +363,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -383,8 +380,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -410,8 +406,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -453,8 +449,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -501,7 +497,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -529,8 +524,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -586,7 +581,6 @@ "ctxt": 0 }, "value": "boo", - "typeAnnotation": null, "optional": false }, "function": { @@ -614,8 +608,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -657,8 +651,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -707,7 +701,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -733,7 +726,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -760,8 +752,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -810,7 +802,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -836,7 +827,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -863,8 +853,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -911,8 +901,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/arrayAssignmentPatternWithAny/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/arrayAssignmentPatternWithAny/input.ts.json index 9b37f9dd4095..125ea084ac41 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/arrayAssignmentPatternWithAny/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/arrayAssignmentPatternWithAny/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -135,8 +135,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -150,7 +150,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/declarationInAmbientContext/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/declarationInAmbientContext/input.ts.json index 03a185dadf60..151308425cce 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/declarationInAmbientContext/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/declarationInAmbientContext/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -102,7 +102,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null @@ -122,7 +121,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/declarationsAndAssignments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/declarationsAndAssignments/input.ts.json index 54ec3d8bbc32..c9aeb8b643df 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/declarationsAndAssignments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/declarationsAndAssignments/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -139,8 +138,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -222,8 +221,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -233,8 +232,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -316,8 +315,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -327,8 +326,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -338,8 +337,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -423,8 +422,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -505,6 +504,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -521,8 +521,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -554,6 +553,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -570,8 +570,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -595,7 +594,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -639,8 +637,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -718,8 +716,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -733,7 +731,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -773,8 +770,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -784,8 +781,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -799,7 +796,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -839,8 +835,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -850,8 +846,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -861,8 +857,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -876,7 +872,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -908,6 +903,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -943,8 +939,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -976,6 +971,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1011,8 +1007,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1044,6 +1039,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1079,8 +1075,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1104,7 +1099,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1169,7 +1163,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1192,7 +1185,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1256,7 +1248,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -1283,7 +1274,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1306,7 +1296,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1370,7 +1359,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -1397,7 +1385,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1420,7 +1407,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1484,7 +1470,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -1504,7 +1489,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -1531,7 +1515,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1554,7 +1537,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1603,6 +1585,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1619,8 +1602,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1652,6 +1634,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1668,8 +1651,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1711,7 +1693,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1722,8 +1703,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1748,7 +1729,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1771,7 +1751,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1830,7 +1809,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1841,8 +1819,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1867,7 +1845,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1890,7 +1867,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1949,7 +1925,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1960,8 +1935,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1974,7 +1949,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1985,8 +1959,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -2011,7 +1985,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -2034,7 +2007,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2083,6 +2055,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2099,8 +2072,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2132,6 +2104,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2148,8 +2121,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2173,7 +2145,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2225,8 +2196,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ArrayPattern", @@ -2244,8 +2215,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ArrayPattern", @@ -2263,8 +2234,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -2384,6 +2355,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2400,8 +2372,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2433,6 +2404,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2449,8 +2421,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2482,6 +2453,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2498,8 +2470,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2523,7 +2494,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2577,7 +2547,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2588,8 +2557,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -2602,7 +2571,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2623,7 +2591,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2634,8 +2601,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -2648,7 +2615,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2669,7 +2635,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2680,8 +2645,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -2716,7 +2681,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2739,7 +2703,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2760,7 +2723,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2788,7 +2750,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2809,7 +2770,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2859,6 +2819,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2875,8 +2836,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2908,6 +2868,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2924,8 +2885,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2957,6 +2917,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2973,8 +2934,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2998,7 +2958,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3057,8 +3016,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -3086,8 +3045,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -3177,6 +3136,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3193,8 +3153,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -3226,6 +3185,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3242,8 +3202,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -3267,7 +3226,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3326,8 +3284,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -3355,8 +3313,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -3441,6 +3399,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3457,8 +3416,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -3490,6 +3448,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3506,8 +3465,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -3531,7 +3489,6 @@ "ctxt": 0 }, "value": "f8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3583,8 +3540,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3594,8 +3551,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3605,8 +3562,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -3658,8 +3615,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3669,8 +3626,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3680,8 +3637,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -3730,7 +3687,6 @@ "ctxt": 0 }, "value": "f9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3782,8 +3738,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3793,8 +3749,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -3846,8 +3802,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3857,8 +3813,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -3953,8 +3909,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3964,8 +3920,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -4026,7 +3982,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4085,7 +4040,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -4105,7 +4059,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -4167,7 +4120,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -4187,7 +4139,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -4226,7 +4177,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4280,7 +4230,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -4291,8 +4240,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -4305,7 +4254,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -4316,8 +4264,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -4342,7 +4290,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -4365,7 +4312,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -4433,8 +4379,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -4456,8 +4402,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -4574,8 +4520,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -4602,8 +4548,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -4725,8 +4671,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -4748,8 +4694,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -4824,6 +4770,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4840,8 +4787,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -4873,6 +4819,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4889,8 +4836,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -4914,7 +4860,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4966,8 +4911,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "AssignmentPattern", @@ -4992,8 +4937,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ObjectPattern", @@ -5018,7 +4963,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -5033,7 +4977,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -5044,8 +4987,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -5101,7 +5044,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -5124,7 +5066,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -5215,7 +5156,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -5238,7 +5178,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -5288,6 +5227,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5304,8 +5244,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -5337,6 +5276,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5353,8 +5293,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -5386,6 +5325,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5402,8 +5342,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -5435,6 +5374,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5451,8 +5391,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -5476,7 +5415,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5528,8 +5466,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5539,8 +5477,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -5622,9 +5560,9 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false - }, + "optional": false, + "typeAnnotation": null + }, { "type": "Identifier", "span": { @@ -5633,8 +5571,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -5668,7 +5606,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5682,7 +5619,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -5709,7 +5645,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -5720,7 +5655,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5734,7 +5668,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -5745,7 +5678,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -5775,7 +5707,6 @@ "ctxt": 0 }, "value": "f14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5811,8 +5742,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -5848,8 +5779,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -5890,7 +5821,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -5905,7 +5835,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -5923,8 +5852,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -5991,6 +5920,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6007,8 +5937,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -6040,6 +5969,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6056,8 +5986,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -6089,6 +6018,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6105,8 +6035,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -6142,7 +6071,6 @@ "ctxt": 0 }, "value": "f14", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6215,7 +6143,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -6238,7 +6165,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -6286,7 +6212,6 @@ "ctxt": 0 }, "value": "f14", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6359,7 +6284,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -6407,7 +6331,6 @@ "ctxt": 0 }, "value": "f14", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6480,7 +6403,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -6523,7 +6445,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -6574,8 +6495,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6585,8 +6506,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -6644,7 +6565,6 @@ "ctxt": 0 }, "value": "f15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6688,8 +6608,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -6734,8 +6654,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -6775,8 +6695,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -6814,7 +6734,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, { @@ -6825,7 +6744,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, { @@ -6836,7 +6754,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } ] @@ -6859,7 +6776,6 @@ "ctxt": 0 }, "value": "f16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6918,7 +6834,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -6938,7 +6853,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -6958,7 +6872,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null @@ -6982,7 +6895,6 @@ "ctxt": 0 }, "value": "f15", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -7009,7 +6921,6 @@ "ctxt": 0 }, "value": "f17", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7045,7 +6956,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -7078,7 +6988,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -7106,7 +7015,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -7167,7 +7075,6 @@ "ctxt": 0 }, "value": "f17", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7209,7 +7116,6 @@ "ctxt": 0 }, "value": "f17", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7233,7 +7139,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -7280,7 +7185,6 @@ "ctxt": 0 }, "value": "f17", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7304,7 +7208,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -7346,7 +7249,6 @@ "ctxt": 0 }, "value": "f17", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7367,7 +7269,6 @@ "ctxt": 0 }, "value": "f15", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -7388,7 +7289,6 @@ "ctxt": 0 }, "value": "f18", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7432,6 +7332,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7448,8 +7349,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -7481,6 +7381,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7497,8 +7398,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -7530,6 +7430,7 @@ "ctxt": 0 }, "value": "aa", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7554,8 +7455,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -7607,7 +7507,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -7627,7 +7526,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -7652,7 +7550,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, { @@ -7663,7 +7560,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } ] @@ -7716,7 +7612,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -7736,7 +7631,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -7761,7 +7655,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, { @@ -7772,7 +7665,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } ] @@ -7818,7 +7710,6 @@ "ctxt": 0 }, "value": "aa", - "typeAnnotation": null, "optional": false }, "property": { @@ -7840,8 +7731,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -7865,7 +7756,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -7879,7 +7769,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -7918,8 +7807,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -7929,8 +7818,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -7954,7 +7843,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -7968,7 +7856,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -8014,8 +7901,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -8043,8 +7930,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -8124,7 +8011,6 @@ "ctxt": 0 }, "value": "f19", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8168,8 +8054,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -8189,8 +8075,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -8228,8 +8114,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -8239,8 +8125,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -8313,8 +8199,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -8324,8 +8210,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -8349,7 +8235,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -8363,7 +8248,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -8416,7 +8300,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -8436,7 +8319,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -8461,7 +8343,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, { @@ -8472,7 +8353,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } ] @@ -8526,8 +8406,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -8537,8 +8417,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -8658,8 +8538,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -8692,8 +8572,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -8703,8 +8583,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -8767,7 +8647,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8788,6 +8667,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8859,8 +8739,7 @@ } ] } - }, - "optional": false + } } } ], @@ -8903,6 +8782,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8919,8 +8799,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -8952,6 +8831,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8968,8 +8848,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -9001,6 +8880,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9017,8 +8897,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -9050,6 +8929,7 @@ "ctxt": 0 }, "value": "a0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9066,8 +8946,7 @@ }, "elemTypes": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -9099,6 +8978,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9134,8 +9014,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -9167,6 +9046,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9220,8 +9100,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -9253,6 +9132,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9324,8 +9204,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -9377,8 +9256,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -9394,7 +9273,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "definite": false @@ -9434,8 +9312,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -9457,8 +9335,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -9474,7 +9352,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "definite": false @@ -9514,8 +9391,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -9525,8 +9402,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -9548,8 +9425,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -9565,7 +9442,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "definite": false @@ -9605,8 +9481,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -9616,8 +9492,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -9627,8 +9503,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -9650,8 +9526,8 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -9667,7 +9543,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "definite": false @@ -9717,8 +9592,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -9734,7 +9609,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -9770,8 +9644,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -9793,8 +9667,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -9810,7 +9684,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -9846,8 +9719,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -9857,8 +9730,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -9880,8 +9753,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -9897,7 +9770,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -9933,8 +9805,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -9944,8 +9816,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -9955,8 +9827,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -9978,8 +9850,8 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -9995,7 +9867,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -10017,7 +9888,6 @@ "ctxt": 0 }, "value": "f21", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10038,6 +9908,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10109,8 +9980,7 @@ } ] } - }, - "optional": false + } } } ], @@ -10153,6 +10023,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10169,8 +10040,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -10202,6 +10072,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10218,8 +10089,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -10251,6 +10121,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10267,8 +10138,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -10300,6 +10170,7 @@ "ctxt": 0 }, "value": "a0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10371,8 +10242,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -10404,6 +10274,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10457,8 +10328,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -10490,6 +10360,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10525,8 +10396,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -10558,6 +10428,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10574,8 +10445,7 @@ }, "elemTypes": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -10627,8 +10497,8 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -10644,7 +10514,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "definite": false @@ -10684,8 +10553,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -10707,8 +10576,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -10724,7 +10593,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "definite": false @@ -10764,8 +10632,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -10775,8 +10643,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -10798,8 +10666,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -10815,7 +10683,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "definite": false @@ -10855,8 +10722,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -10866,8 +10733,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -10877,8 +10744,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -10900,8 +10767,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -10917,7 +10784,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "definite": false @@ -10967,8 +10833,8 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -10984,7 +10850,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -11020,8 +10885,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -11043,8 +10908,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -11060,7 +10925,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -11096,8 +10960,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -11107,8 +10971,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -11130,8 +10994,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -11147,7 +11011,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -11183,8 +11046,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -11194,8 +11057,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -11205,8 +11068,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -11228,8 +11091,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -11245,7 +11108,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringArrayBindingPatternAndAssignment1ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringArrayBindingPatternAndAssignment1ES5/input.ts.json index a5ff0b8cccb4..d1624d9fbb83 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringArrayBindingPatternAndAssignment1ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringArrayBindingPatternAndAssignment1ES5/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -81,7 +81,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -128,8 +127,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -157,8 +156,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -199,7 +198,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -239,8 +237,8 @@ "ctxt": 0 }, "value": "b0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -250,8 +248,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -261,8 +259,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -351,8 +349,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -362,8 +360,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -373,8 +371,8 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -516,7 +514,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -629,8 +626,8 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -640,8 +637,8 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -662,7 +659,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -717,8 +713,8 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -741,7 +737,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -776,8 +771,8 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -862,8 +857,8 @@ "ctxt": 0 }, "value": "c0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -873,8 +868,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -902,7 +897,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -945,8 +939,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1014,8 +1008,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1065,8 +1059,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1219,8 +1213,8 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1234,8 +1228,8 @@ "ctxt": 0 }, "value": "c6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1417,8 +1411,8 @@ "ctxt": 0 }, "value": "c7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1510,8 +1504,8 @@ "ctxt": 0 }, "value": "c8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1615,8 +1609,8 @@ "ctxt": 0 }, "value": "c9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1732,8 +1726,8 @@ "ctxt": 0 }, "value": "c10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1853,8 +1847,8 @@ "ctxt": 0 }, "value": "c11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1864,8 +1858,8 @@ "ctxt": 0 }, "value": "c12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -1887,8 +1881,8 @@ "ctxt": 0 }, "value": "c13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1984,8 +1978,8 @@ "ctxt": 0 }, "value": "c14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1995,8 +1989,8 @@ "ctxt": 0 }, "value": "c15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2006,8 +2000,8 @@ "ctxt": 0 }, "value": "c16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringArrayBindingPatternAndAssignment1ES5iterable/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringArrayBindingPatternAndAssignment1ES5iterable/input.ts.json index 8a790c4689db..02edeb02ea5d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringArrayBindingPatternAndAssignment1ES5iterable/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringArrayBindingPatternAndAssignment1ES5iterable/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -81,7 +81,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -128,8 +127,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -157,8 +156,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -199,7 +198,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -239,8 +237,8 @@ "ctxt": 0 }, "value": "b0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -250,8 +248,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -261,8 +259,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -351,8 +349,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -362,8 +360,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -373,8 +371,8 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -516,7 +514,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -629,8 +626,8 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -640,8 +637,8 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -662,7 +659,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -717,8 +713,8 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -741,7 +737,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -776,8 +771,8 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -862,8 +857,8 @@ "ctxt": 0 }, "value": "c0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -873,8 +868,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -902,7 +897,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -945,8 +939,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1014,8 +1008,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1065,8 +1059,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1219,8 +1213,8 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1234,8 +1228,8 @@ "ctxt": 0 }, "value": "c6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1417,8 +1411,8 @@ "ctxt": 0 }, "value": "c7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1510,8 +1504,8 @@ "ctxt": 0 }, "value": "c8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1615,8 +1609,8 @@ "ctxt": 0 }, "value": "c9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1732,8 +1726,8 @@ "ctxt": 0 }, "value": "c10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1853,8 +1847,8 @@ "ctxt": 0 }, "value": "c11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1864,8 +1858,8 @@ "ctxt": 0 }, "value": "c12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -1887,8 +1881,8 @@ "ctxt": 0 }, "value": "c13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1984,8 +1978,8 @@ "ctxt": 0 }, "value": "c14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1995,8 +1989,8 @@ "ctxt": 0 }, "value": "c15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2006,8 +2000,8 @@ "ctxt": 0 }, "value": "c16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringArrayBindingPatternAndAssignment1ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringArrayBindingPatternAndAssignment1ES6/input.ts.json index f22ef553b5f2..71fc8617f848 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringArrayBindingPatternAndAssignment1ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringArrayBindingPatternAndAssignment1ES6/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -81,7 +81,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -128,8 +127,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -157,8 +156,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -199,7 +198,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -239,8 +237,8 @@ "ctxt": 0 }, "value": "b0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -250,8 +248,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -261,8 +259,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -351,8 +349,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -362,8 +360,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -373,8 +371,8 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -516,7 +514,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -629,8 +626,8 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -640,8 +637,8 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -662,7 +659,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -717,8 +713,8 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -741,7 +737,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -776,8 +771,8 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -862,8 +857,8 @@ "ctxt": 0 }, "value": "c0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -873,8 +868,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -902,7 +897,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -945,8 +939,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1014,8 +1008,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1065,8 +1059,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1219,8 +1213,8 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1234,8 +1228,8 @@ "ctxt": 0 }, "value": "c6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1417,8 +1411,8 @@ "ctxt": 0 }, "value": "c7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1510,8 +1504,8 @@ "ctxt": 0 }, "value": "c8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1615,8 +1609,8 @@ "ctxt": 0 }, "value": "c9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1732,8 +1726,8 @@ "ctxt": 0 }, "value": "c10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1853,8 +1847,8 @@ "ctxt": 0 }, "value": "c11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1864,8 +1858,8 @@ "ctxt": 0 }, "value": "c12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -1887,8 +1881,8 @@ "ctxt": 0 }, "value": "c13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1984,8 +1978,8 @@ "ctxt": 0 }, "value": "c14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1995,8 +1989,8 @@ "ctxt": 0 }, "value": "c15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2006,8 +2000,8 @@ "ctxt": 0 }, "value": "c16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringArrayBindingPatternAndAssignment2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringArrayBindingPatternAndAssignment2/input.ts.json index 41cb1f454548..719fbe89876e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringArrayBindingPatternAndAssignment2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringArrayBindingPatternAndAssignment2/input.ts.json @@ -47,8 +47,8 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -78,8 +78,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -147,8 +147,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -178,8 +178,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -201,7 +201,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -241,8 +240,8 @@ "ctxt": 0 }, "value": "b0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -252,8 +251,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -263,8 +262,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -411,7 +410,6 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -432,7 +430,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -458,7 +455,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -528,7 +524,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -700,7 +695,6 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -747,8 +741,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -774,8 +768,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -785,8 +779,8 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -807,7 +801,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -842,8 +835,8 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -928,8 +921,8 @@ "ctxt": 0 }, "value": "c0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -939,8 +932,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1021,7 +1014,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1064,8 +1056,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1075,8 +1067,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1157,7 +1149,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1182,7 +1173,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1207,6 +1197,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1223,8 +1214,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1264,7 +1254,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1285,6 +1274,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1301,8 +1291,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1386,7 +1375,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1426,8 +1414,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1437,8 +1425,8 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1448,8 +1436,8 @@ "ctxt": 0 }, "value": "c6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1470,7 +1458,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringArrayBindingPatternAndAssignment3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringArrayBindingPatternAndAssignment3/input.ts.json index 0ba10eef26cf..71455036c6ce 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringArrayBindingPatternAndAssignment3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringArrayBindingPatternAndAssignment3/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "AssignmentPattern", @@ -57,8 +57,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -68,7 +68,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -136,8 +135,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "AssignmentPattern", @@ -154,8 +153,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -165,7 +164,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -185,8 +183,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -196,7 +194,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -264,8 +261,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "AssignmentPattern", @@ -282,8 +279,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -293,7 +290,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -313,8 +309,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -324,7 +320,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -344,8 +339,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -355,7 +350,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -439,8 +433,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "AssignmentPattern", @@ -457,8 +451,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -468,7 +462,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -579,8 +572,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "AssignmentPattern", @@ -597,8 +590,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -608,7 +601,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -628,8 +620,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -639,7 +631,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -750,8 +741,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "AssignmentPattern", @@ -768,8 +759,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -779,7 +770,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -799,8 +789,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -810,7 +800,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -830,8 +819,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -841,7 +830,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringArrayBindingPatternAndAssignment4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringArrayBindingPatternAndAssignment4/input.ts.json index 6f0f8bf8d46e..16a7cdfdea42 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringArrayBindingPatternAndAssignment4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringArrayBindingPatternAndAssignment4/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "data", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -74,8 +75,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -115,8 +115,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -130,7 +130,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringAssignabilityCheck/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringAssignabilityCheck/input.ts.json index 7f8bc40210d3..c3ee3753392b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringAssignabilityCheck/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringAssignabilityCheck/input.ts.json @@ -83,7 +83,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -230,7 +229,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -248,7 +246,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -338,7 +335,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringCatch/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringCatch/input.ts.json index 141393fe3326..c1a4fd0d50d3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringCatch/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringCatch/input.ts.json @@ -88,8 +88,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -99,8 +99,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -137,7 +137,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -148,7 +147,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -198,7 +196,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -221,7 +218,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -269,7 +265,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -289,7 +284,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -329,7 +323,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -340,7 +333,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -400,7 +392,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -436,7 +427,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -490,7 +480,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -509,8 +498,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -532,7 +521,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null @@ -576,7 +564,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -587,7 +574,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -636,8 +622,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringControlFlow/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringControlFlow/input.ts.json index a1cf6d0f2de4..d3c724389668 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringControlFlow/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringControlFlow/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -68,7 +68,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -96,8 +95,7 @@ } ] } - }, - "optional": false + } } } ], @@ -137,7 +135,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -148,7 +145,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -184,8 +180,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -223,8 +219,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -241,7 +237,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -289,8 +284,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -307,7 +302,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -318,7 +312,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -348,7 +341,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -369,6 +361,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -449,8 +442,7 @@ } ] } - }, - "optional": false + } } } ], @@ -493,8 +485,8 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -511,7 +503,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -554,8 +545,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -572,7 +563,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -623,8 +613,8 @@ "ctxt": 0 }, "value": "b0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -634,8 +624,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -649,7 +639,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "definite": false @@ -694,8 +683,8 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -705,8 +694,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -720,7 +709,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -756,7 +744,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -785,7 +772,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -833,8 +819,8 @@ "ctxt": 0 }, "value": "c0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -851,7 +837,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -894,8 +879,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -912,7 +897,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -963,8 +947,8 @@ "ctxt": 0 }, "value": "d0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -974,8 +958,8 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -989,7 +973,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1034,8 +1017,8 @@ "ctxt": 0 }, "value": "c0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1045,8 +1028,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1060,7 +1043,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -1087,7 +1069,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1108,6 +1089,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1139,7 +1121,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1181,7 +1162,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1209,8 +1189,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1258,7 +1237,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1269,7 +1247,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1289,7 +1266,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1300,7 +1276,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1354,7 +1329,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -1374,7 +1348,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -1391,7 +1364,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1443,7 +1415,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -1463,7 +1434,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -1480,7 +1450,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -1507,7 +1476,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1551,6 +1519,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1567,8 +1536,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1620,7 +1588,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -1703,8 +1670,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1808,8 +1775,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1851,7 +1818,6 @@ "ctxt": 0 }, "value": "KeyValue", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1943,8 +1909,8 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1954,8 +1920,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1981,7 +1947,6 @@ "ctxt": 0 }, "value": "KeyValue", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2048,7 +2013,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "property": { @@ -2059,7 +2023,6 @@ "ctxt": 0 }, "value": "toUpperCase", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringEvaluationOrder/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringEvaluationOrder/input.ts.json index eccd4b9bcbe6..10f3c9a4aacf 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringEvaluationOrder/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringEvaluationOrder/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "trace", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -55,8 +56,7 @@ "kind": "any" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -96,8 +96,8 @@ "ctxt": 0 }, "value": "order", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -115,6 +115,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -131,8 +132,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "body": { @@ -157,7 +157,6 @@ "ctxt": 0 }, "value": "trace", - "typeAnnotation": null, "optional": false }, "property": { @@ -168,7 +167,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -184,7 +182,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -280,7 +277,6 @@ "ctxt": 0 }, "value": "order", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -308,8 +304,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -331,7 +327,6 @@ "ctxt": 0 }, "value": "order", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -433,7 +428,6 @@ "ctxt": 0 }, "value": "order", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -461,8 +455,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -484,7 +478,6 @@ "ctxt": 0 }, "value": "order", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -584,7 +577,6 @@ "ctxt": 0 }, "value": "order", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -643,7 +635,6 @@ "ctxt": 0 }, "value": "order", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -671,8 +662,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -694,7 +685,6 @@ "ctxt": 0 }, "value": "order", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -736,8 +726,8 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -828,8 +818,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -852,8 +842,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -863,7 +853,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -924,7 +913,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringInFunctionType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringInFunctionType/input.ts.json index 114d894980cb..8ef09a9a3f7d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringInFunctionType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringInFunctionType/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -137,7 +133,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -167,7 +162,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -196,7 +190,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -238,7 +231,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -267,7 +259,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -296,7 +287,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -322,7 +312,6 @@ "ctxt": 0 }, "value": "F1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -350,8 +339,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -361,8 +350,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -372,8 +361,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -416,7 +405,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -451,7 +439,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -481,7 +468,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -516,7 +502,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -562,7 +547,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -613,7 +597,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -642,7 +625,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -685,7 +667,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -714,7 +695,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -745,7 +725,6 @@ "ctxt": 0 }, "value": "F3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -783,7 +762,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -794,8 +772,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -820,7 +798,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -831,8 +808,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -880,7 +857,6 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -931,7 +907,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -976,7 +951,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1005,7 +979,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1039,7 +1012,6 @@ "ctxt": 0 }, "value": "F4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1077,7 +1049,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1096,8 +1067,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1107,8 +1078,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1160,7 +1131,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1198,7 +1168,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1217,8 +1186,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1228,8 +1197,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1291,8 +1260,8 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1318,8 +1287,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1329,8 +1298,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1340,8 +1309,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1396,6 +1365,7 @@ "ctxt": 0 }, "value": "v2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1427,8 +1397,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1438,8 +1408,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1449,8 +1419,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1476,8 +1446,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectAssignmentPatternWithNestedSpread/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectAssignmentPatternWithNestedSpread/input.ts.json index a95a66d6c835..d974d2cfea78 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectAssignmentPatternWithNestedSpread/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectAssignmentPatternWithNestedSpread/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -68,6 +68,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,8 +85,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -105,6 +105,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,8 +122,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -142,7 +142,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -163,7 +162,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -186,7 +184,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -221,6 +218,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -237,8 +235,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -285,7 +282,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -318,7 +314,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -343,8 +338,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -360,7 +355,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -378,7 +372,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment1ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment1ES5/input.ts.json index b1782154b71f..25a7922f9bc2 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment1ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment1ES5/input.ts.json @@ -46,7 +46,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "value": null @@ -79,7 +78,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -126,7 +124,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "value": null @@ -204,7 +201,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "value": null @@ -231,7 +227,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "value": { @@ -285,7 +280,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "value": { @@ -318,7 +312,6 @@ "ctxt": 0 }, "value": "b21", - "typeAnnotation": null, "optional": false }, "value": null @@ -345,7 +338,6 @@ "ctxt": 0 }, "value": "b21", - "typeAnnotation": null, "optional": false }, "value": { @@ -390,7 +382,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "value": { @@ -411,7 +402,6 @@ "ctxt": 0 }, "value": "b21", - "typeAnnotation": null, "optional": false }, "value": { @@ -482,8 +472,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -570,7 +560,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "value": { @@ -621,7 +610,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "value": { @@ -675,7 +663,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "value": { @@ -701,7 +688,6 @@ "ctxt": 0 }, "value": "b52", - "typeAnnotation": null, "optional": false }, "value": null @@ -733,7 +719,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "value": { @@ -752,7 +737,6 @@ "ctxt": 0 }, "value": "b52", - "typeAnnotation": null, "optional": false } ] @@ -779,7 +763,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -804,6 +787,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -820,8 +804,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -861,7 +844,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -946,7 +928,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -963,7 +944,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1048,7 +1028,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1099,8 +1078,8 @@ "ctxt": 0 }, "value": "c0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1122,7 +1101,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1176,8 +1154,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1199,7 +1177,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1224,7 +1201,6 @@ "ctxt": 0 }, "value": "F1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1249,6 +1225,7 @@ "ctxt": 0 }, "value": "str", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1265,8 +1242,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1306,7 +1282,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1396,7 +1371,6 @@ "ctxt": 0 }, "value": "F1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1452,8 +1426,8 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1475,7 +1449,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1534,8 +1507,8 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1557,7 +1530,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment1ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment1ES6/input.ts.json index 3d4c1855592e..c097d6d19093 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment1ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment1ES6/input.ts.json @@ -46,7 +46,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "value": null @@ -79,7 +78,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -126,7 +124,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "value": null @@ -204,7 +201,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "value": null @@ -231,7 +227,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "value": { @@ -285,7 +280,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "value": { @@ -318,7 +312,6 @@ "ctxt": 0 }, "value": "b21", - "typeAnnotation": null, "optional": false }, "value": null @@ -345,7 +338,6 @@ "ctxt": 0 }, "value": "b21", - "typeAnnotation": null, "optional": false }, "value": { @@ -390,7 +382,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "value": { @@ -411,7 +402,6 @@ "ctxt": 0 }, "value": "b21", - "typeAnnotation": null, "optional": false }, "value": { @@ -482,8 +472,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -570,7 +560,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "value": { @@ -621,7 +610,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "value": { @@ -675,7 +663,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "value": { @@ -701,7 +688,6 @@ "ctxt": 0 }, "value": "b52", - "typeAnnotation": null, "optional": false }, "value": null @@ -733,7 +719,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "value": { @@ -752,7 +737,6 @@ "ctxt": 0 }, "value": "b52", - "typeAnnotation": null, "optional": false } ] @@ -779,7 +763,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -804,6 +787,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -820,8 +804,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -861,7 +844,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -946,7 +928,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -963,7 +944,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1048,7 +1028,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1099,8 +1078,8 @@ "ctxt": 0 }, "value": "c0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1122,7 +1101,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1176,8 +1154,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1199,7 +1177,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1224,7 +1201,6 @@ "ctxt": 0 }, "value": "F1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1249,6 +1225,7 @@ "ctxt": 0 }, "value": "str", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1265,8 +1242,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1306,7 +1282,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1396,7 +1371,6 @@ "ctxt": 0 }, "value": "F1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1452,8 +1426,8 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1475,7 +1449,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1534,8 +1507,8 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1557,7 +1530,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment4/input.ts.json index c696908c5be1..60779fb26eeb 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment4/input.ts.json @@ -46,7 +46,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -74,7 +73,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -102,7 +100,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -113,7 +110,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -132,7 +128,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -143,7 +138,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -162,7 +156,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": { @@ -173,7 +166,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -192,7 +184,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -203,7 +194,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment5/input.ts.json index 16947c72391c..f2c2753d69d2 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,6 +59,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -76,8 +76,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -109,6 +108,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -125,8 +125,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,7 +177,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -203,8 +201,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment6/input.ts.json index 28d28b3ecbbe..128f0215c973 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -77,8 +77,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -140,7 +140,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -152,8 +151,8 @@ "ctxt": 0 }, "value": "aVal", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -173,7 +172,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -185,8 +183,8 @@ "ctxt": 0 }, "value": "bVal", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -255,7 +253,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -286,7 +283,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -347,7 +343,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -358,7 +353,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -374,7 +368,6 @@ "ctxt": 0 }, "value": "aVal", - "typeAnnotation": null, "optional": false } }, @@ -388,7 +381,6 @@ "ctxt": 0 }, "value": "bVal", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment7/input.ts.json index 21f2f821252f..f320d0a2b263 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment7/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": { @@ -75,7 +73,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": { @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "property": { @@ -155,7 +151,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -169,8 +164,8 @@ "ctxt": 0 }, "value": "aVal", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -197,7 +192,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "property": { @@ -208,7 +202,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -222,8 +215,8 @@ "ctxt": 0 }, "value": "bVal", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -299,7 +292,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "property": { @@ -310,7 +302,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -350,7 +341,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "property": { @@ -361,7 +351,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -424,7 +413,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -435,7 +423,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -451,7 +438,6 @@ "ctxt": 0 }, "value": "aVal", - "typeAnnotation": null, "optional": false } }, @@ -465,7 +451,6 @@ "ctxt": 0 }, "value": "bVal", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment8/input.ts.json index 7071626ef347..e6986d479d5f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringObjectBindingPatternAndAssignment8/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -80,7 +79,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -153,7 +151,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "property": { @@ -164,7 +161,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -178,8 +174,8 @@ "ctxt": 0 }, "value": "aVal", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -206,7 +202,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "property": { @@ -217,7 +212,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -231,8 +225,8 @@ "ctxt": 0 }, "value": "bVal", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -308,7 +302,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "property": { @@ -319,7 +312,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -359,7 +351,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "property": { @@ -370,7 +361,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -433,7 +423,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -444,7 +433,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -460,7 +448,6 @@ "ctxt": 0 }, "value": "aVal", - "typeAnnotation": null, "optional": false } }, @@ -474,7 +461,6 @@ "ctxt": 0 }, "value": "bVal", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration1ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration1ES5/input.ts.json index dcf2fa1b0702..4c896023ed48 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration1ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration1ES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -45,8 +44,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -56,8 +55,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ArrayPattern", @@ -83,8 +82,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -217,7 +216,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -238,6 +236,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -269,7 +268,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -311,7 +309,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -339,8 +336,7 @@ } ] } - }, - "optional": false + } } } ], @@ -374,7 +370,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -410,7 +405,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "value": null @@ -430,7 +424,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "value": null @@ -445,7 +438,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "value": { @@ -471,7 +463,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": null @@ -491,7 +482,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": null @@ -511,7 +501,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "value": { @@ -530,8 +519,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -541,8 +530,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -552,8 +541,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -593,7 +582,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -635,7 +623,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -677,7 +664,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -715,7 +701,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -757,7 +742,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -804,7 +788,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -909,7 +892,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -945,7 +927,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -965,7 +946,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -1003,7 +983,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1045,7 +1024,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1119,7 +1097,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1229,7 +1206,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1339,7 +1315,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1367,8 +1342,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -1388,7 +1363,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1447,7 +1421,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1475,8 +1448,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -1512,8 +1485,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1533,7 +1506,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1556,7 +1528,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1567,7 +1538,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1607,7 +1577,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1645,7 +1614,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -1671,7 +1639,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -1686,7 +1653,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1712,7 +1678,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "value": null @@ -1749,7 +1714,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -1770,7 +1734,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1798,7 +1761,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1819,7 +1781,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "value": { @@ -1879,7 +1840,6 @@ "ctxt": 0 }, "value": "F1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1909,7 +1869,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1923,8 +1882,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1934,8 +1893,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ArrayPattern", @@ -1954,8 +1913,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1965,8 +1924,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1995,7 +1954,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": null @@ -2010,7 +1968,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": { @@ -2036,7 +1993,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "value": null @@ -2056,7 +2012,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "value": null @@ -2087,7 +2042,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2123,8 +2077,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2134,8 +2088,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2145,8 +2099,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -2170,7 +2124,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2195,7 +2148,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2235,7 +2187,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2279,8 +2230,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -2294,8 +2245,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ArrayPattern", @@ -2321,8 +2272,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2332,8 +2283,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -2375,7 +2326,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2392,7 +2342,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2426,7 +2375,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2440,7 +2388,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2498,7 +2445,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2577,7 +2523,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2618,7 +2563,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -2641,7 +2585,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2688,7 +2631,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2729,7 +2671,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -2752,7 +2693,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2794,7 +2734,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2878,7 +2817,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3008,7 +2946,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "members": [ @@ -3027,7 +2964,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -3044,7 +2980,6 @@ "ctxt": 0 }, "value": "c0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3075,7 +3010,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -3101,7 +3035,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -3116,7 +3049,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -3142,7 +3074,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "value": null @@ -3193,7 +3124,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3236,7 +3166,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null @@ -3263,7 +3192,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -3312,7 +3240,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3348,7 +3275,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -3397,7 +3323,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3440,7 +3365,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -3478,7 +3402,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3545,7 +3468,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -3599,7 +3521,6 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3628,8 +3549,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3639,8 +3560,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ArrayPattern", @@ -3666,8 +3587,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -3713,7 +3634,6 @@ "ctxt": 0 }, "value": "c6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3742,8 +3662,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3753,8 +3673,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ArrayPattern", @@ -3787,8 +3707,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -3857,7 +3777,6 @@ "ctxt": 0 }, "value": "c0", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3881,7 +3800,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -3902,7 +3820,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -3925,7 +3842,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -3946,7 +3862,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "value": { @@ -3999,7 +3914,6 @@ "ctxt": 0 }, "value": "c0", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4023,7 +3937,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -4044,7 +3957,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -4072,7 +3984,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -4093,7 +4004,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "value": { @@ -4141,7 +4051,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4170,7 +4079,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4194,7 +4102,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -4236,7 +4143,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4278,7 +4184,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4302,7 +4207,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -4344,7 +4248,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4368,7 +4271,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -4410,7 +4312,6 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4520,7 +4421,6 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4642,7 +4542,6 @@ "ctxt": 0 }, "value": "d0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4663,8 +4562,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": true + "optional": true, + "typeAnnotation": null } } ], @@ -4698,7 +4597,6 @@ "ctxt": 0 }, "value": "d0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4726,8 +4624,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -4777,7 +4675,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4807,7 +4704,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4829,8 +4725,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4840,8 +4736,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4851,8 +4747,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": true, @@ -4878,7 +4774,6 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4907,7 +4802,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -4927,7 +4821,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -4947,7 +4840,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null @@ -4976,7 +4868,6 @@ "ctxt": 0 }, "value": "e0", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4998,8 +4889,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5009,8 +4900,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5020,8 +4911,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -5044,7 +4935,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5070,7 +4960,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -5101,7 +4990,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "function": { @@ -5147,7 +5035,6 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, "optional": false }, "function": { @@ -5193,7 +5080,6 @@ "ctxt": 0 }, "value": "e0", - "typeAnnotation": null, "optional": false }, "function": { @@ -5222,8 +5108,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5233,8 +5119,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5244,8 +5130,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -5300,7 +5186,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -5317,7 +5202,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5343,7 +5227,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "function": { @@ -5372,8 +5255,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5383,8 +5266,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5394,8 +5277,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -5444,7 +5327,6 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, "optional": false }, "function": { @@ -5480,7 +5362,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -5500,7 +5381,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -5520,7 +5400,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null @@ -5572,7 +5451,6 @@ "ctxt": 0 }, "value": "e0", - "typeAnnotation": null, "optional": false }, "function": { @@ -5601,8 +5479,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5612,8 +5490,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5623,8 +5501,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -5679,7 +5557,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -5696,7 +5573,6 @@ "ctxt": 0 }, "value": "d5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5739,7 +5615,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -5759,7 +5634,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -5786,7 +5660,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -5809,7 +5682,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -5870,7 +5742,6 @@ "ctxt": 0 }, "value": "d5", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -5887,7 +5758,6 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5918,7 +5788,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -5929,8 +5798,8 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -5969,7 +5838,6 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6005,7 +5873,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -6043,7 +5910,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6105,7 +5971,6 @@ "ctxt": 0 }, "value": "e3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6141,7 +6006,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -6179,7 +6043,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6241,7 +6104,6 @@ "ctxt": 0 }, "value": "e4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6272,7 +6134,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -6291,8 +6152,8 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6302,8 +6163,8 @@ "ctxt": 0 }, "value": "string", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6313,8 +6174,8 @@ "ctxt": 0 }, "value": "any", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -6357,7 +6218,6 @@ "ctxt": 0 }, "value": "e5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6388,7 +6248,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -6407,8 +6266,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6418,8 +6277,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6429,8 +6288,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -6470,7 +6329,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration1ES5iterable/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration1ES5iterable/input.ts.json index 882c303df5ca..feab09c16361 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration1ES5iterable/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration1ES5iterable/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -45,8 +44,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -56,8 +55,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ArrayPattern", @@ -83,8 +82,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -217,7 +216,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -238,6 +236,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -269,7 +268,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -311,7 +309,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -339,8 +336,7 @@ } ] } - }, - "optional": false + } } } ], @@ -374,7 +370,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -410,7 +405,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "value": null @@ -430,7 +424,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "value": null @@ -445,7 +438,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "value": { @@ -471,7 +463,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": null @@ -491,7 +482,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": null @@ -511,7 +501,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "value": { @@ -530,8 +519,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -541,8 +530,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -552,8 +541,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -593,7 +582,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -635,7 +623,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -677,7 +664,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -715,7 +701,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -757,7 +742,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -804,7 +788,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -909,7 +892,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -945,7 +927,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -965,7 +946,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -1003,7 +983,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1045,7 +1024,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1119,7 +1097,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1229,7 +1206,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1339,7 +1315,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1367,8 +1342,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -1388,7 +1363,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1447,7 +1421,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1475,8 +1448,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -1512,8 +1485,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1533,7 +1506,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1556,7 +1528,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1567,7 +1538,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1607,7 +1577,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1645,7 +1614,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -1671,7 +1639,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -1686,7 +1653,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1712,7 +1678,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "value": null @@ -1749,7 +1714,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -1770,7 +1734,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1798,7 +1761,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1819,7 +1781,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "value": { @@ -1879,7 +1840,6 @@ "ctxt": 0 }, "value": "F1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1909,7 +1869,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1923,8 +1882,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1934,8 +1893,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ArrayPattern", @@ -1954,8 +1913,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1965,8 +1924,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1995,7 +1954,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": null @@ -2010,7 +1968,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": { @@ -2036,7 +1993,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "value": null @@ -2056,7 +2012,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "value": null @@ -2087,7 +2042,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2123,8 +2077,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2134,8 +2088,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2145,8 +2099,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -2170,7 +2124,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2195,7 +2148,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2235,7 +2187,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2279,8 +2230,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -2294,8 +2245,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ArrayPattern", @@ -2321,8 +2272,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2332,8 +2283,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -2375,7 +2326,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2392,7 +2342,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2426,7 +2375,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2440,7 +2388,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2498,7 +2445,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2577,7 +2523,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2618,7 +2563,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -2641,7 +2585,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2688,7 +2631,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2729,7 +2671,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -2752,7 +2693,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2794,7 +2734,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2878,7 +2817,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3008,7 +2946,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "members": [ @@ -3027,7 +2964,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -3044,7 +2980,6 @@ "ctxt": 0 }, "value": "c0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3075,7 +3010,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -3101,7 +3035,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -3116,7 +3049,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -3142,7 +3074,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "value": null @@ -3193,7 +3124,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3236,7 +3166,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null @@ -3263,7 +3192,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -3312,7 +3240,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3348,7 +3275,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -3397,7 +3323,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3440,7 +3365,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -3478,7 +3402,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3545,7 +3468,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -3599,7 +3521,6 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3628,8 +3549,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3639,8 +3560,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ArrayPattern", @@ -3666,8 +3587,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -3713,7 +3634,6 @@ "ctxt": 0 }, "value": "c6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3742,8 +3662,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3753,8 +3673,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ArrayPattern", @@ -3787,8 +3707,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -3857,7 +3777,6 @@ "ctxt": 0 }, "value": "c0", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3881,7 +3800,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -3902,7 +3820,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -3925,7 +3842,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -3946,7 +3862,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "value": { @@ -3999,7 +3914,6 @@ "ctxt": 0 }, "value": "c0", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4023,7 +3937,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -4044,7 +3957,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -4072,7 +3984,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -4093,7 +4004,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "value": { @@ -4141,7 +4051,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4170,7 +4079,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4194,7 +4102,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -4236,7 +4143,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4278,7 +4184,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4302,7 +4207,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -4344,7 +4248,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4368,7 +4271,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -4410,7 +4312,6 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4520,7 +4421,6 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4642,7 +4542,6 @@ "ctxt": 0 }, "value": "d0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4663,8 +4562,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": true + "optional": true, + "typeAnnotation": null } } ], @@ -4698,7 +4597,6 @@ "ctxt": 0 }, "value": "d0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4726,8 +4624,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -4777,7 +4675,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4807,7 +4704,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4829,8 +4725,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4840,8 +4736,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4851,8 +4747,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": true, @@ -4878,7 +4774,6 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4907,7 +4802,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -4927,7 +4821,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -4947,7 +4840,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null @@ -4976,7 +4868,6 @@ "ctxt": 0 }, "value": "e0", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4998,8 +4889,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5009,8 +4900,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5020,8 +4911,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -5044,7 +4935,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5070,7 +4960,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -5101,7 +4990,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "function": { @@ -5147,7 +5035,6 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, "optional": false }, "function": { @@ -5193,7 +5080,6 @@ "ctxt": 0 }, "value": "e0", - "typeAnnotation": null, "optional": false }, "function": { @@ -5222,8 +5108,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5233,8 +5119,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5244,8 +5130,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -5300,7 +5186,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -5317,7 +5202,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5343,7 +5227,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "function": { @@ -5372,8 +5255,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5383,8 +5266,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5394,8 +5277,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -5444,7 +5327,6 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, "optional": false }, "function": { @@ -5480,7 +5362,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -5500,7 +5381,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -5520,7 +5400,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null @@ -5572,7 +5451,6 @@ "ctxt": 0 }, "value": "e0", - "typeAnnotation": null, "optional": false }, "function": { @@ -5601,8 +5479,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5612,8 +5490,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5623,8 +5501,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -5679,7 +5557,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -5696,7 +5573,6 @@ "ctxt": 0 }, "value": "d5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5739,7 +5615,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -5759,7 +5634,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -5786,7 +5660,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -5809,7 +5682,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -5870,7 +5742,6 @@ "ctxt": 0 }, "value": "d5", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -5887,7 +5758,6 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5918,7 +5788,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -5929,8 +5798,8 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -5969,7 +5838,6 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6005,7 +5873,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -6043,7 +5910,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6105,7 +5971,6 @@ "ctxt": 0 }, "value": "e3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6141,7 +6006,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -6179,7 +6043,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6241,7 +6104,6 @@ "ctxt": 0 }, "value": "e4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6272,7 +6134,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -6291,8 +6152,8 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6302,8 +6163,8 @@ "ctxt": 0 }, "value": "string", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6313,8 +6174,8 @@ "ctxt": 0 }, "value": "any", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -6357,7 +6218,6 @@ "ctxt": 0 }, "value": "e5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6388,7 +6248,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -6407,8 +6266,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6418,8 +6277,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6429,8 +6288,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -6470,7 +6329,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration1ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration1ES6/input.ts.json index 41c964a353c8..45d1a4827c0c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration1ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration1ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -45,8 +44,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -56,8 +55,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ArrayPattern", @@ -83,8 +82,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -217,7 +216,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -238,6 +236,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -269,7 +268,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -311,7 +309,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -339,8 +336,7 @@ } ] } - }, - "optional": false + } } } ], @@ -374,7 +370,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -410,7 +405,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "value": null @@ -430,7 +424,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "value": null @@ -445,7 +438,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "value": { @@ -471,7 +463,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": null @@ -491,7 +482,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": null @@ -511,7 +501,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "value": { @@ -530,8 +519,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -541,8 +530,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -552,8 +541,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -593,7 +582,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -635,7 +623,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -677,7 +664,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -715,7 +701,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -757,7 +742,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -804,7 +788,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -909,7 +892,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -945,7 +927,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -965,7 +946,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -1003,7 +983,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1045,7 +1024,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1119,7 +1097,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1229,7 +1206,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1339,7 +1315,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1367,8 +1342,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -1388,7 +1363,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1447,7 +1421,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1475,8 +1448,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -1512,8 +1485,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1533,7 +1506,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1556,7 +1528,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1567,7 +1538,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1607,7 +1577,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1645,7 +1614,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -1671,7 +1639,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -1686,7 +1653,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1712,7 +1678,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "value": null @@ -1749,7 +1714,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -1770,7 +1734,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1798,7 +1761,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1819,7 +1781,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "value": { @@ -1879,7 +1840,6 @@ "ctxt": 0 }, "value": "F1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1909,7 +1869,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1923,8 +1882,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1934,8 +1893,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ArrayPattern", @@ -1954,8 +1913,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1965,8 +1924,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1995,7 +1954,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": null @@ -2010,7 +1968,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": { @@ -2036,7 +1993,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "value": null @@ -2056,7 +2012,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "value": null @@ -2087,7 +2042,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2123,8 +2077,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2134,8 +2088,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2145,8 +2099,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -2170,7 +2124,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2195,7 +2148,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2235,7 +2187,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2279,8 +2230,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -2294,8 +2245,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ArrayPattern", @@ -2321,8 +2272,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2332,8 +2283,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -2375,7 +2326,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2392,7 +2342,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2426,7 +2375,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2440,7 +2388,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2498,7 +2445,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2577,7 +2523,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2618,7 +2563,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -2641,7 +2585,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2688,7 +2631,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2729,7 +2671,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -2752,7 +2693,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2789,7 +2729,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "members": [ @@ -2808,7 +2747,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -2825,7 +2763,6 @@ "ctxt": 0 }, "value": "c0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2856,7 +2793,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -2882,7 +2818,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -2897,7 +2832,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2923,7 +2857,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "value": null @@ -2974,7 +2907,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3017,7 +2949,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null @@ -3044,7 +2975,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -3093,7 +3023,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3129,7 +3058,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -3178,7 +3106,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3221,7 +3148,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -3259,7 +3185,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3326,7 +3251,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -3380,7 +3304,6 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3409,8 +3332,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3420,8 +3343,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ArrayPattern", @@ -3447,8 +3370,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -3494,7 +3417,6 @@ "ctxt": 0 }, "value": "c6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3523,8 +3445,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3534,8 +3456,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ArrayPattern", @@ -3568,8 +3490,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -3638,7 +3560,6 @@ "ctxt": 0 }, "value": "c0", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3662,7 +3583,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -3683,7 +3603,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -3706,7 +3625,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -3727,7 +3645,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "value": { @@ -3780,7 +3697,6 @@ "ctxt": 0 }, "value": "c0", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3804,7 +3720,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -3825,7 +3740,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -3853,7 +3767,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -3874,7 +3787,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "value": { @@ -3922,7 +3834,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3951,7 +3862,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3975,7 +3885,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -4017,7 +3926,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4059,7 +3967,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4083,7 +3990,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -4125,7 +4031,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4149,7 +4054,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -4191,7 +4095,6 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4301,7 +4204,6 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4428,7 +4330,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4458,7 +4359,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4480,8 +4380,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4491,8 +4391,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4502,8 +4402,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": true, @@ -4529,7 +4429,6 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4558,7 +4457,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -4578,7 +4476,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -4598,7 +4495,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null @@ -4627,7 +4523,6 @@ "ctxt": 0 }, "value": "e0", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4649,8 +4544,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4660,8 +4555,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4671,8 +4566,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -4695,7 +4590,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4721,7 +4615,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -4752,7 +4645,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "function": { @@ -4798,7 +4690,6 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, "optional": false }, "function": { @@ -4844,7 +4735,6 @@ "ctxt": 0 }, "value": "e0", - "typeAnnotation": null, "optional": false }, "function": { @@ -4873,8 +4763,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4884,8 +4774,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4895,8 +4785,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -4951,7 +4841,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -4968,7 +4857,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4994,7 +4882,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "function": { @@ -5023,8 +4910,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5034,8 +4921,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5045,8 +4932,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -5095,7 +4982,6 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, "optional": false }, "function": { @@ -5131,7 +5017,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -5151,7 +5036,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -5171,7 +5055,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null @@ -5223,7 +5106,6 @@ "ctxt": 0 }, "value": "e0", - "typeAnnotation": null, "optional": false }, "function": { @@ -5252,8 +5134,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5263,8 +5145,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5274,8 +5156,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -5330,7 +5212,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -5347,7 +5228,6 @@ "ctxt": 0 }, "value": "d5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5390,7 +5270,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -5410,7 +5289,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -5437,7 +5315,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -5460,7 +5337,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -5521,7 +5397,6 @@ "ctxt": 0 }, "value": "d5", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -5538,7 +5413,6 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5569,7 +5443,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -5580,8 +5453,8 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -5620,7 +5493,6 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5656,7 +5528,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -5694,7 +5565,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5756,7 +5626,6 @@ "ctxt": 0 }, "value": "e3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5792,7 +5661,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -5830,7 +5698,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5892,7 +5759,6 @@ "ctxt": 0 }, "value": "e4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5923,7 +5789,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -5942,8 +5807,8 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5953,8 +5818,8 @@ "ctxt": 0 }, "value": "string", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5964,8 +5829,8 @@ "ctxt": 0 }, "value": "any", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -6008,7 +5873,6 @@ "ctxt": 0 }, "value": "e5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6039,7 +5903,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -6058,8 +5921,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6069,8 +5932,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6080,8 +5943,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -6121,7 +5984,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6238,7 +6100,6 @@ "ctxt": 0 }, "value": "e6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6269,7 +6130,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -6288,8 +6148,8 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6299,8 +6159,8 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6310,8 +6170,8 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration3ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration3ES5/input.ts.json index 32f29d54b47d..cac3ac8939d6 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration3ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration3ES5/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "arrayString", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -41,7 +40,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -92,7 +89,6 @@ "ctxt": 0 }, "value": "someArray", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -119,7 +115,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -145,7 +140,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -189,7 +183,6 @@ "ctxt": 0 }, "value": "stringOrNumArray", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -208,7 +201,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -242,7 +234,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -262,7 +253,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -283,7 +273,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -316,8 +305,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -404,7 +393,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -437,8 +425,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -474,7 +462,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -507,8 +494,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -532,7 +519,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -558,7 +544,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -600,7 +585,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -633,8 +617,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -658,7 +642,6 @@ "ctxt": 0 }, "value": "arrayString", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -697,7 +680,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -730,8 +712,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -755,7 +737,6 @@ "ctxt": 0 }, "value": "stringOrNumArray", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -794,7 +775,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -823,8 +803,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -834,8 +814,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ArrayPattern", @@ -861,8 +841,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -908,7 +888,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -937,8 +916,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -948,8 +927,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ArrayPattern", @@ -975,8 +954,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1006,8 +985,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1047,7 +1026,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1076,8 +1054,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1087,8 +1065,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1098,8 +1076,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -1121,8 +1099,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1201,8 +1179,8 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1279,8 +1257,8 @@ "ctxt": 0 }, "value": "array2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1359,7 +1337,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1387,7 +1364,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false } } @@ -1420,7 +1396,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1438,7 +1413,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false } } @@ -1468,7 +1442,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1602,7 +1575,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1736,7 +1708,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1839,7 +1810,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1906,7 +1876,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1961,7 +1930,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1994,8 +1962,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2026,7 +1994,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2076,7 +2043,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2108,7 +2074,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2216,7 +2181,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2275,7 +2239,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -2294,7 +2257,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -2314,7 +2276,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -2338,7 +2299,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "members": [ @@ -2357,7 +2317,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -2377,7 +2336,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -2394,7 +2352,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2427,8 +2384,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2459,7 +2416,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2509,7 +2465,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2527,7 +2482,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2560,7 +2514,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2617,7 +2570,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2628,7 +2580,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2660,7 +2611,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2717,7 +2667,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2728,7 +2677,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2751,7 +2699,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2762,7 +2709,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration3ES5iterable/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration3ES5iterable/input.ts.json index 8bdc31c0626d..0a29dd4f3105 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration3ES5iterable/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration3ES5iterable/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "arrayString", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -41,7 +40,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -92,7 +89,6 @@ "ctxt": 0 }, "value": "someArray", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -119,7 +115,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -145,7 +140,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -189,7 +183,6 @@ "ctxt": 0 }, "value": "stringOrNumArray", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -208,7 +201,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -242,7 +234,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -262,7 +253,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -283,7 +273,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -316,8 +305,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -404,7 +393,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -437,8 +425,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -474,7 +462,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -507,8 +494,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -532,7 +519,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -558,7 +544,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -600,7 +585,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -633,8 +617,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -658,7 +642,6 @@ "ctxt": 0 }, "value": "arrayString", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -697,7 +680,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -730,8 +712,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -755,7 +737,6 @@ "ctxt": 0 }, "value": "stringOrNumArray", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -794,7 +775,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -823,8 +803,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -834,8 +814,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ArrayPattern", @@ -861,8 +841,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -908,7 +888,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -937,8 +916,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -948,8 +927,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ArrayPattern", @@ -975,8 +954,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1006,8 +985,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1047,7 +1026,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1076,8 +1054,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1087,8 +1065,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1098,8 +1076,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -1121,8 +1099,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1201,8 +1179,8 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1279,8 +1257,8 @@ "ctxt": 0 }, "value": "array2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1359,7 +1337,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1387,7 +1364,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false } } @@ -1420,7 +1396,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1438,7 +1413,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false } } @@ -1468,7 +1442,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1602,7 +1575,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1736,7 +1708,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1839,7 +1810,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1906,7 +1876,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1961,7 +1930,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1994,8 +1962,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2026,7 +1994,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2076,7 +2043,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2108,7 +2074,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2216,7 +2181,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2275,7 +2239,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -2294,7 +2257,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -2314,7 +2276,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -2338,7 +2299,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "members": [ @@ -2357,7 +2317,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -2377,7 +2336,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -2394,7 +2352,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2427,8 +2384,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2459,7 +2416,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2509,7 +2465,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2527,7 +2482,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2560,7 +2514,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2617,7 +2570,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2628,7 +2580,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2660,7 +2611,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2717,7 +2667,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2728,7 +2677,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2751,7 +2699,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2762,7 +2709,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration3ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration3ES6/input.ts.json index 32f29d54b47d..cac3ac8939d6 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration3ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration3ES6/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "arrayString", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -41,7 +40,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -92,7 +89,6 @@ "ctxt": 0 }, "value": "someArray", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -119,7 +115,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -145,7 +140,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -189,7 +183,6 @@ "ctxt": 0 }, "value": "stringOrNumArray", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -208,7 +201,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -242,7 +234,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -262,7 +253,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -283,7 +273,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -316,8 +305,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -404,7 +393,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -437,8 +425,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -474,7 +462,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -507,8 +494,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -532,7 +519,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -558,7 +544,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -600,7 +585,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -633,8 +617,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -658,7 +642,6 @@ "ctxt": 0 }, "value": "arrayString", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -697,7 +680,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -730,8 +712,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -755,7 +737,6 @@ "ctxt": 0 }, "value": "stringOrNumArray", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -794,7 +775,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -823,8 +803,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -834,8 +814,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ArrayPattern", @@ -861,8 +841,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -908,7 +888,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -937,8 +916,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -948,8 +927,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ArrayPattern", @@ -975,8 +954,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1006,8 +985,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1047,7 +1026,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1076,8 +1054,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1087,8 +1065,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1098,8 +1076,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -1121,8 +1099,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1201,8 +1179,8 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1279,8 +1257,8 @@ "ctxt": 0 }, "value": "array2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1359,7 +1337,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1387,7 +1364,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false } } @@ -1420,7 +1396,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1438,7 +1413,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false } } @@ -1468,7 +1442,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1602,7 +1575,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1736,7 +1708,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1839,7 +1810,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1906,7 +1876,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1961,7 +1930,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1994,8 +1962,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2026,7 +1994,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2076,7 +2043,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2108,7 +2074,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2216,7 +2181,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2275,7 +2239,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -2294,7 +2257,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -2314,7 +2276,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -2338,7 +2299,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "members": [ @@ -2357,7 +2317,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -2377,7 +2336,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -2394,7 +2352,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2427,8 +2384,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2459,7 +2416,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2509,7 +2465,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2527,7 +2482,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2560,7 +2514,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2617,7 +2570,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2628,7 +2580,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2660,7 +2611,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2717,7 +2667,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2728,7 +2677,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2751,7 +2699,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2762,7 +2709,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration5/input.ts.json index 6410bbf773c8..aed22c3a7302 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration5/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "Class", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -73,7 +71,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -127,7 +123,6 @@ "ctxt": 0 }, "value": "SubClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -153,7 +148,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -199,7 +193,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -251,7 +244,6 @@ "ctxt": 0 }, "value": "Class", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -269,7 +261,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -295,7 +286,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -341,7 +331,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -378,7 +367,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -395,7 +383,6 @@ "ctxt": 0 }, "value": "SubD", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -421,7 +408,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -467,7 +453,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -519,7 +504,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -537,7 +521,6 @@ "ctxt": 0 }, "value": "d0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -580,7 +563,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -607,7 +589,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -625,7 +606,6 @@ "ctxt": 0 }, "value": "Class", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -678,7 +658,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -696,7 +675,6 @@ "ctxt": 0 }, "value": "Class", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -717,7 +695,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -753,7 +730,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -791,7 +767,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -820,7 +795,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -874,7 +848,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -892,7 +865,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -913,7 +885,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -949,7 +920,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -987,7 +957,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1016,7 +985,6 @@ "ctxt": 0 }, "value": "Class", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1070,7 +1038,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1088,7 +1055,6 @@ "ctxt": 0 }, "value": "Class", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1109,7 +1075,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1145,7 +1110,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -1183,7 +1147,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1212,7 +1175,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1266,7 +1228,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1284,7 +1245,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1305,7 +1265,6 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1348,7 +1307,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -1375,7 +1333,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1393,7 +1350,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1446,7 +1402,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1464,7 +1419,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1500,8 +1454,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1518,7 +1472,6 @@ "ctxt": 0 }, "value": "Class", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1550,7 +1503,6 @@ "ctxt": 0 }, "value": "d0", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1574,7 +1526,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1616,7 +1567,6 @@ "ctxt": 0 }, "value": "d0", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1640,7 +1590,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1682,7 +1631,6 @@ "ctxt": 0 }, "value": "d0", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1706,7 +1654,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1753,7 +1700,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1777,7 +1723,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1795,7 +1740,6 @@ "ctxt": 0 }, "value": "Class", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1831,7 +1775,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1855,7 +1798,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1897,7 +1839,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1921,7 +1862,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1968,7 +1908,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1992,7 +1931,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -2010,7 +1948,6 @@ "ctxt": 0 }, "value": "SubClass", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2046,7 +1983,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2070,7 +2006,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -2112,7 +2047,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2136,7 +2070,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2154,7 +2087,6 @@ "ctxt": 0 }, "value": "SubD", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2190,7 +2122,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2214,7 +2145,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2232,7 +2162,6 @@ "ctxt": 0 }, "value": "SubClass", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2268,7 +2197,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2292,7 +2220,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2310,7 +2237,6 @@ "ctxt": 0 }, "value": "Class", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2346,7 +2272,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2388,7 +2313,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2412,7 +2336,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2454,7 +2377,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2478,7 +2400,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration7ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration7ES5/input.ts.json index 8645fa216748..7e2511fc3fae 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration7ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration7ES5/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "ISomething", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -132,7 +129,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -188,7 +184,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null @@ -208,7 +203,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null @@ -237,7 +231,6 @@ "ctxt": 0 }, "value": "ISomething", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -276,7 +269,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -332,7 +324,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null @@ -352,7 +343,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null @@ -381,7 +371,6 @@ "ctxt": 0 }, "value": "ISomething", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -420,7 +409,6 @@ "ctxt": 0 }, "value": "one", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -496,7 +484,6 @@ "ctxt": 0 }, "value": "two", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -545,8 +532,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -556,8 +543,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -567,8 +554,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration7ES5iterable/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration7ES5iterable/input.ts.json index d13a75448489..ad6ac7698ed6 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration7ES5iterable/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration7ES5iterable/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "ISomething", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -132,7 +129,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -188,7 +184,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null @@ -208,7 +203,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null @@ -237,7 +231,6 @@ "ctxt": 0 }, "value": "ISomething", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -276,7 +269,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -332,7 +324,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null @@ -352,7 +343,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null @@ -381,7 +371,6 @@ "ctxt": 0 }, "value": "ISomething", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -420,7 +409,6 @@ "ctxt": 0 }, "value": "one", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -496,7 +484,6 @@ "ctxt": 0 }, "value": "two", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -545,8 +532,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -556,8 +543,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -567,8 +554,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration8/input.ts.json index a1d818e3c68b..d33484196d57 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringParameterDeclaration8/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,7 +51,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "value": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "value": { @@ -106,7 +103,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -162,7 +158,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -249,7 +244,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -287,7 +281,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -398,7 +391,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false } }, @@ -417,7 +409,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -450,7 +441,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -492,7 +482,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -516,7 +505,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "value": { @@ -544,7 +532,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "value": { @@ -565,7 +552,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -615,7 +601,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -639,7 +624,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "value": { @@ -667,7 +651,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "value": { @@ -688,7 +671,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -738,7 +720,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -762,7 +743,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "value": { @@ -790,7 +770,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "value": { @@ -811,7 +790,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringReassignsRightHandSide/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringReassignsRightHandSide/input.ts.json index 9ddebe13c857..ce94b6d4fd59 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringReassignsRightHandSide/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringReassignsRightHandSide/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -68,7 +68,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -91,7 +90,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -135,6 +133,7 @@ "ctxt": 0 }, "value": "bar", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -151,8 +150,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -204,7 +202,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null @@ -224,7 +221,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null @@ -241,7 +237,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -287,7 +282,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null @@ -307,7 +301,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null @@ -324,7 +317,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringSameNames/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringSameNames/input.ts.json index 38839242dd04..9ac6077db622 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringSameNames/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringSameNames/input.ts.json @@ -46,7 +46,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null @@ -61,7 +60,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -72,8 +70,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -98,7 +96,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -162,7 +159,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null @@ -209,7 +204,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -272,7 +266,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null @@ -287,7 +280,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -298,8 +290,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -324,7 +316,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -382,7 +373,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -393,8 +383,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -412,7 +402,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null @@ -439,7 +428,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -502,7 +490,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null @@ -517,7 +504,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -528,8 +514,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -554,7 +540,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -577,7 +562,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -635,7 +619,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -646,8 +629,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -665,7 +648,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null @@ -692,7 +674,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -715,7 +696,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -773,7 +753,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -784,8 +763,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -798,7 +777,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -809,8 +787,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -835,7 +813,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -893,7 +870,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -904,8 +880,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -918,7 +894,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -929,8 +904,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -955,7 +930,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -978,7 +952,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -1036,7 +1009,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1047,8 +1019,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1061,7 +1033,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1072,8 +1043,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1098,7 +1069,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1147,8 +1117,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1158,8 +1128,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1232,8 +1202,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1243,8 +1213,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1317,8 +1287,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1328,8 +1298,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1339,8 +1309,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1425,8 +1395,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1436,8 +1406,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1447,8 +1417,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1533,8 +1503,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1544,8 +1514,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1555,8 +1525,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1650,7 +1620,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "value": null @@ -1670,7 +1639,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "value": null @@ -1697,7 +1665,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "value": { @@ -1756,7 +1723,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "value": null @@ -1771,7 +1737,6 @@ "ctxt": 0 }, "value": "bar2", - "typeAnnotation": null, "optional": false }, "value": { @@ -1782,8 +1747,8 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1808,7 +1773,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "value": { @@ -1831,7 +1795,6 @@ "ctxt": 0 }, "value": "bar2", - "typeAnnotation": null, "optional": false }, "value": { @@ -1885,7 +1848,6 @@ "ctxt": 0 }, "value": "bar3", - "typeAnnotation": null, "optional": false }, "value": { @@ -1896,8 +1858,8 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1915,7 +1877,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "value": null @@ -1942,7 +1903,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "value": { @@ -1965,7 +1925,6 @@ "ctxt": 0 }, "value": "bar3", - "typeAnnotation": null, "optional": false }, "value": { @@ -2024,7 +1983,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "value": null @@ -2044,7 +2002,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "value": null @@ -2071,7 +2028,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "value": { @@ -2130,7 +2086,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "value": null @@ -2145,7 +2100,6 @@ "ctxt": 0 }, "value": "bar5", - "typeAnnotation": null, "optional": false }, "value": { @@ -2156,8 +2110,8 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -2182,7 +2136,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "value": { @@ -2205,7 +2158,6 @@ "ctxt": 0 }, "value": "bar5", - "typeAnnotation": null, "optional": false }, "value": { @@ -2259,7 +2211,6 @@ "ctxt": 0 }, "value": "bar6", - "typeAnnotation": null, "optional": false }, "value": { @@ -2270,8 +2221,8 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -2289,7 +2240,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "value": null @@ -2316,7 +2266,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "value": { @@ -2339,7 +2288,6 @@ "ctxt": 0 }, "value": "bar6", - "typeAnnotation": null, "optional": false }, "value": { @@ -2391,8 +2339,8 @@ "ctxt": 0 }, "value": "blah1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2402,8 +2350,8 @@ "ctxt": 0 }, "value": "blah1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -2480,8 +2428,8 @@ "ctxt": 0 }, "value": "blah2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2491,8 +2439,8 @@ "ctxt": 0 }, "value": "blah2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringSpread/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringSpread/input.ts.json index ba43cb643385..d98c2cf10823 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringSpread/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringSpread/input.ts.json @@ -46,7 +46,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -90,7 +89,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -149,7 +147,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -176,7 +173,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -252,7 +248,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null @@ -272,7 +267,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -292,7 +286,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -319,7 +312,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -357,7 +349,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -380,7 +371,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -442,7 +432,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null @@ -462,7 +451,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null @@ -482,7 +470,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": null @@ -502,7 +489,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": null @@ -522,7 +508,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "value": null @@ -594,7 +579,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -620,7 +604,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -646,7 +629,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": { @@ -672,7 +654,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_1/input.ts.json index 2ec414ece5d3..11ee2c80bdd8 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_1/input.ts.json @@ -46,7 +46,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -77,7 +76,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_2/input.ts.json index 3ee855a1c3ee..56d415b81fe9 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_2/input.ts.json @@ -46,7 +46,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -84,7 +83,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_3/input.ts.json index 91efd8473ae2..816ccf3e2802 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_3/input.ts.json @@ -46,7 +46,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -84,7 +83,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_4/input.ts.json index e1843ebb4610..acc241e829f5 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_4/input.ts.json @@ -46,7 +46,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -84,7 +83,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_5/input.ts.json index f59670b4efe0..71d89b937b39 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_5/input.ts.json @@ -46,7 +46,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_6/input.ts.json index 134cee883c2a..2b8f3ec01a5f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_6/input.ts.json @@ -46,7 +46,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -77,7 +76,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_7/input.ts.json index 8a36a16da3a9..3f1d2d4a0af5 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringTypeAssertionsES5_7/input.ts.json @@ -46,7 +46,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -84,7 +83,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringVariableDeclaration1ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringVariableDeclaration1ES5/input.ts.json index 92d7612a17a0..ce656b2443b3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringVariableDeclaration1ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringVariableDeclaration1ES5/input.ts.json @@ -46,7 +46,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "value": null @@ -66,7 +65,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "value": null @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -146,7 +143,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -194,7 +190,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "value": { @@ -217,7 +212,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "value": { @@ -274,8 +268,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ArrayPattern", @@ -301,8 +295,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -320,8 +314,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -552,7 +546,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "value": { @@ -585,7 +578,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false }, "value": null @@ -612,7 +604,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false }, "value": { @@ -657,7 +648,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "value": { @@ -678,7 +668,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false }, "value": { @@ -730,8 +719,8 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -751,7 +740,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "value": { @@ -774,7 +762,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "value": { @@ -838,8 +825,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -867,8 +854,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -896,8 +883,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -907,7 +894,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -968,7 +954,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "value": { @@ -991,7 +976,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "value": { @@ -1058,8 +1042,8 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1087,8 +1071,8 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -1116,8 +1100,8 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1127,7 +1111,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1154,7 +1137,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1168,7 +1150,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1182,7 +1163,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1237,8 +1217,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1341,8 +1321,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1450,8 +1430,8 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1461,8 +1441,8 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1536,8 +1516,8 @@ "ctxt": 0 }, "value": "temp1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1622,8 +1602,8 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1633,8 +1613,8 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1691,7 +1671,6 @@ "ctxt": 0 }, "value": "temp1", - "typeAnnotation": null, "optional": false } } @@ -1736,7 +1715,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": { @@ -1755,8 +1733,8 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1766,8 +1744,8 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "AssignmentPattern", @@ -1784,8 +1762,8 @@ "ctxt": 0 }, "value": "e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1805,7 +1783,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "value": { @@ -1828,7 +1805,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "value": { @@ -1872,7 +1848,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": { @@ -1927,7 +1902,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "value": { @@ -1950,7 +1924,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "value": { @@ -2010,7 +1983,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -2029,8 +2001,8 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2040,8 +2012,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ObjectPattern", @@ -2061,7 +2033,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "value": { @@ -2072,8 +2043,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -2091,7 +2062,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "value": null @@ -2127,7 +2097,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -2182,7 +2151,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "value": { @@ -2205,7 +2173,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "value": { @@ -2265,7 +2232,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "value": { @@ -2291,7 +2257,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "value": { @@ -2312,7 +2277,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2368,7 +2332,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2406,7 +2369,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2467,7 +2429,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "value": { @@ -2488,7 +2449,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "value": { @@ -2570,7 +2530,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "value": { @@ -2596,7 +2555,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "value": { @@ -2617,7 +2575,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2673,7 +2630,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2711,7 +2667,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2772,7 +2727,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "value": { @@ -2793,7 +2747,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringVariableDeclaration1ES5iterable/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringVariableDeclaration1ES5iterable/input.ts.json index 530554dc6ace..2656086ba1d3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringVariableDeclaration1ES5iterable/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringVariableDeclaration1ES5iterable/input.ts.json @@ -46,7 +46,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "value": null @@ -66,7 +65,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "value": null @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -146,7 +143,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -194,7 +190,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "value": { @@ -217,7 +212,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "value": { @@ -274,8 +268,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ArrayPattern", @@ -301,8 +295,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -320,8 +314,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -552,7 +546,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "value": { @@ -585,7 +578,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false }, "value": null @@ -612,7 +604,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false }, "value": { @@ -657,7 +648,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "value": { @@ -678,7 +668,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false }, "value": { @@ -730,8 +719,8 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -751,7 +740,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "value": { @@ -774,7 +762,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "value": { @@ -838,8 +825,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -867,8 +854,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -896,8 +883,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -907,7 +894,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -968,7 +954,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "value": { @@ -991,7 +976,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "value": { @@ -1058,8 +1042,8 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1087,8 +1071,8 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -1116,8 +1100,8 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1127,7 +1111,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1154,7 +1137,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1168,7 +1150,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1182,7 +1163,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1237,8 +1217,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1341,8 +1321,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1450,8 +1430,8 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1461,8 +1441,8 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1536,8 +1516,8 @@ "ctxt": 0 }, "value": "temp1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1622,8 +1602,8 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1633,8 +1613,8 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1691,7 +1671,6 @@ "ctxt": 0 }, "value": "temp1", - "typeAnnotation": null, "optional": false } } @@ -1736,7 +1715,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": { @@ -1755,8 +1733,8 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1766,8 +1744,8 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "AssignmentPattern", @@ -1784,8 +1762,8 @@ "ctxt": 0 }, "value": "e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1805,7 +1783,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "value": { @@ -1828,7 +1805,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "value": { @@ -1872,7 +1848,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": { @@ -1927,7 +1902,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "value": { @@ -1950,7 +1924,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "value": { @@ -2010,7 +1983,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -2029,8 +2001,8 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2040,8 +2012,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ObjectPattern", @@ -2061,7 +2033,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "value": { @@ -2072,8 +2043,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -2091,7 +2062,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "value": null @@ -2127,7 +2097,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -2182,7 +2151,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "value": { @@ -2205,7 +2173,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "value": { @@ -2265,7 +2232,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "value": { @@ -2291,7 +2257,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "value": { @@ -2312,7 +2277,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2368,7 +2332,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2406,7 +2369,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2467,7 +2429,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "value": { @@ -2488,7 +2449,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "value": { @@ -2570,7 +2530,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "value": { @@ -2596,7 +2555,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "value": { @@ -2617,7 +2575,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2673,7 +2630,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2711,7 +2667,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2772,7 +2727,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "value": { @@ -2793,7 +2747,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringVariableDeclaration1ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringVariableDeclaration1ES6/input.ts.json index ee4bbf6c9666..a454de60b187 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringVariableDeclaration1ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringVariableDeclaration1ES6/input.ts.json @@ -46,7 +46,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "value": null @@ -66,7 +65,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "value": null @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -146,7 +143,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -194,7 +190,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "value": { @@ -217,7 +212,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "value": { @@ -274,8 +268,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ArrayPattern", @@ -301,8 +295,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -320,8 +314,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -552,7 +546,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "value": { @@ -585,7 +578,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false }, "value": null @@ -612,7 +604,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false }, "value": { @@ -657,7 +648,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "value": { @@ -678,7 +668,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false }, "value": { @@ -730,8 +719,8 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -751,7 +740,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "value": { @@ -774,7 +762,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "value": { @@ -838,8 +825,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -867,8 +854,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -896,8 +883,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -907,7 +894,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -968,7 +954,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "value": { @@ -991,7 +976,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "value": { @@ -1058,8 +1042,8 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1087,8 +1071,8 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -1116,8 +1100,8 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1127,7 +1111,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1154,7 +1137,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1168,7 +1150,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1182,7 +1163,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1237,8 +1217,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1341,8 +1321,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1450,8 +1430,8 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1461,8 +1441,8 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1536,8 +1516,8 @@ "ctxt": 0 }, "value": "temp1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1622,8 +1602,8 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1633,8 +1613,8 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1691,7 +1671,6 @@ "ctxt": 0 }, "value": "temp1", - "typeAnnotation": null, "optional": false } } @@ -1736,7 +1715,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": { @@ -1755,8 +1733,8 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1766,8 +1744,8 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "AssignmentPattern", @@ -1784,8 +1762,8 @@ "ctxt": 0 }, "value": "e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1805,7 +1783,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "value": { @@ -1828,7 +1805,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "value": { @@ -1872,7 +1848,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": { @@ -1927,7 +1902,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "value": { @@ -1950,7 +1924,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "value": { @@ -2010,7 +1983,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -2029,8 +2001,8 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2040,8 +2012,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ObjectPattern", @@ -2061,7 +2033,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "value": { @@ -2072,8 +2043,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -2091,7 +2062,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "value": null @@ -2127,7 +2097,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -2182,7 +2151,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "value": { @@ -2205,7 +2173,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "value": { @@ -2265,7 +2232,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "value": { @@ -2291,7 +2257,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "value": { @@ -2312,7 +2277,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2368,7 +2332,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2406,7 +2369,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2467,7 +2429,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "value": { @@ -2488,7 +2449,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "value": { @@ -2570,7 +2530,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "value": { @@ -2596,7 +2555,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "value": { @@ -2617,7 +2575,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2673,7 +2630,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2711,7 +2667,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2772,7 +2727,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "value": { @@ -2793,7 +2747,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringVariableDeclaration2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringVariableDeclaration2/input.ts.json index cd9cc6ba0265..4d7c83627900 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringVariableDeclaration2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringVariableDeclaration2/input.ts.json @@ -46,7 +46,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "value": null @@ -66,7 +65,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "value": null @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -146,7 +143,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -194,7 +190,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "value": { @@ -217,7 +212,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "value": { @@ -269,8 +263,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ArrayPattern", @@ -296,8 +290,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -315,8 +309,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -532,8 +526,8 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -553,7 +547,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "value": { @@ -576,7 +569,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "value": { @@ -640,8 +632,8 @@ "ctxt": 0 }, "value": "b0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -669,8 +661,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -698,8 +690,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -709,7 +701,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -770,7 +761,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "value": { @@ -793,7 +783,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "value": { @@ -848,8 +837,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -859,8 +848,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "ObjectPattern", @@ -880,7 +869,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "value": { @@ -891,8 +879,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -910,7 +898,6 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, "optional": false }, "value": null @@ -940,8 +927,8 @@ "ctxt": 0 }, "value": "c6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1001,7 +988,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "value": { @@ -1024,7 +1010,6 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, "optional": false }, "value": { @@ -1081,7 +1066,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -1107,7 +1091,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "value": { @@ -1187,7 +1170,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1225,7 +1207,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1286,7 +1267,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -1307,7 +1287,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringVoid/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringVoid/input.ts.json index 712b12bc4cdf..5611fea0be4e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringVoid/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringVoid/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -91,7 +91,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringVoidStrictNullChecks/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringVoidStrictNullChecks/input.ts.json index 66f55aa7f116..b23aa3da7f8d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringVoidStrictNullChecks/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringVoidStrictNullChecks/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -91,7 +91,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringWithLiteralInitializers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringWithLiteralInitializers/input.ts.json index 03252183c06b..7ebc12a3f98c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringWithLiteralInitializers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringWithLiteralInitializers/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,7 +51,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -125,7 +122,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -149,7 +145,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -172,7 +167,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -202,7 +196,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -238,7 +231,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -319,7 +310,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -343,7 +333,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -385,7 +374,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -409,7 +397,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -432,7 +419,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -462,7 +448,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -498,7 +483,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -526,7 +510,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -587,7 +570,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -629,7 +611,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -653,7 +634,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -695,7 +675,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -719,7 +698,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -761,7 +739,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -785,7 +762,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -808,7 +784,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -838,7 +813,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -881,7 +855,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -901,7 +874,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -928,7 +900,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -951,7 +922,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1012,7 +982,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1041,7 +1010,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1065,7 +1033,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1088,7 +1055,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1118,7 +1084,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1161,7 +1126,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -1181,7 +1145,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1216,7 +1179,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1277,7 +1239,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1306,7 +1267,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1330,7 +1290,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1372,7 +1331,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1396,7 +1354,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1419,7 +1376,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1449,7 +1405,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1492,7 +1447,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1520,7 +1474,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1592,7 +1545,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1621,7 +1573,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1663,7 +1614,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1687,7 +1637,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1729,7 +1678,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1753,7 +1701,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1795,7 +1742,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1819,7 +1765,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1842,7 +1787,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1872,7 +1816,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1910,7 +1853,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1936,7 +1878,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1964,7 +1905,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2004,7 +1944,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2065,7 +2004,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2094,7 +2032,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2118,7 +2055,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2160,7 +2096,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2184,7 +2119,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2205,7 +2139,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -2250,7 +2183,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2274,7 +2206,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2295,7 +2226,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2340,7 +2270,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2364,7 +2293,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2385,7 +2313,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -2408,7 +2335,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2441,7 +2367,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2470,8 +2395,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2481,8 +2406,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -2532,7 +2457,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2587,7 +2511,6 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2623,8 +2546,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -2652,8 +2575,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -2714,7 +2637,6 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2769,7 +2691,6 @@ "ctxt": 0 }, "value": "g3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2805,8 +2726,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2816,8 +2737,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -2903,7 +2824,6 @@ "ctxt": 0 }, "value": "g3", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2932,7 +2852,6 @@ "ctxt": 0 }, "value": "g3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2987,7 +2906,6 @@ "ctxt": 0 }, "value": "g4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3023,8 +2941,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "AssignmentPattern", @@ -3041,8 +2959,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -3127,7 +3045,6 @@ "ctxt": 0 }, "value": "g4", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3156,7 +3073,6 @@ "ctxt": 0 }, "value": "g4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3211,7 +3127,6 @@ "ctxt": 0 }, "value": "g5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3254,8 +3169,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -3283,8 +3198,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -3356,7 +3271,6 @@ "ctxt": 0 }, "value": "g5", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3385,7 +3299,6 @@ "ctxt": 0 }, "value": "g5", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringWithLiteralInitializers2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringWithLiteralInitializers2/input.ts.json index 6c4598b1b4f3..7c2935271c76 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringWithLiteralInitializers2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/destructuringWithLiteralInitializers2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f00", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -45,8 +44,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -56,8 +55,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -95,7 +94,6 @@ "ctxt": 0 }, "value": "f01", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -131,8 +129,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -142,8 +140,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -192,7 +190,6 @@ "ctxt": 0 }, "value": "f02", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -228,8 +225,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -239,8 +236,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -302,7 +299,6 @@ "ctxt": 0 }, "value": "f03", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -338,8 +334,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -349,8 +345,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -429,7 +425,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -465,8 +460,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -487,8 +482,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -526,7 +521,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -569,8 +563,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -591,8 +585,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -641,7 +635,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -684,8 +677,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -706,8 +699,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -769,7 +762,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -812,8 +804,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -834,8 +826,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -914,7 +906,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -950,8 +941,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -979,8 +970,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -1034,7 +1025,6 @@ "ctxt": 0 }, "value": "f21", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1077,8 +1067,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1106,8 +1096,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -1172,7 +1162,6 @@ "ctxt": 0 }, "value": "f22", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1215,8 +1204,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1244,8 +1233,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -1323,7 +1312,6 @@ "ctxt": 0 }, "value": "f23", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1366,8 +1354,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1395,8 +1383,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -1506,6 +1494,7 @@ "ctxt": 0 }, "value": "nx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1541,8 +1530,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1574,6 +1562,7 @@ "ctxt": 0 }, "value": "sx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1609,8 +1598,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1627,7 +1615,6 @@ "ctxt": 0 }, "value": "f30", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1663,8 +1650,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1692,8 +1679,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -1747,7 +1734,6 @@ "ctxt": 0 }, "value": "f31", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1790,8 +1776,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1819,8 +1805,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -1885,7 +1871,6 @@ "ctxt": 0 }, "value": "f32", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1928,8 +1913,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1957,8 +1942,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -1998,7 +1983,6 @@ "ctxt": 0 }, "value": "nx", - "typeAnnotation": null, "optional": false } } @@ -2038,7 +2022,6 @@ "ctxt": 0 }, "value": "f33", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2081,8 +2064,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -2110,8 +2093,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -2151,7 +2134,6 @@ "ctxt": 0 }, "value": "nx", - "typeAnnotation": null, "optional": false } }, @@ -2165,7 +2147,6 @@ "ctxt": 0 }, "value": "sx", - "typeAnnotation": null, "optional": false } } @@ -2205,7 +2186,6 @@ "ctxt": 0 }, "value": "f40", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2241,8 +2221,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -2270,8 +2250,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -2325,7 +2305,6 @@ "ctxt": 0 }, "value": "f41", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2368,8 +2347,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -2397,8 +2376,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -2463,7 +2442,6 @@ "ctxt": 0 }, "value": "f42", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2506,8 +2484,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -2535,8 +2513,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -2576,7 +2554,6 @@ "ctxt": 0 }, "value": "sx", - "typeAnnotation": null, "optional": false } } @@ -2616,7 +2593,6 @@ "ctxt": 0 }, "value": "f43", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2659,8 +2635,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -2688,8 +2664,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -2729,7 +2705,6 @@ "ctxt": 0 }, "value": "sx", - "typeAnnotation": null, "optional": false } }, @@ -2743,7 +2718,6 @@ "ctxt": 0 }, "value": "nx", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyArrayBindingPatternParameter01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyArrayBindingPatternParameter01/input.ts.json index 7cbe0c4ee077..a63fbe4b5e63 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyArrayBindingPatternParameter01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyArrayBindingPatternParameter01/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -81,8 +80,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -102,8 +101,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -123,8 +122,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyArrayBindingPatternParameter02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyArrayBindingPatternParameter02/input.ts.json index c44e9dc409ff..f59f36cddac3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyArrayBindingPatternParameter02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyArrayBindingPatternParameter02/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -101,8 +100,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -122,8 +121,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -143,8 +142,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyArrayBindingPatternParameter03/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyArrayBindingPatternParameter03/input.ts.json index c44e9dc409ff..f59f36cddac3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyArrayBindingPatternParameter03/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyArrayBindingPatternParameter03/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -101,8 +100,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -122,8 +121,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -143,8 +142,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyArrayBindingPatternParameter04/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyArrayBindingPatternParameter04/input.ts.json index a64fa971be1f..517aa0f07e67 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyArrayBindingPatternParameter04/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyArrayBindingPatternParameter04/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -148,8 +147,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -169,8 +168,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -190,8 +189,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns01_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns01_ES5/input.ts.json index de1c4284894a..f369044ccbcd 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns01_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns01_ES5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -96,7 +96,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns01_ES5iterable/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns01_ES5iterable/input.ts.json index ead7bf2454ee..6ac775106944 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns01_ES5iterable/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns01_ES5iterable/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -96,7 +96,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns01_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns01_ES6/input.ts.json index b66896f7fc78..9787998ba9a7 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns01_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns01_ES6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -96,7 +96,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns02_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns02_ES5/input.ts.json index 1e5fd6c8a2a7..7bb76ae2072c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns02_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns02_ES5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,8 +80,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -101,8 +101,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -122,8 +122,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -143,8 +143,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -164,8 +164,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -185,8 +185,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -257,7 +257,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -277,7 +276,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -297,7 +295,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null @@ -314,7 +311,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -378,8 +374,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -389,8 +385,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -400,8 +396,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -415,7 +411,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns02_ES5iterable/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns02_ES5iterable/input.ts.json index cfa8f79d1039..08b938893a10 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns02_ES5iterable/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns02_ES5iterable/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,8 +80,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -101,8 +101,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -122,8 +122,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -143,8 +143,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -164,8 +164,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -185,8 +185,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -257,7 +257,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -277,7 +276,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -297,7 +295,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null @@ -314,7 +311,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -378,8 +374,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -389,8 +385,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -400,8 +396,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -415,7 +411,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns02_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns02_ES6/input.ts.json index 1e5fd6c8a2a7..7bb76ae2072c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns02_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns02_ES6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,8 +80,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -101,8 +101,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -122,8 +122,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -143,8 +143,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -164,8 +164,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -185,8 +185,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -257,7 +257,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -277,7 +276,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -297,7 +295,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null @@ -314,7 +311,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -378,8 +374,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -389,8 +385,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -400,8 +396,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -415,7 +411,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns03_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns03_ES5/input.ts.json index 8c7643f1369c..ab1b4dbd256d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns03_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns03_ES5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -115,7 +115,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -182,7 +181,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns03_ES5iterable/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns03_ES5iterable/input.ts.json index 0f8dfaaacd7b..140f56ec775e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns03_ES5iterable/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns03_ES5iterable/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -115,7 +115,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -182,7 +181,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns03_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns03_ES6/input.ts.json index 8c7643f1369c..ab1b4dbd256d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns03_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns03_ES6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -115,7 +115,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -182,7 +181,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns04_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns04_ES5/input.ts.json index 6dd92c2cfabd..8d1befbef9ff 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns04_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns04_ES5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,8 +80,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -101,8 +101,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -122,8 +122,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -143,8 +143,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -164,8 +164,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -185,8 +185,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -238,7 +238,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -258,7 +257,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -278,7 +276,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null @@ -314,7 +311,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -359,8 +355,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -370,8 +366,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -381,8 +377,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -415,7 +411,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns04_ES5iterable/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns04_ES5iterable/input.ts.json index dca3b1d5859f..dc44e0a23679 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns04_ES5iterable/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns04_ES5iterable/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,8 +80,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -101,8 +101,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -122,8 +122,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -143,8 +143,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -164,8 +164,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -185,8 +185,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -238,7 +238,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -258,7 +257,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -278,7 +276,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null @@ -314,7 +311,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -359,8 +355,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -370,8 +366,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -381,8 +377,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -415,7 +411,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns04_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns04_ES6/input.ts.json index 6dd92c2cfabd..8d1befbef9ff 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns04_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyAssignmentPatterns04_ES6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,8 +80,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -101,8 +101,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -122,8 +122,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -143,8 +143,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -164,8 +164,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -185,8 +185,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -238,7 +238,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -258,7 +257,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -278,7 +276,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null @@ -314,7 +311,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -359,8 +355,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -370,8 +366,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -381,8 +377,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -415,7 +411,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyObjectBindingPatternParameter01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyObjectBindingPatternParameter01/input.ts.json index 074eb79a4aa1..dc6c6b79f2ca 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyObjectBindingPatternParameter01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyObjectBindingPatternParameter01/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -81,8 +80,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -102,8 +101,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -123,8 +122,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyObjectBindingPatternParameter02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyObjectBindingPatternParameter02/input.ts.json index 02b8f7ab340a..88a289dca312 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyObjectBindingPatternParameter02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyObjectBindingPatternParameter02/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -101,8 +100,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -122,8 +121,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -143,8 +142,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyObjectBindingPatternParameter03/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyObjectBindingPatternParameter03/input.ts.json index 7a74c3ab1374..44249ce10a92 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyObjectBindingPatternParameter03/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyObjectBindingPatternParameter03/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -57,8 +56,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -101,8 +100,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -122,8 +121,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -143,8 +142,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyObjectBindingPatternParameter04/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyObjectBindingPatternParameter04/input.ts.json index c12d84f440e2..aea85cce639c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyObjectBindingPatternParameter04/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyObjectBindingPatternParameter04/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -65,7 +64,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -174,8 +170,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -195,8 +191,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -216,8 +212,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyVariableDeclarationBindingPatterns01_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyVariableDeclarationBindingPatterns01_ES5/input.ts.json index 7f0ce23bfbc7..64ae198194a1 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyVariableDeclarationBindingPatterns01_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyVariableDeclarationBindingPatterns01_ES5/input.ts.json @@ -70,6 +70,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -86,8 +87,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -130,7 +130,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -173,7 +172,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -216,7 +214,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -259,7 +256,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -302,7 +298,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -345,7 +340,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -388,7 +382,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -419,7 +412,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -462,7 +454,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -493,7 +484,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -536,7 +526,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -567,7 +556,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -609,7 +597,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "value": { @@ -634,7 +621,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "value": { @@ -661,7 +647,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -703,7 +688,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "value": { @@ -728,7 +712,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "value": { @@ -755,7 +738,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -797,7 +779,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "value": { @@ -822,7 +803,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "value": { @@ -849,7 +829,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -980,7 +959,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1019,7 +997,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1059,7 +1036,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1098,7 +1074,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -1127,7 +1102,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1145,7 +1119,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1207,7 +1180,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1238,7 +1210,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1268,7 +1239,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -1297,7 +1267,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1315,7 +1284,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1329,7 +1297,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1421,6 +1388,7 @@ "ctxt": 0 }, "value": "ns", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1453,8 +1421,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1518,7 +1485,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "body": { @@ -1580,7 +1546,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "body": { @@ -1642,7 +1607,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "body": { @@ -1704,7 +1668,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "body": { @@ -1766,7 +1729,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "body": { @@ -1828,7 +1790,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyVariableDeclarationBindingPatterns01_ES5iterable/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyVariableDeclarationBindingPatterns01_ES5iterable/input.ts.json index d33598074cbe..b024725f44f8 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyVariableDeclarationBindingPatterns01_ES5iterable/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyVariableDeclarationBindingPatterns01_ES5iterable/input.ts.json @@ -70,6 +70,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -86,8 +87,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -130,7 +130,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -173,7 +172,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -216,7 +214,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -259,7 +256,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -302,7 +298,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -345,7 +340,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -388,7 +382,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -419,7 +412,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -462,7 +454,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -493,7 +484,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -536,7 +526,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -567,7 +556,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -609,7 +597,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "value": { @@ -634,7 +621,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "value": { @@ -661,7 +647,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -703,7 +688,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "value": { @@ -728,7 +712,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "value": { @@ -755,7 +738,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -797,7 +779,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "value": { @@ -822,7 +803,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "value": { @@ -849,7 +829,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -980,7 +959,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1019,7 +997,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1059,7 +1036,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1098,7 +1074,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -1127,7 +1102,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1145,7 +1119,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1207,7 +1180,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1238,7 +1210,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1268,7 +1239,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -1297,7 +1267,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1315,7 +1284,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1329,7 +1297,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1421,6 +1388,7 @@ "ctxt": 0 }, "value": "ns", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1453,8 +1421,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1518,7 +1485,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "body": { @@ -1580,7 +1546,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "body": { @@ -1642,7 +1607,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "body": { @@ -1704,7 +1668,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "body": { @@ -1766,7 +1729,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "body": { @@ -1828,7 +1790,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyVariableDeclarationBindingPatterns01_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyVariableDeclarationBindingPatterns01_ES6/input.ts.json index 7f0ce23bfbc7..64ae198194a1 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyVariableDeclarationBindingPatterns01_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/emptyVariableDeclarationBindingPatterns01_ES6/input.ts.json @@ -70,6 +70,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -86,8 +87,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -130,7 +130,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -173,7 +172,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -216,7 +214,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -259,7 +256,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -302,7 +298,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -345,7 +340,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -388,7 +382,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -419,7 +412,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -462,7 +454,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -493,7 +484,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -536,7 +526,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -567,7 +556,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -609,7 +597,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "value": { @@ -634,7 +621,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "value": { @@ -661,7 +647,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -703,7 +688,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "value": { @@ -728,7 +712,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "value": { @@ -755,7 +738,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -797,7 +779,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "value": { @@ -822,7 +803,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "value": { @@ -849,7 +829,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -980,7 +959,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1019,7 +997,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1059,7 +1036,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1098,7 +1074,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -1127,7 +1102,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1145,7 +1119,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1207,7 +1180,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1238,7 +1210,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1268,7 +1239,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -1297,7 +1267,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1315,7 +1284,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1329,7 +1297,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1421,6 +1388,7 @@ "ctxt": 0 }, "value": "ns", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1453,8 +1421,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1518,7 +1485,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "body": { @@ -1580,7 +1546,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "body": { @@ -1642,7 +1607,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "body": { @@ -1704,7 +1668,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "body": { @@ -1766,7 +1729,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "body": { @@ -1828,7 +1790,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern1/input.ts.json index d6170b7aa1aa..ad49cf152f8f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -104,7 +101,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -121,7 +117,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -179,7 +174,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -190,7 +184,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -281,8 +274,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -292,8 +285,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -314,7 +307,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern10/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern10/input.ts.json index 113a412f42b5..2fdd834c2d63 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern10/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern10/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -124,7 +120,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -142,7 +137,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -168,7 +162,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -212,7 +205,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -230,7 +222,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -247,7 +238,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -305,7 +295,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -316,7 +305,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -384,7 +372,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -413,8 +400,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -424,8 +411,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -475,7 +462,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -496,7 +482,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern11/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern11/input.ts.json index cc7af1512538..3eba021945b0 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern11/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern11/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -124,7 +120,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -142,7 +137,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -168,7 +162,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -212,7 +205,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -230,7 +222,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -247,7 +238,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -305,7 +295,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -316,7 +305,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -384,7 +372,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -420,8 +407,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -431,8 +418,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -453,7 +440,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -505,7 +491,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -526,7 +511,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern12/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern12/input.ts.json index 616158acdd9c..3c1a1f89ab6a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern12/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern12/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -124,7 +120,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -142,7 +137,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -168,7 +162,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -212,7 +205,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -230,7 +222,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -247,7 +238,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -305,7 +295,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -316,7 +305,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -384,7 +372,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -420,8 +407,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -443,8 +430,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -467,7 +454,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -519,7 +505,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -540,7 +525,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern13/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern13/input.ts.json index 1fc923c6b1b2..901cb1f41f14 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern13/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern13/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -124,7 +120,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -142,7 +137,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -168,7 +162,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -212,7 +205,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -230,7 +222,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -247,7 +238,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -305,7 +295,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -316,7 +305,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -384,7 +372,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -413,8 +400,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -436,8 +423,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -489,7 +476,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -510,7 +496,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern14/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern14/input.ts.json index 9f12d4eece62..d0c8474d3590 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern14/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern14/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -124,7 +120,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -142,7 +137,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -168,7 +162,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -212,7 +205,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -230,7 +222,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -247,7 +238,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -305,7 +295,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -316,7 +305,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -384,7 +372,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -425,8 +412,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -448,8 +435,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -503,7 +490,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -524,7 +510,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern15/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern15/input.ts.json index 8f9903361a86..d0a06e0a4c8b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern15/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern15/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -124,7 +120,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -142,7 +137,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -168,7 +162,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -212,7 +205,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -230,7 +222,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -247,7 +238,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -305,7 +295,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -316,7 +305,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -384,7 +372,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -425,8 +412,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -436,8 +423,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -472,7 +459,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -524,7 +510,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -549,7 +534,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern16/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern16/input.ts.json index 3b02be5aae9a..797f9221d44c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern16/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern16/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -57,8 +56,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -68,8 +67,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -120,7 +119,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -149,7 +147,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -204,7 +201,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -229,7 +225,6 @@ "ctxt": 0 }, "value": "FooIteratorIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -250,7 +245,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -276,7 +270,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -308,7 +301,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -334,7 +326,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -358,7 +349,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -376,7 +366,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -402,7 +391,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -446,7 +434,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -464,7 +451,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -481,7 +467,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -539,7 +524,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -550,7 +534,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -618,7 +601,6 @@ "ctxt": 0 }, "value": "FooIteratorIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -644,7 +626,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -688,7 +669,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -706,7 +686,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -723,7 +702,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -781,7 +759,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -792,7 +769,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern17/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern17/input.ts.json index 253a078a34f4..3f1cbf61adbd 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern17/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern17/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -124,7 +120,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -142,7 +137,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -168,7 +162,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -212,7 +205,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -230,7 +222,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -247,7 +238,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -305,7 +295,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -316,7 +305,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -384,7 +372,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -425,8 +412,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -436,8 +423,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -472,7 +459,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -524,7 +510,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -545,7 +530,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern18/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern18/input.ts.json index 88d69803121f..5c670d6cf311 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern18/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern18/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -124,7 +120,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -142,7 +137,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -168,7 +162,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -212,7 +205,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -230,7 +222,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -247,7 +238,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -305,7 +295,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -316,7 +305,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -384,7 +372,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -413,8 +400,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -424,8 +411,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -458,7 +445,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -510,7 +496,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -531,7 +516,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern19/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern19/input.ts.json index b920ea33db1c..860941f3370e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern19/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern19/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -124,7 +120,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -142,7 +137,6 @@ "ctxt": 0 }, "value": "FooArrayIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -168,7 +162,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -212,7 +205,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -240,7 +232,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -260,7 +251,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -318,7 +308,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -329,7 +318,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -397,7 +385,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -434,8 +421,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -449,8 +436,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -490,7 +477,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -543,7 +529,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -564,7 +549,6 @@ "ctxt": 0 }, "value": "FooArrayIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern2/input.ts.json index 2bd669a26584..442da56084a4 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -104,7 +101,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -121,7 +117,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -179,7 +174,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -190,7 +184,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -281,8 +274,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -304,8 +297,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -328,7 +321,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern20/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern20/input.ts.json index f0956ddb6475..44a84dbc7709 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern20/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern20/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -124,7 +120,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -142,7 +137,6 @@ "ctxt": 0 }, "value": "FooArrayIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -168,7 +162,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -212,7 +205,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -240,7 +232,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -260,7 +251,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -318,7 +308,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -329,7 +318,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -397,7 +385,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -453,8 +440,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -471,7 +458,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -498,8 +484,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -526,7 +512,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -577,7 +562,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -630,7 +614,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -655,7 +638,6 @@ "ctxt": 0 }, "value": "FooArrayIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern21/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern21/input.ts.json index 45db937dcc81..bcb41ada0e4b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern21/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern21/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern22/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern22/input.ts.json index f0e359ae914c..efc1beeea854 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern22/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern22/input.ts.json @@ -51,8 +51,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern23/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern23/input.ts.json index 18f6b17afe88..7124543affe0 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern23/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern23/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -68,6 +68,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,8 +85,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -123,8 +123,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -134,8 +134,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern24/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern24/input.ts.json index e37704390019..18c38478be34 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern24/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern24/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -68,6 +68,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -92,8 +93,7 @@ "kind": "boolean" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -131,8 +131,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -154,8 +154,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern25/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern25/input.ts.json index 082816ff74a2..6207483e9ef3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern25/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern25/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "takeFirstTwoEntries", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -65,8 +64,8 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -76,8 +75,8 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -99,8 +98,8 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -110,8 +109,8 @@ "ctxt": 0 }, "value": "v2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -167,7 +166,6 @@ "ctxt": 0 }, "value": "takeFirstTwoEntries", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -188,7 +186,6 @@ "ctxt": 0 }, "value": "Map", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern26/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern26/input.ts.json index e20a744940c5..062da56b68b2 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern26/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern26/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "takeFirstTwoEntries", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -65,8 +64,8 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -76,8 +75,8 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -99,8 +98,8 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -110,8 +109,8 @@ "ctxt": 0 }, "value": "v2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -228,7 +227,6 @@ "ctxt": 0 }, "value": "takeFirstTwoEntries", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -249,7 +247,6 @@ "ctxt": 0 }, "value": "Map", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern27/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern27/input.ts.json index 9ee232a86e1f..b5461703e25e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern27/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern27/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "takeFirstTwoEntries", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -65,8 +64,8 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -76,8 +75,8 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -99,8 +98,8 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -110,8 +109,8 @@ "ctxt": 0 }, "value": "v2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -228,7 +227,6 @@ "ctxt": 0 }, "value": "takeFirstTwoEntries", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -253,7 +251,6 @@ "ctxt": 0 }, "value": "Map", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern28/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern28/input.ts.json index 28fcf62be89d..0e75d3c0d81d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern28/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern28/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "takeFirstTwoEntries", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -65,8 +64,8 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -76,8 +75,8 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -99,8 +98,8 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -110,8 +109,8 @@ "ctxt": 0 }, "value": "v2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -228,7 +227,6 @@ "ctxt": 0 }, "value": "takeFirstTwoEntries", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -253,7 +251,6 @@ "ctxt": 0 }, "value": "Map", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern29/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern29/input.ts.json index f4eb9978c629..dacda6207471 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern29/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern29/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "takeFirstTwoEntries", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -65,8 +64,8 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -76,8 +75,8 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -99,8 +98,8 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -110,8 +109,8 @@ "ctxt": 0 }, "value": "v2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -228,7 +227,6 @@ "ctxt": 0 }, "value": "takeFirstTwoEntries", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -253,7 +251,6 @@ "ctxt": 0 }, "value": "Map", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern3/input.ts.json index 95f8c6618f55..10689079d549 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -124,7 +120,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -142,7 +137,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -168,7 +162,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -212,7 +205,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -230,7 +222,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -247,7 +238,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -305,7 +295,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -316,7 +305,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -399,6 +387,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -421,13 +410,11 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -447,6 +434,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -469,13 +457,11 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -513,8 +499,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -524,8 +510,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -546,7 +532,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern30/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern30/input.ts.json index 2e3807e4844e..fec23b446eaf 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern30/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern30/input.ts.json @@ -47,8 +47,8 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -58,8 +58,8 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -81,8 +81,8 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -92,8 +92,8 @@ "ctxt": 0 }, "value": "v2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -118,7 +118,6 @@ "ctxt": 0 }, "value": "Map", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern4/input.ts.json index 66038b5105eb..8b5d41f81a65 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -124,7 +120,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -142,7 +137,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -168,7 +162,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -212,7 +205,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -230,7 +222,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -247,7 +238,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -305,7 +295,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -316,7 +305,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -399,6 +387,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -421,13 +410,11 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -447,6 +434,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -476,14 +464,12 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -521,8 +507,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -544,8 +530,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -568,7 +554,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern5/input.ts.json index ef5ff1314c9b..8143f153009c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -124,7 +120,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -142,7 +137,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -168,7 +162,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -212,7 +205,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -230,7 +222,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -247,7 +238,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -305,7 +295,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -316,7 +305,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -399,6 +387,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -421,13 +410,11 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -447,6 +434,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -463,8 +451,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -502,8 +489,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -513,8 +500,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -535,7 +522,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern6/input.ts.json index a59a3716ae28..e3bb58e162e3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -124,7 +120,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -142,7 +137,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -168,7 +162,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -212,7 +205,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -230,7 +222,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -247,7 +238,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -305,7 +295,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -316,7 +305,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -399,6 +387,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -421,13 +410,11 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -447,6 +434,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -471,8 +459,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -510,8 +497,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -533,8 +520,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -557,7 +544,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern7/input.ts.json index c2842f53c097..ccfaf9e4dfbe 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern7/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -124,7 +120,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -142,7 +137,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -168,7 +162,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -212,7 +205,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -230,7 +222,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -247,7 +238,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -305,7 +295,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -316,7 +305,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -399,6 +387,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -421,13 +410,11 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -447,6 +434,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -471,8 +459,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -510,8 +497,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -521,8 +508,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -543,7 +530,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern8/input.ts.json index 3520a2d29029..c63dbd85a3d0 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern8/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -124,7 +120,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -142,7 +137,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -168,7 +162,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -212,7 +205,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -230,7 +222,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -247,7 +238,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -305,7 +295,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -316,7 +305,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -399,6 +387,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -421,13 +410,11 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -447,6 +434,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -463,8 +451,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -502,8 +489,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -525,8 +512,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -549,7 +536,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern9/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern9/input.ts.json index a2d3c008e3d6..6c0a665f5c72 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern9/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/iterableArrayPattern9/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,8 +51,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -63,8 +62,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -85,7 +84,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -125,7 +123,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -151,7 +148,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -183,7 +179,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -209,7 +204,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -233,7 +227,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -251,7 +244,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -277,7 +269,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -321,7 +312,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -339,7 +329,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -356,7 +345,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -414,7 +402,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -425,7 +412,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/missingAndExcessProperties/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/missingAndExcessProperties/input.ts.json index 50280c8d0304..fe1ace54f900 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/missingAndExcessProperties/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/missingAndExcessProperties/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -75,7 +74,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -157,7 +154,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -185,7 +181,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -247,7 +242,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -267,7 +261,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -337,7 +330,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -365,7 +357,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -412,7 +403,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -456,6 +446,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -472,8 +463,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -493,6 +483,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -509,8 +500,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -562,7 +552,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -582,7 +571,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -643,7 +631,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -661,8 +648,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -691,7 +678,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -757,7 +743,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -772,7 +757,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -790,8 +774,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -861,7 +845,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -879,8 +862,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -904,7 +887,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -922,8 +904,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -970,7 +952,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1035,7 +1016,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1058,7 +1038,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1117,7 +1096,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -1144,7 +1122,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1167,7 +1144,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1226,7 +1202,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -1253,7 +1228,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1276,7 +1250,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1335,7 +1308,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -1355,7 +1327,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -1382,7 +1353,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1405,7 +1375,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1441,7 +1410,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1485,6 +1453,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1501,8 +1470,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1522,6 +1490,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1538,8 +1507,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1597,7 +1565,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1620,7 +1587,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1683,7 +1649,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -1710,7 +1675,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1733,7 +1697,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1796,7 +1759,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -1823,7 +1785,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1846,7 +1807,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1909,7 +1869,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -1929,7 +1888,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -1956,7 +1914,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1979,7 +1936,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/nonIterableRestElement1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/nonIterableRestElement1/input.ts.json index 0a3beb151cd2..3d95e72dce83 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/nonIterableRestElement1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/nonIterableRestElement1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -90,8 +90,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/nonIterableRestElement2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/nonIterableRestElement2/input.ts.json index 8de189e08759..3054c74ee152 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/nonIterableRestElement2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/nonIterableRestElement2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -90,8 +90,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/nonIterableRestElement3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/nonIterableRestElement3/input.ts.json index 34146156b467..241edb202f15 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/nonIterableRestElement3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/nonIterableRestElement3/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "bogus", - "typeAnnotation": null, "optional": false }, "value": { @@ -114,8 +113,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/objectBindingPatternKeywordIdentifiers05/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/objectBindingPatternKeywordIdentifiers05/input.ts.json index a567c3327f4f..233644ab79ab 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/objectBindingPatternKeywordIdentifiers05/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/objectBindingPatternKeywordIdentifiers05/input.ts.json @@ -46,7 +46,6 @@ "ctxt": 0 }, "value": "as", - "typeAnnotation": null, "optional": false }, "value": null @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "as", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/objectBindingPatternKeywordIdentifiers06/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/objectBindingPatternKeywordIdentifiers06/input.ts.json index bf8e2957b7f2..2e7bd60b13fc 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/objectBindingPatternKeywordIdentifiers06/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/objectBindingPatternKeywordIdentifiers06/input.ts.json @@ -41,7 +41,6 @@ "ctxt": 0 }, "value": "as", - "typeAnnotation": null, "optional": false }, "value": { @@ -52,8 +51,8 @@ "ctxt": 0 }, "value": "as", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -78,7 +77,6 @@ "ctxt": 0 }, "value": "as", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/optionalBindingParameters1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/optionalBindingParameters1/input.ts.json index 135a057a67bc..3c2c4ee18b17 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/optionalBindingParameters1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/optionalBindingParameters1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -45,8 +44,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -56,8 +55,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -67,8 +66,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": true, @@ -189,7 +188,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -273,7 +271,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/optionalBindingParameters2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/optionalBindingParameters2/input.ts.json index cdf19fcc1e79..a731bfb26977 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/optionalBindingParameters2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/optionalBindingParameters2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,7 +51,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -92,7 +89,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -172,7 +167,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -214,7 +208,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -288,7 +281,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -312,7 +304,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -340,7 +331,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -363,7 +353,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -405,7 +394,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -429,7 +417,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -452,7 +439,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -475,7 +461,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/optionalBindingParametersInOverloads1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/optionalBindingParametersInOverloads1/input.ts.json index 90a5a8aaee0e..5ddbca242045 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/optionalBindingParametersInOverloads1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/optionalBindingParametersInOverloads1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -45,8 +44,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -56,8 +55,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -67,8 +66,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": true, @@ -169,7 +168,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -202,8 +200,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -275,7 +273,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -359,7 +356,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/optionalBindingParametersInOverloads2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/optionalBindingParametersInOverloads2/input.ts.json index e15165516d32..0dc6386e09b1 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/optionalBindingParametersInOverloads2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/optionalBindingParametersInOverloads2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,7 +51,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -92,7 +89,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -172,7 +167,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -214,7 +208,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -268,7 +261,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -301,8 +293,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -374,7 +366,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -398,7 +389,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -426,7 +416,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -449,7 +438,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -491,7 +479,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -515,7 +502,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -538,7 +524,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -561,7 +546,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithAssignmentPattern1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithAssignmentPattern1/input.ts.json index c9429d68bf10..92c9893d0ea2 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithAssignmentPattern1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithAssignmentPattern1/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -68,6 +68,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,8 +85,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,8 +143,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "AssignmentPattern", @@ -161,8 +161,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithAssignmentPattern2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithAssignmentPattern2/input.ts.json index 73b7f6cc3b80..f4f1261935dd 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithAssignmentPattern2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithAssignmentPattern2/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -68,6 +68,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,8 +85,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -161,8 +161,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -196,7 +196,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithAssignmentPattern3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithAssignmentPattern3/input.ts.json index f1fcf36f25a8..1dfeb4be2420 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithAssignmentPattern3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithAssignmentPattern3/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -68,6 +68,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,8 +85,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -117,6 +117,7 @@ "ctxt": 0 }, "value": "tuple", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -170,8 +171,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -267,8 +267,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "AssignmentPattern", @@ -285,8 +285,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -317,7 +317,6 @@ "ctxt": 0 }, "value": "tuple", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithAssignmentPattern4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithAssignmentPattern4/input.ts.json index 20460e2a50db..ab743882c295 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithAssignmentPattern4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithAssignmentPattern4/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -68,6 +68,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,8 +85,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -117,6 +117,7 @@ "ctxt": 0 }, "value": "tuple", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -170,8 +171,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -285,8 +285,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -320,7 +320,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -343,7 +342,6 @@ "ctxt": 0 }, "value": "tuple", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithAssignmentPattern5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithAssignmentPattern5/input.ts.json index 16f3c47d5dc9..82a131f65401 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithAssignmentPattern5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithAssignmentPattern5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -68,6 +68,7 @@ "ctxt": 0 }, "value": "s2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,8 +85,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,8 +143,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -154,8 +154,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithBindingPattern/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithBindingPattern/input.ts.json index 6abb214148a9..d1169765f9f0 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithBindingPattern/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithBindingPattern/input.ts.json @@ -59,8 +59,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -70,8 +70,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithBindingPattern2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithBindingPattern2/input.ts.json index 43f68577a63b..528f4e3aff40 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithBindingPattern2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithBindingPattern2/input.ts.json @@ -70,8 +70,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -89,7 +89,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithNullInitializer/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithNullInitializer/input.ts.json index bb5fcb8b827f..6335e1bcf5d0 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithNullInitializer/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/destructuring/restElementWithNullInitializer/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -64,8 +63,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -115,7 +114,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -163,8 +161,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -180,7 +178,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -217,7 +214,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -265,8 +261,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -317,7 +313,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -365,8 +360,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of1/input.ts.json index ebf42a33c957..56d15dfb14d6 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -55,8 +55,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of10/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of10/input.ts.json index 85112b3b82f5..155d8d224a84 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of10/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of10/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -71,8 +71,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of11/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of11/input.ts.json index 2e650c54bb60..a1f0b795169d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of11/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of11/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -71,8 +71,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of12/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of12/input.ts.json index f1fe59cd114d..2abecff3fabd 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of12/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of12/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -71,8 +71,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -135,7 +135,6 @@ "ctxt": 0 }, "value": "values", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of13/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of13/input.ts.json index 777a2853ceeb..860fc6ce6b3e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of13/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of13/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -71,8 +71,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -123,7 +123,6 @@ "ctxt": 0 }, "value": "values", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of14/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of14/input.ts.json index a2170507c122..d5d0a6f3156b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of14/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of14/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -128,6 +126,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -144,8 +143,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -168,8 +166,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -186,7 +184,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of15/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of15/input.ts.json index 8b4ccd8c3266..1050e90b9045 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of15/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of15/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -125,7 +123,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -219,6 +215,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -235,8 +232,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -259,8 +255,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -277,7 +273,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of16/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of16/input.ts.json index 373fa197908a..77752cf5a4ee 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of16/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of16/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -150,6 +147,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -166,8 +164,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -190,8 +187,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -208,7 +205,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of17/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of17/input.ts.json index 0e5fb8e52434..a930a7f966fb 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of17/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of17/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "NumberIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -167,7 +163,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -178,7 +173,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -261,6 +255,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -277,8 +272,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -301,8 +295,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -319,7 +313,6 @@ "ctxt": 0 }, "value": "NumberIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of18/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of18/input.ts.json index 49d81e954d43..7419c2947a7a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of18/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of18/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -114,7 +111,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -172,7 +168,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -183,7 +178,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -266,6 +260,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -282,8 +277,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -306,8 +300,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -324,7 +318,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of19/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of19/input.ts.json index dcc55963846d..acb1b959098c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of19/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of19/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -113,7 +110,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -148,7 +143,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -206,7 +200,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -217,7 +210,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -308,8 +300,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -331,7 +323,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -360,7 +351,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of20/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of20/input.ts.json index b1ce68fdcdf4..6fb104c7c16b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of20/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of20/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -113,7 +110,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -148,7 +143,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -206,7 +200,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -217,7 +210,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -308,8 +300,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -331,7 +323,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -360,7 +351,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of21/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of21/input.ts.json index 03cedf54e428..75a8386ac1f5 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of21/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of21/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -113,7 +110,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -148,7 +143,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -206,7 +200,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -217,7 +210,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -308,8 +300,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -331,7 +323,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -360,7 +351,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of22/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of22/input.ts.json index 33afccb98c3a..34f61ff90f00 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of22/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of22/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -113,7 +110,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -148,7 +143,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -206,7 +200,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -217,7 +210,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -290,7 +282,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -327,8 +318,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -350,7 +341,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of23/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of23/input.ts.json index fb54dd54144c..c884d9d89bfd 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of23/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of23/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -113,7 +110,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -148,7 +143,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -206,7 +200,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -217,7 +210,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -308,8 +300,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -331,7 +323,6 @@ "ctxt": 0 }, "value": "FooIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -370,8 +361,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of24/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of24/input.ts.json index b9e78d3b574f..27b21115dd4c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of24/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of24/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -88,8 +88,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -104,7 +104,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of25/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of25/input.ts.json index 362e84d78a55..aa6aab9a7918 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of25/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of25/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -104,7 +101,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -153,6 +149,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -169,8 +166,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -210,8 +206,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -233,7 +229,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of26/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of26/input.ts.json index 443dc8c99d24..b6658fb054f1 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of26/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of26/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -76,7 +74,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -122,7 +119,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -133,7 +129,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -216,6 +211,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -232,8 +228,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -273,8 +268,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -296,7 +291,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of27/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of27/input.ts.json index 3b9dfbc51d89..ba37943e212c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of27/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of27/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -60,7 +58,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -133,8 +130,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -156,7 +153,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of28/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of28/input.ts.json index 8539ffd1d6df..73c26d86c679 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of28/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of28/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "value": null, @@ -102,7 +100,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -113,7 +110,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -204,8 +200,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -227,7 +223,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of29/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of29/input.ts.json index 5d25f1641968..f60788e56439 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of29/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of29/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "iterableWithOptionalIterator", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -69,7 +70,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -80,7 +80,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -110,7 +109,6 @@ "ctxt": 0 }, "value": "Iterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -138,8 +136,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -179,8 +176,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -195,7 +192,6 @@ "ctxt": 0 }, "value": "iterableWithOptionalIterator", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of3/input.ts.json index 5b11190b2307..822aeaf0ae27 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of3/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,7 +80,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of30/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of30/input.ts.json index b83f4d795bfc..1826db54cb94 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of30/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of30/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -158,7 +154,6 @@ "ctxt": 0 }, "value": "return", - "typeAnnotation": null, "optional": false }, "value": { @@ -210,7 +205,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -221,7 +215,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -312,8 +305,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -335,7 +328,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of31/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of31/input.ts.json index 950013641895..7f64fdebabe4 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of31/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of31/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -149,7 +146,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -160,7 +156,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -251,8 +246,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -274,7 +269,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of32/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of32/input.ts.json index 874e5b494424..ca3f880ce25f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of32/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of32/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -55,7 +55,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of33/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of33/input.ts.json index 2dc69e4a9c0f..e8f686f8e9c9 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of33/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of33/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -104,7 +101,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -161,8 +157,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -184,7 +180,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of34/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of34/input.ts.json index b763e4984e56..31b69bd04c04 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of34/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of34/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -76,7 +74,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -122,7 +119,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -133,7 +129,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -224,8 +219,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -247,7 +242,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of35/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of35/input.ts.json index 9020e900d2a9..7730f8c90b2f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of35/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of35/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -120,7 +116,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -169,7 +164,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -180,7 +174,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -271,8 +264,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -294,7 +287,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of36/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of36/input.ts.json index 439e41e8780c..aab48caddd05 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of36/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of36/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "tuple", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,8 +85,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -163,8 +163,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -179,7 +179,6 @@ "ctxt": 0 }, "value": "tuple", - "typeAnnotation": null, "optional": false }, "body": { @@ -205,7 +204,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of37/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of37/input.ts.json index 9e7fc8a5d9e5..43fb6c72456b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of37/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of37/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "Map", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -148,8 +147,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -164,7 +163,6 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, "optional": false }, "body": { @@ -190,7 +188,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of38/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of38/input.ts.json index 892f487f332e..6f569437f763 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of38/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of38/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "Map", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -156,8 +155,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -167,8 +166,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -187,7 +186,6 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, "optional": false }, "body": { @@ -213,7 +211,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false } }, @@ -232,7 +229,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of39/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of39/input.ts.json index 1c331cf0a95a..6d557da66ee1 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of39/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of39/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "Map", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -198,8 +197,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -209,8 +208,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -229,7 +228,6 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, "optional": false }, "body": { @@ -255,7 +253,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false } }, @@ -274,7 +271,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of4/input.ts.json index be41ce978390..b75f44caa423 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of4/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -92,7 +92,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of40/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of40/input.ts.json index 9904ab3f6021..43587226ad92 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of40/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of40/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "Map", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -163,8 +162,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -197,8 +196,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -228,7 +227,6 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, "optional": false }, "body": { @@ -254,7 +252,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false } }, @@ -273,7 +270,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of41/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of41/input.ts.json index 7ac6cf7779a8..2bae0ba57522 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of41/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of41/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -62,7 +62,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -98,7 +97,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -119,7 +117,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -192,7 +189,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -211,8 +207,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -229,7 +225,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -255,7 +250,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": null @@ -282,7 +276,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false }, "body": { @@ -308,7 +301,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -327,7 +319,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of42/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of42/input.ts.json index fa6af6c1ae82..29dc167ff712 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of42/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of42/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -62,7 +62,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -90,7 +89,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -155,7 +153,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -166,8 +163,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -180,7 +177,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -191,8 +187,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -212,7 +208,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false }, "body": { @@ -238,7 +233,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -257,7 +251,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of43/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of43/input.ts.json index 23aea567f30d..8ee2cdab6d1a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of43/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of43/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -62,7 +62,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -90,7 +89,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -155,7 +153,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -173,8 +170,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -203,7 +200,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -221,8 +217,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -253,7 +249,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false }, "body": { @@ -279,7 +274,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -298,7 +292,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of44/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of44/input.ts.json index cb7b5a2872ed..ff2f9a7c5230 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of44/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of44/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "array", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -120,8 +121,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -249,7 +249,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -306,8 +305,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -317,8 +316,8 @@ "ctxt": 0 }, "value": "strBoolSym", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -337,7 +336,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false }, "body": { @@ -363,7 +361,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false } }, @@ -382,7 +379,6 @@ "ctxt": 0 }, "value": "strBoolSym", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of45/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of45/input.ts.json index ae7846cc02dc..bfea7bc1a5b3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of45/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of45/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -68,6 +68,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,8 +85,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -117,8 +117,8 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -135,7 +135,6 @@ "ctxt": 0 }, "value": "Map", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -232,8 +231,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -266,8 +265,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -292,7 +291,6 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, "optional": false }, "body": { @@ -318,7 +316,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false } }, @@ -337,7 +334,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of46/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of46/input.ts.json index 9131a223d6cd..29c021b9df6a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of46/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of46/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -68,6 +68,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,8 +85,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -117,8 +117,8 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -135,7 +135,6 @@ "ctxt": 0 }, "value": "Map", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -232,8 +231,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -261,8 +260,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -292,7 +291,6 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, "optional": false }, "body": { @@ -318,7 +316,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false } }, @@ -337,7 +334,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of47/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of47/input.ts.json index 61d3fcc77e5c..48af0111190e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of47/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of47/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -68,6 +68,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,8 +85,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -117,8 +117,8 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -148,7 +148,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -176,7 +175,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -215,7 +213,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -234,7 +231,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "init": null @@ -272,7 +268,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -287,7 +282,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -305,8 +299,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -323,7 +317,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -334,7 +327,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -354,7 +346,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false }, "body": { @@ -380,7 +371,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -399,7 +389,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of48/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of48/input.ts.json index cc63df0d0ce9..b100bd953da7 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of48/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of48/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -68,6 +68,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,8 +85,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -117,8 +117,8 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -148,7 +148,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -176,7 +175,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -215,7 +213,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -234,7 +231,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "init": null @@ -272,7 +268,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -292,7 +287,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -310,7 +304,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -321,7 +314,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -339,7 +331,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false }, "body": { @@ -365,7 +356,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -384,7 +374,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of49/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of49/input.ts.json index 5502a287cbe9..cc4fb8ec0934 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of49/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of49/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -68,6 +68,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,8 +85,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -117,8 +117,8 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -135,7 +135,6 @@ "ctxt": 0 }, "value": "Map", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -225,8 +224,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -256,8 +255,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -277,7 +276,6 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, "optional": false }, "body": { @@ -303,7 +301,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false } }, @@ -322,7 +319,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of5/input.ts.json index 2fef9cb5600a..4bb6d6c05650 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of5/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -92,7 +92,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of50/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of50/input.ts.json index 989a49faf3b9..836d982c5bf2 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of50/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of50/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "Map", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -156,8 +155,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -167,8 +166,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -187,7 +186,6 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, "optional": false }, "body": { @@ -213,7 +211,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false } }, @@ -232,7 +229,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of51/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of51/input.ts.json index 6beb6e649297..8b731f6b7de2 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of51/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of51/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "let", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of52/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of52/input.ts.json index 9e1842fe535f..e119c3dc979c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of52/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of52/input.ts.json @@ -47,8 +47,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -58,8 +58,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of53/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of53/input.ts.json index ac36c5a45585..bb734fb498b6 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of53/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of53/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -89,8 +89,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of54/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of54/input.ts.json index 3a1ce6ae983d..e49792133a5a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of54/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of54/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -89,8 +89,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of55/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of55/input.ts.json index 520875ef112c..7fe24d5b229c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of55/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of55/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -93,8 +93,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -109,7 +109,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "body": { @@ -135,7 +134,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of56/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of56/input.ts.json index 2109203633f2..3e63949df1b0 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of56/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of56/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "let", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of57/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of57/input.ts.json index 5a37559f9f50..e1527889ba7c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of57/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of57/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "iter", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,7 +54,6 @@ "ctxt": 0 }, "value": "Iterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -76,8 +76,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -117,8 +116,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -133,7 +132,6 @@ "ctxt": 0 }, "value": "iter", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of58/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of58/input.ts.json index 94a344bf4a64..33298b66e9fe 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of58/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of58/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -203,6 +199,7 @@ "ctxt": 0 }, "value": "arr", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -240,7 +237,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -268,7 +264,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -276,8 +271,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -317,8 +311,8 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -333,7 +327,6 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, "optional": false }, "body": { @@ -366,7 +359,6 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, "optional": false }, "property": { @@ -377,7 +369,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -405,7 +396,6 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, "optional": false }, "property": { @@ -416,7 +406,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of6/input.ts.json index d10daf7a0938..44be3a117af3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of6/input.ts.json @@ -22,8 +22,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -80,8 +80,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of7/input.ts.json index 7858a335a692..7c40d52e71bc 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of7/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -58,8 +57,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of8/input.ts.json index e8d0d95016c8..5585ab9e2380 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of8/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -58,8 +57,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of9/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of9/input.ts.json index 6d66120989ad..efd8d4487603 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of9/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/for-ofStatements/for-of9/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -71,8 +71,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -127,8 +127,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration11_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration11_es6/input.ts.json index 5410a6e49553..d2e3122f5192 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration11_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration11_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "yield", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration13_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration13_es6/input.ts.json index c26131fc699b..232cc9fe2951 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration13_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration13_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,6 +59,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -82,13 +82,11 @@ "ctxt": 0 }, "value": "yield", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration1_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration1_es6/input.ts.json index f216202dae31..847277b2d8ee 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration1_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration1_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration2_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration2_es6/input.ts.json index 0bc9e132349e..1703d2d0b3ac 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration2_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration2_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "yield", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration3_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration3_es6/input.ts.json index 1657822cbd2e..012c63b4da17 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration3_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration3_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -44,8 +43,8 @@ "ctxt": 0 }, "value": "yield", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -55,7 +54,6 @@ "ctxt": 0 }, "value": "yield", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration4_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration4_es6/input.ts.json index 880f2ecd0d61..1bbcfa4fbb5c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration4_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration4_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "yield", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration8_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration8_es6/input.ts.json index a2eca57c263a..929b39545da6 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration8_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration8_es6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -59,7 +59,6 @@ "ctxt": 0 }, "value": "yield", - "typeAnnotation": null, "optional": false } }, @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration9_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration9_es6/input.ts.json index dc1afe516dcf..6c2eda717223 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration9_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/functionDeclarations/FunctionDeclaration9_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -99,7 +98,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/functionExpressions/FunctionExpression1_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/functionExpressions/FunctionExpression1_es6/input.ts.json index 1a0850d4ede3..c57aa7179219 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/functionExpressions/FunctionExpression1_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/functionExpressions/FunctionExpression1_es6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/functionExpressions/FunctionExpression2_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/functionExpressions/FunctionExpression2_es6/input.ts.json index 3535481dd2b3..5fba0dfb2596 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/functionExpressions/FunctionExpression2_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/functionExpressions/FunctionExpression2_es6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -44,7 +44,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/functionPropertyAssignments/FunctionPropertyAssignments1_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/functionPropertyAssignments/FunctionPropertyAssignments1_es6/input.ts.json index df4ebb3d4a6f..f739a82e853d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/functionPropertyAssignments/FunctionPropertyAssignments1_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/functionPropertyAssignments/FunctionPropertyAssignments1_es6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/functionPropertyAssignments/FunctionPropertyAssignments5_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/functionPropertyAssignments/FunctionPropertyAssignments5_es6/input.ts.json index 6b6651f202ee..e07838aefa1f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/functionPropertyAssignments/FunctionPropertyAssignments5_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/functionPropertyAssignments/FunctionPropertyAssignments5_es6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -66,7 +66,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/memberFunctionDeclarations/MemberFunctionDeclaration1_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/memberFunctionDeclarations/MemberFunctionDeclaration1_es6/input.ts.json index d8e2373f8972..5c98fff18bdc 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/memberFunctionDeclarations/MemberFunctionDeclaration1_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/memberFunctionDeclarations/MemberFunctionDeclaration1_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/memberFunctionDeclarations/MemberFunctionDeclaration2_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/memberFunctionDeclarations/MemberFunctionDeclaration2_es6/input.ts.json index 8ec96e51bc1d..e08051feb0c6 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/memberFunctionDeclarations/MemberFunctionDeclaration2_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/memberFunctionDeclarations/MemberFunctionDeclaration2_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/memberFunctionDeclarations/MemberFunctionDeclaration3_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/memberFunctionDeclarations/MemberFunctionDeclaration3_es6/input.ts.json index e1881c736df2..a64fe40caf4f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/memberFunctionDeclarations/MemberFunctionDeclaration3_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/memberFunctionDeclarations/MemberFunctionDeclaration3_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/memberFunctionDeclarations/MemberFunctionDeclaration7_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/memberFunctionDeclarations/MemberFunctionDeclaration7_es6/input.ts.json index 745f30009dc8..0b38d5ee6946 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/memberFunctionDeclarations/MemberFunctionDeclaration7_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/memberFunctionDeclarations/MemberFunctionDeclaration7_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -87,7 +85,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/moduleExportsAmd/defaultExportsGetExportedAmd/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/moduleExportsAmd/defaultExportsGetExportedAmd/input.ts.json index 25a413b21931..343dd1eafe0d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/moduleExportsAmd/defaultExportsGetExportedAmd/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/moduleExportsAmd/defaultExportsGetExportedAmd/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "span": { @@ -57,7 +56,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/moduleExportsAmd/outFilerootDirModuleNamesAmd/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/moduleExportsAmd/outFilerootDirModuleNamesAmd/input.ts.json index 778b45ec6163..73615de7f8f3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/moduleExportsAmd/outFilerootDirModuleNamesAmd/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/moduleExportsAmd/outFilerootDirModuleNamesAmd/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -68,7 +67,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "span": { @@ -107,7 +105,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -137,7 +134,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } } @@ -176,7 +172,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [], @@ -216,7 +211,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -253,7 +247,6 @@ "ctxt": 0 }, "value": "import", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/moduleExportsCommonjs/defaultExportsGetExportedCommonjs/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/moduleExportsCommonjs/defaultExportsGetExportedCommonjs/input.ts.json index e03d447f3bab..708e1326d0dc 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/moduleExportsCommonjs/defaultExportsGetExportedCommonjs/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/moduleExportsCommonjs/defaultExportsGetExportedCommonjs/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "span": { @@ -57,7 +56,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/moduleExportsSystem/defaultExportsGetExportedSystem/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/moduleExportsSystem/defaultExportsGetExportedSystem/input.ts.json index 7b370b03ec77..4e9ff28cbda6 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/moduleExportsSystem/defaultExportsGetExportedSystem/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/moduleExportsSystem/defaultExportsGetExportedSystem/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "span": { @@ -57,7 +56,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/moduleExportsSystem/outFilerootDirModuleNamesSystem/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/moduleExportsSystem/outFilerootDirModuleNamesSystem/input.ts.json index bce802b5eb6d..39ee52a92941 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/moduleExportsSystem/outFilerootDirModuleNamesSystem/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/moduleExportsSystem/outFilerootDirModuleNamesSystem/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -68,7 +67,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "span": { @@ -107,7 +105,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -137,7 +134,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } } @@ -176,7 +172,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [], @@ -216,7 +211,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -253,7 +247,6 @@ "ctxt": 0 }, "value": "import", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/moduleExportsUmd/defaultExportsGetExportedUmd/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/moduleExportsUmd/defaultExportsGetExportedUmd/input.ts.json index 25a413b21931..343dd1eafe0d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/moduleExportsUmd/defaultExportsGetExportedUmd/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/moduleExportsUmd/defaultExportsGetExportedUmd/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "span": { @@ -57,7 +56,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportInAwaitExpression01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportInAwaitExpression01/input.ts.json index b030d820bb5d..b8cb0ab6c499 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportInAwaitExpression01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportInAwaitExpression01/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -71,8 +70,8 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -82,8 +81,8 @@ "ctxt": 0 }, "value": "reject", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -116,7 +115,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -166,7 +164,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -193,7 +190,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -279,8 +275,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -297,7 +293,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportInAwaitExpression02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportInAwaitExpression02/input.ts.json index 6f613b703ff8..786fa14e11d2 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportInAwaitExpression02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportInAwaitExpression02/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -71,8 +70,8 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -82,8 +81,8 @@ "ctxt": 0 }, "value": "reject", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -116,7 +115,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -166,7 +164,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -193,7 +190,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -279,8 +275,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -297,7 +293,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportWithOverloads01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportWithOverloads01/input.ts.json index c45c8b6f98c7..d1a69aa769dd 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportWithOverloads01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportWithOverloads01/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -57,7 +56,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [ @@ -77,6 +75,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -93,8 +92,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -128,7 +126,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [ @@ -160,8 +157,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportsCannotMerge01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportsCannotMerge01/input.ts.json index a91de873ed81..3430af7962bd 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportsCannotMerge01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportsCannotMerge01/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Decl", - "typeAnnotation": null, "optional": false }, "params": [], @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "Decl", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -118,7 +116,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -160,7 +157,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -214,7 +210,6 @@ "ctxt": 0 }, "value": "Decl", - "typeAnnotation": null, "optional": false }, "body": { @@ -257,8 +252,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -306,8 +301,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -338,7 +333,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -381,7 +375,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false } } @@ -425,7 +418,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -457,6 +449,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -479,13 +472,11 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -517,6 +508,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -541,7 +533,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "right": { @@ -552,14 +543,12 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -588,7 +577,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "property": { @@ -599,7 +587,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -627,7 +614,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "property": { @@ -638,7 +624,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportsCannotMerge02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportsCannotMerge02/input.ts.json index 68bf18bf4a18..f72bec99688e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportsCannotMerge02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportsCannotMerge02/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Decl", - "typeAnnotation": null, "optional": false }, "span": { @@ -62,7 +61,6 @@ "ctxt": 0 }, "value": "Decl", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -188,7 +184,6 @@ "ctxt": 0 }, "value": "Decl", - "typeAnnotation": null, "optional": false }, "body": { @@ -214,7 +209,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -257,7 +251,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false } } @@ -301,7 +294,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -333,6 +325,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -355,13 +348,11 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -393,6 +384,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -417,7 +409,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "right": { @@ -428,14 +419,12 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -467,8 +456,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -485,7 +474,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -520,8 +508,8 @@ "ctxt": 0 }, "value": "sum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -546,7 +534,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "property": { @@ -557,7 +544,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -577,7 +563,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "property": { @@ -588,7 +573,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportsCannotMerge03/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportsCannotMerge03/input.ts.json index 9240cf29dad5..5e70f66b0860 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportsCannotMerge03/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportsCannotMerge03/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Decl", - "typeAnnotation": null, "optional": false }, "span": { @@ -55,7 +54,6 @@ "ctxt": 0 }, "value": "Decl", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -85,7 +83,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -127,7 +124,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -173,7 +169,6 @@ "ctxt": 0 }, "value": "Decl", - "typeAnnotation": null, "optional": false }, "body": { @@ -199,7 +194,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -241,7 +235,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false } } @@ -285,7 +278,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -317,6 +309,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -339,13 +332,11 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -377,6 +368,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -401,7 +393,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "right": { @@ -412,14 +403,12 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -451,8 +440,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -469,7 +458,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -504,8 +492,8 @@ "ctxt": 0 }, "value": "sum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -530,7 +518,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "property": { @@ -541,7 +528,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -561,7 +547,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "property": { @@ -572,7 +557,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportsCannotMerge04/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportsCannotMerge04/input.ts.json index 9ec25b886d83..1bd0957ab15f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportsCannotMerge04/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/defaultExportsCannotMerge04/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "params": [], @@ -65,7 +64,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "body": { @@ -108,8 +106,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -135,7 +133,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -173,7 +170,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportAndImport-es3-amd/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportAndImport-es3-amd/input.ts.json index 5d2095742b4a..55ccbd00a479 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportAndImport-es3-amd/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportAndImport-es3-amd/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "params": [], @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } } @@ -110,7 +108,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "params": [], @@ -150,7 +147,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportAndImport-es3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportAndImport-es3/input.ts.json index 13cdc8afd471..907a5cf7f430 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportAndImport-es3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportAndImport-es3/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "params": [], @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } } @@ -110,7 +108,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "params": [], @@ -150,7 +147,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportAndImport-es5-amd/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportAndImport-es5-amd/input.ts.json index 5d2095742b4a..55ccbd00a479 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportAndImport-es5-amd/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportAndImport-es5-amd/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "params": [], @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } } @@ -110,7 +108,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "params": [], @@ -150,7 +147,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportAndImport-es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportAndImport-es5/input.ts.json index e18365828e89..1fb772b48037 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportAndImport-es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportAndImport-es5/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "params": [], @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } } @@ -110,7 +108,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "params": [], @@ -150,7 +147,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportBinding/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportBinding/input.ts.json index d6faaf9f4d90..054cdc0c8de3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportBinding/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportBinding/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "exported": null @@ -62,7 +61,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "exported": { @@ -73,7 +71,6 @@ "ctxt": 0 }, "value": "xx", - "typeAnnotation": null, "optional": false } } @@ -97,7 +94,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -126,8 +122,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -170,7 +166,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "exported": { @@ -181,7 +176,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false } } @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "exported": null @@ -273,7 +265,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "exported": { @@ -284,7 +275,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false } } @@ -308,7 +298,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -337,8 +326,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportSpellingSuggestion/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportSpellingSuggestion/input.ts.json index 383cd5d42dd5..426cd442ecf4 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportSpellingSuggestion/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportSpellingSuggestion/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -44,6 +43,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,8 +60,7 @@ }, "kind": "never" } - }, - "optional": false + } } }, { @@ -80,6 +79,7 @@ "ctxt": 0 }, "value": "msg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +96,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -137,7 +136,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -173,7 +171,6 @@ "ctxt": 0 }, "value": "msg", - "typeAnnotation": null, "optional": false } } @@ -213,7 +210,6 @@ "ctxt": 0 }, "value": "assertNevar", - "typeAnnotation": null, "optional": false }, "imported": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportStar-amd/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportStar-amd/input.ts.json index 116aac66a944..c1d0709e060c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportStar-amd/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportStar-amd/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -87,8 +87,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -143,7 +143,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -194,8 +193,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -240,8 +239,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -286,8 +285,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -330,7 +329,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "exported": null @@ -350,7 +348,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "exported": null @@ -370,7 +367,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "exported": null @@ -472,7 +468,6 @@ "ctxt": 0 }, "value": "hello", - "typeAnnotation": null, "optional": false } }, @@ -491,7 +486,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "imported": null @@ -511,7 +505,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "imported": null @@ -531,7 +524,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "imported": null @@ -551,7 +543,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "imported": null @@ -589,7 +580,6 @@ "ctxt": 0 }, "value": "hello", - "typeAnnotation": null, "optional": false } }, @@ -608,7 +598,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -627,7 +616,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -646,7 +634,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } }, @@ -665,7 +652,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportStar/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportStar/input.ts.json index 712b54782efd..68566f551b5b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportStar/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportStar/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -87,8 +87,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -143,7 +143,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -194,8 +193,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -240,8 +239,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -286,8 +285,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -330,7 +329,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "exported": null @@ -350,7 +348,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "exported": null @@ -370,7 +367,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "exported": null @@ -472,7 +468,6 @@ "ctxt": 0 }, "value": "hello", - "typeAnnotation": null, "optional": false } }, @@ -491,7 +486,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "imported": null @@ -511,7 +505,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "imported": null @@ -531,7 +524,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "imported": null @@ -551,7 +543,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "imported": null @@ -589,7 +580,6 @@ "ctxt": 0 }, "value": "hello", - "typeAnnotation": null, "optional": false } }, @@ -608,7 +598,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -627,7 +616,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -646,7 +634,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } }, @@ -665,7 +652,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports1-amd/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports1-amd/input.ts.json index a3626a87b428..9d955f6a5fbb 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports1-amd/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports1-amd/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -57,7 +57,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -92,7 +91,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -124,7 +122,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -157,7 +154,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -176,7 +172,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -196,7 +191,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -216,7 +210,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "members": [ @@ -259,7 +251,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -279,7 +270,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -299,7 +289,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -323,7 +312,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -366,8 +354,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -395,7 +383,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { @@ -428,7 +415,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -464,7 +450,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -495,7 +480,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -508,7 +492,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "right": { @@ -519,7 +502,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -547,7 +529,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "exported": null @@ -567,7 +548,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "exported": null @@ -587,7 +567,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "exported": null @@ -607,7 +586,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "exported": null @@ -627,7 +605,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "exported": null @@ -647,7 +624,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "exported": null @@ -667,7 +643,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "exported": null @@ -687,7 +662,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "exported": null @@ -707,7 +681,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "exported": null @@ -727,7 +700,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "exported": null @@ -760,7 +732,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "exported": null @@ -780,7 +751,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "exported": null @@ -800,7 +770,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "exported": null @@ -820,7 +789,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "exported": null @@ -840,7 +808,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "exported": null @@ -860,7 +827,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "exported": null @@ -880,7 +846,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "exported": null @@ -900,7 +865,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "exported": null @@ -920,7 +884,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "exported": null @@ -940,7 +903,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "exported": null @@ -986,7 +948,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1006,7 +967,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1026,7 +986,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1046,7 +1005,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1066,7 +1024,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1086,7 +1043,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1106,7 +1062,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1126,7 +1081,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1146,7 +1100,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1166,7 +1119,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1212,7 +1164,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1232,7 +1183,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1252,7 +1202,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1272,7 +1221,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1292,7 +1240,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1312,7 +1259,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1332,7 +1278,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1352,7 +1297,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1372,7 +1316,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1392,7 +1335,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "exported": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports1-es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports1-es6/input.ts.json index 50b6232b8406..803ac75e3b0c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports1-es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports1-es6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -57,7 +57,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -92,7 +91,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -124,7 +122,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -157,7 +154,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -176,7 +172,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -196,7 +191,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -216,7 +210,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "members": [ @@ -259,7 +251,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -279,7 +270,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -299,7 +289,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -323,7 +312,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -366,8 +354,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -395,7 +383,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { @@ -428,7 +415,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -464,7 +450,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -495,7 +480,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -508,7 +492,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "right": { @@ -519,7 +502,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -547,7 +529,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "exported": null @@ -567,7 +548,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "exported": null @@ -587,7 +567,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "exported": null @@ -607,7 +586,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "exported": null @@ -627,7 +605,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "exported": null @@ -647,7 +624,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "exported": null @@ -667,7 +643,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "exported": null @@ -687,7 +662,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "exported": null @@ -707,7 +681,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "exported": null @@ -727,7 +700,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "exported": null @@ -760,7 +732,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "exported": null @@ -780,7 +751,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "exported": null @@ -800,7 +770,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "exported": null @@ -820,7 +789,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "exported": null @@ -840,7 +808,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "exported": null @@ -860,7 +827,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "exported": null @@ -880,7 +846,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "exported": null @@ -900,7 +865,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "exported": null @@ -920,7 +884,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "exported": null @@ -940,7 +903,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "exported": null @@ -986,7 +948,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1006,7 +967,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1026,7 +986,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1046,7 +1005,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1066,7 +1024,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1086,7 +1043,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1106,7 +1062,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1126,7 +1081,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1146,7 +1100,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1166,7 +1119,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1212,7 +1164,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1232,7 +1183,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1252,7 +1202,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1272,7 +1221,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1292,7 +1240,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1312,7 +1259,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1332,7 +1278,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1352,7 +1297,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1372,7 +1316,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1392,7 +1335,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "exported": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports1/input.ts.json index dd7fae43cf95..abf8faabf0ce 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -57,7 +57,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -92,7 +91,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -124,7 +122,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -157,7 +154,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -176,7 +172,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -196,7 +191,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -216,7 +210,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "members": [ @@ -259,7 +251,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -279,7 +270,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -299,7 +289,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -323,7 +312,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -366,8 +354,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -395,7 +383,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { @@ -428,7 +415,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -464,7 +450,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -495,7 +480,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -508,7 +492,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "right": { @@ -519,7 +502,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -547,7 +529,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "exported": null @@ -567,7 +548,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "exported": null @@ -587,7 +567,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "exported": null @@ -607,7 +586,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "exported": null @@ -627,7 +605,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "exported": null @@ -647,7 +624,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "exported": null @@ -667,7 +643,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "exported": null @@ -687,7 +662,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "exported": null @@ -707,7 +681,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "exported": null @@ -727,7 +700,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "exported": null @@ -760,7 +732,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "exported": null @@ -780,7 +751,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "exported": null @@ -800,7 +770,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "exported": null @@ -820,7 +789,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "exported": null @@ -840,7 +808,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "exported": null @@ -860,7 +827,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "exported": null @@ -880,7 +846,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "exported": null @@ -900,7 +865,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "exported": null @@ -920,7 +884,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "exported": null @@ -940,7 +903,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "exported": null @@ -986,7 +948,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1006,7 +967,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1026,7 +986,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1046,7 +1005,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1066,7 +1024,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1086,7 +1043,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1106,7 +1062,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1126,7 +1081,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1146,7 +1100,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1166,7 +1119,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1212,7 +1164,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1232,7 +1183,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1252,7 +1202,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1272,7 +1221,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1292,7 +1240,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1312,7 +1259,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1332,7 +1278,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1352,7 +1297,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1372,7 +1316,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1392,7 +1335,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "exported": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports2-amd/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports2-amd/input.ts.json index 50a8adec735e..97bd9639a801 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports2-amd/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports2-amd/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -92,8 +92,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -137,7 +137,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "exported": { @@ -148,7 +147,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -167,7 +165,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "exported": { @@ -178,7 +175,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -223,7 +219,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "imported": null @@ -243,7 +238,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "imported": null @@ -289,7 +283,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "exported": { @@ -300,7 +293,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -319,7 +311,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "exported": { @@ -330,7 +321,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports2-es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports2-es6/input.ts.json index 2a8dfef25928..201522b4983f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports2-es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports2-es6/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -92,8 +92,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -137,7 +137,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "exported": { @@ -148,7 +147,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -167,7 +165,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "exported": { @@ -178,7 +175,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -223,7 +219,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "imported": null @@ -243,7 +238,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "imported": null @@ -289,7 +283,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "exported": { @@ -300,7 +293,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -319,7 +311,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "exported": { @@ -330,7 +321,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports2/input.ts.json index 950a8b888b72..3ca2e9304afe 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports2/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -92,8 +92,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -137,7 +137,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "exported": { @@ -148,7 +147,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -167,7 +165,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "exported": { @@ -178,7 +175,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -223,7 +219,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "imported": null @@ -243,7 +238,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "imported": null @@ -289,7 +283,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "exported": { @@ -300,7 +293,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -319,7 +311,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "exported": { @@ -330,7 +321,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports3-amd/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports3-amd/input.ts.json index d246ff93e9e4..226230c54cc6 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports3-amd/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports3-amd/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,7 +72,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -115,7 +114,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -155,7 +153,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -196,7 +193,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -215,7 +211,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -235,7 +230,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -255,7 +249,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -287,7 +280,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "members": [ @@ -306,7 +298,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -326,7 +317,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -346,7 +336,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -378,7 +367,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -421,8 +409,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -458,7 +446,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { @@ -491,7 +478,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -535,7 +521,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -567,7 +552,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -580,7 +564,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "right": { @@ -591,7 +574,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -619,7 +601,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "exported": { @@ -630,7 +611,6 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, "optional": false } }, @@ -649,7 +629,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "exported": { @@ -660,7 +639,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } }, @@ -679,7 +657,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "exported": { @@ -690,7 +667,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false } }, @@ -709,7 +685,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "exported": { @@ -720,7 +695,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false } }, @@ -739,7 +713,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "exported": { @@ -750,7 +723,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false } }, @@ -769,7 +741,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "exported": { @@ -780,7 +751,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false } }, @@ -799,7 +769,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "exported": { @@ -810,7 +779,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false } }, @@ -829,7 +797,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "exported": { @@ -840,7 +807,6 @@ "ctxt": 0 }, "value": "N1", - "typeAnnotation": null, "optional": false } }, @@ -859,7 +825,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "exported": { @@ -870,7 +835,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false } }, @@ -889,7 +853,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "exported": { @@ -900,7 +863,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } } @@ -932,7 +894,6 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -943,7 +904,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -962,7 +922,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -973,7 +932,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -992,7 +950,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1003,7 +960,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -1022,7 +978,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1033,7 +988,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false } }, @@ -1052,7 +1006,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1063,7 +1016,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false } }, @@ -1082,7 +1034,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1093,7 +1044,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false } }, @@ -1112,7 +1062,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1123,7 +1072,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } }, @@ -1142,7 +1090,6 @@ "ctxt": 0 }, "value": "N1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1153,7 +1100,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false } }, @@ -1172,7 +1118,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1183,7 +1128,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false } }, @@ -1202,7 +1146,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1213,7 +1156,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1258,7 +1200,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1269,7 +1210,6 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, "optional": false } }, @@ -1288,7 +1228,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1299,7 +1238,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } }, @@ -1318,7 +1256,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1329,7 +1266,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false } }, @@ -1348,7 +1284,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1359,7 +1294,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false } }, @@ -1378,7 +1312,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1389,7 +1322,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false } }, @@ -1408,7 +1340,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1419,7 +1350,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false } }, @@ -1438,7 +1368,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1449,7 +1378,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false } }, @@ -1468,7 +1396,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1479,7 +1406,6 @@ "ctxt": 0 }, "value": "N1", - "typeAnnotation": null, "optional": false } }, @@ -1498,7 +1424,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1509,7 +1434,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false } }, @@ -1528,7 +1452,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1539,7 +1462,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } } @@ -1584,7 +1506,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1604,7 +1525,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1624,7 +1544,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1644,7 +1563,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1664,7 +1582,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1684,7 +1601,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1704,7 +1620,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1724,7 +1639,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1744,7 +1658,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1764,7 +1677,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "exported": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports3-es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports3-es6/input.ts.json index 54c03b19cc80..80c98283dfe3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports3-es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports3-es6/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,7 +72,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -115,7 +114,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -155,7 +153,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -196,7 +193,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -215,7 +211,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -235,7 +230,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -255,7 +249,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -287,7 +280,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "members": [ @@ -306,7 +298,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -326,7 +317,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -346,7 +336,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -378,7 +367,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -421,8 +409,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -458,7 +446,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { @@ -491,7 +478,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -535,7 +521,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -567,7 +552,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -580,7 +564,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "right": { @@ -591,7 +574,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -619,7 +601,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "exported": { @@ -630,7 +611,6 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, "optional": false } }, @@ -649,7 +629,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "exported": { @@ -660,7 +639,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } }, @@ -679,7 +657,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "exported": { @@ -690,7 +667,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false } }, @@ -709,7 +685,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "exported": { @@ -720,7 +695,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false } }, @@ -739,7 +713,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "exported": { @@ -750,7 +723,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false } }, @@ -769,7 +741,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "exported": { @@ -780,7 +751,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false } }, @@ -799,7 +769,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "exported": { @@ -810,7 +779,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false } }, @@ -829,7 +797,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "exported": { @@ -840,7 +807,6 @@ "ctxt": 0 }, "value": "N1", - "typeAnnotation": null, "optional": false } }, @@ -859,7 +825,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "exported": { @@ -870,7 +835,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false } }, @@ -889,7 +853,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "exported": { @@ -900,7 +863,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } } @@ -932,7 +894,6 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -943,7 +904,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -962,7 +922,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -973,7 +932,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -992,7 +950,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1003,7 +960,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -1022,7 +978,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1033,7 +988,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false } }, @@ -1052,7 +1006,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1063,7 +1016,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false } }, @@ -1082,7 +1034,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1093,7 +1044,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false } }, @@ -1112,7 +1062,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1123,7 +1072,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } }, @@ -1142,7 +1090,6 @@ "ctxt": 0 }, "value": "N1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1153,7 +1100,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false } }, @@ -1172,7 +1118,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1183,7 +1128,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false } }, @@ -1202,7 +1146,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1213,7 +1156,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1258,7 +1200,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1269,7 +1210,6 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, "optional": false } }, @@ -1288,7 +1228,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1299,7 +1238,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } }, @@ -1318,7 +1256,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1329,7 +1266,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false } }, @@ -1348,7 +1284,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1359,7 +1294,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false } }, @@ -1378,7 +1312,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1389,7 +1322,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false } }, @@ -1408,7 +1340,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1419,7 +1350,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false } }, @@ -1438,7 +1368,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1449,7 +1378,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false } }, @@ -1468,7 +1396,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1479,7 +1406,6 @@ "ctxt": 0 }, "value": "N1", - "typeAnnotation": null, "optional": false } }, @@ -1498,7 +1424,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1509,7 +1434,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false } }, @@ -1528,7 +1452,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1539,7 +1462,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } } @@ -1584,7 +1506,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1604,7 +1525,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1624,7 +1544,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1644,7 +1563,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1664,7 +1582,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1684,7 +1601,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1704,7 +1620,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1724,7 +1639,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1744,7 +1658,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1764,7 +1677,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "exported": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports3/input.ts.json index 8c75143b6508..dd4b935ad6d6 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports3/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,7 +72,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -115,7 +114,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -155,7 +153,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -196,7 +193,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -215,7 +211,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -235,7 +230,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -255,7 +249,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -287,7 +280,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "members": [ @@ -306,7 +298,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -326,7 +317,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -346,7 +336,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -378,7 +367,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -421,8 +409,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -458,7 +446,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { @@ -491,7 +478,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -535,7 +521,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -567,7 +552,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -580,7 +564,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "right": { @@ -591,7 +574,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -619,7 +601,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "exported": { @@ -630,7 +611,6 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, "optional": false } }, @@ -649,7 +629,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "exported": { @@ -660,7 +639,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } }, @@ -679,7 +657,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "exported": { @@ -690,7 +667,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false } }, @@ -709,7 +685,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "exported": { @@ -720,7 +695,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false } }, @@ -739,7 +713,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "exported": { @@ -750,7 +723,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false } }, @@ -769,7 +741,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "exported": { @@ -780,7 +751,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false } }, @@ -799,7 +769,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "exported": { @@ -810,7 +779,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false } }, @@ -829,7 +797,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "exported": { @@ -840,7 +807,6 @@ "ctxt": 0 }, "value": "N1", - "typeAnnotation": null, "optional": false } }, @@ -859,7 +825,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "exported": { @@ -870,7 +835,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false } }, @@ -889,7 +853,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "exported": { @@ -900,7 +863,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } } @@ -932,7 +894,6 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -943,7 +904,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -962,7 +922,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -973,7 +932,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -992,7 +950,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1003,7 +960,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -1022,7 +978,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1033,7 +988,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false } }, @@ -1052,7 +1006,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1063,7 +1016,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false } }, @@ -1082,7 +1034,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1093,7 +1044,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false } }, @@ -1112,7 +1062,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1123,7 +1072,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } }, @@ -1142,7 +1090,6 @@ "ctxt": 0 }, "value": "N1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1153,7 +1100,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false } }, @@ -1172,7 +1118,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1183,7 +1128,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false } }, @@ -1202,7 +1146,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1213,7 +1156,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1258,7 +1200,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1269,7 +1210,6 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, "optional": false } }, @@ -1288,7 +1228,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1299,7 +1238,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } }, @@ -1318,7 +1256,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1329,7 +1266,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false } }, @@ -1348,7 +1284,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1359,7 +1294,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false } }, @@ -1378,7 +1312,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1389,7 +1322,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false } }, @@ -1408,7 +1340,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1419,7 +1350,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false } }, @@ -1438,7 +1368,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1449,7 +1378,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false } }, @@ -1468,7 +1396,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1479,7 +1406,6 @@ "ctxt": 0 }, "value": "N1", - "typeAnnotation": null, "optional": false } }, @@ -1498,7 +1424,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1509,7 +1434,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false } }, @@ -1528,7 +1452,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1539,7 +1462,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } } @@ -1584,7 +1506,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1604,7 +1525,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1624,7 +1544,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1644,7 +1563,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1664,7 +1582,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1684,7 +1601,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1704,7 +1620,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1724,7 +1639,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1744,7 +1658,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1764,7 +1677,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "exported": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports4-amd/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports4-amd/input.ts.json index 8c15eb92d6cc..305f68059409 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports4-amd/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports4-amd/input.ts.json @@ -45,7 +45,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -93,7 +92,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "computed": false @@ -133,7 +130,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -170,7 +166,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -197,7 +192,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -241,7 +235,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -252,7 +245,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "computed": false @@ -281,7 +273,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "imported": { @@ -292,7 +283,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false } } @@ -329,7 +319,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -356,7 +345,6 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, "optional": false } }, @@ -375,7 +363,6 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, "optional": false } } @@ -412,7 +399,6 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, "optional": false } }, @@ -438,7 +424,6 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, "optional": false }, "property": { @@ -449,7 +434,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "computed": false @@ -478,7 +462,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } }, @@ -497,7 +480,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "imported": { @@ -508,7 +490,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false } } @@ -545,7 +526,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } }, @@ -564,7 +544,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false } }, @@ -610,7 +589,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -658,7 +636,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -669,7 +646,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "computed": false @@ -698,7 +674,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -735,7 +710,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -762,7 +736,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -806,7 +779,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -817,7 +789,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "computed": false @@ -846,7 +817,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "imported": { @@ -857,7 +827,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false } } @@ -894,7 +863,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -921,7 +889,6 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, "optional": false } }, @@ -940,7 +907,6 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, "optional": false } } @@ -977,7 +943,6 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, "optional": false } }, @@ -1003,7 +968,6 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1014,7 +978,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1043,7 +1006,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } }, @@ -1062,7 +1024,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1073,7 +1034,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false } } @@ -1110,7 +1070,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } }, @@ -1129,7 +1088,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false } }, @@ -1156,7 +1114,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1176,7 +1133,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1196,7 +1152,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1216,7 +1171,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1236,7 +1190,6 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1256,7 +1209,6 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1276,7 +1228,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1296,7 +1247,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "exported": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports4-es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports4-es6/input.ts.json index c479c081bdfa..65dada1cab3c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports4-es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports4-es6/input.ts.json @@ -45,7 +45,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -93,7 +92,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "computed": false @@ -133,7 +130,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -170,7 +166,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -197,7 +192,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -241,7 +235,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -252,7 +245,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "computed": false @@ -281,7 +273,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "imported": { @@ -292,7 +283,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false } } @@ -329,7 +319,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -356,7 +345,6 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, "optional": false } }, @@ -375,7 +363,6 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, "optional": false } } @@ -412,7 +399,6 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, "optional": false } }, @@ -438,7 +424,6 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, "optional": false }, "property": { @@ -449,7 +434,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "computed": false @@ -478,7 +462,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } }, @@ -497,7 +480,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "imported": { @@ -508,7 +490,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false } } @@ -545,7 +526,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } }, @@ -564,7 +544,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false } }, @@ -610,7 +589,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -658,7 +636,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -669,7 +646,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "computed": false @@ -698,7 +674,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -735,7 +710,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -762,7 +736,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -806,7 +779,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -817,7 +789,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "computed": false @@ -846,7 +817,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "imported": { @@ -857,7 +827,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false } } @@ -894,7 +863,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -921,7 +889,6 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, "optional": false } }, @@ -940,7 +907,6 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, "optional": false } } @@ -977,7 +943,6 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, "optional": false } }, @@ -1003,7 +968,6 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1014,7 +978,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1043,7 +1006,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } }, @@ -1062,7 +1024,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1073,7 +1034,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false } } @@ -1110,7 +1070,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } }, @@ -1129,7 +1088,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false } }, @@ -1156,7 +1114,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1176,7 +1133,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1196,7 +1152,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1216,7 +1171,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1236,7 +1190,6 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1256,7 +1209,6 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1276,7 +1228,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1296,7 +1247,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "exported": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports4/input.ts.json index c479c081bdfa..65dada1cab3c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImports4/input.ts.json @@ -45,7 +45,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -93,7 +92,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "computed": false @@ -133,7 +130,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -170,7 +166,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -197,7 +192,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -241,7 +235,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -252,7 +245,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "computed": false @@ -281,7 +273,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "imported": { @@ -292,7 +283,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false } } @@ -329,7 +319,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -356,7 +345,6 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, "optional": false } }, @@ -375,7 +363,6 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, "optional": false } } @@ -412,7 +399,6 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, "optional": false } }, @@ -438,7 +424,6 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, "optional": false }, "property": { @@ -449,7 +434,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "computed": false @@ -478,7 +462,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } }, @@ -497,7 +480,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "imported": { @@ -508,7 +490,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false } } @@ -545,7 +526,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } }, @@ -564,7 +544,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false } }, @@ -610,7 +589,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -658,7 +636,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -669,7 +646,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "computed": false @@ -698,7 +674,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -735,7 +710,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -762,7 +736,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -806,7 +779,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -817,7 +789,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "computed": false @@ -846,7 +817,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "imported": { @@ -857,7 +827,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false } } @@ -894,7 +863,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -921,7 +889,6 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, "optional": false } }, @@ -940,7 +907,6 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, "optional": false } } @@ -977,7 +943,6 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, "optional": false } }, @@ -1003,7 +968,6 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1014,7 +978,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1043,7 +1006,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } }, @@ -1062,7 +1024,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1073,7 +1034,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false } } @@ -1110,7 +1070,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } }, @@ -1129,7 +1088,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false } }, @@ -1156,7 +1114,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1176,7 +1133,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1196,7 +1152,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1216,7 +1171,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1236,7 +1190,6 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1256,7 +1209,6 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1276,7 +1228,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1296,7 +1247,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "exported": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImportsWithContextualKeywordNames02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImportsWithContextualKeywordNames02/input.ts.json index 5c9e82dc1401..b0a19fa1131f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImportsWithContextualKeywordNames02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImportsWithContextualKeywordNames02/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "as", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -70,7 +70,6 @@ "ctxt": 0 }, "value": "as", - "typeAnnotation": null, "optional": false }, "exported": { @@ -81,7 +80,6 @@ "ctxt": 0 }, "value": "return", - "typeAnnotation": null, "optional": false } }, @@ -100,7 +98,6 @@ "ctxt": 0 }, "value": "as", - "typeAnnotation": null, "optional": false }, "exported": null @@ -133,7 +130,6 @@ "ctxt": 0 }, "value": "as", - "typeAnnotation": null, "optional": false } } @@ -180,8 +176,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -198,7 +194,6 @@ "ctxt": 0 }, "value": "as", - "typeAnnotation": null, "optional": false }, "property": { @@ -209,7 +204,6 @@ "ctxt": 0 }, "value": "as", - "typeAnnotation": null, "optional": false }, "computed": false @@ -243,8 +237,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -261,7 +255,6 @@ "ctxt": 0 }, "value": "as", - "typeAnnotation": null, "optional": false }, "property": { @@ -272,7 +265,6 @@ "ctxt": 0 }, "value": "return", - "typeAnnotation": null, "optional": false }, "computed": false @@ -304,7 +296,6 @@ "ctxt": 0 }, "value": "as", - "typeAnnotation": null, "optional": false }, "imported": { @@ -315,7 +306,6 @@ "ctxt": 0 }, "value": "as", - "typeAnnotation": null, "optional": false } } @@ -360,7 +350,6 @@ "ctxt": 0 }, "value": "as", - "typeAnnotation": null, "optional": false }, "imported": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImportsWithUnderscores2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImportsWithUnderscores2/input.ts.json index 89510b5613c9..1ab959c0be62 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImportsWithUnderscores2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImportsWithUnderscores2/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "R", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -78,8 +78,8 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -168,7 +168,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false } } @@ -230,7 +229,6 @@ "ctxt": 0 }, "value": "__esmodule", - "typeAnnotation": null, "optional": false }, "value": null @@ -250,7 +248,6 @@ "ctxt": 0 }, "value": "__proto__", - "typeAnnotation": null, "optional": false }, "value": null @@ -267,7 +264,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImportsWithUnderscores3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImportsWithUnderscores3/input.ts.json index 4defbe13e994..36b3e64e88b8 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImportsWithUnderscores3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImportsWithUnderscores3/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "R", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -78,8 +78,8 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -194,7 +194,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false } } @@ -256,7 +255,6 @@ "ctxt": 0 }, "value": "___", - "typeAnnotation": null, "optional": false }, "value": null @@ -276,7 +274,6 @@ "ctxt": 0 }, "value": "___hello", - "typeAnnotation": null, "optional": false }, "value": null @@ -296,7 +293,6 @@ "ctxt": 0 }, "value": "_hi", - "typeAnnotation": null, "optional": false }, "value": null @@ -313,7 +309,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImportsWithUnderscores4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImportsWithUnderscores4/input.ts.json index c0da1882cf87..bac064e8fab9 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImportsWithUnderscores4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/exportsAndImportsWithUnderscores4/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "console", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -72,7 +72,6 @@ "ctxt": 0 }, "value": "_", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -120,7 +119,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -131,7 +129,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -183,7 +180,6 @@ "ctxt": 0 }, "value": "__", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -231,7 +227,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -242,7 +237,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -294,7 +288,6 @@ "ctxt": 0 }, "value": "___", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -342,7 +335,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -353,7 +345,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -405,7 +396,6 @@ "ctxt": 0 }, "value": "_hi", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -453,7 +443,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -464,7 +453,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -516,7 +504,6 @@ "ctxt": 0 }, "value": "__proto", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -564,7 +551,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -575,7 +561,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -627,7 +612,6 @@ "ctxt": 0 }, "value": "__esmodule", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -675,7 +659,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -686,7 +669,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -738,7 +720,6 @@ "ctxt": 0 }, "value": "___hello", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -786,7 +767,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -797,7 +777,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -855,7 +834,6 @@ "ctxt": 0 }, "value": "_", - "typeAnnotation": null, "optional": false }, "imported": null @@ -875,7 +853,6 @@ "ctxt": 0 }, "value": "__", - "typeAnnotation": null, "optional": false }, "imported": null @@ -895,7 +872,6 @@ "ctxt": 0 }, "value": "___hello", - "typeAnnotation": null, "optional": false }, "imported": null @@ -915,7 +891,6 @@ "ctxt": 0 }, "value": "__esmodule", - "typeAnnotation": null, "optional": false }, "imported": null @@ -935,7 +910,6 @@ "ctxt": 0 }, "value": "__proto", - "typeAnnotation": null, "optional": false }, "imported": null @@ -955,7 +929,6 @@ "ctxt": 0 }, "value": "_hi", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1000,7 +973,6 @@ "ctxt": 0 }, "value": "_", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1029,7 +1001,6 @@ "ctxt": 0 }, "value": "__", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1058,7 +1029,6 @@ "ctxt": 0 }, "value": "___hello", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1087,7 +1057,6 @@ "ctxt": 0 }, "value": "__esmodule", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1116,7 +1085,6 @@ "ctxt": 0 }, "value": "__proto", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1145,7 +1113,6 @@ "ctxt": 0 }, "value": "_hi", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/multipleDefaultExports01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/multipleDefaultExports01/input.ts.json index 3ef65fa89a40..b952b23cf18a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/multipleDefaultExports01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/multipleDefaultExports01/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "span": { @@ -57,7 +56,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "params": [], @@ -107,8 +105,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -138,7 +136,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -165,7 +162,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false } } @@ -209,7 +205,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/multipleDefaultExports02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/multipleDefaultExports02/input.ts.json index be17ef1f64cc..8d00fe2f8822 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/multipleDefaultExports02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/multipleDefaultExports02/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [], @@ -65,7 +64,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "params": [], @@ -113,7 +111,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false } } @@ -157,7 +154,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/multipleDefaultExports03/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/multipleDefaultExports03/input.ts.json index fb14a8649757..09371887ce97 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/multipleDefaultExports03/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/multipleDefaultExports03/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "span": { @@ -57,7 +56,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/multipleDefaultExports04/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/multipleDefaultExports04/input.ts.json index faf4f55e0607..0623bb63477b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/multipleDefaultExports04/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/multipleDefaultExports04/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -65,7 +64,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/multipleDefaultExports05/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/multipleDefaultExports05/input.ts.json index 1a901dcf5e6a..babe4e4d38af 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/multipleDefaultExports05/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/multipleDefaultExports05/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "AA1", - "typeAnnotation": null, "optional": false }, "span": { @@ -57,7 +56,6 @@ "ctxt": 0 }, "value": "BB1", - "typeAnnotation": null, "optional": false }, "span": { @@ -91,7 +89,6 @@ "ctxt": 0 }, "value": "CC1", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/modules/reExportDefaultExport/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/modules/reExportDefaultExport/input.ts.json index 2cc238d13c01..1c2a28f361bd 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/modules/reExportDefaultExport/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/modules/reExportDefaultExport/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "exported": null @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -149,7 +146,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "imported": null @@ -194,7 +190,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -223,7 +218,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/newTarget/newTarget.es5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/newTarget/newTarget.es5/input.ts.json index c62d9a7ff7a5..8a931cb513f6 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/newTarget/newTarget.es5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/newTarget/newTarget.es5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -79,8 +77,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MetaProperty", @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "property": { @@ -103,7 +100,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false } }, @@ -136,8 +132,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -157,7 +153,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "property": { @@ -168,7 +163,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false } }, @@ -201,7 +195,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -239,7 +232,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "property": { @@ -250,7 +242,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false } } @@ -288,7 +279,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -326,7 +316,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "property": { @@ -337,7 +326,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false } } @@ -377,7 +365,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -403,7 +390,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -466,8 +452,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MetaProperty", @@ -479,7 +465,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "property": { @@ -490,7 +475,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false } }, @@ -523,8 +507,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -544,7 +528,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "property": { @@ -555,7 +538,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false } }, @@ -582,7 +564,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -600,7 +581,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -644,8 +624,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MetaProperty", @@ -657,7 +637,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "property": { @@ -668,7 +647,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false } }, @@ -701,8 +679,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -722,7 +700,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "property": { @@ -733,7 +710,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false } }, @@ -778,8 +754,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -824,8 +800,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MetaProperty", @@ -837,7 +813,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "property": { @@ -848,7 +823,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false } }, @@ -881,8 +855,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -902,7 +876,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "property": { @@ -913,7 +886,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false } }, @@ -962,8 +934,8 @@ "ctxt": 0 }, "value": "O", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -983,7 +955,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "value": { @@ -1021,7 +992,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "property": { @@ -1032,7 +1002,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/newTarget/newTarget.es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/newTarget/newTarget.es6/input.ts.json index c62d9a7ff7a5..8a931cb513f6 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/newTarget/newTarget.es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/newTarget/newTarget.es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -79,8 +77,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MetaProperty", @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "property": { @@ -103,7 +100,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false } }, @@ -136,8 +132,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -157,7 +153,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "property": { @@ -168,7 +163,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false } }, @@ -201,7 +195,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -239,7 +232,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "property": { @@ -250,7 +242,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false } } @@ -288,7 +279,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -326,7 +316,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "property": { @@ -337,7 +326,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false } } @@ -377,7 +365,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -403,7 +390,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -466,8 +452,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MetaProperty", @@ -479,7 +465,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "property": { @@ -490,7 +475,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false } }, @@ -523,8 +507,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -544,7 +528,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "property": { @@ -555,7 +538,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false } }, @@ -582,7 +564,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -600,7 +581,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -644,8 +624,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MetaProperty", @@ -657,7 +637,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "property": { @@ -668,7 +647,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false } }, @@ -701,8 +679,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -722,7 +700,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "property": { @@ -733,7 +710,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false } }, @@ -778,8 +754,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -824,8 +800,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MetaProperty", @@ -837,7 +813,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "property": { @@ -848,7 +823,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false } }, @@ -881,8 +855,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -902,7 +876,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "property": { @@ -913,7 +886,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false } }, @@ -962,8 +934,8 @@ "ctxt": 0 }, "value": "O", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -983,7 +955,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "value": { @@ -1021,7 +992,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "property": { @@ -1032,7 +1002,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/propertyAccess/propertyAccessNumericLiterals.es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/propertyAccess/propertyAccessNumericLiterals.es6/input.ts.json index 0a9f0f4bdc23..f793280ce51d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/propertyAccess/propertyAccessNumericLiterals.es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/propertyAccess/propertyAccessNumericLiterals.es6/input.ts.json @@ -44,7 +44,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -91,7 +90,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -138,7 +136,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -185,7 +182,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -232,7 +228,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersFunction/input.ts.json index 5a65b0b3385d..9128a9f1cfe4 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersFunction/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,8 +48,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -86,7 +85,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -107,6 +105,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -123,8 +122,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -143,6 +141,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -159,8 +158,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -191,8 +189,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersFunctionES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersFunctionES6/input.ts.json index 5a65b0b3385d..9128a9f1cfe4 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersFunctionES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersFunctionES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,8 +48,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -86,7 +85,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -107,6 +105,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -123,8 +122,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -143,6 +141,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -159,8 +158,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -191,8 +189,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersFunctionExpression/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersFunctionExpression/input.ts.json index 976f2e472258..873f170f4a42 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersFunctionExpression/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersFunctionExpression/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "funcExp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -62,8 +62,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -111,8 +111,8 @@ "ctxt": 0 }, "value": "funcExp1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -130,6 +130,7 @@ "ctxt": 0 }, "value": "X", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -146,8 +147,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -169,8 +169,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -218,8 +218,8 @@ "ctxt": 0 }, "value": "funcExp2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -253,8 +253,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -309,8 +309,8 @@ "ctxt": 0 }, "value": "funcExp3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -358,8 +358,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersFunctionExpressionES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersFunctionExpressionES6/input.ts.json index 976f2e472258..873f170f4a42 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersFunctionExpressionES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersFunctionExpressionES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "funcExp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -62,8 +62,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -111,8 +111,8 @@ "ctxt": 0 }, "value": "funcExp1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -130,6 +130,7 @@ "ctxt": 0 }, "value": "X", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -146,8 +147,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -169,8 +169,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -218,8 +218,8 @@ "ctxt": 0 }, "value": "funcExp2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -253,8 +253,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -309,8 +309,8 @@ "ctxt": 0 }, "value": "funcExp3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -358,8 +358,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersFunctionProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersFunctionProperty/input.ts.json index b0419f571ff7..0cff8d29b983 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersFunctionProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersFunctionProperty/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "func1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -104,8 +104,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -134,8 +134,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -167,8 +166,8 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -188,7 +187,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "params": [ @@ -220,8 +218,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersFunctionPropertyES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersFunctionPropertyES6/input.ts.json index b0419f571ff7..0cff8d29b983 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersFunctionPropertyES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersFunctionPropertyES6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "func1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -104,8 +104,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -134,8 +134,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -167,8 +166,8 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -188,7 +187,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "params": [ @@ -220,8 +218,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersMethod/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersMethod/input.ts.json index 1099c4173268..784d5e704aeb 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersMethod/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersMethod/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -78,8 +77,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -110,8 +108,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -144,7 +142,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -177,8 +174,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -225,7 +222,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -246,6 +242,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -262,8 +259,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -294,8 +290,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -344,7 +340,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -370,7 +365,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -402,8 +396,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -436,7 +430,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -469,8 +462,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -517,7 +510,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -538,6 +530,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -554,8 +547,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -586,8 +578,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersMethodES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersMethodES6/input.ts.json index 1099c4173268..784d5e704aeb 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersMethodES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/restParameters/emitRestParametersMethodES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -78,8 +77,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -110,8 +108,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -144,7 +142,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -177,8 +174,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -225,7 +222,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -246,6 +242,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -262,8 +259,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -294,8 +290,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -344,7 +340,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -370,7 +365,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -402,8 +396,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -436,7 +430,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -469,8 +462,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -517,7 +510,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -538,6 +530,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -554,8 +547,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -586,8 +578,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/restParameters/readonlyRestParameters/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/restParameters/readonlyRestParameters/input.ts.json index 89c1a51b805c..f790c8536beb 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/restParameters/readonlyRestParameters/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/restParameters/readonlyRestParameters/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -73,6 +72,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -89,8 +89,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -130,7 +129,6 @@ "ctxt": 0 }, "value": "f0", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -144,7 +142,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -158,7 +155,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -188,7 +184,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -202,7 +197,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -216,7 +210,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -246,7 +239,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -260,7 +252,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -274,7 +265,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -299,7 +289,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -332,8 +321,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -408,7 +397,6 @@ "ctxt": 0 }, "value": "f0", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -426,7 +414,6 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, "optional": false } } @@ -456,7 +443,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -520,7 +506,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -555,7 +540,6 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, "optional": false } } @@ -585,7 +569,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -603,7 +586,6 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, "optional": false } } @@ -628,7 +610,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -661,8 +642,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -766,7 +747,6 @@ "ctxt": 0 }, "value": "f0", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -784,7 +764,6 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, "optional": false } } @@ -814,7 +793,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -878,7 +856,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -913,7 +890,6 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, "optional": false } } @@ -943,7 +919,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -961,7 +936,6 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, "optional": false } } @@ -991,7 +965,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1055,7 +1028,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1090,7 +1062,6 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, "optional": false } } @@ -1120,7 +1091,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1138,7 +1108,6 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, "optional": false } } @@ -1163,7 +1132,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1196,8 +1164,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1280,7 +1248,6 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandProperties/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandProperties/input.ts.json index 65abac9ea99a..e8714226e968 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandProperties/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandProperties/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -52,8 +52,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -73,8 +73,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -106,8 +106,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -125,7 +125,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } ] @@ -159,8 +158,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -178,7 +177,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } ] @@ -212,8 +210,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -233,7 +231,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -254,7 +251,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, { @@ -265,7 +261,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, { @@ -278,7 +273,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "params": [], @@ -310,7 +304,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, { @@ -323,7 +316,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "value": { @@ -334,7 +326,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignment/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignment/input.ts.json index ae57c01a86c5..db42e5a4336a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignment/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignment/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "id", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -88,6 +88,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +105,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -150,6 +150,7 @@ "ctxt": 0 }, "value": "person", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -181,7 +182,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -223,7 +223,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -251,8 +250,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -270,7 +268,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, { @@ -281,7 +278,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false } ] @@ -300,7 +296,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -321,6 +316,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -352,7 +348,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -380,8 +375,7 @@ } ] } - }, - "optional": false + } } } ], @@ -439,7 +433,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -460,6 +453,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -476,8 +470,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -496,6 +489,7 @@ "ctxt": 0 }, "value": "id", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -512,8 +506,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -554,7 +547,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, { @@ -565,7 +557,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false } ] @@ -588,7 +579,6 @@ "ctxt": 0 }, "value": "bar1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -609,6 +599,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -625,8 +616,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -645,6 +635,7 @@ "ctxt": 0 }, "value": "id", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -661,8 +652,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -703,7 +693,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false } ] @@ -726,7 +715,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -747,6 +735,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -763,8 +752,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -783,6 +771,7 @@ "ctxt": 0 }, "value": "id", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -799,8 +788,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -841,7 +829,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, { @@ -852,7 +839,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false } ] @@ -894,7 +880,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -936,7 +921,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -988,7 +972,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1002,7 +985,6 @@ "ctxt": 0 }, "value": "person", - "typeAnnotation": null, "optional": false } } @@ -1035,8 +1017,8 @@ "ctxt": 0 }, "value": "person1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1053,7 +1035,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1118,6 +1099,7 @@ "ctxt": 0 }, "value": "person2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1149,7 +1131,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1177,8 +1158,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1195,7 +1175,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1260,6 +1239,7 @@ "ctxt": 0 }, "value": "person3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1291,7 +1271,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1333,7 +1312,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1361,8 +1339,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1379,7 +1356,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentES6/input.ts.json index 273400112ec2..58762570e2b2 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentES6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "id", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -88,6 +88,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +105,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -150,6 +150,7 @@ "ctxt": 0 }, "value": "person", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -181,7 +182,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -223,7 +223,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -251,8 +250,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -270,7 +268,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, { @@ -281,7 +278,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false } ] @@ -300,7 +296,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -321,6 +316,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -352,7 +348,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -380,8 +375,7 @@ } ] } - }, - "optional": false + } } } ], @@ -439,7 +433,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -460,6 +453,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -476,8 +470,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -496,6 +489,7 @@ "ctxt": 0 }, "value": "id", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -512,8 +506,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -554,7 +547,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, { @@ -565,7 +557,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false } ] @@ -588,7 +579,6 @@ "ctxt": 0 }, "value": "bar1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -609,6 +599,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -625,8 +616,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -645,6 +635,7 @@ "ctxt": 0 }, "value": "id", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -661,8 +652,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -703,7 +693,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false } ] @@ -726,7 +715,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -747,6 +735,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -763,8 +752,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -783,6 +771,7 @@ "ctxt": 0 }, "value": "id", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -799,8 +788,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -841,7 +829,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, { @@ -852,7 +839,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false } ] @@ -894,7 +880,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -936,7 +921,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -988,7 +972,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1002,7 +985,6 @@ "ctxt": 0 }, "value": "person", - "typeAnnotation": null, "optional": false } } @@ -1035,8 +1017,8 @@ "ctxt": 0 }, "value": "person1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1053,7 +1035,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1118,6 +1099,7 @@ "ctxt": 0 }, "value": "person2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1149,7 +1131,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1177,8 +1158,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1195,7 +1175,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1260,6 +1239,7 @@ "ctxt": 0 }, "value": "person3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1291,7 +1271,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1333,7 +1312,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1361,8 +1339,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1379,7 +1356,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentError/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentError/input.ts.json index 45eb9fc39fff..ac6feb37a4f2 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentError/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentError/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "id", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -88,6 +88,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +105,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -150,6 +150,7 @@ "ctxt": 0 }, "value": "person", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -181,7 +182,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -223,7 +223,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -251,8 +250,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -270,7 +268,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, { @@ -281,7 +278,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false } ] @@ -315,6 +311,7 @@ "ctxt": 0 }, "value": "person1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -346,7 +343,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -372,7 +368,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -384,8 +379,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -402,7 +396,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -423,6 +416,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -439,8 +433,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -459,6 +452,7 @@ "ctxt": 0 }, "value": "id", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -475,8 +469,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -517,7 +510,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, { @@ -528,7 +520,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false } ] @@ -570,7 +561,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -612,7 +602,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -652,7 +641,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -673,6 +661,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -704,7 +693,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -746,7 +734,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -774,8 +761,7 @@ } ] } - }, - "optional": false + } } } ], @@ -821,7 +807,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -843,7 +828,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, { @@ -854,7 +838,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier/input.ts.json index fb9323564035..84d87493a4e2 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesAssignmentErrorFromMissingIdentifier/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "id", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -88,6 +88,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +105,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -150,6 +150,7 @@ "ctxt": 0 }, "value": "person", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -181,7 +182,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -223,7 +223,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -251,8 +250,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -270,7 +268,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, { @@ -281,7 +278,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false } ] @@ -300,7 +296,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -321,6 +316,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -337,8 +333,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -357,6 +352,7 @@ "ctxt": 0 }, "value": "id", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -373,8 +369,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -415,7 +410,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, { @@ -426,7 +420,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false } ] @@ -468,7 +461,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -510,7 +502,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -550,7 +541,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -571,6 +561,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -587,8 +578,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -607,6 +597,7 @@ "ctxt": 0 }, "value": "id", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -623,8 +614,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -665,7 +655,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, { @@ -676,7 +665,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false } ] @@ -718,7 +706,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -760,7 +747,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -815,6 +801,7 @@ "ctxt": 0 }, "value": "person1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -846,7 +833,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -872,7 +858,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -884,8 +869,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -917,6 +901,7 @@ "ctxt": 0 }, "value": "person2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -948,7 +933,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -990,7 +974,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1018,8 +1001,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1036,7 +1018,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesES6/input.ts.json index 65abac9ea99a..e8714226e968 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -52,8 +52,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -73,8 +73,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -106,8 +106,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -125,7 +125,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } ] @@ -159,8 +158,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -178,7 +177,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } ] @@ -212,8 +210,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -233,7 +231,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -254,7 +251,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, { @@ -265,7 +261,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, { @@ -278,7 +273,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "params": [], @@ -310,7 +304,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, { @@ -323,7 +316,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "value": { @@ -334,7 +326,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesFunctionArgument/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesFunctionArgument/input.ts.json index 6fa7c54f6d1d..fe32152045e5 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesFunctionArgument/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesFunctionArgument/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "id", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -88,6 +88,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +105,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -150,8 +150,8 @@ "ctxt": 0 }, "value": "person", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -169,7 +169,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, { @@ -180,7 +179,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false } ] @@ -199,7 +197,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -220,6 +217,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -251,7 +249,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -293,7 +290,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -321,8 +317,7 @@ } ] } - }, - "optional": false + } } } ], @@ -368,7 +363,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -382,7 +376,6 @@ "ctxt": 0 }, "value": "person", - "typeAnnotation": null, "optional": false } } @@ -415,8 +408,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -436,7 +429,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -447,7 +439,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false } }, @@ -461,7 +452,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": { @@ -472,7 +462,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesFunctionArgument2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesFunctionArgument2/input.ts.json index 5138e89f424d..e78ca0043c5f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesFunctionArgument2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesFunctionArgument2/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "id", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -88,6 +88,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +105,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -150,8 +150,8 @@ "ctxt": 0 }, "value": "person", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -169,7 +169,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, { @@ -180,7 +179,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false } ] @@ -199,7 +197,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -220,6 +217,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -251,7 +249,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -293,7 +290,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -321,8 +317,7 @@ } ] } - }, - "optional": false + } } } ], @@ -368,7 +363,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -382,7 +376,6 @@ "ctxt": 0 }, "value": "person", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModule/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModule/input.ts.json index ce4ab302d402..cf1d990008aa 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModule/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModule/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "body": { @@ -66,8 +65,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -95,7 +94,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "body": { @@ -131,8 +129,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -142,7 +140,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -174,8 +171,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -195,7 +192,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -206,7 +202,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -218,7 +213,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModuleES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModuleES6/input.ts.json index f20999af8b68..495665afdaab 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModuleES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModuleES6/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "body": { @@ -66,8 +65,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -95,7 +94,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "body": { @@ -131,8 +129,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -142,7 +140,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -174,8 +171,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -195,7 +192,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -206,7 +202,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -218,7 +213,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/es6/spread/arrayLiteralSpread/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/spread/arrayLiteralSpread/input.ts.json index b3c0c259d41d..ebee25173697 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/spread/arrayLiteralSpread/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/spread/arrayLiteralSpread/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -138,8 +137,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -163,7 +162,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -198,8 +196,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -235,7 +233,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -270,8 +267,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -319,7 +316,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -354,8 +350,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -379,7 +375,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -426,8 +421,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -451,7 +446,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -510,8 +504,8 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -559,7 +553,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -618,8 +611,8 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -655,7 +648,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -685,7 +677,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -720,8 +711,8 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -745,7 +736,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -763,7 +753,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -781,7 +770,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -808,7 +796,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -852,8 +839,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -930,8 +917,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -972,7 +959,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1019,6 +1005,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1079,8 +1066,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1104,7 +1090,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1148,8 +1133,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1274,8 +1259,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/spread/arrayLiteralSpreadES5iterable/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/spread/arrayLiteralSpreadES5iterable/input.ts.json index b716b741281d..9cf6586797eb 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/spread/arrayLiteralSpreadES5iterable/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/spread/arrayLiteralSpreadES5iterable/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -138,8 +137,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -163,7 +162,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -198,8 +196,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -235,7 +233,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -270,8 +267,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -319,7 +316,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -354,8 +350,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -379,7 +375,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -426,8 +421,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -451,7 +446,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -510,8 +504,8 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -559,7 +553,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -618,8 +611,8 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -655,7 +648,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -685,7 +677,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -720,8 +711,8 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -745,7 +736,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -763,7 +753,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -781,7 +770,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -808,7 +796,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -852,8 +839,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -930,8 +917,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -972,7 +959,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1019,6 +1005,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1079,8 +1066,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1104,7 +1090,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1148,8 +1133,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1274,8 +1259,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray/input.ts.json index 702910f2c895..9d65c5c57a59 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -104,7 +101,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -121,7 +117,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -179,7 +174,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -190,7 +184,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -273,8 +266,8 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -305,7 +298,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray10/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray10/input.ts.json index 41e9782607c0..d5e3b3bb3b30 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray10/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray10/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -150,8 +147,8 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -182,7 +179,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray11/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray11/input.ts.json index ad314212a02a..3dbacfb73419 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray11/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray11/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "iter", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,7 +54,6 @@ "ctxt": 0 }, "value": "Iterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -76,8 +76,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -109,8 +108,8 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -134,7 +133,6 @@ "ctxt": 0 }, "value": "iter", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray2/input.ts.json index baf449932e9f..105abc1c5058 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -104,7 +101,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -121,7 +117,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -179,7 +174,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -190,7 +184,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -258,7 +251,6 @@ "ctxt": 0 }, "value": "NumberIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -284,7 +276,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -328,7 +319,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -351,7 +341,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -409,7 +398,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -420,7 +408,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -503,8 +490,8 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -535,7 +522,6 @@ "ctxt": 0 }, "value": "NumberIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -563,7 +549,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray3/input.ts.json index 6f42b548e415..874156c1f325 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -104,7 +101,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -121,7 +117,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -179,7 +174,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -190,7 +184,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -273,8 +266,8 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -346,7 +339,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray4/input.ts.json index a929578fea40..913f13929ddb 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -104,7 +101,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -121,7 +117,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -179,7 +174,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -190,7 +184,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -273,8 +266,8 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -329,7 +322,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray5/input.ts.json index 71f2ab69ef04..c0ae218debff 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -104,7 +101,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -121,7 +117,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -179,7 +174,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -190,7 +184,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -273,6 +266,7 @@ "ctxt": 0 }, "value": "array", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -297,8 +291,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -353,7 +346,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray6/input.ts.json index 91de32362854..1b7f352d74b0 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -104,7 +101,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -121,7 +117,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -179,7 +174,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -190,7 +184,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -273,6 +266,7 @@ "ctxt": 0 }, "value": "array", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -297,8 +291,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -367,7 +360,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false }, "property": { @@ -378,7 +370,6 @@ "ctxt": 0 }, "value": "concat", - "typeAnnotation": null, "optional": false }, "computed": false @@ -415,7 +406,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray7/input.ts.json index ec04c3fe2232..9cfbbe9d4f0d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray7/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -104,7 +101,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -121,7 +117,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -179,7 +174,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -190,7 +184,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -273,6 +266,7 @@ "ctxt": 0 }, "value": "array", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -297,8 +291,7 @@ "kind": "symbol" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -334,7 +327,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false }, "property": { @@ -345,7 +337,6 @@ "ctxt": 0 }, "value": "concat", - "typeAnnotation": null, "optional": false }, "computed": false @@ -382,7 +373,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray8/input.ts.json index 5caa80c9a929..521350cf8951 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray8/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -104,7 +101,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -121,7 +117,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -182,8 +177,8 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -214,7 +209,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray9/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray9/input.ts.json index c74b6a3a0c2f..3f7c83a1382b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray9/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInArray9/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -104,7 +101,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -167,7 +162,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -250,8 +244,8 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -282,7 +276,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall/input.ts.json index 5778fc405cb6..945902984daa 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "symbol" } - }, - "optional": false + } } } ], @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -114,7 +112,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -158,7 +155,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -176,7 +172,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -193,7 +188,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -251,7 +245,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -262,7 +255,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -342,7 +334,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -367,7 +358,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall10/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall10/input.ts.json index f6f23431d8fa..cdc5b212e31a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall10/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall10/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,14 +66,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -113,7 +111,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -155,7 +152,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -175,7 +171,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -201,7 +196,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -245,7 +239,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -263,7 +256,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -280,7 +272,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -338,7 +329,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -349,7 +339,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -429,7 +418,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -454,7 +442,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall11/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall11/input.ts.json index 2c40a92298c5..9de733a65779 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall11/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall11/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,8 +48,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -81,7 +80,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -127,7 +125,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -169,7 +166,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -189,7 +185,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -215,7 +210,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -259,7 +253,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -277,7 +270,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -294,7 +286,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -352,7 +343,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -363,7 +353,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -443,7 +432,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -468,7 +456,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall12/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall12/input.ts.json index 319e740997da..7bd5566cd143 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall12/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall12/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -74,8 +72,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -106,7 +104,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -154,7 +151,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -175,7 +171,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -201,7 +196,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -245,7 +239,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -263,7 +256,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -280,7 +272,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -338,7 +329,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -349,7 +339,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -417,7 +406,6 @@ "ctxt": 0 }, "value": "_StringIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -443,7 +431,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -487,7 +474,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -515,7 +501,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -573,7 +558,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -584,7 +568,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -664,7 +647,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -703,7 +685,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -745,7 +726,6 @@ "ctxt": 0 }, "value": "_StringIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall2/input.ts.json index 9933a0afd9fd..e7ae2094daa4 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -61,8 +61,7 @@ "kind": "symbol" } } - }, - "optional": false + } } } ], @@ -96,7 +95,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -122,7 +120,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -166,7 +163,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -184,7 +180,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -201,7 +196,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -259,7 +253,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -270,7 +263,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -350,7 +342,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -375,7 +366,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall3/input.ts.json index d9d95a6291d4..71a80c05a4ff 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,8 +48,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -110,7 +109,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -136,7 +134,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -180,7 +177,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -198,7 +194,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -215,7 +210,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -273,7 +267,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -284,7 +277,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -364,7 +356,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -389,7 +380,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall4/input.ts.json index b3203c42e7bd..f2899471134e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "s1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "symbol" } - }, - "optional": false + } } }, { @@ -85,8 +84,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -146,7 +145,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -172,7 +170,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -216,7 +213,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -234,7 +230,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -251,7 +246,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -309,7 +303,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -320,7 +313,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -400,7 +392,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -425,7 +416,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall5/input.ts.json index 9e93119c3f60..e8b453bbc46d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,8 +48,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -137,7 +136,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -163,7 +161,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -207,7 +204,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -225,7 +221,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -242,7 +237,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -300,7 +294,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -311,7 +304,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -379,7 +371,6 @@ "ctxt": 0 }, "value": "_StringIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -405,7 +396,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -449,7 +439,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -477,7 +466,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -535,7 +523,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -546,7 +533,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -626,7 +612,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -651,7 +636,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -679,7 +663,6 @@ "ctxt": 0 }, "value": "_StringIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall6/input.ts.json index f5a73426c08e..8dc6b4ee523d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,8 +48,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -137,7 +136,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -163,7 +161,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -207,7 +204,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -225,7 +221,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -242,7 +237,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -300,7 +294,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -311,7 +304,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -379,7 +371,6 @@ "ctxt": 0 }, "value": "_StringIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -405,7 +396,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -449,7 +439,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -477,7 +466,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -535,7 +523,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -546,7 +533,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -626,7 +612,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -651,7 +636,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -679,7 +663,6 @@ "ctxt": 0 }, "value": "_StringIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall7/input.ts.json index ef4f218f5950..65b78f729e90 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall7/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,8 +48,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -81,7 +80,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -127,7 +125,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -169,7 +166,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -189,7 +185,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -215,7 +210,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -259,7 +253,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -277,7 +270,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -294,7 +286,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -352,7 +343,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -363,7 +353,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -431,7 +420,6 @@ "ctxt": 0 }, "value": "_StringIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -457,7 +445,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -501,7 +488,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -529,7 +515,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -587,7 +572,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -598,7 +582,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -678,7 +661,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -703,7 +685,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -731,7 +712,6 @@ "ctxt": 0 }, "value": "_StringIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall8/input.ts.json index 097c212e82aa..b2e4848d4e02 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall8/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -74,8 +72,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -106,7 +104,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -154,7 +151,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -175,7 +171,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -201,7 +196,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -245,7 +239,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -263,7 +256,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -280,7 +272,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -338,7 +329,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -349,7 +339,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -417,7 +406,6 @@ "ctxt": 0 }, "value": "_StringIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -443,7 +431,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -487,7 +474,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -515,7 +501,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -573,7 +558,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -584,7 +568,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -664,7 +647,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -689,7 +671,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -717,7 +698,6 @@ "ctxt": 0 }, "value": "_StringIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall9/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall9/input.ts.json index db3268fffd91..bfe4c9026e42 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall9/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/spread/iteratorSpreadInCall9/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -74,8 +72,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -106,7 +104,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -154,7 +151,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -175,7 +171,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -201,7 +196,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -245,7 +239,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -263,7 +256,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -280,7 +272,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -338,7 +329,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -349,7 +339,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -417,7 +406,6 @@ "ctxt": 0 }, "value": "_StringIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -443,7 +431,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -487,7 +474,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -515,7 +501,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -573,7 +558,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -584,7 +568,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -664,7 +647,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -689,7 +671,6 @@ "ctxt": 0 }, "value": "SymbolIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -731,7 +712,6 @@ "ctxt": 0 }, "value": "_StringIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes01/input.ts.json index b8288b67145d..1e5ae32313fe 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes01/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,8 +48,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -122,7 +121,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes01_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes01_ES6/input.ts.json index ea07593c380e..bc3d76ff5f17 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes01_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes01_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,8 +48,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -122,7 +121,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes02_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes02_ES6/input.ts.json index f1dcc362d82d..bcff82f2013a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes02_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes02_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,8 +48,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -122,7 +121,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsTypeArgumentInference/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsTypeArgumentInference/input.ts.json index e21359d19e2f..4f64dbe42b34 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsTypeArgumentInference/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsTypeArgumentInference/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "noParams", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -109,7 +107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -141,7 +138,6 @@ "ctxt": 0 }, "value": "noParams", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -197,7 +193,6 @@ "ctxt": 0 }, "value": "noGenericParams", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -218,6 +213,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -240,13 +236,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -290,7 +284,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -322,7 +315,6 @@ "ctxt": 0 }, "value": "noGenericParams", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -378,7 +370,6 @@ "ctxt": 0 }, "value": "someGenerics1a", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -399,6 +390,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -421,13 +413,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -446,6 +436,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -462,8 +453,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -507,7 +497,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -528,7 +517,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -560,7 +548,6 @@ "ctxt": 0 }, "value": "someGenerics1a", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -663,7 +650,6 @@ "ctxt": 0 }, "value": "someGenerics1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -684,6 +670,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -706,13 +693,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -731,6 +716,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -753,13 +739,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -803,7 +787,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -824,7 +807,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -856,7 +838,6 @@ "ctxt": 0 }, "value": "someGenerics1b", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -959,7 +940,6 @@ "ctxt": 0 }, "value": "someGenerics2a", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -980,6 +960,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1002,13 +983,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1027,6 +1006,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1050,6 +1030,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1072,13 +1053,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1100,8 +1079,7 @@ } } } - }, - "optional": false + } } } ], @@ -1145,7 +1123,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1177,7 +1154,6 @@ "ctxt": 0 }, "value": "someGenerics2a", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1197,6 +1173,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1213,8 +1190,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -1225,7 +1201,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1323,7 +1298,6 @@ "ctxt": 0 }, "value": "someGenerics2b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1344,6 +1318,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1366,13 +1341,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1391,6 +1364,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1414,6 +1388,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1436,13 +1411,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1452,6 +1425,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1474,13 +1448,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1502,8 +1474,7 @@ } } } - }, - "optional": false + } } } ], @@ -1547,7 +1518,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1568,7 +1538,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1600,7 +1569,6 @@ "ctxt": 0 }, "value": "someGenerics2b", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1620,6 +1588,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1636,8 +1605,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1647,6 +1615,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1663,8 +1632,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1675,7 +1643,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1773,7 +1740,6 @@ "ctxt": 0 }, "value": "someGenerics3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1794,6 +1760,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1816,13 +1783,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1841,6 +1806,7 @@ "ctxt": 0 }, "value": "producer", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1879,15 +1845,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -1931,7 +1895,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1963,7 +1926,6 @@ "ctxt": 0 }, "value": "someGenerics3", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -2096,7 +2058,6 @@ "ctxt": 0 }, "value": "someGenerics3", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -2116,7 +2077,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2226,7 +2186,6 @@ "ctxt": 0 }, "value": "someGenerics3", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -2342,7 +2301,6 @@ "ctxt": 0 }, "value": "someGenerics4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2363,6 +2321,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2385,13 +2344,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2410,6 +2367,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2432,13 +2390,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2457,6 +2413,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2480,6 +2437,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2502,13 +2460,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2530,8 +2486,7 @@ } } } - }, - "optional": false + } } } ], @@ -2575,7 +2530,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2596,7 +2550,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2628,7 +2581,6 @@ "ctxt": 0 }, "value": "someGenerics4", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -2801,7 +2753,6 @@ "ctxt": 0 }, "value": "someGenerics4", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -2980,7 +2931,6 @@ "ctxt": 0 }, "value": "someGenerics4", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -3127,7 +3077,6 @@ "ctxt": 0 }, "value": "someGenerics5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3148,6 +3097,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3170,13 +3120,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3195,6 +3143,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3217,13 +3166,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3242,6 +3189,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3265,6 +3213,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3287,13 +3236,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3315,8 +3262,7 @@ } } } - }, - "optional": false + } } } ], @@ -3360,7 +3306,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3381,7 +3326,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3413,7 +3357,6 @@ "ctxt": 0 }, "value": "someGenerics5", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -3586,7 +3529,6 @@ "ctxt": 0 }, "value": "someGenerics5", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -3765,7 +3707,6 @@ "ctxt": 0 }, "value": "someGenerics5", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -3912,7 +3853,6 @@ "ctxt": 0 }, "value": "someGenerics6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3933,6 +3873,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3955,13 +3896,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3980,6 +3919,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4003,6 +3943,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4025,13 +3966,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4057,15 +3996,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -4084,6 +4021,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4107,6 +4045,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4129,13 +4068,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4161,15 +4098,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -4188,6 +4123,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4211,6 +4147,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4233,13 +4170,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4265,15 +4200,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -4317,7 +4250,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4349,7 +4281,6 @@ "ctxt": 0 }, "value": "someGenerics6", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -4369,8 +4300,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4381,7 +4312,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4405,8 +4335,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4417,7 +4347,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4441,8 +4370,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4453,7 +4382,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4637,7 +4565,6 @@ "ctxt": 0 }, "value": "someGenerics6", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -4657,8 +4584,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4669,7 +4596,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4693,8 +4619,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4705,7 +4631,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4729,8 +4654,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4741,7 +4666,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4925,7 +4849,6 @@ "ctxt": 0 }, "value": "someGenerics6", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -4945,6 +4868,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4961,8 +4885,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -4973,7 +4896,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4997,6 +4919,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5013,8 +4936,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -5025,7 +4947,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5049,6 +4970,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5065,8 +4987,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -5077,7 +4998,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5249,7 +5169,6 @@ "ctxt": 0 }, "value": "someGenerics7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5270,6 +5189,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5292,13 +5212,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -5317,6 +5235,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5340,6 +5259,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5362,13 +5282,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5394,15 +5312,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -5421,6 +5337,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5444,6 +5361,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5466,13 +5384,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5498,15 +5414,13 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -5525,6 +5439,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5548,6 +5463,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5570,13 +5486,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5602,15 +5516,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -5654,7 +5566,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5675,7 +5586,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5696,7 +5606,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5728,7 +5637,6 @@ "ctxt": 0 }, "value": "someGenerics7", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -5748,8 +5656,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5760,7 +5668,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5784,8 +5691,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5796,7 +5703,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5820,8 +5726,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5832,7 +5738,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -6016,7 +5921,6 @@ "ctxt": 0 }, "value": "someGenerics7", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -6036,8 +5940,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -6048,7 +5952,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -6072,8 +5975,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -6084,7 +5987,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -6108,8 +6010,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -6120,7 +6022,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -6304,7 +6205,6 @@ "ctxt": 0 }, "value": "someGenerics7", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -6324,6 +6224,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6340,8 +6241,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -6352,7 +6252,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -6376,6 +6275,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6392,8 +6292,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -6404,7 +6303,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -6428,6 +6326,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6444,8 +6343,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -6456,7 +6354,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -6628,7 +6525,6 @@ "ctxt": 0 }, "value": "someGenerics8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6649,6 +6545,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6671,13 +6568,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -6696,6 +6591,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6718,13 +6614,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6757,7 +6651,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -6788,7 +6681,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6818,7 +6710,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6850,8 +6741,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -6868,7 +6759,6 @@ "ctxt": 0 }, "value": "someGenerics8", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -6880,7 +6770,6 @@ "ctxt": 0 }, "value": "someGenerics7", - "typeAnnotation": null, "optional": false } ], @@ -6988,7 +6877,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -7180,7 +7068,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7201,6 +7088,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7223,13 +7111,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -7248,6 +7134,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7270,13 +7157,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -7295,6 +7180,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7317,13 +7203,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -7342,6 +7226,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7364,13 +7249,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -7431,7 +7314,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7461,7 +7343,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7493,8 +7374,8 @@ "ctxt": 0 }, "value": "a9a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -7511,7 +7392,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -7729,6 +7609,7 @@ "ctxt": 0 }, "value": "a9a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7745,8 +7626,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -7768,7 +7648,6 @@ "ctxt": 0 }, "value": "A91", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7798,7 +7677,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7840,7 +7718,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7884,7 +7761,6 @@ "ctxt": 0 }, "value": "A92", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7914,7 +7790,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7956,7 +7831,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7985,7 +7859,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8021,8 +7894,8 @@ "ctxt": 0 }, "value": "a9e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -8039,7 +7912,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -8051,7 +7923,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, { @@ -8072,7 +7943,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -8095,7 +7965,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -8113,7 +7982,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -8140,7 +8008,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -8163,7 +8030,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -8365,6 +8231,7 @@ "ctxt": 0 }, "value": "a9e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8381,8 +8248,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -8414,8 +8280,8 @@ "ctxt": 0 }, "value": "a9d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -8432,7 +8298,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -8454,7 +8319,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -8487,7 +8351,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -8520,7 +8383,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -8717,6 +8579,7 @@ "ctxt": 0 }, "value": "a9d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8748,7 +8611,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8776,8 +8638,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -8809,6 +8670,7 @@ "ctxt": 0 }, "value": "anyVar", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8825,8 +8687,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -8858,8 +8719,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -8876,7 +8737,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -8897,7 +8757,6 @@ "ctxt": 0 }, "value": "anyVar", - "typeAnnotation": null, "optional": false }, { @@ -9091,6 +8950,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9107,8 +8967,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -9140,8 +8999,8 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -9158,7 +9017,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -9187,7 +9045,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } ], @@ -9372,6 +9229,7 @@ "ctxt": 0 }, "value": "arr", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9396,8 +9254,7 @@ "kind": "any" } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsTypeArgumentInferenceES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsTypeArgumentInferenceES6/input.ts.json index 80f88517a929..032d4b519909 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsTypeArgumentInferenceES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsTypeArgumentInferenceES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "noParams", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -109,7 +107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -141,7 +138,6 @@ "ctxt": 0 }, "value": "noParams", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -197,7 +193,6 @@ "ctxt": 0 }, "value": "noGenericParams", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -218,6 +213,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -240,13 +236,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -290,7 +284,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -322,7 +315,6 @@ "ctxt": 0 }, "value": "noGenericParams", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -378,7 +370,6 @@ "ctxt": 0 }, "value": "someGenerics1a", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -399,6 +390,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -421,13 +413,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -446,6 +436,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -462,8 +453,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -507,7 +497,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -528,7 +517,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -560,7 +548,6 @@ "ctxt": 0 }, "value": "someGenerics1a", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -663,7 +650,6 @@ "ctxt": 0 }, "value": "someGenerics1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -684,6 +670,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -706,13 +693,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -731,6 +716,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -753,13 +739,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -803,7 +787,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -824,7 +807,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -856,7 +838,6 @@ "ctxt": 0 }, "value": "someGenerics1b", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -959,7 +940,6 @@ "ctxt": 0 }, "value": "someGenerics2a", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -980,6 +960,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1002,13 +983,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1027,6 +1006,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1050,6 +1030,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1072,13 +1053,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1100,8 +1079,7 @@ } } } - }, - "optional": false + } } } ], @@ -1145,7 +1123,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1177,7 +1154,6 @@ "ctxt": 0 }, "value": "someGenerics2a", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1197,6 +1173,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1213,8 +1190,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -1225,7 +1201,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1323,7 +1298,6 @@ "ctxt": 0 }, "value": "someGenerics2b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1344,6 +1318,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1366,13 +1341,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1391,6 +1364,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1414,6 +1388,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1436,13 +1411,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1452,6 +1425,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1474,13 +1448,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1502,8 +1474,7 @@ } } } - }, - "optional": false + } } } ], @@ -1547,7 +1518,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1568,7 +1538,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1600,7 +1569,6 @@ "ctxt": 0 }, "value": "someGenerics2b", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1620,6 +1588,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1636,8 +1605,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1647,6 +1615,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1663,8 +1632,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1675,7 +1643,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1773,7 +1740,6 @@ "ctxt": 0 }, "value": "someGenerics3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1794,6 +1760,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1816,13 +1783,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1841,6 +1806,7 @@ "ctxt": 0 }, "value": "producer", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1879,15 +1845,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -1931,7 +1895,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1963,7 +1926,6 @@ "ctxt": 0 }, "value": "someGenerics3", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -2096,7 +2058,6 @@ "ctxt": 0 }, "value": "someGenerics3", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -2116,7 +2077,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2226,7 +2186,6 @@ "ctxt": 0 }, "value": "someGenerics3", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -2342,7 +2301,6 @@ "ctxt": 0 }, "value": "someGenerics4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2363,6 +2321,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2385,13 +2344,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2410,6 +2367,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2432,13 +2390,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2457,6 +2413,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2480,6 +2437,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2502,13 +2460,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2530,8 +2486,7 @@ } } } - }, - "optional": false + } } } ], @@ -2575,7 +2530,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2596,7 +2550,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2628,7 +2581,6 @@ "ctxt": 0 }, "value": "someGenerics4", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -2801,7 +2753,6 @@ "ctxt": 0 }, "value": "someGenerics4", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -2980,7 +2931,6 @@ "ctxt": 0 }, "value": "someGenerics4", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -3127,7 +3077,6 @@ "ctxt": 0 }, "value": "someGenerics5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3148,6 +3097,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3170,13 +3120,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3195,6 +3143,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3217,13 +3166,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3242,6 +3189,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3265,6 +3213,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3287,13 +3236,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3315,8 +3262,7 @@ } } } - }, - "optional": false + } } } ], @@ -3360,7 +3306,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3381,7 +3326,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3413,7 +3357,6 @@ "ctxt": 0 }, "value": "someGenerics5", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -3586,7 +3529,6 @@ "ctxt": 0 }, "value": "someGenerics5", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -3765,7 +3707,6 @@ "ctxt": 0 }, "value": "someGenerics5", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -3912,7 +3853,6 @@ "ctxt": 0 }, "value": "someGenerics6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3933,6 +3873,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3955,13 +3896,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3980,6 +3919,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4003,6 +3943,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4025,13 +3966,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4057,15 +3996,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -4084,6 +4021,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4107,6 +4045,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4129,13 +4068,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4161,15 +4098,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -4188,6 +4123,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4211,6 +4147,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4233,13 +4170,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4265,15 +4200,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -4317,7 +4250,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4349,7 +4281,6 @@ "ctxt": 0 }, "value": "someGenerics6", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -4369,8 +4300,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4381,7 +4312,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4405,8 +4335,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4417,7 +4347,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4441,8 +4370,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4453,7 +4382,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4637,7 +4565,6 @@ "ctxt": 0 }, "value": "someGenerics6", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -4657,8 +4584,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4669,7 +4596,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4693,8 +4619,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4705,7 +4631,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4729,8 +4654,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4741,7 +4666,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4925,7 +4849,6 @@ "ctxt": 0 }, "value": "someGenerics6", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -4945,6 +4868,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4961,8 +4885,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -4973,7 +4896,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4997,6 +4919,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5013,8 +4936,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -5025,7 +4947,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5049,6 +4970,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5065,8 +4987,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -5077,7 +4998,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5249,7 +5169,6 @@ "ctxt": 0 }, "value": "someGenerics7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5270,6 +5189,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5292,13 +5212,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -5317,6 +5235,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5340,6 +5259,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5362,13 +5282,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5394,15 +5312,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -5421,6 +5337,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5444,6 +5361,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5466,13 +5384,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5498,15 +5414,13 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -5525,6 +5439,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5548,6 +5463,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5570,13 +5486,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5602,15 +5516,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -5654,7 +5566,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5675,7 +5586,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5696,7 +5606,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5728,7 +5637,6 @@ "ctxt": 0 }, "value": "someGenerics7", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -5748,8 +5656,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5760,7 +5668,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5784,8 +5691,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5796,7 +5703,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5820,8 +5726,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5832,7 +5738,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -6016,7 +5921,6 @@ "ctxt": 0 }, "value": "someGenerics7", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -6036,8 +5940,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -6048,7 +5952,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -6072,8 +5975,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -6084,7 +5987,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -6108,8 +6010,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -6120,7 +6022,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -6304,7 +6205,6 @@ "ctxt": 0 }, "value": "someGenerics7", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -6324,6 +6224,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6340,8 +6241,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -6352,7 +6252,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -6376,6 +6275,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6392,8 +6292,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -6404,7 +6303,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -6428,6 +6326,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6444,8 +6343,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -6456,7 +6354,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -6628,7 +6525,6 @@ "ctxt": 0 }, "value": "someGenerics8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6649,6 +6545,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6671,13 +6568,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -6696,6 +6591,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6718,13 +6614,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6757,7 +6651,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -6788,7 +6681,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6818,7 +6710,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6850,8 +6741,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -6868,7 +6759,6 @@ "ctxt": 0 }, "value": "someGenerics8", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -6880,7 +6770,6 @@ "ctxt": 0 }, "value": "someGenerics7", - "typeAnnotation": null, "optional": false } ], @@ -6988,7 +6877,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -7180,7 +7068,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7201,6 +7088,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7223,13 +7111,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -7248,6 +7134,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7270,13 +7157,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -7295,6 +7180,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7317,13 +7203,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -7342,6 +7226,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7364,13 +7249,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -7431,7 +7314,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7461,7 +7343,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7493,8 +7374,8 @@ "ctxt": 0 }, "value": "a9a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -7511,7 +7392,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -7729,6 +7609,7 @@ "ctxt": 0 }, "value": "a9a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7745,8 +7626,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -7768,7 +7648,6 @@ "ctxt": 0 }, "value": "A91", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7798,7 +7677,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7840,7 +7718,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7884,7 +7761,6 @@ "ctxt": 0 }, "value": "A92", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7914,7 +7790,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7956,7 +7831,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7985,7 +7859,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8021,8 +7894,8 @@ "ctxt": 0 }, "value": "a9e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -8039,7 +7912,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -8051,7 +7923,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, { @@ -8072,7 +7943,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -8095,7 +7965,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -8113,7 +7982,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -8140,7 +8008,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -8163,7 +8030,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -8365,6 +8231,7 @@ "ctxt": 0 }, "value": "a9e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8381,8 +8248,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -8414,8 +8280,8 @@ "ctxt": 0 }, "value": "a9d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -8432,7 +8298,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -8454,7 +8319,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -8487,7 +8351,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -8520,7 +8383,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -8717,6 +8579,7 @@ "ctxt": 0 }, "value": "a9d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8748,7 +8611,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8776,8 +8638,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -8809,6 +8670,7 @@ "ctxt": 0 }, "value": "anyVar", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8825,8 +8687,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -8858,8 +8719,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -8876,7 +8737,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -8897,7 +8757,6 @@ "ctxt": 0 }, "value": "anyVar", - "typeAnnotation": null, "optional": false }, { @@ -9091,6 +8950,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9107,8 +8967,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -9140,8 +8999,8 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -9158,7 +9017,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -9187,7 +9045,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } ], @@ -9372,6 +9229,7 @@ "ctxt": 0 }, "value": "arr", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9396,8 +9254,7 @@ "kind": "any" } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithIncompatibleTypedTags/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithIncompatibleTypedTags/input.ts.json index 090e28d01e29..44e2cef6de36 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithIncompatibleTypedTags/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithIncompatibleTypedTags/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,6 +50,7 @@ "ctxt": 0 }, "value": "stringParts", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -73,13 +73,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "RestElement", @@ -101,8 +99,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -153,7 +151,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -177,7 +174,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -206,7 +202,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -230,7 +225,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -259,7 +253,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -283,7 +276,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -312,7 +304,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -336,7 +327,6 @@ "ctxt": 0 }, "value": "thisIsNotATag", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -350,6 +340,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -366,8 +357,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -400,6 +390,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -416,8 +407,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -442,7 +432,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -483,6 +472,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,13 +495,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -540,7 +528,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -608,7 +595,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -776,7 +762,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -829,7 +814,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -864,7 +848,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1010,7 +993,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1045,7 +1027,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -1136,7 +1117,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1334,7 +1314,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -1398,7 +1377,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1582,7 +1560,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1744,7 +1721,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1928,7 +1904,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -2090,7 +2065,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2260,7 +2234,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { @@ -2271,7 +2244,6 @@ "ctxt": 0 }, "value": "thisIsNotATag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2361,7 +2333,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { @@ -2372,7 +2343,6 @@ "ctxt": 0 }, "value": "thisIsNotATag", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithIncompatibleTypedTagsES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithIncompatibleTypedTagsES6/input.ts.json index c33046caad88..62d0a44097cc 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithIncompatibleTypedTagsES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithIncompatibleTypedTagsES6/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,6 +50,7 @@ "ctxt": 0 }, "value": "stringParts", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -73,13 +73,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "RestElement", @@ -101,8 +99,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -153,7 +151,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -177,7 +174,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -206,7 +202,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -230,7 +225,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -259,7 +253,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -283,7 +276,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -312,7 +304,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -336,7 +327,6 @@ "ctxt": 0 }, "value": "thisIsNotATag", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -350,6 +340,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -366,8 +357,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -400,6 +390,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -416,8 +407,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -442,7 +432,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -483,6 +472,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,13 +495,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -540,7 +528,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -608,7 +595,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -776,7 +762,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -829,7 +814,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -864,7 +848,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1010,7 +993,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1045,7 +1027,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -1136,7 +1117,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1334,7 +1314,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -1398,7 +1377,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1582,7 +1560,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1744,7 +1721,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1928,7 +1904,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -2090,7 +2065,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2260,7 +2234,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { @@ -2271,7 +2244,6 @@ "ctxt": 0 }, "value": "thisIsNotATag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2361,7 +2333,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { @@ -2372,7 +2343,6 @@ "ctxt": 0 }, "value": "thisIsNotATag", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithManyCallAndMemberExpressions/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithManyCallAndMemberExpressions/input.ts.json index 9af47929f04b..6cb01e4e55b7 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithManyCallAndMemberExpressions/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithManyCallAndMemberExpressions/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,6 +50,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -73,13 +73,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "RestElement", @@ -101,8 +99,8 @@ "ctxt": 0 }, "value": "subs", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -153,7 +151,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -177,7 +174,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -215,6 +211,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -231,8 +228,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -266,6 +262,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -282,8 +279,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -371,6 +367,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -393,13 +390,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -431,8 +426,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -485,7 +480,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -585,7 +579,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithManyCallAndMemberExpressionsES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithManyCallAndMemberExpressionsES6/input.ts.json index 45c1a56d73c6..98b96ff93110 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithManyCallAndMemberExpressionsES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithManyCallAndMemberExpressionsES6/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,6 +50,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -73,13 +73,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "RestElement", @@ -101,8 +99,8 @@ "ctxt": 0 }, "value": "subs", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -153,7 +151,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -177,7 +174,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -215,6 +211,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -231,8 +228,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -266,6 +262,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -282,8 +279,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -371,6 +367,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -393,13 +390,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -431,8 +426,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -485,7 +480,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -585,7 +579,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithOverloadResolution1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithOverloadResolution1/input.ts.json index 2bf8a126b506..6a9f950de30b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithOverloadResolution1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithOverloadResolution1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -107,7 +105,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -128,6 +125,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -150,13 +148,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -175,6 +171,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -191,8 +188,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -234,7 +230,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -255,6 +250,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -277,13 +273,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -302,6 +296,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -318,8 +313,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -338,6 +332,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -354,8 +349,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -397,7 +391,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -418,6 +411,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -440,13 +434,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -465,6 +457,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -481,8 +474,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -501,6 +493,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -517,8 +510,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -560,7 +552,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -593,8 +584,8 @@ "ctxt": 0 }, "value": "stuff", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -653,7 +644,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -705,8 +695,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -723,7 +713,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -771,8 +760,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -789,7 +778,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -849,8 +837,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -867,7 +855,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -939,8 +926,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -957,7 +944,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1029,8 +1015,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1047,7 +1033,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1124,8 +1109,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1142,7 +1127,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1226,8 +1210,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -1244,7 +1228,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -1318,8 +1301,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -1336,7 +1319,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1457,8 +1439,8 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -1475,7 +1457,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1642,8 +1623,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -1660,7 +1641,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1827,8 +1807,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -1845,7 +1825,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -2017,8 +1996,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -2035,7 +2014,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "expressions": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithOverloadResolution1_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithOverloadResolution1_ES6/input.ts.json index e93f0b7f253b..82fa491dda61 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithOverloadResolution1_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithOverloadResolution1_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -107,7 +105,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -128,6 +125,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -150,13 +148,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -175,6 +171,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -191,8 +188,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -234,7 +230,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -255,6 +250,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -277,13 +273,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -302,6 +296,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -318,8 +313,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -338,6 +332,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -354,8 +349,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -397,7 +391,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -418,6 +411,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -440,13 +434,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -465,6 +457,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -481,8 +474,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -501,6 +493,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -517,8 +510,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -560,7 +552,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -593,8 +584,8 @@ "ctxt": 0 }, "value": "stuff", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -653,7 +644,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -705,8 +695,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -723,7 +713,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -771,8 +760,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -789,7 +778,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -849,8 +837,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -867,7 +855,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -939,8 +926,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -957,7 +944,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1029,8 +1015,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1047,7 +1033,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1124,8 +1109,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1142,7 +1127,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1226,8 +1210,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -1244,7 +1228,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -1318,8 +1301,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -1336,7 +1319,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1457,8 +1439,8 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -1475,7 +1457,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1642,8 +1623,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -1660,7 +1641,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1827,8 +1807,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -1845,7 +1825,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -2017,8 +1996,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -2035,7 +2014,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "expressions": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithOverloadResolution2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithOverloadResolution2/input.ts.json index 8c0d4cd17579..7e96ca15e645 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithOverloadResolution2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithOverloadResolution2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -100,8 +99,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -143,7 +141,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -164,6 +161,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -188,8 +186,7 @@ "kind": "string" } } - }, - "optional": false + } } }, { @@ -208,6 +205,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -224,8 +222,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -267,7 +264,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -300,8 +296,8 @@ "ctxt": 0 }, "value": "stuff", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -360,7 +356,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -412,8 +407,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -430,7 +425,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -551,8 +545,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -569,7 +563,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -614,7 +607,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -635,6 +627,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -659,8 +652,7 @@ "kind": "string" } } - }, - "optional": false + } } }, { @@ -679,6 +671,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -695,8 +688,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -738,7 +730,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -759,6 +750,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -781,13 +773,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -806,6 +796,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -822,8 +813,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -865,7 +855,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -898,8 +887,8 @@ "ctxt": 0 }, "value": "stuff", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -958,7 +947,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1010,8 +998,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -1028,7 +1016,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1149,8 +1136,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1167,7 +1154,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithOverloadResolution2_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithOverloadResolution2_ES6/input.ts.json index c711a3fd801a..e1b5ded1a839 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithOverloadResolution2_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithOverloadResolution2_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -100,8 +99,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -143,7 +141,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -164,6 +161,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -188,8 +186,7 @@ "kind": "string" } } - }, - "optional": false + } } }, { @@ -208,6 +205,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -224,8 +222,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -267,7 +264,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -300,8 +296,8 @@ "ctxt": 0 }, "value": "stuff", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -360,7 +356,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -412,8 +407,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -430,7 +425,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -551,8 +545,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -569,7 +563,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -614,7 +607,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -635,6 +627,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -659,8 +652,7 @@ "kind": "string" } } - }, - "optional": false + } } }, { @@ -679,6 +671,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -695,8 +688,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -738,7 +730,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -759,6 +750,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -781,13 +773,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -806,6 +796,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -822,8 +813,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -865,7 +855,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -898,8 +887,8 @@ "ctxt": 0 }, "value": "stuff", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -958,7 +947,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1010,8 +998,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -1028,7 +1016,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1149,8 +1136,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1167,7 +1154,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithOverloadResolution3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithOverloadResolution3/input.ts.json index 9f6f43497b24..908a24a85127 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithOverloadResolution3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithOverloadResolution3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -100,8 +99,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -143,7 +141,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -164,6 +161,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -186,13 +184,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -211,6 +207,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -227,8 +224,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -270,7 +266,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -337,6 +332,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -353,8 +349,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "TaggedTemplateExpression", @@ -371,7 +366,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -383,7 +377,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } ], @@ -491,7 +484,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -594,7 +586,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -615,6 +606,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -637,13 +629,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -662,6 +652,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -678,8 +669,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -698,6 +688,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -714,8 +705,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -757,7 +747,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -778,6 +767,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -800,13 +790,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -825,6 +813,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -841,8 +830,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -861,6 +849,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -883,13 +872,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -925,7 +912,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -955,7 +941,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -972,7 +957,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1006,7 +990,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1042,6 +1025,7 @@ "ctxt": 0 }, "value": "d1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1064,13 +1048,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "TaggedTemplateExpression", @@ -1087,7 +1069,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1108,7 +1089,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } ], @@ -1256,8 +1236,8 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -1274,7 +1254,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1295,7 +1274,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } ], @@ -1447,7 +1425,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1458,7 +1435,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1489,7 +1465,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1518,7 +1493,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1684,7 +1658,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1838,7 +1811,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1859,6 +1831,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1881,13 +1854,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1906,6 +1877,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1928,13 +1900,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1970,7 +1940,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2006,7 +1975,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2027,6 +1995,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2049,13 +2018,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2074,6 +2041,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2090,8 +2058,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -2110,6 +2077,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2132,13 +2100,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2157,6 +2123,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2179,13 +2146,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2221,7 +2186,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2242,7 +2206,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2272,7 +2235,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2289,7 +2251,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2310,6 +2271,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2332,13 +2294,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2357,6 +2317,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2379,13 +2340,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2404,6 +2363,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2426,13 +2386,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2451,6 +2409,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2473,13 +2432,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2515,7 +2472,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2536,7 +2492,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2557,7 +2512,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2593,7 +2547,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2660,8 +2613,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -2678,7 +2631,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -2799,8 +2751,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -2817,7 +2769,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -3040,8 +2991,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -3058,7 +3009,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -3271,6 +3221,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3287,8 +3238,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -3320,8 +3270,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -3338,7 +3288,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -3459,8 +3408,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -3477,7 +3426,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -3705,8 +3653,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -3723,7 +3671,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -3943,7 +3890,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -3999,7 +3945,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4020,6 +3965,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4042,13 +3988,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4067,6 +4011,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4089,13 +4034,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4114,6 +4057,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4136,13 +4080,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4178,7 +4120,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4207,7 +4148,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4235,7 +4175,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4256,6 +4195,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4278,13 +4218,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4303,6 +4241,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4325,13 +4264,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4350,6 +4287,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4372,13 +4310,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4414,7 +4350,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4443,7 +4378,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4471,7 +4405,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4492,6 +4425,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4514,13 +4448,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4546,7 +4478,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4593,7 +4524,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -4759,7 +4689,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -4925,7 +4854,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -4946,7 +4874,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } ], @@ -5088,7 +5015,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -5253,7 +5179,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -5412,7 +5337,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -5572,7 +5496,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -5720,7 +5643,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5741,6 +5663,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5763,13 +5686,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -5788,6 +5709,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5811,6 +5733,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5827,8 +5750,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -5850,8 +5772,7 @@ } } } - }, - "optional": false + } } } ], @@ -5893,7 +5814,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5914,6 +5834,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5936,13 +5857,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -5961,6 +5880,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5984,6 +5904,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6000,8 +5921,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -6023,8 +5943,7 @@ } } } - }, - "optional": false + } } } ], @@ -6066,7 +5985,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6100,7 +6018,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -6133,7 +6050,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -6153,8 +6069,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -6179,7 +6095,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -6190,7 +6105,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6305,7 +6219,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -6325,8 +6238,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -6351,7 +6264,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -6362,7 +6274,6 @@ "ctxt": 0 }, "value": "substr", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithOverloadResolution3_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithOverloadResolution3_ES6/input.ts.json index 881a9c5d58e9..d1defd2a7405 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithOverloadResolution3_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithOverloadResolution3_ES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -100,8 +99,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -143,7 +141,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -164,6 +161,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -186,13 +184,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -211,6 +207,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -227,8 +224,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -270,7 +266,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -337,6 +332,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -353,8 +349,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "TaggedTemplateExpression", @@ -371,7 +366,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -383,7 +377,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } ], @@ -491,7 +484,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -594,7 +586,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -615,6 +606,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -637,13 +629,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -662,6 +652,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -678,8 +669,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -698,6 +688,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -714,8 +705,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -757,7 +747,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -778,6 +767,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -800,13 +790,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -825,6 +813,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -841,8 +830,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -861,6 +849,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -883,13 +872,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -925,7 +912,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -955,7 +941,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -972,7 +957,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1006,7 +990,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1042,6 +1025,7 @@ "ctxt": 0 }, "value": "d1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1064,13 +1048,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "TaggedTemplateExpression", @@ -1087,7 +1069,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1108,7 +1089,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } ], @@ -1256,8 +1236,8 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -1274,7 +1254,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1295,7 +1274,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } ], @@ -1447,7 +1425,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1458,7 +1435,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1489,7 +1465,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1518,7 +1493,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1684,7 +1658,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1838,7 +1811,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1859,6 +1831,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1881,13 +1854,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1906,6 +1877,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1928,13 +1900,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1970,7 +1940,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2006,7 +1975,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2027,6 +1995,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2049,13 +2018,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2074,6 +2041,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2090,8 +2058,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -2110,6 +2077,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2132,13 +2100,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2157,6 +2123,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2179,13 +2146,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2221,7 +2186,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2242,7 +2206,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2272,7 +2235,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2289,7 +2251,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2310,6 +2271,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2332,13 +2294,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2357,6 +2317,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2379,13 +2340,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2404,6 +2363,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2426,13 +2386,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2451,6 +2409,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2473,13 +2432,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2515,7 +2472,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2536,7 +2492,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2557,7 +2512,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2593,7 +2547,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2660,8 +2613,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -2678,7 +2631,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -2799,8 +2751,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -2817,7 +2769,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -3040,8 +2991,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -3058,7 +3009,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -3271,6 +3221,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3287,8 +3238,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -3320,8 +3270,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -3338,7 +3288,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -3459,8 +3408,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -3477,7 +3426,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -3705,8 +3653,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -3723,7 +3671,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -3943,7 +3890,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -3999,7 +3945,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4020,6 +3965,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4042,13 +3988,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4067,6 +4011,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4089,13 +4034,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4114,6 +4057,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4136,13 +4080,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4178,7 +4120,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4207,7 +4148,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4235,7 +4175,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4256,6 +4195,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4278,13 +4218,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4303,6 +4241,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4325,13 +4264,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4350,6 +4287,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4372,13 +4310,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4414,7 +4350,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4443,7 +4378,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4471,7 +4405,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4492,6 +4425,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4514,13 +4448,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4546,7 +4478,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4593,7 +4524,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -4759,7 +4689,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -4925,7 +4854,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -4946,7 +4874,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } ], @@ -5088,7 +5015,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -5253,7 +5179,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -5412,7 +5337,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -5572,7 +5496,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -5720,7 +5643,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5741,6 +5663,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5763,13 +5686,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -5788,6 +5709,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5811,6 +5733,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5827,8 +5750,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -5850,8 +5772,7 @@ } } } - }, - "optional": false + } } } ], @@ -5893,7 +5814,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5914,6 +5834,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5936,13 +5857,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -5961,6 +5880,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5984,6 +5904,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6000,8 +5921,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -6023,8 +5943,7 @@ } } } - }, - "optional": false + } } } ], @@ -6066,7 +5985,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6100,7 +6018,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -6133,7 +6050,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -6153,8 +6069,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -6179,7 +6095,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -6190,7 +6105,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6305,7 +6219,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -6325,8 +6238,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -6351,7 +6264,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -6362,7 +6274,6 @@ "ctxt": 0 }, "value": "substr", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTagNamedDeclare/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTagNamedDeclare/input.ts.json index 1133a2c96f5d..b03d8d8b334c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTagNamedDeclare/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTagNamedDeclare/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "declare", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -85,8 +84,8 @@ "ctxt": 0 }, "value": "ys", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -158,7 +157,6 @@ "ctxt": 0 }, "value": "declare", - "typeAnnotation": null, "optional": false }, "expressions": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTagNamedDeclareES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTagNamedDeclareES6/input.ts.json index 44e6a741fe61..f4815dc046d2 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTagNamedDeclareES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTagNamedDeclareES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "declare", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -85,8 +84,8 @@ "ctxt": 0 }, "value": "ys", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -158,7 +157,6 @@ "ctxt": 0 }, "value": "declare", - "typeAnnotation": null, "optional": false }, "expressions": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTagsTypedAsAny/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTagsTypedAsAny/input.ts.json index 67e1105421e2..8f6d2b10106e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTagsTypedAsAny/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTagsTypedAsAny/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -145,7 +144,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -320,7 +318,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { @@ -331,7 +328,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -344,7 +340,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "computed": false @@ -428,7 +423,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { @@ -439,7 +433,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -452,7 +445,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "computed": false @@ -622,7 +614,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -675,7 +666,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -710,7 +700,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -856,7 +845,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -891,7 +879,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -982,7 +969,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1180,7 +1166,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -1249,7 +1234,6 @@ "ctxt": 0 }, "value": "someOtherTag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1433,7 +1417,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1595,7 +1578,6 @@ "ctxt": 0 }, "value": "someOtherTag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1765,7 +1747,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { @@ -1776,7 +1757,6 @@ "ctxt": 0 }, "value": "thisIsNotATag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1866,7 +1846,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { @@ -1877,7 +1856,6 @@ "ctxt": 0 }, "value": "thisIsNotATag", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTagsTypedAsAnyES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTagsTypedAsAnyES6/input.ts.json index 7c91c8bea35b..6214eb18479b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTagsTypedAsAnyES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTagsTypedAsAnyES6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -145,7 +144,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -320,7 +318,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { @@ -331,7 +328,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -344,7 +340,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "computed": false @@ -428,7 +423,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { @@ -439,7 +433,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -452,7 +445,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "computed": false @@ -622,7 +614,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -675,7 +666,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -710,7 +700,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -856,7 +845,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -891,7 +879,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -982,7 +969,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1180,7 +1166,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -1249,7 +1234,6 @@ "ctxt": 0 }, "value": "someOtherTag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1433,7 +1417,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1595,7 +1578,6 @@ "ctxt": 0 }, "value": "someOtherTag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1765,7 +1747,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { @@ -1776,7 +1757,6 @@ "ctxt": 0 }, "value": "thisIsNotATag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1866,7 +1846,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { @@ -1877,7 +1856,6 @@ "ctxt": 0 }, "value": "thisIsNotATag", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression/input.ts.json index 26fe0dc72a6d..5ff750ae3a7c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,8 +48,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -122,7 +121,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -146,6 +144,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -162,8 +161,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -204,8 +202,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpressionES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpressionES6/input.ts.json index 671d5da775f3..32486ca116c4 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpressionES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpressionES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,8 +48,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -122,7 +121,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -146,6 +144,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -162,8 +161,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -204,8 +202,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTypedTags/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTypedTags/input.ts.json index 8448e1065254..16ba43925989 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTypedTags/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTypedTags/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,6 +50,7 @@ "ctxt": 0 }, "value": "stringParts", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -73,13 +73,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "RestElement", @@ -101,8 +99,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -153,7 +151,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -177,7 +174,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -206,7 +202,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -230,7 +225,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -259,7 +253,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -283,7 +276,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -312,7 +304,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -336,7 +327,6 @@ "ctxt": 0 }, "value": "thisIsNotATag", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -350,6 +340,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -366,8 +357,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -400,6 +390,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -416,8 +407,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -442,7 +432,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -483,6 +472,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,13 +495,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -540,7 +528,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -608,7 +595,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -776,7 +762,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -829,7 +814,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -864,7 +848,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1010,7 +993,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1045,7 +1027,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -1136,7 +1117,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1334,7 +1314,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -1398,7 +1377,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1582,7 +1560,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1744,7 +1721,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1914,7 +1890,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { @@ -1925,7 +1900,6 @@ "ctxt": 0 }, "value": "thisIsNotATag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2015,7 +1989,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { @@ -2026,7 +1999,6 @@ "ctxt": 0 }, "value": "thisIsNotATag", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTypedTagsES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTypedTagsES6/input.ts.json index 799445125156..d9122893b864 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTypedTagsES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateStringsWithTypedTagsES6/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,6 +50,7 @@ "ctxt": 0 }, "value": "stringParts", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -73,13 +73,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "RestElement", @@ -101,8 +99,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -153,7 +151,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -177,7 +174,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -206,7 +202,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -230,7 +225,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -259,7 +253,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -283,7 +276,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -312,7 +304,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -336,7 +327,6 @@ "ctxt": 0 }, "value": "thisIsNotATag", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -350,6 +340,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -366,8 +357,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -400,6 +390,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -416,8 +407,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -442,7 +432,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -483,6 +472,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,13 +495,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -540,7 +528,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -608,7 +595,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -776,7 +762,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -829,7 +814,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -864,7 +848,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1010,7 +993,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1045,7 +1027,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -1136,7 +1117,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1334,7 +1314,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -1398,7 +1377,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1582,7 +1560,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1744,7 +1721,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1914,7 +1890,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { @@ -1925,7 +1900,6 @@ "ctxt": 0 }, "value": "thisIsNotATag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2015,7 +1989,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { @@ -2026,7 +1999,6 @@ "ctxt": 0 }, "value": "thisIsNotATag", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateUntypedTagCall01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateUntypedTagCall01/input.ts.json index 00b9864c932a..c2333a018e4c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateUntypedTagCall01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateUntypedTagCall01/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "tag", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,13 +54,11 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "tag", - "typeAnnotation": null, "optional": false }, "expressions": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateWithConstructableTag01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateWithConstructableTag01/input.ts.json index 8d26e2928c66..25eb3ee7cba3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateWithConstructableTag01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateWithConstructableTag01/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "CtorTag", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -55,7 +54,6 @@ "ctxt": 0 }, "value": "CtorTag", - "typeAnnotation": null, "optional": false }, "expressions": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateWithConstructableTag02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateWithConstructableTag02/input.ts.json index 3edb7f4c111e..2da2de7310f3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateWithConstructableTag02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplateWithConstructableTag02/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -63,8 +62,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -167,6 +166,7 @@ "ctxt": 0 }, "value": "tag", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -189,13 +189,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -224,7 +222,6 @@ "ctxt": 0 }, "value": "tag", - "typeAnnotation": null, "optional": false }, "expressions": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplatesWithTypeArguments1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplatesWithTypeArguments1/input.ts.json index fdd916338790..fde54beb4ba6 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplatesWithTypeArguments1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/taggedTemplatesWithTypeArguments1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -96,8 +94,8 @@ "ctxt": 0 }, "value": "callbacks", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -121,7 +119,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -148,6 +145,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -170,13 +168,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -237,7 +233,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -278,7 +273,6 @@ "ctxt": 0 }, "value": "Stuff", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -308,7 +302,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -350,7 +343,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -392,7 +384,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -453,8 +444,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -471,7 +462,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -491,8 +481,8 @@ "ctxt": 0 }, "value": "stuff", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -510,7 +500,6 @@ "ctxt": 0 }, "value": "stuff", - "typeAnnotation": null, "optional": false }, "property": { @@ -521,7 +510,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -547,8 +535,8 @@ "ctxt": 0 }, "value": "stuff", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -566,7 +554,6 @@ "ctxt": 0 }, "value": "stuff", - "typeAnnotation": null, "optional": false }, "property": { @@ -577,7 +564,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -603,8 +589,8 @@ "ctxt": 0 }, "value": "stuff", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -622,7 +608,6 @@ "ctxt": 0 }, "value": "stuff", - "typeAnnotation": null, "optional": false }, "property": { @@ -633,7 +618,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -817,7 +801,6 @@ "ctxt": 0 }, "value": "Stuff", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -840,7 +823,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -861,6 +843,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -883,13 +866,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -908,6 +889,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -931,6 +913,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -953,13 +936,11 @@ "ctxt": 0 }, "value": "Input", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -985,15 +966,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -1012,6 +991,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1035,6 +1015,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1057,13 +1038,11 @@ "ctxt": 0 }, "value": "Input", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1089,15 +1068,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -1116,6 +1093,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1139,6 +1117,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1161,13 +1140,11 @@ "ctxt": 0 }, "value": "Input", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1193,15 +1170,13 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -1237,7 +1212,6 @@ "ctxt": 0 }, "value": "Input", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1258,7 +1232,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1279,7 +1252,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1300,7 +1272,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1338,7 +1309,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1358,7 +1328,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1378,7 +1347,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1419,8 +1387,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -1437,7 +1405,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1457,8 +1424,8 @@ "ctxt": 0 }, "value": "stuff", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1476,7 +1443,6 @@ "ctxt": 0 }, "value": "stuff", - "typeAnnotation": null, "optional": false }, "property": { @@ -1487,7 +1453,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1513,8 +1478,8 @@ "ctxt": 0 }, "value": "stuff", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1532,7 +1497,6 @@ "ctxt": 0 }, "value": "stuff", - "typeAnnotation": null, "optional": false }, "property": { @@ -1543,7 +1507,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1569,8 +1532,8 @@ "ctxt": 0 }, "value": "stuff", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1588,7 +1551,6 @@ "ctxt": 0 }, "value": "stuff", - "typeAnnotation": null, "optional": false }, "property": { @@ -1599,7 +1561,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1783,7 +1744,6 @@ "ctxt": 0 }, "value": "Stuff", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1848,6 +1808,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1879,7 +1840,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1909,6 +1869,7 @@ "ctxt": 0 }, "value": "strs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1931,13 +1892,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1947,6 +1906,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1970,6 +1930,7 @@ "ctxt": 0 }, "value": "input", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1992,13 +1953,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2024,15 +1983,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -2058,7 +2015,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2097,7 +2053,6 @@ "ctxt": 0 }, "value": "returnedObjProp", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2126,7 +2081,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2143,8 +2097,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2183,8 +2136,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -2208,7 +2161,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -2244,8 +2196,8 @@ "ctxt": 0 }, "value": "input", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2278,7 +2230,6 @@ "ctxt": 0 }, "value": "input", - "typeAnnotation": null, "optional": false } } @@ -2390,7 +2341,6 @@ "ctxt": 0 }, "value": "Stuff", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2432,7 +2382,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -2443,7 +2392,6 @@ "ctxt": 0 }, "value": "returnedObjProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2456,7 +2404,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2491,7 +2438,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -2502,7 +2448,6 @@ "ctxt": 0 }, "value": "returnedObjProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2515,7 +2460,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2550,7 +2494,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -2561,7 +2504,6 @@ "ctxt": 0 }, "value": "returnedObjProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2574,7 +2516,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2603,8 +2544,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TaggedTemplateExpression", @@ -2628,7 +2569,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -2639,7 +2579,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2661,8 +2600,8 @@ "ctxt": 0 }, "value": "input", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2695,7 +2634,6 @@ "ctxt": 0 }, "value": "input", - "typeAnnotation": null, "optional": false } } @@ -2807,7 +2745,6 @@ "ctxt": 0 }, "value": "Stuff", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2846,7 +2783,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -2857,7 +2793,6 @@ "ctxt": 0 }, "value": "returnedObjProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2870,7 +2805,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2905,7 +2839,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -2916,7 +2849,6 @@ "ctxt": 0 }, "value": "returnedObjProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2929,7 +2861,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2964,7 +2895,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -2975,7 +2905,6 @@ "ctxt": 0 }, "value": "returnedObjProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2988,7 +2917,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringBinaryOperations/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringBinaryOperations/input.ts.json index 0024daa86cc5..5a2540e9b6da 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringBinaryOperations/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringBinaryOperations/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -176,8 +176,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -321,8 +321,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -466,8 +466,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -611,8 +611,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -756,8 +756,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -901,8 +901,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1046,8 +1046,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1191,8 +1191,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1354,8 +1354,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1517,8 +1517,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1680,8 +1680,8 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1843,8 +1843,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2006,8 +2006,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2169,8 +2169,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2332,8 +2332,8 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2495,8 +2495,8 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2658,8 +2658,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2821,8 +2821,8 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2984,8 +2984,8 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3147,8 +3147,8 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3328,8 +3328,8 @@ "ctxt": 0 }, "value": "j2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3509,8 +3509,8 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3690,8 +3690,8 @@ "ctxt": 0 }, "value": "l2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3871,8 +3871,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4034,8 +4034,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4197,8 +4197,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4360,8 +4360,8 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4523,8 +4523,8 @@ "ctxt": 0 }, "value": "e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4686,8 +4686,8 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4849,8 +4849,8 @@ "ctxt": 0 }, "value": "g3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5012,8 +5012,8 @@ "ctxt": 0 }, "value": "h3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5175,8 +5175,8 @@ "ctxt": 0 }, "value": "i3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5356,8 +5356,8 @@ "ctxt": 0 }, "value": "j3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5537,8 +5537,8 @@ "ctxt": 0 }, "value": "k3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5718,8 +5718,8 @@ "ctxt": 0 }, "value": "l3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5899,8 +5899,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6062,8 +6062,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6225,8 +6225,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6388,8 +6388,8 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6551,8 +6551,8 @@ "ctxt": 0 }, "value": "e4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6714,8 +6714,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6877,8 +6877,8 @@ "ctxt": 0 }, "value": "g4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7040,8 +7040,8 @@ "ctxt": 0 }, "value": "h4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7203,8 +7203,8 @@ "ctxt": 0 }, "value": "i4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7384,8 +7384,8 @@ "ctxt": 0 }, "value": "j4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7565,8 +7565,8 @@ "ctxt": 0 }, "value": "k4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7746,8 +7746,8 @@ "ctxt": 0 }, "value": "l4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringBinaryOperationsES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringBinaryOperationsES6/input.ts.json index 719afbcee527..153be4183c1d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringBinaryOperationsES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringBinaryOperationsES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -176,8 +176,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -321,8 +321,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -466,8 +466,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -611,8 +611,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -756,8 +756,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -901,8 +901,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1046,8 +1046,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1191,8 +1191,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1354,8 +1354,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1517,8 +1517,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1680,8 +1680,8 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1843,8 +1843,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2006,8 +2006,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2169,8 +2169,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2332,8 +2332,8 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2495,8 +2495,8 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2658,8 +2658,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2821,8 +2821,8 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2984,8 +2984,8 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3147,8 +3147,8 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3328,8 +3328,8 @@ "ctxt": 0 }, "value": "j2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3509,8 +3509,8 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3690,8 +3690,8 @@ "ctxt": 0 }, "value": "l2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3871,8 +3871,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4034,8 +4034,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4197,8 +4197,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4360,8 +4360,8 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4523,8 +4523,8 @@ "ctxt": 0 }, "value": "e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4686,8 +4686,8 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4849,8 +4849,8 @@ "ctxt": 0 }, "value": "g3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5012,8 +5012,8 @@ "ctxt": 0 }, "value": "h3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5175,8 +5175,8 @@ "ctxt": 0 }, "value": "i3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5356,8 +5356,8 @@ "ctxt": 0 }, "value": "j3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5537,8 +5537,8 @@ "ctxt": 0 }, "value": "k3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5718,8 +5718,8 @@ "ctxt": 0 }, "value": "l3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5899,8 +5899,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6062,8 +6062,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6225,8 +6225,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6388,8 +6388,8 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6551,8 +6551,8 @@ "ctxt": 0 }, "value": "e4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6714,8 +6714,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6877,8 +6877,8 @@ "ctxt": 0 }, "value": "g4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7040,8 +7040,8 @@ "ctxt": 0 }, "value": "h4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7203,8 +7203,8 @@ "ctxt": 0 }, "value": "i4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7384,8 +7384,8 @@ "ctxt": 0 }, "value": "j4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7565,8 +7565,8 @@ "ctxt": 0 }, "value": "k4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7746,8 +7746,8 @@ "ctxt": 0 }, "value": "l4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringBinaryOperationsES6Invalid/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringBinaryOperationsES6Invalid/input.ts.json index 41a0aef1b378..90592dd18dc7 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringBinaryOperationsES6Invalid/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringBinaryOperationsES6Invalid/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -176,8 +176,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -321,8 +321,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -466,8 +466,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -611,8 +611,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -756,8 +756,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -901,8 +901,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1046,8 +1046,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1191,8 +1191,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1336,8 +1336,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1481,8 +1481,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1626,8 +1626,8 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1771,8 +1771,8 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1916,8 +1916,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2061,8 +2061,8 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2206,8 +2206,8 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2351,8 +2351,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2496,8 +2496,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2641,8 +2641,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2786,8 +2786,8 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2931,8 +2931,8 @@ "ctxt": 0 }, "value": "e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3076,8 +3076,8 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3221,8 +3221,8 @@ "ctxt": 0 }, "value": "g3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3366,8 +3366,8 @@ "ctxt": 0 }, "value": "h3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3511,8 +3511,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3674,8 +3674,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3837,8 +3837,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4000,8 +4000,8 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4163,8 +4163,8 @@ "ctxt": 0 }, "value": "e4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4326,8 +4326,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4489,8 +4489,8 @@ "ctxt": 0 }, "value": "g4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4652,8 +4652,8 @@ "ctxt": 0 }, "value": "h4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4815,8 +4815,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4978,8 +4978,8 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5141,8 +5141,8 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5304,8 +5304,8 @@ "ctxt": 0 }, "value": "d5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5467,8 +5467,8 @@ "ctxt": 0 }, "value": "e5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5630,8 +5630,8 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5793,8 +5793,8 @@ "ctxt": 0 }, "value": "g5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5956,8 +5956,8 @@ "ctxt": 0 }, "value": "h5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6119,8 +6119,8 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6282,8 +6282,8 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6445,8 +6445,8 @@ "ctxt": 0 }, "value": "c6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6608,8 +6608,8 @@ "ctxt": 0 }, "value": "d6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6771,8 +6771,8 @@ "ctxt": 0 }, "value": "e6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6934,8 +6934,8 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7097,8 +7097,8 @@ "ctxt": 0 }, "value": "g6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7260,8 +7260,8 @@ "ctxt": 0 }, "value": "h6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7423,8 +7423,8 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7586,8 +7586,8 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7749,8 +7749,8 @@ "ctxt": 0 }, "value": "c7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7912,8 +7912,8 @@ "ctxt": 0 }, "value": "d7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8075,8 +8075,8 @@ "ctxt": 0 }, "value": "e7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8238,8 +8238,8 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8401,8 +8401,8 @@ "ctxt": 0 }, "value": "g7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8564,8 +8564,8 @@ "ctxt": 0 }, "value": "h7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8727,8 +8727,8 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8890,8 +8890,8 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9053,8 +9053,8 @@ "ctxt": 0 }, "value": "c8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9216,8 +9216,8 @@ "ctxt": 0 }, "value": "d8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9379,8 +9379,8 @@ "ctxt": 0 }, "value": "e8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9542,8 +9542,8 @@ "ctxt": 0 }, "value": "f8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9705,8 +9705,8 @@ "ctxt": 0 }, "value": "g8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9868,8 +9868,8 @@ "ctxt": 0 }, "value": "h8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10031,8 +10031,8 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10194,8 +10194,8 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10357,8 +10357,8 @@ "ctxt": 0 }, "value": "c9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10520,8 +10520,8 @@ "ctxt": 0 }, "value": "d9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10683,8 +10683,8 @@ "ctxt": 0 }, "value": "e9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10846,8 +10846,8 @@ "ctxt": 0 }, "value": "f9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11009,8 +11009,8 @@ "ctxt": 0 }, "value": "g9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11172,8 +11172,8 @@ "ctxt": 0 }, "value": "h9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11335,8 +11335,8 @@ "ctxt": 0 }, "value": "aa", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11498,8 +11498,8 @@ "ctxt": 0 }, "value": "ba", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11661,8 +11661,8 @@ "ctxt": 0 }, "value": "ca", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11824,8 +11824,8 @@ "ctxt": 0 }, "value": "da", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11987,8 +11987,8 @@ "ctxt": 0 }, "value": "ea", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12150,8 +12150,8 @@ "ctxt": 0 }, "value": "fa", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12313,8 +12313,8 @@ "ctxt": 0 }, "value": "ga", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12476,8 +12476,8 @@ "ctxt": 0 }, "value": "ha", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12639,8 +12639,8 @@ "ctxt": 0 }, "value": "ab", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12802,8 +12802,8 @@ "ctxt": 0 }, "value": "bb", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12965,8 +12965,8 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13128,8 +13128,8 @@ "ctxt": 0 }, "value": "db", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13291,8 +13291,8 @@ "ctxt": 0 }, "value": "eb", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13454,8 +13454,8 @@ "ctxt": 0 }, "value": "fb", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13617,8 +13617,8 @@ "ctxt": 0 }, "value": "gb", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13780,8 +13780,8 @@ "ctxt": 0 }, "value": "hb", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13943,8 +13943,8 @@ "ctxt": 0 }, "value": "ac", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14106,8 +14106,8 @@ "ctxt": 0 }, "value": "bc", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14269,8 +14269,8 @@ "ctxt": 0 }, "value": "cc", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14432,8 +14432,8 @@ "ctxt": 0 }, "value": "dc", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14595,8 +14595,8 @@ "ctxt": 0 }, "value": "ec", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14758,8 +14758,8 @@ "ctxt": 0 }, "value": "fc", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14921,8 +14921,8 @@ "ctxt": 0 }, "value": "gc", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -15084,8 +15084,8 @@ "ctxt": 0 }, "value": "hc", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringBinaryOperationsInvalid/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringBinaryOperationsInvalid/input.ts.json index 388861233b4e..fc225e9b2ccb 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringBinaryOperationsInvalid/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringBinaryOperationsInvalid/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -176,8 +176,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -321,8 +321,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -466,8 +466,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -611,8 +611,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -756,8 +756,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -901,8 +901,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1046,8 +1046,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1191,8 +1191,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1336,8 +1336,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1481,8 +1481,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1626,8 +1626,8 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1771,8 +1771,8 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1916,8 +1916,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2061,8 +2061,8 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2206,8 +2206,8 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2351,8 +2351,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2496,8 +2496,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2641,8 +2641,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2786,8 +2786,8 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2931,8 +2931,8 @@ "ctxt": 0 }, "value": "e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3076,8 +3076,8 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3221,8 +3221,8 @@ "ctxt": 0 }, "value": "g3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3366,8 +3366,8 @@ "ctxt": 0 }, "value": "h3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3511,8 +3511,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3674,8 +3674,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3837,8 +3837,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4000,8 +4000,8 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4163,8 +4163,8 @@ "ctxt": 0 }, "value": "e4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4326,8 +4326,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4489,8 +4489,8 @@ "ctxt": 0 }, "value": "g4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4652,8 +4652,8 @@ "ctxt": 0 }, "value": "h4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4815,8 +4815,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4978,8 +4978,8 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5141,8 +5141,8 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5304,8 +5304,8 @@ "ctxt": 0 }, "value": "d5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5467,8 +5467,8 @@ "ctxt": 0 }, "value": "e5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5630,8 +5630,8 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5793,8 +5793,8 @@ "ctxt": 0 }, "value": "g5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5956,8 +5956,8 @@ "ctxt": 0 }, "value": "h5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6119,8 +6119,8 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6282,8 +6282,8 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6445,8 +6445,8 @@ "ctxt": 0 }, "value": "c6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6608,8 +6608,8 @@ "ctxt": 0 }, "value": "d6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6771,8 +6771,8 @@ "ctxt": 0 }, "value": "e6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6934,8 +6934,8 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7097,8 +7097,8 @@ "ctxt": 0 }, "value": "g6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7260,8 +7260,8 @@ "ctxt": 0 }, "value": "h6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7423,8 +7423,8 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7586,8 +7586,8 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7749,8 +7749,8 @@ "ctxt": 0 }, "value": "c7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7912,8 +7912,8 @@ "ctxt": 0 }, "value": "d7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8075,8 +8075,8 @@ "ctxt": 0 }, "value": "e7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8238,8 +8238,8 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8401,8 +8401,8 @@ "ctxt": 0 }, "value": "g7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8564,8 +8564,8 @@ "ctxt": 0 }, "value": "h7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8727,8 +8727,8 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8890,8 +8890,8 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9053,8 +9053,8 @@ "ctxt": 0 }, "value": "c8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9216,8 +9216,8 @@ "ctxt": 0 }, "value": "d8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9379,8 +9379,8 @@ "ctxt": 0 }, "value": "e8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9542,8 +9542,8 @@ "ctxt": 0 }, "value": "f8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9705,8 +9705,8 @@ "ctxt": 0 }, "value": "g8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9868,8 +9868,8 @@ "ctxt": 0 }, "value": "h8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10031,8 +10031,8 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10194,8 +10194,8 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10357,8 +10357,8 @@ "ctxt": 0 }, "value": "c9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10520,8 +10520,8 @@ "ctxt": 0 }, "value": "d9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10683,8 +10683,8 @@ "ctxt": 0 }, "value": "e9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10846,8 +10846,8 @@ "ctxt": 0 }, "value": "f9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11009,8 +11009,8 @@ "ctxt": 0 }, "value": "g9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11172,8 +11172,8 @@ "ctxt": 0 }, "value": "h9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11335,8 +11335,8 @@ "ctxt": 0 }, "value": "aa", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11498,8 +11498,8 @@ "ctxt": 0 }, "value": "ba", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11661,8 +11661,8 @@ "ctxt": 0 }, "value": "ca", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11824,8 +11824,8 @@ "ctxt": 0 }, "value": "da", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11987,8 +11987,8 @@ "ctxt": 0 }, "value": "ea", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12150,8 +12150,8 @@ "ctxt": 0 }, "value": "fa", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12313,8 +12313,8 @@ "ctxt": 0 }, "value": "ga", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12476,8 +12476,8 @@ "ctxt": 0 }, "value": "ha", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12639,8 +12639,8 @@ "ctxt": 0 }, "value": "ab", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12802,8 +12802,8 @@ "ctxt": 0 }, "value": "bb", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12965,8 +12965,8 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13128,8 +13128,8 @@ "ctxt": 0 }, "value": "db", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13291,8 +13291,8 @@ "ctxt": 0 }, "value": "eb", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13454,8 +13454,8 @@ "ctxt": 0 }, "value": "fb", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13617,8 +13617,8 @@ "ctxt": 0 }, "value": "gb", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13780,8 +13780,8 @@ "ctxt": 0 }, "value": "hb", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13943,8 +13943,8 @@ "ctxt": 0 }, "value": "ac", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14106,8 +14106,8 @@ "ctxt": 0 }, "value": "bc", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14269,8 +14269,8 @@ "ctxt": 0 }, "value": "cc", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14432,8 +14432,8 @@ "ctxt": 0 }, "value": "dc", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14595,8 +14595,8 @@ "ctxt": 0 }, "value": "ec", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14758,8 +14758,8 @@ "ctxt": 0 }, "value": "fc", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14921,8 +14921,8 @@ "ctxt": 0 }, "value": "gc", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -15084,8 +15084,8 @@ "ctxt": 0 }, "value": "hc", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes01/input.ts.json index 3e7cde688e52..173d7cee2227 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes01/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes01_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes01_ES6/input.ts.json index ea3d4953884e..5ab5559f8a13 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes01_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes01_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes02/input.ts.json index 6dc348beaa19..55a6fc20ba1a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes02/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes02_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes02_ES6/input.ts.json index 5f718c136ff2..afa0549a11ba 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes02_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes02_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes03/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes03/input.ts.json index f8f906f67692..ed7daf8a2a0b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes03/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes03/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes03_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes03_ES6/input.ts.json index 2fc02ae42b04..736861986219 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes03_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes03_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes04/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes04/input.ts.json index 04629d56da24..83362184f961 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes04/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes04/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes04_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes04_ES6/input.ts.json index 8caec48221f5..565f58c2c292 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes04_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringControlCharacterEscapes04_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInArray/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInArray/input.ts.json index c1c22c45b76a..24eddfa3f1b6 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInArray/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInArray/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInArrowFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInArrowFunction/input.ts.json index b2d2b05e253a..181f8ed34e28 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInArrowFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInArrowFunction/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -70,7 +70,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInArrowFunctionES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInArrowFunctionES6/input.ts.json index 8472c6570a0b..9ecb2edb8cf7 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInArrowFunctionES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInArrowFunctionES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -70,7 +70,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInConditional/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInConditional/input.ts.json index bcc103370cad..b5582f0843ad 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInConditional/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInConditional/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInConditionalES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInConditionalES6/input.ts.json index 7bf7591a6ab6..6f8eeae9b17b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInConditionalES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInConditionalES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInDivision/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInDivision/input.ts.json index cde16550013f..428e8213a7cf 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInDivision/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInDivision/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInEqualityChecks/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInEqualityChecks/input.ts.json index 4e03aa20eb99..16f2464837ee 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInEqualityChecks/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInEqualityChecks/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInEqualityChecksES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInEqualityChecksES6/input.ts.json index 4b3171239f90..03ceb5d32cc9 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInEqualityChecksES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInEqualityChecksES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInFunctionExpression/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInFunctionExpression/input.ts.json index 42b567b23174..ddb87ff21b0e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInFunctionExpression/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInFunctionExpression/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -44,7 +44,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInFunctionExpressionES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInFunctionExpressionES6/input.ts.json index 2ef524b83841..e7bc04544393 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInFunctionExpressionES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInFunctionExpressionES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -44,7 +44,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInInOperator/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInInOperator/input.ts.json index 5a9ee4c1648b..1ad016b3b9a6 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInInOperator/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInInOperator/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -160,7 +160,6 @@ "ctxt": 0 }, "value": "hi", - "typeAnnotation": null, "optional": false }, "value": { @@ -183,7 +182,6 @@ "ctxt": 0 }, "value": "hello", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInInOperatorES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInInOperatorES6/input.ts.json index 74351c0e078e..428eb8e773d4 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInInOperatorES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInInOperatorES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -160,7 +160,6 @@ "ctxt": 0 }, "value": "hi", - "typeAnnotation": null, "optional": false }, "value": { @@ -183,7 +182,6 @@ "ctxt": 0 }, "value": "hello", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInInstanceOf/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInInstanceOf/input.ts.json index 0323419b1adc..b9ca8ed51bee 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInInstanceOf/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInInstanceOf/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -145,7 +145,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInInstanceOfES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInInstanceOfES6/input.ts.json index 056ca9483181..c84b0746a072 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInInstanceOfES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInInstanceOfES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -145,7 +145,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInModulo/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInModulo/input.ts.json index 59f419ad999c..ad213ab39f1b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInModulo/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInModulo/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInModuloES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInModuloES6/input.ts.json index fb42744f75c7..c059748b183d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInModuloES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInModuloES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInMultiplication/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInMultiplication/input.ts.json index bfe0ff340e4d..6324e65ded22 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInMultiplication/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInMultiplication/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInMultiplicationES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInMultiplicationES6/input.ts.json index d35354298bf7..62057ba0e5bb 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInMultiplicationES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInMultiplicationES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInNewOperator/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInNewOperator/input.ts.json index 22e53ce8d1c7..377cee8e8c2b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInNewOperator/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInNewOperator/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInNewOperatorES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInNewOperatorES6/input.ts.json index e6fa64343987..c7fb2b2e1605 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInNewOperatorES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInNewOperatorES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInParentheses/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInParentheses/input.ts.json index ab74d8d1d0b7..91db44123600 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInParentheses/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInParentheses/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInParenthesesES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInParenthesesES6/input.ts.json index ca98bc6dc382..d46a683db01c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInParenthesesES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInParenthesesES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInPropertyAssignment/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInPropertyAssignment/input.ts.json index a252a343f5e3..8ab3cd9943f3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInPropertyAssignment/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInPropertyAssignment/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInPropertyAssignmentES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInPropertyAssignmentES6/input.ts.json index bc5ce4e6ce13..193094ac856a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInPropertyAssignmentES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInPropertyAssignmentES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInTypeAssertion/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInTypeAssertion/input.ts.json index 29ad65916e26..07a628fcfa7d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInTypeAssertion/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInTypeAssertion/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInTypeAssertionES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInTypeAssertionES6/input.ts.json index a07fb9aea2e9..0d9fa1db21cf 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInTypeAssertionES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInTypeAssertionES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInTypeOf/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInTypeOf/input.ts.json index 009a5cd50369..11bbb98862d4 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInTypeOf/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInTypeOf/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInTypeOfES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInTypeOfES6/input.ts.json index d9ee51de5134..f92652aa69bf 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInTypeOfES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInTypeOfES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInUnaryPlus/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInUnaryPlus/input.ts.json index f3ce42dcc211..6cf551d9555a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInUnaryPlus/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInUnaryPlus/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInUnaryPlusES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInUnaryPlusES6/input.ts.json index efc03ece2bf3..a9284e17260c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInUnaryPlusES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInUnaryPlusES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInYieldKeyword/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInYieldKeyword/input.ts.json index 93f152d3c5a4..2a6d24b5f3ef 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInYieldKeyword/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringInYieldKeyword/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "gen", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -86,7 +85,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } ], diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithBackslashEscapes01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithBackslashEscapes01/input.ts.json index 978f434d8a6e..093adbfa52c3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithBackslashEscapes01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithBackslashEscapes01/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -111,8 +111,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -191,8 +191,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -271,8 +271,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithBackslashEscapes01_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithBackslashEscapes01_ES6/input.ts.json index b2ba1afee6d3..2df90e9db218 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithBackslashEscapes01_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithBackslashEscapes01_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -111,8 +111,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -191,8 +191,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -271,8 +271,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedAddition/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedAddition/input.ts.json index 783781d387f8..55fc3410848a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedAddition/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedAddition/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedAdditionES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedAdditionES6/input.ts.json index 6faba9944fbf..b6934ef3f7ae 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedAdditionES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedAdditionES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedArray/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedArray/input.ts.json index 809d471da28b..57d8e861ad6b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedArray/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedArray/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedArrayES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedArrayES6/input.ts.json index f9558cd73a26..adb0c2942d92 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedArrayES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedArrayES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedArrowFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedArrowFunction/input.ts.json index 6cdb9941dfdc..c7160b4e81e6 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedArrowFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedArrowFunction/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -58,8 +58,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -70,7 +70,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedArrowFunctionES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedArrowFunctionES6/input.ts.json index dcd164624611..73a1d11b901a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedArrowFunctionES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedArrowFunctionES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -58,8 +58,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -70,7 +70,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedConditional/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedConditional/input.ts.json index 671d8224bb87..3066d26ed4e9 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedConditional/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedConditional/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedConditionalES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedConditionalES6/input.ts.json index b2f54f31556f..9ae87a51a132 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedConditionalES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedConditionalES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedDivision/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedDivision/input.ts.json index 632ae5fc89f3..387c7eb374fa 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedDivision/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedDivision/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedDivisionES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedDivisionES6/input.ts.json index d02ac563869f..36b52ca8e3e3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedDivisionES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedDivisionES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedFunctionExpression/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedFunctionExpression/input.ts.json index d7df08ec04fa..d45617bab251 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedFunctionExpression/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedFunctionExpression/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "params": [], @@ -85,7 +84,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedFunctionExpressionES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedFunctionExpressionES6/input.ts.json index 20aa451b7ee0..c8bf72b69928 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedFunctionExpressionES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedFunctionExpressionES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "params": [], @@ -85,7 +84,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedInOperator/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedInOperator/input.ts.json index f0970add6013..ad61911d4f6e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedInOperator/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedInOperator/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -82,7 +82,6 @@ "ctxt": 0 }, "value": "hi", - "typeAnnotation": null, "optional": false }, "value": { @@ -105,7 +104,6 @@ "ctxt": 0 }, "value": "hello", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedInOperatorES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedInOperatorES6/input.ts.json index fcc3e68247cc..8d34015cae17 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedInOperatorES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedInOperatorES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -82,7 +82,6 @@ "ctxt": 0 }, "value": "hi", - "typeAnnotation": null, "optional": false }, "value": { @@ -105,7 +104,6 @@ "ctxt": 0 }, "value": "hello", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedInstanceOf/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedInstanceOf/input.ts.json index 392fac1e0cbe..d13670d1fd5c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedInstanceOf/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedInstanceOf/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -72,7 +72,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedInstanceOfES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedInstanceOfES6/input.ts.json index f79c60433c7f..82aa9662eb6d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedInstanceOfES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedInstanceOfES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -72,7 +72,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedModulo/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedModulo/input.ts.json index 78c2327ae452..6bc73d23e53b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedModulo/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedModulo/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedModuloES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedModuloES6/input.ts.json index d18ab35dde83..04cb3a892a35 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedModuloES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedModuloES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedMultiplication/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedMultiplication/input.ts.json index 4683a0523617..32e583fe1c53 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedMultiplication/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedMultiplication/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedMultiplicationES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedMultiplicationES6/input.ts.json index d9a361a9befa..0e5b7eac14d0 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedMultiplicationES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedMultiplicationES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedNewOperator/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedNewOperator/input.ts.json index 47dc04a4963d..34de75368376 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedNewOperator/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedNewOperator/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -57,7 +57,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedNewOperatorES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedNewOperatorES6/input.ts.json index 007ad34d6d40..ce1dfcc6df71 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedNewOperatorES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedNewOperatorES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -57,7 +57,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedObjectLiteral/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedObjectLiteral/input.ts.json index 84603f9aa837..06b164398ab8 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedObjectLiteral/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedObjectLiteral/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -60,7 +60,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -83,7 +82,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedObjectLiteralES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedObjectLiteralES6/input.ts.json index ac862d19f050..122d6bbc03a8 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedObjectLiteralES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedObjectLiteralES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -60,7 +60,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -83,7 +82,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedTemplateString/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedTemplateString/input.ts.json index 7d943a1b4db1..c9f056bd26a1 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedTemplateString/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedTemplateString/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedTemplateStringES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedTemplateStringES6/input.ts.json index 75960a717a78..6b821e953943 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedTemplateStringES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedTemplateStringES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedTypeAssertionOnAddition/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedTypeAssertionOnAddition/input.ts.json index 6ac144683f41..f6f3dc8ccba5 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedTypeAssertionOnAddition/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedTypeAssertionOnAddition/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedTypeAssertionOnAdditionES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedTypeAssertionOnAdditionES6/input.ts.json index 7fa85818463b..944d782cb81b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedTypeAssertionOnAdditionES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedTypeAssertionOnAdditionES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedTypeOfOperator/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedTypeOfOperator/input.ts.json index 93e82c761b6c..d2897e49a74f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedTypeOfOperator/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedTypeOfOperator/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedTypeOfOperatorES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedTypeOfOperatorES6/input.ts.json index 708448d74041..2a5fef4912fb 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedTypeOfOperatorES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedTypeOfOperatorES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedUnaryPlus/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedUnaryPlus/input.ts.json index e0c043054a38..5e5c12239276 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedUnaryPlus/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedUnaryPlus/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -58,7 +58,6 @@ "ctxt": 0 }, "value": "Infinity", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedUnaryPlusES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedUnaryPlusES6/input.ts.json index 79aec2bb881f..231b36a1861c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedUnaryPlusES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedUnaryPlusES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -58,7 +58,6 @@ "ctxt": 0 }, "value": "Infinity", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedYieldKeywordES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedYieldKeywordES6/input.ts.json index b9b142a5ffd9..89d3a0513c6b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedYieldKeywordES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmbeddedYieldKeywordES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "gen", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmptyLiteralPortions/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmptyLiteralPortions/input.ts.json index 7ecd06c5e961..35cd4ec54e89 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmptyLiteralPortions/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmptyLiteralPortions/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -111,8 +111,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -238,8 +238,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -365,8 +365,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -492,8 +492,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -619,8 +619,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -792,8 +792,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -965,8 +965,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -1138,8 +1138,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -1311,8 +1311,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -1484,8 +1484,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -1657,8 +1657,8 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -1830,8 +1830,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmptyLiteralPortionsES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmptyLiteralPortionsES6/input.ts.json index 4dc3f013177c..f4e6e6817b7c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmptyLiteralPortionsES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithEmptyLiteralPortionsES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -111,8 +111,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -238,8 +238,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -365,8 +365,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -492,8 +492,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -619,8 +619,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -792,8 +792,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -965,8 +965,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -1138,8 +1138,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -1311,8 +1311,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -1484,8 +1484,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -1657,8 +1657,8 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -1830,8 +1830,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithPropertyAccess/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithPropertyAccess/input.ts.json index 56bf2823b9bc..85f4dd19c1a4 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithPropertyAccess/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithPropertyAccess/input.ts.json @@ -130,7 +130,6 @@ "ctxt": 0 }, "value": "indexOf", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithPropertyAccessES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithPropertyAccessES6/input.ts.json index 2103515ff8cd..7f738a5a08ce 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithPropertyAccessES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringWithPropertyAccessES6/input.ts.json @@ -130,7 +130,6 @@ "ctxt": 0 }, "value": "indexOf", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression/input.ts.json index fd50dda004d0..acb90b81a930 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression/input.ts.json @@ -41,6 +41,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -57,8 +58,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -99,8 +99,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpressionES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpressionES6/input.ts.json index d443841d9456..adb02549e3a3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpressionES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/templates/templateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpressionES6/input.ts.json @@ -41,6 +41,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -57,8 +58,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -99,8 +99,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions01_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions01_ES5/input.ts.json index fa0641485a03..c5a8c10efc57 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions01_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions01_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions01_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions01_ES6/input.ts.json index fa0641485a03..c5a8c10efc57 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions01_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions01_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions02_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions02_ES5/input.ts.json index 324a6fc3851f..5be0aa50306e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions02_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions02_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions02_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions02_ES6/input.ts.json index 324a6fc3851f..5be0aa50306e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions02_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions02_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions03_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions03_ES5/input.ts.json index 1af055e9dc64..0fc0dc426b5d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions03_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions03_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions03_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions03_ES6/input.ts.json index 1af055e9dc64..0fc0dc426b5d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions03_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions03_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions04_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions04_ES5/input.ts.json index 0e567179bda2..0a631e17cfbd 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions04_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions04_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions04_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions04_ES6/input.ts.json index 0e567179bda2..0a631e17cfbd 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions04_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions04_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions05_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions05_ES5/input.ts.json index 31204be0e8bd..e1d0c8fb706b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions05_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions05_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions05_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions05_ES6/input.ts.json index 31204be0e8bd..e1d0c8fb706b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions05_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions05_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions06_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions06_ES5/input.ts.json index 098c12a7e252..fb56d37c4338 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions06_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions06_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions06_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions06_ES6/input.ts.json index 098c12a7e252..fb56d37c4338 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions06_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions06_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions07_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions07_ES5/input.ts.json index 10bf871d6198..12f4fa81da96 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions07_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions07_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions07_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions07_ES6/input.ts.json index 10bf871d6198..12f4fa81da96 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions07_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions07_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions08_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions08_ES5/input.ts.json index 5ab54416819b..902a121c7ff3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions08_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions08_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions08_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions08_ES6/input.ts.json index 5ab54416819b..902a121c7ff3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions08_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions08_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions09_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions09_ES5/input.ts.json index 69fdd5dd8288..191ead827b53 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions09_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions09_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions09_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions09_ES6/input.ts.json index 69fdd5dd8288..191ead827b53 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions09_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions09_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions10_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions10_ES5/input.ts.json index cb7b74a890cc..dda3642a8c73 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions10_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions10_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions10_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions10_ES6/input.ts.json index cb7b74a890cc..dda3642a8c73 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions10_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions10_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions11_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions11_ES5/input.ts.json index 5297186599f9..3472f2bcb3e3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions11_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions11_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions11_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions11_ES6/input.ts.json index 5297186599f9..3472f2bcb3e3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions11_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions11_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions12_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions12_ES5/input.ts.json index e2b9719c60de..b741ed36a810 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions12_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions12_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions12_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions12_ES6/input.ts.json index e2b9719c60de..b741ed36a810 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions12_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions12_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions13_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions13_ES5/input.ts.json index c76c49ee25fc..134cf7a73445 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions13_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions13_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions13_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions13_ES6/input.ts.json index c76c49ee25fc..134cf7a73445 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions13_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions13_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions14_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions14_ES5/input.ts.json index 423f69d0e488..779187d0a3c2 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions14_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions14_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions14_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions14_ES6/input.ts.json index 423f69d0e488..779187d0a3c2 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions14_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions14_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions15_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions15_ES5/input.ts.json index b6bbfa4cbef9..c68cca9a5c1c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions15_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions15_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions15_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions15_ES6/input.ts.json index b6bbfa4cbef9..c68cca9a5c1c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions15_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions15_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions16_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions16_ES5/input.ts.json index 3e5c5a9a8779..ed5e8c4c22cf 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions16_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions16_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions16_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions16_ES6/input.ts.json index 3e5c5a9a8779..ed5e8c4c22cf 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions16_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions16_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions17_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions17_ES5/input.ts.json index bf200a3b82b8..e63175a7b250 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions17_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions17_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions17_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions17_ES6/input.ts.json index bf200a3b82b8..e63175a7b250 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions17_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions17_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions18_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions18_ES5/input.ts.json index 2f1e0c1d5964..b8c08fad500a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions18_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions18_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions18_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions18_ES6/input.ts.json index 2f1e0c1d5964..b8c08fad500a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions18_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions18_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions19_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions19_ES5/input.ts.json index 613a22b5ff5a..5e955186a68c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions19_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions19_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions19_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions19_ES6/input.ts.json index 613a22b5ff5a..5e955186a68c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions19_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions19_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES5/input.ts.json index db2cb9e416f9..f4f9dbf87bd1 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES6/input.ts.json index db2cb9e416f9..f4f9dbf87bd1 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES5/input.ts.json index be31db348db9..65a5dc60e329 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES6/input.ts.json index be31db348db9..65a5dc60e329 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES5/input.ts.json index 3f995a0d2448..34d8114f3855 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES6/input.ts.json index 3f995a0d2448..34d8114f3855 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES5/input.ts.json index 879a5b90646f..ed19ba6feebe 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES6/input.ts.json index 879a5b90646f..ed19ba6feebe 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5/input.ts.json index a9d615289885..5b82f6b8574d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6/input.ts.json index a9d615289885..5b82f6b8574d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES5/input.ts.json index 91f89e9529fc..3a8f88839698 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES6/input.ts.json index 91f89e9529fc..3a8f88839698 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES5/input.ts.json index 44e96e65f0cc..87eee44253f6 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES6/input.ts.json index 44e96e65f0cc..87eee44253f6 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES5/input.ts.json index 07919f8a98e7..562aa2c41c6b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES6/input.ts.json index 07919f8a98e7..562aa2c41c6b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES5/input.ts.json index 8f83247923a2..e2c4bbad0efa 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES6/input.ts.json index 8f83247923a2..e2c4bbad0efa 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES5/input.ts.json index 34af1d88d108..3a67773dc4ce 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES6/input.ts.json index 34af1d88d108..3a67773dc4ce 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES5/input.ts.json index 34af1d88d108..3a67773dc4ce 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES6/input.ts.json index 34af1d88d108..3a67773dc4ce 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES5/input.ts.json index 3cf073b2d5e5..bafbac944b17 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES6/input.ts.json index 3cf073b2d5e5..bafbac944b17 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES5/input.ts.json index 983a79c49f9f..51ebdf06f7f4 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES6/input.ts.json index 983a79c49f9f..51ebdf06f7f4 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES5/input.ts.json index 584793d098e4..61e38838adec 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES6/input.ts.json index 584793d098e4..61e38838adec 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES5/input.ts.json index e7be30c95a0c..bf4adf0539d9 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES6/input.ts.json index e7be30c95a0c..bf4adf0539d9 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES5/input.ts.json index b3bec9babf6a..00c60a407f1e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES6/input.ts.json index b3bec9babf6a..00c60a407f1e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES5/input.ts.json index 44c843098dae..08e41b3bdd82 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES6/input.ts.json index 44c843098dae..08e41b3bdd82 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5/input.ts.json index fe6704a8d920..493c857fb5dc 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6/input.ts.json index fe6704a8d920..493c857fb5dc 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES5/input.ts.json index 82bc38284f3f..3319017900d9 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES6/input.ts.json index 82bc38284f3f..3319017900d9 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES5/input.ts.json index c82bd7780d56..002ed1c19517 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES6/input.ts.json index c82bd7780d56..002ed1c19517 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES5/input.ts.json index e0c14012885d..8240ac791161 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES6/input.ts.json index e0c14012885d..8240ac791161 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES5/input.ts.json index f1628cc3d8a8..df155ee1cdda 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES6/input.ts.json index f1628cc3d8a8..df155ee1cdda 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES5/input.ts.json index 99ae5d541a80..f8cdd2ee99bc 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES6/input.ts.json index 99ae5d541a80..f8cdd2ee99bc 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES5/input.ts.json index 8ee259b18ae1..a51641030911 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES6/input.ts.json index 8ee259b18ae1..a51641030911 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES5/input.ts.json index 75511da81c55..d9c85af075a4 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES6/input.ts.json index 75511da81c55..d9c85af075a4 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5/input.ts.json index 4f69e3f338df..2b9cc3dbc268 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6/input.ts.json index 4f69e3f338df..2b9cc3dbc268 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration10_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration10_es6/input.ts.json index 4509a6c7ee70..51ecff5ed7eb 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration10_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration10_es6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration12_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration12_es6/input.ts.json index f7a872bfab5a..dac057828878 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration12_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration12_es6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration3_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration3_es6/input.ts.json index 2219858493f0..9a7631fdc3b1 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration3_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration3_es6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration5_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration5_es6/input.ts.json index 754a8c9a263f..07b6aa47ee86 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration5_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration5_es6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration7_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration7_es6/input.ts.json index b0f5b6db24db..504aaaa68725 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration7_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration7_es6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration8_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration8_es6/input.ts.json index ff52c237d6d0..1a8e7de8c213 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration8_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration8_es6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration9_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration9_es6/input.ts.json index 740941bd8315..9a91e5163d43 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration9_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/variableDeclarations/VariableDeclaration9_es6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression10_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression10_es6/input.ts.json index 6a2513cdf232..bbfbdad66c6f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression10_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression10_es6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [], @@ -99,7 +98,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression11_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression11_es6/input.ts.json index a19cfed2bd6d..44286e9f7031 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression11_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression11_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression13_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression13_es6/input.ts.json index 922c1388d079..b17ec0d8ed48 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression13_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression13_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression19_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression19_es6/input.ts.json index 1f4a6b41695e..de92058d65b7 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression19_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression19_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -45,7 +44,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "quux", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -122,7 +119,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression1_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression1_es6/input.ts.json index 5008aad9af86..2f4c5d76820f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression1_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression1_es6/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "yield", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression3_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression3_es6/input.ts.json index dca7c0fdd1e9..0d06bc6ce5b5 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression3_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression3_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression4_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression4_es6/input.ts.json index 6a3d0983d22a..a34d67181be4 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression4_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression4_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression6_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression6_es6/input.ts.json index 144db35d31ac..bae9389ece3c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression6_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression6_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -57,7 +56,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "delegate": true diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression7_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression7_es6/input.ts.json index 12b2b3e491ae..12452b00dfdb 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression7_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression7_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -57,7 +56,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "delegate": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression8_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression8_es6/input.ts.json index 4fc515454ca9..9424be11d9c1 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression8_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression8_es6/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "yield", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -60,7 +58,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -108,7 +105,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression9_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression9_es6/input.ts.json index 416037965664..293fd83557f4 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression9_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldExpression9_es6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -81,7 +81,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldStarExpression1_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldStarExpression1_es6/input.ts.json index dfb07be979ab..7101be462650 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldStarExpression1_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldStarExpression1_es6/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "yield", - "typeAnnotation": null, "optional": false }, "right": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldStarExpression4_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldStarExpression4_es6/input.ts.json index 021698436636..ffbdb8c863da 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldStarExpression4_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/YieldStarExpression4_es6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorInAmbientContext5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorInAmbientContext5/input.ts.json index 49373c3b398f..496140df8d1f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorInAmbientContext5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorInAmbientContext5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "generator", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorInAmbientContext6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorInAmbientContext6/input.ts.json index 53d0a5195e53..5548cb795452 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorInAmbientContext6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorInAmbientContext6/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "generator", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorNoImplicitReturns/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorNoImplicitReturns/input.ts.json index 6151107880e6..86fd08ca8e1e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorNoImplicitReturns/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorNoImplicitReturns/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "testGenerator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -72,7 +71,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -83,7 +81,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorOverloads4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorOverloads4/input.ts.json index d32b309a4a5b..c7e37614ccbf 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorOverloads4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorOverloads4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -79,8 +78,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -116,7 +114,6 @@ "ctxt": 0 }, "value": "Iterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -162,7 +159,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -183,6 +179,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -199,8 +196,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -236,7 +232,6 @@ "ctxt": 0 }, "value": "Iterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -282,7 +277,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -303,6 +297,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -319,8 +314,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -364,7 +358,6 @@ "ctxt": 0 }, "value": "Iterable", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorOverloads5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorOverloads5/input.ts.json index 6655cc4f418b..4fa4f7fc9842 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorOverloads5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorOverloads5/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -65,6 +63,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -81,8 +80,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -118,7 +116,6 @@ "ctxt": 0 }, "value": "Iterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -153,7 +150,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -174,6 +170,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -190,8 +187,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -227,7 +223,6 @@ "ctxt": 0 }, "value": "Iterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -262,7 +257,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -283,6 +277,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -299,8 +294,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -344,7 +338,6 @@ "ctxt": 0 }, "value": "Iterable", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck1/input.ts.json index 463dfec3b51b..b83ef633d2ea 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -61,7 +60,6 @@ "ctxt": 0 }, "value": "Iterator", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck10/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck10/input.ts.json index c8b1ccf4583b..ae48eebafc40 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck10/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck10/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck11/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck11/input.ts.json index ec02dd19474f..0ba67378334d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck11/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck11/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -79,7 +78,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck12/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck12/input.ts.json index fbe4a4361ea9..09d72b7078d2 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck12/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck12/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -84,7 +83,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck13/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck13/input.ts.json index f8281531f460..330840f38e89 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck13/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck13/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +109,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck14/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck14/input.ts.json index 3c375990db90..a31d3f4f4910 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck14/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck14/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck15/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck15/input.ts.json index fe8ebccb1984..c56aa85f8d53 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck15/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck15/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck16/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck16/input.ts.json index 6602583f75ab..687e3eb5dc8d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck16/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck16/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck17/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck17/input.ts.json index 877e55924487..7a02ac487a41 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck17/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck17/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -240,7 +234,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -276,7 +269,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -302,7 +294,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck18/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck18/input.ts.json index e58a32f849af..5a938064a2f8 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck18/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck18/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -230,7 +225,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -266,7 +260,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -292,7 +285,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck19/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck19/input.ts.json index 23f1ef4c0d0f..325eb40464e7 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck19/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck19/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -250,7 +244,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -289,7 +282,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -315,7 +307,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck2/input.ts.json index 5a64e7aaa317..06262f937908 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -61,7 +60,6 @@ "ctxt": 0 }, "value": "Iterable", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck20/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck20/input.ts.json index c8a798d19eff..bbc5a8c94e70 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck20/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck20/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -240,7 +235,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -279,7 +273,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -305,7 +298,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck21/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck21/input.ts.json index 2de47ac3a2ef..d8323c098846 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck21/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck21/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -240,7 +234,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -276,7 +269,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -302,7 +294,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck22/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck22/input.ts.json index 23b97328a7e8..ae25f9dd5989 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck22/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck22/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -248,7 +241,6 @@ "ctxt": 0 }, "value": "g3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -314,7 +306,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -352,7 +343,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -400,7 +390,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -451,7 +440,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck23/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck23/input.ts.json index cf7c4dbc7a21..864699125f2d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck23/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck23/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -248,7 +241,6 @@ "ctxt": 0 }, "value": "g3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -314,7 +306,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -352,7 +343,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -390,7 +380,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -438,7 +427,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -489,7 +477,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck24/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck24/input.ts.json index ed1fbcfdff44..681d41bcdfce 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck24/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck24/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -248,7 +241,6 @@ "ctxt": 0 }, "value": "g3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -324,7 +316,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -365,7 +356,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -403,7 +393,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -451,7 +440,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -502,7 +490,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck25/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck25/input.ts.json index ae89e45d2fe1..7e03e22c674b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck25/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck25/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -263,6 +256,7 @@ "ctxt": 0 }, "value": "g3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -301,7 +295,6 @@ "ctxt": 0 }, "value": "Iterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -327,7 +320,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -337,8 +329,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -405,7 +396,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -443,7 +433,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -491,7 +480,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -542,7 +530,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck26/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck26/input.ts.json index 7fcbbd859416..a33e16c3eec5 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck26/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck26/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -65,8 +64,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -84,7 +83,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -148,8 +145,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -167,7 +164,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -178,7 +174,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -217,8 +212,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -236,7 +231,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -247,7 +241,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -285,7 +278,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -312,6 +304,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -328,8 +321,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck27/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck27/input.ts.json index a31dfcf6bf42..23d3ca01c80d 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck27/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck27/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -104,8 +103,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -123,7 +122,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -134,7 +132,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -187,7 +184,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -214,6 +210,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -230,8 +227,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck28/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck28/input.ts.json index 64c13bc4d1cd..d4ec5b37d868 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck28/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck28/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -81,7 +80,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -143,8 +140,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -162,7 +159,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -173,7 +169,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -225,7 +220,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -252,6 +246,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -268,8 +263,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck29/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck29/input.ts.json index df5767bc0199..8b29c67074bc 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck29/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck29/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -104,8 +103,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -123,7 +122,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -134,7 +132,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -187,7 +184,6 @@ "ctxt": 0 }, "value": "Iterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -213,7 +209,6 @@ "ctxt": 0 }, "value": "Iterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -240,6 +235,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -256,8 +252,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck3/input.ts.json index 6c292828074c..469cfc7d665f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -61,7 +60,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck30/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck30/input.ts.json index df5767bc0199..8b29c67074bc 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck30/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck30/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -104,8 +103,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -123,7 +122,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -134,7 +132,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -187,7 +184,6 @@ "ctxt": 0 }, "value": "Iterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -213,7 +209,6 @@ "ctxt": 0 }, "value": "Iterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -240,6 +235,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -256,8 +252,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck31/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck31/input.ts.json index 0208b7da918a..36a79a626c12 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck31/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck31/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -104,8 +103,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -123,7 +122,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -134,7 +132,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -187,7 +184,6 @@ "ctxt": 0 }, "value": "Iterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -229,7 +225,6 @@ "ctxt": 0 }, "value": "Iterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -256,6 +251,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -272,8 +268,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck33/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck33/input.ts.json index 3a0e3dacb58b..334daaf94603 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck33/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck33/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck34/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck34/input.ts.json index d72ce2d79752..2a208cbf74b0 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck34/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck34/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck35/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck35/input.ts.json index 8b234fdbf6c5..bd012c423191 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck35/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck35/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck36/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck36/input.ts.json index 4e8ce9c8e5f1..ff7f69fa7097 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck36/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck36/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck37/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck37/input.ts.json index 454a5f5ca663..a9d5887a267b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck37/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck37/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck38/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck38/input.ts.json index 0251926d9bc1..d018cda6265e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck38/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck38/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "yield", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -119,6 +118,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -141,12 +141,10 @@ "ctxt": 0 }, "value": "yield", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck4/input.ts.json index 56d523e95986..81d1baf63e7a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck40/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck40/input.ts.json index cc0421b31cc4..bc4337c92940 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck40/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck40/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -45,7 +44,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck41/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck41/input.ts.json index f5473b5cf29a..26172924910c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck41/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck41/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck42/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck42/input.ts.json index c9404dd485a2..0e4f0257829f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck42/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck42/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck43/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck43/input.ts.json index 4cc1c2c06665..a2ec59077d5b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck43/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck43/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck44/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck44/input.ts.json index fa8b0981a490..a8b8fde44aa3 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck44/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck44/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck45/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck45/input.ts.json index 380f10081398..f472572172b0 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck45/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck45/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "fun", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -122,7 +121,6 @@ "ctxt": 0 }, "value": "Iterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -149,6 +147,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -171,13 +170,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -203,7 +200,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -215,8 +211,7 @@ } } } - }, - "optional": false + } } }, { @@ -235,6 +230,7 @@ "ctxt": 0 }, "value": "fun2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -258,6 +254,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -280,13 +277,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -312,15 +307,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -356,7 +349,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -377,7 +369,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -407,7 +398,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -436,7 +426,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -507,8 +496,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -526,7 +515,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -537,7 +525,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -576,8 +563,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -588,7 +575,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck46/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck46/input.ts.json index 1ef333639313..2c2574fb11ba 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck46/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck46/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "fun", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -122,7 +121,6 @@ "ctxt": 0 }, "value": "Iterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -149,6 +147,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -171,13 +170,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -203,7 +200,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -215,8 +211,7 @@ } } } - }, - "optional": false + } } }, { @@ -235,6 +230,7 @@ "ctxt": 0 }, "value": "fun2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -258,6 +254,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -280,13 +277,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -312,15 +307,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -356,7 +349,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -377,7 +369,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -407,7 +398,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -436,7 +426,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -523,7 +512,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -534,7 +522,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -585,8 +572,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -604,7 +591,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -615,7 +601,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -666,8 +651,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -678,7 +663,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck47/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck47/input.ts.json index 623705d611ad..62030d79fb07 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck47/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck47/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck48/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck48/input.ts.json index 0a33a57de8ea..45bd1abc673a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck48/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck48/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +69,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -111,7 +109,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "delegate": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck49/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck49/input.ts.json index 001af676ec02..c3a45d6177b9 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck49/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck49/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck5/input.ts.json index b8044379c06a..7643e5e19dff 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck50/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck50/input.ts.json index 5eca49c076b6..973b8944fabe 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck50/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck50/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck51/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck51/input.ts.json index 57d02c7872a7..5d0c0c1cd128 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck51/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck51/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -45,7 +44,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck52/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck52/input.ts.json index 8c508996b566..9816e33dffbf 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck52/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck52/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -212,7 +207,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -250,7 +244,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck53/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck53/input.ts.json index 8e5399d27494..0e91476f1070 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck53/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck53/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -212,7 +207,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -260,7 +254,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck54/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck54/input.ts.json index a707bfd03a0f..b2195fe64b57 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck54/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck54/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -222,7 +217,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -273,7 +267,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck55/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck55/input.ts.json index ba9a00bcd515..090a9612107c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck55/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck55/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ClassExpression", @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck56/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck56/input.ts.json index 89f3568e7ca7..298227158a05 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck56/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck56/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ClassExpression", @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck6/input.ts.json index 60dda466bf8d..883049b2b2e1 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck60/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck60/input.ts.json index f6150cf33968..f0a7a65285a0 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck60/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck60/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -45,7 +44,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck62/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck62/input.ts.json index 0343c51276e2..7c19d5595488 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck62/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck62/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "StrategicState", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "lastStrategyApplied", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -105,7 +103,6 @@ "ctxt": 0 }, "value": "strategy", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -126,6 +123,7 @@ "ctxt": 0 }, "value": "stratName", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -142,8 +140,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -162,6 +159,7 @@ "ctxt": 0 }, "value": "gen", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -185,6 +183,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -207,13 +206,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -239,7 +236,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -273,7 +269,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -294,8 +289,7 @@ } } } - }, - "optional": false + } } } ], @@ -340,8 +334,8 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -392,8 +386,8 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -415,7 +409,6 @@ "ctxt": 0 }, "value": "gen", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -429,7 +422,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false } } @@ -459,7 +451,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -500,7 +491,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "property": { @@ -511,7 +501,6 @@ "ctxt": 0 }, "value": "lastStrategyApplied", - "typeAnnotation": null, "optional": false }, "computed": false @@ -524,7 +513,6 @@ "ctxt": 0 }, "value": "stratName", - "typeAnnotation": null, "optional": false } } @@ -555,7 +543,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -599,7 +586,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -617,7 +603,6 @@ "ctxt": 0 }, "value": "StrategicState", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -649,6 +634,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -671,13 +657,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -703,7 +687,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -737,7 +720,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -783,7 +765,6 @@ "ctxt": 0 }, "value": "Strategy", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -810,7 +791,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -843,6 +823,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -865,13 +846,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -896,7 +875,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -930,7 +908,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -978,7 +955,6 @@ "ctxt": 0 }, "value": "State", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -999,7 +975,6 @@ "ctxt": 0 }, "value": "StrategicState", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1029,7 +1004,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1091,6 +1065,7 @@ "ctxt": 0 }, "value": "Nothing1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1113,7 +1088,6 @@ "ctxt": 0 }, "value": "Strategy", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1139,7 +1113,6 @@ "ctxt": 0 }, "value": "State", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1147,8 +1120,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1165,7 +1137,6 @@ "ctxt": 0 }, "value": "strategy", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1208,6 +1179,7 @@ "ctxt": 0 }, "value": "state", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1230,13 +1202,11 @@ "ctxt": 0 }, "value": "State", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1269,7 +1239,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false } } @@ -1321,6 +1290,7 @@ "ctxt": 0 }, "value": "Nothing2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1343,7 +1313,6 @@ "ctxt": 0 }, "value": "Strategy", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1369,7 +1338,6 @@ "ctxt": 0 }, "value": "State", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1377,8 +1345,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1395,7 +1362,6 @@ "ctxt": 0 }, "value": "strategy", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1438,6 +1404,7 @@ "ctxt": 0 }, "value": "state", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1460,13 +1427,11 @@ "ctxt": 0 }, "value": "State", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1506,7 +1471,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -1560,6 +1524,7 @@ "ctxt": 0 }, "value": "Nothing3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1582,7 +1547,6 @@ "ctxt": 0 }, "value": "Strategy", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1608,7 +1572,6 @@ "ctxt": 0 }, "value": "State", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1616,8 +1579,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1634,7 +1596,6 @@ "ctxt": 0 }, "value": "strategy", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1677,6 +1638,7 @@ "ctxt": 0 }, "value": "state", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1699,13 +1661,11 @@ "ctxt": 0 }, "value": "State", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1756,7 +1716,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck63/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck63/input.ts.json index 873e5029f59c..00f7e02ca75b 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck63/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck63/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "StrategicState", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "lastStrategyApplied", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -105,7 +103,6 @@ "ctxt": 0 }, "value": "strategy", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -126,6 +123,7 @@ "ctxt": 0 }, "value": "stratName", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -142,8 +140,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -162,6 +159,7 @@ "ctxt": 0 }, "value": "gen", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -185,6 +183,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -207,13 +206,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -239,7 +236,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -273,7 +269,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -294,8 +289,7 @@ } } } - }, - "optional": false + } } } ], @@ -340,8 +334,8 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -392,8 +386,8 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -415,7 +409,6 @@ "ctxt": 0 }, "value": "gen", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -429,7 +422,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false } } @@ -459,7 +451,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -500,7 +491,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "property": { @@ -511,7 +501,6 @@ "ctxt": 0 }, "value": "lastStrategyApplied", - "typeAnnotation": null, "optional": false }, "computed": false @@ -524,7 +513,6 @@ "ctxt": 0 }, "value": "stratName", - "typeAnnotation": null, "optional": false } } @@ -555,7 +543,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -599,7 +586,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -617,7 +603,6 @@ "ctxt": 0 }, "value": "StrategicState", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -649,6 +634,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -671,13 +657,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -703,7 +687,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -737,7 +720,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -783,7 +765,6 @@ "ctxt": 0 }, "value": "Strategy", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -810,7 +791,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -843,6 +823,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -865,13 +846,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -896,7 +875,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -930,7 +908,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -978,7 +955,6 @@ "ctxt": 0 }, "value": "State", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -999,7 +975,6 @@ "ctxt": 0 }, "value": "StrategicState", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1029,7 +1004,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1091,6 +1065,7 @@ "ctxt": 0 }, "value": "Nothing", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1113,7 +1088,6 @@ "ctxt": 0 }, "value": "Strategy", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1139,7 +1113,6 @@ "ctxt": 0 }, "value": "State", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1147,8 +1120,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1165,7 +1137,6 @@ "ctxt": 0 }, "value": "strategy", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1208,6 +1179,7 @@ "ctxt": 0 }, "value": "state", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1230,13 +1202,11 @@ "ctxt": 0 }, "value": "State", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1295,7 +1265,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false } } @@ -1347,6 +1316,7 @@ "ctxt": 0 }, "value": "Nothing1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1369,7 +1339,6 @@ "ctxt": 0 }, "value": "Strategy", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1395,7 +1364,6 @@ "ctxt": 0 }, "value": "State", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1403,8 +1371,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1421,7 +1388,6 @@ "ctxt": 0 }, "value": "strategy", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1464,6 +1430,7 @@ "ctxt": 0 }, "value": "state", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1486,13 +1453,11 @@ "ctxt": 0 }, "value": "State", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1557,6 +1522,7 @@ "ctxt": 0 }, "value": "Nothing2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1579,7 +1545,6 @@ "ctxt": 0 }, "value": "Strategy", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1605,7 +1570,6 @@ "ctxt": 0 }, "value": "State", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1613,8 +1577,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1631,7 +1594,6 @@ "ctxt": 0 }, "value": "strategy", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1674,6 +1636,7 @@ "ctxt": 0 }, "value": "state", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1696,13 +1659,11 @@ "ctxt": 0 }, "value": "State", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1785,6 +1746,7 @@ "ctxt": 0 }, "value": "Nothing3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1807,7 +1769,6 @@ "ctxt": 0 }, "value": "Strategy", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1833,7 +1794,6 @@ "ctxt": 0 }, "value": "State", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1841,8 +1801,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1859,7 +1818,6 @@ "ctxt": 0 }, "value": "strategy", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1902,6 +1860,7 @@ "ctxt": 0 }, "value": "state", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1924,13 +1883,11 @@ "ctxt": 0 }, "value": "State", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1970,7 +1927,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "delegate": false diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck7/input.ts.json index 7b8cfbe144c2..483b3ebe4f43 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck7/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "WeirdIter", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "hello", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -129,7 +126,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -174,7 +170,6 @@ "ctxt": 0 }, "value": "WeirdIter", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck8/input.ts.json index 20aff390cc89..62ebf4a72164 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck8/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "BadGenerator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "Iterator", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "Iterable", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -124,7 +121,6 @@ "ctxt": 0 }, "value": "g3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "BadGenerator", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck9/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck9/input.ts.json index 462da263db6d..29479f16b87e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck9/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/generatorTypeCheck9/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g3", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/yieldExpressionInControlFlow/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/yieldExpressionInControlFlow/input.ts.json index d4a2cd82b86e..152620e97719 100644 --- a/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/yieldExpressionInControlFlow/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es6/yieldExpressions/yieldExpressionInControlFlow/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -115,8 +114,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "YieldExpression", @@ -133,7 +132,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -160,7 +158,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -204,8 +201,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -267,8 +264,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "YieldExpression", @@ -285,7 +282,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "delegate": true diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/compoundExponentiationAssignmentLHSCanBeAssigned1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/compoundExponentiationAssignmentLHSCanBeAssigned1/input.ts.json index 19afe11bcc8e..67223e726840 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/compoundExponentiationAssignmentLHSCanBeAssigned1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/compoundExponentiationAssignmentLHSCanBeAssigned1/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -82,7 +79,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "init": null @@ -114,6 +110,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -130,8 +127,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -163,6 +159,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -179,8 +176,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -212,6 +208,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -234,13 +231,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -272,6 +267,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -288,8 +284,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -319,8 +314,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -330,7 +325,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -358,8 +352,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -369,7 +363,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -397,8 +390,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -408,7 +401,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -436,8 +428,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -472,8 +464,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -483,7 +475,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -513,6 +504,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -529,8 +521,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -560,8 +551,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -571,7 +562,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -599,8 +589,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -610,7 +600,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -638,8 +627,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -649,7 +638,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -677,8 +665,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -713,8 +701,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -724,7 +712,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -754,6 +741,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -776,13 +764,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -812,8 +798,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -823,7 +809,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -851,8 +836,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -862,7 +847,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -890,8 +874,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -901,7 +885,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -929,8 +912,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -965,8 +948,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -976,7 +959,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/compoundExponentiationAssignmentLHSCannotBeAssigned/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/compoundExponentiationAssignmentLHSCannotBeAssigned/input.ts.json index 9ebcf8bdf6c4..5a7e4a34c7da 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/compoundExponentiationAssignmentLHSCannotBeAssigned/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/compoundExponentiationAssignmentLHSCannotBeAssigned/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -94,6 +91,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -110,8 +108,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,6 +140,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -159,8 +157,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -192,6 +189,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -208,8 +206,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -239,8 +236,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -250,7 +247,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -278,8 +274,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -289,7 +285,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -317,8 +312,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -354,8 +349,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -391,8 +386,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -433,8 +428,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -451,7 +446,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -462,7 +456,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -492,8 +485,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -529,8 +522,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -565,8 +558,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -576,7 +569,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -606,6 +598,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -622,8 +615,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -653,8 +645,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -664,7 +656,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -692,8 +683,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -703,7 +694,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -731,8 +721,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -768,8 +758,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -805,8 +795,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -847,8 +837,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -865,7 +855,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -876,7 +865,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -906,8 +894,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -943,8 +931,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -979,8 +967,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -990,7 +978,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1020,6 +1007,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1036,8 +1024,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1067,8 +1054,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1078,7 +1065,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1106,8 +1092,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1117,7 +1103,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1145,8 +1130,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -1182,8 +1167,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1219,8 +1204,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -1261,8 +1246,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1279,7 +1264,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1290,7 +1274,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1320,8 +1303,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1357,8 +1340,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -1393,8 +1376,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1404,7 +1387,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1434,6 +1416,7 @@ "ctxt": 0 }, "value": "x4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1450,8 +1433,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1481,8 +1463,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1492,7 +1474,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1520,8 +1501,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1531,7 +1512,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1559,8 +1539,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -1596,8 +1576,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1633,8 +1613,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -1675,8 +1655,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1693,7 +1673,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1704,7 +1683,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1734,8 +1712,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1771,8 +1749,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -1807,8 +1785,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1818,7 +1796,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1848,6 +1825,7 @@ "ctxt": 0 }, "value": "x5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1864,8 +1842,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1895,8 +1872,8 @@ "ctxt": 0 }, "value": "x5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1906,7 +1883,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1934,8 +1910,8 @@ "ctxt": 0 }, "value": "x5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -1971,8 +1947,8 @@ "ctxt": 0 }, "value": "x5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -2013,8 +1989,8 @@ "ctxt": 0 }, "value": "x5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -2052,6 +2028,7 @@ "ctxt": 0 }, "value": "x6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2074,13 +2051,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2110,8 +2085,8 @@ "ctxt": 0 }, "value": "x6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2121,7 +2096,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2149,8 +2123,8 @@ "ctxt": 0 }, "value": "x6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -2186,8 +2160,8 @@ "ctxt": 0 }, "value": "x6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -2228,8 +2202,8 @@ "ctxt": 0 }, "value": "x6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/compoundExponentiationAssignmentLHSIsReference/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/compoundExponentiationAssignmentLHSIsReference/input.ts.json index 381de260eac9..e3189fbb80a2 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/compoundExponentiationAssignmentLHSIsReference/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/compoundExponentiationAssignmentLHSIsReference/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -127,8 +127,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -138,7 +138,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -153,7 +152,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -174,6 +172,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -190,8 +189,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -232,8 +230,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -243,7 +241,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -280,6 +277,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -311,7 +309,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -339,8 +336,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -377,7 +373,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, "property": { @@ -388,7 +383,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -401,7 +395,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -436,7 +429,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, "property": { @@ -463,7 +455,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -498,7 +489,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false } }, @@ -510,7 +500,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -525,7 +514,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -546,6 +534,7 @@ "ctxt": 0 }, "value": "x4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -562,8 +551,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -611,7 +599,6 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, "optional": false } }, @@ -623,7 +610,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -672,7 +658,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, "property": { @@ -683,7 +668,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -697,7 +681,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -739,7 +722,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, "property": { @@ -767,7 +749,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitCompoundExponentiationAssignmentWithIndexingOnLHS1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitCompoundExponentiationAssignmentWithIndexingOnLHS1/input.ts.json index f9f84496787c..adb3ad155f8c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitCompoundExponentiationAssignmentWithIndexingOnLHS1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitCompoundExponentiationAssignmentWithIndexingOnLHS1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "array0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -109,8 +109,8 @@ "ctxt": 0 }, "value": "i0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -155,7 +155,6 @@ "ctxt": 0 }, "value": "array0", - "typeAnnotation": null, "optional": false }, "property": { @@ -175,7 +174,6 @@ "ctxt": 0 }, "value": "i0", - "typeAnnotation": null, "optional": false } }, @@ -217,8 +215,8 @@ "ctxt": 0 }, "value": "array1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -295,8 +293,8 @@ "ctxt": 0 }, "value": "i1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -341,7 +339,6 @@ "ctxt": 0 }, "value": "array1", - "typeAnnotation": null, "optional": false }, "property": { @@ -361,7 +358,6 @@ "ctxt": 0 }, "value": "i1", - "typeAnnotation": null, "optional": false } }, @@ -390,7 +386,6 @@ "ctxt": 0 }, "value": "array1", - "typeAnnotation": null, "optional": false }, "property": { @@ -410,7 +405,6 @@ "ctxt": 0 }, "value": "i1", - "typeAnnotation": null, "optional": false } }, @@ -453,8 +447,8 @@ "ctxt": 0 }, "value": "array2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -531,8 +525,8 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -577,7 +571,6 @@ "ctxt": 0 }, "value": "array2", - "typeAnnotation": null, "optional": false }, "property": { @@ -597,7 +590,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false } }, @@ -626,7 +618,6 @@ "ctxt": 0 }, "value": "array2", - "typeAnnotation": null, "optional": false }, "property": { @@ -646,7 +637,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false } }, @@ -689,8 +679,8 @@ "ctxt": 0 }, "value": "array3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -767,8 +757,8 @@ "ctxt": 0 }, "value": "j0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -796,8 +786,8 @@ "ctxt": 0 }, "value": "j1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -842,7 +832,6 @@ "ctxt": 0 }, "value": "array3", - "typeAnnotation": null, "optional": false }, "property": { @@ -862,7 +851,6 @@ "ctxt": 0 }, "value": "j0", - "typeAnnotation": null, "optional": false } }, @@ -891,7 +879,6 @@ "ctxt": 0 }, "value": "array3", - "typeAnnotation": null, "optional": false }, "property": { @@ -911,7 +898,6 @@ "ctxt": 0 }, "value": "j1", - "typeAnnotation": null, "optional": false } }, @@ -940,7 +926,6 @@ "ctxt": 0 }, "value": "array3", - "typeAnnotation": null, "optional": false }, "property": { @@ -960,7 +945,6 @@ "ctxt": 0 }, "value": "j0", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitCompoundExponentiationAssignmentWithIndexingOnLHS2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitCompoundExponentiationAssignmentWithIndexingOnLHS2/input.ts.json index 84cfef6d927c..feabf8b67450 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitCompoundExponentiationAssignmentWithIndexingOnLHS2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitCompoundExponentiationAssignmentWithIndexingOnLHS2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "globalCounter", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -57,7 +57,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -99,8 +98,8 @@ "ctxt": 0 }, "value": "globalCounter", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -196,7 +195,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -235,7 +233,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -279,8 +276,8 @@ "ctxt": 0 }, "value": "result_foo1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AssignmentExpression", @@ -312,7 +309,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -351,7 +347,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -410,7 +405,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -457,7 +451,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -511,8 +504,8 @@ "ctxt": 0 }, "value": "result_foo2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AssignmentExpression", @@ -544,7 +537,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -591,7 +583,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -660,7 +651,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -707,7 +697,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -761,8 +750,8 @@ "ctxt": 0 }, "value": "result_foo3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AssignmentExpression", @@ -794,7 +783,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -841,7 +829,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitCompoundExponentiationAssignmentWithIndexingOnLHS4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitCompoundExponentiationAssignmentWithIndexingOnLHS4/input.ts.json index 7926d0de7875..53dcf737da77 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitCompoundExponentiationAssignmentWithIndexingOnLHS4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitCompoundExponentiationAssignmentWithIndexingOnLHS4/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "globalCounter", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -57,7 +57,6 @@ "ctxt": 0 }, "value": "incrementIdx", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -78,6 +77,7 @@ "ctxt": 0 }, "value": "max", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -94,8 +94,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -136,8 +135,8 @@ "ctxt": 0 }, "value": "globalCounter", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -175,8 +174,8 @@ "ctxt": 0 }, "value": "idx", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -200,7 +199,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -211,7 +209,6 @@ "ctxt": 0 }, "value": "floor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -249,7 +246,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -260,7 +256,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -276,7 +271,6 @@ "ctxt": 0 }, "value": "max", - "typeAnnotation": null, "optional": false } } @@ -303,7 +297,6 @@ "ctxt": 0 }, "value": "idx", - "typeAnnotation": null, "optional": false } } @@ -339,8 +332,8 @@ "ctxt": 0 }, "value": "array1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -446,7 +439,6 @@ "ctxt": 0 }, "value": "array1", - "typeAnnotation": null, "optional": false }, "property": { @@ -464,7 +456,6 @@ "ctxt": 0 }, "value": "incrementIdx", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -485,7 +476,6 @@ "ctxt": 0 }, "value": "array1", - "typeAnnotation": null, "optional": false }, "property": { @@ -496,7 +486,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -548,7 +537,6 @@ "ctxt": 0 }, "value": "array1", - "typeAnnotation": null, "optional": false }, "property": { @@ -566,7 +554,6 @@ "ctxt": 0 }, "value": "incrementIdx", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -587,7 +574,6 @@ "ctxt": 0 }, "value": "array1", - "typeAnnotation": null, "optional": false }, "property": { @@ -598,7 +584,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -632,7 +617,6 @@ "ctxt": 0 }, "value": "array1", - "typeAnnotation": null, "optional": false }, "property": { @@ -650,7 +634,6 @@ "ctxt": 0 }, "value": "incrementIdx", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -671,7 +654,6 @@ "ctxt": 0 }, "value": "array1", - "typeAnnotation": null, "optional": false }, "property": { @@ -682,7 +664,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -735,7 +716,6 @@ "ctxt": 0 }, "value": "array1", - "typeAnnotation": null, "optional": false }, "property": { @@ -753,7 +733,6 @@ "ctxt": 0 }, "value": "incrementIdx", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -774,7 +753,6 @@ "ctxt": 0 }, "value": "array1", - "typeAnnotation": null, "optional": false }, "property": { @@ -785,7 +763,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -819,7 +796,6 @@ "ctxt": 0 }, "value": "array1", - "typeAnnotation": null, "optional": false }, "property": { @@ -837,7 +813,6 @@ "ctxt": 0 }, "value": "incrementIdx", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -858,7 +833,6 @@ "ctxt": 0 }, "value": "array1", - "typeAnnotation": null, "optional": false }, "property": { @@ -869,7 +843,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitCompoundExponentiationAssignmentWithPropertyAccessingOnLHS1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitCompoundExponentiationAssignmentWithPropertyAccessingOnLHS1/input.ts.json index aa29f4933920..2c6fbe74691c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitCompoundExponentiationAssignmentWithPropertyAccessingOnLHS1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitCompoundExponentiationAssignmentWithPropertyAccessingOnLHS1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "globalCounter", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -57,7 +57,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -99,8 +98,8 @@ "ctxt": 0 }, "value": "globalCounter", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -138,7 +137,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": { @@ -198,7 +196,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -212,7 +209,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -253,8 +249,8 @@ "ctxt": 0 }, "value": "result0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AssignmentExpression", @@ -286,7 +282,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -300,7 +295,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -356,7 +350,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -370,7 +363,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -405,7 +397,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -419,7 +410,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -461,8 +451,8 @@ "ctxt": 0 }, "value": "result1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AssignmentExpression", @@ -494,7 +484,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -508,7 +497,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -543,7 +531,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -557,7 +544,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -614,7 +600,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -628,7 +613,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -663,7 +647,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -677,7 +660,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -719,8 +701,8 @@ "ctxt": 0 }, "value": "result2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AssignmentExpression", @@ -752,7 +734,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -766,7 +747,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -801,7 +781,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -815,7 +794,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitCompoundExponentiationOperator1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitCompoundExponentiationOperator1/input.ts.json index 92e80dec1a22..3dd73be8f687 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitCompoundExponentiationOperator1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitCompoundExponentiationOperator1/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "comp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -78,8 +78,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -115,8 +115,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -134,7 +134,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false }, "right": { @@ -145,7 +144,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false } } @@ -174,8 +172,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -193,7 +191,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false }, "right": { @@ -212,7 +209,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false }, "right": { @@ -251,8 +247,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -278,7 +274,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false }, "right": { @@ -289,7 +284,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false } }, @@ -328,8 +322,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -355,7 +349,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false }, "right": { @@ -366,7 +359,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false } }, @@ -405,8 +397,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -432,7 +424,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false }, "right": { @@ -443,7 +434,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false } }, @@ -482,8 +472,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -509,7 +499,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false }, "right": { @@ -520,7 +509,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false } }, @@ -559,8 +547,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -586,7 +574,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false }, "right": { @@ -597,7 +584,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false } }, @@ -636,8 +622,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -670,7 +656,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false }, "right": { @@ -719,8 +704,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -753,7 +738,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false }, "right": { @@ -802,8 +786,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -836,7 +820,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false }, "right": { @@ -885,8 +868,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -919,7 +902,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false }, "right": { @@ -968,8 +950,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1002,7 +984,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false }, "right": { @@ -1051,8 +1032,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1070,7 +1051,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false }, "right": { @@ -1134,8 +1114,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1153,7 +1133,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false }, "right": { @@ -1217,8 +1196,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1236,7 +1215,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false }, "right": { @@ -1300,8 +1278,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1319,7 +1297,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false }, "right": { @@ -1383,8 +1360,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1402,7 +1379,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false }, "right": { diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitCompoundExponentiationOperator2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitCompoundExponentiationOperator2/input.ts.json index 10a0c1361126..31c64c6b3961 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitCompoundExponentiationOperator2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitCompoundExponentiationOperator2/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "comp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -78,8 +78,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -115,8 +115,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -134,8 +134,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -172,8 +172,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -191,8 +191,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -247,8 +247,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -266,8 +266,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -322,8 +322,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -341,8 +341,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -397,8 +397,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -416,8 +416,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -472,8 +472,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -491,8 +491,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -555,8 +555,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -574,8 +574,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -638,8 +638,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -657,8 +657,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -721,8 +721,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -740,8 +740,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -804,8 +804,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -823,8 +823,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -897,8 +897,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -916,8 +916,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -990,8 +990,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -1009,8 +1009,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1083,8 +1083,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -1102,8 +1102,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1176,8 +1176,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -1195,8 +1195,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1277,8 +1277,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -1296,8 +1296,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1378,8 +1378,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -1397,8 +1397,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1479,8 +1479,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -1498,8 +1498,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperator2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperator2/input.ts.json index d5943ab80857..043c6702317a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperator2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperator2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -79,7 +79,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -126,7 +125,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -173,7 +171,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -220,7 +217,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -267,7 +263,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -287,7 +282,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false }, "right": { @@ -334,7 +328,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -354,7 +347,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false }, "right": { @@ -401,7 +393,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -421,7 +412,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false }, "right": { @@ -468,7 +458,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -488,7 +477,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false }, "right": { @@ -535,7 +523,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -555,7 +542,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false }, "right": { @@ -602,7 +588,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -649,7 +634,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -696,7 +680,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -716,7 +699,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -754,7 +736,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -774,7 +755,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -812,7 +792,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -832,7 +811,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false }, "right": { @@ -879,7 +857,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -899,7 +876,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false }, "right": { @@ -946,7 +922,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -966,7 +941,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false }, "right": { @@ -1013,7 +987,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -1033,7 +1006,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false }, "right": { @@ -1080,7 +1052,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -1100,7 +1071,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false }, "right": { @@ -1147,7 +1117,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -1212,7 +1181,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -1277,7 +1245,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -1342,7 +1309,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -1407,7 +1373,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -1472,7 +1437,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -1537,7 +1501,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -1602,7 +1565,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -1667,7 +1629,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -1741,7 +1702,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1788,7 +1748,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1835,7 +1794,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1882,7 +1840,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1937,7 +1894,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -2002,7 +1958,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -2067,7 +2022,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -2132,7 +2086,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -2197,7 +2150,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -2262,7 +2214,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -2327,7 +2278,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -2392,7 +2342,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -2457,7 +2406,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -2522,7 +2470,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -2587,7 +2534,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -2652,7 +2598,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -2717,7 +2662,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -2782,7 +2726,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperator3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperator3/input.ts.json index 6653f7933cd3..e05670ee8387 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperator3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperator3/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -94,7 +94,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -158,7 +157,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -222,7 +220,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -286,7 +283,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -374,7 +370,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -464,7 +459,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -554,7 +548,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -644,7 +637,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -721,7 +713,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -785,7 +776,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -849,7 +839,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -913,7 +902,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -977,7 +965,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1041,7 +1028,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1105,7 +1091,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1169,7 +1154,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1241,7 +1225,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -1323,7 +1306,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -1405,7 +1387,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -1487,7 +1468,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -1569,7 +1549,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -1651,7 +1630,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -1733,7 +1711,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -1815,7 +1792,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -1880,7 +1856,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1936,7 +1911,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1992,7 +1966,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -2048,7 +2021,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -2119,7 +2091,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -2201,7 +2172,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -2283,7 +2253,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -2365,7 +2334,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -2447,7 +2415,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -2529,7 +2496,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperator4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperator4/input.ts.json index cc4900a1af05..9bc2049f5b7a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperator4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperator4/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "temp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -92,7 +92,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -163,7 +162,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -235,7 +233,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -307,7 +304,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -379,7 +375,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -468,7 +463,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -558,7 +552,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -648,7 +641,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -738,7 +730,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -812,7 +803,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -876,7 +866,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -992,7 +981,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1056,7 +1044,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1137,7 +1124,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1219,7 +1205,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1371,7 +1356,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1453,7 +1437,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1518,7 +1501,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1582,7 +1564,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1698,7 +1679,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1762,7 +1742,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1843,7 +1822,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1925,7 +1903,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -2077,7 +2054,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -2159,7 +2135,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTempalteString4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTempalteString4/input.ts.json index d358c0c8bbb7..71969c0f0c75 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTempalteString4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTempalteString4/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -113,8 +113,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -152,7 +152,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -171,7 +170,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -309,7 +307,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -322,7 +319,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -334,7 +330,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -480,7 +475,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -494,7 +488,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -506,7 +499,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -652,7 +644,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -666,7 +657,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -678,7 +668,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -807,7 +796,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -828,7 +816,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -848,7 +835,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -979,7 +965,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -998,7 +983,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1009,7 +993,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1126,7 +1109,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1145,7 +1127,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1166,7 +1147,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1185,7 +1165,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1360,7 +1339,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1373,7 +1351,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -1385,7 +1362,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -1428,7 +1404,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1441,7 +1416,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -1453,7 +1427,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1636,7 +1609,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1650,7 +1622,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -1662,7 +1633,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -1682,7 +1652,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1725,7 +1694,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1747,7 +1715,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1932,7 +1899,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1946,7 +1912,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -1958,7 +1923,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -1978,7 +1942,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2021,7 +1984,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2043,7 +2005,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2211,7 +2172,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2232,7 +2192,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2252,7 +2211,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2289,7 +2247,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2310,7 +2267,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2330,7 +2286,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2498,7 +2453,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2517,7 +2471,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2528,7 +2481,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2566,7 +2518,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2585,7 +2536,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2596,7 +2546,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2773,7 +2722,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2786,7 +2734,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -2798,7 +2745,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2944,7 +2890,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2958,7 +2903,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -2970,7 +2914,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3116,7 +3059,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3130,7 +3072,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -3142,7 +3083,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3271,7 +3211,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3292,7 +3231,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3312,7 +3250,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3443,7 +3380,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3462,7 +3398,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3473,7 +3408,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTempalteString4ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTempalteString4ES6/input.ts.json index d358c0c8bbb7..71969c0f0c75 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTempalteString4ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTempalteString4ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -113,8 +113,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -152,7 +152,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -171,7 +170,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -309,7 +307,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -322,7 +319,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -334,7 +330,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -480,7 +475,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -494,7 +488,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -506,7 +499,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -652,7 +644,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -666,7 +657,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -678,7 +668,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -807,7 +796,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -828,7 +816,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -848,7 +835,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -979,7 +965,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -998,7 +983,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1009,7 +993,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1126,7 +1109,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1145,7 +1127,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1166,7 +1147,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1185,7 +1165,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1360,7 +1339,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1373,7 +1351,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -1385,7 +1362,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -1428,7 +1404,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1441,7 +1416,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -1453,7 +1427,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1636,7 +1609,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1650,7 +1622,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -1662,7 +1633,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -1682,7 +1652,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1725,7 +1694,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1747,7 +1715,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1932,7 +1899,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1946,7 +1912,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -1958,7 +1923,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -1978,7 +1942,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2021,7 +1984,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2043,7 +2005,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2211,7 +2172,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2232,7 +2192,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2252,7 +2211,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2289,7 +2247,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2310,7 +2267,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2330,7 +2286,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2498,7 +2453,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2517,7 +2471,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2528,7 +2481,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2566,7 +2518,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2585,7 +2536,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2596,7 +2546,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2773,7 +2722,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2786,7 +2734,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -2798,7 +2745,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2944,7 +2890,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2958,7 +2903,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -2970,7 +2914,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3116,7 +3059,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3130,7 +3072,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -3142,7 +3083,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3271,7 +3211,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3292,7 +3231,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3312,7 +3250,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3443,7 +3380,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3462,7 +3398,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3473,7 +3408,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTemplateString1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTemplateString1/input.ts.json index 3b170e6e9767..902e77ae3932 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTemplateString1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTemplateString1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -113,8 +113,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -152,7 +152,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -163,7 +162,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -277,7 +275,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -296,7 +293,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -307,7 +303,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -422,7 +417,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -441,7 +435,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -452,7 +445,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -575,7 +567,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -586,7 +577,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -598,7 +588,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -720,7 +709,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -739,7 +727,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -750,7 +737,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -763,7 +749,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -892,7 +877,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -911,7 +895,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -922,7 +905,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1071,7 +1053,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1090,7 +1071,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1101,7 +1081,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1219,7 +1198,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1230,7 +1208,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -1250,7 +1227,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1261,7 +1237,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1412,7 +1387,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1431,7 +1405,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1442,7 +1415,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1463,7 +1435,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1482,7 +1453,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1493,7 +1463,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1645,7 +1614,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1664,7 +1632,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1675,7 +1642,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1696,7 +1662,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1715,7 +1680,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1726,7 +1690,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1886,7 +1849,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1897,7 +1859,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -1909,7 +1870,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -1937,7 +1897,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1948,7 +1907,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -1960,7 +1918,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2119,7 +2076,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2138,7 +2094,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2149,7 +2104,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -2162,7 +2116,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -2190,7 +2143,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2209,7 +2161,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2220,7 +2171,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -2233,7 +2183,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2399,7 +2348,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2418,7 +2366,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2429,7 +2376,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2467,7 +2413,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2486,7 +2431,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2497,7 +2441,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2651,7 +2594,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2662,7 +2604,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -2682,7 +2623,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2693,7 +2633,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -2844,7 +2783,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2863,7 +2801,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2874,7 +2811,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2895,7 +2831,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2914,7 +2849,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2925,7 +2859,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3077,7 +3010,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3096,7 +3028,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3107,7 +3038,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3128,7 +3058,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3147,7 +3076,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3158,7 +3086,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3318,7 +3245,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3329,7 +3255,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -3341,7 +3266,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -3369,7 +3293,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3380,7 +3303,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -3392,7 +3314,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3551,7 +3472,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3570,7 +3490,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3581,7 +3500,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -3594,7 +3512,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -3622,7 +3539,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3641,7 +3557,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3652,7 +3567,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -3665,7 +3579,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3831,7 +3744,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3850,7 +3762,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3861,7 +3772,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3899,7 +3809,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3918,7 +3827,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3929,7 +3837,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTemplateString1ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTemplateString1ES6/input.ts.json index 3b170e6e9767..902e77ae3932 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTemplateString1ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTemplateString1ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -113,8 +113,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -152,7 +152,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -163,7 +162,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -277,7 +275,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -296,7 +293,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -307,7 +303,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -422,7 +417,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -441,7 +435,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -452,7 +445,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -575,7 +567,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -586,7 +577,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -598,7 +588,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -720,7 +709,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -739,7 +727,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -750,7 +737,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -763,7 +749,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -892,7 +877,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -911,7 +895,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -922,7 +905,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1071,7 +1053,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1090,7 +1071,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1101,7 +1081,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1219,7 +1198,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1230,7 +1208,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -1250,7 +1227,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1261,7 +1237,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1412,7 +1387,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1431,7 +1405,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1442,7 +1415,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1463,7 +1435,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1482,7 +1453,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1493,7 +1463,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1645,7 +1614,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1664,7 +1632,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1675,7 +1642,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1696,7 +1662,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1715,7 +1680,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1726,7 +1690,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1886,7 +1849,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1897,7 +1859,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -1909,7 +1870,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -1937,7 +1897,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1948,7 +1907,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -1960,7 +1918,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2119,7 +2076,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2138,7 +2094,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2149,7 +2104,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -2162,7 +2116,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -2190,7 +2143,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2209,7 +2161,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2220,7 +2171,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -2233,7 +2183,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2399,7 +2348,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2418,7 +2366,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2429,7 +2376,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2467,7 +2413,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2486,7 +2431,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2497,7 +2441,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2651,7 +2594,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2662,7 +2604,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -2682,7 +2623,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2693,7 +2633,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -2844,7 +2783,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2863,7 +2801,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2874,7 +2811,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2895,7 +2831,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2914,7 +2849,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2925,7 +2859,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3077,7 +3010,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3096,7 +3028,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3107,7 +3038,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3128,7 +3058,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3147,7 +3076,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3158,7 +3086,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3318,7 +3245,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3329,7 +3255,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -3341,7 +3266,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -3369,7 +3293,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3380,7 +3303,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -3392,7 +3314,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3551,7 +3472,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3570,7 +3490,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3581,7 +3500,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -3594,7 +3512,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -3622,7 +3539,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3641,7 +3557,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3652,7 +3567,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -3665,7 +3579,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3831,7 +3744,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3850,7 +3762,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3861,7 +3772,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3899,7 +3809,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3918,7 +3827,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3929,7 +3837,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTemplateString2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTemplateString2/input.ts.json index 94e55eef3c9b..9ba0ed17edb1 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTemplateString2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTemplateString2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -113,8 +113,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -152,7 +152,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -163,7 +162,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -277,7 +275,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -296,7 +293,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -307,7 +303,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -422,7 +417,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -441,7 +435,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -452,7 +445,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -575,7 +567,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -586,7 +577,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -598,7 +588,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -720,7 +709,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -739,7 +727,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -750,7 +737,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -763,7 +749,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -892,7 +877,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -911,7 +895,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -922,7 +905,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1071,7 +1053,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1090,7 +1071,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1101,7 +1081,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1219,7 +1198,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1230,7 +1208,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -1250,7 +1227,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1261,7 +1237,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1412,7 +1387,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1431,7 +1405,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1442,7 +1415,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1463,7 +1435,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1482,7 +1453,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1493,7 +1463,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1645,7 +1614,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1664,7 +1632,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1675,7 +1642,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1696,7 +1662,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1715,7 +1680,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1726,7 +1690,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1886,7 +1849,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1897,7 +1859,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -1909,7 +1870,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -1937,7 +1897,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1948,7 +1907,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -1960,7 +1918,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2119,7 +2076,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2138,7 +2094,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2149,7 +2104,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -2162,7 +2116,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -2190,7 +2143,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2209,7 +2161,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2220,7 +2171,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -2233,7 +2183,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2399,7 +2348,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2418,7 +2366,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2429,7 +2376,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2467,7 +2413,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2486,7 +2431,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2497,7 +2441,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2651,7 +2594,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2662,7 +2604,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -2682,7 +2623,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2693,7 +2633,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -2844,7 +2783,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2863,7 +2801,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2874,7 +2811,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2895,7 +2831,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2914,7 +2849,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2925,7 +2859,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3077,7 +3010,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3096,7 +3028,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3107,7 +3038,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3128,7 +3058,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3147,7 +3076,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3158,7 +3086,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3318,7 +3245,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3329,7 +3255,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -3341,7 +3266,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -3369,7 +3293,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3380,7 +3303,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -3392,7 +3314,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3551,7 +3472,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3570,7 +3490,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3581,7 +3500,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -3594,7 +3512,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -3622,7 +3539,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3641,7 +3557,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3652,7 +3567,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -3665,7 +3579,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3831,7 +3744,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3850,7 +3762,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3861,7 +3772,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3899,7 +3809,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3918,7 +3827,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3929,7 +3837,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTemplateString2ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTemplateString2ES6/input.ts.json index 94e55eef3c9b..9ba0ed17edb1 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTemplateString2ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTemplateString2ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -113,8 +113,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -152,7 +152,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -163,7 +162,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -277,7 +275,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -296,7 +293,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -307,7 +303,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -422,7 +417,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -441,7 +435,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -452,7 +445,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -575,7 +567,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -586,7 +577,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -598,7 +588,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -720,7 +709,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -739,7 +727,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -750,7 +737,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -763,7 +749,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -892,7 +877,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -911,7 +895,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -922,7 +905,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1071,7 +1053,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1090,7 +1071,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1101,7 +1081,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1219,7 +1198,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1230,7 +1208,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -1250,7 +1227,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1261,7 +1237,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1412,7 +1387,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1431,7 +1405,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1442,7 +1415,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1463,7 +1435,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1482,7 +1453,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1493,7 +1463,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1645,7 +1614,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1664,7 +1632,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1675,7 +1642,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1696,7 +1662,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1715,7 +1680,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1726,7 +1690,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1886,7 +1849,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1897,7 +1859,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -1909,7 +1870,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -1937,7 +1897,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1948,7 +1907,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -1960,7 +1918,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2119,7 +2076,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2138,7 +2094,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2149,7 +2104,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -2162,7 +2116,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -2190,7 +2143,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2209,7 +2161,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2220,7 +2171,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -2233,7 +2183,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2399,7 +2348,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2418,7 +2366,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2429,7 +2376,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2467,7 +2413,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2486,7 +2431,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2497,7 +2441,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2651,7 +2594,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2662,7 +2604,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -2682,7 +2623,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2693,7 +2633,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -2844,7 +2783,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2863,7 +2801,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2874,7 +2811,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2895,7 +2831,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2914,7 +2849,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2925,7 +2859,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3077,7 +3010,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3096,7 +3028,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3107,7 +3038,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3128,7 +3058,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3147,7 +3076,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3158,7 +3086,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3318,7 +3245,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3329,7 +3255,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -3341,7 +3266,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -3369,7 +3293,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3380,7 +3303,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -3392,7 +3314,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3551,7 +3472,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3570,7 +3490,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3581,7 +3500,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -3594,7 +3512,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -3622,7 +3539,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3641,7 +3557,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3652,7 +3567,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -3665,7 +3579,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3831,7 +3744,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3850,7 +3762,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3861,7 +3772,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3899,7 +3809,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3918,7 +3827,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3929,7 +3837,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTemplateString3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTemplateString3/input.ts.json index 2485110fd482..a6c20024d862 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTemplateString3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTemplateString3/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -113,8 +113,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -152,7 +152,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -163,7 +162,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -277,7 +275,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -296,7 +293,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -307,7 +303,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -422,7 +417,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -441,7 +435,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -452,7 +445,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -575,7 +567,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -586,7 +577,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -598,7 +588,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -720,7 +709,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -739,7 +727,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -750,7 +737,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -763,7 +749,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -892,7 +877,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -911,7 +895,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -922,7 +905,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1071,7 +1053,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1090,7 +1071,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1101,7 +1081,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1219,7 +1198,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1230,7 +1208,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -1250,7 +1227,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1261,7 +1237,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1412,7 +1387,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1431,7 +1405,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1442,7 +1415,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1463,7 +1435,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1482,7 +1453,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1493,7 +1463,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1645,7 +1614,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1664,7 +1632,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1675,7 +1642,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1696,7 +1662,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1715,7 +1680,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1726,7 +1690,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1886,7 +1849,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1897,7 +1859,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -1909,7 +1870,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -1937,7 +1897,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1948,7 +1907,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -1960,7 +1918,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2119,7 +2076,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2138,7 +2094,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2149,7 +2104,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -2162,7 +2116,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -2190,7 +2143,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2209,7 +2161,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2220,7 +2171,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -2233,7 +2183,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2399,7 +2348,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2418,7 +2366,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2429,7 +2376,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2467,7 +2413,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2486,7 +2431,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2497,7 +2441,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2651,7 +2594,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2662,7 +2604,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -2682,7 +2623,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2693,7 +2633,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -2844,7 +2783,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2863,7 +2801,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2874,7 +2811,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2895,7 +2831,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2914,7 +2849,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2925,7 +2859,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3077,7 +3010,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3096,7 +3028,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3107,7 +3038,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3128,7 +3058,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3147,7 +3076,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3158,7 +3086,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3318,7 +3245,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3329,7 +3255,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -3341,7 +3266,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -3369,7 +3293,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3380,7 +3303,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -3392,7 +3314,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3551,7 +3472,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3570,7 +3490,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3581,7 +3500,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -3594,7 +3512,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -3622,7 +3539,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3641,7 +3557,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3652,7 +3567,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -3665,7 +3579,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3831,7 +3744,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3850,7 +3762,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3861,7 +3772,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3899,7 +3809,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3918,7 +3827,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3929,7 +3837,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTemplateString3ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTemplateString3ES6/input.ts.json index 2485110fd482..a6c20024d862 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTemplateString3ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/emitExponentiationOperatorInTemplateString3ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -113,8 +113,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -152,7 +152,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -163,7 +162,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -277,7 +275,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -296,7 +293,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -307,7 +303,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -422,7 +417,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -441,7 +435,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -452,7 +445,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -575,7 +567,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -586,7 +577,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -598,7 +588,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -720,7 +709,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -739,7 +727,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -750,7 +737,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -763,7 +749,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -892,7 +877,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -911,7 +895,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -922,7 +905,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1071,7 +1053,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1090,7 +1071,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1101,7 +1081,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1219,7 +1198,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1230,7 +1208,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -1250,7 +1227,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1261,7 +1237,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1412,7 +1387,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1431,7 +1405,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1442,7 +1415,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1463,7 +1435,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1482,7 +1453,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1493,7 +1463,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1645,7 +1614,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1664,7 +1632,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1675,7 +1642,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1696,7 +1662,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1715,7 +1680,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1726,7 +1690,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1886,7 +1849,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1897,7 +1859,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -1909,7 +1870,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -1937,7 +1897,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1948,7 +1907,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -1960,7 +1918,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2119,7 +2076,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2138,7 +2094,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2149,7 +2104,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -2162,7 +2116,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -2190,7 +2143,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2209,7 +2161,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2220,7 +2171,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -2233,7 +2183,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2399,7 +2348,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2418,7 +2366,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2429,7 +2376,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2467,7 +2413,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2486,7 +2431,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2497,7 +2441,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2651,7 +2594,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2662,7 +2604,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -2682,7 +2623,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2693,7 +2633,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -2844,7 +2783,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2863,7 +2801,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2874,7 +2811,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2895,7 +2831,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2914,7 +2849,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2925,7 +2859,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3077,7 +3010,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3096,7 +3028,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3107,7 +3038,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3128,7 +3058,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3147,7 +3076,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3158,7 +3086,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3318,7 +3245,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3329,7 +3255,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -3341,7 +3266,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -3369,7 +3293,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3380,7 +3303,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -3392,7 +3314,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3551,7 +3472,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3570,7 +3490,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3581,7 +3500,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -3594,7 +3512,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -3622,7 +3539,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3641,7 +3557,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3652,7 +3567,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -3665,7 +3579,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3831,7 +3744,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3850,7 +3762,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3861,7 +3772,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3899,7 +3809,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3918,7 +3827,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3929,7 +3837,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithAnyAndNumber/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithAnyAndNumber/input.ts.json index 956c1d726c80..fdfa37e1ae66 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithAnyAndNumber/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithAnyAndNumber/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,8 +129,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -148,7 +148,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -159,7 +158,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -192,8 +190,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -211,7 +209,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -222,7 +219,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -255,8 +251,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -274,7 +270,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -316,8 +311,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -344,7 +339,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -377,8 +371,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -436,8 +430,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -455,7 +449,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -497,8 +490,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -525,7 +518,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -558,8 +550,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -577,7 +569,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -588,7 +579,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithEnum/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithEnum/input.ts.json index 8ebfdfed1f1d..79025859a9d7 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithEnum/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithEnum/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -94,6 +91,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -110,8 +108,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,6 +140,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -159,8 +157,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -192,6 +189,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -214,13 +212,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -252,8 +248,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -271,7 +267,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -282,7 +277,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -315,8 +309,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -334,7 +328,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -345,7 +338,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -378,8 +370,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -397,7 +389,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -408,7 +399,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -441,8 +431,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -460,7 +450,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -471,7 +460,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -504,8 +492,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -523,7 +511,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -534,7 +521,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -567,8 +553,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -593,7 +579,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -604,7 +589,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -617,7 +601,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -650,8 +633,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -676,7 +659,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -687,7 +669,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -700,7 +681,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -733,8 +713,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -759,7 +739,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -770,7 +749,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -790,7 +768,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -801,7 +778,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -836,8 +812,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -862,7 +838,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -873,7 +848,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -917,8 +891,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -936,7 +910,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -954,7 +927,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -965,7 +937,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1000,8 +971,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1019,7 +990,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1037,7 +1007,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1048,7 +1017,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1083,8 +1051,8 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1118,7 +1086,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1129,7 +1096,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithEnumUnion/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithEnumUnion/input.ts.json index 511a35fcdd3b..c99d526fbff2 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithEnumUnion/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithEnumUnion/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -86,7 +83,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "members": [ @@ -105,7 +101,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "init": null @@ -125,7 +120,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "init": null @@ -157,6 +151,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -173,8 +168,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -206,6 +200,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -222,8 +217,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -255,6 +249,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -285,7 +280,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -305,15 +299,13 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -345,8 +337,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -364,7 +356,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -375,7 +366,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -408,8 +398,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -427,7 +417,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -438,7 +427,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -471,8 +459,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -490,7 +478,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -501,7 +488,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -534,8 +520,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -553,7 +539,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -564,7 +549,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -597,8 +581,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -616,7 +600,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -627,7 +610,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -660,8 +642,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -686,7 +668,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -697,7 +678,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -710,7 +690,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -743,8 +722,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -769,7 +748,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -780,7 +758,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -793,7 +770,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -826,8 +802,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -852,7 +828,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -863,7 +838,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -883,7 +857,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -894,7 +867,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -929,8 +901,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -955,7 +927,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -966,7 +937,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1010,8 +980,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1029,7 +999,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1047,7 +1016,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1058,7 +1026,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1093,8 +1060,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1112,7 +1079,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1130,7 +1096,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1141,7 +1106,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1176,8 +1140,8 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1211,7 +1175,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1222,7 +1185,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithInvalidOperands/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithInvalidOperands/input.ts.json index 666696e25361..b716a4efa770 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithInvalidOperands/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithInvalidOperands/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -82,7 +79,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "init": null @@ -114,6 +110,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -130,8 +127,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -163,6 +159,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -179,8 +176,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -212,6 +208,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -228,8 +225,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -261,6 +257,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -277,8 +274,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -310,6 +306,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,7 +338,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -369,8 +365,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -402,6 +397,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -424,13 +420,11 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -462,8 +456,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -481,7 +475,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -492,7 +485,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -525,8 +517,8 @@ "ctxt": 0 }, "value": "r1a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -544,7 +536,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -555,7 +546,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -588,8 +578,8 @@ "ctxt": 0 }, "value": "r1a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -607,7 +597,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -618,7 +607,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -651,8 +639,8 @@ "ctxt": 0 }, "value": "r1a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -670,7 +658,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -681,7 +668,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -714,8 +700,8 @@ "ctxt": 0 }, "value": "r1a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -733,7 +719,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -744,7 +729,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -777,8 +761,8 @@ "ctxt": 0 }, "value": "r1a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -796,7 +780,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -807,7 +790,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -840,8 +822,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -859,7 +841,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -870,7 +851,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -903,8 +883,8 @@ "ctxt": 0 }, "value": "r1b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -922,7 +902,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -933,7 +912,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -966,8 +944,8 @@ "ctxt": 0 }, "value": "r1b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -985,7 +963,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -996,7 +973,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1029,8 +1005,8 @@ "ctxt": 0 }, "value": "r1b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1048,7 +1024,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1059,7 +1034,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -1092,8 +1066,8 @@ "ctxt": 0 }, "value": "r1b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1111,7 +1085,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1122,7 +1095,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -1155,8 +1127,8 @@ "ctxt": 0 }, "value": "r1b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1174,7 +1146,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1185,7 +1156,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -1218,8 +1188,8 @@ "ctxt": 0 }, "value": "r1c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1237,7 +1207,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1248,7 +1217,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1281,8 +1249,8 @@ "ctxt": 0 }, "value": "r1c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1300,7 +1268,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1311,7 +1278,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1344,8 +1310,8 @@ "ctxt": 0 }, "value": "r1c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1363,7 +1329,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1374,7 +1339,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1407,8 +1371,8 @@ "ctxt": 0 }, "value": "r1c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1426,7 +1390,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1437,7 +1400,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -1470,8 +1432,8 @@ "ctxt": 0 }, "value": "r1c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1489,7 +1451,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1500,7 +1461,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -1533,8 +1493,8 @@ "ctxt": 0 }, "value": "r1c6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1552,7 +1512,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1563,7 +1522,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -1596,8 +1554,8 @@ "ctxt": 0 }, "value": "r1d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1615,7 +1573,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1626,7 +1583,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1659,8 +1615,8 @@ "ctxt": 0 }, "value": "r1d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1678,7 +1634,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1689,7 +1644,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1722,8 +1676,8 @@ "ctxt": 0 }, "value": "r1d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1741,7 +1695,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1752,7 +1705,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1785,8 +1737,8 @@ "ctxt": 0 }, "value": "r1d4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1804,7 +1756,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1815,7 +1766,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -1848,8 +1798,8 @@ "ctxt": 0 }, "value": "r1d5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1867,7 +1817,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1878,7 +1827,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -1911,8 +1859,8 @@ "ctxt": 0 }, "value": "r1d6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1930,7 +1878,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1941,7 +1888,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -1974,8 +1920,8 @@ "ctxt": 0 }, "value": "r1e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1993,7 +1939,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -2004,7 +1949,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2037,8 +1981,8 @@ "ctxt": 0 }, "value": "r1e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2056,7 +2000,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -2067,7 +2010,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2100,8 +2042,8 @@ "ctxt": 0 }, "value": "r1e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2119,7 +2061,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -2130,7 +2071,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -2163,8 +2103,8 @@ "ctxt": 0 }, "value": "r1e4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2182,7 +2122,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -2193,7 +2132,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -2226,8 +2164,8 @@ "ctxt": 0 }, "value": "r1e5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2245,7 +2183,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -2256,7 +2193,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -2289,8 +2225,8 @@ "ctxt": 0 }, "value": "r1e6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2308,7 +2244,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -2319,7 +2254,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -2352,8 +2286,8 @@ "ctxt": 0 }, "value": "r1f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2371,7 +2305,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -2382,7 +2315,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2415,8 +2347,8 @@ "ctxt": 0 }, "value": "r1f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2434,7 +2366,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -2445,7 +2376,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2478,8 +2408,8 @@ "ctxt": 0 }, "value": "r1f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2497,7 +2427,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -2508,7 +2437,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -2541,8 +2469,8 @@ "ctxt": 0 }, "value": "r1f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2560,7 +2488,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -2571,7 +2498,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -2604,8 +2530,8 @@ "ctxt": 0 }, "value": "r1f5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2623,7 +2549,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -2634,7 +2559,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -2667,8 +2591,8 @@ "ctxt": 0 }, "value": "r1f6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2686,7 +2610,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -2697,7 +2620,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -2730,8 +2652,8 @@ "ctxt": 0 }, "value": "r1g1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2756,7 +2678,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2767,7 +2688,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2780,7 +2700,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2813,8 +2732,8 @@ "ctxt": 0 }, "value": "r1g2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2839,7 +2758,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2850,7 +2768,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2863,7 +2780,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2896,8 +2812,8 @@ "ctxt": 0 }, "value": "r1g3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2922,7 +2838,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2933,7 +2848,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2946,7 +2860,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -2979,8 +2892,8 @@ "ctxt": 0 }, "value": "r1g4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3005,7 +2918,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3016,7 +2928,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3029,7 +2940,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -3062,8 +2972,8 @@ "ctxt": 0 }, "value": "r1g5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3088,7 +2998,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3099,7 +3008,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3112,7 +3020,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -3145,8 +3052,8 @@ "ctxt": 0 }, "value": "r1g6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3171,7 +3078,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3182,7 +3088,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3195,7 +3100,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -3228,8 +3132,8 @@ "ctxt": 0 }, "value": "r1h1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3247,7 +3151,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3265,7 +3168,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3276,7 +3178,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3311,8 +3212,8 @@ "ctxt": 0 }, "value": "r1h2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3330,7 +3231,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3348,7 +3248,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3359,7 +3258,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3394,8 +3292,8 @@ "ctxt": 0 }, "value": "r1h3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3413,7 +3311,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3431,7 +3328,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3442,7 +3338,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3477,8 +3372,8 @@ "ctxt": 0 }, "value": "r1h4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3496,7 +3391,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -3514,7 +3408,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3525,7 +3418,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3560,8 +3452,8 @@ "ctxt": 0 }, "value": "r1h5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3579,7 +3471,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -3597,7 +3488,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3608,7 +3498,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3643,8 +3532,8 @@ "ctxt": 0 }, "value": "r1h6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3662,7 +3551,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -3680,7 +3568,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3691,7 +3578,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithInvalidSimpleUnaryExpressionOperands/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithInvalidSimpleUnaryExpressionOperands/input.ts.json index 63920e3be0b2..f43043de8b46 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithInvalidSimpleUnaryExpressionOperands/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithInvalidSimpleUnaryExpressionOperands/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "temp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -102,7 +102,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -166,7 +165,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -282,7 +280,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -346,7 +343,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -410,7 +406,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -492,7 +487,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -644,7 +638,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -726,7 +719,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -808,7 +800,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -872,7 +863,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -988,7 +978,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1052,7 +1041,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1133,7 +1121,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1215,7 +1202,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1367,7 +1353,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1449,7 +1434,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1514,7 +1498,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1578,7 +1561,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1642,7 +1624,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1706,7 +1687,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1787,7 +1767,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1869,7 +1848,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1951,7 +1929,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -2033,7 +2010,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithNew/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithNew/input.ts.json index 2e1a31a7e7a7..b97683783f92 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithNew/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithNew/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -183,7 +183,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -205,7 +204,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -216,7 +214,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -252,7 +249,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -281,7 +277,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -295,7 +290,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -338,7 +332,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -357,7 +350,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -368,7 +360,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithNullValueAndInvalidOperands/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithNullValueAndInvalidOperands/input.ts.json index 35c50fc04e72..15e7bafb4839 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithNullValueAndInvalidOperands/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithNullValueAndInvalidOperands/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -151,13 +152,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -189,8 +188,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -216,7 +215,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -249,8 +247,8 @@ "ctxt": 0 }, "value": "r1a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -276,7 +274,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -309,8 +306,8 @@ "ctxt": 0 }, "value": "r1a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -336,7 +333,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -369,8 +365,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -388,7 +384,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -429,8 +424,8 @@ "ctxt": 0 }, "value": "r1b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -448,7 +443,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -489,8 +483,8 @@ "ctxt": 0 }, "value": "r1b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -508,7 +502,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -549,8 +542,8 @@ "ctxt": 0 }, "value": "r1c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -607,8 +600,8 @@ "ctxt": 0 }, "value": "r1c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -670,8 +663,8 @@ "ctxt": 0 }, "value": "r1c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -728,8 +721,8 @@ "ctxt": 0 }, "value": "r1d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -786,8 +779,8 @@ "ctxt": 0 }, "value": "r1d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -849,8 +842,8 @@ "ctxt": 0 }, "value": "r1d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithNullValueAndValidOperands/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithNullValueAndValidOperands/input.ts.json index 4bd15ac05aff..5e84fe18673c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithNullValueAndValidOperands/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithNullValueAndValidOperands/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -94,6 +91,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -110,8 +108,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,6 +140,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -159,8 +157,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -192,8 +189,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -219,7 +216,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -252,8 +248,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -279,7 +275,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -312,8 +307,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -370,8 +365,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -404,7 +399,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -415,7 +409,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -450,8 +443,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -469,7 +462,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -510,8 +502,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -529,7 +521,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -570,8 +561,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -628,8 +619,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -654,7 +645,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -665,7 +655,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithOnlyNullValueOrUndefinedValue/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithOnlyNullValueOrUndefinedValue/input.ts.json index 0aa066759b92..e4a176fe122c 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithOnlyNullValueOrUndefinedValue/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithOnlyNullValueOrUndefinedValue/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -88,8 +88,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -115,7 +115,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -148,8 +147,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -167,7 +166,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -208,8 +206,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -227,7 +225,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -238,7 +235,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithTemplateStringInvalid/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithTemplateStringInvalid/input.ts.json index c1fe7f46d46f..20ead85e322e 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithTemplateStringInvalid/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithTemplateStringInvalid/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -176,8 +176,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -321,8 +321,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -466,8 +466,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -611,8 +611,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -756,8 +756,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -901,8 +901,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1046,8 +1046,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1191,8 +1191,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1230,8 +1230,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TemplateLiteral", @@ -1353,8 +1353,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TemplateLiteral", @@ -1476,8 +1476,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TemplateLiteral", @@ -1599,8 +1599,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithTemplateStringInvalidES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithTemplateStringInvalidES6/input.ts.json index ea6ca4e23247..face1e92746f 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithTemplateStringInvalidES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithTemplateStringInvalidES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -176,8 +176,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -321,8 +321,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -466,8 +466,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -611,8 +611,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -756,8 +756,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -901,8 +901,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1046,8 +1046,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1191,8 +1191,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1230,8 +1230,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TemplateLiteral", @@ -1353,8 +1353,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TemplateLiteral", @@ -1476,8 +1476,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TemplateLiteral", @@ -1599,8 +1599,8 @@ "ctxt": 0 }, "value": "kj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithTypeParameter/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithTypeParameter/input.ts.json index 36f0112ccb32..4fc19ab69bde 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithTypeParameter/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithTypeParameter/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -108,6 +106,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -124,8 +123,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -157,6 +155,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -173,8 +172,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -206,6 +204,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -222,8 +221,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -255,6 +253,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -271,8 +270,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -304,6 +302,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -320,8 +319,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -353,8 +351,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -372,7 +370,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -383,7 +380,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -416,8 +412,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -435,7 +431,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -446,7 +441,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -479,8 +473,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -498,7 +492,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -509,7 +502,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -542,8 +534,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -561,7 +553,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -572,7 +563,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -605,8 +595,8 @@ "ctxt": 0 }, "value": "r1c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -624,7 +614,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -635,7 +624,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -668,8 +656,8 @@ "ctxt": 0 }, "value": "r2c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -687,7 +675,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -698,7 +685,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -731,8 +717,8 @@ "ctxt": 0 }, "value": "r1d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -750,7 +736,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -761,7 +746,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -794,8 +778,8 @@ "ctxt": 0 }, "value": "r2d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -813,7 +797,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -824,7 +807,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -857,8 +839,8 @@ "ctxt": 0 }, "value": "r1e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -876,7 +858,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -887,7 +868,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -920,8 +900,8 @@ "ctxt": 0 }, "value": "r2e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -939,7 +919,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -950,7 +929,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -983,8 +961,8 @@ "ctxt": 0 }, "value": "r1f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1002,7 +980,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1013,7 +990,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1048,7 +1024,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithUndefinedValueAndInvalidOperands/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithUndefinedValueAndInvalidOperands/input.ts.json index e372847b1c62..1164e1f8e5fb 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithUndefinedValueAndInvalidOperands/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithUndefinedValueAndInvalidOperands/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -151,13 +152,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -189,8 +188,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -208,7 +207,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -219,7 +217,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -252,8 +249,8 @@ "ctxt": 0 }, "value": "r1a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -271,7 +268,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -282,7 +278,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -315,8 +310,8 @@ "ctxt": 0 }, "value": "r1a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -334,7 +329,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -345,7 +339,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -378,8 +371,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -397,7 +390,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -408,7 +400,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -441,8 +432,8 @@ "ctxt": 0 }, "value": "r1b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -460,7 +451,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -471,7 +461,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -504,8 +493,8 @@ "ctxt": 0 }, "value": "r1b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -523,7 +512,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -534,7 +522,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -567,8 +554,8 @@ "ctxt": 0 }, "value": "r1c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -586,7 +573,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -628,8 +614,8 @@ "ctxt": 0 }, "value": "r1c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -647,7 +633,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -694,8 +679,8 @@ "ctxt": 0 }, "value": "r1c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -713,7 +698,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -755,8 +739,8 @@ "ctxt": 0 }, "value": "r1d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -783,7 +767,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -816,8 +799,8 @@ "ctxt": 0 }, "value": "r1d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -849,7 +832,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -882,8 +864,8 @@ "ctxt": 0 }, "value": "r1d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -910,7 +892,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithUndefinedValueAndValidOperands/input.ts.json b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithUndefinedValueAndValidOperands/input.ts.json index 1fdbf0e2356f..cee172cd841a 100644 --- a/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithUndefinedValueAndValidOperands/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/es7/exponentiationOperator/exponentiationOperatorWithUndefinedValueAndValidOperands/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -94,6 +91,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -110,8 +108,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,6 +140,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -159,8 +157,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -192,8 +189,8 @@ "ctxt": 0 }, "value": "rk1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -211,7 +208,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -222,7 +218,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -255,8 +250,8 @@ "ctxt": 0 }, "value": "rk2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -274,7 +269,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -285,7 +279,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -318,8 +311,8 @@ "ctxt": 0 }, "value": "rk3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -337,7 +330,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -379,8 +371,8 @@ "ctxt": 0 }, "value": "rk4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -398,7 +390,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -416,7 +407,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -427,7 +417,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -462,8 +451,8 @@ "ctxt": 0 }, "value": "rk5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -481,7 +470,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -492,7 +480,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -525,8 +512,8 @@ "ctxt": 0 }, "value": "rk6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -544,7 +531,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -555,7 +541,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -588,8 +573,8 @@ "ctxt": 0 }, "value": "rk7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -616,7 +601,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -649,8 +633,8 @@ "ctxt": 0 }, "value": "rk8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -675,7 +659,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -686,7 +669,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -699,7 +681,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment1/input.ts.json index 4d5db753c9f2..5df6e8224dd3 100644 --- a/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment1/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -99,6 +99,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -134,8 +135,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -167,6 +167,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -202,8 +203,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -235,6 +235,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -270,8 +271,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -303,6 +303,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -338,8 +339,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -371,6 +371,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -406,8 +407,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -439,6 +439,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -507,8 +508,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -540,6 +540,7 @@ "ctxt": 0 }, "value": "h", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -608,8 +609,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -641,6 +641,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -709,8 +710,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -740,8 +740,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -782,8 +782,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -824,8 +824,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -866,8 +866,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -903,8 +903,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -940,8 +940,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -977,8 +977,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1014,8 +1014,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1051,8 +1051,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment10/input.ts.json b/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment10/input.ts.json index 68729284e22a..c36894a1094f 100644 --- a/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment10/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment10/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -98,7 +98,6 @@ "ctxt": 0 }, "value": "incr", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -141,7 +140,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false } } @@ -178,8 +176,8 @@ "ctxt": 0 }, "value": "oobj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -197,7 +195,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } ] @@ -236,7 +233,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -254,7 +250,6 @@ "ctxt": 0 }, "value": "incr", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -277,7 +272,6 @@ "ctxt": 0 }, "value": "incr", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -322,7 +316,6 @@ "ctxt": 0 }, "value": "oobj", - "typeAnnotation": null, "optional": false }, "property": { @@ -356,7 +349,6 @@ "ctxt": 0 }, "value": "incr", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -379,7 +371,6 @@ "ctxt": 0 }, "value": "incr", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment2/input.ts.json index ae89a8e6ec42..03270841ac04 100644 --- a/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -89,7 +87,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -126,7 +123,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -256,7 +252,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -386,7 +381,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -523,6 +517,7 @@ "ctxt": 0 }, "value": "result", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -545,13 +540,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -583,6 +576,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -605,13 +599,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -643,6 +635,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -665,13 +658,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -703,6 +694,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -725,13 +717,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -768,7 +758,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -779,7 +768,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -799,7 +787,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "property": { @@ -810,7 +797,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -847,7 +833,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -858,7 +843,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -878,7 +862,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "property": { @@ -889,7 +872,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -926,7 +908,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -937,7 +918,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -957,7 +937,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "property": { @@ -968,7 +947,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1012,7 +990,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1023,7 +1000,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1066,7 +1042,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "property": { @@ -1077,7 +1052,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1090,7 +1064,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1134,7 +1107,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1145,7 +1117,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1188,7 +1159,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "property": { @@ -1199,7 +1169,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1212,7 +1181,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1256,7 +1224,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1267,7 +1234,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1310,7 +1276,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "property": { @@ -1321,7 +1286,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1334,7 +1298,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1392,7 +1355,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1403,7 +1365,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1416,7 +1377,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1432,7 +1392,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1473,7 +1432,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "property": { @@ -1484,7 +1442,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1497,7 +1454,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1513,7 +1469,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1571,7 +1526,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1582,7 +1536,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1595,7 +1548,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1611,7 +1563,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1652,7 +1603,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "property": { @@ -1663,7 +1613,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1676,7 +1625,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1692,7 +1640,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1750,7 +1697,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1761,7 +1707,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1774,7 +1719,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1790,7 +1734,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1831,7 +1774,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "property": { @@ -1842,7 +1784,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1855,7 +1796,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1871,7 +1811,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment3/input.ts.json index d86699da7413..1a1c48bb039f 100644 --- a/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment3/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -188,6 +186,7 @@ "ctxt": 0 }, "value": "result", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -210,13 +209,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -248,6 +245,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -270,13 +268,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -308,6 +304,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -330,13 +327,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -368,6 +363,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -390,13 +386,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -440,7 +434,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -451,7 +444,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -472,7 +464,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "property": { @@ -483,7 +474,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -527,7 +517,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -538,7 +527,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -559,7 +547,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "property": { @@ -570,7 +557,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -614,7 +600,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -625,7 +610,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -646,7 +630,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "property": { @@ -657,7 +640,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment4/input.ts.json index 9c3c1e9c2e50..e88ff45c35bd 100644 --- a/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "results", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,8 +80,7 @@ } ] } - }, - "optional": false + } } } ], @@ -143,8 +142,8 @@ "ctxt": 0 }, "value": "results", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -165,7 +164,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -204,7 +202,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -225,6 +222,7 @@ "ctxt": 0 }, "value": "results", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -268,8 +266,7 @@ } ] } - }, - "optional": false + } } } ], @@ -331,8 +328,8 @@ "ctxt": 0 }, "value": "results", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -353,7 +350,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -392,7 +388,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -413,6 +408,7 @@ "ctxt": 0 }, "value": "results", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -456,8 +452,7 @@ } ] } - }, - "optional": false + } } } ], @@ -498,8 +493,8 @@ "ctxt": 0 }, "value": "results", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -541,7 +536,6 @@ "ctxt": 0 }, "value": "results", - "typeAnnotation": null, "optional": false }, "property": { @@ -552,7 +546,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -591,7 +584,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -612,6 +604,7 @@ "ctxt": 0 }, "value": "results", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -655,8 +648,7 @@ } ] } - }, - "optional": false + } } } ], @@ -697,8 +689,8 @@ "ctxt": 0 }, "value": "results", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -740,7 +732,6 @@ "ctxt": 0 }, "value": "results", - "typeAnnotation": null, "optional": false }, "property": { @@ -751,7 +742,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -795,7 +785,6 @@ "ctxt": 0 }, "value": "ThingWithOriginal", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -825,7 +814,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -867,7 +855,6 @@ "ctxt": 0 }, "value": "original", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -896,7 +883,6 @@ "ctxt": 0 }, "value": "ThingWithOriginal", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -932,6 +918,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -948,8 +935,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -966,7 +952,6 @@ "ctxt": 0 }, "value": "doSomethingWithAlias", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -987,6 +972,7 @@ "ctxt": 0 }, "value": "thing", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1017,7 +1003,6 @@ "ctxt": 0 }, "value": "ThingWithOriginal", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1033,8 +1018,7 @@ } ] } - }, - "optional": false + } } }, { @@ -1053,6 +1037,7 @@ "ctxt": 0 }, "value": "defaultValue", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1083,7 +1068,6 @@ "ctxt": 0 }, "value": "ThingWithOriginal", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1099,8 +1083,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1141,7 +1124,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -1185,8 +1167,8 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1203,7 +1185,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false }, "property": { @@ -1214,7 +1195,6 @@ "ctxt": 0 }, "value": "original", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1250,7 +1230,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false }, "property": { @@ -1261,7 +1240,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1296,7 +1274,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -1340,8 +1317,8 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1351,7 +1328,6 @@ "ctxt": 0 }, "value": "defaultValue", - "typeAnnotation": null, "optional": false } }, @@ -1385,7 +1361,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false }, "property": { @@ -1396,7 +1371,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1424,7 +1398,6 @@ "ctxt": 0 }, "value": "defaultValue", - "typeAnnotation": null, "optional": false }, "property": { @@ -1435,7 +1408,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1470,7 +1442,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -1514,8 +1485,8 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1525,7 +1496,6 @@ "ctxt": 0 }, "value": "defaultValue", - "typeAnnotation": null, "optional": false } }, @@ -1559,7 +1529,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false }, "property": { @@ -1570,7 +1539,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1598,7 +1566,6 @@ "ctxt": 0 }, "value": "defaultValue", - "typeAnnotation": null, "optional": false }, "property": { @@ -1609,7 +1576,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1652,8 +1618,8 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1663,7 +1629,6 @@ "ctxt": 0 }, "value": "defaultValue", - "typeAnnotation": null, "optional": false } }, @@ -1697,7 +1662,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false }, "property": { @@ -1708,7 +1672,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1736,7 +1699,6 @@ "ctxt": 0 }, "value": "defaultValue", - "typeAnnotation": null, "optional": false }, "property": { @@ -1747,7 +1709,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment5/input.ts.json index 3a662795d608..adf2aa97edb7 100644 --- a/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "f", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,6 +60,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -76,8 +77,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -99,8 +99,7 @@ } } } - }, - "optional": true + } } } ], @@ -141,8 +140,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -167,8 +166,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -179,7 +178,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -212,7 +210,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -249,7 +246,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -270,6 +266,7 @@ "ctxt": 0 }, "value": "f", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -293,6 +290,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -309,8 +307,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -332,8 +329,7 @@ } } } - }, - "optional": true + } } } ], @@ -374,8 +370,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -400,8 +396,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -412,7 +408,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -445,7 +440,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -482,7 +476,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -503,6 +496,7 @@ "ctxt": 0 }, "value": "f", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -526,6 +520,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -542,8 +537,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -565,8 +559,7 @@ } } } - }, - "optional": true + } } } ], @@ -607,8 +600,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -633,8 +626,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -645,7 +638,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -678,7 +670,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -715,7 +706,6 @@ "ctxt": 0 }, "value": "bar1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -736,6 +726,7 @@ "ctxt": 0 }, "value": "f", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -759,6 +750,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -775,8 +767,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -798,8 +789,7 @@ } } } - }, - "optional": true + } } } ], @@ -840,8 +830,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -880,7 +870,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { @@ -891,7 +880,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -922,8 +910,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -934,7 +922,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -970,7 +957,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1007,7 +993,6 @@ "ctxt": 0 }, "value": "bar2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1028,6 +1013,7 @@ "ctxt": 0 }, "value": "f", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1051,6 +1037,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1067,8 +1054,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1090,8 +1076,7 @@ } } } - }, - "optional": true + } } } ], @@ -1132,8 +1117,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -1172,7 +1157,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { @@ -1183,7 +1167,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1214,8 +1197,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1226,7 +1209,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1262,7 +1244,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1299,7 +1280,6 @@ "ctxt": 0 }, "value": "bar3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1320,6 +1300,7 @@ "ctxt": 0 }, "value": "f", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1343,6 +1324,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1359,8 +1341,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1382,8 +1363,7 @@ } } } - }, - "optional": true + } } } ], @@ -1424,8 +1404,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -1464,7 +1444,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { @@ -1475,7 +1454,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1506,8 +1484,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1518,7 +1496,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1554,7 +1531,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment6/input.ts.json index 2977a0dad9a7..ce031acd34f5 100644 --- a/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "results", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,8 +80,7 @@ } ] } - }, - "optional": false + } } }, { @@ -100,6 +99,7 @@ "ctxt": 0 }, "value": "results1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -143,8 +143,7 @@ } ] } - }, - "optional": false + } } } ], @@ -206,8 +205,8 @@ "ctxt": 0 }, "value": "results", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -232,8 +231,8 @@ "ctxt": 0 }, "value": "results1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -256,7 +255,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -295,7 +293,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -316,6 +313,7 @@ "ctxt": 0 }, "value": "results", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -359,8 +357,7 @@ } ] } - }, - "optional": false + } } }, { @@ -379,6 +376,7 @@ "ctxt": 0 }, "value": "results1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -422,8 +420,7 @@ } ] } - }, - "optional": false + } } } ], @@ -485,8 +482,8 @@ "ctxt": 0 }, "value": "results", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -511,8 +508,8 @@ "ctxt": 0 }, "value": "results1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -535,7 +532,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -574,7 +570,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -595,6 +590,7 @@ "ctxt": 0 }, "value": "results", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -638,8 +634,7 @@ } ] } - }, - "optional": false + } } }, { @@ -658,6 +653,7 @@ "ctxt": 0 }, "value": "results1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -701,8 +697,7 @@ } ] } - }, - "optional": false + } } } ], @@ -764,8 +759,8 @@ "ctxt": 0 }, "value": "results", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -790,8 +785,8 @@ "ctxt": 0 }, "value": "results1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -814,7 +809,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment7/input.ts.json index e55d98b39d8f..a3fbc752ac83 100644 --- a/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment7/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "results", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,8 +80,7 @@ } ] } - }, - "optional": false + } } }, { @@ -100,6 +99,7 @@ "ctxt": 0 }, "value": "results1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -143,8 +143,7 @@ } ] } - }, - "optional": false + } } } ], @@ -206,8 +205,8 @@ "ctxt": 0 }, "value": "results", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -225,8 +224,8 @@ "ctxt": 0 }, "value": "results1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -248,7 +247,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -287,7 +285,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -308,6 +305,7 @@ "ctxt": 0 }, "value": "results", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -351,8 +349,7 @@ } ] } - }, - "optional": false + } } }, { @@ -371,6 +368,7 @@ "ctxt": 0 }, "value": "results1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -414,8 +412,7 @@ } ] } - }, - "optional": false + } } } ], @@ -477,8 +474,8 @@ "ctxt": 0 }, "value": "results", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -496,8 +493,8 @@ "ctxt": 0 }, "value": "results1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -519,7 +516,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -558,7 +554,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -579,6 +574,7 @@ "ctxt": 0 }, "value": "results", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -622,8 +618,7 @@ } ] } - }, - "optional": false + } } }, { @@ -642,6 +637,7 @@ "ctxt": 0 }, "value": "results1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -685,8 +681,7 @@ } ] } - }, - "optional": false + } } } ], @@ -748,8 +743,8 @@ "ctxt": 0 }, "value": "results", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -767,8 +762,8 @@ "ctxt": 0 }, "value": "results1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -790,7 +785,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment8/input.ts.json index d28b279e5375..91d86d46d0a1 100644 --- a/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment8/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "bar", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -70,7 +71,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -117,8 +117,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -135,7 +134,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -156,6 +154,7 @@ "ctxt": 0 }, "value": "results", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -199,8 +198,7 @@ } ] } - }, - "optional": false + } } } ], @@ -262,8 +260,8 @@ "ctxt": 0 }, "value": "results", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -300,7 +298,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "property": { @@ -311,7 +308,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false @@ -337,7 +333,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -376,7 +371,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -397,6 +391,7 @@ "ctxt": 0 }, "value": "results", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -440,8 +435,7 @@ } ] } - }, - "optional": false + } } } ], @@ -503,8 +497,8 @@ "ctxt": 0 }, "value": "results", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -541,7 +535,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "property": { @@ -552,7 +545,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false @@ -578,7 +570,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -617,7 +608,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -638,6 +628,7 @@ "ctxt": 0 }, "value": "results", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -681,8 +672,7 @@ } ] } - }, - "optional": false + } } } ], @@ -744,8 +734,8 @@ "ctxt": 0 }, "value": "results", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -782,7 +772,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "property": { @@ -793,7 +782,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false @@ -819,7 +807,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment9/input.ts.json b/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment9/input.ts.json index a1ddf928d72f..f011434ef222 100644 --- a/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment9/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/esnext/logicalAssignment/logicalAssignment9/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,8 +90,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -128,7 +127,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -139,7 +137,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -185,7 +182,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -196,7 +192,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/arrayLiterals/arrayLiteralInference/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/arrayLiterals/arrayLiteralInference/input.ts.json index ceb22bf52286..66cc8cf0b0a1 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/arrayLiterals/arrayLiteralInference/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/arrayLiterals/arrayLiteralInference/input.ts.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "AppType", - "typeAnnotation": null, "optional": false }, "members": [ @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "HeaderDetail", - "typeAnnotation": null, "optional": false }, "init": { @@ -82,7 +80,6 @@ "ctxt": 0 }, "value": "HeaderMultiDetail", - "typeAnnotation": null, "optional": false }, "init": { @@ -115,7 +112,6 @@ "ctxt": 0 }, "value": "AdvancedList", - "typeAnnotation": null, "optional": false }, "init": { @@ -148,7 +144,6 @@ "ctxt": 0 }, "value": "Standard", - "typeAnnotation": null, "optional": false }, "init": { @@ -181,7 +176,6 @@ "ctxt": 0 }, "value": "Relationship", - "typeAnnotation": null, "optional": false }, "init": { @@ -214,7 +208,6 @@ "ctxt": 0 }, "value": "Report", - "typeAnnotation": null, "optional": false }, "init": { @@ -247,7 +240,6 @@ "ctxt": 0 }, "value": "Composite", - "typeAnnotation": null, "optional": false }, "init": { @@ -280,7 +272,6 @@ "ctxt": 0 }, "value": "ListOnly", - "typeAnnotation": null, "optional": false }, "init": { @@ -313,7 +304,6 @@ "ctxt": 0 }, "value": "ModuleSettings", - "typeAnnotation": null, "optional": false }, "init": { @@ -358,7 +348,6 @@ "ctxt": 0 }, "value": "AppStyle", - "typeAnnotation": null, "optional": false }, "members": [ @@ -377,7 +366,6 @@ "ctxt": 0 }, "value": "Tree", - "typeAnnotation": null, "optional": false }, "init": null @@ -397,7 +385,6 @@ "ctxt": 0 }, "value": "TreeEntity", - "typeAnnotation": null, "optional": false }, "init": null @@ -417,7 +404,6 @@ "ctxt": 0 }, "value": "Standard", - "typeAnnotation": null, "optional": false }, "init": null @@ -437,7 +423,6 @@ "ctxt": 0 }, "value": "MiniApp", - "typeAnnotation": null, "optional": false }, "init": null @@ -457,7 +442,6 @@ "ctxt": 0 }, "value": "PivotTable", - "typeAnnotation": null, "optional": false }, "init": null @@ -490,6 +474,7 @@ "ctxt": 0 }, "value": "appTypeStylesWithError", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -512,7 +497,6 @@ "ctxt": 0 }, "value": "Map", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -538,7 +522,6 @@ "ctxt": 0 }, "value": "AppType", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -558,7 +541,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -584,7 +566,6 @@ "ctxt": 0 }, "value": "AppStyle", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -595,8 +576,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -613,7 +593,6 @@ "ctxt": 0 }, "value": "Map", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -654,7 +633,6 @@ "ctxt": 0 }, "value": "AppType", - "typeAnnotation": null, "optional": false }, "property": { @@ -665,7 +643,6 @@ "ctxt": 0 }, "value": "Standard", - "typeAnnotation": null, "optional": false }, "computed": false @@ -698,7 +675,6 @@ "ctxt": 0 }, "value": "AppStyle", - "typeAnnotation": null, "optional": false }, "property": { @@ -709,7 +685,6 @@ "ctxt": 0 }, "value": "Standard", - "typeAnnotation": null, "optional": false }, "computed": false @@ -732,7 +707,6 @@ "ctxt": 0 }, "value": "AppStyle", - "typeAnnotation": null, "optional": false }, "property": { @@ -743,7 +717,6 @@ "ctxt": 0 }, "value": "MiniApp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -782,7 +755,6 @@ "ctxt": 0 }, "value": "AppType", - "typeAnnotation": null, "optional": false }, "property": { @@ -793,7 +765,6 @@ "ctxt": 0 }, "value": "Relationship", - "typeAnnotation": null, "optional": false }, "computed": false @@ -826,7 +797,6 @@ "ctxt": 0 }, "value": "AppStyle", - "typeAnnotation": null, "optional": false }, "property": { @@ -837,7 +807,6 @@ "ctxt": 0 }, "value": "Standard", - "typeAnnotation": null, "optional": false }, "computed": false @@ -860,7 +829,6 @@ "ctxt": 0 }, "value": "AppStyle", - "typeAnnotation": null, "optional": false }, "property": { @@ -871,7 +839,6 @@ "ctxt": 0 }, "value": "Tree", - "typeAnnotation": null, "optional": false }, "computed": false @@ -894,7 +861,6 @@ "ctxt": 0 }, "value": "AppStyle", - "typeAnnotation": null, "optional": false }, "property": { @@ -905,7 +871,6 @@ "ctxt": 0 }, "value": "TreeEntity", - "typeAnnotation": null, "optional": false }, "computed": false @@ -944,7 +909,6 @@ "ctxt": 0 }, "value": "AppType", - "typeAnnotation": null, "optional": false }, "property": { @@ -955,7 +919,6 @@ "ctxt": 0 }, "value": "AdvancedList", - "typeAnnotation": null, "optional": false }, "computed": false @@ -988,7 +951,6 @@ "ctxt": 0 }, "value": "AppStyle", - "typeAnnotation": null, "optional": false }, "property": { @@ -999,7 +961,6 @@ "ctxt": 0 }, "value": "Standard", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1022,7 +983,6 @@ "ctxt": 0 }, "value": "AppStyle", - "typeAnnotation": null, "optional": false }, "property": { @@ -1033,7 +993,6 @@ "ctxt": 0 }, "value": "MiniApp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1065,7 +1024,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1098,8 +1056,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1130,7 +1088,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1172,7 +1129,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1209,7 +1165,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1242,6 +1197,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1280,7 +1236,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1309,8 +1264,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1327,7 +1281,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1351,7 +1304,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1387,7 +1339,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1435,6 +1386,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1467,8 +1419,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1485,7 +1436,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/arrayLiterals/arrayLiterals/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/arrayLiterals/arrayLiterals/input.ts.json index e061905dd133..f1a56e6fd767 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/arrayLiterals/arrayLiterals/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/arrayLiterals/arrayLiterals/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "arr1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -140,8 +140,8 @@ "ctxt": 0 }, "value": "arr2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -261,8 +261,8 @@ "ctxt": 0 }, "value": "stringArrArr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -363,8 +363,8 @@ "ctxt": 0 }, "value": "stringArr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -439,8 +439,8 @@ "ctxt": 0 }, "value": "numberArr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -529,8 +529,8 @@ "ctxt": 0 }, "value": "boolArr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -604,7 +604,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -630,7 +629,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": null, @@ -677,8 +675,8 @@ "ctxt": 0 }, "value": "classArr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -705,7 +703,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -729,7 +726,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -767,8 +763,8 @@ "ctxt": 0 }, "value": "classTypeArray", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -788,7 +784,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -802,7 +797,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -816,7 +810,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } @@ -851,6 +844,7 @@ "ctxt": 0 }, "value": "classTypeArray", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -873,7 +867,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -899,15 +892,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -939,6 +930,7 @@ "ctxt": 0 }, "value": "context1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -965,6 +957,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -981,8 +974,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1016,7 +1008,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1058,7 +1049,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1096,8 +1086,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1127,7 +1116,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1155,7 +1143,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1178,7 +1165,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -1219,7 +1205,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1247,7 +1232,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1270,7 +1254,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -1317,8 +1300,8 @@ "ctxt": 0 }, "value": "context2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1348,7 +1331,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1376,7 +1358,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1399,7 +1380,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -1440,7 +1420,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1468,7 +1447,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1491,7 +1469,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -1523,7 +1500,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1549,7 +1525,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1581,7 +1556,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1607,7 +1581,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1631,7 +1604,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1657,7 +1629,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1683,7 +1654,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1707,7 +1677,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1748,6 +1717,7 @@ "ctxt": 0 }, "value": "context3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1777,14 +1747,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1811,7 +1779,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1835,7 +1802,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1873,6 +1839,7 @@ "ctxt": 0 }, "value": "context4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1902,14 +1869,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1936,7 +1901,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1960,7 +1924,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/arrayLiterals/arrayLiterals2ES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/arrayLiterals/arrayLiterals2ES5/input.ts.json index 2f8a30fea9cd..09a4688d7650 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/arrayLiterals/arrayLiterals2ES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/arrayLiterals/arrayLiterals2ES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -111,8 +111,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -187,8 +187,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -215,7 +215,6 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, "optional": false } }, @@ -267,8 +266,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -294,7 +293,6 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, "optional": false } } @@ -329,8 +327,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -396,8 +394,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -421,7 +419,6 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, "optional": false } }, @@ -457,6 +454,7 @@ "ctxt": 0 }, "value": "b0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -528,8 +526,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -549,7 +546,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -574,7 +570,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -609,6 +604,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -678,8 +674,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -824,8 +819,8 @@ "ctxt": 0 }, "value": "c0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -835,8 +830,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -913,8 +908,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -924,8 +919,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1006,8 +1001,8 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1099,8 +1094,8 @@ "ctxt": 0 }, "value": "temp1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1177,6 +1172,7 @@ "ctxt": 0 }, "value": "temp2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1246,8 +1242,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1384,8 +1379,8 @@ "ctxt": 0 }, "value": "temp3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1405,7 +1400,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1430,7 +1424,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1465,8 +1458,8 @@ "ctxt": 0 }, "value": "temp4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1496,7 +1489,6 @@ "ctxt": 0 }, "value": "myArray", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1517,7 +1509,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1543,7 +1534,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1577,7 +1567,6 @@ "ctxt": 0 }, "value": "myArray2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1598,7 +1587,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1632,7 +1620,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1652,7 +1639,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1698,8 +1684,8 @@ "ctxt": 0 }, "value": "d0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1747,7 +1733,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1782,8 +1767,8 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1807,7 +1792,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1842,6 +1826,7 @@ "ctxt": 0 }, "value": "d2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1866,8 +1851,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1891,7 +1875,6 @@ "ctxt": 0 }, "value": "temp1", - "typeAnnotation": null, "optional": false } } @@ -1926,6 +1909,7 @@ "ctxt": 0 }, "value": "d3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1948,13 +1932,11 @@ "ctxt": 0 }, "value": "myArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1978,7 +1960,6 @@ "ctxt": 0 }, "value": "temp1", - "typeAnnotation": null, "optional": false } } @@ -2013,6 +1994,7 @@ "ctxt": 0 }, "value": "d4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2035,13 +2017,11 @@ "ctxt": 0 }, "value": "myArray2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -2065,7 +2045,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -2083,7 +2062,6 @@ "ctxt": 0 }, "value": "temp1", - "typeAnnotation": null, "optional": false } } @@ -2118,8 +2096,8 @@ "ctxt": 0 }, "value": "d5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -2143,7 +2121,6 @@ "ctxt": 0 }, "value": "temp3", - "typeAnnotation": null, "optional": false } } @@ -2178,8 +2155,8 @@ "ctxt": 0 }, "value": "d6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -2203,7 +2180,6 @@ "ctxt": 0 }, "value": "temp4", - "typeAnnotation": null, "optional": false } } @@ -2238,8 +2214,8 @@ "ctxt": 0 }, "value": "d7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -2277,7 +2253,6 @@ "ctxt": 0 }, "value": "temp1", - "typeAnnotation": null, "optional": false } } @@ -2315,6 +2290,7 @@ "ctxt": 0 }, "value": "d8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2347,8 +2323,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -2382,7 +2357,6 @@ "ctxt": 0 }, "value": "temp1", - "typeAnnotation": null, "optional": false } } @@ -2420,8 +2394,8 @@ "ctxt": 0 }, "value": "d9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -2455,7 +2429,6 @@ "ctxt": 0 }, "value": "temp1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/arrayLiterals/arrayLiterals2ES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/arrayLiterals/arrayLiterals2ES6/input.ts.json index 3c8782d83b89..c95ddafe8024 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/arrayLiterals/arrayLiterals2ES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/arrayLiterals/arrayLiterals2ES6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -111,8 +111,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -187,8 +187,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -215,7 +215,6 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, "optional": false } }, @@ -267,8 +266,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -294,7 +293,6 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, "optional": false } } @@ -329,8 +327,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -396,8 +394,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -421,7 +419,6 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, "optional": false } }, @@ -457,6 +454,7 @@ "ctxt": 0 }, "value": "b0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -528,8 +526,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -549,7 +546,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -574,7 +570,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -609,6 +604,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -678,8 +674,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -824,8 +819,8 @@ "ctxt": 0 }, "value": "c0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -835,8 +830,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -913,8 +908,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -924,8 +919,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1006,8 +1001,8 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1099,8 +1094,8 @@ "ctxt": 0 }, "value": "temp1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1177,6 +1172,7 @@ "ctxt": 0 }, "value": "temp2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1246,8 +1242,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1374,7 +1369,6 @@ "ctxt": 0 }, "value": "myArray", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1395,7 +1389,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1421,7 +1414,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1455,7 +1447,6 @@ "ctxt": 0 }, "value": "myArray2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1476,7 +1467,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1510,7 +1500,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1530,7 +1519,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1576,8 +1564,8 @@ "ctxt": 0 }, "value": "d0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1625,7 +1613,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1660,8 +1647,8 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1685,7 +1672,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } @@ -1720,6 +1706,7 @@ "ctxt": 0 }, "value": "d2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1744,8 +1731,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1769,7 +1755,6 @@ "ctxt": 0 }, "value": "temp1", - "typeAnnotation": null, "optional": false } } @@ -1804,6 +1789,7 @@ "ctxt": 0 }, "value": "d3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1826,13 +1812,11 @@ "ctxt": 0 }, "value": "myArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1856,7 +1840,6 @@ "ctxt": 0 }, "value": "temp1", - "typeAnnotation": null, "optional": false } } @@ -1891,6 +1874,7 @@ "ctxt": 0 }, "value": "d4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1913,13 +1897,11 @@ "ctxt": 0 }, "value": "myArray2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1943,7 +1925,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } }, @@ -1961,7 +1942,6 @@ "ctxt": 0 }, "value": "temp1", - "typeAnnotation": null, "optional": false } } @@ -1996,8 +1976,8 @@ "ctxt": 0 }, "value": "d5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -2021,7 +2001,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -2056,8 +2035,8 @@ "ctxt": 0 }, "value": "d6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -2081,7 +2060,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } } @@ -2116,8 +2094,8 @@ "ctxt": 0 }, "value": "d7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -2141,7 +2119,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } } @@ -2176,6 +2153,7 @@ "ctxt": 0 }, "value": "d8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2208,8 +2186,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -2243,7 +2220,6 @@ "ctxt": 0 }, "value": "temp1", - "typeAnnotation": null, "optional": false } } @@ -2281,8 +2257,8 @@ "ctxt": 0 }, "value": "d9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -2316,7 +2292,6 @@ "ctxt": 0 }, "value": "temp1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/arrayLiterals/arrayLiterals3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/arrayLiterals/arrayLiterals3/input.ts.json index 561fc49a9d1e..0eb0fab7666f 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/arrayLiterals/arrayLiterals3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/arrayLiterals/arrayLiterals3/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,8 +103,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -143,6 +143,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -214,8 +215,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -305,8 +305,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -316,8 +316,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -468,8 +468,8 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -561,8 +561,8 @@ "ctxt": 0 }, "value": "temp1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -639,6 +639,7 @@ "ctxt": 0 }, "value": "temp2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -708,8 +709,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -836,7 +836,6 @@ "ctxt": 0 }, "value": "tup", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1018,7 +1017,6 @@ "ctxt": 0 }, "value": "myArray", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1039,7 +1037,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1065,7 +1062,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1099,7 +1095,6 @@ "ctxt": 0 }, "value": "myArray2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1120,7 +1115,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1154,7 +1148,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1174,7 +1167,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1220,6 +1212,7 @@ "ctxt": 0 }, "value": "c0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1242,13 +1235,11 @@ "ctxt": 0 }, "value": "tup", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1272,7 +1263,6 @@ "ctxt": 0 }, "value": "temp2", - "typeAnnotation": null, "optional": false } } @@ -1307,6 +1297,7 @@ "ctxt": 0 }, "value": "c1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1378,8 +1369,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1403,7 +1393,6 @@ "ctxt": 0 }, "value": "temp1", - "typeAnnotation": null, "optional": false } } @@ -1438,6 +1427,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1460,13 +1450,11 @@ "ctxt": 0 }, "value": "myArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1490,7 +1478,6 @@ "ctxt": 0 }, "value": "temp1", - "typeAnnotation": null, "optional": false } }, @@ -1508,7 +1495,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOpEmitParens/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOpEmitParens/input.ts.json index 81843adc0bb8..d13ec9b32180 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOpEmitParens/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOpEmitParens/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -84,7 +84,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -155,7 +154,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -177,7 +175,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -226,7 +223,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperator1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperator1/input.ts.json index 3dba012e05b1..4e5fd87d4416 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperator1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperator1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "as", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -90,7 +90,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -132,8 +131,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -183,7 +182,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -217,8 +215,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -242,7 +240,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -294,8 +291,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -369,8 +366,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperator2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperator2/input.ts.json index ee353c652353..1a964d23414b 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperator2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperator2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperator3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperator3/input.ts.json index d88992b1c8c6..90c3a078ee83 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperator3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperator3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "tag", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -49,8 +48,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -133,8 +132,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -295,8 +294,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -457,8 +456,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -619,8 +618,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -763,8 +762,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -860,8 +859,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -1022,8 +1021,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -1047,7 +1046,6 @@ "ctxt": 0 }, "value": "tag", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1178,8 +1176,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -1203,7 +1201,6 @@ "ctxt": 0 }, "value": "tag", - "typeAnnotation": null, "optional": false }, "expressions": [], diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperator4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperator4/input.ts.json index 8a07ca932b7e..2665fc7895e8 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperator4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperator4/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -72,7 +71,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "imported": null @@ -117,7 +115,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -160,7 +157,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperatorASI/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperatorASI/input.ts.json index 3d8cfe1630e6..e2bf670596a9 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperatorASI/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperatorASI/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "as", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -76,8 +74,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -144,8 +142,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -182,7 +180,6 @@ "ctxt": 0 }, "value": "as", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -253,8 +250,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -291,7 +288,6 @@ "ctxt": 0 }, "value": "as", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -305,7 +301,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperatorAmbiguity/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperatorAmbiguity/input.ts.json index 7f707294f3d5..1f4180389274 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperatorAmbiguity/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperatorAmbiguity/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -136,7 +132,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -166,7 +161,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -220,6 +214,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -236,8 +231,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -269,8 +263,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -287,7 +281,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -312,7 +305,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -338,7 +330,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -377,8 +368,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -402,7 +393,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -424,7 +414,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperatorContextualType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperatorContextualType/input.ts.json index 5737daeb773e..3903ef75eee8 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperatorContextualType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperatorContextualType/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -64,8 +64,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -76,7 +76,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "async": false, @@ -101,6 +100,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -117,8 +117,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperatorNames/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperatorNames/input.ts.json index 6a2a28fce969..4749901dbdae 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperatorNames/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/asOperator/asOperatorNames/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -90,7 +90,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -132,8 +131,8 @@ "ctxt": 0 }, "value": "as", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -178,8 +177,8 @@ "ctxt": 0 }, "value": "as1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -196,7 +195,6 @@ "ctxt": 0 }, "value": "as", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/assignmentGenericLookupTypeNarrowing/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/assignmentGenericLookupTypeNarrowing/input.ts.json index 8465a14a7b5c..4d159b738d76 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/assignmentGenericLookupTypeNarrowing/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/assignmentGenericLookupTypeNarrowing/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "mappedObject", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -61,7 +62,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -131,7 +131,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -162,8 +161,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -183,7 +181,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -204,7 +201,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -241,7 +237,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -262,6 +257,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -284,13 +280,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -326,7 +320,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -373,7 +366,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -392,7 +384,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -413,6 +404,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -435,13 +427,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -484,8 +474,8 @@ "ctxt": 0 }, "value": "element", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -502,7 +492,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -523,7 +512,6 @@ "ctxt": 0 }, "value": "mappedObject", - "typeAnnotation": null, "optional": false }, "property": { @@ -534,7 +522,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -570,7 +557,6 @@ "ctxt": 0 }, "value": "element", - "typeAnnotation": null, "optional": false }, "right": { @@ -618,8 +604,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -636,7 +622,6 @@ "ctxt": 0 }, "value": "element", - "typeAnnotation": null, "optional": false }, "property": { @@ -647,7 +632,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -683,7 +667,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/assignmentLHSIsReference/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/assignmentLHSIsReference/input.ts.json index 7eb22822475e..b207be67e7d5 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/assignmentLHSIsReference/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/assignmentLHSIsReference/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -127,8 +127,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -138,7 +138,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -153,7 +152,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -174,6 +172,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -190,8 +189,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -232,8 +230,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -243,7 +241,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -280,6 +277,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -311,7 +309,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -339,8 +336,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -377,7 +373,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, "property": { @@ -388,7 +383,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -401,7 +395,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -436,7 +429,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, "property": { @@ -463,7 +455,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -498,7 +489,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false } }, @@ -510,7 +500,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -525,7 +514,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -546,6 +534,7 @@ "ctxt": 0 }, "value": "x4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -562,8 +551,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -611,7 +599,6 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, "optional": false } }, @@ -623,7 +610,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -672,7 +658,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, "property": { @@ -683,7 +668,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -697,7 +681,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -739,7 +722,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, "property": { @@ -767,7 +749,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/assignmentTypeNarrowing/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/assignmentTypeNarrowing/input.ts.json index 438ccad03c6e..9ebd222922b4 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/assignmentTypeNarrowing/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/assignmentTypeNarrowing/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -88,15 +89,13 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -126,8 +125,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -160,7 +159,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -195,8 +193,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -241,7 +239,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -283,8 +280,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -345,7 +342,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -394,7 +390,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -421,7 +416,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -454,7 +448,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -498,7 +491,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -509,8 +501,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -535,7 +527,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -568,7 +559,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -617,7 +607,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -657,7 +646,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -690,7 +678,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -734,7 +721,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -752,8 +738,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "RegExpLiteral", @@ -790,7 +776,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -823,7 +808,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -852,6 +836,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -876,8 +861,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -900,8 +884,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -911,7 +895,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "body": { @@ -937,7 +920,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -960,7 +942,6 @@ "ctxt": 0 }, "value": "AOrArrA", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -986,7 +967,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1017,7 +997,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1044,7 +1023,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1078,6 +1056,7 @@ "ctxt": 0 }, "value": "arr", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1100,7 +1079,6 @@ "ctxt": 0 }, "value": "AOrArrA", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1135,7 +1113,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1179,8 +1156,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1210,7 +1186,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1266,7 +1241,6 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, "optional": false }, "property": { @@ -1277,7 +1251,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1303,7 +1276,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/compoundAdditionAssignmentLHSCanBeAssigned/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/compoundAdditionAssignmentLHSCanBeAssigned/input.ts.json index b885c7f0c26b..929a1ffa4a8d 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/compoundAdditionAssignmentLHSCanBeAssigned/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/compoundAdditionAssignmentLHSCanBeAssigned/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -94,6 +91,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -110,8 +108,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,6 +140,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -159,8 +157,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -192,6 +189,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -208,8 +206,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -239,8 +236,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -250,7 +247,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -278,8 +274,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -289,7 +285,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -317,8 +312,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -354,8 +349,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -391,8 +386,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -433,8 +428,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -451,7 +446,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -462,7 +456,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -492,8 +485,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -529,8 +522,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -565,8 +558,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -576,7 +569,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -606,6 +598,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -622,8 +615,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -653,8 +645,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -664,7 +656,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -692,8 +683,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -703,7 +694,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -731,8 +721,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -768,8 +758,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -805,8 +795,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -847,8 +837,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -865,7 +855,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -876,7 +865,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -906,8 +894,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -943,8 +931,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -979,8 +967,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -990,7 +978,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1020,6 +1007,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1036,8 +1024,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1067,8 +1054,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1078,7 +1065,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1106,8 +1092,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1143,8 +1129,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1161,7 +1147,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1172,7 +1157,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1202,8 +1186,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -1238,8 +1222,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1249,7 +1233,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1279,6 +1262,7 @@ "ctxt": 0 }, "value": "x4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1301,13 +1285,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1337,8 +1319,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1348,7 +1330,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1376,8 +1357,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1413,8 +1394,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1431,7 +1412,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1442,7 +1422,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1472,8 +1451,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -1508,8 +1487,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1519,7 +1498,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1549,6 +1527,7 @@ "ctxt": 0 }, "value": "x5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1565,8 +1544,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1596,8 +1574,8 @@ "ctxt": 0 }, "value": "x5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1607,7 +1585,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1637,6 +1614,7 @@ "ctxt": 0 }, "value": "x6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1653,8 +1631,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1684,8 +1661,8 @@ "ctxt": 0 }, "value": "x6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1695,7 +1672,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1723,8 +1699,8 @@ "ctxt": 0 }, "value": "x6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -1767,6 +1743,7 @@ "ctxt": 0 }, "value": "x7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1783,8 +1760,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1814,8 +1790,8 @@ "ctxt": 0 }, "value": "x7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1825,7 +1801,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/compoundAdditionAssignmentLHSCannotBeAssigned/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/compoundAdditionAssignmentLHSCannotBeAssigned/input.ts.json index ec3bda38b9f8..fffaaa083703 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/compoundAdditionAssignmentLHSCannotBeAssigned/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/compoundAdditionAssignmentLHSCannotBeAssigned/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -82,7 +79,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "init": null @@ -114,6 +110,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -130,8 +127,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -161,8 +157,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -205,6 +201,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -221,8 +218,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -252,8 +248,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -296,6 +292,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -318,13 +315,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -354,8 +349,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -398,6 +393,7 @@ "ctxt": 0 }, "value": "x4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -429,7 +425,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -457,8 +452,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -488,8 +482,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -532,6 +526,7 @@ "ctxt": 0 }, "value": "x5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -548,8 +543,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -579,8 +573,8 @@ "ctxt": 0 }, "value": "x5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/compoundAdditionAssignmentWithInvalidOperands/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/compoundAdditionAssignmentWithInvalidOperands/input.ts.json index 9855fc4d3eca..d055b3436670 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/compoundAdditionAssignmentWithInvalidOperands/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/compoundAdditionAssignmentWithInvalidOperands/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -94,6 +91,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -110,8 +108,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,6 +140,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -159,8 +157,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -190,8 +187,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -201,7 +198,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -229,8 +225,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -266,8 +262,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -303,8 +299,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -321,7 +317,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -332,7 +327,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -362,8 +356,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -399,8 +393,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -435,8 +429,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -446,7 +440,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -476,6 +469,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -492,8 +486,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -523,8 +516,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -534,7 +527,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -562,8 +554,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -599,8 +591,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -636,8 +628,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -654,7 +646,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -665,7 +656,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -695,8 +685,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -732,8 +722,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -768,8 +758,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -779,7 +769,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -809,6 +798,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -825,8 +815,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -856,8 +845,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -867,7 +856,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -895,8 +883,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -932,8 +920,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -969,8 +957,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -987,7 +975,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -998,7 +985,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1028,8 +1014,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1065,8 +1051,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -1101,8 +1087,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1112,7 +1098,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1142,6 +1127,7 @@ "ctxt": 0 }, "value": "x4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1158,8 +1144,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1189,8 +1174,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1200,7 +1185,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1228,8 +1212,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -1265,8 +1249,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1304,6 +1288,7 @@ "ctxt": 0 }, "value": "x5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1326,13 +1311,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1362,8 +1345,8 @@ "ctxt": 0 }, "value": "x5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1373,7 +1356,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1401,8 +1383,8 @@ "ctxt": 0 }, "value": "x5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -1438,8 +1420,8 @@ "ctxt": 0 }, "value": "x5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/compoundArithmeticAssignmentLHSCanBeAssigned/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/compoundArithmeticAssignmentLHSCanBeAssigned/input.ts.json index ee153205bc1b..0217faa20506 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/compoundArithmeticAssignmentLHSCanBeAssigned/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/compoundArithmeticAssignmentLHSCanBeAssigned/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -82,7 +79,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "init": null @@ -114,6 +110,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -130,8 +127,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -163,6 +159,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -179,8 +176,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -212,6 +208,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -234,13 +231,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -272,6 +267,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -288,8 +284,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -319,8 +314,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -330,7 +325,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -358,8 +352,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -369,7 +363,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -397,8 +390,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -408,7 +401,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -436,8 +428,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -472,8 +464,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -483,7 +475,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -513,6 +504,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -529,8 +521,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -560,8 +551,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -571,7 +562,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -599,8 +589,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -610,7 +600,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -638,8 +627,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -649,7 +638,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -677,8 +665,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -713,8 +701,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -724,7 +712,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -754,6 +741,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -776,13 +764,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -812,8 +798,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -823,7 +809,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -851,8 +836,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -862,7 +847,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -890,8 +874,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -901,7 +885,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -929,8 +912,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -965,8 +948,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -976,7 +959,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/compoundArithmeticAssignmentWithInvalidOperands/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/compoundArithmeticAssignmentWithInvalidOperands/input.ts.json index d139857e64ca..1e3035385c57 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/compoundArithmeticAssignmentWithInvalidOperands/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/compoundArithmeticAssignmentWithInvalidOperands/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -94,6 +91,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -110,8 +108,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,6 +140,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -159,8 +157,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -192,6 +189,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -208,8 +206,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -239,8 +236,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -250,7 +247,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -278,8 +274,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -289,7 +285,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -317,8 +312,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -354,8 +349,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -391,8 +386,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -433,8 +428,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -451,7 +446,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -462,7 +456,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -492,8 +485,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -529,8 +522,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -565,8 +558,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -576,7 +569,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -606,6 +598,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -622,8 +615,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -653,8 +645,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -664,7 +656,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -692,8 +683,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -703,7 +694,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -731,8 +721,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -768,8 +758,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -805,8 +795,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -847,8 +837,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -865,7 +855,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -876,7 +865,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -906,8 +894,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -943,8 +931,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -979,8 +967,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -990,7 +978,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1020,6 +1007,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1036,8 +1024,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1067,8 +1054,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1078,7 +1065,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1106,8 +1092,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1117,7 +1103,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1145,8 +1130,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -1182,8 +1167,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1219,8 +1204,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -1261,8 +1246,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1279,7 +1264,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1290,7 +1274,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1320,8 +1303,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1357,8 +1340,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -1393,8 +1376,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1404,7 +1387,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1434,6 +1416,7 @@ "ctxt": 0 }, "value": "x4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1450,8 +1433,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1481,8 +1463,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1492,7 +1474,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1520,8 +1501,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1531,7 +1512,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1559,8 +1539,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -1596,8 +1576,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1633,8 +1613,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -1675,8 +1655,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1693,7 +1673,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1704,7 +1683,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1734,8 +1712,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1771,8 +1749,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -1807,8 +1785,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1818,7 +1796,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1848,6 +1825,7 @@ "ctxt": 0 }, "value": "x5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1864,8 +1842,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1895,8 +1872,8 @@ "ctxt": 0 }, "value": "x5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1906,7 +1883,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1934,8 +1910,8 @@ "ctxt": 0 }, "value": "x5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -1971,8 +1947,8 @@ "ctxt": 0 }, "value": "x5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -2013,8 +1989,8 @@ "ctxt": 0 }, "value": "x5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -2052,6 +2028,7 @@ "ctxt": 0 }, "value": "x6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2074,13 +2051,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2110,8 +2085,8 @@ "ctxt": 0 }, "value": "x6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2121,7 +2096,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2149,8 +2123,8 @@ "ctxt": 0 }, "value": "x6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -2186,8 +2160,8 @@ "ctxt": 0 }, "value": "x6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -2228,8 +2202,8 @@ "ctxt": 0 }, "value": "x6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/compoundAssignmentLHSIsReference/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/compoundAssignmentLHSIsReference/input.ts.json index 04f8c19f033a..2d6cd3dc8742 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/compoundAssignmentLHSIsReference/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/assignmentOperator/compoundAssignmentLHSIsReference/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -64,6 +64,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,8 +81,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -111,8 +111,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -122,7 +122,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -150,8 +149,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -161,7 +160,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -176,7 +174,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -197,6 +194,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -213,8 +211,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -255,8 +252,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -266,7 +263,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -294,8 +290,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -305,7 +301,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -342,6 +337,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -373,7 +369,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -401,8 +396,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -439,7 +433,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, "property": { @@ -450,7 +443,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -463,7 +455,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -498,7 +489,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, "property": { @@ -509,7 +499,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -522,7 +511,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -557,7 +545,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, "property": { @@ -584,7 +571,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -619,7 +605,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, "property": { @@ -646,7 +631,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -681,7 +665,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false } }, @@ -693,7 +676,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -728,7 +710,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false } }, @@ -740,7 +721,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -755,7 +735,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -776,6 +755,7 @@ "ctxt": 0 }, "value": "x4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -792,8 +772,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -841,7 +820,6 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, "optional": false } }, @@ -853,7 +831,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -888,7 +865,6 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, "optional": false } }, @@ -900,7 +876,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -949,7 +924,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, "property": { @@ -960,7 +934,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -974,7 +947,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -1016,7 +988,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1027,7 +998,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1041,7 +1011,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -1083,7 +1052,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1111,7 +1079,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -1153,7 +1120,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1181,7 +1147,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithAnyAndEveryType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithAnyAndEveryType/input.ts.json index 8cbb3bdeac34..2938eba8751d 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithAnyAndEveryType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithAnyAndEveryType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -123,7 +120,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -178,7 +174,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -197,7 +192,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -217,7 +211,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -237,7 +230,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "init": null @@ -261,7 +253,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -304,8 +295,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -341,6 +332,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -357,8 +349,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -390,6 +381,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -406,8 +398,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -439,6 +430,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -455,8 +447,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -488,6 +479,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -504,8 +496,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -537,6 +528,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -559,13 +551,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -597,8 +587,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -616,7 +606,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -627,7 +616,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -660,8 +648,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -679,7 +667,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -690,7 +677,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -723,8 +709,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -742,7 +728,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -753,7 +738,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -786,8 +770,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -805,7 +789,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -816,7 +799,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -849,8 +831,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -868,7 +850,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -879,7 +860,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -912,8 +892,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -931,7 +911,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -942,7 +921,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -975,8 +953,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -994,7 +972,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1005,7 +982,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1038,8 +1014,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1057,7 +1033,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1068,7 +1043,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1101,8 +1075,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1120,7 +1094,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -1131,7 +1104,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1164,8 +1136,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1183,7 +1155,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1194,7 +1165,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -1227,8 +1197,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1246,7 +1216,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1264,7 +1233,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1300,8 +1268,8 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1319,7 +1287,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1330,7 +1297,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -1363,8 +1329,8 @@ "ctxt": 0 }, "value": "r13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1382,7 +1348,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1400,7 +1365,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1436,8 +1400,8 @@ "ctxt": 0 }, "value": "r14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1455,7 +1419,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1466,7 +1429,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false } }, @@ -1499,8 +1461,8 @@ "ctxt": 0 }, "value": "r15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1518,7 +1480,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1536,7 +1497,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1547,7 +1507,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1582,8 +1541,8 @@ "ctxt": 0 }, "value": "r16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1601,7 +1560,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1612,7 +1570,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } }, @@ -1645,8 +1602,8 @@ "ctxt": 0 }, "value": "r17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1664,7 +1621,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1711,8 +1667,8 @@ "ctxt": 0 }, "value": "r18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1730,7 +1686,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1772,8 +1727,8 @@ "ctxt": 0 }, "value": "r19", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1791,7 +1746,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1812,7 +1766,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1862,8 +1815,8 @@ "ctxt": 0 }, "value": "r20", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1881,7 +1834,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1907,6 +1859,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1923,8 +1876,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -1950,7 +1902,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithConstrainedTypeParameter/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithConstrainedTypeParameter/input.ts.json index e9e1399f390f..2bbe8cd5b89f 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithConstrainedTypeParameter/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithConstrainedTypeParameter/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "sum", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -73,6 +72,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -95,13 +95,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -120,6 +118,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -142,13 +141,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -189,8 +186,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -208,7 +205,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -226,7 +222,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -237,7 +232,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -268,8 +262,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -286,7 +280,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -297,7 +290,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -331,7 +323,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -349,7 +340,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -375,7 +365,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -409,7 +398,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -437,7 +425,6 @@ "ctxt": 0 }, "value": "realSum", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -458,6 +445,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -474,8 +462,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -494,6 +481,7 @@ "ctxt": 0 }, "value": "vs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -523,14 +511,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } }, { @@ -549,6 +535,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -571,13 +558,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -628,8 +613,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -644,7 +629,6 @@ "ctxt": 0 }, "value": "vs", - "typeAnnotation": null, "optional": false }, "body": { @@ -678,8 +662,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -697,7 +681,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -715,7 +698,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -726,7 +708,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -757,8 +738,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -775,7 +756,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -786,7 +766,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -823,7 +802,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -841,7 +819,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -867,7 +844,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -901,7 +877,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithInvalidOperands/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithInvalidOperands/input.ts.json index 5ea11410199c..bc1c0d5d8f8c 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithInvalidOperands/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithInvalidOperands/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -123,7 +120,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -178,7 +174,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -197,7 +192,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -217,7 +211,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -237,7 +230,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "init": null @@ -261,7 +253,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -304,8 +295,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -341,6 +332,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -357,8 +349,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -390,6 +381,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -406,8 +398,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -439,6 +430,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -461,13 +453,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -499,6 +489,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -521,13 +512,11 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -559,8 +548,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -578,7 +567,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -589,7 +577,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -622,8 +609,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -641,7 +628,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -652,7 +638,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -685,8 +670,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -704,7 +689,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -715,7 +699,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -748,8 +731,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -767,7 +750,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -778,7 +760,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -811,8 +792,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -830,7 +811,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -841,7 +821,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -874,8 +853,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -893,7 +872,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -904,7 +882,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -937,8 +914,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -956,7 +933,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -967,7 +943,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1000,8 +975,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1019,7 +994,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1030,7 +1004,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1063,8 +1036,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1082,7 +1055,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1093,7 +1065,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1126,8 +1097,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1145,7 +1116,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1187,8 +1157,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1246,8 +1216,8 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1305,8 +1275,8 @@ "ctxt": 0 }, "value": "r13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1364,8 +1334,8 @@ "ctxt": 0 }, "value": "r14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1383,7 +1353,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1394,7 +1363,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -1427,8 +1395,8 @@ "ctxt": 0 }, "value": "r15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1446,7 +1414,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1457,7 +1424,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -1490,8 +1456,8 @@ "ctxt": 0 }, "value": "r16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1509,7 +1475,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1527,7 +1492,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1563,8 +1527,8 @@ "ctxt": 0 }, "value": "r17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1582,7 +1546,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1593,7 +1556,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -1626,8 +1588,8 @@ "ctxt": 0 }, "value": "r18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1652,7 +1614,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1663,7 +1624,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1683,7 +1643,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1719,8 +1678,8 @@ "ctxt": 0 }, "value": "r19", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1745,7 +1704,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1756,7 +1714,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1783,7 +1740,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -1794,7 +1750,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1832,8 +1787,8 @@ "ctxt": 0 }, "value": "r20", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1858,7 +1813,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1869,7 +1823,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1882,7 +1835,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithNullValueAndInvalidOperator/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithNullValueAndInvalidOperator/input.ts.json index cabb0ad7556d..f543d2dc59cd 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithNullValueAndInvalidOperator/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithNullValueAndInvalidOperator/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -102,6 +100,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -118,8 +117,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -151,6 +149,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -173,13 +172,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -211,6 +208,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -227,8 +225,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -260,6 +257,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -282,13 +280,11 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -320,8 +316,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -347,7 +343,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -380,8 +375,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -407,7 +402,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -440,8 +434,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -467,7 +461,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -500,8 +493,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -519,7 +512,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -560,8 +552,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -579,7 +571,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -620,8 +611,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -647,7 +638,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -680,8 +670,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -707,7 +697,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -740,8 +729,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -798,8 +787,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -835,7 +824,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -885,8 +873,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -919,7 +907,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -955,8 +942,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithNullValueAndValidOperator/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithNullValueAndValidOperator/input.ts.json index c30abb877304..dbe07efd134f 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithNullValueAndValidOperator/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithNullValueAndValidOperator/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -82,7 +79,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "init": null @@ -114,6 +110,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -130,8 +127,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -163,6 +159,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -179,8 +176,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -212,6 +208,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -234,13 +231,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -272,6 +267,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -288,8 +284,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -321,6 +316,7 @@ "ctxt": 0 }, "value": "r1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -337,8 +333,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -364,7 +359,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -397,6 +391,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -413,8 +408,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -432,7 +426,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -473,8 +466,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -500,7 +493,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -533,8 +525,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -591,8 +583,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -618,7 +610,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -651,8 +642,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -685,7 +676,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -696,7 +686,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -731,8 +720,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -765,7 +754,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -814,8 +802,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -833,7 +821,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -874,8 +861,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -932,8 +919,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -951,7 +938,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -992,8 +978,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1018,7 +1004,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1029,7 +1014,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1072,8 +1056,8 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1098,7 +1082,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1155,8 +1138,8 @@ "ctxt": 0 }, "value": "r13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1182,7 +1165,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -1215,8 +1197,8 @@ "ctxt": 0 }, "value": "r14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1278,8 +1260,8 @@ "ctxt": 0 }, "value": "r15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1297,7 +1279,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1338,8 +1319,8 @@ "ctxt": 0 }, "value": "r16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithNumberAndEnum/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithNumberAndEnum/input.ts.json index 44528a5bdb3a..d140ed86a4d4 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithNumberAndEnum/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithNumberAndEnum/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -86,7 +83,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "members": [ @@ -105,7 +101,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "init": null @@ -125,7 +120,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "init": null @@ -157,6 +151,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -173,8 +168,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -206,6 +200,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -228,13 +223,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -266,6 +259,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -296,7 +290,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -316,15 +309,13 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -356,8 +347,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -375,7 +366,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -386,7 +376,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -419,8 +408,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -438,7 +427,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -449,7 +437,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -482,8 +469,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -501,7 +488,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -512,7 +498,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -545,8 +530,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -564,7 +549,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -575,7 +559,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -608,8 +591,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -636,7 +619,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -669,8 +651,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -695,7 +677,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -706,7 +687,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -750,8 +730,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -776,7 +756,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -787,7 +766,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -807,7 +785,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -818,7 +795,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -853,8 +829,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -879,7 +855,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -913,7 +888,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -962,8 +936,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -988,7 +962,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1022,7 +995,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "property": { @@ -1071,8 +1043,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1090,7 +1062,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1101,7 +1072,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1134,8 +1104,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1153,7 +1123,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1164,7 +1133,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1197,8 +1165,8 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1216,7 +1184,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1227,7 +1194,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1260,8 +1226,8 @@ "ctxt": 0 }, "value": "r13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1279,7 +1245,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1290,7 +1255,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1323,8 +1287,8 @@ "ctxt": 0 }, "value": "r14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1342,7 +1306,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1353,7 +1316,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithOnlyNullValueOrUndefinedValue/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithOnlyNullValueOrUndefinedValue/input.ts.json index bdca1329feb3..1eabac3f458f 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithOnlyNullValueOrUndefinedValue/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithOnlyNullValueOrUndefinedValue/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -88,8 +88,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -115,7 +115,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -148,8 +147,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -167,7 +166,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -208,8 +206,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -227,7 +225,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -238,7 +235,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithStringAndEveryType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithStringAndEveryType/input.ts.json index 026c1b461f78..03ccab6a72a9 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithStringAndEveryType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithStringAndEveryType/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -82,7 +79,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "init": null @@ -114,6 +110,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -130,8 +127,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -163,6 +159,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -179,8 +176,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -212,6 +208,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -228,8 +225,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -261,6 +257,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -277,8 +274,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -310,6 +306,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -332,13 +329,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -370,6 +365,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -386,8 +382,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -419,6 +414,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -441,13 +437,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -479,6 +473,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -495,8 +490,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -528,8 +522,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -547,7 +541,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -558,7 +551,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -591,8 +583,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -610,7 +602,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -621,7 +612,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -654,8 +644,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -673,7 +663,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -684,7 +673,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -717,8 +705,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -736,7 +724,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -747,7 +734,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -780,8 +766,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -799,7 +785,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -810,7 +795,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -843,8 +827,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -862,7 +846,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -873,7 +856,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -906,8 +888,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -925,7 +907,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -936,7 +917,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -969,8 +949,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -988,7 +968,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -999,7 +978,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1032,8 +1010,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1051,7 +1029,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1062,7 +1039,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1095,8 +1071,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1114,7 +1090,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1125,7 +1100,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1158,8 +1132,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1177,7 +1151,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1188,7 +1161,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1221,8 +1193,8 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1240,7 +1212,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -1251,7 +1222,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1284,8 +1254,8 @@ "ctxt": 0 }, "value": "r13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1303,7 +1273,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -1314,7 +1283,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1347,8 +1315,8 @@ "ctxt": 0 }, "value": "r14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1366,7 +1334,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -1377,7 +1344,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1410,8 +1376,8 @@ "ctxt": 0 }, "value": "r15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1429,7 +1395,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1440,7 +1405,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false } }, @@ -1473,8 +1437,8 @@ "ctxt": 0 }, "value": "r16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1492,7 +1456,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1510,7 +1473,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1521,7 +1483,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1556,8 +1517,8 @@ "ctxt": 0 }, "value": "r17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1575,7 +1536,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1622,8 +1582,8 @@ "ctxt": 0 }, "value": "r18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1641,7 +1601,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1683,8 +1642,8 @@ "ctxt": 0 }, "value": "r19", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1702,7 +1661,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1723,7 +1681,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1773,8 +1730,8 @@ "ctxt": 0 }, "value": "r20", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1792,7 +1749,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithTypeParameter/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithTypeParameter/input.ts.json index 1cd16b1aea00..a97741ba0df0 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithTypeParameter/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithTypeParameter/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -79,7 +76,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,6 +96,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -122,13 +119,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -147,6 +142,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -169,13 +165,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -218,6 +212,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -234,8 +229,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -267,6 +261,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -283,8 +278,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -316,6 +310,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -332,8 +327,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -365,6 +359,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -381,8 +376,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -414,6 +408,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -436,13 +431,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -474,6 +467,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -496,13 +490,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -534,6 +526,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -550,8 +543,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -583,6 +575,7 @@ "ctxt": 0 }, "value": "r1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -599,8 +592,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -618,7 +610,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -629,7 +620,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -662,8 +652,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -681,7 +671,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -692,7 +681,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -725,8 +713,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -744,7 +732,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -755,7 +742,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -788,8 +774,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -807,7 +793,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -818,7 +803,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -851,8 +835,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -870,7 +854,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -881,7 +864,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -914,8 +896,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -933,7 +915,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -944,7 +925,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -977,8 +957,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -996,7 +976,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1007,7 +986,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -1040,8 +1018,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1059,7 +1037,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1070,7 +1047,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1103,8 +1079,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1122,7 +1098,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1133,7 +1108,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1166,8 +1140,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1185,7 +1159,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1196,7 +1169,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1229,8 +1201,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1248,7 +1220,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1259,7 +1230,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1292,8 +1262,8 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1311,7 +1281,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -1322,7 +1291,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1355,8 +1323,8 @@ "ctxt": 0 }, "value": "r13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1374,7 +1342,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -1385,7 +1352,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1418,8 +1384,8 @@ "ctxt": 0 }, "value": "r14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1437,7 +1403,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -1448,7 +1413,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1481,8 +1445,8 @@ "ctxt": 0 }, "value": "r15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1500,7 +1464,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1541,8 +1504,8 @@ "ctxt": 0 }, "value": "r16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1560,7 +1523,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1571,7 +1533,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1604,8 +1565,8 @@ "ctxt": 0 }, "value": "r17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1623,7 +1584,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1634,7 +1594,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1667,8 +1626,8 @@ "ctxt": 0 }, "value": "r18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1686,7 +1645,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1697,7 +1655,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -1730,8 +1687,8 @@ "ctxt": 0 }, "value": "r19", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1749,7 +1706,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1812,8 +1768,8 @@ "ctxt": 0 }, "value": "r20", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1831,7 +1787,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1875,7 +1830,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1896,7 +1850,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithUndefinedValueAndInvalidOperands/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithUndefinedValueAndInvalidOperands/input.ts.json index d613d5dda434..eb2a7250190a 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithUndefinedValueAndInvalidOperands/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithUndefinedValueAndInvalidOperands/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -102,6 +100,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -118,8 +117,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -151,6 +149,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -173,13 +172,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -211,6 +208,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -227,8 +225,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -260,6 +257,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -282,13 +280,11 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -320,8 +316,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -339,7 +335,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -350,7 +345,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -383,8 +377,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -402,7 +396,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -413,7 +406,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -446,8 +438,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -465,7 +457,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -476,7 +467,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -509,8 +499,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -528,7 +518,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -539,7 +528,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -572,8 +560,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -591,7 +579,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -602,7 +589,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -635,8 +621,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -654,7 +640,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -665,7 +650,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -698,8 +682,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -717,7 +701,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -728,7 +711,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -761,8 +743,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -780,7 +762,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -822,8 +803,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -841,7 +822,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -862,7 +842,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -912,8 +891,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -931,7 +910,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -949,7 +927,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -985,8 +962,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1004,7 +981,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithUndefinedValueAndValidOperator/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithUndefinedValueAndValidOperator/input.ts.json index fe3a5491eb25..777cb48e3629 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithUndefinedValueAndValidOperator/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/additionOperator/additionOperatorWithUndefinedValueAndValidOperator/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -82,7 +79,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "init": null @@ -114,6 +110,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -130,8 +127,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -163,6 +159,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -179,8 +176,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -212,6 +208,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -234,13 +231,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -272,6 +267,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -288,8 +284,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -321,6 +316,7 @@ "ctxt": 0 }, "value": "r1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -337,8 +333,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -356,7 +351,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -367,7 +361,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -400,6 +393,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -416,8 +410,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -435,7 +428,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -446,7 +438,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -479,8 +470,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -498,7 +489,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -509,7 +499,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -542,8 +531,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -561,7 +550,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -603,8 +591,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -622,7 +610,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -633,7 +620,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -666,8 +652,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -685,7 +671,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -703,7 +688,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -714,7 +698,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -749,8 +732,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -768,7 +751,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -786,7 +768,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -835,8 +816,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -854,7 +835,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -865,7 +845,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -898,8 +877,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -926,7 +905,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -959,8 +937,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -978,7 +956,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -989,7 +966,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1022,8 +998,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1048,7 +1024,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1059,7 +1034,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1072,7 +1046,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1105,8 +1078,8 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1131,7 +1104,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1158,7 +1130,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1191,8 +1162,8 @@ "ctxt": 0 }, "value": "r13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1210,7 +1181,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1221,7 +1191,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -1254,8 +1223,8 @@ "ctxt": 0 }, "value": "r14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1273,7 +1242,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1320,8 +1288,8 @@ "ctxt": 0 }, "value": "r15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1339,7 +1307,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1350,7 +1317,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1383,8 +1349,8 @@ "ctxt": 0 }, "value": "r16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1416,7 +1382,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithAnyAndNumber/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithAnyAndNumber/input.ts.json index b41bcab1a4d7..4bf0f1409583 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithAnyAndNumber/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithAnyAndNumber/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,8 +129,8 @@ "ctxt": 0 }, "value": "ra1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -148,7 +148,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -159,7 +158,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -192,8 +190,8 @@ "ctxt": 0 }, "value": "ra2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -211,7 +209,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -222,7 +219,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -255,8 +251,8 @@ "ctxt": 0 }, "value": "ra3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -274,7 +270,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -316,8 +311,8 @@ "ctxt": 0 }, "value": "ra4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -344,7 +339,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -377,8 +371,8 @@ "ctxt": 0 }, "value": "ra5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -436,8 +430,8 @@ "ctxt": 0 }, "value": "ra6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -455,7 +449,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -497,8 +490,8 @@ "ctxt": 0 }, "value": "ra7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -525,7 +518,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -558,8 +550,8 @@ "ctxt": 0 }, "value": "ra8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -577,7 +569,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -588,7 +579,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -621,8 +611,8 @@ "ctxt": 0 }, "value": "rb1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -640,7 +630,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -651,7 +640,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -684,8 +672,8 @@ "ctxt": 0 }, "value": "rb2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -703,7 +691,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -714,7 +701,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -747,8 +733,8 @@ "ctxt": 0 }, "value": "rb3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -766,7 +752,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -808,8 +793,8 @@ "ctxt": 0 }, "value": "rb4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -836,7 +821,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -869,8 +853,8 @@ "ctxt": 0 }, "value": "rb5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -928,8 +912,8 @@ "ctxt": 0 }, "value": "rb6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -947,7 +931,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -989,8 +972,8 @@ "ctxt": 0 }, "value": "rb7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1017,7 +1000,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1050,8 +1032,8 @@ "ctxt": 0 }, "value": "rb8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1069,7 +1051,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1080,7 +1061,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1113,8 +1093,8 @@ "ctxt": 0 }, "value": "rc1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1132,7 +1112,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1143,7 +1122,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1176,8 +1154,8 @@ "ctxt": 0 }, "value": "rc2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1195,7 +1173,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1206,7 +1183,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1239,8 +1215,8 @@ "ctxt": 0 }, "value": "rc3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1258,7 +1234,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1300,8 +1275,8 @@ "ctxt": 0 }, "value": "rc4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1328,7 +1303,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1361,8 +1335,8 @@ "ctxt": 0 }, "value": "rc5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1420,8 +1394,8 @@ "ctxt": 0 }, "value": "rc6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1439,7 +1413,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1481,8 +1454,8 @@ "ctxt": 0 }, "value": "rc7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1509,7 +1482,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1542,8 +1514,8 @@ "ctxt": 0 }, "value": "rc8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1561,7 +1533,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1572,7 +1543,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1605,8 +1575,8 @@ "ctxt": 0 }, "value": "rd1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1624,7 +1594,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1635,7 +1604,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1668,8 +1636,8 @@ "ctxt": 0 }, "value": "rd2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1687,7 +1655,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1698,7 +1665,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1731,8 +1697,8 @@ "ctxt": 0 }, "value": "rd3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1750,7 +1716,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1792,8 +1757,8 @@ "ctxt": 0 }, "value": "rd4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1820,7 +1785,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1853,8 +1817,8 @@ "ctxt": 0 }, "value": "rd5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1912,8 +1876,8 @@ "ctxt": 0 }, "value": "rd6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1931,7 +1895,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1973,8 +1936,8 @@ "ctxt": 0 }, "value": "rd7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2001,7 +1964,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2034,8 +1996,8 @@ "ctxt": 0 }, "value": "rd8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2053,7 +2015,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2064,7 +2025,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2097,8 +2057,8 @@ "ctxt": 0 }, "value": "re1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2116,7 +2076,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2127,7 +2086,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2160,8 +2118,8 @@ "ctxt": 0 }, "value": "re2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2179,7 +2137,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2190,7 +2147,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2223,8 +2179,8 @@ "ctxt": 0 }, "value": "re3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2242,7 +2198,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2284,8 +2239,8 @@ "ctxt": 0 }, "value": "re4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2312,7 +2267,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2345,8 +2299,8 @@ "ctxt": 0 }, "value": "re5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2404,8 +2358,8 @@ "ctxt": 0 }, "value": "re6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2423,7 +2377,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2465,8 +2418,8 @@ "ctxt": 0 }, "value": "re7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2493,7 +2446,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2526,8 +2478,8 @@ "ctxt": 0 }, "value": "re8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2545,7 +2497,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2556,7 +2507,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2589,8 +2539,8 @@ "ctxt": 0 }, "value": "rf1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2608,7 +2558,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2619,7 +2568,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2652,8 +2600,8 @@ "ctxt": 0 }, "value": "rf2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2671,7 +2619,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2682,7 +2629,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2715,8 +2661,8 @@ "ctxt": 0 }, "value": "rf3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2734,7 +2680,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2776,8 +2721,8 @@ "ctxt": 0 }, "value": "rf4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2804,7 +2749,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2837,8 +2781,8 @@ "ctxt": 0 }, "value": "rf5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2896,8 +2840,8 @@ "ctxt": 0 }, "value": "rf6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2915,7 +2859,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2957,8 +2900,8 @@ "ctxt": 0 }, "value": "rf7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2985,7 +2928,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3018,8 +2960,8 @@ "ctxt": 0 }, "value": "rf8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3037,7 +2979,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3048,7 +2989,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3081,8 +3021,8 @@ "ctxt": 0 }, "value": "rg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3100,7 +3040,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3111,7 +3050,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3144,8 +3082,8 @@ "ctxt": 0 }, "value": "rg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3163,7 +3101,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3174,7 +3111,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3207,8 +3143,8 @@ "ctxt": 0 }, "value": "rg3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3226,7 +3162,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3268,8 +3203,8 @@ "ctxt": 0 }, "value": "rg4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3296,7 +3231,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3329,8 +3263,8 @@ "ctxt": 0 }, "value": "rg5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3388,8 +3322,8 @@ "ctxt": 0 }, "value": "rg6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3407,7 +3341,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3449,8 +3382,8 @@ "ctxt": 0 }, "value": "rg7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3477,7 +3410,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3510,8 +3442,8 @@ "ctxt": 0 }, "value": "rg8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3529,7 +3461,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3540,7 +3471,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3573,8 +3503,8 @@ "ctxt": 0 }, "value": "rh1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3592,7 +3522,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3603,7 +3532,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3636,8 +3564,8 @@ "ctxt": 0 }, "value": "rh2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3655,7 +3583,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3666,7 +3593,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3699,8 +3625,8 @@ "ctxt": 0 }, "value": "rh3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3718,7 +3644,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3760,8 +3685,8 @@ "ctxt": 0 }, "value": "rh4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3788,7 +3713,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3821,8 +3745,8 @@ "ctxt": 0 }, "value": "rh5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3880,8 +3804,8 @@ "ctxt": 0 }, "value": "rh6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3899,7 +3823,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3941,8 +3864,8 @@ "ctxt": 0 }, "value": "rh7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3969,7 +3892,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4002,8 +3924,8 @@ "ctxt": 0 }, "value": "rh8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4021,7 +3943,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4032,7 +3953,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4065,8 +3985,8 @@ "ctxt": 0 }, "value": "ri1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4084,7 +4004,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4095,7 +4014,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4128,8 +4046,8 @@ "ctxt": 0 }, "value": "ri2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4147,7 +4065,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4158,7 +4075,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4191,8 +4107,8 @@ "ctxt": 0 }, "value": "ri3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4210,7 +4126,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4252,8 +4167,8 @@ "ctxt": 0 }, "value": "ri4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4280,7 +4195,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4313,8 +4227,8 @@ "ctxt": 0 }, "value": "ri5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4372,8 +4286,8 @@ "ctxt": 0 }, "value": "ri6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4391,7 +4305,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4433,8 +4346,8 @@ "ctxt": 0 }, "value": "ri7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4461,7 +4374,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4494,8 +4406,8 @@ "ctxt": 0 }, "value": "ri8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4513,7 +4425,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4524,7 +4435,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4557,8 +4467,8 @@ "ctxt": 0 }, "value": "rj1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4576,7 +4486,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4587,7 +4496,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4620,8 +4528,8 @@ "ctxt": 0 }, "value": "rj2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4639,7 +4547,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4650,7 +4557,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4683,8 +4589,8 @@ "ctxt": 0 }, "value": "rj3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4702,7 +4608,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4744,8 +4649,8 @@ "ctxt": 0 }, "value": "rj4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4772,7 +4677,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4805,8 +4709,8 @@ "ctxt": 0 }, "value": "rj5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4864,8 +4768,8 @@ "ctxt": 0 }, "value": "rj6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4883,7 +4787,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4925,8 +4828,8 @@ "ctxt": 0 }, "value": "rj7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4953,7 +4856,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4986,8 +4888,8 @@ "ctxt": 0 }, "value": "rj8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5005,7 +4907,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -5016,7 +4917,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithEnum/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithEnum/input.ts.json index 6c6c06207a5e..a7a208109eef 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithEnum/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithEnum/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -94,6 +91,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -110,8 +108,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,6 +140,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -159,8 +157,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -192,6 +189,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -214,13 +212,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -252,8 +248,8 @@ "ctxt": 0 }, "value": "ra1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -271,7 +267,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -282,7 +277,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -315,8 +309,8 @@ "ctxt": 0 }, "value": "ra2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -334,7 +328,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -345,7 +338,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -378,8 +370,8 @@ "ctxt": 0 }, "value": "ra3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -397,7 +389,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -408,7 +399,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -441,8 +431,8 @@ "ctxt": 0 }, "value": "ra4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -460,7 +450,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -471,7 +460,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -504,8 +492,8 @@ "ctxt": 0 }, "value": "ra5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -523,7 +511,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -534,7 +521,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -567,8 +553,8 @@ "ctxt": 0 }, "value": "ra6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -593,7 +579,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -604,7 +589,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -617,7 +601,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -650,8 +633,8 @@ "ctxt": 0 }, "value": "ra7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -676,7 +659,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -687,7 +669,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -700,7 +681,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -733,8 +713,8 @@ "ctxt": 0 }, "value": "ra8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -759,7 +739,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -770,7 +749,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -790,7 +768,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -801,7 +778,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -836,8 +812,8 @@ "ctxt": 0 }, "value": "ra9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -862,7 +838,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -873,7 +848,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -917,8 +891,8 @@ "ctxt": 0 }, "value": "ra10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -936,7 +910,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -954,7 +927,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -965,7 +937,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1000,8 +971,8 @@ "ctxt": 0 }, "value": "ra11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1019,7 +990,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1037,7 +1007,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1048,7 +1017,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1083,8 +1051,8 @@ "ctxt": 0 }, "value": "ra12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1118,7 +1086,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1129,7 +1096,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1164,8 +1130,8 @@ "ctxt": 0 }, "value": "rb1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1183,7 +1149,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1194,7 +1159,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1227,8 +1191,8 @@ "ctxt": 0 }, "value": "rb2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1246,7 +1210,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1257,7 +1220,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1290,8 +1252,8 @@ "ctxt": 0 }, "value": "rb3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1309,7 +1271,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1320,7 +1281,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1353,8 +1313,8 @@ "ctxt": 0 }, "value": "rb4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1372,7 +1332,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1383,7 +1342,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1416,8 +1374,8 @@ "ctxt": 0 }, "value": "rb5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1435,7 +1393,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1446,7 +1403,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1479,8 +1435,8 @@ "ctxt": 0 }, "value": "rb6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1505,7 +1461,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1516,7 +1471,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1529,7 +1483,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1562,8 +1515,8 @@ "ctxt": 0 }, "value": "rb7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1588,7 +1541,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1599,7 +1551,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1612,7 +1563,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1645,8 +1595,8 @@ "ctxt": 0 }, "value": "rb8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1671,7 +1621,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1682,7 +1631,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1702,7 +1650,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1713,7 +1660,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1748,8 +1694,8 @@ "ctxt": 0 }, "value": "rb9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1774,7 +1720,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1785,7 +1730,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1829,8 +1773,8 @@ "ctxt": 0 }, "value": "rb10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1848,7 +1792,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1866,7 +1809,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1877,7 +1819,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1912,8 +1853,8 @@ "ctxt": 0 }, "value": "rb11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1931,7 +1872,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1949,7 +1889,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1960,7 +1899,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1995,8 +1933,8 @@ "ctxt": 0 }, "value": "rb12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2030,7 +1968,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2041,7 +1978,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2076,8 +2012,8 @@ "ctxt": 0 }, "value": "rc1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2095,7 +2031,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -2106,7 +2041,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2139,8 +2073,8 @@ "ctxt": 0 }, "value": "rc2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2158,7 +2092,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -2169,7 +2102,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2202,8 +2134,8 @@ "ctxt": 0 }, "value": "rc3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2221,7 +2153,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -2232,7 +2163,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -2265,8 +2195,8 @@ "ctxt": 0 }, "value": "rc4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2284,7 +2214,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2295,7 +2224,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -2328,8 +2256,8 @@ "ctxt": 0 }, "value": "rc5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2347,7 +2275,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2358,7 +2285,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -2391,8 +2317,8 @@ "ctxt": 0 }, "value": "rc6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2417,7 +2343,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2428,7 +2353,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2441,7 +2365,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2474,8 +2397,8 @@ "ctxt": 0 }, "value": "rc7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2500,7 +2423,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2511,7 +2433,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2524,7 +2445,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2557,8 +2477,8 @@ "ctxt": 0 }, "value": "rc8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2583,7 +2503,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2594,7 +2513,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2614,7 +2532,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2625,7 +2542,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2660,8 +2576,8 @@ "ctxt": 0 }, "value": "rc9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2686,7 +2602,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2697,7 +2612,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2741,8 +2655,8 @@ "ctxt": 0 }, "value": "rc10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2760,7 +2674,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2778,7 +2691,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2789,7 +2701,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2824,8 +2735,8 @@ "ctxt": 0 }, "value": "rc11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2843,7 +2754,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2861,7 +2771,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2872,7 +2781,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2907,8 +2815,8 @@ "ctxt": 0 }, "value": "rc12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2942,7 +2850,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2953,7 +2860,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2988,8 +2894,8 @@ "ctxt": 0 }, "value": "rd1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3007,7 +2913,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3018,7 +2923,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3051,8 +2955,8 @@ "ctxt": 0 }, "value": "rd2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3070,7 +2974,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3081,7 +2984,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3114,8 +3016,8 @@ "ctxt": 0 }, "value": "rd3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3133,7 +3035,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3144,7 +3045,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3177,8 +3077,8 @@ "ctxt": 0 }, "value": "rd4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3196,7 +3096,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3207,7 +3106,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3240,8 +3138,8 @@ "ctxt": 0 }, "value": "rd5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3259,7 +3157,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3270,7 +3167,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3303,8 +3199,8 @@ "ctxt": 0 }, "value": "rd6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3329,7 +3225,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3340,7 +3235,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3353,7 +3247,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3386,8 +3279,8 @@ "ctxt": 0 }, "value": "rd7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3412,7 +3305,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3423,7 +3315,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3436,7 +3327,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3469,8 +3359,8 @@ "ctxt": 0 }, "value": "rd8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3495,7 +3385,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3506,7 +3395,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3526,7 +3414,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3537,7 +3424,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3572,8 +3458,8 @@ "ctxt": 0 }, "value": "rd9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3598,7 +3484,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3609,7 +3494,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3653,8 +3537,8 @@ "ctxt": 0 }, "value": "rd10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3672,7 +3556,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3690,7 +3573,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3701,7 +3583,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3736,8 +3617,8 @@ "ctxt": 0 }, "value": "rd11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3755,7 +3636,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3773,7 +3653,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3784,7 +3663,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3819,8 +3697,8 @@ "ctxt": 0 }, "value": "rd12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3854,7 +3732,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3865,7 +3742,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3900,8 +3776,8 @@ "ctxt": 0 }, "value": "re1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3919,7 +3795,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3930,7 +3805,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3963,8 +3837,8 @@ "ctxt": 0 }, "value": "re2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3982,7 +3856,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3993,7 +3866,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4026,8 +3898,8 @@ "ctxt": 0 }, "value": "re3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4045,7 +3917,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4056,7 +3927,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -4089,8 +3959,8 @@ "ctxt": 0 }, "value": "re4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4108,7 +3978,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4119,7 +3988,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -4152,8 +4020,8 @@ "ctxt": 0 }, "value": "re5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4171,7 +4039,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4182,7 +4049,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -4215,8 +4081,8 @@ "ctxt": 0 }, "value": "re6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4241,7 +4107,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4252,7 +4117,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4265,7 +4129,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4298,8 +4161,8 @@ "ctxt": 0 }, "value": "re7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4324,7 +4187,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4335,7 +4197,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4348,7 +4209,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4381,8 +4241,8 @@ "ctxt": 0 }, "value": "re8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4407,7 +4267,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4418,7 +4277,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4438,7 +4296,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4449,7 +4306,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4484,8 +4340,8 @@ "ctxt": 0 }, "value": "re9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4510,7 +4366,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4521,7 +4376,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4565,8 +4419,8 @@ "ctxt": 0 }, "value": "re10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4584,7 +4438,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4602,7 +4455,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4613,7 +4465,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4648,8 +4499,8 @@ "ctxt": 0 }, "value": "re11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4667,7 +4518,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4685,7 +4535,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4696,7 +4545,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4731,8 +4579,8 @@ "ctxt": 0 }, "value": "re12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4766,7 +4614,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4777,7 +4624,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4812,8 +4658,8 @@ "ctxt": 0 }, "value": "rf1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4831,7 +4677,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4842,7 +4687,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4875,8 +4719,8 @@ "ctxt": 0 }, "value": "rf2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4894,7 +4738,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4905,7 +4748,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4938,8 +4780,8 @@ "ctxt": 0 }, "value": "rf3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4957,7 +4799,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4968,7 +4809,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5001,8 +4841,8 @@ "ctxt": 0 }, "value": "rf4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5020,7 +4860,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -5031,7 +4870,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5064,8 +4902,8 @@ "ctxt": 0 }, "value": "rf5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5083,7 +4921,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -5094,7 +4931,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5127,8 +4963,8 @@ "ctxt": 0 }, "value": "rf6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5153,7 +4989,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -5164,7 +4999,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5177,7 +5011,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -5210,8 +5043,8 @@ "ctxt": 0 }, "value": "rf7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5236,7 +5069,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -5247,7 +5079,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5260,7 +5091,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -5293,8 +5123,8 @@ "ctxt": 0 }, "value": "rf8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5319,7 +5149,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -5330,7 +5159,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5350,7 +5178,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -5361,7 +5188,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5396,8 +5222,8 @@ "ctxt": 0 }, "value": "rf9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5422,7 +5248,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -5433,7 +5258,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5477,8 +5301,8 @@ "ctxt": 0 }, "value": "rf10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5496,7 +5320,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -5514,7 +5337,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -5525,7 +5347,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5560,8 +5381,8 @@ "ctxt": 0 }, "value": "rf11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5579,7 +5400,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -5597,7 +5417,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -5608,7 +5427,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5643,8 +5461,8 @@ "ctxt": 0 }, "value": "rf12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5678,7 +5496,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -5689,7 +5506,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5724,8 +5540,8 @@ "ctxt": 0 }, "value": "rg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5743,7 +5559,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -5754,7 +5569,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -5787,8 +5601,8 @@ "ctxt": 0 }, "value": "rg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5806,7 +5620,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -5817,7 +5630,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -5850,8 +5662,8 @@ "ctxt": 0 }, "value": "rg3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5869,7 +5681,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -5880,7 +5691,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5913,8 +5723,8 @@ "ctxt": 0 }, "value": "rg4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5932,7 +5742,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -5943,7 +5752,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5976,8 +5784,8 @@ "ctxt": 0 }, "value": "rg5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5995,7 +5803,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -6006,7 +5813,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -6039,8 +5845,8 @@ "ctxt": 0 }, "value": "rg6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6065,7 +5871,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6076,7 +5881,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6089,7 +5893,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -6122,8 +5925,8 @@ "ctxt": 0 }, "value": "rg7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6148,7 +5951,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6159,7 +5961,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6172,7 +5973,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -6205,8 +6005,8 @@ "ctxt": 0 }, "value": "rg8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6231,7 +6031,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6242,7 +6041,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6262,7 +6060,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6273,7 +6070,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6308,8 +6104,8 @@ "ctxt": 0 }, "value": "rg9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6334,7 +6130,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6345,7 +6140,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6389,8 +6183,8 @@ "ctxt": 0 }, "value": "rg10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6408,7 +6202,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -6426,7 +6219,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6437,7 +6229,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6472,8 +6263,8 @@ "ctxt": 0 }, "value": "rg11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6491,7 +6282,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -6509,7 +6299,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6520,7 +6309,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6555,8 +6343,8 @@ "ctxt": 0 }, "value": "rg12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6590,7 +6378,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6601,7 +6388,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6636,8 +6422,8 @@ "ctxt": 0 }, "value": "rh1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6655,7 +6441,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -6666,7 +6451,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -6699,8 +6483,8 @@ "ctxt": 0 }, "value": "rh2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6718,7 +6502,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -6729,7 +6512,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -6762,8 +6544,8 @@ "ctxt": 0 }, "value": "rh3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6781,7 +6563,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -6792,7 +6573,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -6825,8 +6605,8 @@ "ctxt": 0 }, "value": "rh4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6844,7 +6624,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -6855,7 +6634,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -6888,8 +6666,8 @@ "ctxt": 0 }, "value": "rh5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6907,7 +6685,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -6918,7 +6695,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -6951,8 +6727,8 @@ "ctxt": 0 }, "value": "rh6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6977,7 +6753,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6988,7 +6763,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7001,7 +6775,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -7034,8 +6807,8 @@ "ctxt": 0 }, "value": "rh7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7060,7 +6833,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -7071,7 +6843,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7084,7 +6855,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -7117,8 +6887,8 @@ "ctxt": 0 }, "value": "rh8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7143,7 +6913,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -7154,7 +6923,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7174,7 +6942,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -7185,7 +6952,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7220,8 +6986,8 @@ "ctxt": 0 }, "value": "rh9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7246,7 +7012,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -7257,7 +7022,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7301,8 +7065,8 @@ "ctxt": 0 }, "value": "rh10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7320,7 +7084,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -7338,7 +7101,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -7349,7 +7111,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7384,8 +7145,8 @@ "ctxt": 0 }, "value": "rh11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7403,7 +7164,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -7421,7 +7181,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -7432,7 +7191,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7467,8 +7225,8 @@ "ctxt": 0 }, "value": "rh12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7502,7 +7260,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -7513,7 +7270,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7548,8 +7304,8 @@ "ctxt": 0 }, "value": "ri1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7567,7 +7323,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -7578,7 +7333,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -7611,8 +7365,8 @@ "ctxt": 0 }, "value": "ri2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7630,7 +7384,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -7641,7 +7394,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -7674,8 +7426,8 @@ "ctxt": 0 }, "value": "ri3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7693,7 +7445,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -7704,7 +7455,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -7737,8 +7487,8 @@ "ctxt": 0 }, "value": "ri4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7756,7 +7506,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -7767,7 +7516,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -7800,8 +7548,8 @@ "ctxt": 0 }, "value": "ri5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7819,7 +7567,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -7830,7 +7577,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -7863,8 +7609,8 @@ "ctxt": 0 }, "value": "ri6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7889,7 +7635,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -7900,7 +7645,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7913,7 +7657,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -7946,8 +7689,8 @@ "ctxt": 0 }, "value": "ri7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7972,7 +7715,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -7983,7 +7725,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7996,7 +7737,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -8029,8 +7769,8 @@ "ctxt": 0 }, "value": "ri8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8055,7 +7795,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -8066,7 +7805,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8086,7 +7824,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -8097,7 +7834,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8132,8 +7868,8 @@ "ctxt": 0 }, "value": "ri9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8158,7 +7894,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -8169,7 +7904,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8213,8 +7947,8 @@ "ctxt": 0 }, "value": "ri10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8232,7 +7966,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -8250,7 +7983,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -8261,7 +7993,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8296,8 +8027,8 @@ "ctxt": 0 }, "value": "ri11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8315,7 +8046,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -8333,7 +8063,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -8344,7 +8073,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8379,8 +8107,8 @@ "ctxt": 0 }, "value": "ri12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8414,7 +8142,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -8425,7 +8152,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8460,8 +8186,8 @@ "ctxt": 0 }, "value": "rj1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8479,7 +8205,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -8490,7 +8215,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -8523,8 +8247,8 @@ "ctxt": 0 }, "value": "rj2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8542,7 +8266,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -8553,7 +8276,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -8586,8 +8308,8 @@ "ctxt": 0 }, "value": "rj3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8605,7 +8327,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -8616,7 +8337,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -8649,8 +8369,8 @@ "ctxt": 0 }, "value": "rj4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8668,7 +8388,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -8679,7 +8398,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -8712,8 +8430,8 @@ "ctxt": 0 }, "value": "rj5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8731,7 +8449,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -8742,7 +8459,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -8775,8 +8491,8 @@ "ctxt": 0 }, "value": "rj6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8801,7 +8517,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -8812,7 +8527,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8825,7 +8539,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -8858,8 +8571,8 @@ "ctxt": 0 }, "value": "rj7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8884,7 +8597,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -8895,7 +8607,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8908,7 +8619,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -8941,8 +8651,8 @@ "ctxt": 0 }, "value": "rj8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8967,7 +8677,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -8978,7 +8687,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8998,7 +8706,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -9009,7 +8716,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9044,8 +8750,8 @@ "ctxt": 0 }, "value": "rj9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9070,7 +8776,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -9081,7 +8786,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9125,8 +8829,8 @@ "ctxt": 0 }, "value": "rj10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9144,7 +8848,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -9162,7 +8865,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -9173,7 +8875,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9208,8 +8909,8 @@ "ctxt": 0 }, "value": "rj11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9227,7 +8928,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -9245,7 +8945,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -9256,7 +8955,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9291,8 +8989,8 @@ "ctxt": 0 }, "value": "rj12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9326,7 +9024,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -9337,7 +9034,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithEnumUnion/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithEnumUnion/input.ts.json index ddb124854fc4..b37e013783aa 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithEnumUnion/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithEnumUnion/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -86,7 +83,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "members": [ @@ -105,7 +101,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "init": null @@ -125,7 +120,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "init": null @@ -157,6 +151,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -173,8 +168,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -206,6 +200,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -222,8 +217,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -255,6 +249,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -285,7 +280,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -305,15 +299,13 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -345,8 +337,8 @@ "ctxt": 0 }, "value": "ra1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -364,7 +356,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -375,7 +366,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -408,8 +398,8 @@ "ctxt": 0 }, "value": "ra2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -427,7 +417,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -438,7 +427,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -471,8 +459,8 @@ "ctxt": 0 }, "value": "ra3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -490,7 +478,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -501,7 +488,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -534,8 +520,8 @@ "ctxt": 0 }, "value": "ra4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -553,7 +539,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -564,7 +549,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -597,8 +581,8 @@ "ctxt": 0 }, "value": "ra5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -616,7 +600,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -627,7 +610,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -660,8 +642,8 @@ "ctxt": 0 }, "value": "ra6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -686,7 +668,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -697,7 +678,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -710,7 +690,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -743,8 +722,8 @@ "ctxt": 0 }, "value": "ra7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -769,7 +748,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -780,7 +758,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -793,7 +770,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -826,8 +802,8 @@ "ctxt": 0 }, "value": "ra8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -852,7 +828,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -863,7 +838,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -883,7 +857,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -894,7 +867,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -929,8 +901,8 @@ "ctxt": 0 }, "value": "ra9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -955,7 +927,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -966,7 +937,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1010,8 +980,8 @@ "ctxt": 0 }, "value": "ra10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1029,7 +999,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1047,7 +1016,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1058,7 +1026,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1093,8 +1060,8 @@ "ctxt": 0 }, "value": "ra11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1112,7 +1079,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1130,7 +1096,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1141,7 +1106,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1176,8 +1140,8 @@ "ctxt": 0 }, "value": "ra12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1211,7 +1175,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1222,7 +1185,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1257,8 +1219,8 @@ "ctxt": 0 }, "value": "rb1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1276,7 +1238,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1287,7 +1248,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1320,8 +1280,8 @@ "ctxt": 0 }, "value": "rb2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1339,7 +1299,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1350,7 +1309,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1383,8 +1341,8 @@ "ctxt": 0 }, "value": "rb3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1402,7 +1360,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1413,7 +1370,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1446,8 +1402,8 @@ "ctxt": 0 }, "value": "rb4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1465,7 +1421,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1476,7 +1431,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1509,8 +1463,8 @@ "ctxt": 0 }, "value": "rb5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1528,7 +1482,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1539,7 +1492,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1572,8 +1524,8 @@ "ctxt": 0 }, "value": "rb6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1598,7 +1550,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1609,7 +1560,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1622,7 +1572,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1655,8 +1604,8 @@ "ctxt": 0 }, "value": "rb7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1681,7 +1630,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1692,7 +1640,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1705,7 +1652,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1738,8 +1684,8 @@ "ctxt": 0 }, "value": "rb8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1764,7 +1710,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1775,7 +1720,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1795,7 +1739,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1806,7 +1749,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1841,8 +1783,8 @@ "ctxt": 0 }, "value": "rb9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1867,7 +1809,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1878,7 +1819,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1922,8 +1862,8 @@ "ctxt": 0 }, "value": "rb10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1941,7 +1881,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1959,7 +1898,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1970,7 +1908,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2005,8 +1942,8 @@ "ctxt": 0 }, "value": "rb11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2024,7 +1961,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2042,7 +1978,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2053,7 +1988,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2088,8 +2022,8 @@ "ctxt": 0 }, "value": "rb12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2123,7 +2057,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2134,7 +2067,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2169,8 +2101,8 @@ "ctxt": 0 }, "value": "rc1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2188,7 +2120,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -2199,7 +2130,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2232,8 +2162,8 @@ "ctxt": 0 }, "value": "rc2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2251,7 +2181,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -2262,7 +2191,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2295,8 +2223,8 @@ "ctxt": 0 }, "value": "rc3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2314,7 +2242,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -2325,7 +2252,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -2358,8 +2284,8 @@ "ctxt": 0 }, "value": "rc4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2377,7 +2303,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2388,7 +2313,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -2421,8 +2345,8 @@ "ctxt": 0 }, "value": "rc5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2440,7 +2364,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2451,7 +2374,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -2484,8 +2406,8 @@ "ctxt": 0 }, "value": "rc6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2510,7 +2432,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2521,7 +2442,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2534,7 +2454,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2567,8 +2486,8 @@ "ctxt": 0 }, "value": "rc7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2593,7 +2512,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2604,7 +2522,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2617,7 +2534,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2650,8 +2566,8 @@ "ctxt": 0 }, "value": "rc8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2676,7 +2592,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2687,7 +2602,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2707,7 +2621,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2718,7 +2631,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2753,8 +2665,8 @@ "ctxt": 0 }, "value": "rc9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2779,7 +2691,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2790,7 +2701,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2834,8 +2744,8 @@ "ctxt": 0 }, "value": "rc10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2853,7 +2763,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2871,7 +2780,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2882,7 +2790,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2917,8 +2824,8 @@ "ctxt": 0 }, "value": "rc11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2936,7 +2843,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2954,7 +2860,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2965,7 +2870,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3000,8 +2904,8 @@ "ctxt": 0 }, "value": "rc12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3035,7 +2939,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3046,7 +2949,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3081,8 +2983,8 @@ "ctxt": 0 }, "value": "rd1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3100,7 +3002,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3111,7 +3012,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3144,8 +3044,8 @@ "ctxt": 0 }, "value": "rd2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3163,7 +3063,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3174,7 +3073,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3207,8 +3105,8 @@ "ctxt": 0 }, "value": "rd3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3226,7 +3124,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3237,7 +3134,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3270,8 +3166,8 @@ "ctxt": 0 }, "value": "rd4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3289,7 +3185,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3300,7 +3195,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3333,8 +3227,8 @@ "ctxt": 0 }, "value": "rd5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3352,7 +3246,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3363,7 +3256,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3396,8 +3288,8 @@ "ctxt": 0 }, "value": "rd6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3422,7 +3314,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3433,7 +3324,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3446,7 +3336,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3479,8 +3368,8 @@ "ctxt": 0 }, "value": "rd7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3505,7 +3394,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3516,7 +3404,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3529,7 +3416,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3562,8 +3448,8 @@ "ctxt": 0 }, "value": "rd8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3588,7 +3474,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3599,7 +3484,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3619,7 +3503,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3630,7 +3513,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3665,8 +3547,8 @@ "ctxt": 0 }, "value": "rd9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3691,7 +3573,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3702,7 +3583,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3746,8 +3626,8 @@ "ctxt": 0 }, "value": "rd10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3765,7 +3645,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3783,7 +3662,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3794,7 +3672,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3829,8 +3706,8 @@ "ctxt": 0 }, "value": "rd11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3848,7 +3725,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3866,7 +3742,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3877,7 +3752,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3912,8 +3786,8 @@ "ctxt": 0 }, "value": "rd12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3947,7 +3821,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3958,7 +3831,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3993,8 +3865,8 @@ "ctxt": 0 }, "value": "re1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4012,7 +3884,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4023,7 +3894,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4056,8 +3926,8 @@ "ctxt": 0 }, "value": "re2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4075,7 +3945,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4086,7 +3955,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4119,8 +3987,8 @@ "ctxt": 0 }, "value": "re3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4138,7 +4006,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4149,7 +4016,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -4182,8 +4048,8 @@ "ctxt": 0 }, "value": "re4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4201,7 +4067,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4212,7 +4077,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -4245,8 +4109,8 @@ "ctxt": 0 }, "value": "re5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4264,7 +4128,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4275,7 +4138,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -4308,8 +4170,8 @@ "ctxt": 0 }, "value": "re6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4334,7 +4196,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4345,7 +4206,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4358,7 +4218,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4391,8 +4250,8 @@ "ctxt": 0 }, "value": "re7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4417,7 +4276,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4428,7 +4286,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4441,7 +4298,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4474,8 +4330,8 @@ "ctxt": 0 }, "value": "re8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4500,7 +4356,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4511,7 +4366,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4531,7 +4385,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4542,7 +4395,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4577,8 +4429,8 @@ "ctxt": 0 }, "value": "re9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4603,7 +4455,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4614,7 +4465,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4658,8 +4508,8 @@ "ctxt": 0 }, "value": "re10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4677,7 +4527,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4695,7 +4544,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4706,7 +4554,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4741,8 +4588,8 @@ "ctxt": 0 }, "value": "re11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4760,7 +4607,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4778,7 +4624,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4789,7 +4634,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4824,8 +4668,8 @@ "ctxt": 0 }, "value": "re12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4859,7 +4703,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4870,7 +4713,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4905,8 +4747,8 @@ "ctxt": 0 }, "value": "rf1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4924,7 +4766,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4935,7 +4776,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4968,8 +4808,8 @@ "ctxt": 0 }, "value": "rf2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4987,7 +4827,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4998,7 +4837,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -5031,8 +4869,8 @@ "ctxt": 0 }, "value": "rf3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5050,7 +4888,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -5061,7 +4898,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5094,8 +4930,8 @@ "ctxt": 0 }, "value": "rf4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5113,7 +4949,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -5124,7 +4959,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5157,8 +4991,8 @@ "ctxt": 0 }, "value": "rf5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5176,7 +5010,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -5187,7 +5020,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5220,8 +5052,8 @@ "ctxt": 0 }, "value": "rf6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5246,7 +5078,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -5257,7 +5088,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5270,7 +5100,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -5303,8 +5132,8 @@ "ctxt": 0 }, "value": "rf7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5329,7 +5158,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -5340,7 +5168,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5353,7 +5180,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -5386,8 +5212,8 @@ "ctxt": 0 }, "value": "rf8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5412,7 +5238,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -5423,7 +5248,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5443,7 +5267,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -5454,7 +5277,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5489,8 +5311,8 @@ "ctxt": 0 }, "value": "rf9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5515,7 +5337,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -5526,7 +5347,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5570,8 +5390,8 @@ "ctxt": 0 }, "value": "rf10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5589,7 +5409,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -5607,7 +5426,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -5618,7 +5436,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5653,8 +5470,8 @@ "ctxt": 0 }, "value": "rf11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5672,7 +5489,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -5690,7 +5506,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -5701,7 +5516,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5736,8 +5550,8 @@ "ctxt": 0 }, "value": "rf12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5771,7 +5585,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -5782,7 +5595,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5817,8 +5629,8 @@ "ctxt": 0 }, "value": "rg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5836,7 +5648,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -5847,7 +5658,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -5880,8 +5690,8 @@ "ctxt": 0 }, "value": "rg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5899,7 +5709,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -5910,7 +5719,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -5943,8 +5751,8 @@ "ctxt": 0 }, "value": "rg3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5962,7 +5770,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -5973,7 +5780,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -6006,8 +5812,8 @@ "ctxt": 0 }, "value": "rg4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6025,7 +5831,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -6036,7 +5841,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -6069,8 +5873,8 @@ "ctxt": 0 }, "value": "rg5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6088,7 +5892,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -6099,7 +5902,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -6132,8 +5934,8 @@ "ctxt": 0 }, "value": "rg6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6158,7 +5960,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6169,7 +5970,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6182,7 +5982,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -6215,8 +6014,8 @@ "ctxt": 0 }, "value": "rg7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6241,7 +6040,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6252,7 +6050,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6265,7 +6062,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -6298,8 +6094,8 @@ "ctxt": 0 }, "value": "rg8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6324,7 +6120,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6335,7 +6130,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6355,7 +6149,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6366,7 +6159,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6401,8 +6193,8 @@ "ctxt": 0 }, "value": "rg9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6427,7 +6219,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6438,7 +6229,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6482,8 +6272,8 @@ "ctxt": 0 }, "value": "rg10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6501,7 +6291,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -6519,7 +6308,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6530,7 +6318,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6565,8 +6352,8 @@ "ctxt": 0 }, "value": "rg11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6584,7 +6371,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -6602,7 +6388,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6613,7 +6398,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6648,8 +6432,8 @@ "ctxt": 0 }, "value": "rg12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6683,7 +6467,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6694,7 +6477,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6729,8 +6511,8 @@ "ctxt": 0 }, "value": "rh1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6748,7 +6530,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -6759,7 +6540,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -6792,8 +6572,8 @@ "ctxt": 0 }, "value": "rh2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6811,7 +6591,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -6822,7 +6601,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -6855,8 +6633,8 @@ "ctxt": 0 }, "value": "rh3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6874,7 +6652,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -6885,7 +6662,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -6918,8 +6694,8 @@ "ctxt": 0 }, "value": "rh4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6937,7 +6713,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -6948,7 +6723,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -6981,8 +6755,8 @@ "ctxt": 0 }, "value": "rh5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7000,7 +6774,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -7011,7 +6784,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -7044,8 +6816,8 @@ "ctxt": 0 }, "value": "rh6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7070,7 +6842,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -7081,7 +6852,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7094,7 +6864,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -7127,8 +6896,8 @@ "ctxt": 0 }, "value": "rh7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7153,7 +6922,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -7164,7 +6932,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7177,7 +6944,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -7210,8 +6976,8 @@ "ctxt": 0 }, "value": "rh8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7236,7 +7002,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -7247,7 +7012,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7267,7 +7031,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -7278,7 +7041,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7313,8 +7075,8 @@ "ctxt": 0 }, "value": "rh9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7339,7 +7101,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -7350,7 +7111,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7394,8 +7154,8 @@ "ctxt": 0 }, "value": "rh10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7413,7 +7173,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -7431,7 +7190,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -7442,7 +7200,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7477,8 +7234,8 @@ "ctxt": 0 }, "value": "rh11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7496,7 +7253,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -7514,7 +7270,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -7525,7 +7280,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7560,8 +7314,8 @@ "ctxt": 0 }, "value": "rh12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7595,7 +7349,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -7606,7 +7359,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7641,8 +7393,8 @@ "ctxt": 0 }, "value": "ri1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7660,7 +7412,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -7671,7 +7422,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -7704,8 +7454,8 @@ "ctxt": 0 }, "value": "ri2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7723,7 +7473,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -7734,7 +7483,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -7767,8 +7515,8 @@ "ctxt": 0 }, "value": "ri3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7786,7 +7534,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -7797,7 +7544,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -7830,8 +7576,8 @@ "ctxt": 0 }, "value": "ri4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7849,7 +7595,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -7860,7 +7605,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -7893,8 +7637,8 @@ "ctxt": 0 }, "value": "ri5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7912,7 +7656,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -7923,7 +7666,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -7956,8 +7698,8 @@ "ctxt": 0 }, "value": "ri6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7982,7 +7724,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -7993,7 +7734,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8006,7 +7746,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -8039,8 +7778,8 @@ "ctxt": 0 }, "value": "ri7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8065,7 +7804,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -8076,7 +7814,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8089,7 +7826,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -8122,8 +7858,8 @@ "ctxt": 0 }, "value": "ri8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8148,7 +7884,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -8159,7 +7894,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8179,7 +7913,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -8190,7 +7923,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8225,8 +7957,8 @@ "ctxt": 0 }, "value": "ri9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8251,7 +7983,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -8262,7 +7993,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8306,8 +8036,8 @@ "ctxt": 0 }, "value": "ri10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8325,7 +8055,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -8343,7 +8072,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -8354,7 +8082,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8389,8 +8116,8 @@ "ctxt": 0 }, "value": "ri11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8408,7 +8135,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -8426,7 +8152,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -8437,7 +8162,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8472,8 +8196,8 @@ "ctxt": 0 }, "value": "ri12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8507,7 +8231,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -8518,7 +8241,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8553,8 +8275,8 @@ "ctxt": 0 }, "value": "rj1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8572,7 +8294,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -8583,7 +8304,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -8616,8 +8336,8 @@ "ctxt": 0 }, "value": "rj2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8635,7 +8355,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -8646,7 +8365,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -8679,8 +8397,8 @@ "ctxt": 0 }, "value": "rj3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8698,7 +8416,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -8709,7 +8426,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -8742,8 +8458,8 @@ "ctxt": 0 }, "value": "rj4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8761,7 +8477,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -8772,7 +8487,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -8805,8 +8519,8 @@ "ctxt": 0 }, "value": "rj5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8824,7 +8538,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -8835,7 +8548,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -8868,8 +8580,8 @@ "ctxt": 0 }, "value": "rj6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8894,7 +8606,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -8905,7 +8616,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8918,7 +8628,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -8951,8 +8660,8 @@ "ctxt": 0 }, "value": "rj7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8977,7 +8686,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -8988,7 +8696,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9001,7 +8708,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -9034,8 +8740,8 @@ "ctxt": 0 }, "value": "rj8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9060,7 +8766,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -9071,7 +8776,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9091,7 +8795,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -9102,7 +8805,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9137,8 +8839,8 @@ "ctxt": 0 }, "value": "rj9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9163,7 +8865,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -9174,7 +8875,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9218,8 +8918,8 @@ "ctxt": 0 }, "value": "rj10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9237,7 +8937,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -9255,7 +8954,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -9266,7 +8964,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9301,8 +8998,8 @@ "ctxt": 0 }, "value": "rj11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9320,7 +9017,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -9338,7 +9034,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -9349,7 +9044,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9384,8 +9078,8 @@ "ctxt": 0 }, "value": "rj12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9419,7 +9113,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -9430,7 +9123,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithInvalidOperands/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithInvalidOperands/input.ts.json index e937fe37cb44..22a689a2c755 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithInvalidOperands/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithInvalidOperands/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -82,7 +79,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "init": null @@ -114,6 +110,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -130,8 +127,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -163,6 +159,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -179,8 +176,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -212,6 +208,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -228,8 +225,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -261,6 +257,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -277,8 +274,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -310,6 +306,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,7 +338,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -369,8 +365,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -402,6 +397,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -424,13 +420,11 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -462,8 +456,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -481,7 +475,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -492,7 +485,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -525,8 +517,8 @@ "ctxt": 0 }, "value": "r1a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -544,7 +536,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -555,7 +546,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -588,8 +578,8 @@ "ctxt": 0 }, "value": "r1a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -607,7 +597,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -618,7 +607,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -651,8 +639,8 @@ "ctxt": 0 }, "value": "r1a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -670,7 +658,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -681,7 +668,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -714,8 +700,8 @@ "ctxt": 0 }, "value": "r1a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -733,7 +719,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -744,7 +729,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -777,8 +761,8 @@ "ctxt": 0 }, "value": "r1a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -796,7 +780,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -807,7 +790,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -840,8 +822,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -859,7 +841,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -870,7 +851,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -903,8 +883,8 @@ "ctxt": 0 }, "value": "r1b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -922,7 +902,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -933,7 +912,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -966,8 +944,8 @@ "ctxt": 0 }, "value": "r1b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -985,7 +963,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -996,7 +973,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1029,8 +1005,8 @@ "ctxt": 0 }, "value": "r1b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1048,7 +1024,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1059,7 +1034,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -1092,8 +1066,8 @@ "ctxt": 0 }, "value": "r1b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1111,7 +1085,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1122,7 +1095,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -1155,8 +1127,8 @@ "ctxt": 0 }, "value": "r1b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1174,7 +1146,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1185,7 +1156,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -1218,8 +1188,8 @@ "ctxt": 0 }, "value": "r1c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1237,7 +1207,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1248,7 +1217,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1281,8 +1249,8 @@ "ctxt": 0 }, "value": "r1c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1300,7 +1268,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1311,7 +1278,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1344,8 +1310,8 @@ "ctxt": 0 }, "value": "r1c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1363,7 +1329,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1374,7 +1339,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1407,8 +1371,8 @@ "ctxt": 0 }, "value": "r1c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1426,7 +1390,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1437,7 +1400,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -1470,8 +1432,8 @@ "ctxt": 0 }, "value": "r1c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1489,7 +1451,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1500,7 +1461,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -1533,8 +1493,8 @@ "ctxt": 0 }, "value": "r1c6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1552,7 +1512,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1563,7 +1522,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -1596,8 +1554,8 @@ "ctxt": 0 }, "value": "r1d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1615,7 +1573,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1626,7 +1583,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1659,8 +1615,8 @@ "ctxt": 0 }, "value": "r1d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1678,7 +1634,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1689,7 +1644,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1722,8 +1676,8 @@ "ctxt": 0 }, "value": "r1d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1741,7 +1695,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1752,7 +1705,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1785,8 +1737,8 @@ "ctxt": 0 }, "value": "r1d4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1804,7 +1756,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1815,7 +1766,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -1848,8 +1798,8 @@ "ctxt": 0 }, "value": "r1d5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1867,7 +1817,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1878,7 +1827,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -1911,8 +1859,8 @@ "ctxt": 0 }, "value": "r1d6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1930,7 +1878,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1941,7 +1888,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -1974,8 +1920,8 @@ "ctxt": 0 }, "value": "r1e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1993,7 +1939,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -2004,7 +1949,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2037,8 +1981,8 @@ "ctxt": 0 }, "value": "r1e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2056,7 +2000,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -2067,7 +2010,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2100,8 +2042,8 @@ "ctxt": 0 }, "value": "r1e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2119,7 +2061,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -2130,7 +2071,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -2163,8 +2103,8 @@ "ctxt": 0 }, "value": "r1e4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2182,7 +2122,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -2193,7 +2132,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -2226,8 +2164,8 @@ "ctxt": 0 }, "value": "r1e5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2245,7 +2183,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -2256,7 +2193,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -2289,8 +2225,8 @@ "ctxt": 0 }, "value": "r1e6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2308,7 +2244,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -2319,7 +2254,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -2352,8 +2286,8 @@ "ctxt": 0 }, "value": "r1f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2371,7 +2305,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -2382,7 +2315,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2415,8 +2347,8 @@ "ctxt": 0 }, "value": "r1f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2434,7 +2366,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -2445,7 +2376,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2478,8 +2408,8 @@ "ctxt": 0 }, "value": "r1f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2497,7 +2427,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -2508,7 +2437,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -2541,8 +2469,8 @@ "ctxt": 0 }, "value": "r1f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2560,7 +2488,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -2571,7 +2498,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -2604,8 +2530,8 @@ "ctxt": 0 }, "value": "r1f5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2623,7 +2549,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -2634,7 +2559,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -2667,8 +2591,8 @@ "ctxt": 0 }, "value": "r1f6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2686,7 +2610,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -2697,7 +2620,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -2730,8 +2652,8 @@ "ctxt": 0 }, "value": "r1g1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2756,7 +2678,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2767,7 +2688,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2780,7 +2700,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2813,8 +2732,8 @@ "ctxt": 0 }, "value": "r1g2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2839,7 +2758,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2850,7 +2768,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2863,7 +2780,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2896,8 +2812,8 @@ "ctxt": 0 }, "value": "r1g3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2922,7 +2838,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2933,7 +2848,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2946,7 +2860,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -2979,8 +2892,8 @@ "ctxt": 0 }, "value": "r1g4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3005,7 +2918,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3016,7 +2928,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3029,7 +2940,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -3062,8 +2972,8 @@ "ctxt": 0 }, "value": "r1g5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3088,7 +2998,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3099,7 +3008,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3112,7 +3020,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -3145,8 +3052,8 @@ "ctxt": 0 }, "value": "r1g6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3171,7 +3078,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3182,7 +3088,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3195,7 +3100,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -3228,8 +3132,8 @@ "ctxt": 0 }, "value": "r1h1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3247,7 +3151,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3265,7 +3168,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3276,7 +3178,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3311,8 +3212,8 @@ "ctxt": 0 }, "value": "r1h2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3330,7 +3231,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3348,7 +3248,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3359,7 +3258,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3394,8 +3292,8 @@ "ctxt": 0 }, "value": "r1h3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3413,7 +3311,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3431,7 +3328,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3442,7 +3338,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3477,8 +3372,8 @@ "ctxt": 0 }, "value": "r1h4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3496,7 +3391,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -3514,7 +3408,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3525,7 +3418,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3560,8 +3452,8 @@ "ctxt": 0 }, "value": "r1h5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3579,7 +3471,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -3597,7 +3488,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3608,7 +3498,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3643,8 +3532,8 @@ "ctxt": 0 }, "value": "r1h6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3662,7 +3551,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -3680,7 +3568,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3691,7 +3578,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3726,8 +3612,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3745,7 +3631,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3756,7 +3641,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3789,8 +3673,8 @@ "ctxt": 0 }, "value": "r2a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3808,7 +3692,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3819,7 +3702,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3852,8 +3734,8 @@ "ctxt": 0 }, "value": "r2a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3871,7 +3753,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3882,7 +3763,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3915,8 +3795,8 @@ "ctxt": 0 }, "value": "r2a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3934,7 +3814,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3945,7 +3824,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -3978,8 +3856,8 @@ "ctxt": 0 }, "value": "r2a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3997,7 +3875,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4008,7 +3885,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -4041,8 +3917,8 @@ "ctxt": 0 }, "value": "r2a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4060,7 +3936,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4071,7 +3946,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -4104,8 +3978,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4123,7 +3997,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4134,7 +4007,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4167,8 +4039,8 @@ "ctxt": 0 }, "value": "r2b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4186,7 +4058,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4197,7 +4068,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4230,8 +4100,8 @@ "ctxt": 0 }, "value": "r2b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4249,7 +4119,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4260,7 +4129,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -4293,8 +4161,8 @@ "ctxt": 0 }, "value": "r2b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4312,7 +4180,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4323,7 +4190,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -4356,8 +4222,8 @@ "ctxt": 0 }, "value": "r2b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4375,7 +4241,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4386,7 +4251,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -4419,8 +4283,8 @@ "ctxt": 0 }, "value": "r2b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4438,7 +4302,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4449,7 +4312,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -4482,8 +4344,8 @@ "ctxt": 0 }, "value": "r2c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4501,7 +4363,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4512,7 +4373,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4545,8 +4405,8 @@ "ctxt": 0 }, "value": "r2c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4564,7 +4424,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4575,7 +4434,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4608,8 +4466,8 @@ "ctxt": 0 }, "value": "r2c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4627,7 +4485,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4638,7 +4495,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -4671,8 +4527,8 @@ "ctxt": 0 }, "value": "r2c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4690,7 +4546,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4701,7 +4556,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -4734,8 +4588,8 @@ "ctxt": 0 }, "value": "r2c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4753,7 +4607,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4764,7 +4617,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -4797,8 +4649,8 @@ "ctxt": 0 }, "value": "r2c6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4816,7 +4668,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4827,7 +4678,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -4860,8 +4710,8 @@ "ctxt": 0 }, "value": "r2d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4879,7 +4729,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4890,7 +4739,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4923,8 +4771,8 @@ "ctxt": 0 }, "value": "r2d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4942,7 +4790,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4953,7 +4800,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4986,8 +4832,8 @@ "ctxt": 0 }, "value": "r2d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5005,7 +4851,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -5016,7 +4861,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5049,8 +4893,8 @@ "ctxt": 0 }, "value": "r2d4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5068,7 +4912,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -5079,7 +4922,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -5112,8 +4954,8 @@ "ctxt": 0 }, "value": "r2d5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5131,7 +4973,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -5142,7 +4983,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -5175,8 +5015,8 @@ "ctxt": 0 }, "value": "r2d6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5194,7 +5034,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -5205,7 +5044,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -5238,8 +5076,8 @@ "ctxt": 0 }, "value": "r2e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5257,7 +5095,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -5268,7 +5105,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -5301,8 +5137,8 @@ "ctxt": 0 }, "value": "r2e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5320,7 +5156,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -5331,7 +5166,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -5364,8 +5198,8 @@ "ctxt": 0 }, "value": "r2e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5383,7 +5217,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -5394,7 +5227,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5427,8 +5259,8 @@ "ctxt": 0 }, "value": "r2e4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5446,7 +5278,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -5457,7 +5288,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -5490,8 +5320,8 @@ "ctxt": 0 }, "value": "r2e5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5509,7 +5339,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -5520,7 +5349,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -5553,8 +5381,8 @@ "ctxt": 0 }, "value": "r2e6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5572,7 +5400,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -5583,7 +5410,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -5616,8 +5442,8 @@ "ctxt": 0 }, "value": "r2f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5635,7 +5461,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -5646,7 +5471,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -5679,8 +5503,8 @@ "ctxt": 0 }, "value": "r2f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5698,7 +5522,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -5709,7 +5532,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -5742,8 +5564,8 @@ "ctxt": 0 }, "value": "r2f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5761,7 +5583,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -5772,7 +5593,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5805,8 +5625,8 @@ "ctxt": 0 }, "value": "r2f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5824,7 +5644,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -5835,7 +5654,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -5868,8 +5686,8 @@ "ctxt": 0 }, "value": "r2f5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5887,7 +5705,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -5898,7 +5715,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -5931,8 +5747,8 @@ "ctxt": 0 }, "value": "r2f6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5950,7 +5766,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -5961,7 +5776,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -5994,8 +5808,8 @@ "ctxt": 0 }, "value": "r2g1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6020,7 +5834,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6031,7 +5844,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6044,7 +5856,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -6077,8 +5888,8 @@ "ctxt": 0 }, "value": "r2g2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6103,7 +5914,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6114,7 +5924,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6127,7 +5936,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -6160,8 +5968,8 @@ "ctxt": 0 }, "value": "r2g3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6186,7 +5994,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6197,7 +6004,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6210,7 +6016,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -6243,8 +6048,8 @@ "ctxt": 0 }, "value": "r2g4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6269,7 +6074,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6280,7 +6084,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6293,7 +6096,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -6326,8 +6128,8 @@ "ctxt": 0 }, "value": "r2g5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6352,7 +6154,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6363,7 +6164,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6376,7 +6176,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -6409,8 +6208,8 @@ "ctxt": 0 }, "value": "r2g6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6435,7 +6234,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6446,7 +6244,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6459,7 +6256,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -6492,8 +6288,8 @@ "ctxt": 0 }, "value": "r2h1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6511,7 +6307,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -6529,7 +6324,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6540,7 +6334,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6575,8 +6368,8 @@ "ctxt": 0 }, "value": "r2h2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6594,7 +6387,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -6612,7 +6404,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6623,7 +6414,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6658,8 +6448,8 @@ "ctxt": 0 }, "value": "r2h3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6677,7 +6467,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -6695,7 +6484,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6706,7 +6494,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6741,8 +6528,8 @@ "ctxt": 0 }, "value": "r2h4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6760,7 +6547,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -6778,7 +6564,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6789,7 +6574,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6824,8 +6608,8 @@ "ctxt": 0 }, "value": "r2h5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6843,7 +6627,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -6861,7 +6644,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6872,7 +6654,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6907,8 +6688,8 @@ "ctxt": 0 }, "value": "r2h6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6926,7 +6707,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -6944,7 +6724,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6955,7 +6734,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6990,8 +6768,8 @@ "ctxt": 0 }, "value": "r3a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7009,7 +6787,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -7020,7 +6797,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -7053,8 +6829,8 @@ "ctxt": 0 }, "value": "r3a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7072,7 +6848,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -7083,7 +6858,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -7116,8 +6890,8 @@ "ctxt": 0 }, "value": "r3a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7135,7 +6909,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -7146,7 +6919,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -7179,8 +6951,8 @@ "ctxt": 0 }, "value": "r3a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7198,7 +6970,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -7209,7 +6980,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -7242,8 +7012,8 @@ "ctxt": 0 }, "value": "r3a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7261,7 +7031,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -7272,7 +7041,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -7305,8 +7073,8 @@ "ctxt": 0 }, "value": "r3a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7324,7 +7092,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -7335,7 +7102,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -7368,8 +7134,8 @@ "ctxt": 0 }, "value": "r3b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7387,7 +7153,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -7398,7 +7163,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -7431,8 +7195,8 @@ "ctxt": 0 }, "value": "r3b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7450,7 +7214,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -7461,7 +7224,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -7494,8 +7256,8 @@ "ctxt": 0 }, "value": "r3b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7513,7 +7275,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -7524,7 +7285,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -7557,8 +7317,8 @@ "ctxt": 0 }, "value": "r3b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7576,7 +7336,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -7587,7 +7346,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -7620,8 +7378,8 @@ "ctxt": 0 }, "value": "r3b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7639,7 +7397,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -7650,7 +7407,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -7683,8 +7439,8 @@ "ctxt": 0 }, "value": "r3b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7702,7 +7458,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -7713,7 +7468,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -7746,8 +7500,8 @@ "ctxt": 0 }, "value": "r3c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7765,7 +7519,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -7776,7 +7529,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -7809,8 +7561,8 @@ "ctxt": 0 }, "value": "r3c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7828,7 +7580,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -7839,7 +7590,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -7872,8 +7622,8 @@ "ctxt": 0 }, "value": "r3c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7891,7 +7641,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -7902,7 +7651,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -7935,8 +7683,8 @@ "ctxt": 0 }, "value": "r3c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7954,7 +7702,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -7965,7 +7712,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -7998,8 +7744,8 @@ "ctxt": 0 }, "value": "r3c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8017,7 +7763,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -8028,7 +7773,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -8061,8 +7805,8 @@ "ctxt": 0 }, "value": "r3c6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8080,7 +7824,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -8091,7 +7834,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -8124,8 +7866,8 @@ "ctxt": 0 }, "value": "r3d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8143,7 +7885,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -8154,7 +7895,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -8187,8 +7927,8 @@ "ctxt": 0 }, "value": "r3d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8206,7 +7946,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -8217,7 +7956,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -8250,8 +7988,8 @@ "ctxt": 0 }, "value": "r3d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8269,7 +8007,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -8280,7 +8017,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -8313,8 +8049,8 @@ "ctxt": 0 }, "value": "r3d4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8332,7 +8068,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -8343,7 +8078,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -8376,8 +8110,8 @@ "ctxt": 0 }, "value": "r3d5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8395,7 +8129,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -8406,7 +8139,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -8439,8 +8171,8 @@ "ctxt": 0 }, "value": "r3d6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8458,7 +8190,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -8469,7 +8200,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -8502,8 +8232,8 @@ "ctxt": 0 }, "value": "r3e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8521,7 +8251,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -8532,7 +8261,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -8565,8 +8293,8 @@ "ctxt": 0 }, "value": "r3e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8584,7 +8312,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -8595,7 +8322,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -8628,8 +8354,8 @@ "ctxt": 0 }, "value": "r3e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8647,7 +8373,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -8658,7 +8383,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -8691,8 +8415,8 @@ "ctxt": 0 }, "value": "r3e4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8710,7 +8434,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -8721,7 +8444,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -8754,8 +8476,8 @@ "ctxt": 0 }, "value": "r3e5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8773,7 +8495,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -8784,7 +8505,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -8817,8 +8537,8 @@ "ctxt": 0 }, "value": "r3e6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8836,7 +8556,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -8847,7 +8566,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -8880,8 +8598,8 @@ "ctxt": 0 }, "value": "r3f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8899,7 +8617,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -8910,7 +8627,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -8943,8 +8659,8 @@ "ctxt": 0 }, "value": "r3f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8962,7 +8678,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -8973,7 +8688,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -9006,8 +8720,8 @@ "ctxt": 0 }, "value": "r3f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9025,7 +8739,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -9036,7 +8749,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -9069,8 +8781,8 @@ "ctxt": 0 }, "value": "r3f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9088,7 +8800,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -9099,7 +8810,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -9132,8 +8842,8 @@ "ctxt": 0 }, "value": "r3f5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9151,7 +8861,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -9162,7 +8871,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -9195,8 +8903,8 @@ "ctxt": 0 }, "value": "r3f6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9214,7 +8922,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -9225,7 +8932,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -9258,8 +8964,8 @@ "ctxt": 0 }, "value": "r3g1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9284,7 +8990,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -9295,7 +9000,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9308,7 +9012,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -9341,8 +9044,8 @@ "ctxt": 0 }, "value": "r3g2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9367,7 +9070,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -9378,7 +9080,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9391,7 +9092,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -9424,8 +9124,8 @@ "ctxt": 0 }, "value": "r3g3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9450,7 +9150,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -9461,7 +9160,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9474,7 +9172,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -9507,8 +9204,8 @@ "ctxt": 0 }, "value": "r3g4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9533,7 +9230,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -9544,7 +9240,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9557,7 +9252,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -9590,8 +9284,8 @@ "ctxt": 0 }, "value": "r3g5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9616,7 +9310,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -9627,7 +9320,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9640,7 +9332,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -9673,8 +9364,8 @@ "ctxt": 0 }, "value": "r3g6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9699,7 +9390,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -9710,7 +9400,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9723,7 +9412,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -9756,8 +9444,8 @@ "ctxt": 0 }, "value": "r3h1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9775,7 +9463,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -9793,7 +9480,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -9804,7 +9490,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9839,8 +9524,8 @@ "ctxt": 0 }, "value": "r3h2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9858,7 +9543,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -9876,7 +9560,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -9887,7 +9570,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9922,8 +9604,8 @@ "ctxt": 0 }, "value": "r3h3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9941,7 +9623,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -9959,7 +9640,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -9970,7 +9650,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10005,8 +9684,8 @@ "ctxt": 0 }, "value": "r3h4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10024,7 +9703,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -10042,7 +9720,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -10053,7 +9730,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10088,8 +9764,8 @@ "ctxt": 0 }, "value": "r3h5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10107,7 +9783,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -10125,7 +9800,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -10136,7 +9810,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10171,8 +9844,8 @@ "ctxt": 0 }, "value": "r3h6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10190,7 +9863,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -10208,7 +9880,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -10219,7 +9890,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10254,8 +9924,8 @@ "ctxt": 0 }, "value": "r4a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10273,7 +9943,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -10284,7 +9953,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -10317,8 +9985,8 @@ "ctxt": 0 }, "value": "r4a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10336,7 +10004,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -10347,7 +10014,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -10380,8 +10046,8 @@ "ctxt": 0 }, "value": "r4a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10399,7 +10065,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -10410,7 +10075,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -10443,8 +10107,8 @@ "ctxt": 0 }, "value": "r4a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10462,7 +10126,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -10473,7 +10136,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -10506,8 +10168,8 @@ "ctxt": 0 }, "value": "r4a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10525,7 +10187,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -10536,7 +10197,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -10569,8 +10229,8 @@ "ctxt": 0 }, "value": "r4a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10588,7 +10248,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -10599,7 +10258,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -10632,8 +10290,8 @@ "ctxt": 0 }, "value": "r4b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10651,7 +10309,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -10662,7 +10319,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -10695,8 +10351,8 @@ "ctxt": 0 }, "value": "r4b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10714,7 +10370,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -10725,7 +10380,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -10758,8 +10412,8 @@ "ctxt": 0 }, "value": "r4b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10777,7 +10431,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -10788,7 +10441,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -10821,8 +10473,8 @@ "ctxt": 0 }, "value": "r4b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10840,7 +10492,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -10851,7 +10502,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -10884,8 +10534,8 @@ "ctxt": 0 }, "value": "r4b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10903,7 +10553,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -10914,7 +10563,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -10947,8 +10595,8 @@ "ctxt": 0 }, "value": "r4b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10966,7 +10614,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -10977,7 +10624,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -11010,8 +10656,8 @@ "ctxt": 0 }, "value": "r4c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11029,7 +10675,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -11040,7 +10685,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -11073,8 +10717,8 @@ "ctxt": 0 }, "value": "r4c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11092,7 +10736,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -11103,7 +10746,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -11136,8 +10778,8 @@ "ctxt": 0 }, "value": "r4c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11155,7 +10797,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -11166,7 +10807,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -11199,8 +10839,8 @@ "ctxt": 0 }, "value": "r4c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11218,7 +10858,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -11229,7 +10868,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -11262,8 +10900,8 @@ "ctxt": 0 }, "value": "r4c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11281,7 +10919,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -11292,7 +10929,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -11325,8 +10961,8 @@ "ctxt": 0 }, "value": "r4c6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11344,7 +10980,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -11355,7 +10990,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -11388,8 +11022,8 @@ "ctxt": 0 }, "value": "r4d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11407,7 +11041,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -11418,7 +11051,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -11451,8 +11083,8 @@ "ctxt": 0 }, "value": "r4d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11470,7 +11102,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -11481,7 +11112,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -11514,8 +11144,8 @@ "ctxt": 0 }, "value": "r4d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11533,7 +11163,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -11544,7 +11173,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -11577,8 +11205,8 @@ "ctxt": 0 }, "value": "r4d4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11596,7 +11224,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -11607,7 +11234,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -11640,8 +11266,8 @@ "ctxt": 0 }, "value": "r4d5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11659,7 +11285,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -11670,7 +11295,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -11703,8 +11327,8 @@ "ctxt": 0 }, "value": "r4d6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11722,7 +11346,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -11733,7 +11356,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -11766,8 +11388,8 @@ "ctxt": 0 }, "value": "r4e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11785,7 +11407,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -11796,7 +11417,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -11829,8 +11449,8 @@ "ctxt": 0 }, "value": "r4e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11848,7 +11468,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -11859,7 +11478,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -11892,8 +11510,8 @@ "ctxt": 0 }, "value": "r4e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11911,7 +11529,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -11922,7 +11539,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -11955,8 +11571,8 @@ "ctxt": 0 }, "value": "r4e4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11974,7 +11590,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -11985,7 +11600,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -12018,8 +11632,8 @@ "ctxt": 0 }, "value": "r4e5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12037,7 +11651,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -12048,7 +11661,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -12081,8 +11693,8 @@ "ctxt": 0 }, "value": "r4e6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12100,7 +11712,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -12111,7 +11722,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -12144,8 +11754,8 @@ "ctxt": 0 }, "value": "r4f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12163,7 +11773,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -12174,7 +11783,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -12207,8 +11815,8 @@ "ctxt": 0 }, "value": "r4f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12226,7 +11834,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -12237,7 +11844,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -12270,8 +11876,8 @@ "ctxt": 0 }, "value": "r4f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12289,7 +11895,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -12300,7 +11905,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -12333,8 +11937,8 @@ "ctxt": 0 }, "value": "r4f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12352,7 +11956,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -12363,7 +11966,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -12396,8 +11998,8 @@ "ctxt": 0 }, "value": "r4f5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12415,7 +12017,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -12426,7 +12027,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -12459,8 +12059,8 @@ "ctxt": 0 }, "value": "r4f6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12478,7 +12078,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -12489,7 +12088,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -12522,8 +12120,8 @@ "ctxt": 0 }, "value": "r4g1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12548,7 +12146,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -12559,7 +12156,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12572,7 +12168,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -12605,8 +12200,8 @@ "ctxt": 0 }, "value": "r4g2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12631,7 +12226,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -12642,7 +12236,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12655,7 +12248,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -12688,8 +12280,8 @@ "ctxt": 0 }, "value": "r4g3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12714,7 +12306,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -12725,7 +12316,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12738,7 +12328,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -12771,8 +12360,8 @@ "ctxt": 0 }, "value": "r4g4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12797,7 +12386,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -12808,7 +12396,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12821,7 +12408,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -12854,8 +12440,8 @@ "ctxt": 0 }, "value": "r4g5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12880,7 +12466,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -12891,7 +12476,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12904,7 +12488,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -12937,8 +12520,8 @@ "ctxt": 0 }, "value": "r4g6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12963,7 +12546,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -12974,7 +12556,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12987,7 +12568,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -13020,8 +12600,8 @@ "ctxt": 0 }, "value": "r4h1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13039,7 +12619,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -13057,7 +12636,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -13068,7 +12646,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13103,8 +12680,8 @@ "ctxt": 0 }, "value": "r4h2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13122,7 +12699,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -13140,7 +12716,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -13151,7 +12726,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13186,8 +12760,8 @@ "ctxt": 0 }, "value": "r4h3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13205,7 +12779,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -13223,7 +12796,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -13234,7 +12806,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13269,8 +12840,8 @@ "ctxt": 0 }, "value": "r4h4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13288,7 +12859,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -13306,7 +12876,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -13317,7 +12886,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13352,8 +12920,8 @@ "ctxt": 0 }, "value": "r4h5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13371,7 +12939,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -13389,7 +12956,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -13400,7 +12966,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13435,8 +13000,8 @@ "ctxt": 0 }, "value": "r4h6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13454,7 +13019,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -13472,7 +13036,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -13483,7 +13046,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13518,8 +13080,8 @@ "ctxt": 0 }, "value": "r5a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13537,7 +13099,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -13548,7 +13109,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -13581,8 +13141,8 @@ "ctxt": 0 }, "value": "r5a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13600,7 +13160,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -13611,7 +13170,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -13644,8 +13202,8 @@ "ctxt": 0 }, "value": "r5a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13663,7 +13221,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -13674,7 +13231,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -13707,8 +13263,8 @@ "ctxt": 0 }, "value": "r5a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13726,7 +13282,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -13737,7 +13292,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -13770,8 +13324,8 @@ "ctxt": 0 }, "value": "r5a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13789,7 +13343,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -13800,7 +13353,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -13833,8 +13385,8 @@ "ctxt": 0 }, "value": "r5a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13852,7 +13404,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -13863,7 +13414,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -13896,8 +13446,8 @@ "ctxt": 0 }, "value": "r5b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13915,7 +13465,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -13926,7 +13475,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -13959,8 +13507,8 @@ "ctxt": 0 }, "value": "r5b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13978,7 +13526,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -13989,7 +13536,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -14022,8 +13568,8 @@ "ctxt": 0 }, "value": "r5b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14041,7 +13587,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -14052,7 +13597,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -14085,8 +13629,8 @@ "ctxt": 0 }, "value": "r5b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14104,7 +13648,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -14115,7 +13658,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -14148,8 +13690,8 @@ "ctxt": 0 }, "value": "r5b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14167,7 +13709,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -14178,7 +13719,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -14211,8 +13751,8 @@ "ctxt": 0 }, "value": "r5b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14230,7 +13770,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -14241,7 +13780,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -14274,8 +13812,8 @@ "ctxt": 0 }, "value": "r5c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14293,7 +13831,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -14304,7 +13841,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -14337,8 +13873,8 @@ "ctxt": 0 }, "value": "r5c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14356,7 +13892,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -14367,7 +13902,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -14400,8 +13934,8 @@ "ctxt": 0 }, "value": "r5c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14419,7 +13953,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -14430,7 +13963,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -14463,8 +13995,8 @@ "ctxt": 0 }, "value": "r5c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14482,7 +14014,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -14493,7 +14024,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -14526,8 +14056,8 @@ "ctxt": 0 }, "value": "r5c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14545,7 +14075,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -14556,7 +14085,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -14589,8 +14117,8 @@ "ctxt": 0 }, "value": "r5c6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14608,7 +14136,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -14619,7 +14146,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -14652,8 +14178,8 @@ "ctxt": 0 }, "value": "r5d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14671,7 +14197,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -14682,7 +14207,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -14715,8 +14239,8 @@ "ctxt": 0 }, "value": "r5d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14734,7 +14258,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -14745,7 +14268,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -14778,8 +14300,8 @@ "ctxt": 0 }, "value": "r5d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14797,7 +14319,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -14808,7 +14329,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -14841,8 +14361,8 @@ "ctxt": 0 }, "value": "r5d4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14860,7 +14380,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -14871,7 +14390,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -14904,8 +14422,8 @@ "ctxt": 0 }, "value": "r5d5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14923,7 +14441,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -14934,7 +14451,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -14967,8 +14483,8 @@ "ctxt": 0 }, "value": "r5d6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -14986,7 +14502,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -14997,7 +14512,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -15030,8 +14544,8 @@ "ctxt": 0 }, "value": "r5e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -15049,7 +14563,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -15060,7 +14573,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -15093,8 +14605,8 @@ "ctxt": 0 }, "value": "r5e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -15112,7 +14624,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -15123,7 +14634,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -15156,8 +14666,8 @@ "ctxt": 0 }, "value": "r5e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -15175,7 +14685,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -15186,7 +14695,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -15219,8 +14727,8 @@ "ctxt": 0 }, "value": "r5e4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -15238,7 +14746,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -15249,7 +14756,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -15282,8 +14788,8 @@ "ctxt": 0 }, "value": "r5e5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -15301,7 +14807,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -15312,7 +14817,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -15345,8 +14849,8 @@ "ctxt": 0 }, "value": "r5e6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -15364,7 +14868,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -15375,7 +14878,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -15408,8 +14910,8 @@ "ctxt": 0 }, "value": "r5f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -15427,7 +14929,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -15438,7 +14939,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -15471,8 +14971,8 @@ "ctxt": 0 }, "value": "r5f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -15490,7 +14990,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -15501,7 +15000,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -15534,8 +15032,8 @@ "ctxt": 0 }, "value": "r5f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -15553,7 +15051,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -15564,7 +15061,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -15597,8 +15093,8 @@ "ctxt": 0 }, "value": "r5f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -15616,7 +15112,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -15627,7 +15122,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -15660,8 +15154,8 @@ "ctxt": 0 }, "value": "r5f5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -15679,7 +15173,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -15690,7 +15183,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -15723,8 +15215,8 @@ "ctxt": 0 }, "value": "r5f6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -15742,7 +15234,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -15753,7 +15244,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -15786,8 +15276,8 @@ "ctxt": 0 }, "value": "r5g1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -15812,7 +15302,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -15823,7 +15312,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15836,7 +15324,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -15869,8 +15356,8 @@ "ctxt": 0 }, "value": "r5g2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -15895,7 +15382,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -15906,7 +15392,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15919,7 +15404,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -15952,8 +15436,8 @@ "ctxt": 0 }, "value": "r5g3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -15978,7 +15462,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -15989,7 +15472,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16002,7 +15484,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -16035,8 +15516,8 @@ "ctxt": 0 }, "value": "r5g4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -16061,7 +15542,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -16072,7 +15552,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16085,7 +15564,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -16118,8 +15596,8 @@ "ctxt": 0 }, "value": "r5g5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -16144,7 +15622,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -16155,7 +15632,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16168,7 +15644,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -16201,8 +15676,8 @@ "ctxt": 0 }, "value": "r5g6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -16227,7 +15702,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -16238,7 +15712,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16251,7 +15724,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -16284,8 +15756,8 @@ "ctxt": 0 }, "value": "r5h1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -16303,7 +15775,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -16321,7 +15792,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -16332,7 +15802,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16367,8 +15836,8 @@ "ctxt": 0 }, "value": "r5h2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -16386,7 +15855,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -16404,7 +15872,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -16415,7 +15882,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16450,8 +15916,8 @@ "ctxt": 0 }, "value": "r5h3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -16469,7 +15935,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -16487,7 +15952,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -16498,7 +15962,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16533,8 +15996,8 @@ "ctxt": 0 }, "value": "r5h4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -16552,7 +16015,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -16570,7 +16032,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -16581,7 +16042,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16616,8 +16076,8 @@ "ctxt": 0 }, "value": "r5h5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -16635,7 +16095,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -16653,7 +16112,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -16664,7 +16122,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16699,8 +16156,8 @@ "ctxt": 0 }, "value": "r5h6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -16718,7 +16175,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -16736,7 +16192,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -16747,7 +16202,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16782,8 +16236,8 @@ "ctxt": 0 }, "value": "r6a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -16801,7 +16255,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -16812,7 +16265,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -16845,8 +16297,8 @@ "ctxt": 0 }, "value": "r6a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -16864,7 +16316,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -16875,7 +16326,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -16908,8 +16358,8 @@ "ctxt": 0 }, "value": "r6a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -16927,7 +16377,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -16938,7 +16387,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -16971,8 +16419,8 @@ "ctxt": 0 }, "value": "r6a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -16990,7 +16438,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -17001,7 +16448,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -17034,8 +16480,8 @@ "ctxt": 0 }, "value": "r6a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -17053,7 +16499,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -17064,7 +16509,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -17097,8 +16541,8 @@ "ctxt": 0 }, "value": "r6a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -17116,7 +16560,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -17127,7 +16570,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -17160,8 +16602,8 @@ "ctxt": 0 }, "value": "r6b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -17179,7 +16621,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -17190,7 +16631,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -17223,8 +16663,8 @@ "ctxt": 0 }, "value": "r6b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -17242,7 +16682,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -17253,7 +16692,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -17286,8 +16724,8 @@ "ctxt": 0 }, "value": "r6b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -17305,7 +16743,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -17316,7 +16753,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -17349,8 +16785,8 @@ "ctxt": 0 }, "value": "r6b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -17368,7 +16804,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -17379,7 +16814,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -17412,8 +16846,8 @@ "ctxt": 0 }, "value": "r6b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -17431,7 +16865,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -17442,7 +16875,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -17475,8 +16907,8 @@ "ctxt": 0 }, "value": "r6b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -17494,7 +16926,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -17505,7 +16936,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -17538,8 +16968,8 @@ "ctxt": 0 }, "value": "r6c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -17557,7 +16987,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -17568,7 +16997,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -17601,8 +17029,8 @@ "ctxt": 0 }, "value": "r6c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -17620,7 +17048,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -17631,7 +17058,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -17664,8 +17090,8 @@ "ctxt": 0 }, "value": "r6c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -17683,7 +17109,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -17694,7 +17119,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -17727,8 +17151,8 @@ "ctxt": 0 }, "value": "r6c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -17746,7 +17170,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -17757,7 +17180,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -17790,8 +17212,8 @@ "ctxt": 0 }, "value": "r6c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -17809,7 +17231,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -17820,7 +17241,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -17853,8 +17273,8 @@ "ctxt": 0 }, "value": "r6c6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -17872,7 +17292,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -17883,7 +17302,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -17916,8 +17334,8 @@ "ctxt": 0 }, "value": "r6d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -17935,7 +17353,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -17946,7 +17363,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -17979,8 +17395,8 @@ "ctxt": 0 }, "value": "r6d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -17998,7 +17414,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -18009,7 +17424,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -18042,8 +17456,8 @@ "ctxt": 0 }, "value": "r6d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -18061,7 +17475,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -18072,7 +17485,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -18105,8 +17517,8 @@ "ctxt": 0 }, "value": "r6d4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -18124,7 +17536,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -18135,7 +17546,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -18168,8 +17578,8 @@ "ctxt": 0 }, "value": "r6d5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -18187,7 +17597,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -18198,7 +17607,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -18231,8 +17639,8 @@ "ctxt": 0 }, "value": "r6d6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -18250,7 +17658,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -18261,7 +17668,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -18294,8 +17700,8 @@ "ctxt": 0 }, "value": "r6e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -18313,7 +17719,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -18324,7 +17729,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -18357,8 +17761,8 @@ "ctxt": 0 }, "value": "r6e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -18376,7 +17780,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -18387,7 +17790,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -18420,8 +17822,8 @@ "ctxt": 0 }, "value": "r6e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -18439,7 +17841,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -18450,7 +17851,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -18483,8 +17883,8 @@ "ctxt": 0 }, "value": "r6e4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -18502,7 +17902,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -18513,7 +17912,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -18546,8 +17944,8 @@ "ctxt": 0 }, "value": "r6e5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -18565,7 +17963,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -18576,7 +17973,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -18609,8 +18005,8 @@ "ctxt": 0 }, "value": "r6e6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -18628,7 +18024,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -18639,7 +18034,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -18672,8 +18066,8 @@ "ctxt": 0 }, "value": "r6f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -18691,7 +18085,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -18702,7 +18095,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -18735,8 +18127,8 @@ "ctxt": 0 }, "value": "r6f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -18754,7 +18146,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -18765,7 +18156,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -18798,8 +18188,8 @@ "ctxt": 0 }, "value": "r6f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -18817,7 +18207,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -18828,7 +18217,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -18861,8 +18249,8 @@ "ctxt": 0 }, "value": "r6f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -18880,7 +18268,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -18891,7 +18278,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -18924,8 +18310,8 @@ "ctxt": 0 }, "value": "r6f5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -18943,7 +18329,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -18954,7 +18339,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -18987,8 +18371,8 @@ "ctxt": 0 }, "value": "r6f6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -19006,7 +18390,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -19017,7 +18400,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -19050,8 +18432,8 @@ "ctxt": 0 }, "value": "r6g1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -19076,7 +18458,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -19087,7 +18468,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19100,7 +18480,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -19133,8 +18512,8 @@ "ctxt": 0 }, "value": "r6g2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -19159,7 +18538,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -19170,7 +18548,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19183,7 +18560,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -19216,8 +18592,8 @@ "ctxt": 0 }, "value": "r6g3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -19242,7 +18618,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -19253,7 +18628,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19266,7 +18640,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -19299,8 +18672,8 @@ "ctxt": 0 }, "value": "r6g4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -19325,7 +18698,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -19336,7 +18708,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19349,7 +18720,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -19382,8 +18752,8 @@ "ctxt": 0 }, "value": "r6g5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -19408,7 +18778,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -19419,7 +18788,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19432,7 +18800,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -19465,8 +18832,8 @@ "ctxt": 0 }, "value": "r6g6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -19491,7 +18858,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -19502,7 +18868,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19515,7 +18880,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -19548,8 +18912,8 @@ "ctxt": 0 }, "value": "r6h1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -19567,7 +18931,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -19585,7 +18948,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -19596,7 +18958,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19631,8 +18992,8 @@ "ctxt": 0 }, "value": "r6h2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -19650,7 +19011,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -19668,7 +19028,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -19679,7 +19038,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19714,8 +19072,8 @@ "ctxt": 0 }, "value": "r6h3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -19733,7 +19091,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -19751,7 +19108,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -19762,7 +19118,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19797,8 +19152,8 @@ "ctxt": 0 }, "value": "r6h4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -19816,7 +19171,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -19834,7 +19188,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -19845,7 +19198,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19880,8 +19232,8 @@ "ctxt": 0 }, "value": "r6h5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -19899,7 +19251,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -19917,7 +19268,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -19928,7 +19278,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19963,8 +19312,8 @@ "ctxt": 0 }, "value": "r6h6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -19982,7 +19331,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -20000,7 +19348,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -20011,7 +19358,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20046,8 +19392,8 @@ "ctxt": 0 }, "value": "r7a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -20065,7 +19411,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -20076,7 +19421,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -20109,8 +19453,8 @@ "ctxt": 0 }, "value": "r7a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -20128,7 +19472,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -20139,7 +19482,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -20172,8 +19514,8 @@ "ctxt": 0 }, "value": "r7a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -20191,7 +19533,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -20202,7 +19543,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -20235,8 +19575,8 @@ "ctxt": 0 }, "value": "r7a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -20254,7 +19594,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -20265,7 +19604,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -20298,8 +19636,8 @@ "ctxt": 0 }, "value": "r7a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -20317,7 +19655,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -20328,7 +19665,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -20361,8 +19697,8 @@ "ctxt": 0 }, "value": "r7a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -20380,7 +19716,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -20391,7 +19726,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -20424,8 +19758,8 @@ "ctxt": 0 }, "value": "r7b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -20443,7 +19777,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -20454,7 +19787,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -20487,8 +19819,8 @@ "ctxt": 0 }, "value": "r7b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -20506,7 +19838,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -20517,7 +19848,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -20550,8 +19880,8 @@ "ctxt": 0 }, "value": "r7b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -20569,7 +19899,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -20580,7 +19909,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -20613,8 +19941,8 @@ "ctxt": 0 }, "value": "r7b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -20632,7 +19960,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -20643,7 +19970,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -20676,8 +20002,8 @@ "ctxt": 0 }, "value": "r7b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -20695,7 +20021,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -20706,7 +20031,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -20739,8 +20063,8 @@ "ctxt": 0 }, "value": "r7b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -20758,7 +20082,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -20769,7 +20092,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -20802,8 +20124,8 @@ "ctxt": 0 }, "value": "r7c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -20821,7 +20143,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -20832,7 +20153,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -20865,8 +20185,8 @@ "ctxt": 0 }, "value": "r7c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -20884,7 +20204,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -20895,7 +20214,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -20928,8 +20246,8 @@ "ctxt": 0 }, "value": "r7c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -20947,7 +20265,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -20958,7 +20275,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -20991,8 +20307,8 @@ "ctxt": 0 }, "value": "r7c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -21010,7 +20326,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -21021,7 +20336,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -21054,8 +20368,8 @@ "ctxt": 0 }, "value": "r7c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -21073,7 +20387,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -21084,7 +20397,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -21117,8 +20429,8 @@ "ctxt": 0 }, "value": "r7c6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -21136,7 +20448,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -21147,7 +20458,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -21180,8 +20490,8 @@ "ctxt": 0 }, "value": "r7d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -21199,7 +20509,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -21210,7 +20519,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -21243,8 +20551,8 @@ "ctxt": 0 }, "value": "r7d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -21262,7 +20570,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -21273,7 +20580,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -21306,8 +20612,8 @@ "ctxt": 0 }, "value": "r7d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -21325,7 +20631,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -21336,7 +20641,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -21369,8 +20673,8 @@ "ctxt": 0 }, "value": "r7d4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -21388,7 +20692,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -21399,7 +20702,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -21432,8 +20734,8 @@ "ctxt": 0 }, "value": "r7d5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -21451,7 +20753,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -21462,7 +20763,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -21495,8 +20795,8 @@ "ctxt": 0 }, "value": "r7d6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -21514,7 +20814,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -21525,7 +20824,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -21558,8 +20856,8 @@ "ctxt": 0 }, "value": "r7e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -21577,7 +20875,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -21588,7 +20885,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -21621,8 +20917,8 @@ "ctxt": 0 }, "value": "r7e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -21640,7 +20936,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -21651,7 +20946,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -21684,8 +20978,8 @@ "ctxt": 0 }, "value": "r7e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -21703,7 +20997,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -21714,7 +21007,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -21747,8 +21039,8 @@ "ctxt": 0 }, "value": "r7e4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -21766,7 +21058,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -21777,7 +21068,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -21810,8 +21100,8 @@ "ctxt": 0 }, "value": "r7e5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -21829,7 +21119,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -21840,7 +21129,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -21873,8 +21161,8 @@ "ctxt": 0 }, "value": "r7e6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -21892,7 +21180,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -21903,7 +21190,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -21936,8 +21222,8 @@ "ctxt": 0 }, "value": "r7f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -21955,7 +21241,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -21966,7 +21251,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -21999,8 +21283,8 @@ "ctxt": 0 }, "value": "r7f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -22018,7 +21302,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -22029,7 +21312,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -22062,8 +21344,8 @@ "ctxt": 0 }, "value": "r7f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -22081,7 +21363,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -22092,7 +21373,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -22125,8 +21405,8 @@ "ctxt": 0 }, "value": "r7f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -22144,7 +21424,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -22155,7 +21434,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -22188,8 +21466,8 @@ "ctxt": 0 }, "value": "r7f5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -22207,7 +21485,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -22218,7 +21495,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -22251,8 +21527,8 @@ "ctxt": 0 }, "value": "r7f6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -22270,7 +21546,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -22281,7 +21556,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -22314,8 +21588,8 @@ "ctxt": 0 }, "value": "r7g1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -22340,7 +21614,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -22351,7 +21624,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22364,7 +21636,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -22397,8 +21668,8 @@ "ctxt": 0 }, "value": "r7g2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -22423,7 +21694,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -22434,7 +21704,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22447,7 +21716,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -22480,8 +21748,8 @@ "ctxt": 0 }, "value": "r7g3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -22506,7 +21774,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -22517,7 +21784,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22530,7 +21796,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -22563,8 +21828,8 @@ "ctxt": 0 }, "value": "r7g4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -22589,7 +21854,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -22600,7 +21864,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22613,7 +21876,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -22646,8 +21908,8 @@ "ctxt": 0 }, "value": "r7g5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -22672,7 +21934,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -22683,7 +21944,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22696,7 +21956,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -22729,8 +21988,8 @@ "ctxt": 0 }, "value": "r7g6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -22755,7 +22014,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -22766,7 +22024,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22779,7 +22036,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -22812,8 +22068,8 @@ "ctxt": 0 }, "value": "r7h1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -22831,7 +22087,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -22849,7 +22104,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -22860,7 +22114,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22895,8 +22148,8 @@ "ctxt": 0 }, "value": "r7h2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -22914,7 +22167,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -22932,7 +22184,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -22943,7 +22194,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22978,8 +22228,8 @@ "ctxt": 0 }, "value": "r7h3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -22997,7 +22247,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -23015,7 +22264,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -23026,7 +22274,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23061,8 +22308,8 @@ "ctxt": 0 }, "value": "r7h4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -23080,7 +22327,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -23098,7 +22344,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -23109,7 +22354,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23144,8 +22388,8 @@ "ctxt": 0 }, "value": "r7h5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -23163,7 +22407,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -23181,7 +22424,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -23192,7 +22434,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23227,8 +22468,8 @@ "ctxt": 0 }, "value": "r7h6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -23246,7 +22487,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -23264,7 +22504,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -23275,7 +22514,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23310,8 +22548,8 @@ "ctxt": 0 }, "value": "r8a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -23329,7 +22567,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -23340,7 +22577,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -23373,8 +22609,8 @@ "ctxt": 0 }, "value": "r8a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -23392,7 +22628,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -23403,7 +22638,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -23436,8 +22670,8 @@ "ctxt": 0 }, "value": "r8a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -23455,7 +22689,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -23466,7 +22699,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -23499,8 +22731,8 @@ "ctxt": 0 }, "value": "r8a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -23518,7 +22750,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -23529,7 +22760,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -23562,8 +22792,8 @@ "ctxt": 0 }, "value": "r8a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -23581,7 +22811,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -23592,7 +22821,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -23625,8 +22853,8 @@ "ctxt": 0 }, "value": "r8a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -23644,7 +22872,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -23655,7 +22882,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -23688,8 +22914,8 @@ "ctxt": 0 }, "value": "r8b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -23707,7 +22933,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -23718,7 +22943,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -23751,8 +22975,8 @@ "ctxt": 0 }, "value": "r8b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -23770,7 +22994,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -23781,7 +23004,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -23814,8 +23036,8 @@ "ctxt": 0 }, "value": "r8b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -23833,7 +23055,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -23844,7 +23065,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -23877,8 +23097,8 @@ "ctxt": 0 }, "value": "r8b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -23896,7 +23116,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -23907,7 +23126,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -23940,8 +23158,8 @@ "ctxt": 0 }, "value": "r8b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -23959,7 +23177,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -23970,7 +23187,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -24003,8 +23219,8 @@ "ctxt": 0 }, "value": "r8b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -24022,7 +23238,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -24033,7 +23248,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -24066,8 +23280,8 @@ "ctxt": 0 }, "value": "r8c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -24085,7 +23299,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -24096,7 +23309,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -24129,8 +23341,8 @@ "ctxt": 0 }, "value": "r8c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -24148,7 +23360,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -24159,7 +23370,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -24192,8 +23402,8 @@ "ctxt": 0 }, "value": "r8c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -24211,7 +23421,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -24222,7 +23431,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -24255,8 +23463,8 @@ "ctxt": 0 }, "value": "r8c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -24274,7 +23482,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -24285,7 +23492,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -24318,8 +23524,8 @@ "ctxt": 0 }, "value": "r8c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -24337,7 +23543,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -24348,7 +23553,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -24381,8 +23585,8 @@ "ctxt": 0 }, "value": "r8c6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -24400,7 +23604,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -24411,7 +23614,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -24444,8 +23646,8 @@ "ctxt": 0 }, "value": "r8d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -24463,7 +23665,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -24474,7 +23675,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -24507,8 +23707,8 @@ "ctxt": 0 }, "value": "r8d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -24526,7 +23726,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -24537,7 +23736,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -24570,8 +23768,8 @@ "ctxt": 0 }, "value": "r8d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -24589,7 +23787,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -24600,7 +23797,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -24633,8 +23829,8 @@ "ctxt": 0 }, "value": "r8d4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -24652,7 +23848,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -24663,7 +23858,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -24696,8 +23890,8 @@ "ctxt": 0 }, "value": "r8d5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -24715,7 +23909,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -24726,7 +23919,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -24759,8 +23951,8 @@ "ctxt": 0 }, "value": "r8d6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -24778,7 +23970,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -24789,7 +23980,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -24822,8 +24012,8 @@ "ctxt": 0 }, "value": "r8e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -24841,7 +24031,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -24852,7 +24041,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -24885,8 +24073,8 @@ "ctxt": 0 }, "value": "r8e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -24904,7 +24092,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -24915,7 +24102,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -24948,8 +24134,8 @@ "ctxt": 0 }, "value": "r8e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -24967,7 +24153,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -24978,7 +24163,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -25011,8 +24195,8 @@ "ctxt": 0 }, "value": "r8e4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -25030,7 +24214,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -25041,7 +24224,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -25074,8 +24256,8 @@ "ctxt": 0 }, "value": "r8e5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -25093,7 +24275,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -25104,7 +24285,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -25137,8 +24317,8 @@ "ctxt": 0 }, "value": "r8e6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -25156,7 +24336,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -25167,7 +24346,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -25200,8 +24378,8 @@ "ctxt": 0 }, "value": "r8f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -25219,7 +24397,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -25230,7 +24407,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -25263,8 +24439,8 @@ "ctxt": 0 }, "value": "r8f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -25282,7 +24458,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -25293,7 +24468,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -25326,8 +24500,8 @@ "ctxt": 0 }, "value": "r8f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -25345,7 +24519,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -25356,7 +24529,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -25389,8 +24561,8 @@ "ctxt": 0 }, "value": "r8f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -25408,7 +24580,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -25419,7 +24590,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -25452,8 +24622,8 @@ "ctxt": 0 }, "value": "r8f5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -25471,7 +24641,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -25482,7 +24651,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -25515,8 +24683,8 @@ "ctxt": 0 }, "value": "r8f6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -25534,7 +24702,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -25545,7 +24712,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -25578,8 +24744,8 @@ "ctxt": 0 }, "value": "r8g1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -25604,7 +24770,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -25615,7 +24780,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25628,7 +24792,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -25661,8 +24824,8 @@ "ctxt": 0 }, "value": "r8g2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -25687,7 +24850,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -25698,7 +24860,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25711,7 +24872,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -25744,8 +24904,8 @@ "ctxt": 0 }, "value": "r8g3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -25770,7 +24930,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -25781,7 +24940,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25794,7 +24952,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -25827,8 +24984,8 @@ "ctxt": 0 }, "value": "r8g4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -25853,7 +25010,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -25864,7 +25020,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25877,7 +25032,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -25910,8 +25064,8 @@ "ctxt": 0 }, "value": "r8g5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -25936,7 +25090,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -25947,7 +25100,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25960,7 +25112,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -25993,8 +25144,8 @@ "ctxt": 0 }, "value": "r8g6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -26019,7 +25170,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -26030,7 +25180,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26043,7 +25192,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -26076,8 +25224,8 @@ "ctxt": 0 }, "value": "r8h1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -26095,7 +25243,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -26113,7 +25260,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -26124,7 +25270,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26159,8 +25304,8 @@ "ctxt": 0 }, "value": "r8h2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -26178,7 +25323,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -26196,7 +25340,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -26207,7 +25350,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26242,8 +25384,8 @@ "ctxt": 0 }, "value": "r8h3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -26261,7 +25403,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -26279,7 +25420,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -26290,7 +25430,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26325,8 +25464,8 @@ "ctxt": 0 }, "value": "r8h4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -26344,7 +25483,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -26362,7 +25500,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -26373,7 +25510,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26408,8 +25544,8 @@ "ctxt": 0 }, "value": "r8h5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -26427,7 +25563,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -26445,7 +25580,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -26456,7 +25590,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26491,8 +25624,8 @@ "ctxt": 0 }, "value": "r8h6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -26510,7 +25643,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -26528,7 +25660,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -26539,7 +25670,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26574,8 +25704,8 @@ "ctxt": 0 }, "value": "r9a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -26593,7 +25723,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -26604,7 +25733,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -26637,8 +25765,8 @@ "ctxt": 0 }, "value": "r9a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -26656,7 +25784,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -26667,7 +25794,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -26700,8 +25826,8 @@ "ctxt": 0 }, "value": "r9a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -26719,7 +25845,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -26730,7 +25855,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -26763,8 +25887,8 @@ "ctxt": 0 }, "value": "r9a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -26782,7 +25906,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -26793,7 +25916,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -26826,8 +25948,8 @@ "ctxt": 0 }, "value": "r9a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -26845,7 +25967,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -26856,7 +25977,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -26889,8 +26009,8 @@ "ctxt": 0 }, "value": "r9a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -26908,7 +26028,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -26919,7 +26038,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -26952,8 +26070,8 @@ "ctxt": 0 }, "value": "r9b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -26971,7 +26089,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -26982,7 +26099,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -27015,8 +26131,8 @@ "ctxt": 0 }, "value": "r9b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -27034,7 +26150,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -27045,7 +26160,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -27078,8 +26192,8 @@ "ctxt": 0 }, "value": "r9b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -27097,7 +26211,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -27108,7 +26221,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -27141,8 +26253,8 @@ "ctxt": 0 }, "value": "r9b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -27160,7 +26272,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -27171,7 +26282,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -27204,8 +26314,8 @@ "ctxt": 0 }, "value": "r9b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -27223,7 +26333,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -27234,7 +26343,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -27267,8 +26375,8 @@ "ctxt": 0 }, "value": "r9b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -27286,7 +26394,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -27297,7 +26404,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -27330,8 +26436,8 @@ "ctxt": 0 }, "value": "r9c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -27349,7 +26455,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -27360,7 +26465,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -27393,8 +26497,8 @@ "ctxt": 0 }, "value": "r9c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -27412,7 +26516,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -27423,7 +26526,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -27456,8 +26558,8 @@ "ctxt": 0 }, "value": "r9c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -27475,7 +26577,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -27486,7 +26587,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -27519,8 +26619,8 @@ "ctxt": 0 }, "value": "r9c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -27538,7 +26638,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -27549,7 +26648,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -27582,8 +26680,8 @@ "ctxt": 0 }, "value": "r9c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -27601,7 +26699,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -27612,7 +26709,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -27645,8 +26741,8 @@ "ctxt": 0 }, "value": "r9c6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -27664,7 +26760,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -27675,7 +26770,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -27708,8 +26802,8 @@ "ctxt": 0 }, "value": "r9d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -27727,7 +26821,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -27738,7 +26831,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -27771,8 +26863,8 @@ "ctxt": 0 }, "value": "r9d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -27790,7 +26882,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -27801,7 +26892,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -27834,8 +26924,8 @@ "ctxt": 0 }, "value": "r9d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -27853,7 +26943,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -27864,7 +26953,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -27897,8 +26985,8 @@ "ctxt": 0 }, "value": "r9d4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -27916,7 +27004,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -27927,7 +27014,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -27960,8 +27046,8 @@ "ctxt": 0 }, "value": "r9d5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -27979,7 +27065,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -27990,7 +27075,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -28023,8 +27107,8 @@ "ctxt": 0 }, "value": "r9d6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -28042,7 +27126,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -28053,7 +27136,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -28086,8 +27168,8 @@ "ctxt": 0 }, "value": "r9e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -28105,7 +27187,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -28116,7 +27197,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -28149,8 +27229,8 @@ "ctxt": 0 }, "value": "r9e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -28168,7 +27248,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -28179,7 +27258,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -28212,8 +27290,8 @@ "ctxt": 0 }, "value": "r9e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -28231,7 +27309,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -28242,7 +27319,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -28275,8 +27351,8 @@ "ctxt": 0 }, "value": "r9e4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -28294,7 +27370,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -28305,7 +27380,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -28338,8 +27412,8 @@ "ctxt": 0 }, "value": "r9e5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -28357,7 +27431,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -28368,7 +27441,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -28401,8 +27473,8 @@ "ctxt": 0 }, "value": "r9e6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -28420,7 +27492,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -28431,7 +27502,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -28464,8 +27534,8 @@ "ctxt": 0 }, "value": "r9f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -28483,7 +27553,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -28494,7 +27563,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -28527,8 +27595,8 @@ "ctxt": 0 }, "value": "r9f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -28546,7 +27614,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -28557,7 +27624,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -28590,8 +27656,8 @@ "ctxt": 0 }, "value": "r9f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -28609,7 +27675,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -28620,7 +27685,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -28653,8 +27717,8 @@ "ctxt": 0 }, "value": "r9f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -28672,7 +27736,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -28683,7 +27746,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -28716,8 +27778,8 @@ "ctxt": 0 }, "value": "r9f5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -28735,7 +27797,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -28746,7 +27807,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -28779,8 +27839,8 @@ "ctxt": 0 }, "value": "r9f6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -28798,7 +27858,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -28809,7 +27868,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -28842,8 +27900,8 @@ "ctxt": 0 }, "value": "r9g1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -28868,7 +27926,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -28879,7 +27936,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28892,7 +27948,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -28925,8 +27980,8 @@ "ctxt": 0 }, "value": "r9g2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -28951,7 +28006,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -28962,7 +28016,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28975,7 +28028,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -29008,8 +28060,8 @@ "ctxt": 0 }, "value": "r9g3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -29034,7 +28086,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -29045,7 +28096,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29058,7 +28108,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -29091,8 +28140,8 @@ "ctxt": 0 }, "value": "r9g4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -29117,7 +28166,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -29128,7 +28176,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29141,7 +28188,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -29174,8 +28220,8 @@ "ctxt": 0 }, "value": "r9g5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -29200,7 +28246,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -29211,7 +28256,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29224,7 +28268,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -29257,8 +28300,8 @@ "ctxt": 0 }, "value": "r9g6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -29283,7 +28326,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -29294,7 +28336,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29307,7 +28348,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -29340,8 +28380,8 @@ "ctxt": 0 }, "value": "r9h1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -29359,7 +28399,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -29377,7 +28416,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -29388,7 +28426,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29423,8 +28460,8 @@ "ctxt": 0 }, "value": "r9h2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -29442,7 +28479,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -29460,7 +28496,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -29471,7 +28506,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29506,8 +28540,8 @@ "ctxt": 0 }, "value": "r9h3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -29525,7 +28559,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -29543,7 +28576,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -29554,7 +28586,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29589,8 +28620,8 @@ "ctxt": 0 }, "value": "r9h4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -29608,7 +28639,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -29626,7 +28656,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -29637,7 +28666,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29672,8 +28700,8 @@ "ctxt": 0 }, "value": "r9h5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -29691,7 +28719,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -29709,7 +28736,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -29720,7 +28746,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29755,8 +28780,8 @@ "ctxt": 0 }, "value": "r9h6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -29774,7 +28799,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -29792,7 +28816,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -29803,7 +28826,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29838,8 +28860,8 @@ "ctxt": 0 }, "value": "r10a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -29857,7 +28879,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -29868,7 +28889,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -29901,8 +28921,8 @@ "ctxt": 0 }, "value": "r10a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -29920,7 +28940,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -29931,7 +28950,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -29964,8 +28982,8 @@ "ctxt": 0 }, "value": "r10a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -29983,7 +29001,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -29994,7 +29011,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -30027,8 +29043,8 @@ "ctxt": 0 }, "value": "r10a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -30046,7 +29062,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -30057,7 +29072,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -30090,8 +29104,8 @@ "ctxt": 0 }, "value": "r10a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -30109,7 +29123,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -30120,7 +29133,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -30153,8 +29165,8 @@ "ctxt": 0 }, "value": "r10a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -30172,7 +29184,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -30183,7 +29194,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -30216,8 +29226,8 @@ "ctxt": 0 }, "value": "r10b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -30235,7 +29245,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -30246,7 +29255,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -30279,8 +29287,8 @@ "ctxt": 0 }, "value": "r10b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -30298,7 +29306,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -30309,7 +29316,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -30342,8 +29348,8 @@ "ctxt": 0 }, "value": "r10b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -30361,7 +29367,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -30372,7 +29377,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -30405,8 +29409,8 @@ "ctxt": 0 }, "value": "r10b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -30424,7 +29428,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -30435,7 +29438,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -30468,8 +29470,8 @@ "ctxt": 0 }, "value": "r10b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -30487,7 +29489,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -30498,7 +29499,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -30531,8 +29531,8 @@ "ctxt": 0 }, "value": "r10b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -30550,7 +29550,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -30561,7 +29560,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -30594,8 +29592,8 @@ "ctxt": 0 }, "value": "r10c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -30613,7 +29611,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -30624,7 +29621,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -30657,8 +29653,8 @@ "ctxt": 0 }, "value": "r10c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -30676,7 +29672,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -30687,7 +29682,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -30720,8 +29714,8 @@ "ctxt": 0 }, "value": "r10c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -30739,7 +29733,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -30750,7 +29743,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -30783,8 +29775,8 @@ "ctxt": 0 }, "value": "r10c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -30802,7 +29794,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -30813,7 +29804,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -30846,8 +29836,8 @@ "ctxt": 0 }, "value": "r10c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -30865,7 +29855,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -30876,7 +29865,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -30909,8 +29897,8 @@ "ctxt": 0 }, "value": "r10c6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -30928,7 +29916,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -30939,7 +29926,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -30972,8 +29958,8 @@ "ctxt": 0 }, "value": "r10d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -30991,7 +29977,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -31002,7 +29987,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -31035,8 +30019,8 @@ "ctxt": 0 }, "value": "r10d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -31054,7 +30038,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -31065,7 +30048,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -31098,8 +30080,8 @@ "ctxt": 0 }, "value": "r10d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -31117,7 +30099,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -31128,7 +30109,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -31161,8 +30141,8 @@ "ctxt": 0 }, "value": "r10d4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -31180,7 +30160,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -31191,7 +30170,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -31224,8 +30202,8 @@ "ctxt": 0 }, "value": "r10d5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -31243,7 +30221,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -31254,7 +30231,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -31287,8 +30263,8 @@ "ctxt": 0 }, "value": "r10d6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -31306,7 +30282,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -31317,7 +30292,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -31350,8 +30324,8 @@ "ctxt": 0 }, "value": "r10e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -31369,7 +30343,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -31380,7 +30353,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -31413,8 +30385,8 @@ "ctxt": 0 }, "value": "r10e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -31432,7 +30404,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -31443,7 +30414,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -31476,8 +30446,8 @@ "ctxt": 0 }, "value": "r10e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -31495,7 +30465,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -31506,7 +30475,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -31539,8 +30507,8 @@ "ctxt": 0 }, "value": "r10e4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -31558,7 +30526,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -31569,7 +30536,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -31602,8 +30568,8 @@ "ctxt": 0 }, "value": "r10e5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -31621,7 +30587,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -31632,7 +30597,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -31665,8 +30629,8 @@ "ctxt": 0 }, "value": "r10e6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -31684,7 +30648,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -31695,7 +30658,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -31728,8 +30690,8 @@ "ctxt": 0 }, "value": "r10f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -31747,7 +30709,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -31758,7 +30719,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -31791,8 +30751,8 @@ "ctxt": 0 }, "value": "r10f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -31810,7 +30770,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -31821,7 +30780,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -31854,8 +30812,8 @@ "ctxt": 0 }, "value": "r10f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -31873,7 +30831,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -31884,7 +30841,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -31917,8 +30873,8 @@ "ctxt": 0 }, "value": "r10f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -31936,7 +30892,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -31947,7 +30902,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -31980,8 +30934,8 @@ "ctxt": 0 }, "value": "r10f5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -31999,7 +30953,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -32010,7 +30963,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -32043,8 +30995,8 @@ "ctxt": 0 }, "value": "r10f6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -32062,7 +31014,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -32073,7 +31024,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -32106,8 +31056,8 @@ "ctxt": 0 }, "value": "r10g1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -32132,7 +31082,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -32143,7 +31092,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32156,7 +31104,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -32189,8 +31136,8 @@ "ctxt": 0 }, "value": "r10g2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -32215,7 +31162,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -32226,7 +31172,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32239,7 +31184,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -32272,8 +31216,8 @@ "ctxt": 0 }, "value": "r10g3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -32298,7 +31242,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -32309,7 +31252,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32322,7 +31264,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -32355,8 +31296,8 @@ "ctxt": 0 }, "value": "r10g4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -32381,7 +31322,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -32392,7 +31332,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32405,7 +31344,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -32438,8 +31376,8 @@ "ctxt": 0 }, "value": "r10g5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -32464,7 +31402,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -32475,7 +31412,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32488,7 +31424,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -32521,8 +31456,8 @@ "ctxt": 0 }, "value": "r10g6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -32547,7 +31482,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -32558,7 +31492,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32571,7 +31504,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -32604,8 +31536,8 @@ "ctxt": 0 }, "value": "r10h1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -32623,7 +31555,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -32641,7 +31572,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -32652,7 +31582,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32687,8 +31616,8 @@ "ctxt": 0 }, "value": "r10h2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -32706,7 +31635,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -32724,7 +31652,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -32735,7 +31662,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32770,8 +31696,8 @@ "ctxt": 0 }, "value": "r10h3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -32789,7 +31715,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -32807,7 +31732,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -32818,7 +31742,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32853,8 +31776,8 @@ "ctxt": 0 }, "value": "r10h4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -32872,7 +31795,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -32890,7 +31812,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -32901,7 +31822,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32936,8 +31856,8 @@ "ctxt": 0 }, "value": "r10h5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -32955,7 +31875,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -32973,7 +31892,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -32984,7 +31902,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33019,8 +31936,8 @@ "ctxt": 0 }, "value": "r10h6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -33038,7 +31955,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -33056,7 +31972,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -33067,7 +31982,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithNullValueAndInvalidOperands/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithNullValueAndInvalidOperands/input.ts.json index 256a6bf79efb..e364c757bd08 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithNullValueAndInvalidOperands/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithNullValueAndInvalidOperands/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -151,13 +152,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -189,8 +188,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -216,7 +215,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -249,8 +247,8 @@ "ctxt": 0 }, "value": "r1a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -276,7 +274,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -309,8 +306,8 @@ "ctxt": 0 }, "value": "r1a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -336,7 +333,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -369,8 +365,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -388,7 +384,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -429,8 +424,8 @@ "ctxt": 0 }, "value": "r1b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -448,7 +443,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -489,8 +483,8 @@ "ctxt": 0 }, "value": "r1b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -508,7 +502,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -549,8 +542,8 @@ "ctxt": 0 }, "value": "r1c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -607,8 +600,8 @@ "ctxt": 0 }, "value": "r1c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -670,8 +663,8 @@ "ctxt": 0 }, "value": "r1c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -728,8 +721,8 @@ "ctxt": 0 }, "value": "r1d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -786,8 +779,8 @@ "ctxt": 0 }, "value": "r1d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -849,8 +842,8 @@ "ctxt": 0 }, "value": "r1d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -907,8 +900,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -934,7 +927,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -967,8 +959,8 @@ "ctxt": 0 }, "value": "r2a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -994,7 +986,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1027,8 +1018,8 @@ "ctxt": 0 }, "value": "r2a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1054,7 +1045,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1087,8 +1077,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1106,7 +1096,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1147,8 +1136,8 @@ "ctxt": 0 }, "value": "r2b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1166,7 +1155,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1207,8 +1195,8 @@ "ctxt": 0 }, "value": "r2b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1226,7 +1214,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1267,8 +1254,8 @@ "ctxt": 0 }, "value": "r2c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1325,8 +1312,8 @@ "ctxt": 0 }, "value": "r2c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1388,8 +1375,8 @@ "ctxt": 0 }, "value": "r2c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1446,8 +1433,8 @@ "ctxt": 0 }, "value": "r2d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1504,8 +1491,8 @@ "ctxt": 0 }, "value": "r2d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1567,8 +1554,8 @@ "ctxt": 0 }, "value": "r2d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1625,8 +1612,8 @@ "ctxt": 0 }, "value": "r3a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1652,7 +1639,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1685,8 +1671,8 @@ "ctxt": 0 }, "value": "r3a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1712,7 +1698,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1745,8 +1730,8 @@ "ctxt": 0 }, "value": "r3a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1772,7 +1757,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1805,8 +1789,8 @@ "ctxt": 0 }, "value": "r3b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1824,7 +1808,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1865,8 +1848,8 @@ "ctxt": 0 }, "value": "r3b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1884,7 +1867,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1925,8 +1907,8 @@ "ctxt": 0 }, "value": "r3b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1944,7 +1926,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1985,8 +1966,8 @@ "ctxt": 0 }, "value": "r3c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2043,8 +2024,8 @@ "ctxt": 0 }, "value": "r3c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2106,8 +2087,8 @@ "ctxt": 0 }, "value": "r3c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2164,8 +2145,8 @@ "ctxt": 0 }, "value": "r3d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2222,8 +2203,8 @@ "ctxt": 0 }, "value": "r3d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2285,8 +2266,8 @@ "ctxt": 0 }, "value": "r3d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2343,8 +2324,8 @@ "ctxt": 0 }, "value": "r4a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2370,7 +2351,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2403,8 +2383,8 @@ "ctxt": 0 }, "value": "r4a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2430,7 +2410,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2463,8 +2442,8 @@ "ctxt": 0 }, "value": "r4a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2490,7 +2469,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -2523,8 +2501,8 @@ "ctxt": 0 }, "value": "r4b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2542,7 +2520,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2583,8 +2560,8 @@ "ctxt": 0 }, "value": "r4b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2602,7 +2579,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2643,8 +2619,8 @@ "ctxt": 0 }, "value": "r4b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2662,7 +2638,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -2703,8 +2678,8 @@ "ctxt": 0 }, "value": "r4c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2761,8 +2736,8 @@ "ctxt": 0 }, "value": "r4c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2824,8 +2799,8 @@ "ctxt": 0 }, "value": "r4c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2882,8 +2857,8 @@ "ctxt": 0 }, "value": "r4d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2940,8 +2915,8 @@ "ctxt": 0 }, "value": "r4d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3003,8 +2978,8 @@ "ctxt": 0 }, "value": "r4d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3061,8 +3036,8 @@ "ctxt": 0 }, "value": "r5a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3088,7 +3063,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3121,8 +3095,8 @@ "ctxt": 0 }, "value": "r5a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3148,7 +3122,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3181,8 +3154,8 @@ "ctxt": 0 }, "value": "r5a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3208,7 +3181,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3241,8 +3213,8 @@ "ctxt": 0 }, "value": "r5b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3260,7 +3232,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3301,8 +3272,8 @@ "ctxt": 0 }, "value": "r5b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3320,7 +3291,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3361,8 +3331,8 @@ "ctxt": 0 }, "value": "r5b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3380,7 +3350,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3421,8 +3390,8 @@ "ctxt": 0 }, "value": "r5c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3479,8 +3448,8 @@ "ctxt": 0 }, "value": "r5c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3542,8 +3511,8 @@ "ctxt": 0 }, "value": "r5c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3600,8 +3569,8 @@ "ctxt": 0 }, "value": "r5d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3658,8 +3627,8 @@ "ctxt": 0 }, "value": "r5d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3721,8 +3690,8 @@ "ctxt": 0 }, "value": "r5d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3779,8 +3748,8 @@ "ctxt": 0 }, "value": "r6a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3806,7 +3775,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3839,8 +3807,8 @@ "ctxt": 0 }, "value": "r6a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3866,7 +3834,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3899,8 +3866,8 @@ "ctxt": 0 }, "value": "r6a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3926,7 +3893,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3959,8 +3925,8 @@ "ctxt": 0 }, "value": "r6b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3978,7 +3944,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4019,8 +3984,8 @@ "ctxt": 0 }, "value": "r6b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4038,7 +4003,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4079,8 +4043,8 @@ "ctxt": 0 }, "value": "r6b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4098,7 +4062,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4139,8 +4102,8 @@ "ctxt": 0 }, "value": "r6c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4197,8 +4160,8 @@ "ctxt": 0 }, "value": "r6c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4260,8 +4223,8 @@ "ctxt": 0 }, "value": "r6c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4318,8 +4281,8 @@ "ctxt": 0 }, "value": "r6d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4376,8 +4339,8 @@ "ctxt": 0 }, "value": "r6d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4439,8 +4402,8 @@ "ctxt": 0 }, "value": "r6d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4497,8 +4460,8 @@ "ctxt": 0 }, "value": "r7a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4524,7 +4487,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4557,8 +4519,8 @@ "ctxt": 0 }, "value": "r7a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4584,7 +4546,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4617,8 +4578,8 @@ "ctxt": 0 }, "value": "r7a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4644,7 +4605,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -4677,8 +4637,8 @@ "ctxt": 0 }, "value": "r7b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4696,7 +4656,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4737,8 +4696,8 @@ "ctxt": 0 }, "value": "r7b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4756,7 +4715,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4797,8 +4755,8 @@ "ctxt": 0 }, "value": "r7b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4816,7 +4774,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4857,8 +4814,8 @@ "ctxt": 0 }, "value": "r7c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4915,8 +4872,8 @@ "ctxt": 0 }, "value": "r7c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4978,8 +4935,8 @@ "ctxt": 0 }, "value": "r7c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5036,8 +4993,8 @@ "ctxt": 0 }, "value": "r7d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5094,8 +5051,8 @@ "ctxt": 0 }, "value": "r7d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5157,8 +5114,8 @@ "ctxt": 0 }, "value": "r7d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5215,8 +5172,8 @@ "ctxt": 0 }, "value": "r8a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5242,7 +5199,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -5275,8 +5231,8 @@ "ctxt": 0 }, "value": "r8a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5302,7 +5258,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -5335,8 +5290,8 @@ "ctxt": 0 }, "value": "r8a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5362,7 +5317,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5395,8 +5349,8 @@ "ctxt": 0 }, "value": "r8b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5414,7 +5368,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -5455,8 +5408,8 @@ "ctxt": 0 }, "value": "r8b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5474,7 +5427,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -5515,8 +5467,8 @@ "ctxt": 0 }, "value": "r8b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5534,7 +5486,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -5575,8 +5526,8 @@ "ctxt": 0 }, "value": "r8c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5633,8 +5584,8 @@ "ctxt": 0 }, "value": "r8c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5696,8 +5647,8 @@ "ctxt": 0 }, "value": "r8c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5754,8 +5705,8 @@ "ctxt": 0 }, "value": "r8d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5812,8 +5763,8 @@ "ctxt": 0 }, "value": "r8d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5875,8 +5826,8 @@ "ctxt": 0 }, "value": "r8d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5933,8 +5884,8 @@ "ctxt": 0 }, "value": "r9a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5960,7 +5911,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -5993,8 +5943,8 @@ "ctxt": 0 }, "value": "r9a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6020,7 +5970,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -6053,8 +6002,8 @@ "ctxt": 0 }, "value": "r9a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6080,7 +6029,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -6113,8 +6061,8 @@ "ctxt": 0 }, "value": "r9b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6132,7 +6080,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -6173,8 +6120,8 @@ "ctxt": 0 }, "value": "r9b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6192,7 +6139,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -6233,8 +6179,8 @@ "ctxt": 0 }, "value": "r9b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6252,7 +6198,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -6293,8 +6238,8 @@ "ctxt": 0 }, "value": "r9c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6351,8 +6296,8 @@ "ctxt": 0 }, "value": "r9c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6414,8 +6359,8 @@ "ctxt": 0 }, "value": "r9c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6472,8 +6417,8 @@ "ctxt": 0 }, "value": "r9d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6530,8 +6475,8 @@ "ctxt": 0 }, "value": "r9d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6593,8 +6538,8 @@ "ctxt": 0 }, "value": "r9d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6651,8 +6596,8 @@ "ctxt": 0 }, "value": "r10a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6678,7 +6623,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -6711,8 +6655,8 @@ "ctxt": 0 }, "value": "r10a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6738,7 +6682,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -6771,8 +6714,8 @@ "ctxt": 0 }, "value": "r10a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6798,7 +6741,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -6831,8 +6773,8 @@ "ctxt": 0 }, "value": "r10b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6850,7 +6792,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -6891,8 +6832,8 @@ "ctxt": 0 }, "value": "r10b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6910,7 +6851,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -6951,8 +6891,8 @@ "ctxt": 0 }, "value": "r10b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6970,7 +6910,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -7011,8 +6950,8 @@ "ctxt": 0 }, "value": "r10c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7069,8 +7008,8 @@ "ctxt": 0 }, "value": "r10c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7132,8 +7071,8 @@ "ctxt": 0 }, "value": "r10c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7190,8 +7129,8 @@ "ctxt": 0 }, "value": "r10d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7248,8 +7187,8 @@ "ctxt": 0 }, "value": "r10d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7311,8 +7250,8 @@ "ctxt": 0 }, "value": "r10d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithNullValueAndValidOperands/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithNullValueAndValidOperands/input.ts.json index 856a4c119e41..837f4286016b 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithNullValueAndValidOperands/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithNullValueAndValidOperands/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -94,6 +91,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -110,8 +108,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,6 +140,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -159,8 +157,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -192,8 +189,8 @@ "ctxt": 0 }, "value": "ra1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -219,7 +216,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -252,8 +248,8 @@ "ctxt": 0 }, "value": "ra2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -279,7 +275,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -312,8 +307,8 @@ "ctxt": 0 }, "value": "ra3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -370,8 +365,8 @@ "ctxt": 0 }, "value": "ra4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -404,7 +399,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -415,7 +409,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -450,8 +443,8 @@ "ctxt": 0 }, "value": "ra5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -469,7 +462,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -510,8 +502,8 @@ "ctxt": 0 }, "value": "ra6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -529,7 +521,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -570,8 +561,8 @@ "ctxt": 0 }, "value": "ra7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -628,8 +619,8 @@ "ctxt": 0 }, "value": "ra8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -654,7 +645,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -665,7 +655,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -708,8 +697,8 @@ "ctxt": 0 }, "value": "rb1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -735,7 +724,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -768,8 +756,8 @@ "ctxt": 0 }, "value": "rb2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -795,7 +783,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -828,8 +815,8 @@ "ctxt": 0 }, "value": "rb3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -886,8 +873,8 @@ "ctxt": 0 }, "value": "rb4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -920,7 +907,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -931,7 +917,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -966,8 +951,8 @@ "ctxt": 0 }, "value": "rb5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -985,7 +970,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1026,8 +1010,8 @@ "ctxt": 0 }, "value": "rb6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1045,7 +1029,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1086,8 +1069,8 @@ "ctxt": 0 }, "value": "rb7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1144,8 +1127,8 @@ "ctxt": 0 }, "value": "rb8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1170,7 +1153,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1181,7 +1163,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1224,8 +1205,8 @@ "ctxt": 0 }, "value": "rc1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1251,7 +1232,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1284,8 +1264,8 @@ "ctxt": 0 }, "value": "rc2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1311,7 +1291,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1344,8 +1323,8 @@ "ctxt": 0 }, "value": "rc3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1402,8 +1381,8 @@ "ctxt": 0 }, "value": "rc4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1436,7 +1415,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1447,7 +1425,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1482,8 +1459,8 @@ "ctxt": 0 }, "value": "rc5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1501,7 +1478,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1542,8 +1518,8 @@ "ctxt": 0 }, "value": "rc6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1561,7 +1537,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1602,8 +1577,8 @@ "ctxt": 0 }, "value": "rc7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1660,8 +1635,8 @@ "ctxt": 0 }, "value": "rc8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1686,7 +1661,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1697,7 +1671,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1740,8 +1713,8 @@ "ctxt": 0 }, "value": "rd1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1767,7 +1740,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1800,8 +1772,8 @@ "ctxt": 0 }, "value": "rd2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1827,7 +1799,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1860,8 +1831,8 @@ "ctxt": 0 }, "value": "rd3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1918,8 +1889,8 @@ "ctxt": 0 }, "value": "rd4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1952,7 +1923,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1963,7 +1933,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1998,8 +1967,8 @@ "ctxt": 0 }, "value": "rd5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2017,7 +1986,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2058,8 +2026,8 @@ "ctxt": 0 }, "value": "rd6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2077,7 +2045,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2118,8 +2085,8 @@ "ctxt": 0 }, "value": "rd7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2176,8 +2143,8 @@ "ctxt": 0 }, "value": "rd8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2202,7 +2169,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2213,7 +2179,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2256,8 +2221,8 @@ "ctxt": 0 }, "value": "re1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2283,7 +2248,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2316,8 +2280,8 @@ "ctxt": 0 }, "value": "re2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2343,7 +2307,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2376,8 +2339,8 @@ "ctxt": 0 }, "value": "re3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2434,8 +2397,8 @@ "ctxt": 0 }, "value": "re4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2468,7 +2431,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2479,7 +2441,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2514,8 +2475,8 @@ "ctxt": 0 }, "value": "re5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2533,7 +2494,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2574,8 +2534,8 @@ "ctxt": 0 }, "value": "re6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2593,7 +2553,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2634,8 +2593,8 @@ "ctxt": 0 }, "value": "re7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2692,8 +2651,8 @@ "ctxt": 0 }, "value": "re8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2718,7 +2677,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2729,7 +2687,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2772,8 +2729,8 @@ "ctxt": 0 }, "value": "rf1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2799,7 +2756,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2832,8 +2788,8 @@ "ctxt": 0 }, "value": "rf2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2859,7 +2815,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2892,8 +2847,8 @@ "ctxt": 0 }, "value": "rf3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2950,8 +2905,8 @@ "ctxt": 0 }, "value": "rf4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2984,7 +2939,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2995,7 +2949,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3030,8 +2983,8 @@ "ctxt": 0 }, "value": "rf5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3049,7 +3002,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3090,8 +3042,8 @@ "ctxt": 0 }, "value": "rf6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3109,7 +3061,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3150,8 +3101,8 @@ "ctxt": 0 }, "value": "rf7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3208,8 +3159,8 @@ "ctxt": 0 }, "value": "rf8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3234,7 +3185,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3245,7 +3195,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3288,8 +3237,8 @@ "ctxt": 0 }, "value": "rg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3315,7 +3264,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3348,8 +3296,8 @@ "ctxt": 0 }, "value": "rg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3375,7 +3323,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3408,8 +3355,8 @@ "ctxt": 0 }, "value": "rg3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3466,8 +3413,8 @@ "ctxt": 0 }, "value": "rg4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3500,7 +3447,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3511,7 +3457,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3546,8 +3491,8 @@ "ctxt": 0 }, "value": "rg5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3565,7 +3510,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3606,8 +3550,8 @@ "ctxt": 0 }, "value": "rg6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3625,7 +3569,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3666,8 +3609,8 @@ "ctxt": 0 }, "value": "rg7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3724,8 +3667,8 @@ "ctxt": 0 }, "value": "rg8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3750,7 +3693,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3761,7 +3703,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3804,8 +3745,8 @@ "ctxt": 0 }, "value": "rh1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3831,7 +3772,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3864,8 +3804,8 @@ "ctxt": 0 }, "value": "rh2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3891,7 +3831,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3924,8 +3863,8 @@ "ctxt": 0 }, "value": "rh3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3982,8 +3921,8 @@ "ctxt": 0 }, "value": "rh4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4016,7 +3955,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4027,7 +3965,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4062,8 +3999,8 @@ "ctxt": 0 }, "value": "rh5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4081,7 +4018,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4122,8 +4058,8 @@ "ctxt": 0 }, "value": "rh6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4141,7 +4077,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4182,8 +4117,8 @@ "ctxt": 0 }, "value": "rh7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4240,8 +4175,8 @@ "ctxt": 0 }, "value": "rh8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4266,7 +4201,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4277,7 +4211,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4320,8 +4253,8 @@ "ctxt": 0 }, "value": "ri1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4347,7 +4280,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4380,8 +4312,8 @@ "ctxt": 0 }, "value": "ri2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4407,7 +4339,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4440,8 +4371,8 @@ "ctxt": 0 }, "value": "ri3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4498,8 +4429,8 @@ "ctxt": 0 }, "value": "ri4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4532,7 +4463,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4543,7 +4473,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4578,8 +4507,8 @@ "ctxt": 0 }, "value": "ri5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4597,7 +4526,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4638,8 +4566,8 @@ "ctxt": 0 }, "value": "ri6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4657,7 +4585,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4698,8 +4625,8 @@ "ctxt": 0 }, "value": "ri7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4756,8 +4683,8 @@ "ctxt": 0 }, "value": "ri8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4782,7 +4709,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4793,7 +4719,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4836,8 +4761,8 @@ "ctxt": 0 }, "value": "rj1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4863,7 +4788,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4896,8 +4820,8 @@ "ctxt": 0 }, "value": "rj2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4923,7 +4847,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4956,8 +4879,8 @@ "ctxt": 0 }, "value": "rj3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5014,8 +4937,8 @@ "ctxt": 0 }, "value": "rj4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5048,7 +4971,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -5059,7 +4981,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5094,8 +5015,8 @@ "ctxt": 0 }, "value": "rj5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5113,7 +5034,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -5154,8 +5074,8 @@ "ctxt": 0 }, "value": "rj6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5173,7 +5093,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -5214,8 +5133,8 @@ "ctxt": 0 }, "value": "rj7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5272,8 +5191,8 @@ "ctxt": 0 }, "value": "rj8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5298,7 +5217,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -5309,7 +5227,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithOnlyNullValueOrUndefinedValue/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithOnlyNullValueOrUndefinedValue/input.ts.json index a3c517db2443..28aa83ecfe5a 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithOnlyNullValueOrUndefinedValue/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithOnlyNullValueOrUndefinedValue/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "ra1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -88,8 +88,8 @@ "ctxt": 0 }, "value": "ra2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -115,7 +115,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -148,8 +147,8 @@ "ctxt": 0 }, "value": "ra3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -167,7 +166,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -208,8 +206,8 @@ "ctxt": 0 }, "value": "ra4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -227,7 +225,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -238,7 +235,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -271,8 +267,8 @@ "ctxt": 0 }, "value": "rb1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -328,8 +324,8 @@ "ctxt": 0 }, "value": "rb2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -355,7 +351,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -388,8 +383,8 @@ "ctxt": 0 }, "value": "rb3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -407,7 +402,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -448,8 +442,8 @@ "ctxt": 0 }, "value": "rb4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -467,7 +461,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -478,7 +471,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -511,8 +503,8 @@ "ctxt": 0 }, "value": "rc1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -568,8 +560,8 @@ "ctxt": 0 }, "value": "rc2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -595,7 +587,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -628,8 +619,8 @@ "ctxt": 0 }, "value": "rc3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -647,7 +638,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -688,8 +678,8 @@ "ctxt": 0 }, "value": "rc4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -707,7 +697,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -718,7 +707,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -751,8 +739,8 @@ "ctxt": 0 }, "value": "rd1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -808,8 +796,8 @@ "ctxt": 0 }, "value": "rd2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -835,7 +823,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -868,8 +855,8 @@ "ctxt": 0 }, "value": "rd3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -887,7 +874,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -928,8 +914,8 @@ "ctxt": 0 }, "value": "rd4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -947,7 +933,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -958,7 +943,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -991,8 +975,8 @@ "ctxt": 0 }, "value": "re1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1048,8 +1032,8 @@ "ctxt": 0 }, "value": "re2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1075,7 +1059,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1108,8 +1091,8 @@ "ctxt": 0 }, "value": "re3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1127,7 +1110,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1168,8 +1150,8 @@ "ctxt": 0 }, "value": "re4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1187,7 +1169,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1198,7 +1179,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1231,8 +1211,8 @@ "ctxt": 0 }, "value": "rf1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1288,8 +1268,8 @@ "ctxt": 0 }, "value": "rf2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1315,7 +1295,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1348,8 +1327,8 @@ "ctxt": 0 }, "value": "rf3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1367,7 +1346,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1408,8 +1386,8 @@ "ctxt": 0 }, "value": "rf4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1427,7 +1405,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1438,7 +1415,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1471,8 +1447,8 @@ "ctxt": 0 }, "value": "rg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1528,8 +1504,8 @@ "ctxt": 0 }, "value": "rg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1555,7 +1531,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1588,8 +1563,8 @@ "ctxt": 0 }, "value": "rg3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1607,7 +1582,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1648,8 +1622,8 @@ "ctxt": 0 }, "value": "rg4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1667,7 +1641,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1678,7 +1651,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1711,8 +1683,8 @@ "ctxt": 0 }, "value": "rh1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1768,8 +1740,8 @@ "ctxt": 0 }, "value": "rh2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1795,7 +1767,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1828,8 +1799,8 @@ "ctxt": 0 }, "value": "rh3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1847,7 +1818,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1888,8 +1858,8 @@ "ctxt": 0 }, "value": "rh4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1907,7 +1877,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1918,7 +1887,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1951,8 +1919,8 @@ "ctxt": 0 }, "value": "ri1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2008,8 +1976,8 @@ "ctxt": 0 }, "value": "ri2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2035,7 +2003,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2068,8 +2035,8 @@ "ctxt": 0 }, "value": "ri3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2087,7 +2054,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -2128,8 +2094,8 @@ "ctxt": 0 }, "value": "ri4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2147,7 +2113,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -2158,7 +2123,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2191,8 +2155,8 @@ "ctxt": 0 }, "value": "rj1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2248,8 +2212,8 @@ "ctxt": 0 }, "value": "rj2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2275,7 +2239,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2308,8 +2271,8 @@ "ctxt": 0 }, "value": "rj3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2327,7 +2290,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -2368,8 +2330,8 @@ "ctxt": 0 }, "value": "rj4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2387,7 +2349,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -2398,7 +2359,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithTypeParameter/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithTypeParameter/input.ts.json index 430eb701f83a..c73b22cd7418 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithTypeParameter/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithTypeParameter/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -108,6 +106,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -124,8 +123,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -157,6 +155,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -173,8 +172,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -206,6 +204,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -222,8 +221,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -255,6 +253,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -271,8 +270,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -304,6 +302,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -320,8 +319,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -353,8 +351,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -372,7 +370,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -383,7 +380,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -416,8 +412,8 @@ "ctxt": 0 }, "value": "r1a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -435,7 +431,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -446,7 +441,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -479,8 +473,8 @@ "ctxt": 0 }, "value": "r1a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -498,7 +492,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -509,7 +502,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -542,8 +534,8 @@ "ctxt": 0 }, "value": "r1a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -561,7 +553,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -572,7 +563,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -605,8 +595,8 @@ "ctxt": 0 }, "value": "r1a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -624,7 +614,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -635,7 +624,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -668,8 +656,8 @@ "ctxt": 0 }, "value": "r1a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -687,7 +675,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -698,7 +685,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -731,8 +717,8 @@ "ctxt": 0 }, "value": "r1a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -750,7 +736,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -761,7 +746,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -794,8 +778,8 @@ "ctxt": 0 }, "value": "r1a8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -813,7 +797,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -824,7 +807,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -857,8 +839,8 @@ "ctxt": 0 }, "value": "r1a9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -876,7 +858,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -887,7 +868,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -920,8 +900,8 @@ "ctxt": 0 }, "value": "r1a10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -939,7 +919,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -950,7 +929,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -983,8 +961,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1002,7 +980,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1013,7 +990,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1046,8 +1022,8 @@ "ctxt": 0 }, "value": "r2a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1065,7 +1041,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1076,7 +1051,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1109,8 +1083,8 @@ "ctxt": 0 }, "value": "r2a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1128,7 +1102,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1139,7 +1112,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1172,8 +1144,8 @@ "ctxt": 0 }, "value": "r2a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1191,7 +1163,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1202,7 +1173,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1235,8 +1205,8 @@ "ctxt": 0 }, "value": "r2a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1254,7 +1224,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1265,7 +1234,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1298,8 +1266,8 @@ "ctxt": 0 }, "value": "r2a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1317,7 +1285,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1328,7 +1295,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1361,8 +1327,8 @@ "ctxt": 0 }, "value": "r2a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1380,7 +1346,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1391,7 +1356,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1424,8 +1388,8 @@ "ctxt": 0 }, "value": "r2a8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1443,7 +1407,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1454,7 +1417,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1487,8 +1449,8 @@ "ctxt": 0 }, "value": "r2a9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1506,7 +1468,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1517,7 +1478,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1550,8 +1510,8 @@ "ctxt": 0 }, "value": "r2a10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1569,7 +1529,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1580,7 +1539,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1613,8 +1571,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1632,7 +1590,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1643,7 +1600,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1676,8 +1632,8 @@ "ctxt": 0 }, "value": "r1b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1695,7 +1651,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1706,7 +1661,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1739,8 +1693,8 @@ "ctxt": 0 }, "value": "r1b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1758,7 +1712,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1769,7 +1722,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1802,8 +1754,8 @@ "ctxt": 0 }, "value": "r1b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1821,7 +1773,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1832,7 +1783,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1865,8 +1815,8 @@ "ctxt": 0 }, "value": "r1b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1884,7 +1834,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1895,7 +1844,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1928,8 +1876,8 @@ "ctxt": 0 }, "value": "r1b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1947,7 +1895,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1958,7 +1905,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1991,8 +1937,8 @@ "ctxt": 0 }, "value": "r1b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2010,7 +1956,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2021,7 +1966,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -2054,8 +1998,8 @@ "ctxt": 0 }, "value": "r1b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2073,7 +2017,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2084,7 +2027,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -2117,8 +2059,8 @@ "ctxt": 0 }, "value": "r1b9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2136,7 +2078,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2147,7 +2088,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -2180,8 +2120,8 @@ "ctxt": 0 }, "value": "r1b10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2199,7 +2139,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2210,7 +2149,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -2243,8 +2181,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2262,7 +2200,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2273,7 +2210,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2306,8 +2242,8 @@ "ctxt": 0 }, "value": "r2b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2325,7 +2261,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2336,7 +2271,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2369,8 +2303,8 @@ "ctxt": 0 }, "value": "r2b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2388,7 +2322,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2399,7 +2332,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2432,8 +2364,8 @@ "ctxt": 0 }, "value": "r2b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2451,7 +2383,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2462,7 +2393,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2495,8 +2425,8 @@ "ctxt": 0 }, "value": "r2b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2514,7 +2444,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2525,7 +2454,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2558,8 +2486,8 @@ "ctxt": 0 }, "value": "r2b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2577,7 +2505,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2588,7 +2515,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2621,8 +2547,8 @@ "ctxt": 0 }, "value": "r2b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2640,7 +2566,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2651,7 +2576,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2684,8 +2608,8 @@ "ctxt": 0 }, "value": "r2b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2703,7 +2627,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2714,7 +2637,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2747,8 +2669,8 @@ "ctxt": 0 }, "value": "r2b9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2766,7 +2688,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2777,7 +2698,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2810,8 +2730,8 @@ "ctxt": 0 }, "value": "r2b10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2829,7 +2749,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2840,7 +2759,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2873,8 +2791,8 @@ "ctxt": 0 }, "value": "r1c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2892,7 +2810,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -2903,7 +2820,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -2936,8 +2852,8 @@ "ctxt": 0 }, "value": "r1c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2955,7 +2871,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -2966,7 +2881,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -2999,8 +2913,8 @@ "ctxt": 0 }, "value": "r1c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3018,7 +2932,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3029,7 +2942,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -3062,8 +2974,8 @@ "ctxt": 0 }, "value": "r1c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3081,7 +2993,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3092,7 +3003,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -3125,8 +3035,8 @@ "ctxt": 0 }, "value": "r1c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3144,7 +3054,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3155,7 +3064,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -3188,8 +3096,8 @@ "ctxt": 0 }, "value": "r1c6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3207,7 +3115,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3218,7 +3125,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -3251,8 +3157,8 @@ "ctxt": 0 }, "value": "r1c7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3270,7 +3176,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3281,7 +3186,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -3314,8 +3218,8 @@ "ctxt": 0 }, "value": "r1c8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3333,7 +3237,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3344,7 +3247,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -3377,8 +3279,8 @@ "ctxt": 0 }, "value": "r1c9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3396,7 +3298,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3407,7 +3308,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -3440,8 +3340,8 @@ "ctxt": 0 }, "value": "r1c10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3459,7 +3359,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3470,7 +3369,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -3503,8 +3401,8 @@ "ctxt": 0 }, "value": "r2c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3522,7 +3420,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -3533,7 +3430,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3566,8 +3462,8 @@ "ctxt": 0 }, "value": "r2c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3585,7 +3481,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -3596,7 +3491,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3629,8 +3523,8 @@ "ctxt": 0 }, "value": "r2c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3648,7 +3542,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -3659,7 +3552,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3692,8 +3584,8 @@ "ctxt": 0 }, "value": "r2c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3711,7 +3603,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -3722,7 +3613,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3755,8 +3645,8 @@ "ctxt": 0 }, "value": "r2c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3774,7 +3664,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -3785,7 +3674,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3818,8 +3706,8 @@ "ctxt": 0 }, "value": "r2c6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3837,7 +3725,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -3848,7 +3735,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3881,8 +3767,8 @@ "ctxt": 0 }, "value": "r2c7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3900,7 +3786,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -3911,7 +3796,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3944,8 +3828,8 @@ "ctxt": 0 }, "value": "r2c8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3963,7 +3847,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -3974,7 +3857,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -4007,8 +3889,8 @@ "ctxt": 0 }, "value": "r2c9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4026,7 +3908,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -4037,7 +3918,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -4070,8 +3950,8 @@ "ctxt": 0 }, "value": "r2c10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4089,7 +3969,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -4100,7 +3979,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -4133,8 +4011,8 @@ "ctxt": 0 }, "value": "r1d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4152,7 +4030,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4163,7 +4040,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4196,8 +4072,8 @@ "ctxt": 0 }, "value": "r1d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4215,7 +4091,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4226,7 +4101,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4259,8 +4133,8 @@ "ctxt": 0 }, "value": "r1d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4278,7 +4152,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4289,7 +4162,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4322,8 +4194,8 @@ "ctxt": 0 }, "value": "r1d4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4341,7 +4213,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4352,7 +4223,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4385,8 +4255,8 @@ "ctxt": 0 }, "value": "r1d5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4404,7 +4274,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4415,7 +4284,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4448,8 +4316,8 @@ "ctxt": 0 }, "value": "r1d6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4467,7 +4335,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4478,7 +4345,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4511,8 +4377,8 @@ "ctxt": 0 }, "value": "r1d7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4530,7 +4396,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4541,7 +4406,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4574,8 +4438,8 @@ "ctxt": 0 }, "value": "r1d8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4593,7 +4457,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4604,7 +4467,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4637,8 +4499,8 @@ "ctxt": 0 }, "value": "r1d9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4656,7 +4518,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4667,7 +4528,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4700,8 +4560,8 @@ "ctxt": 0 }, "value": "r1d10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4719,7 +4579,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4730,7 +4589,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4763,8 +4621,8 @@ "ctxt": 0 }, "value": "r2d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4782,7 +4640,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -4793,7 +4650,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -4826,8 +4682,8 @@ "ctxt": 0 }, "value": "r2d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4845,7 +4701,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -4856,7 +4711,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -4889,8 +4743,8 @@ "ctxt": 0 }, "value": "r2d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4908,7 +4762,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -4919,7 +4772,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -4952,8 +4804,8 @@ "ctxt": 0 }, "value": "r2d4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4971,7 +4823,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -4982,7 +4833,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -5015,8 +4865,8 @@ "ctxt": 0 }, "value": "r2d5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5034,7 +4884,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -5045,7 +4894,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -5078,8 +4926,8 @@ "ctxt": 0 }, "value": "r2d6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5097,7 +4945,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -5108,7 +4955,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -5141,8 +4987,8 @@ "ctxt": 0 }, "value": "r2d7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5160,7 +5006,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -5171,7 +5016,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -5204,8 +5048,8 @@ "ctxt": 0 }, "value": "r2d8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5223,7 +5067,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -5234,7 +5077,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -5267,8 +5109,8 @@ "ctxt": 0 }, "value": "r2d9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5286,7 +5128,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -5297,7 +5138,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -5330,8 +5170,8 @@ "ctxt": 0 }, "value": "r2d10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5349,7 +5189,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -5360,7 +5199,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -5393,8 +5231,8 @@ "ctxt": 0 }, "value": "r1e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5412,7 +5250,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -5423,7 +5260,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -5456,8 +5292,8 @@ "ctxt": 0 }, "value": "r1e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5475,7 +5311,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -5486,7 +5321,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -5519,8 +5353,8 @@ "ctxt": 0 }, "value": "r1e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5538,7 +5372,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -5549,7 +5382,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -5582,8 +5414,8 @@ "ctxt": 0 }, "value": "r1e4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5601,7 +5433,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -5612,7 +5443,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -5645,8 +5475,8 @@ "ctxt": 0 }, "value": "r1e5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5664,7 +5494,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -5675,7 +5504,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -5708,8 +5536,8 @@ "ctxt": 0 }, "value": "r1e6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5727,7 +5555,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -5738,7 +5565,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -5771,8 +5597,8 @@ "ctxt": 0 }, "value": "r1e7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5790,7 +5616,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -5801,7 +5626,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -5834,8 +5658,8 @@ "ctxt": 0 }, "value": "r1e8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5853,7 +5677,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -5864,7 +5687,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -5897,8 +5719,8 @@ "ctxt": 0 }, "value": "r1e9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5916,7 +5738,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -5927,7 +5748,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -5960,8 +5780,8 @@ "ctxt": 0 }, "value": "r1e10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5979,7 +5799,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -5990,7 +5809,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -6023,8 +5841,8 @@ "ctxt": 0 }, "value": "r2e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6042,7 +5860,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -6053,7 +5870,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -6086,8 +5902,8 @@ "ctxt": 0 }, "value": "r2e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6105,7 +5921,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -6116,7 +5931,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -6149,8 +5963,8 @@ "ctxt": 0 }, "value": "r2e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6168,7 +5982,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -6179,7 +5992,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -6212,8 +6024,8 @@ "ctxt": 0 }, "value": "r2e4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6231,7 +6043,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -6242,7 +6053,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -6275,8 +6085,8 @@ "ctxt": 0 }, "value": "r2e5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6294,7 +6104,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -6305,7 +6114,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -6338,8 +6146,8 @@ "ctxt": 0 }, "value": "r2e6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6357,7 +6165,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -6368,7 +6175,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -6401,8 +6207,8 @@ "ctxt": 0 }, "value": "r2e7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6420,7 +6226,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -6431,7 +6236,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -6464,8 +6268,8 @@ "ctxt": 0 }, "value": "r2e8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6483,7 +6287,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -6494,7 +6297,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -6527,8 +6329,8 @@ "ctxt": 0 }, "value": "r2e9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6546,7 +6348,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -6557,7 +6358,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -6590,8 +6390,8 @@ "ctxt": 0 }, "value": "r2e10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6609,7 +6409,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -6620,7 +6419,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -6653,8 +6451,8 @@ "ctxt": 0 }, "value": "r1f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6672,7 +6470,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -6683,7 +6480,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -6716,8 +6512,8 @@ "ctxt": 0 }, "value": "r1f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6735,7 +6531,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -6746,7 +6541,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -6779,8 +6573,8 @@ "ctxt": 0 }, "value": "r1f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6798,7 +6592,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -6809,7 +6602,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -6842,8 +6634,8 @@ "ctxt": 0 }, "value": "r1f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6861,7 +6653,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -6872,7 +6663,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -6905,8 +6695,8 @@ "ctxt": 0 }, "value": "r1f5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6924,7 +6714,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -6935,7 +6724,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -6968,8 +6756,8 @@ "ctxt": 0 }, "value": "r1f6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6987,7 +6775,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -6998,7 +6785,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -7031,8 +6817,8 @@ "ctxt": 0 }, "value": "r1f7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7050,7 +6836,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -7061,7 +6846,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -7094,8 +6878,8 @@ "ctxt": 0 }, "value": "r1f8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7113,7 +6897,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -7124,7 +6907,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -7157,8 +6939,8 @@ "ctxt": 0 }, "value": "r1f9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7176,7 +6958,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -7187,7 +6968,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -7220,8 +7000,8 @@ "ctxt": 0 }, "value": "r1f10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7239,7 +7019,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -7250,7 +7029,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -7285,7 +7063,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithUndefinedValueAndInvalidOperands/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithUndefinedValueAndInvalidOperands/input.ts.json index f6dbbc96b256..95f12890b84c 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithUndefinedValueAndInvalidOperands/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithUndefinedValueAndInvalidOperands/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -151,13 +152,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -189,8 +188,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -208,7 +207,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -219,7 +217,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -252,8 +249,8 @@ "ctxt": 0 }, "value": "r1a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -271,7 +268,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -282,7 +278,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -315,8 +310,8 @@ "ctxt": 0 }, "value": "r1a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -334,7 +329,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -345,7 +339,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -378,8 +371,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -397,7 +390,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -408,7 +400,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -441,8 +432,8 @@ "ctxt": 0 }, "value": "r1b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -460,7 +451,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -471,7 +461,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -504,8 +493,8 @@ "ctxt": 0 }, "value": "r1b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -523,7 +512,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -534,7 +522,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -567,8 +554,8 @@ "ctxt": 0 }, "value": "r1c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -586,7 +573,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -628,8 +614,8 @@ "ctxt": 0 }, "value": "r1c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -647,7 +633,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -694,8 +679,8 @@ "ctxt": 0 }, "value": "r1c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -713,7 +698,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -755,8 +739,8 @@ "ctxt": 0 }, "value": "r1d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -783,7 +767,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -816,8 +799,8 @@ "ctxt": 0 }, "value": "r1d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -849,7 +832,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -882,8 +864,8 @@ "ctxt": 0 }, "value": "r1d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -910,7 +892,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -943,8 +924,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -962,7 +943,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -973,7 +953,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1006,8 +985,8 @@ "ctxt": 0 }, "value": "r2a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1025,7 +1004,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1036,7 +1014,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1069,8 +1046,8 @@ "ctxt": 0 }, "value": "r2a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1088,7 +1065,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1099,7 +1075,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1132,8 +1107,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1151,7 +1126,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1162,7 +1136,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1195,8 +1168,8 @@ "ctxt": 0 }, "value": "r2b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1214,7 +1187,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1225,7 +1197,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1258,8 +1229,8 @@ "ctxt": 0 }, "value": "r2b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1277,7 +1248,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1288,7 +1258,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1321,8 +1290,8 @@ "ctxt": 0 }, "value": "r2c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1340,7 +1309,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1382,8 +1350,8 @@ "ctxt": 0 }, "value": "r2c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1401,7 +1369,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1448,8 +1415,8 @@ "ctxt": 0 }, "value": "r2c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1467,7 +1434,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1509,8 +1475,8 @@ "ctxt": 0 }, "value": "r2d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1537,7 +1503,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1570,8 +1535,8 @@ "ctxt": 0 }, "value": "r2d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1603,7 +1568,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1636,8 +1600,8 @@ "ctxt": 0 }, "value": "r2d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1664,7 +1628,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1697,8 +1660,8 @@ "ctxt": 0 }, "value": "r3a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1716,7 +1679,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1727,7 +1689,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1760,8 +1721,8 @@ "ctxt": 0 }, "value": "r3a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1779,7 +1740,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1790,7 +1750,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1823,8 +1782,8 @@ "ctxt": 0 }, "value": "r3a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1842,7 +1801,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1853,7 +1811,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1886,8 +1843,8 @@ "ctxt": 0 }, "value": "r3b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1905,7 +1862,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1916,7 +1872,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1949,8 +1904,8 @@ "ctxt": 0 }, "value": "r3b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1968,7 +1923,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1979,7 +1933,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2012,8 +1965,8 @@ "ctxt": 0 }, "value": "r3b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2031,7 +1984,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -2042,7 +1994,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2075,8 +2026,8 @@ "ctxt": 0 }, "value": "r3c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2094,7 +2045,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -2136,8 +2086,8 @@ "ctxt": 0 }, "value": "r3c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2155,7 +2105,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -2202,8 +2151,8 @@ "ctxt": 0 }, "value": "r3c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2221,7 +2170,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -2263,8 +2211,8 @@ "ctxt": 0 }, "value": "r3d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2291,7 +2239,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2324,8 +2271,8 @@ "ctxt": 0 }, "value": "r3d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2357,7 +2304,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2390,8 +2336,8 @@ "ctxt": 0 }, "value": "r3d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2418,7 +2364,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2451,8 +2396,8 @@ "ctxt": 0 }, "value": "r4a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2470,7 +2415,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -2481,7 +2425,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2514,8 +2457,8 @@ "ctxt": 0 }, "value": "r4a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2533,7 +2476,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -2544,7 +2486,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2577,8 +2518,8 @@ "ctxt": 0 }, "value": "r4a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2596,7 +2537,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -2607,7 +2547,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -2640,8 +2579,8 @@ "ctxt": 0 }, "value": "r4b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2659,7 +2598,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2670,7 +2608,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2703,8 +2640,8 @@ "ctxt": 0 }, "value": "r4b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2722,7 +2659,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2733,7 +2669,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2766,8 +2701,8 @@ "ctxt": 0 }, "value": "r4b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2785,7 +2720,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -2796,7 +2730,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2829,8 +2762,8 @@ "ctxt": 0 }, "value": "r4c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2848,7 +2781,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -2890,8 +2822,8 @@ "ctxt": 0 }, "value": "r4c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2909,7 +2841,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -2956,8 +2887,8 @@ "ctxt": 0 }, "value": "r4c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2975,7 +2906,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -3017,8 +2947,8 @@ "ctxt": 0 }, "value": "r4d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3045,7 +2975,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -3078,8 +3007,8 @@ "ctxt": 0 }, "value": "r4d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3111,7 +3040,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -3144,8 +3072,8 @@ "ctxt": 0 }, "value": "r4d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3172,7 +3100,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -3205,8 +3132,8 @@ "ctxt": 0 }, "value": "r5a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3224,7 +3151,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -3235,7 +3161,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3268,8 +3193,8 @@ "ctxt": 0 }, "value": "r5a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3287,7 +3212,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -3298,7 +3222,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3331,8 +3254,8 @@ "ctxt": 0 }, "value": "r5a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3350,7 +3273,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -3361,7 +3283,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3394,8 +3315,8 @@ "ctxt": 0 }, "value": "r5b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3413,7 +3334,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3424,7 +3344,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -3457,8 +3376,8 @@ "ctxt": 0 }, "value": "r5b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3476,7 +3395,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3487,7 +3405,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -3520,8 +3437,8 @@ "ctxt": 0 }, "value": "r5b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3539,7 +3456,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3550,7 +3466,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -3583,8 +3498,8 @@ "ctxt": 0 }, "value": "r5c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3602,7 +3517,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -3644,8 +3558,8 @@ "ctxt": 0 }, "value": "r5c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3663,7 +3577,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -3710,8 +3623,8 @@ "ctxt": 0 }, "value": "r5c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3729,7 +3642,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -3771,8 +3683,8 @@ "ctxt": 0 }, "value": "r5d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3799,7 +3711,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -3832,8 +3743,8 @@ "ctxt": 0 }, "value": "r5d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3865,7 +3776,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -3898,8 +3808,8 @@ "ctxt": 0 }, "value": "r5d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3926,7 +3836,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -3959,8 +3868,8 @@ "ctxt": 0 }, "value": "r6a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3978,7 +3887,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -3989,7 +3897,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4022,8 +3929,8 @@ "ctxt": 0 }, "value": "r6a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4041,7 +3948,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -4052,7 +3958,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4085,8 +3990,8 @@ "ctxt": 0 }, "value": "r6a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4104,7 +4009,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -4115,7 +4019,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -4148,8 +4051,8 @@ "ctxt": 0 }, "value": "r6b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4167,7 +4070,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4178,7 +4080,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -4211,8 +4112,8 @@ "ctxt": 0 }, "value": "r6b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4230,7 +4131,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4241,7 +4141,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -4274,8 +4173,8 @@ "ctxt": 0 }, "value": "r6b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4293,7 +4192,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4304,7 +4202,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -4337,8 +4234,8 @@ "ctxt": 0 }, "value": "r6c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4356,7 +4253,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -4398,8 +4294,8 @@ "ctxt": 0 }, "value": "r6c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4417,7 +4313,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -4464,8 +4359,8 @@ "ctxt": 0 }, "value": "r6c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4483,7 +4378,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -4525,8 +4419,8 @@ "ctxt": 0 }, "value": "r6d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4553,7 +4447,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -4586,8 +4479,8 @@ "ctxt": 0 }, "value": "r6d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4619,7 +4512,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -4652,8 +4544,8 @@ "ctxt": 0 }, "value": "r6d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4680,7 +4572,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -4713,8 +4604,8 @@ "ctxt": 0 }, "value": "r7a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4732,7 +4623,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -4743,7 +4633,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4776,8 +4665,8 @@ "ctxt": 0 }, "value": "r7a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4795,7 +4684,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -4806,7 +4694,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4839,8 +4726,8 @@ "ctxt": 0 }, "value": "r7a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4858,7 +4745,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -4869,7 +4755,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -4902,8 +4787,8 @@ "ctxt": 0 }, "value": "r7b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4921,7 +4806,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4932,7 +4816,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -4965,8 +4848,8 @@ "ctxt": 0 }, "value": "r7b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4984,7 +4867,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4995,7 +4877,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -5028,8 +4909,8 @@ "ctxt": 0 }, "value": "r7b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5047,7 +4928,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -5058,7 +4938,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -5091,8 +4970,8 @@ "ctxt": 0 }, "value": "r7c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5110,7 +4989,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -5152,8 +5030,8 @@ "ctxt": 0 }, "value": "r7c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5171,7 +5049,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -5218,8 +5095,8 @@ "ctxt": 0 }, "value": "r7c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5237,7 +5114,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -5279,8 +5155,8 @@ "ctxt": 0 }, "value": "r7d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5307,7 +5183,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -5340,8 +5215,8 @@ "ctxt": 0 }, "value": "r7d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5373,7 +5248,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -5406,8 +5280,8 @@ "ctxt": 0 }, "value": "r7d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5434,7 +5308,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -5467,8 +5340,8 @@ "ctxt": 0 }, "value": "r8a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5486,7 +5359,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -5497,7 +5369,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -5530,8 +5401,8 @@ "ctxt": 0 }, "value": "r8a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5549,7 +5420,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -5560,7 +5430,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -5593,8 +5462,8 @@ "ctxt": 0 }, "value": "r8a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5612,7 +5481,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -5623,7 +5491,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5656,8 +5523,8 @@ "ctxt": 0 }, "value": "r8b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5675,7 +5542,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -5686,7 +5552,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -5719,8 +5584,8 @@ "ctxt": 0 }, "value": "r8b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5738,7 +5603,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -5749,7 +5613,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -5782,8 +5645,8 @@ "ctxt": 0 }, "value": "r8b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5801,7 +5664,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -5812,7 +5674,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -5845,8 +5706,8 @@ "ctxt": 0 }, "value": "r8c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5864,7 +5725,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -5906,8 +5766,8 @@ "ctxt": 0 }, "value": "r8c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5925,7 +5785,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -5972,8 +5831,8 @@ "ctxt": 0 }, "value": "r8c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5991,7 +5850,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -6033,8 +5891,8 @@ "ctxt": 0 }, "value": "r8d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6061,7 +5919,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -6094,8 +5951,8 @@ "ctxt": 0 }, "value": "r8d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6127,7 +5984,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -6160,8 +6016,8 @@ "ctxt": 0 }, "value": "r8d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6188,7 +6044,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -6221,8 +6076,8 @@ "ctxt": 0 }, "value": "r9a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6240,7 +6095,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -6251,7 +6105,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -6284,8 +6137,8 @@ "ctxt": 0 }, "value": "r9a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6303,7 +6156,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -6314,7 +6166,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -6347,8 +6198,8 @@ "ctxt": 0 }, "value": "r9a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6366,7 +6217,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -6377,7 +6227,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -6410,8 +6259,8 @@ "ctxt": 0 }, "value": "r9b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6429,7 +6278,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -6440,7 +6288,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -6473,8 +6320,8 @@ "ctxt": 0 }, "value": "r9b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6492,7 +6339,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -6503,7 +6349,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -6536,8 +6381,8 @@ "ctxt": 0 }, "value": "r9b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6555,7 +6400,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -6566,7 +6410,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -6599,8 +6442,8 @@ "ctxt": 0 }, "value": "r9c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6618,7 +6461,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -6660,8 +6502,8 @@ "ctxt": 0 }, "value": "r9c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6679,7 +6521,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -6726,8 +6567,8 @@ "ctxt": 0 }, "value": "r9c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6745,7 +6586,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -6787,8 +6627,8 @@ "ctxt": 0 }, "value": "r9d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6815,7 +6655,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -6848,8 +6687,8 @@ "ctxt": 0 }, "value": "r9d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6881,7 +6720,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -6914,8 +6752,8 @@ "ctxt": 0 }, "value": "r9d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6942,7 +6780,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -6975,8 +6812,8 @@ "ctxt": 0 }, "value": "r10a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6994,7 +6831,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -7005,7 +6841,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -7038,8 +6873,8 @@ "ctxt": 0 }, "value": "r10a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7057,7 +6892,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -7068,7 +6902,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -7101,8 +6934,8 @@ "ctxt": 0 }, "value": "r10a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7120,7 +6953,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -7131,7 +6963,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -7164,8 +6995,8 @@ "ctxt": 0 }, "value": "r10b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7183,7 +7014,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -7194,7 +7024,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -7227,8 +7056,8 @@ "ctxt": 0 }, "value": "r10b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7246,7 +7075,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -7257,7 +7085,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -7290,8 +7117,8 @@ "ctxt": 0 }, "value": "r10b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7309,7 +7136,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -7320,7 +7146,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -7353,8 +7178,8 @@ "ctxt": 0 }, "value": "r10c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7372,7 +7197,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -7414,8 +7238,8 @@ "ctxt": 0 }, "value": "r10c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7433,7 +7257,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -7480,8 +7303,8 @@ "ctxt": 0 }, "value": "r10c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7499,7 +7322,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -7541,8 +7363,8 @@ "ctxt": 0 }, "value": "r10d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7569,7 +7391,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -7602,8 +7423,8 @@ "ctxt": 0 }, "value": "r10d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7635,7 +7456,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -7668,8 +7488,8 @@ "ctxt": 0 }, "value": "r10d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7696,7 +7516,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithUndefinedValueAndValidOperands/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithUndefinedValueAndValidOperands/input.ts.json index 45d191c38b3c..ddcb2980abd1 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithUndefinedValueAndValidOperands/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/arithmeticOperator/arithmeticOperatorWithUndefinedValueAndValidOperands/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -94,6 +91,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -110,8 +108,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,6 +140,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -159,8 +157,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -192,8 +189,8 @@ "ctxt": 0 }, "value": "ra1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -211,7 +208,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -222,7 +218,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -255,8 +250,8 @@ "ctxt": 0 }, "value": "ra2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -274,7 +269,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -285,7 +279,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -318,8 +311,8 @@ "ctxt": 0 }, "value": "ra3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -337,7 +330,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -379,8 +371,8 @@ "ctxt": 0 }, "value": "ra4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -398,7 +390,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -416,7 +407,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -427,7 +417,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -462,8 +451,8 @@ "ctxt": 0 }, "value": "ra5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -481,7 +470,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -492,7 +480,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -525,8 +512,8 @@ "ctxt": 0 }, "value": "ra6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -544,7 +531,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -555,7 +541,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -588,8 +573,8 @@ "ctxt": 0 }, "value": "ra7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -616,7 +601,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -649,8 +633,8 @@ "ctxt": 0 }, "value": "ra8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -675,7 +659,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -686,7 +669,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -699,7 +681,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -732,8 +713,8 @@ "ctxt": 0 }, "value": "rb1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -751,7 +732,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -762,7 +742,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -795,8 +774,8 @@ "ctxt": 0 }, "value": "rb2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -814,7 +793,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -825,7 +803,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -858,8 +835,8 @@ "ctxt": 0 }, "value": "rb3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -877,7 +854,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -919,8 +895,8 @@ "ctxt": 0 }, "value": "rb4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -938,7 +914,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -956,7 +931,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -967,7 +941,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1002,8 +975,8 @@ "ctxt": 0 }, "value": "rb5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1021,7 +994,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1032,7 +1004,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1065,8 +1036,8 @@ "ctxt": 0 }, "value": "rb6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1084,7 +1055,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1095,7 +1065,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1128,8 +1097,8 @@ "ctxt": 0 }, "value": "rb7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1156,7 +1125,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1189,8 +1157,8 @@ "ctxt": 0 }, "value": "rb8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1215,7 +1183,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1226,7 +1193,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1239,7 +1205,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1272,8 +1237,8 @@ "ctxt": 0 }, "value": "rc1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1291,7 +1256,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1302,7 +1266,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1335,8 +1298,8 @@ "ctxt": 0 }, "value": "rc2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1354,7 +1317,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1365,7 +1327,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1398,8 +1359,8 @@ "ctxt": 0 }, "value": "rc3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1417,7 +1378,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1459,8 +1419,8 @@ "ctxt": 0 }, "value": "rc4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1478,7 +1438,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1496,7 +1455,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1507,7 +1465,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1542,8 +1499,8 @@ "ctxt": 0 }, "value": "rc5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1561,7 +1518,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1572,7 +1528,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1605,8 +1560,8 @@ "ctxt": 0 }, "value": "rc6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1624,7 +1579,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1635,7 +1589,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1668,8 +1621,8 @@ "ctxt": 0 }, "value": "rc7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1696,7 +1649,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1729,8 +1681,8 @@ "ctxt": 0 }, "value": "rc8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1755,7 +1707,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1766,7 +1717,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1779,7 +1729,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1812,8 +1761,8 @@ "ctxt": 0 }, "value": "rd1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1831,7 +1780,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1842,7 +1790,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1875,8 +1822,8 @@ "ctxt": 0 }, "value": "rd2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1894,7 +1841,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1905,7 +1851,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1938,8 +1883,8 @@ "ctxt": 0 }, "value": "rd3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1957,7 +1902,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1999,8 +1943,8 @@ "ctxt": 0 }, "value": "rd4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2018,7 +1962,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -2036,7 +1979,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2047,7 +1989,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2082,8 +2023,8 @@ "ctxt": 0 }, "value": "rd5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2101,7 +2042,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2112,7 +2052,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2145,8 +2084,8 @@ "ctxt": 0 }, "value": "rd6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2164,7 +2103,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2175,7 +2113,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2208,8 +2145,8 @@ "ctxt": 0 }, "value": "rd7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2236,7 +2173,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2269,8 +2205,8 @@ "ctxt": 0 }, "value": "rd8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2295,7 +2231,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2306,7 +2241,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2319,7 +2253,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2352,8 +2285,8 @@ "ctxt": 0 }, "value": "re1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2371,7 +2304,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -2382,7 +2314,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2415,8 +2346,8 @@ "ctxt": 0 }, "value": "re2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2434,7 +2365,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -2445,7 +2375,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2478,8 +2407,8 @@ "ctxt": 0 }, "value": "re3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2497,7 +2426,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -2539,8 +2467,8 @@ "ctxt": 0 }, "value": "re4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2558,7 +2486,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -2576,7 +2503,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2587,7 +2513,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2622,8 +2547,8 @@ "ctxt": 0 }, "value": "re5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2641,7 +2566,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2652,7 +2576,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2685,8 +2608,8 @@ "ctxt": 0 }, "value": "re6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2704,7 +2627,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2715,7 +2637,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2748,8 +2669,8 @@ "ctxt": 0 }, "value": "re7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2776,7 +2697,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2809,8 +2729,8 @@ "ctxt": 0 }, "value": "re8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2835,7 +2755,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2846,7 +2765,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2859,7 +2777,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2892,8 +2809,8 @@ "ctxt": 0 }, "value": "rf1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2911,7 +2828,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -2922,7 +2838,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2955,8 +2870,8 @@ "ctxt": 0 }, "value": "rf2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2974,7 +2889,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -2985,7 +2899,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3018,8 +2931,8 @@ "ctxt": 0 }, "value": "rf3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3037,7 +2950,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -3079,8 +2991,8 @@ "ctxt": 0 }, "value": "rf4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3098,7 +3010,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -3116,7 +3027,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3127,7 +3037,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3162,8 +3071,8 @@ "ctxt": 0 }, "value": "rf5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3181,7 +3090,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3192,7 +3100,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -3225,8 +3132,8 @@ "ctxt": 0 }, "value": "rf6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3244,7 +3151,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3255,7 +3161,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -3288,8 +3193,8 @@ "ctxt": 0 }, "value": "rf7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3316,7 +3221,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -3349,8 +3253,8 @@ "ctxt": 0 }, "value": "rf8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3375,7 +3279,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3386,7 +3289,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3399,7 +3301,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -3432,8 +3333,8 @@ "ctxt": 0 }, "value": "rg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3451,7 +3352,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -3462,7 +3362,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3495,8 +3394,8 @@ "ctxt": 0 }, "value": "rg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3514,7 +3413,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -3525,7 +3423,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3558,8 +3455,8 @@ "ctxt": 0 }, "value": "rg3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3577,7 +3474,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -3619,8 +3515,8 @@ "ctxt": 0 }, "value": "rg4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3638,7 +3534,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -3656,7 +3551,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3667,7 +3561,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3702,8 +3595,8 @@ "ctxt": 0 }, "value": "rg5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3721,7 +3614,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3732,7 +3624,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -3765,8 +3656,8 @@ "ctxt": 0 }, "value": "rg6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3784,7 +3675,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3795,7 +3685,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -3828,8 +3717,8 @@ "ctxt": 0 }, "value": "rg7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3856,7 +3745,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -3889,8 +3777,8 @@ "ctxt": 0 }, "value": "rg8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3915,7 +3803,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3926,7 +3813,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3939,7 +3825,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -3972,8 +3857,8 @@ "ctxt": 0 }, "value": "rh1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3991,7 +3876,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -4002,7 +3886,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4035,8 +3918,8 @@ "ctxt": 0 }, "value": "rh2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4054,7 +3937,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -4065,7 +3947,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4098,8 +3979,8 @@ "ctxt": 0 }, "value": "rh3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4117,7 +3998,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -4159,8 +4039,8 @@ "ctxt": 0 }, "value": "rh4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4178,7 +4058,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -4196,7 +4075,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4207,7 +4085,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4242,8 +4119,8 @@ "ctxt": 0 }, "value": "rh5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4261,7 +4138,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4272,7 +4148,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -4305,8 +4180,8 @@ "ctxt": 0 }, "value": "rh6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4324,7 +4199,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4335,7 +4209,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -4368,8 +4241,8 @@ "ctxt": 0 }, "value": "rh7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4396,7 +4269,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -4429,8 +4301,8 @@ "ctxt": 0 }, "value": "rh8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4455,7 +4327,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4466,7 +4337,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4479,7 +4349,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -4512,8 +4381,8 @@ "ctxt": 0 }, "value": "ri1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4531,7 +4400,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -4542,7 +4410,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4575,8 +4442,8 @@ "ctxt": 0 }, "value": "ri2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4594,7 +4461,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -4605,7 +4471,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4638,8 +4503,8 @@ "ctxt": 0 }, "value": "ri3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4657,7 +4522,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -4699,8 +4563,8 @@ "ctxt": 0 }, "value": "ri4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4718,7 +4582,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -4736,7 +4599,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4747,7 +4609,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4782,8 +4643,8 @@ "ctxt": 0 }, "value": "ri5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4801,7 +4662,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4812,7 +4672,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -4845,8 +4704,8 @@ "ctxt": 0 }, "value": "ri6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4864,7 +4723,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4875,7 +4733,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -4908,8 +4765,8 @@ "ctxt": 0 }, "value": "ri7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4936,7 +4793,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -4969,8 +4825,8 @@ "ctxt": 0 }, "value": "ri8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4995,7 +4851,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -5006,7 +4861,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5019,7 +4873,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -5052,8 +4905,8 @@ "ctxt": 0 }, "value": "rj1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5071,7 +4924,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -5082,7 +4934,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -5115,8 +4966,8 @@ "ctxt": 0 }, "value": "rj2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5134,7 +4985,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -5145,7 +4995,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -5178,8 +5027,8 @@ "ctxt": 0 }, "value": "rj3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5197,7 +5046,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -5239,8 +5087,8 @@ "ctxt": 0 }, "value": "rj4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5258,7 +5106,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -5276,7 +5123,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -5287,7 +5133,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5322,8 +5167,8 @@ "ctxt": 0 }, "value": "rj5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5341,7 +5186,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -5352,7 +5196,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -5385,8 +5228,8 @@ "ctxt": 0 }, "value": "rj6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5404,7 +5247,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -5415,7 +5257,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -5448,8 +5289,8 @@ "ctxt": 0 }, "value": "rj7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5476,7 +5317,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -5509,8 +5349,8 @@ "ctxt": 0 }, "value": "rj8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5535,7 +5375,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -5546,7 +5385,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5559,7 +5397,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithIdenticalObjects/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithIdenticalObjects/input.ts.json index 4ec5b850845a..948905c05795 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithIdenticalObjects/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithIdenticalObjects/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -180,7 +176,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -226,7 +221,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": null, @@ -252,7 +246,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -283,7 +276,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -304,6 +296,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -320,8 +313,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -401,7 +393,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -427,7 +418,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -473,7 +463,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -519,7 +508,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -565,7 +553,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -611,7 +598,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": null, @@ -637,7 +623,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -668,7 +653,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -689,6 +673,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -705,8 +690,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -786,7 +770,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -812,7 +795,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -858,7 +840,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -879,6 +860,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -895,8 +877,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -976,7 +957,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -995,7 +975,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1013,7 +992,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1032,7 +1010,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1055,7 +1032,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1085,7 +1061,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1099,6 +1074,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1115,8 +1091,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -1156,7 +1131,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1186,7 +1160,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1200,6 +1173,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1216,8 +1190,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -1257,7 +1230,6 @@ "ctxt": 0 }, "value": "A4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1287,6 +1259,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1303,8 +1276,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1329,7 +1301,6 @@ "ctxt": 0 }, "value": "A1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1355,7 +1326,6 @@ "ctxt": 0 }, "value": "B4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1385,6 +1355,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1401,8 +1372,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1427,7 +1397,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1453,7 +1422,6 @@ "ctxt": 0 }, "value": "A5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1478,6 +1446,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1494,8 +1463,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1540,7 +1508,6 @@ "ctxt": 0 }, "value": "B5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1565,6 +1532,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1581,8 +1549,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1627,7 +1594,6 @@ "ctxt": 0 }, "value": "A6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1652,6 +1618,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1668,8 +1635,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1714,7 +1680,6 @@ "ctxt": 0 }, "value": "B6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1739,6 +1704,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1755,8 +1721,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1811,6 +1776,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1833,13 +1799,11 @@ "ctxt": 0 }, "value": "A1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1871,6 +1835,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1893,13 +1858,11 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1931,6 +1894,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1953,13 +1917,11 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1991,6 +1953,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2013,13 +1976,11 @@ "ctxt": 0 }, "value": "A4", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2051,6 +2012,7 @@ "ctxt": 0 }, "value": "a5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2073,13 +2035,11 @@ "ctxt": 0 }, "value": "A5", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2111,6 +2071,7 @@ "ctxt": 0 }, "value": "a6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2133,13 +2094,11 @@ "ctxt": 0 }, "value": "A6", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2171,6 +2130,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2193,13 +2153,11 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2231,6 +2189,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2253,13 +2212,11 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2291,6 +2248,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2313,13 +2271,11 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2351,6 +2307,7 @@ "ctxt": 0 }, "value": "b4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2373,13 +2330,11 @@ "ctxt": 0 }, "value": "B4", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2411,6 +2366,7 @@ "ctxt": 0 }, "value": "b5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2433,13 +2389,11 @@ "ctxt": 0 }, "value": "B5", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2471,6 +2425,7 @@ "ctxt": 0 }, "value": "b6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2493,13 +2448,11 @@ "ctxt": 0 }, "value": "B6", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2531,6 +2484,7 @@ "ctxt": 0 }, "value": "base1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2553,13 +2507,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2591,6 +2543,7 @@ "ctxt": 0 }, "value": "base2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2613,13 +2566,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2651,8 +2602,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2670,7 +2621,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2681,7 +2631,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -2714,8 +2663,8 @@ "ctxt": 0 }, "value": "r1a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2733,7 +2682,6 @@ "ctxt": 0 }, "value": "base1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2744,7 +2692,6 @@ "ctxt": 0 }, "value": "base2", - "typeAnnotation": null, "optional": false } }, @@ -2777,8 +2724,8 @@ "ctxt": 0 }, "value": "r1a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2796,7 +2743,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2807,7 +2753,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -2840,8 +2785,8 @@ "ctxt": 0 }, "value": "r1a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2859,7 +2804,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2870,7 +2814,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -2903,8 +2846,8 @@ "ctxt": 0 }, "value": "r1a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2922,7 +2865,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -2933,7 +2875,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -2966,8 +2907,8 @@ "ctxt": 0 }, "value": "r1a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2985,7 +2926,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -2996,7 +2936,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -3029,8 +2968,8 @@ "ctxt": 0 }, "value": "r1a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3048,7 +2987,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -3059,7 +2997,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -3092,8 +3029,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3111,7 +3048,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3122,7 +3058,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -3155,8 +3090,8 @@ "ctxt": 0 }, "value": "r1b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3174,7 +3109,6 @@ "ctxt": 0 }, "value": "base2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3185,7 +3119,6 @@ "ctxt": 0 }, "value": "base1", - "typeAnnotation": null, "optional": false } }, @@ -3218,8 +3151,8 @@ "ctxt": 0 }, "value": "r1b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3237,7 +3170,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3248,7 +3180,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -3281,8 +3212,8 @@ "ctxt": 0 }, "value": "r1b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3300,7 +3231,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3311,7 +3241,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -3344,8 +3273,8 @@ "ctxt": 0 }, "value": "r1b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3363,7 +3292,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3374,7 +3302,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -3407,8 +3334,8 @@ "ctxt": 0 }, "value": "r1b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3426,7 +3353,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -3437,7 +3363,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -3470,8 +3395,8 @@ "ctxt": 0 }, "value": "r1b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3489,7 +3414,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -3500,7 +3424,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -3533,8 +3456,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3552,7 +3475,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3563,7 +3485,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -3596,8 +3517,8 @@ "ctxt": 0 }, "value": "r2a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3615,7 +3536,6 @@ "ctxt": 0 }, "value": "base1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3626,7 +3546,6 @@ "ctxt": 0 }, "value": "base2", - "typeAnnotation": null, "optional": false } }, @@ -3659,8 +3578,8 @@ "ctxt": 0 }, "value": "r2a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3678,7 +3597,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3689,7 +3607,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -3722,8 +3639,8 @@ "ctxt": 0 }, "value": "r2a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3741,7 +3658,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3752,7 +3668,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -3785,8 +3700,8 @@ "ctxt": 0 }, "value": "r2a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3804,7 +3719,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3815,7 +3729,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -3848,8 +3761,8 @@ "ctxt": 0 }, "value": "r2a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3867,7 +3780,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -3878,7 +3790,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -3911,8 +3822,8 @@ "ctxt": 0 }, "value": "r2a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3930,7 +3841,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -3941,7 +3851,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -3974,8 +3883,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3993,7 +3902,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4004,7 +3912,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -4037,8 +3944,8 @@ "ctxt": 0 }, "value": "r2b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4056,7 +3963,6 @@ "ctxt": 0 }, "value": "base2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4067,7 +3973,6 @@ "ctxt": 0 }, "value": "base1", - "typeAnnotation": null, "optional": false } }, @@ -4100,8 +4005,8 @@ "ctxt": 0 }, "value": "r2b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4119,7 +4024,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4130,7 +4034,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -4163,8 +4066,8 @@ "ctxt": 0 }, "value": "r2b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4182,7 +4085,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4193,7 +4095,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -4226,8 +4127,8 @@ "ctxt": 0 }, "value": "r2b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4245,7 +4146,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4256,7 +4156,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -4289,8 +4188,8 @@ "ctxt": 0 }, "value": "r2b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4308,7 +4207,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -4319,7 +4217,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -4352,8 +4249,8 @@ "ctxt": 0 }, "value": "r2b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4371,7 +4268,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -4382,7 +4278,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -4415,8 +4310,8 @@ "ctxt": 0 }, "value": "r3a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4434,7 +4329,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4445,7 +4339,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -4478,8 +4371,8 @@ "ctxt": 0 }, "value": "r3a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4497,7 +4390,6 @@ "ctxt": 0 }, "value": "base1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4508,7 +4400,6 @@ "ctxt": 0 }, "value": "base2", - "typeAnnotation": null, "optional": false } }, @@ -4541,8 +4432,8 @@ "ctxt": 0 }, "value": "r3a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4560,7 +4451,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4571,7 +4461,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -4604,8 +4493,8 @@ "ctxt": 0 }, "value": "r3a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4623,7 +4512,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4634,7 +4522,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -4667,8 +4554,8 @@ "ctxt": 0 }, "value": "r3a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4686,7 +4573,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4697,7 +4583,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -4730,8 +4615,8 @@ "ctxt": 0 }, "value": "r3a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4749,7 +4634,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -4760,7 +4644,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -4793,8 +4676,8 @@ "ctxt": 0 }, "value": "r3a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4812,7 +4695,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -4823,7 +4705,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -4856,8 +4737,8 @@ "ctxt": 0 }, "value": "r3b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4875,7 +4756,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4886,7 +4766,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -4919,8 +4798,8 @@ "ctxt": 0 }, "value": "r3b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4938,7 +4817,6 @@ "ctxt": 0 }, "value": "base2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4949,7 +4827,6 @@ "ctxt": 0 }, "value": "base1", - "typeAnnotation": null, "optional": false } }, @@ -4982,8 +4859,8 @@ "ctxt": 0 }, "value": "r3b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5001,7 +4878,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -5012,7 +4888,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -5045,8 +4920,8 @@ "ctxt": 0 }, "value": "r3b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5064,7 +4939,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -5075,7 +4949,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -5108,8 +4981,8 @@ "ctxt": 0 }, "value": "r3b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5127,7 +5000,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -5138,7 +5010,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -5171,8 +5042,8 @@ "ctxt": 0 }, "value": "r3b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5190,7 +5061,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -5201,7 +5071,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -5234,8 +5103,8 @@ "ctxt": 0 }, "value": "r3b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5253,7 +5122,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -5264,7 +5132,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -5297,8 +5164,8 @@ "ctxt": 0 }, "value": "r4a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5316,7 +5183,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -5327,7 +5193,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -5360,8 +5225,8 @@ "ctxt": 0 }, "value": "r4a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5379,7 +5244,6 @@ "ctxt": 0 }, "value": "base1", - "typeAnnotation": null, "optional": false }, "right": { @@ -5390,7 +5254,6 @@ "ctxt": 0 }, "value": "base2", - "typeAnnotation": null, "optional": false } }, @@ -5423,8 +5286,8 @@ "ctxt": 0 }, "value": "r4a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5442,7 +5305,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -5453,7 +5315,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -5486,8 +5347,8 @@ "ctxt": 0 }, "value": "r4a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5505,7 +5366,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -5516,7 +5376,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -5549,8 +5408,8 @@ "ctxt": 0 }, "value": "r4a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5568,7 +5427,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -5579,7 +5437,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -5612,8 +5469,8 @@ "ctxt": 0 }, "value": "r4a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5631,7 +5488,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -5642,7 +5498,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -5675,8 +5530,8 @@ "ctxt": 0 }, "value": "r4a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5694,7 +5549,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -5705,7 +5559,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -5738,8 +5591,8 @@ "ctxt": 0 }, "value": "r4b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5757,7 +5610,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -5768,7 +5620,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -5801,8 +5652,8 @@ "ctxt": 0 }, "value": "r4b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5820,7 +5671,6 @@ "ctxt": 0 }, "value": "base2", - "typeAnnotation": null, "optional": false }, "right": { @@ -5831,7 +5681,6 @@ "ctxt": 0 }, "value": "base1", - "typeAnnotation": null, "optional": false } }, @@ -5864,8 +5713,8 @@ "ctxt": 0 }, "value": "r4b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5883,7 +5732,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -5894,7 +5742,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -5927,8 +5774,8 @@ "ctxt": 0 }, "value": "r4b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5946,7 +5793,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -5957,7 +5803,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -5990,8 +5835,8 @@ "ctxt": 0 }, "value": "r4b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6009,7 +5854,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -6020,7 +5864,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -6053,8 +5896,8 @@ "ctxt": 0 }, "value": "r4b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6072,7 +5915,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -6083,7 +5925,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -6116,8 +5957,8 @@ "ctxt": 0 }, "value": "r4b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6135,7 +5976,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -6146,7 +5986,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -6179,8 +6018,8 @@ "ctxt": 0 }, "value": "r5a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6198,7 +6037,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -6209,7 +6047,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -6242,8 +6079,8 @@ "ctxt": 0 }, "value": "r5a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6261,7 +6098,6 @@ "ctxt": 0 }, "value": "base1", - "typeAnnotation": null, "optional": false }, "right": { @@ -6272,7 +6108,6 @@ "ctxt": 0 }, "value": "base2", - "typeAnnotation": null, "optional": false } }, @@ -6305,8 +6140,8 @@ "ctxt": 0 }, "value": "r5a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6324,7 +6159,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -6335,7 +6169,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -6368,8 +6201,8 @@ "ctxt": 0 }, "value": "r5a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6387,7 +6220,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -6398,7 +6230,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -6431,8 +6262,8 @@ "ctxt": 0 }, "value": "r5a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6450,7 +6281,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -6461,7 +6291,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -6494,8 +6323,8 @@ "ctxt": 0 }, "value": "r5a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6513,7 +6342,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -6524,7 +6352,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -6557,8 +6384,8 @@ "ctxt": 0 }, "value": "r5a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6576,7 +6403,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -6587,7 +6413,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -6620,8 +6445,8 @@ "ctxt": 0 }, "value": "r5b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6639,7 +6464,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -6650,7 +6474,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -6683,8 +6506,8 @@ "ctxt": 0 }, "value": "r5b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6702,7 +6525,6 @@ "ctxt": 0 }, "value": "base2", - "typeAnnotation": null, "optional": false }, "right": { @@ -6713,7 +6535,6 @@ "ctxt": 0 }, "value": "base1", - "typeAnnotation": null, "optional": false } }, @@ -6746,8 +6567,8 @@ "ctxt": 0 }, "value": "r5b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6765,7 +6586,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -6776,7 +6596,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -6809,8 +6628,8 @@ "ctxt": 0 }, "value": "r5b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6828,7 +6647,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -6839,7 +6657,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -6872,8 +6689,8 @@ "ctxt": 0 }, "value": "r5b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6891,7 +6708,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -6902,7 +6718,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -6935,8 +6750,8 @@ "ctxt": 0 }, "value": "r5b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6954,7 +6769,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -6965,7 +6779,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -6998,8 +6811,8 @@ "ctxt": 0 }, "value": "r5b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7017,7 +6830,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -7028,7 +6840,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -7061,8 +6872,8 @@ "ctxt": 0 }, "value": "r6a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7080,7 +6891,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -7091,7 +6901,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -7124,8 +6933,8 @@ "ctxt": 0 }, "value": "r6a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7143,7 +6952,6 @@ "ctxt": 0 }, "value": "base1", - "typeAnnotation": null, "optional": false }, "right": { @@ -7154,7 +6962,6 @@ "ctxt": 0 }, "value": "base2", - "typeAnnotation": null, "optional": false } }, @@ -7187,8 +6994,8 @@ "ctxt": 0 }, "value": "r6a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7206,7 +7013,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -7217,7 +7023,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -7250,8 +7055,8 @@ "ctxt": 0 }, "value": "r6a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7269,7 +7074,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -7280,7 +7084,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -7313,8 +7116,8 @@ "ctxt": 0 }, "value": "r6a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7332,7 +7135,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -7343,7 +7145,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -7376,8 +7177,8 @@ "ctxt": 0 }, "value": "r6a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7395,7 +7196,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -7406,7 +7206,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -7439,8 +7238,8 @@ "ctxt": 0 }, "value": "r6a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7458,7 +7257,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -7469,7 +7267,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -7502,8 +7299,8 @@ "ctxt": 0 }, "value": "r6b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7521,7 +7318,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -7532,7 +7328,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -7565,8 +7360,8 @@ "ctxt": 0 }, "value": "r6b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7584,7 +7379,6 @@ "ctxt": 0 }, "value": "base2", - "typeAnnotation": null, "optional": false }, "right": { @@ -7595,7 +7389,6 @@ "ctxt": 0 }, "value": "base1", - "typeAnnotation": null, "optional": false } }, @@ -7628,8 +7421,8 @@ "ctxt": 0 }, "value": "r6b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7647,7 +7440,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -7658,7 +7450,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -7691,8 +7482,8 @@ "ctxt": 0 }, "value": "r6b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7710,7 +7501,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -7721,7 +7511,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -7754,8 +7543,8 @@ "ctxt": 0 }, "value": "r6b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7773,7 +7562,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -7784,7 +7572,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -7817,8 +7604,8 @@ "ctxt": 0 }, "value": "r6b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7836,7 +7623,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -7847,7 +7633,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -7880,8 +7665,8 @@ "ctxt": 0 }, "value": "r6b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7899,7 +7684,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -7910,7 +7694,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -7943,8 +7726,8 @@ "ctxt": 0 }, "value": "r7a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7962,7 +7745,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -7973,7 +7755,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -8006,8 +7787,8 @@ "ctxt": 0 }, "value": "r7a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8025,7 +7806,6 @@ "ctxt": 0 }, "value": "base1", - "typeAnnotation": null, "optional": false }, "right": { @@ -8036,7 +7816,6 @@ "ctxt": 0 }, "value": "base2", - "typeAnnotation": null, "optional": false } }, @@ -8069,8 +7848,8 @@ "ctxt": 0 }, "value": "r7a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8088,7 +7867,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -8099,7 +7877,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -8132,8 +7909,8 @@ "ctxt": 0 }, "value": "r7a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8151,7 +7928,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -8162,7 +7938,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -8195,8 +7970,8 @@ "ctxt": 0 }, "value": "r7a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8214,7 +7989,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -8225,7 +7999,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -8258,8 +8031,8 @@ "ctxt": 0 }, "value": "r7a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8277,7 +8050,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -8288,7 +8060,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -8321,8 +8092,8 @@ "ctxt": 0 }, "value": "r7a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8340,7 +8111,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -8351,7 +8121,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -8384,8 +8153,8 @@ "ctxt": 0 }, "value": "r7b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8403,7 +8172,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -8414,7 +8182,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -8447,8 +8214,8 @@ "ctxt": 0 }, "value": "r7b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8466,7 +8233,6 @@ "ctxt": 0 }, "value": "base2", - "typeAnnotation": null, "optional": false }, "right": { @@ -8477,7 +8243,6 @@ "ctxt": 0 }, "value": "base1", - "typeAnnotation": null, "optional": false } }, @@ -8510,8 +8275,8 @@ "ctxt": 0 }, "value": "r7b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8529,7 +8294,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -8540,7 +8304,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -8573,8 +8336,8 @@ "ctxt": 0 }, "value": "r7b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8592,7 +8355,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -8603,7 +8365,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -8636,8 +8397,8 @@ "ctxt": 0 }, "value": "r7b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8655,7 +8416,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -8666,7 +8426,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -8699,8 +8458,8 @@ "ctxt": 0 }, "value": "r7b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8718,7 +8477,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -8729,7 +8487,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -8762,8 +8519,8 @@ "ctxt": 0 }, "value": "r7b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8781,7 +8538,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -8792,7 +8548,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -8825,8 +8580,8 @@ "ctxt": 0 }, "value": "r8a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8844,7 +8599,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -8855,7 +8609,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -8888,8 +8641,8 @@ "ctxt": 0 }, "value": "r8a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8907,7 +8660,6 @@ "ctxt": 0 }, "value": "base1", - "typeAnnotation": null, "optional": false }, "right": { @@ -8918,7 +8670,6 @@ "ctxt": 0 }, "value": "base2", - "typeAnnotation": null, "optional": false } }, @@ -8951,8 +8702,8 @@ "ctxt": 0 }, "value": "r8a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8970,7 +8721,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -8981,7 +8731,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -9014,8 +8763,8 @@ "ctxt": 0 }, "value": "r8a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9033,7 +8782,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -9044,7 +8792,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -9077,8 +8824,8 @@ "ctxt": 0 }, "value": "r8a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9096,7 +8843,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -9107,7 +8853,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -9140,8 +8885,8 @@ "ctxt": 0 }, "value": "r8a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9159,7 +8904,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -9170,7 +8914,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -9203,8 +8946,8 @@ "ctxt": 0 }, "value": "r8a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9222,7 +8965,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -9233,7 +8975,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -9266,8 +9007,8 @@ "ctxt": 0 }, "value": "r8b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9285,7 +9026,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -9296,7 +9036,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -9329,8 +9068,8 @@ "ctxt": 0 }, "value": "r8b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9348,7 +9087,6 @@ "ctxt": 0 }, "value": "base2", - "typeAnnotation": null, "optional": false }, "right": { @@ -9359,7 +9097,6 @@ "ctxt": 0 }, "value": "base1", - "typeAnnotation": null, "optional": false } }, @@ -9392,8 +9129,8 @@ "ctxt": 0 }, "value": "r8b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9411,7 +9148,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -9422,7 +9158,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -9455,8 +9190,8 @@ "ctxt": 0 }, "value": "r8b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9474,7 +9209,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -9485,7 +9219,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -9518,8 +9251,8 @@ "ctxt": 0 }, "value": "r8b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9537,7 +9270,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -9548,7 +9280,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -9581,8 +9312,8 @@ "ctxt": 0 }, "value": "r8b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9600,7 +9331,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -9611,7 +9341,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -9644,8 +9373,8 @@ "ctxt": 0 }, "value": "r8b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9663,7 +9392,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -9674,7 +9402,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithIdenticalPrimitiveType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithIdenticalPrimitiveType/input.ts.json index dccc945eb3b5..e1413701eb99 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithIdenticalPrimitiveType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithIdenticalPrimitiveType/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -82,7 +79,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "init": null @@ -114,6 +110,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -130,8 +127,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -163,6 +159,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -179,8 +176,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -212,6 +208,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -228,8 +225,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -261,6 +257,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -277,8 +274,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -310,6 +306,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -332,13 +329,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -370,8 +365,8 @@ "ctxt": 0 }, "value": "ra1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -389,7 +384,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -400,7 +394,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -433,8 +426,8 @@ "ctxt": 0 }, "value": "ra2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -452,7 +445,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -463,7 +455,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -496,8 +487,8 @@ "ctxt": 0 }, "value": "ra3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -515,7 +506,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -526,7 +516,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -559,8 +548,8 @@ "ctxt": 0 }, "value": "ra4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -578,7 +567,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -589,7 +577,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -622,8 +609,8 @@ "ctxt": 0 }, "value": "ra5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -641,7 +628,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -652,7 +638,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -685,8 +670,8 @@ "ctxt": 0 }, "value": "ra6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -742,8 +727,8 @@ "ctxt": 0 }, "value": "ra7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -761,7 +746,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -772,7 +756,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -805,8 +788,8 @@ "ctxt": 0 }, "value": "rb1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -824,7 +807,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -835,7 +817,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -868,8 +849,8 @@ "ctxt": 0 }, "value": "rb2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -887,7 +868,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -898,7 +878,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -931,8 +910,8 @@ "ctxt": 0 }, "value": "rb3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -950,7 +929,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -961,7 +939,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -994,8 +971,8 @@ "ctxt": 0 }, "value": "rb4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1013,7 +990,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1024,7 +1000,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -1057,8 +1032,8 @@ "ctxt": 0 }, "value": "rb5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1076,7 +1051,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -1087,7 +1061,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -1120,8 +1093,8 @@ "ctxt": 0 }, "value": "rb6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1177,8 +1150,8 @@ "ctxt": 0 }, "value": "rb7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1196,7 +1169,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1207,7 +1179,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1240,8 +1211,8 @@ "ctxt": 0 }, "value": "rc1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1259,7 +1230,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1270,7 +1240,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1303,8 +1272,8 @@ "ctxt": 0 }, "value": "rc2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1322,7 +1291,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1333,7 +1301,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1366,8 +1333,8 @@ "ctxt": 0 }, "value": "rc3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1385,7 +1352,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1396,7 +1362,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1429,8 +1394,8 @@ "ctxt": 0 }, "value": "rc4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1448,7 +1413,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1459,7 +1423,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -1492,8 +1455,8 @@ "ctxt": 0 }, "value": "rc5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1511,7 +1474,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -1522,7 +1484,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -1555,8 +1516,8 @@ "ctxt": 0 }, "value": "rc6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1612,8 +1573,8 @@ "ctxt": 0 }, "value": "rc7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1631,7 +1592,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1642,7 +1602,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1675,8 +1634,8 @@ "ctxt": 0 }, "value": "rd1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1694,7 +1653,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1705,7 +1663,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1738,8 +1695,8 @@ "ctxt": 0 }, "value": "rd2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1757,7 +1714,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1768,7 +1724,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1801,8 +1756,8 @@ "ctxt": 0 }, "value": "rd3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1820,7 +1775,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1831,7 +1785,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1864,8 +1817,8 @@ "ctxt": 0 }, "value": "rd4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1883,7 +1836,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1894,7 +1846,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -1927,8 +1878,8 @@ "ctxt": 0 }, "value": "rd5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1946,7 +1897,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -1957,7 +1907,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -1990,8 +1939,8 @@ "ctxt": 0 }, "value": "rd6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2047,8 +1996,8 @@ "ctxt": 0 }, "value": "rd7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2066,7 +2015,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -2077,7 +2025,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2110,8 +2057,8 @@ "ctxt": 0 }, "value": "re1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2129,7 +2076,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2140,7 +2086,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2173,8 +2118,8 @@ "ctxt": 0 }, "value": "re2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2192,7 +2137,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2203,7 +2147,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2236,8 +2179,8 @@ "ctxt": 0 }, "value": "re3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2255,7 +2198,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -2266,7 +2208,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -2299,8 +2240,8 @@ "ctxt": 0 }, "value": "re4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2318,7 +2259,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -2329,7 +2269,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -2362,8 +2301,8 @@ "ctxt": 0 }, "value": "re5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2381,7 +2320,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -2392,7 +2330,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -2425,8 +2362,8 @@ "ctxt": 0 }, "value": "re6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2482,8 +2419,8 @@ "ctxt": 0 }, "value": "re7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2501,7 +2438,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -2512,7 +2448,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2545,8 +2480,8 @@ "ctxt": 0 }, "value": "rf1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2564,7 +2499,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2575,7 +2509,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2608,8 +2541,8 @@ "ctxt": 0 }, "value": "rf2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2627,7 +2560,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2638,7 +2570,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2671,8 +2602,8 @@ "ctxt": 0 }, "value": "rf3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2690,7 +2621,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -2701,7 +2631,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -2734,8 +2663,8 @@ "ctxt": 0 }, "value": "rf4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2753,7 +2682,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -2764,7 +2692,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -2797,8 +2724,8 @@ "ctxt": 0 }, "value": "rf5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2816,7 +2743,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -2827,7 +2753,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -2860,8 +2785,8 @@ "ctxt": 0 }, "value": "rf6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2917,8 +2842,8 @@ "ctxt": 0 }, "value": "rf7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2936,7 +2861,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -2947,7 +2871,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2980,8 +2903,8 @@ "ctxt": 0 }, "value": "rg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2999,7 +2922,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3010,7 +2932,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3043,8 +2964,8 @@ "ctxt": 0 }, "value": "rg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3062,7 +2983,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3073,7 +2993,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3106,8 +3025,8 @@ "ctxt": 0 }, "value": "rg3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3125,7 +3044,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3136,7 +3054,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3169,8 +3086,8 @@ "ctxt": 0 }, "value": "rg4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3188,7 +3105,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -3199,7 +3115,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -3232,8 +3147,8 @@ "ctxt": 0 }, "value": "rg5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3251,7 +3166,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -3262,7 +3176,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -3295,8 +3208,8 @@ "ctxt": 0 }, "value": "rg6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3352,8 +3265,8 @@ "ctxt": 0 }, "value": "rg7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3371,7 +3284,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -3382,7 +3294,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -3415,8 +3326,8 @@ "ctxt": 0 }, "value": "rh1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3434,7 +3345,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3445,7 +3355,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3478,8 +3387,8 @@ "ctxt": 0 }, "value": "rh2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3497,7 +3406,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3508,7 +3416,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3541,8 +3448,8 @@ "ctxt": 0 }, "value": "rh3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3560,7 +3467,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3571,7 +3477,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3604,8 +3509,8 @@ "ctxt": 0 }, "value": "rh4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3623,7 +3528,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -3634,7 +3538,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -3667,8 +3570,8 @@ "ctxt": 0 }, "value": "rh5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3686,7 +3589,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -3697,7 +3599,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -3730,8 +3631,8 @@ "ctxt": 0 }, "value": "rh6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3787,8 +3688,8 @@ "ctxt": 0 }, "value": "rh7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3806,7 +3707,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -3817,7 +3717,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithIdenticalTypeParameter/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithIdenticalTypeParameter/input.ts.json index a11eca749a05..1b33a7486b1b 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithIdenticalTypeParameter/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithIdenticalTypeParameter/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -108,8 +106,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -127,7 +125,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -138,7 +135,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -171,8 +167,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -190,7 +186,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -201,7 +196,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -234,8 +228,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -253,7 +247,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -264,7 +257,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -297,8 +289,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -316,7 +308,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -327,7 +318,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -360,8 +350,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -379,7 +369,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -390,7 +379,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -423,8 +411,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -442,7 +430,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -453,7 +440,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -486,8 +472,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -505,7 +491,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -516,7 +501,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -549,8 +533,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -568,7 +552,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -579,7 +562,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -614,7 +596,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnCallSignature/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnCallSignature/input.ts.json index e44d5cf85ed7..27827163fbad 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnCallSignature/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnCallSignature/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -263,6 +256,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -294,7 +288,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -322,7 +315,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -332,8 +324,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -365,6 +356,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -410,7 +402,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -420,8 +411,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -453,6 +443,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -484,7 +475,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -498,6 +488,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -514,8 +505,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -525,6 +515,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -541,8 +532,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -566,8 +556,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -599,6 +588,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -630,7 +620,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -644,6 +633,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -660,8 +650,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -685,8 +674,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -718,6 +706,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -749,7 +738,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -763,6 +751,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,13 +774,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -801,6 +788,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -817,8 +805,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -842,8 +829,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -875,6 +861,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -906,7 +893,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -920,6 +906,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -942,13 +929,11 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -958,6 +943,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -980,13 +966,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1010,8 +994,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1043,6 +1026,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1074,7 +1058,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1102,7 +1085,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1112,8 +1094,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1145,6 +1126,7 @@ "ctxt": 0 }, "value": "b4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1176,7 +1158,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1204,7 +1185,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1214,8 +1194,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1247,6 +1226,7 @@ "ctxt": 0 }, "value": "a5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1278,7 +1258,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1292,6 +1271,7 @@ "ctxt": 0 }, "value": "a", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1314,13 +1294,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnn": { @@ -1344,8 +1322,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1377,6 +1354,7 @@ "ctxt": 0 }, "value": "b5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1408,7 +1386,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1422,6 +1399,7 @@ "ctxt": 0 }, "value": "a", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1444,13 +1422,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnn": { @@ -1474,8 +1450,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1507,6 +1482,7 @@ "ctxt": 0 }, "value": "a6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1538,7 +1514,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1564,8 +1539,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1596,7 +1571,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1626,8 +1600,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1659,6 +1632,7 @@ "ctxt": 0 }, "value": "b6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1690,7 +1664,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1716,8 +1689,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1748,7 +1721,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1778,8 +1750,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1811,6 +1782,7 @@ "ctxt": 0 }, "value": "a7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1842,7 +1814,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1856,6 +1827,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1878,13 +1850,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1909,7 +1879,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1938,7 +1907,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1949,8 +1917,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1982,6 +1949,7 @@ "ctxt": 0 }, "value": "b7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2013,7 +1981,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2027,6 +1994,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2056,14 +2024,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeAnn": { @@ -2088,7 +2054,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2117,7 +2082,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2128,8 +2092,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2161,8 +2124,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2180,7 +2143,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2191,7 +2153,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -2224,8 +2185,8 @@ "ctxt": 0 }, "value": "r1a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2243,7 +2204,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2254,7 +2214,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -2287,8 +2246,8 @@ "ctxt": 0 }, "value": "r1a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2306,7 +2265,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2317,7 +2275,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -2350,8 +2307,8 @@ "ctxt": 0 }, "value": "r1a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2369,7 +2326,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -2380,7 +2336,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -2413,8 +2368,8 @@ "ctxt": 0 }, "value": "r1a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2432,7 +2387,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -2443,7 +2397,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -2476,8 +2429,8 @@ "ctxt": 0 }, "value": "r1a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2495,7 +2448,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -2506,7 +2458,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -2539,8 +2490,8 @@ "ctxt": 0 }, "value": "r1a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2558,7 +2509,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -2569,7 +2519,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -2602,8 +2551,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2621,7 +2570,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2632,7 +2580,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -2665,8 +2612,8 @@ "ctxt": 0 }, "value": "r1b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2684,7 +2631,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2695,7 +2641,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -2728,8 +2673,8 @@ "ctxt": 0 }, "value": "r1b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2747,7 +2692,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2758,7 +2702,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -2791,8 +2734,8 @@ "ctxt": 0 }, "value": "r1b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2810,7 +2753,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -2821,7 +2763,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -2854,8 +2795,8 @@ "ctxt": 0 }, "value": "r1b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2873,7 +2814,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -2884,7 +2824,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -2917,8 +2856,8 @@ "ctxt": 0 }, "value": "r1b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2936,7 +2875,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -2947,7 +2885,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -2980,8 +2917,8 @@ "ctxt": 0 }, "value": "r1b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2999,7 +2936,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -3010,7 +2946,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -3043,8 +2978,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3062,7 +2997,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3073,7 +3007,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -3106,8 +3039,8 @@ "ctxt": 0 }, "value": "r2a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3125,7 +3058,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3136,7 +3068,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -3169,8 +3100,8 @@ "ctxt": 0 }, "value": "r2a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3188,7 +3119,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3199,7 +3129,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -3232,8 +3161,8 @@ "ctxt": 0 }, "value": "r2a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3251,7 +3180,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3262,7 +3190,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -3295,8 +3222,8 @@ "ctxt": 0 }, "value": "r2a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3314,7 +3241,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -3325,7 +3251,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -3358,8 +3283,8 @@ "ctxt": 0 }, "value": "r2a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3377,7 +3302,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -3388,7 +3312,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -3421,8 +3344,8 @@ "ctxt": 0 }, "value": "r2a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3440,7 +3363,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -3451,7 +3373,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -3484,8 +3405,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3503,7 +3424,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3514,7 +3434,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -3547,8 +3466,8 @@ "ctxt": 0 }, "value": "r2b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3566,7 +3485,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3577,7 +3495,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -3610,8 +3527,8 @@ "ctxt": 0 }, "value": "r2b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3629,7 +3546,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3640,7 +3556,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -3673,8 +3588,8 @@ "ctxt": 0 }, "value": "r2b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3692,7 +3607,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3703,7 +3617,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -3736,8 +3649,8 @@ "ctxt": 0 }, "value": "r2b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3755,7 +3668,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -3766,7 +3678,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -3799,8 +3710,8 @@ "ctxt": 0 }, "value": "r2b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3818,7 +3729,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -3829,7 +3739,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -3862,8 +3771,8 @@ "ctxt": 0 }, "value": "r2b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3881,7 +3790,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -3892,7 +3800,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -3925,8 +3832,8 @@ "ctxt": 0 }, "value": "r3a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3944,7 +3851,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3955,7 +3861,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -3988,8 +3893,8 @@ "ctxt": 0 }, "value": "r3a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4007,7 +3912,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4018,7 +3922,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -4051,8 +3954,8 @@ "ctxt": 0 }, "value": "r3a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4070,7 +3973,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4081,7 +3983,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -4114,8 +4015,8 @@ "ctxt": 0 }, "value": "r3a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4133,7 +4034,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4144,7 +4044,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -4177,8 +4076,8 @@ "ctxt": 0 }, "value": "r3a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4196,7 +4095,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -4207,7 +4105,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -4240,8 +4137,8 @@ "ctxt": 0 }, "value": "r3a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4259,7 +4156,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -4270,7 +4166,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -4303,8 +4198,8 @@ "ctxt": 0 }, "value": "r3a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4322,7 +4217,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -4333,7 +4227,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -4366,8 +4259,8 @@ "ctxt": 0 }, "value": "r3b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4385,7 +4278,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4396,7 +4288,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -4429,8 +4320,8 @@ "ctxt": 0 }, "value": "r3b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4448,7 +4339,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4459,7 +4349,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -4492,8 +4381,8 @@ "ctxt": 0 }, "value": "r3b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4511,7 +4400,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4522,7 +4410,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -4555,8 +4442,8 @@ "ctxt": 0 }, "value": "r3b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4574,7 +4461,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4585,7 +4471,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -4618,8 +4503,8 @@ "ctxt": 0 }, "value": "r3b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4637,7 +4522,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -4648,7 +4532,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -4681,8 +4564,8 @@ "ctxt": 0 }, "value": "r3b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4700,7 +4583,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -4711,7 +4593,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -4744,8 +4625,8 @@ "ctxt": 0 }, "value": "r3b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4763,7 +4644,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -4774,7 +4654,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -4807,8 +4686,8 @@ "ctxt": 0 }, "value": "r4a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4826,7 +4705,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4837,7 +4715,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -4870,8 +4747,8 @@ "ctxt": 0 }, "value": "r4a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4889,7 +4766,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4900,7 +4776,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -4933,8 +4808,8 @@ "ctxt": 0 }, "value": "r4a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4952,7 +4827,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4963,7 +4837,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -4996,8 +4869,8 @@ "ctxt": 0 }, "value": "r4a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5015,7 +4888,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -5026,7 +4898,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -5059,8 +4930,8 @@ "ctxt": 0 }, "value": "r4a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5078,7 +4949,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -5089,7 +4959,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -5122,8 +4991,8 @@ "ctxt": 0 }, "value": "r4a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5141,7 +5010,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -5152,7 +5020,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -5185,8 +5052,8 @@ "ctxt": 0 }, "value": "r4a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5204,7 +5071,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -5215,7 +5081,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -5248,8 +5113,8 @@ "ctxt": 0 }, "value": "r4b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5267,7 +5132,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -5278,7 +5142,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -5311,8 +5174,8 @@ "ctxt": 0 }, "value": "r4b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5330,7 +5193,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -5341,7 +5203,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -5374,8 +5235,8 @@ "ctxt": 0 }, "value": "r4b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5393,7 +5254,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -5404,7 +5264,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -5437,8 +5296,8 @@ "ctxt": 0 }, "value": "r4b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5456,7 +5315,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -5467,7 +5325,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -5500,8 +5357,8 @@ "ctxt": 0 }, "value": "r4b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5519,7 +5376,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -5530,7 +5386,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -5563,8 +5418,8 @@ "ctxt": 0 }, "value": "r4b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5582,7 +5437,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -5593,7 +5447,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -5626,8 +5479,8 @@ "ctxt": 0 }, "value": "r4b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5645,7 +5498,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -5656,7 +5508,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -5689,8 +5540,8 @@ "ctxt": 0 }, "value": "r5a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5708,7 +5559,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -5719,7 +5569,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -5752,8 +5601,8 @@ "ctxt": 0 }, "value": "r5a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5771,7 +5620,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -5782,7 +5630,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -5815,8 +5662,8 @@ "ctxt": 0 }, "value": "r5a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5834,7 +5681,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -5845,7 +5691,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -5878,8 +5723,8 @@ "ctxt": 0 }, "value": "r5a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5897,7 +5742,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -5908,7 +5752,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -5941,8 +5784,8 @@ "ctxt": 0 }, "value": "r5a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5960,7 +5803,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -5971,7 +5813,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -6004,8 +5845,8 @@ "ctxt": 0 }, "value": "r5a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6023,7 +5864,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -6034,7 +5874,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -6067,8 +5906,8 @@ "ctxt": 0 }, "value": "r5a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6086,7 +5925,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -6097,7 +5935,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -6130,8 +5967,8 @@ "ctxt": 0 }, "value": "r5b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6149,7 +5986,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -6160,7 +5996,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -6193,8 +6028,8 @@ "ctxt": 0 }, "value": "r5b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6212,7 +6047,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -6223,7 +6057,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -6256,8 +6089,8 @@ "ctxt": 0 }, "value": "r5b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6275,7 +6108,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -6286,7 +6118,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -6319,8 +6150,8 @@ "ctxt": 0 }, "value": "r5b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6338,7 +6169,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -6349,7 +6179,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -6382,8 +6211,8 @@ "ctxt": 0 }, "value": "r5b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6401,7 +6230,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -6412,7 +6240,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -6445,8 +6272,8 @@ "ctxt": 0 }, "value": "r5b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6464,7 +6291,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -6475,7 +6301,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -6508,8 +6333,8 @@ "ctxt": 0 }, "value": "r5b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6527,7 +6352,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -6538,7 +6362,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -6571,8 +6394,8 @@ "ctxt": 0 }, "value": "r6a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6590,7 +6413,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -6601,7 +6423,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -6634,8 +6455,8 @@ "ctxt": 0 }, "value": "r6a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6653,7 +6474,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -6664,7 +6484,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -6697,8 +6516,8 @@ "ctxt": 0 }, "value": "r6a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6716,7 +6535,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -6727,7 +6545,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -6760,8 +6577,8 @@ "ctxt": 0 }, "value": "r6a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6779,7 +6596,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -6790,7 +6606,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -6823,8 +6638,8 @@ "ctxt": 0 }, "value": "r6a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6842,7 +6657,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -6853,7 +6667,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -6886,8 +6699,8 @@ "ctxt": 0 }, "value": "r6a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6905,7 +6718,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -6916,7 +6728,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -6949,8 +6760,8 @@ "ctxt": 0 }, "value": "r6a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6968,7 +6779,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -6979,7 +6789,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -7012,8 +6821,8 @@ "ctxt": 0 }, "value": "r6b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7031,7 +6840,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -7042,7 +6850,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -7075,8 +6882,8 @@ "ctxt": 0 }, "value": "r6b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7094,7 +6901,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -7105,7 +6911,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -7138,8 +6943,8 @@ "ctxt": 0 }, "value": "r6b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7157,7 +6962,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -7168,7 +6972,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -7201,8 +7004,8 @@ "ctxt": 0 }, "value": "r6b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7220,7 +7023,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -7231,7 +7033,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -7264,8 +7065,8 @@ "ctxt": 0 }, "value": "r6b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7283,7 +7084,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -7294,7 +7094,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -7327,8 +7126,8 @@ "ctxt": 0 }, "value": "r6b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7346,7 +7145,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -7357,7 +7155,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -7390,8 +7187,8 @@ "ctxt": 0 }, "value": "r6b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7409,7 +7206,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -7420,7 +7216,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -7453,8 +7248,8 @@ "ctxt": 0 }, "value": "r7a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7472,7 +7267,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -7483,7 +7277,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -7516,8 +7309,8 @@ "ctxt": 0 }, "value": "r7a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7535,7 +7328,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -7546,7 +7338,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -7579,8 +7370,8 @@ "ctxt": 0 }, "value": "r7a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7598,7 +7389,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -7609,7 +7399,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -7642,8 +7431,8 @@ "ctxt": 0 }, "value": "r7a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7661,7 +7450,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -7672,7 +7460,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -7705,8 +7492,8 @@ "ctxt": 0 }, "value": "r7a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7724,7 +7511,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -7735,7 +7521,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -7768,8 +7553,8 @@ "ctxt": 0 }, "value": "r7a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7787,7 +7572,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -7798,7 +7582,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -7831,8 +7614,8 @@ "ctxt": 0 }, "value": "r7a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7850,7 +7633,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -7861,7 +7643,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -7894,8 +7675,8 @@ "ctxt": 0 }, "value": "r7b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7913,7 +7694,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -7924,7 +7704,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -7957,8 +7736,8 @@ "ctxt": 0 }, "value": "r7b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7976,7 +7755,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -7987,7 +7765,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -8020,8 +7797,8 @@ "ctxt": 0 }, "value": "r7b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8039,7 +7816,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -8050,7 +7826,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -8083,8 +7858,8 @@ "ctxt": 0 }, "value": "r7b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8102,7 +7877,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -8113,7 +7887,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -8146,8 +7919,8 @@ "ctxt": 0 }, "value": "r7b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8165,7 +7938,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -8176,7 +7948,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -8209,8 +7980,8 @@ "ctxt": 0 }, "value": "r7b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8228,7 +7999,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -8239,7 +8009,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -8272,8 +8041,8 @@ "ctxt": 0 }, "value": "r7b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8291,7 +8060,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -8302,7 +8070,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -8335,8 +8102,8 @@ "ctxt": 0 }, "value": "r8a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8354,7 +8121,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -8365,7 +8131,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -8398,8 +8163,8 @@ "ctxt": 0 }, "value": "r8a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8417,7 +8182,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -8428,7 +8192,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -8461,8 +8224,8 @@ "ctxt": 0 }, "value": "r8a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8480,7 +8243,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -8491,7 +8253,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -8524,8 +8285,8 @@ "ctxt": 0 }, "value": "r8a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8543,7 +8304,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -8554,7 +8314,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -8587,8 +8346,8 @@ "ctxt": 0 }, "value": "r8a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8606,7 +8365,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -8617,7 +8375,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -8650,8 +8407,8 @@ "ctxt": 0 }, "value": "r8a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8669,7 +8426,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -8680,7 +8436,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -8713,8 +8468,8 @@ "ctxt": 0 }, "value": "r8a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8732,7 +8487,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -8743,7 +8497,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -8776,8 +8529,8 @@ "ctxt": 0 }, "value": "r8b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8795,7 +8548,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -8806,7 +8558,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -8839,8 +8590,8 @@ "ctxt": 0 }, "value": "r8b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8858,7 +8609,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -8869,7 +8619,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -8902,8 +8651,8 @@ "ctxt": 0 }, "value": "r8b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8921,7 +8670,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -8932,7 +8680,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -8965,8 +8712,8 @@ "ctxt": 0 }, "value": "r8b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8984,7 +8731,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -8995,7 +8741,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -9028,8 +8773,8 @@ "ctxt": 0 }, "value": "r8b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9047,7 +8792,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -9058,7 +8802,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -9091,8 +8834,8 @@ "ctxt": 0 }, "value": "r8b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9110,7 +8853,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -9121,7 +8863,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -9154,8 +8895,8 @@ "ctxt": 0 }, "value": "r8b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9173,7 +8914,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -9184,7 +8924,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature/input.ts.json index 94697769e136..ce4b1830ab91 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -263,6 +256,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -294,7 +288,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -322,7 +315,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -332,8 +324,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -365,6 +356,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -410,7 +402,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -420,8 +411,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -453,6 +443,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -484,6 +475,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -500,8 +492,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -511,6 +502,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -527,8 +519,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -553,7 +544,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -563,8 +553,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -596,6 +585,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -627,6 +617,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -643,8 +634,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -669,7 +659,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -679,8 +668,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -712,6 +700,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -743,6 +732,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -765,13 +755,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -781,6 +769,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -797,8 +786,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -823,7 +811,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -833,8 +820,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -866,6 +852,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -897,6 +884,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -919,13 +907,11 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -935,6 +921,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -957,13 +944,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -988,7 +973,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -998,8 +982,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1031,6 +1014,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1076,7 +1060,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1086,8 +1069,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1119,6 +1101,7 @@ "ctxt": 0 }, "value": "b4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1164,7 +1147,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1174,8 +1156,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1207,6 +1188,7 @@ "ctxt": 0 }, "value": "a5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1238,6 +1220,7 @@ "ctxt": 0 }, "value": "a", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1260,13 +1243,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnnotation": { @@ -1291,7 +1272,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1301,8 +1281,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1334,6 +1313,7 @@ "ctxt": 0 }, "value": "b5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1365,6 +1345,7 @@ "ctxt": 0 }, "value": "a", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1387,13 +1368,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnnotation": { @@ -1418,7 +1397,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1428,8 +1406,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1461,6 +1438,7 @@ "ctxt": 0 }, "value": "a6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1504,8 +1482,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1536,7 +1514,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1567,7 +1544,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1577,8 +1553,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1610,6 +1585,7 @@ "ctxt": 0 }, "value": "b6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1653,8 +1629,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1685,7 +1661,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1716,7 +1691,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1726,8 +1700,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1759,6 +1732,7 @@ "ctxt": 0 }, "value": "a7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1790,6 +1764,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1812,13 +1787,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1843,7 +1816,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1872,7 +1844,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1883,8 +1854,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1916,6 +1886,7 @@ "ctxt": 0 }, "value": "b7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1947,6 +1918,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1976,14 +1948,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2008,7 +1978,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2037,7 +2006,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2048,8 +2016,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2081,8 +2048,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2100,7 +2067,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2111,7 +2077,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -2144,8 +2109,8 @@ "ctxt": 0 }, "value": "r1a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2163,7 +2128,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2174,7 +2138,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -2207,8 +2170,8 @@ "ctxt": 0 }, "value": "r1a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2226,7 +2189,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2237,7 +2199,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -2270,8 +2231,8 @@ "ctxt": 0 }, "value": "r1a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2289,7 +2250,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -2300,7 +2260,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -2333,8 +2292,8 @@ "ctxt": 0 }, "value": "r1a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2352,7 +2311,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -2363,7 +2321,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -2396,8 +2353,8 @@ "ctxt": 0 }, "value": "r1a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2415,7 +2372,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -2426,7 +2382,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -2459,8 +2414,8 @@ "ctxt": 0 }, "value": "r1a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2478,7 +2433,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -2489,7 +2443,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -2522,8 +2475,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2541,7 +2494,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2552,7 +2504,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -2585,8 +2536,8 @@ "ctxt": 0 }, "value": "r1b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2604,7 +2555,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2615,7 +2565,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -2648,8 +2597,8 @@ "ctxt": 0 }, "value": "r1b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2667,7 +2616,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2678,7 +2626,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -2711,8 +2658,8 @@ "ctxt": 0 }, "value": "r1b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2730,7 +2677,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -2741,7 +2687,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -2774,8 +2719,8 @@ "ctxt": 0 }, "value": "r1b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2793,7 +2738,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -2804,7 +2748,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -2837,8 +2780,8 @@ "ctxt": 0 }, "value": "r1b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2856,7 +2799,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -2867,7 +2809,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -2900,8 +2841,8 @@ "ctxt": 0 }, "value": "r1b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2919,7 +2860,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -2930,7 +2870,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -2963,8 +2902,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2982,7 +2921,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2993,7 +2931,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -3026,8 +2963,8 @@ "ctxt": 0 }, "value": "r2a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3045,7 +2982,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3056,7 +2992,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -3089,8 +3024,8 @@ "ctxt": 0 }, "value": "r2a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3108,7 +3043,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3119,7 +3053,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -3152,8 +3085,8 @@ "ctxt": 0 }, "value": "r2a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3171,7 +3104,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3182,7 +3114,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -3215,8 +3146,8 @@ "ctxt": 0 }, "value": "r2a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3234,7 +3165,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -3245,7 +3175,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -3278,8 +3207,8 @@ "ctxt": 0 }, "value": "r2a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3297,7 +3226,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -3308,7 +3236,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -3341,8 +3268,8 @@ "ctxt": 0 }, "value": "r2a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3360,7 +3287,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -3371,7 +3297,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -3404,8 +3329,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3423,7 +3348,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3434,7 +3358,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -3467,8 +3390,8 @@ "ctxt": 0 }, "value": "r2b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3486,7 +3409,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3497,7 +3419,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -3530,8 +3451,8 @@ "ctxt": 0 }, "value": "r2b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3549,7 +3470,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3560,7 +3480,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -3593,8 +3512,8 @@ "ctxt": 0 }, "value": "r2b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3612,7 +3531,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3623,7 +3541,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -3656,8 +3573,8 @@ "ctxt": 0 }, "value": "r2b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3675,7 +3592,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -3686,7 +3602,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -3719,8 +3634,8 @@ "ctxt": 0 }, "value": "r2b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3738,7 +3653,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -3749,7 +3663,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -3782,8 +3695,8 @@ "ctxt": 0 }, "value": "r2b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3801,7 +3714,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -3812,7 +3724,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -3845,8 +3756,8 @@ "ctxt": 0 }, "value": "r3a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3864,7 +3775,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3875,7 +3785,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -3908,8 +3817,8 @@ "ctxt": 0 }, "value": "r3a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3927,7 +3836,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3938,7 +3846,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -3971,8 +3878,8 @@ "ctxt": 0 }, "value": "r3a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3990,7 +3897,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4001,7 +3907,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -4034,8 +3939,8 @@ "ctxt": 0 }, "value": "r3a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4053,7 +3958,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4064,7 +3968,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -4097,8 +4000,8 @@ "ctxt": 0 }, "value": "r3a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4116,7 +4019,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -4127,7 +4029,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -4160,8 +4061,8 @@ "ctxt": 0 }, "value": "r3a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4179,7 +4080,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -4190,7 +4090,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -4223,8 +4122,8 @@ "ctxt": 0 }, "value": "r3a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4242,7 +4141,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -4253,7 +4151,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -4286,8 +4183,8 @@ "ctxt": 0 }, "value": "r3b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4305,7 +4202,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4316,7 +4212,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -4349,8 +4244,8 @@ "ctxt": 0 }, "value": "r3b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4368,7 +4263,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4379,7 +4273,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -4412,8 +4305,8 @@ "ctxt": 0 }, "value": "r3b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4431,7 +4324,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4442,7 +4334,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -4475,8 +4366,8 @@ "ctxt": 0 }, "value": "r3b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4494,7 +4385,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4505,7 +4395,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -4538,8 +4427,8 @@ "ctxt": 0 }, "value": "r3b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4557,7 +4446,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -4568,7 +4456,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -4601,8 +4488,8 @@ "ctxt": 0 }, "value": "r3b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4620,7 +4507,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -4631,7 +4517,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -4664,8 +4549,8 @@ "ctxt": 0 }, "value": "r3b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4683,7 +4568,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -4694,7 +4578,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -4727,8 +4610,8 @@ "ctxt": 0 }, "value": "r4a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4746,7 +4629,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4757,7 +4639,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -4790,8 +4671,8 @@ "ctxt": 0 }, "value": "r4a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4809,7 +4690,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4820,7 +4700,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -4853,8 +4732,8 @@ "ctxt": 0 }, "value": "r4a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4872,7 +4751,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4883,7 +4761,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -4916,8 +4793,8 @@ "ctxt": 0 }, "value": "r4a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4935,7 +4812,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4946,7 +4822,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -4979,8 +4854,8 @@ "ctxt": 0 }, "value": "r4a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4998,7 +4873,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -5009,7 +4883,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -5042,8 +4915,8 @@ "ctxt": 0 }, "value": "r4a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5061,7 +4934,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -5072,7 +4944,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -5105,8 +4976,8 @@ "ctxt": 0 }, "value": "r4a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5124,7 +4995,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -5135,7 +5005,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -5168,8 +5037,8 @@ "ctxt": 0 }, "value": "r4b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5187,7 +5056,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -5198,7 +5066,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -5231,8 +5098,8 @@ "ctxt": 0 }, "value": "r4b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5250,7 +5117,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -5261,7 +5127,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -5294,8 +5159,8 @@ "ctxt": 0 }, "value": "r4b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5313,7 +5178,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -5324,7 +5188,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -5357,8 +5220,8 @@ "ctxt": 0 }, "value": "r4b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5376,7 +5239,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -5387,7 +5249,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -5420,8 +5281,8 @@ "ctxt": 0 }, "value": "r4b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5439,7 +5300,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -5450,7 +5310,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -5483,8 +5342,8 @@ "ctxt": 0 }, "value": "r4b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5502,7 +5361,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -5513,7 +5371,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -5546,8 +5403,8 @@ "ctxt": 0 }, "value": "r4b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5565,7 +5422,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -5576,7 +5432,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -5609,8 +5464,8 @@ "ctxt": 0 }, "value": "r5a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5628,7 +5483,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -5639,7 +5493,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -5672,8 +5525,8 @@ "ctxt": 0 }, "value": "r5a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5691,7 +5544,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -5702,7 +5554,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -5735,8 +5586,8 @@ "ctxt": 0 }, "value": "r5a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5754,7 +5605,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -5765,7 +5615,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -5798,8 +5647,8 @@ "ctxt": 0 }, "value": "r5a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5817,7 +5666,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -5828,7 +5676,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -5861,8 +5708,8 @@ "ctxt": 0 }, "value": "r5a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5880,7 +5727,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -5891,7 +5737,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -5924,8 +5769,8 @@ "ctxt": 0 }, "value": "r5a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5943,7 +5788,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -5954,7 +5798,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -5987,8 +5830,8 @@ "ctxt": 0 }, "value": "r5a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6006,7 +5849,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -6017,7 +5859,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -6050,8 +5891,8 @@ "ctxt": 0 }, "value": "r5b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6069,7 +5910,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -6080,7 +5920,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -6113,8 +5952,8 @@ "ctxt": 0 }, "value": "r5b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6132,7 +5971,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -6143,7 +5981,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -6176,8 +6013,8 @@ "ctxt": 0 }, "value": "r5b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6195,7 +6032,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -6206,7 +6042,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -6239,8 +6074,8 @@ "ctxt": 0 }, "value": "r5b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6258,7 +6093,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -6269,7 +6103,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -6302,8 +6135,8 @@ "ctxt": 0 }, "value": "r5b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6321,7 +6154,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -6332,7 +6164,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -6365,8 +6196,8 @@ "ctxt": 0 }, "value": "r5b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6384,7 +6215,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -6395,7 +6225,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -6428,8 +6257,8 @@ "ctxt": 0 }, "value": "r5b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6447,7 +6276,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -6458,7 +6286,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -6491,8 +6318,8 @@ "ctxt": 0 }, "value": "r6a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6510,7 +6337,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -6521,7 +6347,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -6554,8 +6379,8 @@ "ctxt": 0 }, "value": "r6a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6573,7 +6398,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -6584,7 +6408,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -6617,8 +6440,8 @@ "ctxt": 0 }, "value": "r6a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6636,7 +6459,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -6647,7 +6469,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -6680,8 +6501,8 @@ "ctxt": 0 }, "value": "r6a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6699,7 +6520,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -6710,7 +6530,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -6743,8 +6562,8 @@ "ctxt": 0 }, "value": "r6a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6762,7 +6581,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -6773,7 +6591,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -6806,8 +6623,8 @@ "ctxt": 0 }, "value": "r6a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6825,7 +6642,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -6836,7 +6652,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -6869,8 +6684,8 @@ "ctxt": 0 }, "value": "r6a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6888,7 +6703,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -6899,7 +6713,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -6932,8 +6745,8 @@ "ctxt": 0 }, "value": "r6b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6951,7 +6764,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -6962,7 +6774,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -6995,8 +6806,8 @@ "ctxt": 0 }, "value": "r6b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7014,7 +6825,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -7025,7 +6835,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -7058,8 +6867,8 @@ "ctxt": 0 }, "value": "r6b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7077,7 +6886,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -7088,7 +6896,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -7121,8 +6928,8 @@ "ctxt": 0 }, "value": "r6b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7140,7 +6947,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -7151,7 +6957,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -7184,8 +6989,8 @@ "ctxt": 0 }, "value": "r6b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7203,7 +7008,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -7214,7 +7018,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -7247,8 +7050,8 @@ "ctxt": 0 }, "value": "r6b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7266,7 +7069,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -7277,7 +7079,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -7310,8 +7111,8 @@ "ctxt": 0 }, "value": "r6b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7329,7 +7130,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -7340,7 +7140,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -7373,8 +7172,8 @@ "ctxt": 0 }, "value": "r7a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7392,7 +7191,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -7403,7 +7201,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -7436,8 +7233,8 @@ "ctxt": 0 }, "value": "r7a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7455,7 +7252,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -7466,7 +7262,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -7499,8 +7294,8 @@ "ctxt": 0 }, "value": "r7a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7518,7 +7313,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -7529,7 +7323,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -7562,8 +7355,8 @@ "ctxt": 0 }, "value": "r7a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7581,7 +7374,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -7592,7 +7384,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -7625,8 +7416,8 @@ "ctxt": 0 }, "value": "r7a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7644,7 +7435,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -7655,7 +7445,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -7688,8 +7477,8 @@ "ctxt": 0 }, "value": "r7a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7707,7 +7496,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -7718,7 +7506,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -7751,8 +7538,8 @@ "ctxt": 0 }, "value": "r7a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7770,7 +7557,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -7781,7 +7567,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -7814,8 +7599,8 @@ "ctxt": 0 }, "value": "r7b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7833,7 +7618,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -7844,7 +7628,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -7877,8 +7660,8 @@ "ctxt": 0 }, "value": "r7b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7896,7 +7679,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -7907,7 +7689,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -7940,8 +7721,8 @@ "ctxt": 0 }, "value": "r7b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7959,7 +7740,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -7970,7 +7750,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -8003,8 +7782,8 @@ "ctxt": 0 }, "value": "r7b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8022,7 +7801,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -8033,7 +7811,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -8066,8 +7843,8 @@ "ctxt": 0 }, "value": "r7b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8085,7 +7862,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -8096,7 +7872,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -8129,8 +7904,8 @@ "ctxt": 0 }, "value": "r7b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8148,7 +7923,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -8159,7 +7933,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -8192,8 +7965,8 @@ "ctxt": 0 }, "value": "r7b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8211,7 +7984,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -8222,7 +7994,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -8255,8 +8026,8 @@ "ctxt": 0 }, "value": "r8a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8274,7 +8045,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -8285,7 +8055,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -8318,8 +8087,8 @@ "ctxt": 0 }, "value": "r8a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8337,7 +8106,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -8348,7 +8116,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -8381,8 +8148,8 @@ "ctxt": 0 }, "value": "r8a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8400,7 +8167,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -8411,7 +8177,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -8444,8 +8209,8 @@ "ctxt": 0 }, "value": "r8a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8463,7 +8228,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -8474,7 +8238,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -8507,8 +8270,8 @@ "ctxt": 0 }, "value": "r8a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8526,7 +8289,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -8537,7 +8299,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -8570,8 +8331,8 @@ "ctxt": 0 }, "value": "r8a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8589,7 +8350,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -8600,7 +8360,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -8633,8 +8392,8 @@ "ctxt": 0 }, "value": "r8a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8652,7 +8411,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -8663,7 +8421,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -8696,8 +8453,8 @@ "ctxt": 0 }, "value": "r8b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8715,7 +8472,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -8726,7 +8482,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -8759,8 +8514,8 @@ "ctxt": 0 }, "value": "r8b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8778,7 +8533,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -8789,7 +8543,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -8822,8 +8575,8 @@ "ctxt": 0 }, "value": "r8b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8841,7 +8594,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -8852,7 +8604,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -8885,8 +8636,8 @@ "ctxt": 0 }, "value": "r8b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8904,7 +8655,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -8915,7 +8665,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -8948,8 +8697,8 @@ "ctxt": 0 }, "value": "r8b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8967,7 +8716,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -8978,7 +8726,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -9011,8 +8758,8 @@ "ctxt": 0 }, "value": "r8b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9030,7 +8777,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -9041,7 +8787,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -9074,8 +8819,8 @@ "ctxt": 0 }, "value": "r8b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9093,7 +8838,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -9104,7 +8848,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature/input.ts.json index 26d2983b5673..42bfb3468ce9 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -263,6 +256,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -289,6 +283,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -305,8 +300,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -335,8 +329,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -368,6 +361,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -394,6 +388,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -410,8 +405,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -440,8 +434,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -473,6 +466,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -499,6 +493,7 @@ "ctxt": 0 }, "value": "index", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -515,8 +510,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -541,7 +535,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -556,8 +549,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -589,6 +581,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -615,6 +608,7 @@ "ctxt": 0 }, "value": "index", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -631,8 +625,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -657,7 +650,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -672,8 +664,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -705,6 +696,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -731,6 +723,7 @@ "ctxt": 0 }, "value": "index", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -747,8 +740,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -773,7 +765,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -788,8 +779,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -821,6 +811,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -847,6 +838,7 @@ "ctxt": 0 }, "value": "index", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -863,8 +855,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -889,7 +880,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -904,8 +894,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -937,6 +926,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -963,6 +953,7 @@ "ctxt": 0 }, "value": "index", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -979,8 +970,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1005,7 +995,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1020,8 +1009,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1053,6 +1041,7 @@ "ctxt": 0 }, "value": "b4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1079,6 +1068,7 @@ "ctxt": 0 }, "value": "index", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1095,8 +1085,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1121,7 +1110,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1136,8 +1124,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1169,8 +1156,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1188,7 +1175,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1199,7 +1185,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -1232,8 +1217,8 @@ "ctxt": 0 }, "value": "r1a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1251,7 +1236,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1262,7 +1246,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -1295,8 +1278,8 @@ "ctxt": 0 }, "value": "r1a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1314,7 +1297,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -1325,7 +1307,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -1358,8 +1339,8 @@ "ctxt": 0 }, "value": "r1a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1377,7 +1358,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -1388,7 +1368,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -1421,8 +1400,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1440,7 +1419,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1451,7 +1429,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -1484,8 +1461,8 @@ "ctxt": 0 }, "value": "r1b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1503,7 +1480,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1514,7 +1490,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -1547,8 +1522,8 @@ "ctxt": 0 }, "value": "r1b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1566,7 +1541,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -1577,7 +1551,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -1610,8 +1583,8 @@ "ctxt": 0 }, "value": "r1b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1629,7 +1602,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -1640,7 +1612,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -1673,8 +1644,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1692,7 +1663,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1703,7 +1673,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -1736,8 +1705,8 @@ "ctxt": 0 }, "value": "r2a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1755,7 +1724,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1766,7 +1734,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -1799,8 +1766,8 @@ "ctxt": 0 }, "value": "r2a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1818,7 +1785,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -1829,7 +1795,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -1862,8 +1827,8 @@ "ctxt": 0 }, "value": "r2a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1881,7 +1846,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -1892,7 +1856,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -1925,8 +1888,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1944,7 +1907,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1955,7 +1917,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -1988,8 +1949,8 @@ "ctxt": 0 }, "value": "r2b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2007,7 +1968,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2018,7 +1978,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -2051,8 +2010,8 @@ "ctxt": 0 }, "value": "r2b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2070,7 +2029,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2081,7 +2039,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -2114,8 +2071,8 @@ "ctxt": 0 }, "value": "r2b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2133,7 +2090,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -2144,7 +2100,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -2177,8 +2132,8 @@ "ctxt": 0 }, "value": "r3a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2196,7 +2151,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2207,7 +2161,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -2240,8 +2193,8 @@ "ctxt": 0 }, "value": "r3a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2259,7 +2212,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2270,7 +2222,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -2303,8 +2254,8 @@ "ctxt": 0 }, "value": "r3a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2322,7 +2273,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2333,7 +2283,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -2366,8 +2315,8 @@ "ctxt": 0 }, "value": "r3a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2385,7 +2334,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -2396,7 +2344,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -2429,8 +2376,8 @@ "ctxt": 0 }, "value": "r3b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2448,7 +2395,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2459,7 +2405,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -2492,8 +2437,8 @@ "ctxt": 0 }, "value": "r3b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2511,7 +2456,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2522,7 +2466,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -2555,8 +2498,8 @@ "ctxt": 0 }, "value": "r3b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2574,7 +2517,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2585,7 +2527,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -2618,8 +2559,8 @@ "ctxt": 0 }, "value": "r3b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2637,7 +2578,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -2648,7 +2588,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -2681,8 +2620,8 @@ "ctxt": 0 }, "value": "r4a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2700,7 +2639,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2711,7 +2649,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -2744,8 +2681,8 @@ "ctxt": 0 }, "value": "r4a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2763,7 +2700,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2774,7 +2710,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -2807,8 +2742,8 @@ "ctxt": 0 }, "value": "r4a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2826,7 +2761,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2837,7 +2771,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -2870,8 +2803,8 @@ "ctxt": 0 }, "value": "r4a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2889,7 +2822,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -2900,7 +2832,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -2933,8 +2864,8 @@ "ctxt": 0 }, "value": "r4b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2952,7 +2883,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2963,7 +2893,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -2996,8 +2925,8 @@ "ctxt": 0 }, "value": "r4b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3015,7 +2944,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3026,7 +2954,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -3059,8 +2986,8 @@ "ctxt": 0 }, "value": "r4b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3078,7 +3005,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3089,7 +3015,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -3122,8 +3047,8 @@ "ctxt": 0 }, "value": "r4b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3141,7 +3066,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3152,7 +3076,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -3185,8 +3108,8 @@ "ctxt": 0 }, "value": "r5a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3204,7 +3127,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3215,7 +3137,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -3248,8 +3169,8 @@ "ctxt": 0 }, "value": "r5a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3267,7 +3188,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3278,7 +3198,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -3311,8 +3230,8 @@ "ctxt": 0 }, "value": "r5a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3330,7 +3249,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3341,7 +3259,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -3374,8 +3291,8 @@ "ctxt": 0 }, "value": "r5a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3393,7 +3310,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3404,7 +3320,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -3437,8 +3352,8 @@ "ctxt": 0 }, "value": "r5b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3456,7 +3371,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3467,7 +3381,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -3500,8 +3413,8 @@ "ctxt": 0 }, "value": "r5b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3519,7 +3432,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3530,7 +3442,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -3563,8 +3474,8 @@ "ctxt": 0 }, "value": "r5b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3582,7 +3493,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3593,7 +3503,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -3626,8 +3535,8 @@ "ctxt": 0 }, "value": "r5b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3645,7 +3554,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3656,7 +3564,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -3689,8 +3596,8 @@ "ctxt": 0 }, "value": "r6a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3708,7 +3615,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3719,7 +3625,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -3752,8 +3657,8 @@ "ctxt": 0 }, "value": "r6a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3771,7 +3676,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3782,7 +3686,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -3815,8 +3718,8 @@ "ctxt": 0 }, "value": "r6a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3834,7 +3737,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3845,7 +3747,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -3878,8 +3779,8 @@ "ctxt": 0 }, "value": "r6a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3897,7 +3798,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3908,7 +3808,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -3941,8 +3840,8 @@ "ctxt": 0 }, "value": "r6b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3960,7 +3859,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3971,7 +3869,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -4004,8 +3901,8 @@ "ctxt": 0 }, "value": "r6b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4023,7 +3920,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4034,7 +3930,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -4067,8 +3962,8 @@ "ctxt": 0 }, "value": "r6b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4086,7 +3981,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4097,7 +3991,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -4130,8 +4023,8 @@ "ctxt": 0 }, "value": "r6b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4149,7 +4042,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4160,7 +4052,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -4193,8 +4084,8 @@ "ctxt": 0 }, "value": "r7a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4212,7 +4103,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4223,7 +4113,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -4256,8 +4145,8 @@ "ctxt": 0 }, "value": "r7a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4275,7 +4164,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4286,7 +4174,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -4319,8 +4206,8 @@ "ctxt": 0 }, "value": "r7a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4338,7 +4225,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4349,7 +4235,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -4382,8 +4267,8 @@ "ctxt": 0 }, "value": "r7a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4401,7 +4286,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4412,7 +4296,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -4445,8 +4328,8 @@ "ctxt": 0 }, "value": "r7b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4464,7 +4347,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4475,7 +4357,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -4508,8 +4389,8 @@ "ctxt": 0 }, "value": "r7b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4527,7 +4408,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4538,7 +4418,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -4571,8 +4450,8 @@ "ctxt": 0 }, "value": "r7b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4590,7 +4469,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4601,7 +4479,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -4634,8 +4511,8 @@ "ctxt": 0 }, "value": "r7b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4653,7 +4530,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4664,7 +4540,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -4697,8 +4572,8 @@ "ctxt": 0 }, "value": "r8a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4716,7 +4591,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4727,7 +4601,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -4760,8 +4633,8 @@ "ctxt": 0 }, "value": "r8a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4779,7 +4652,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4790,7 +4662,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -4823,8 +4694,8 @@ "ctxt": 0 }, "value": "r8a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4842,7 +4713,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4853,7 +4723,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -4886,8 +4755,8 @@ "ctxt": 0 }, "value": "r8a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4905,7 +4774,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4916,7 +4784,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -4949,8 +4816,8 @@ "ctxt": 0 }, "value": "r8b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4968,7 +4835,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4979,7 +4845,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -5012,8 +4877,8 @@ "ctxt": 0 }, "value": "r8b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5031,7 +4896,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -5042,7 +4906,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -5075,8 +4938,8 @@ "ctxt": 0 }, "value": "r8b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5094,7 +4957,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -5105,7 +4967,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -5138,8 +4999,8 @@ "ctxt": 0 }, "value": "r8b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5157,7 +5018,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -5168,7 +5028,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature/input.ts.json index 9cff1b52ea53..f536555b5ced 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -263,6 +256,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -294,7 +288,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -308,6 +301,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -330,13 +324,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -361,7 +353,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -390,7 +381,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -401,8 +391,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -434,6 +423,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -465,7 +455,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -492,8 +481,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -525,6 +513,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,7 +545,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -570,6 +558,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -592,13 +581,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -623,7 +610,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -652,7 +638,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -663,8 +648,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -696,6 +680,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -727,7 +712,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -741,6 +725,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -757,8 +742,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -782,8 +766,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -815,6 +798,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -846,7 +830,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -860,6 +843,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -882,13 +866,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnn": { @@ -913,7 +895,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -942,7 +923,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -953,8 +933,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -986,6 +965,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1017,7 +997,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1031,6 +1010,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1047,8 +1027,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "typeAnn": { @@ -1072,8 +1051,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1105,6 +1083,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1136,7 +1115,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1162,8 +1140,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1194,7 +1172,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1225,7 +1202,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1254,7 +1230,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1265,8 +1240,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1298,6 +1272,7 @@ "ctxt": 0 }, "value": "b4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1329,7 +1304,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1355,8 +1329,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1406,8 +1380,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1439,6 +1412,7 @@ "ctxt": 0 }, "value": "a5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1470,7 +1444,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1484,6 +1457,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1506,13 +1480,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1522,6 +1494,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1544,13 +1517,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1575,7 +1546,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1604,7 +1574,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1615,8 +1584,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1648,6 +1616,7 @@ "ctxt": 0 }, "value": "b5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1679,7 +1648,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1693,6 +1661,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1709,8 +1678,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1720,6 +1688,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1736,8 +1705,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -1761,8 +1729,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1794,6 +1761,7 @@ "ctxt": 0 }, "value": "a6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1825,7 +1793,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1839,6 +1806,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1861,13 +1829,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1877,6 +1843,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1899,13 +1866,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1930,7 +1895,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1959,7 +1923,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1980,7 +1943,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1998,7 +1960,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2010,8 +1971,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2043,6 +2003,7 @@ "ctxt": 0 }, "value": "b6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2074,7 +2035,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2088,6 +2048,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2110,13 +2071,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2126,6 +2085,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2148,13 +2108,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -2179,7 +2137,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2189,8 +2146,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2222,8 +2178,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2241,7 +2197,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2252,7 +2207,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -2285,8 +2239,8 @@ "ctxt": 0 }, "value": "r1a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2304,7 +2258,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2315,7 +2268,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -2348,8 +2300,8 @@ "ctxt": 0 }, "value": "r1a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2367,7 +2319,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2378,7 +2329,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -2411,8 +2361,8 @@ "ctxt": 0 }, "value": "r1a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2430,7 +2380,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -2441,7 +2390,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -2474,8 +2422,8 @@ "ctxt": 0 }, "value": "r1a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2493,7 +2441,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -2504,7 +2451,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -2537,8 +2483,8 @@ "ctxt": 0 }, "value": "r1a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2556,7 +2502,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -2567,7 +2512,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -2600,8 +2544,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2619,7 +2563,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2630,7 +2573,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -2663,8 +2605,8 @@ "ctxt": 0 }, "value": "r1b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2682,7 +2624,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2693,7 +2634,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -2726,8 +2666,8 @@ "ctxt": 0 }, "value": "r1b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2745,7 +2685,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2756,7 +2695,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -2789,8 +2727,8 @@ "ctxt": 0 }, "value": "r1b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2808,7 +2746,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -2819,7 +2756,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -2852,8 +2788,8 @@ "ctxt": 0 }, "value": "r1b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2871,7 +2807,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -2882,7 +2817,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -2915,8 +2849,8 @@ "ctxt": 0 }, "value": "r1b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2934,7 +2868,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -2945,7 +2878,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -2978,8 +2910,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2997,7 +2929,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3008,7 +2939,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -3041,8 +2971,8 @@ "ctxt": 0 }, "value": "r2a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3060,7 +2990,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3071,7 +3000,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -3104,8 +3032,8 @@ "ctxt": 0 }, "value": "r2a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3123,7 +3051,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3134,7 +3061,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -3167,8 +3093,8 @@ "ctxt": 0 }, "value": "r2a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3186,7 +3112,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3197,7 +3122,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -3230,8 +3154,8 @@ "ctxt": 0 }, "value": "r2a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3249,7 +3173,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -3260,7 +3183,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -3293,8 +3215,8 @@ "ctxt": 0 }, "value": "r2a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3312,7 +3234,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -3323,7 +3244,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -3356,8 +3276,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3375,7 +3295,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3386,7 +3305,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -3419,8 +3337,8 @@ "ctxt": 0 }, "value": "r2b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3438,7 +3356,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3449,7 +3366,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -3482,8 +3398,8 @@ "ctxt": 0 }, "value": "r2b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3501,7 +3417,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3512,7 +3427,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -3545,8 +3459,8 @@ "ctxt": 0 }, "value": "r2b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3564,7 +3478,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3575,7 +3488,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -3608,8 +3520,8 @@ "ctxt": 0 }, "value": "r2b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3627,7 +3539,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -3638,7 +3549,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -3671,8 +3581,8 @@ "ctxt": 0 }, "value": "r2b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3690,7 +3600,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -3701,7 +3610,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -3734,8 +3642,8 @@ "ctxt": 0 }, "value": "r3a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3753,7 +3661,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3764,7 +3671,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -3797,8 +3703,8 @@ "ctxt": 0 }, "value": "r3a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3816,7 +3722,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3827,7 +3732,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -3860,8 +3764,8 @@ "ctxt": 0 }, "value": "r3a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3879,7 +3783,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3890,7 +3793,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -3923,8 +3825,8 @@ "ctxt": 0 }, "value": "r3a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3942,7 +3844,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3953,7 +3854,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -3986,8 +3886,8 @@ "ctxt": 0 }, "value": "r3a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4005,7 +3905,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -4016,7 +3915,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -4049,8 +3947,8 @@ "ctxt": 0 }, "value": "r3a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4068,7 +3966,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -4079,7 +3976,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -4112,8 +4008,8 @@ "ctxt": 0 }, "value": "r3b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4131,7 +4027,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4142,7 +4037,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -4175,8 +4069,8 @@ "ctxt": 0 }, "value": "r3b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4194,7 +4088,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4205,7 +4098,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -4238,8 +4130,8 @@ "ctxt": 0 }, "value": "r3b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4257,7 +4149,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4268,7 +4159,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -4301,8 +4191,8 @@ "ctxt": 0 }, "value": "r3b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4320,7 +4210,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4331,7 +4220,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -4364,8 +4252,8 @@ "ctxt": 0 }, "value": "r3b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4383,7 +4271,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -4394,7 +4281,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -4427,8 +4313,8 @@ "ctxt": 0 }, "value": "r3b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4446,7 +4332,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -4457,7 +4342,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -4490,8 +4374,8 @@ "ctxt": 0 }, "value": "r4a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4509,7 +4393,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4520,7 +4403,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -4553,8 +4435,8 @@ "ctxt": 0 }, "value": "r4a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4572,7 +4454,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4583,7 +4464,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -4616,8 +4496,8 @@ "ctxt": 0 }, "value": "r4a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4635,7 +4515,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4646,7 +4525,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -4679,8 +4557,8 @@ "ctxt": 0 }, "value": "r4a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4698,7 +4576,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4709,7 +4586,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -4742,8 +4618,8 @@ "ctxt": 0 }, "value": "r4a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4761,7 +4637,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -4772,7 +4647,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -4805,8 +4679,8 @@ "ctxt": 0 }, "value": "r4a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4824,7 +4698,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -4835,7 +4708,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -4868,8 +4740,8 @@ "ctxt": 0 }, "value": "r4b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4887,7 +4759,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4898,7 +4769,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -4931,8 +4801,8 @@ "ctxt": 0 }, "value": "r4b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4950,7 +4820,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4961,7 +4830,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -4994,8 +4862,8 @@ "ctxt": 0 }, "value": "r4b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5013,7 +4881,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -5024,7 +4891,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -5057,8 +4923,8 @@ "ctxt": 0 }, "value": "r4b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5076,7 +4942,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -5087,7 +4952,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -5120,8 +4984,8 @@ "ctxt": 0 }, "value": "r4b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5139,7 +5003,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -5150,7 +5013,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -5183,8 +5045,8 @@ "ctxt": 0 }, "value": "r4b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5202,7 +5064,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -5213,7 +5074,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -5246,8 +5106,8 @@ "ctxt": 0 }, "value": "r5a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5265,7 +5125,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -5276,7 +5135,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -5309,8 +5167,8 @@ "ctxt": 0 }, "value": "r5a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5328,7 +5186,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -5339,7 +5196,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -5372,8 +5228,8 @@ "ctxt": 0 }, "value": "r5a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5391,7 +5247,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -5402,7 +5257,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -5435,8 +5289,8 @@ "ctxt": 0 }, "value": "r5a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5454,7 +5308,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -5465,7 +5318,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -5498,8 +5350,8 @@ "ctxt": 0 }, "value": "r5a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5517,7 +5369,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -5528,7 +5379,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -5561,8 +5411,8 @@ "ctxt": 0 }, "value": "r5a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5580,7 +5430,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -5591,7 +5440,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -5624,8 +5472,8 @@ "ctxt": 0 }, "value": "r5b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5643,7 +5491,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -5654,7 +5501,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -5687,8 +5533,8 @@ "ctxt": 0 }, "value": "r5b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5706,7 +5552,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -5717,7 +5562,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -5750,8 +5594,8 @@ "ctxt": 0 }, "value": "r5b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5769,7 +5613,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -5780,7 +5623,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -5813,8 +5655,8 @@ "ctxt": 0 }, "value": "r5b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5832,7 +5674,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -5843,7 +5684,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -5876,8 +5716,8 @@ "ctxt": 0 }, "value": "r5b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5895,7 +5735,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -5906,7 +5745,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -5939,8 +5777,8 @@ "ctxt": 0 }, "value": "r5b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5958,7 +5796,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -5969,7 +5806,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -6002,8 +5838,8 @@ "ctxt": 0 }, "value": "r6a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6021,7 +5857,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -6032,7 +5867,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -6065,8 +5899,8 @@ "ctxt": 0 }, "value": "r6a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6084,7 +5918,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -6095,7 +5928,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -6128,8 +5960,8 @@ "ctxt": 0 }, "value": "r6a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6147,7 +5979,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -6158,7 +5989,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -6191,8 +6021,8 @@ "ctxt": 0 }, "value": "r6a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6210,7 +6040,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -6221,7 +6050,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -6254,8 +6082,8 @@ "ctxt": 0 }, "value": "r6a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6273,7 +6101,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -6284,7 +6111,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -6317,8 +6143,8 @@ "ctxt": 0 }, "value": "r6a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6336,7 +6162,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -6347,7 +6172,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -6380,8 +6204,8 @@ "ctxt": 0 }, "value": "r6b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6399,7 +6223,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -6410,7 +6233,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -6443,8 +6265,8 @@ "ctxt": 0 }, "value": "r6b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6462,7 +6284,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -6473,7 +6294,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -6506,8 +6326,8 @@ "ctxt": 0 }, "value": "r6b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6525,7 +6345,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -6536,7 +6355,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -6569,8 +6387,8 @@ "ctxt": 0 }, "value": "r6b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6588,7 +6406,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -6599,7 +6416,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -6632,8 +6448,8 @@ "ctxt": 0 }, "value": "r6b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6651,7 +6467,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -6662,7 +6477,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -6695,8 +6509,8 @@ "ctxt": 0 }, "value": "r6b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6714,7 +6528,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -6725,7 +6538,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -6758,8 +6570,8 @@ "ctxt": 0 }, "value": "r7a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6777,7 +6589,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -6788,7 +6599,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -6821,8 +6631,8 @@ "ctxt": 0 }, "value": "r7a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6840,7 +6650,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -6851,7 +6660,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -6884,8 +6692,8 @@ "ctxt": 0 }, "value": "r7a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6903,7 +6711,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -6914,7 +6721,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -6947,8 +6753,8 @@ "ctxt": 0 }, "value": "r7a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6966,7 +6772,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -6977,7 +6782,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -7010,8 +6814,8 @@ "ctxt": 0 }, "value": "r7a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7029,7 +6833,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -7040,7 +6843,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -7073,8 +6875,8 @@ "ctxt": 0 }, "value": "r7a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7092,7 +6894,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -7103,7 +6904,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -7136,8 +6936,8 @@ "ctxt": 0 }, "value": "r7b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7155,7 +6955,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -7166,7 +6965,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -7199,8 +6997,8 @@ "ctxt": 0 }, "value": "r7b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7218,7 +7016,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -7229,7 +7026,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -7262,8 +7058,8 @@ "ctxt": 0 }, "value": "r7b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7281,7 +7077,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -7292,7 +7087,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -7325,8 +7119,8 @@ "ctxt": 0 }, "value": "r7b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7344,7 +7138,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -7355,7 +7148,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -7388,8 +7180,8 @@ "ctxt": 0 }, "value": "r7b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7407,7 +7199,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -7418,7 +7209,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -7451,8 +7241,8 @@ "ctxt": 0 }, "value": "r7b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7470,7 +7260,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -7481,7 +7270,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -7514,8 +7302,8 @@ "ctxt": 0 }, "value": "r8a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7533,7 +7321,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -7544,7 +7331,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -7577,8 +7363,8 @@ "ctxt": 0 }, "value": "r8a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7596,7 +7382,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -7607,7 +7392,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -7640,8 +7424,8 @@ "ctxt": 0 }, "value": "r8a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7659,7 +7443,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -7670,7 +7453,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -7703,8 +7485,8 @@ "ctxt": 0 }, "value": "r8a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7722,7 +7504,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -7733,7 +7514,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -7766,8 +7546,8 @@ "ctxt": 0 }, "value": "r8a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7785,7 +7565,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -7796,7 +7575,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -7829,8 +7607,8 @@ "ctxt": 0 }, "value": "r8a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7848,7 +7626,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -7859,7 +7636,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -7892,8 +7668,8 @@ "ctxt": 0 }, "value": "r8b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7911,7 +7687,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -7922,7 +7697,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -7955,8 +7729,8 @@ "ctxt": 0 }, "value": "r8b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7974,7 +7748,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -7985,7 +7758,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -8018,8 +7790,8 @@ "ctxt": 0 }, "value": "r8b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8037,7 +7809,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -8048,7 +7819,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -8081,8 +7851,8 @@ "ctxt": 0 }, "value": "r8b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8100,7 +7870,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -8111,7 +7880,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -8144,8 +7912,8 @@ "ctxt": 0 }, "value": "r8b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8163,7 +7931,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -8174,7 +7941,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -8207,8 +7973,8 @@ "ctxt": 0 }, "value": "r8b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8226,7 +7992,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -8237,7 +8002,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature/input.ts.json index c75f5f384037..978b3e4f06ae 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -263,6 +256,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -294,6 +288,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -316,13 +311,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -347,7 +340,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -376,7 +368,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -387,8 +378,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -420,6 +410,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -464,8 +455,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -497,6 +487,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -528,6 +519,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -550,13 +542,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -581,7 +571,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -610,7 +599,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -621,8 +609,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -654,6 +641,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -685,6 +673,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -701,8 +690,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -726,8 +714,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -759,6 +746,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -790,6 +778,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -812,13 +801,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnnotation": { @@ -843,7 +830,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -872,7 +858,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -883,8 +868,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -916,6 +900,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -947,6 +932,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -963,8 +949,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -988,8 +973,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1021,6 +1005,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1064,8 +1049,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1096,7 +1081,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1127,7 +1111,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1156,7 +1139,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1167,8 +1149,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1200,6 +1181,7 @@ "ctxt": 0 }, "value": "b4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1243,8 +1225,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1294,8 +1276,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1327,6 +1308,7 @@ "ctxt": 0 }, "value": "a5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1358,6 +1340,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1380,13 +1363,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1396,6 +1377,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1418,13 +1400,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1449,7 +1429,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1478,7 +1457,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1489,8 +1467,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1522,6 +1499,7 @@ "ctxt": 0 }, "value": "b5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1553,6 +1531,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1569,8 +1548,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1580,6 +1558,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1596,8 +1575,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1621,8 +1599,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1654,6 +1631,7 @@ "ctxt": 0 }, "value": "a6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1685,6 +1663,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1707,13 +1686,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1723,6 +1700,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1745,13 +1723,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1776,7 +1752,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1805,7 +1780,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1826,7 +1800,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1844,7 +1817,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1856,8 +1828,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1889,6 +1860,7 @@ "ctxt": 0 }, "value": "b6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1920,6 +1892,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1942,13 +1915,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1958,6 +1929,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1980,13 +1952,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2011,7 +1981,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2021,8 +1990,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2054,8 +2022,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2073,7 +2041,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2084,7 +2051,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -2117,8 +2083,8 @@ "ctxt": 0 }, "value": "r1a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2136,7 +2102,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2147,7 +2112,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -2180,8 +2144,8 @@ "ctxt": 0 }, "value": "r1a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2199,7 +2163,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2210,7 +2173,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -2243,8 +2205,8 @@ "ctxt": 0 }, "value": "r1a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2262,7 +2224,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -2273,7 +2234,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -2306,8 +2266,8 @@ "ctxt": 0 }, "value": "r1a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2325,7 +2285,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -2336,7 +2295,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -2369,8 +2327,8 @@ "ctxt": 0 }, "value": "r1a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2388,7 +2346,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -2399,7 +2356,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -2432,8 +2388,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2451,7 +2407,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2462,7 +2417,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -2495,8 +2449,8 @@ "ctxt": 0 }, "value": "r1b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2514,7 +2468,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2525,7 +2478,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -2558,8 +2510,8 @@ "ctxt": 0 }, "value": "r1b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2577,7 +2529,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2588,7 +2539,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -2621,8 +2571,8 @@ "ctxt": 0 }, "value": "r1b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2640,7 +2590,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -2651,7 +2600,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -2684,8 +2632,8 @@ "ctxt": 0 }, "value": "r1b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2703,7 +2651,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -2714,7 +2661,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -2747,8 +2693,8 @@ "ctxt": 0 }, "value": "r1b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2766,7 +2712,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -2777,7 +2722,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -2810,8 +2754,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2829,7 +2773,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2840,7 +2783,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -2873,8 +2815,8 @@ "ctxt": 0 }, "value": "r2a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2892,7 +2834,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2903,7 +2844,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -2936,8 +2876,8 @@ "ctxt": 0 }, "value": "r2a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2955,7 +2895,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2966,7 +2905,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -2999,8 +2937,8 @@ "ctxt": 0 }, "value": "r2a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3018,7 +2956,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3029,7 +2966,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -3062,8 +2998,8 @@ "ctxt": 0 }, "value": "r2a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3081,7 +3017,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -3092,7 +3027,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -3125,8 +3059,8 @@ "ctxt": 0 }, "value": "r2a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3144,7 +3078,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -3155,7 +3088,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -3188,8 +3120,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3207,7 +3139,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3218,7 +3149,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -3251,8 +3181,8 @@ "ctxt": 0 }, "value": "r2b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3270,7 +3200,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3281,7 +3210,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -3314,8 +3242,8 @@ "ctxt": 0 }, "value": "r2b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3333,7 +3261,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3344,7 +3271,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -3377,8 +3303,8 @@ "ctxt": 0 }, "value": "r2b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3396,7 +3322,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3407,7 +3332,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -3440,8 +3364,8 @@ "ctxt": 0 }, "value": "r2b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3459,7 +3383,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -3470,7 +3393,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -3503,8 +3425,8 @@ "ctxt": 0 }, "value": "r2b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3522,7 +3444,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -3533,7 +3454,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -3566,8 +3486,8 @@ "ctxt": 0 }, "value": "r3a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3585,7 +3505,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3596,7 +3515,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -3629,8 +3547,8 @@ "ctxt": 0 }, "value": "r3a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3648,7 +3566,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3659,7 +3576,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -3692,8 +3608,8 @@ "ctxt": 0 }, "value": "r3a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3711,7 +3627,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3722,7 +3637,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -3755,8 +3669,8 @@ "ctxt": 0 }, "value": "r3a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3774,7 +3688,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3785,7 +3698,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -3818,8 +3730,8 @@ "ctxt": 0 }, "value": "r3a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3837,7 +3749,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -3848,7 +3759,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -3881,8 +3791,8 @@ "ctxt": 0 }, "value": "r3a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3900,7 +3810,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -3911,7 +3820,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -3944,8 +3852,8 @@ "ctxt": 0 }, "value": "r3b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3963,7 +3871,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3974,7 +3881,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -4007,8 +3913,8 @@ "ctxt": 0 }, "value": "r3b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4026,7 +3932,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4037,7 +3942,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -4070,8 +3974,8 @@ "ctxt": 0 }, "value": "r3b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4089,7 +3993,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4100,7 +4003,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -4133,8 +4035,8 @@ "ctxt": 0 }, "value": "r3b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4152,7 +4054,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4163,7 +4064,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -4196,8 +4096,8 @@ "ctxt": 0 }, "value": "r3b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4215,7 +4115,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -4226,7 +4125,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -4259,8 +4157,8 @@ "ctxt": 0 }, "value": "r3b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4278,7 +4176,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -4289,7 +4186,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -4322,8 +4218,8 @@ "ctxt": 0 }, "value": "r4a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4341,7 +4237,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4352,7 +4247,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -4385,8 +4279,8 @@ "ctxt": 0 }, "value": "r4a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4404,7 +4298,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4415,7 +4308,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -4448,8 +4340,8 @@ "ctxt": 0 }, "value": "r4a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4467,7 +4359,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4478,7 +4369,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -4511,8 +4401,8 @@ "ctxt": 0 }, "value": "r4a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4530,7 +4420,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4541,7 +4430,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -4574,8 +4462,8 @@ "ctxt": 0 }, "value": "r4a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4593,7 +4481,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -4604,7 +4491,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -4637,8 +4523,8 @@ "ctxt": 0 }, "value": "r4a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4656,7 +4542,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -4667,7 +4552,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -4700,8 +4584,8 @@ "ctxt": 0 }, "value": "r4b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4719,7 +4603,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4730,7 +4613,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -4763,8 +4645,8 @@ "ctxt": 0 }, "value": "r4b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4782,7 +4664,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4793,7 +4674,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -4826,8 +4706,8 @@ "ctxt": 0 }, "value": "r4b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4845,7 +4725,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4856,7 +4735,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -4889,8 +4767,8 @@ "ctxt": 0 }, "value": "r4b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4908,7 +4786,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4919,7 +4796,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -4952,8 +4828,8 @@ "ctxt": 0 }, "value": "r4b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4971,7 +4847,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -4982,7 +4857,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -5015,8 +4889,8 @@ "ctxt": 0 }, "value": "r4b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5034,7 +4908,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -5045,7 +4918,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -5078,8 +4950,8 @@ "ctxt": 0 }, "value": "r5a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5097,7 +4969,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -5108,7 +4979,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -5141,8 +5011,8 @@ "ctxt": 0 }, "value": "r5a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5160,7 +5030,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -5171,7 +5040,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -5204,8 +5072,8 @@ "ctxt": 0 }, "value": "r5a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5223,7 +5091,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -5234,7 +5101,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -5267,8 +5133,8 @@ "ctxt": 0 }, "value": "r5a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5286,7 +5152,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -5297,7 +5162,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -5330,8 +5194,8 @@ "ctxt": 0 }, "value": "r5a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5349,7 +5213,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -5360,7 +5223,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -5393,8 +5255,8 @@ "ctxt": 0 }, "value": "r5a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5412,7 +5274,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -5423,7 +5284,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -5456,8 +5316,8 @@ "ctxt": 0 }, "value": "r5b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5475,7 +5335,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -5486,7 +5345,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -5519,8 +5377,8 @@ "ctxt": 0 }, "value": "r5b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5538,7 +5396,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -5549,7 +5406,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -5582,8 +5438,8 @@ "ctxt": 0 }, "value": "r5b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5601,7 +5457,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -5612,7 +5467,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -5645,8 +5499,8 @@ "ctxt": 0 }, "value": "r5b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5664,7 +5518,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -5675,7 +5528,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -5708,8 +5560,8 @@ "ctxt": 0 }, "value": "r5b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5727,7 +5579,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -5738,7 +5589,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -5771,8 +5621,8 @@ "ctxt": 0 }, "value": "r5b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5790,7 +5640,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -5801,7 +5650,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -5834,8 +5682,8 @@ "ctxt": 0 }, "value": "r6a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5853,7 +5701,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -5864,7 +5711,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -5897,8 +5743,8 @@ "ctxt": 0 }, "value": "r6a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5916,7 +5762,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -5927,7 +5772,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -5960,8 +5804,8 @@ "ctxt": 0 }, "value": "r6a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5979,7 +5823,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -5990,7 +5833,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -6023,8 +5865,8 @@ "ctxt": 0 }, "value": "r6a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6042,7 +5884,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -6053,7 +5894,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -6086,8 +5926,8 @@ "ctxt": 0 }, "value": "r6a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6105,7 +5945,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -6116,7 +5955,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -6149,8 +5987,8 @@ "ctxt": 0 }, "value": "r6a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6168,7 +6006,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -6179,7 +6016,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -6212,8 +6048,8 @@ "ctxt": 0 }, "value": "r6b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6231,7 +6067,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -6242,7 +6077,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -6275,8 +6109,8 @@ "ctxt": 0 }, "value": "r6b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6294,7 +6128,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -6305,7 +6138,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -6338,8 +6170,8 @@ "ctxt": 0 }, "value": "r6b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6357,7 +6189,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -6368,7 +6199,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -6401,8 +6231,8 @@ "ctxt": 0 }, "value": "r6b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6420,7 +6250,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -6431,7 +6260,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -6464,8 +6292,8 @@ "ctxt": 0 }, "value": "r6b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6483,7 +6311,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -6494,7 +6321,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -6527,8 +6353,8 @@ "ctxt": 0 }, "value": "r6b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6546,7 +6372,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -6557,7 +6382,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -6590,8 +6414,8 @@ "ctxt": 0 }, "value": "r7a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6609,7 +6433,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -6620,7 +6443,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -6653,8 +6475,8 @@ "ctxt": 0 }, "value": "r7a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6672,7 +6494,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -6683,7 +6504,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -6716,8 +6536,8 @@ "ctxt": 0 }, "value": "r7a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6735,7 +6555,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -6746,7 +6565,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -6779,8 +6597,8 @@ "ctxt": 0 }, "value": "r7a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6798,7 +6616,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -6809,7 +6626,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -6842,8 +6658,8 @@ "ctxt": 0 }, "value": "r7a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6861,7 +6677,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -6872,7 +6687,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -6905,8 +6719,8 @@ "ctxt": 0 }, "value": "r7a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6924,7 +6738,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -6935,7 +6748,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -6968,8 +6780,8 @@ "ctxt": 0 }, "value": "r7b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6987,7 +6799,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -6998,7 +6809,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -7031,8 +6841,8 @@ "ctxt": 0 }, "value": "r7b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7050,7 +6860,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -7061,7 +6870,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -7094,8 +6902,8 @@ "ctxt": 0 }, "value": "r7b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7113,7 +6921,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -7124,7 +6931,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -7157,8 +6963,8 @@ "ctxt": 0 }, "value": "r7b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7176,7 +6982,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -7187,7 +6992,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -7220,8 +7024,8 @@ "ctxt": 0 }, "value": "r7b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7239,7 +7043,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -7250,7 +7053,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -7283,8 +7085,8 @@ "ctxt": 0 }, "value": "r7b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7302,7 +7104,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -7313,7 +7114,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -7346,8 +7146,8 @@ "ctxt": 0 }, "value": "r8a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7365,7 +7165,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -7376,7 +7175,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -7409,8 +7207,8 @@ "ctxt": 0 }, "value": "r8a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7428,7 +7226,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -7439,7 +7236,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -7472,8 +7268,8 @@ "ctxt": 0 }, "value": "r8a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7491,7 +7287,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -7502,7 +7297,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -7535,8 +7329,8 @@ "ctxt": 0 }, "value": "r8a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7554,7 +7348,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -7565,7 +7358,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -7598,8 +7390,8 @@ "ctxt": 0 }, "value": "r8a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7617,7 +7409,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -7628,7 +7419,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -7661,8 +7451,8 @@ "ctxt": 0 }, "value": "r8a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7680,7 +7470,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -7691,7 +7480,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -7724,8 +7512,8 @@ "ctxt": 0 }, "value": "r8b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7743,7 +7531,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -7754,7 +7541,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -7787,8 +7573,8 @@ "ctxt": 0 }, "value": "r8b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7806,7 +7592,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -7817,7 +7602,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -7850,8 +7634,8 @@ "ctxt": 0 }, "value": "r8b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7869,7 +7653,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -7880,7 +7663,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -7913,8 +7695,8 @@ "ctxt": 0 }, "value": "r8b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7932,7 +7714,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -7943,7 +7724,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -7976,8 +7756,8 @@ "ctxt": 0 }, "value": "r8b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7995,7 +7775,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -8006,7 +7785,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -8039,8 +7817,8 @@ "ctxt": 0 }, "value": "r8b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8058,7 +7836,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -8069,7 +7846,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty/input.ts.json index c33942b77bd2..310a427ab83e 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnOptionalProperty/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -125,7 +122,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -179,6 +175,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -201,13 +198,11 @@ "ctxt": 0 }, "value": "A1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -239,6 +234,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -261,13 +257,11 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -299,8 +293,8 @@ "ctxt": 0 }, "value": "ra1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -318,7 +312,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -329,7 +322,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -362,8 +354,8 @@ "ctxt": 0 }, "value": "ra2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -381,7 +373,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -392,7 +383,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -425,8 +415,8 @@ "ctxt": 0 }, "value": "rb1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -444,7 +434,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -455,7 +444,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -488,8 +476,8 @@ "ctxt": 0 }, "value": "rb2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -507,7 +495,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -518,7 +505,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -551,8 +537,8 @@ "ctxt": 0 }, "value": "rc1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -570,7 +556,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -581,7 +566,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -614,8 +598,8 @@ "ctxt": 0 }, "value": "rc2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -633,7 +617,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -644,7 +627,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -677,8 +659,8 @@ "ctxt": 0 }, "value": "rd1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -696,7 +678,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -707,7 +688,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -740,8 +720,8 @@ "ctxt": 0 }, "value": "rd2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -759,7 +739,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -770,7 +749,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -803,8 +781,8 @@ "ctxt": 0 }, "value": "re1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -822,7 +800,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -833,7 +810,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -866,8 +842,8 @@ "ctxt": 0 }, "value": "re2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -885,7 +861,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -896,7 +871,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -929,8 +903,8 @@ "ctxt": 0 }, "value": "rf1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -948,7 +922,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -959,7 +932,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -992,8 +964,8 @@ "ctxt": 0 }, "value": "rf2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1011,7 +983,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1022,7 +993,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1055,8 +1025,8 @@ "ctxt": 0 }, "value": "rg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1074,7 +1044,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1085,7 +1054,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1118,8 +1086,8 @@ "ctxt": 0 }, "value": "rg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1137,7 +1105,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1148,7 +1115,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1181,8 +1147,8 @@ "ctxt": 0 }, "value": "rh1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1200,7 +1166,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1211,7 +1176,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1244,8 +1208,8 @@ "ctxt": 0 }, "value": "rh2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1263,7 +1227,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1274,7 +1237,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnProperty/input.ts.json index afa4c703f530..84352f263f30 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnProperty/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -238,7 +232,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -264,7 +257,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -327,6 +319,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -349,13 +342,11 @@ "ctxt": 0 }, "value": "A1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -387,6 +378,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -409,13 +401,11 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -447,6 +437,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -469,13 +460,11 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -507,6 +496,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -529,13 +519,11 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -567,8 +555,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -586,7 +574,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -597,7 +584,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -630,8 +616,8 @@ "ctxt": 0 }, "value": "r1a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -649,7 +635,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -660,7 +645,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -693,8 +677,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -712,7 +696,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -723,7 +706,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -756,8 +738,8 @@ "ctxt": 0 }, "value": "r1b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -775,7 +757,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -786,7 +767,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -819,8 +799,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -838,7 +818,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -849,7 +828,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -882,8 +860,8 @@ "ctxt": 0 }, "value": "r2a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -901,7 +879,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -912,7 +889,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -945,8 +921,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -964,7 +940,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -975,7 +950,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -1008,8 +982,8 @@ "ctxt": 0 }, "value": "r2b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1027,7 +1001,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1038,7 +1011,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -1071,8 +1043,8 @@ "ctxt": 0 }, "value": "r3a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1090,7 +1062,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1101,7 +1072,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -1134,8 +1104,8 @@ "ctxt": 0 }, "value": "r3a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1153,7 +1123,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1164,7 +1133,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -1197,8 +1165,8 @@ "ctxt": 0 }, "value": "r3b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1216,7 +1184,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1227,7 +1194,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -1260,8 +1226,8 @@ "ctxt": 0 }, "value": "r3b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1279,7 +1245,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1290,7 +1255,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -1323,8 +1287,8 @@ "ctxt": 0 }, "value": "r4a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1342,7 +1306,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1353,7 +1316,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -1386,8 +1348,8 @@ "ctxt": 0 }, "value": "r4a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1405,7 +1367,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1416,7 +1377,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -1449,8 +1409,8 @@ "ctxt": 0 }, "value": "r4b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1468,7 +1428,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1479,7 +1438,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -1512,8 +1470,8 @@ "ctxt": 0 }, "value": "r4b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1531,7 +1489,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1542,7 +1499,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -1575,8 +1531,8 @@ "ctxt": 0 }, "value": "r5a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1594,7 +1550,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1605,7 +1560,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -1638,8 +1592,8 @@ "ctxt": 0 }, "value": "r5a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1657,7 +1611,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1668,7 +1621,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -1701,8 +1653,8 @@ "ctxt": 0 }, "value": "r5b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1720,7 +1672,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1731,7 +1682,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -1764,8 +1714,8 @@ "ctxt": 0 }, "value": "r5b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1783,7 +1733,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1794,7 +1743,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -1827,8 +1775,8 @@ "ctxt": 0 }, "value": "r6a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1846,7 +1794,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1857,7 +1804,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -1890,8 +1836,8 @@ "ctxt": 0 }, "value": "r6a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1909,7 +1855,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1920,7 +1865,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -1953,8 +1897,8 @@ "ctxt": 0 }, "value": "r6b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1972,7 +1916,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1983,7 +1926,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -2016,8 +1958,8 @@ "ctxt": 0 }, "value": "r6b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2035,7 +1977,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2046,7 +1987,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -2079,8 +2019,8 @@ "ctxt": 0 }, "value": "r7a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2098,7 +2038,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2109,7 +2048,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -2142,8 +2080,8 @@ "ctxt": 0 }, "value": "r7a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2161,7 +2099,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2172,7 +2109,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -2205,8 +2141,8 @@ "ctxt": 0 }, "value": "r7b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2224,7 +2160,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2235,7 +2170,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -2268,8 +2202,8 @@ "ctxt": 0 }, "value": "r7b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2287,7 +2221,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2298,7 +2231,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -2331,8 +2263,8 @@ "ctxt": 0 }, "value": "r8a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2350,7 +2282,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2361,7 +2292,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -2394,8 +2324,8 @@ "ctxt": 0 }, "value": "r8a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2413,7 +2343,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2424,7 +2353,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -2457,8 +2385,8 @@ "ctxt": 0 }, "value": "r8b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2476,7 +2404,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2487,7 +2414,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -2520,8 +2446,8 @@ "ctxt": 0 }, "value": "r8b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2539,7 +2465,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2550,7 +2475,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipPrimitiveType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipPrimitiveType/input.ts.json index de116dbd91dc..c9520cc5f92a 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipPrimitiveType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipPrimitiveType/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -82,7 +79,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "init": null @@ -114,6 +110,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -130,8 +127,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -163,6 +159,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -179,8 +176,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -212,6 +208,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -228,8 +225,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -261,6 +257,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -277,8 +274,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -310,6 +306,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -332,13 +329,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -370,8 +365,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -389,7 +384,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -400,7 +394,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -433,8 +426,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -452,7 +445,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -463,7 +455,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -496,8 +487,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -515,7 +506,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -526,7 +516,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -559,8 +548,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -578,7 +567,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -589,7 +577,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -622,8 +609,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -641,7 +628,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -652,7 +638,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -685,8 +670,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -704,7 +689,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -715,7 +699,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -748,8 +731,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -767,7 +750,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -778,7 +760,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -811,8 +792,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -830,7 +811,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -841,7 +821,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -874,8 +853,8 @@ "ctxt": 0 }, "value": "r1c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -893,7 +872,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -904,7 +882,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -937,8 +914,8 @@ "ctxt": 0 }, "value": "r1c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -956,7 +933,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -967,7 +943,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1000,8 +975,8 @@ "ctxt": 0 }, "value": "r1c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1019,7 +994,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1030,7 +1004,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -1063,8 +1036,8 @@ "ctxt": 0 }, "value": "r1c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1082,7 +1055,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1093,7 +1065,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -1126,8 +1097,8 @@ "ctxt": 0 }, "value": "r1d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1145,7 +1116,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1156,7 +1126,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1189,8 +1158,8 @@ "ctxt": 0 }, "value": "r1d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1208,7 +1177,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1219,7 +1187,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1252,8 +1219,8 @@ "ctxt": 0 }, "value": "r1d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1271,7 +1238,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1282,7 +1248,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1315,8 +1280,8 @@ "ctxt": 0 }, "value": "r1d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1334,7 +1299,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1345,7 +1309,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -1378,8 +1341,8 @@ "ctxt": 0 }, "value": "r1e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1397,7 +1360,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -1408,7 +1370,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1441,8 +1402,8 @@ "ctxt": 0 }, "value": "r1e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1460,7 +1421,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -1471,7 +1431,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1504,8 +1463,8 @@ "ctxt": 0 }, "value": "r1e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1523,7 +1482,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -1534,7 +1492,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1567,8 +1524,8 @@ "ctxt": 0 }, "value": "r1e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1586,7 +1543,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -1597,7 +1553,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -1630,8 +1585,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1649,7 +1604,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1660,7 +1614,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1693,8 +1646,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1712,7 +1665,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1723,7 +1675,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1756,8 +1707,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1775,7 +1726,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1786,7 +1736,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -1819,8 +1768,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1838,7 +1787,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1849,7 +1797,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -1882,8 +1829,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1901,7 +1848,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1912,7 +1858,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1945,8 +1890,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1964,7 +1909,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1975,7 +1919,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -2008,8 +1951,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2027,7 +1970,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2038,7 +1980,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -2071,8 +2012,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2090,7 +2031,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2101,7 +2041,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -2134,8 +2073,8 @@ "ctxt": 0 }, "value": "r2c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2153,7 +2092,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -2164,7 +2102,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2197,8 +2134,8 @@ "ctxt": 0 }, "value": "r2c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2216,7 +2153,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -2227,7 +2163,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2260,8 +2195,8 @@ "ctxt": 0 }, "value": "r2c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2279,7 +2214,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -2290,7 +2224,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -2323,8 +2256,8 @@ "ctxt": 0 }, "value": "r2c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2342,7 +2275,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -2353,7 +2285,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -2386,8 +2317,8 @@ "ctxt": 0 }, "value": "r2d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2405,7 +2336,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -2416,7 +2346,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2449,8 +2378,8 @@ "ctxt": 0 }, "value": "r2d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2468,7 +2397,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -2479,7 +2407,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2512,8 +2439,8 @@ "ctxt": 0 }, "value": "r2d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2531,7 +2458,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -2542,7 +2468,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -2575,8 +2500,8 @@ "ctxt": 0 }, "value": "r2d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2594,7 +2519,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -2605,7 +2529,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -2638,8 +2561,8 @@ "ctxt": 0 }, "value": "r2e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2657,7 +2580,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -2668,7 +2590,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2701,8 +2622,8 @@ "ctxt": 0 }, "value": "r2e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2720,7 +2641,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -2731,7 +2651,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2764,8 +2683,8 @@ "ctxt": 0 }, "value": "r2e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2783,7 +2702,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -2794,7 +2712,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -2827,8 +2744,8 @@ "ctxt": 0 }, "value": "r2e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2846,7 +2763,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -2857,7 +2773,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -2890,8 +2805,8 @@ "ctxt": 0 }, "value": "r3a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2909,7 +2824,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2920,7 +2834,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2953,8 +2866,8 @@ "ctxt": 0 }, "value": "r3a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2972,7 +2885,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2983,7 +2895,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3016,8 +2927,8 @@ "ctxt": 0 }, "value": "r3a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3035,7 +2946,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3046,7 +2956,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -3079,8 +2988,8 @@ "ctxt": 0 }, "value": "r3a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3098,7 +3007,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3109,7 +3017,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -3142,8 +3049,8 @@ "ctxt": 0 }, "value": "r3b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3161,7 +3068,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3172,7 +3078,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3205,8 +3110,8 @@ "ctxt": 0 }, "value": "r3b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3224,7 +3129,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3235,7 +3139,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3268,8 +3171,8 @@ "ctxt": 0 }, "value": "r3b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3287,7 +3190,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3298,7 +3200,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -3331,8 +3232,8 @@ "ctxt": 0 }, "value": "r3b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3350,7 +3251,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3361,7 +3261,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -3394,8 +3293,8 @@ "ctxt": 0 }, "value": "r3c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3413,7 +3312,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3424,7 +3322,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3457,8 +3354,8 @@ "ctxt": 0 }, "value": "r3c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3476,7 +3373,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3487,7 +3383,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3520,8 +3415,8 @@ "ctxt": 0 }, "value": "r3c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3539,7 +3434,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3550,7 +3444,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -3583,8 +3476,8 @@ "ctxt": 0 }, "value": "r3c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3602,7 +3495,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3613,7 +3505,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -3646,8 +3537,8 @@ "ctxt": 0 }, "value": "r3d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3665,7 +3556,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -3676,7 +3566,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3709,8 +3598,8 @@ "ctxt": 0 }, "value": "r3d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3728,7 +3617,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -3739,7 +3627,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3772,8 +3659,8 @@ "ctxt": 0 }, "value": "r3d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3791,7 +3678,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -3802,7 +3688,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3835,8 +3720,8 @@ "ctxt": 0 }, "value": "r3d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3854,7 +3739,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -3865,7 +3749,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -3898,8 +3781,8 @@ "ctxt": 0 }, "value": "r3e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3917,7 +3800,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -3928,7 +3810,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3961,8 +3842,8 @@ "ctxt": 0 }, "value": "r3e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3980,7 +3861,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -3991,7 +3871,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4024,8 +3903,8 @@ "ctxt": 0 }, "value": "r3e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4043,7 +3922,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -4054,7 +3932,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -4087,8 +3964,8 @@ "ctxt": 0 }, "value": "r3e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4106,7 +3983,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -4117,7 +3993,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -4150,8 +4025,8 @@ "ctxt": 0 }, "value": "r4a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4169,7 +4044,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4180,7 +4054,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4213,8 +4086,8 @@ "ctxt": 0 }, "value": "r4a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4232,7 +4105,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4243,7 +4115,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -4276,8 +4147,8 @@ "ctxt": 0 }, "value": "r4a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4295,7 +4166,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4306,7 +4176,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -4339,8 +4208,8 @@ "ctxt": 0 }, "value": "r4a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4358,7 +4227,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4369,7 +4237,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -4402,8 +4269,8 @@ "ctxt": 0 }, "value": "r4b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4421,7 +4288,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4432,7 +4298,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4465,8 +4330,8 @@ "ctxt": 0 }, "value": "r4b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4484,7 +4349,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4495,7 +4359,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -4528,8 +4391,8 @@ "ctxt": 0 }, "value": "r4b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4547,7 +4410,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4558,7 +4420,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -4591,8 +4452,8 @@ "ctxt": 0 }, "value": "r4b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4610,7 +4471,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4621,7 +4481,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -4654,8 +4513,8 @@ "ctxt": 0 }, "value": "r4c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4673,7 +4532,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4684,7 +4542,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4717,8 +4574,8 @@ "ctxt": 0 }, "value": "r4c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4736,7 +4593,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4747,7 +4603,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4780,8 +4635,8 @@ "ctxt": 0 }, "value": "r4c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4799,7 +4654,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4810,7 +4664,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -4843,8 +4696,8 @@ "ctxt": 0 }, "value": "r4c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4862,7 +4715,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4873,7 +4725,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -4906,8 +4757,8 @@ "ctxt": 0 }, "value": "r4d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4925,7 +4776,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4936,7 +4786,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4969,8 +4818,8 @@ "ctxt": 0 }, "value": "r4d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4988,7 +4837,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4999,7 +4847,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -5032,8 +4879,8 @@ "ctxt": 0 }, "value": "r4d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5051,7 +4898,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -5062,7 +4908,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5095,8 +4940,8 @@ "ctxt": 0 }, "value": "r4d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5114,7 +4959,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -5125,7 +4969,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -5158,8 +5001,8 @@ "ctxt": 0 }, "value": "r4e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5177,7 +5020,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -5188,7 +5030,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -5221,8 +5062,8 @@ "ctxt": 0 }, "value": "r4e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5240,7 +5081,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -5251,7 +5091,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -5284,8 +5123,8 @@ "ctxt": 0 }, "value": "r4e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5303,7 +5142,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -5314,7 +5152,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5347,8 +5184,8 @@ "ctxt": 0 }, "value": "r4e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5366,7 +5203,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -5377,7 +5213,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -5410,8 +5245,8 @@ "ctxt": 0 }, "value": "r5a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5429,7 +5264,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -5440,7 +5274,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -5473,8 +5306,8 @@ "ctxt": 0 }, "value": "r5a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5492,7 +5325,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -5503,7 +5335,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5536,8 +5367,8 @@ "ctxt": 0 }, "value": "r5a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5555,7 +5386,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -5566,7 +5396,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -5599,8 +5428,8 @@ "ctxt": 0 }, "value": "r5a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5618,7 +5447,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -5629,7 +5457,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -5662,8 +5489,8 @@ "ctxt": 0 }, "value": "r5b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5681,7 +5508,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -5692,7 +5518,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -5725,8 +5550,8 @@ "ctxt": 0 }, "value": "r5b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5744,7 +5569,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -5755,7 +5579,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5788,8 +5611,8 @@ "ctxt": 0 }, "value": "r5b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5807,7 +5630,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -5818,7 +5640,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -5851,8 +5672,8 @@ "ctxt": 0 }, "value": "r5b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5870,7 +5691,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -5881,7 +5701,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -5914,8 +5733,8 @@ "ctxt": 0 }, "value": "r5c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5933,7 +5752,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -5944,7 +5762,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -5977,8 +5794,8 @@ "ctxt": 0 }, "value": "r5c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5996,7 +5813,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -6007,7 +5823,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -6040,8 +5855,8 @@ "ctxt": 0 }, "value": "r5c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6059,7 +5874,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -6070,7 +5884,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -6103,8 +5916,8 @@ "ctxt": 0 }, "value": "r5c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6122,7 +5935,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -6133,7 +5945,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -6166,8 +5977,8 @@ "ctxt": 0 }, "value": "r5d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6185,7 +5996,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -6196,7 +6006,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -6229,8 +6038,8 @@ "ctxt": 0 }, "value": "r5d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6248,7 +6057,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -6259,7 +6067,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -6292,8 +6099,8 @@ "ctxt": 0 }, "value": "r5d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6311,7 +6118,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -6322,7 +6128,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -6355,8 +6160,8 @@ "ctxt": 0 }, "value": "r5d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6374,7 +6179,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -6385,7 +6189,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -6418,8 +6221,8 @@ "ctxt": 0 }, "value": "r5e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6437,7 +6240,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -6448,7 +6250,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -6481,8 +6282,8 @@ "ctxt": 0 }, "value": "r5e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6500,7 +6301,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -6511,7 +6311,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -6544,8 +6343,8 @@ "ctxt": 0 }, "value": "r5e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6563,7 +6362,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -6574,7 +6372,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -6607,8 +6404,8 @@ "ctxt": 0 }, "value": "r5e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6626,7 +6423,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -6637,7 +6433,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -6670,8 +6465,8 @@ "ctxt": 0 }, "value": "r6a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6689,7 +6484,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -6700,7 +6494,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -6733,8 +6526,8 @@ "ctxt": 0 }, "value": "r6a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6752,7 +6545,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -6763,7 +6555,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -6796,8 +6587,8 @@ "ctxt": 0 }, "value": "r6a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6815,7 +6606,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -6826,7 +6616,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -6859,8 +6648,8 @@ "ctxt": 0 }, "value": "r6a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6878,7 +6667,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -6889,7 +6677,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -6922,8 +6709,8 @@ "ctxt": 0 }, "value": "r6b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6941,7 +6728,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -6952,7 +6738,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -6985,8 +6770,8 @@ "ctxt": 0 }, "value": "r6b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7004,7 +6789,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -7015,7 +6799,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -7048,8 +6831,8 @@ "ctxt": 0 }, "value": "r6b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7067,7 +6850,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -7078,7 +6860,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -7111,8 +6892,8 @@ "ctxt": 0 }, "value": "r6b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7130,7 +6911,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -7141,7 +6921,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -7174,8 +6953,8 @@ "ctxt": 0 }, "value": "r6c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7193,7 +6972,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -7204,7 +6982,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -7237,8 +7014,8 @@ "ctxt": 0 }, "value": "r6c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7256,7 +7033,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -7267,7 +7043,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -7300,8 +7075,8 @@ "ctxt": 0 }, "value": "r6c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7319,7 +7094,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -7330,7 +7104,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -7363,8 +7136,8 @@ "ctxt": 0 }, "value": "r6c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7382,7 +7155,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -7393,7 +7165,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -7426,8 +7197,8 @@ "ctxt": 0 }, "value": "r6d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7445,7 +7216,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -7456,7 +7226,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -7489,8 +7258,8 @@ "ctxt": 0 }, "value": "r6d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7508,7 +7277,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -7519,7 +7287,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -7552,8 +7319,8 @@ "ctxt": 0 }, "value": "r6d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7571,7 +7338,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -7582,7 +7348,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -7615,8 +7380,8 @@ "ctxt": 0 }, "value": "r6d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7634,7 +7399,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -7645,7 +7409,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -7678,8 +7441,8 @@ "ctxt": 0 }, "value": "r6e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7697,7 +7460,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -7708,7 +7470,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -7741,8 +7502,8 @@ "ctxt": 0 }, "value": "r6e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7760,7 +7521,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -7771,7 +7531,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -7804,8 +7563,8 @@ "ctxt": 0 }, "value": "r6e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7823,7 +7582,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -7834,7 +7592,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -7867,8 +7624,8 @@ "ctxt": 0 }, "value": "r6e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7886,7 +7643,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -7897,7 +7653,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -7930,8 +7685,8 @@ "ctxt": 0 }, "value": "r7a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7949,7 +7704,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -7960,7 +7714,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -7993,8 +7746,8 @@ "ctxt": 0 }, "value": "r7a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8012,7 +7765,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -8023,7 +7775,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -8056,8 +7807,8 @@ "ctxt": 0 }, "value": "r7a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8075,7 +7826,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -8086,7 +7836,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -8119,8 +7868,8 @@ "ctxt": 0 }, "value": "r7a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8138,7 +7887,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -8149,7 +7897,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -8182,8 +7929,8 @@ "ctxt": 0 }, "value": "r7b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8201,7 +7948,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -8212,7 +7958,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -8245,8 +7990,8 @@ "ctxt": 0 }, "value": "r7b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8264,7 +8009,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -8275,7 +8019,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -8308,8 +8051,8 @@ "ctxt": 0 }, "value": "r7b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8327,7 +8070,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -8338,7 +8080,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -8371,8 +8112,8 @@ "ctxt": 0 }, "value": "r7b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8390,7 +8131,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -8401,7 +8141,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -8434,8 +8173,8 @@ "ctxt": 0 }, "value": "r7c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8453,7 +8192,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -8464,7 +8202,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -8497,8 +8234,8 @@ "ctxt": 0 }, "value": "r7c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8516,7 +8253,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -8527,7 +8263,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -8560,8 +8295,8 @@ "ctxt": 0 }, "value": "r7c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8579,7 +8314,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -8590,7 +8324,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -8623,8 +8356,8 @@ "ctxt": 0 }, "value": "r7c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8642,7 +8375,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -8653,7 +8385,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -8686,8 +8417,8 @@ "ctxt": 0 }, "value": "r7d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8705,7 +8436,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -8716,7 +8446,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -8749,8 +8478,8 @@ "ctxt": 0 }, "value": "r7d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8768,7 +8497,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -8779,7 +8507,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -8812,8 +8539,8 @@ "ctxt": 0 }, "value": "r7d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8831,7 +8558,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -8842,7 +8568,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -8875,8 +8600,8 @@ "ctxt": 0 }, "value": "r7d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8894,7 +8619,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -8905,7 +8629,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -8938,8 +8661,8 @@ "ctxt": 0 }, "value": "r7e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8957,7 +8680,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -8968,7 +8690,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -9001,8 +8722,8 @@ "ctxt": 0 }, "value": "r7e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9020,7 +8741,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -9031,7 +8751,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -9064,8 +8783,8 @@ "ctxt": 0 }, "value": "r7e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9083,7 +8802,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -9094,7 +8812,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -9127,8 +8844,8 @@ "ctxt": 0 }, "value": "r7e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9146,7 +8863,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -9157,7 +8873,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -9190,8 +8905,8 @@ "ctxt": 0 }, "value": "r8a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9209,7 +8924,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -9220,7 +8934,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -9253,8 +8966,8 @@ "ctxt": 0 }, "value": "r8a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9272,7 +8985,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -9283,7 +8995,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -9316,8 +9027,8 @@ "ctxt": 0 }, "value": "r8a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9335,7 +9046,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -9346,7 +9056,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -9379,8 +9088,8 @@ "ctxt": 0 }, "value": "r8a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9398,7 +9107,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -9409,7 +9117,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -9442,8 +9149,8 @@ "ctxt": 0 }, "value": "r8b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9461,7 +9168,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -9472,7 +9178,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -9505,8 +9210,8 @@ "ctxt": 0 }, "value": "r8b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9524,7 +9229,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -9535,7 +9239,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -9568,8 +9271,8 @@ "ctxt": 0 }, "value": "r8b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9587,7 +9290,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -9598,7 +9300,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -9631,8 +9332,8 @@ "ctxt": 0 }, "value": "r8b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9650,7 +9351,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -9661,7 +9361,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -9694,8 +9393,8 @@ "ctxt": 0 }, "value": "r8c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9713,7 +9412,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -9724,7 +9422,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -9757,8 +9454,8 @@ "ctxt": 0 }, "value": "r8c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9776,7 +9473,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -9787,7 +9483,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -9820,8 +9515,8 @@ "ctxt": 0 }, "value": "r8c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9839,7 +9534,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -9850,7 +9544,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -9883,8 +9576,8 @@ "ctxt": 0 }, "value": "r8c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9902,7 +9595,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -9913,7 +9605,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -9946,8 +9637,8 @@ "ctxt": 0 }, "value": "r8d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9965,7 +9656,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -9976,7 +9666,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -10009,8 +9698,8 @@ "ctxt": 0 }, "value": "r8d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10028,7 +9717,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -10039,7 +9727,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -10072,8 +9759,8 @@ "ctxt": 0 }, "value": "r8d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10091,7 +9778,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -10102,7 +9788,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -10135,8 +9820,8 @@ "ctxt": 0 }, "value": "r8d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10154,7 +9839,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -10165,7 +9849,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -10198,8 +9881,8 @@ "ctxt": 0 }, "value": "r8e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10217,7 +9900,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -10228,7 +9910,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -10261,8 +9942,8 @@ "ctxt": 0 }, "value": "r8e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10280,7 +9961,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -10291,7 +9971,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -10324,8 +10003,8 @@ "ctxt": 0 }, "value": "r8e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10343,7 +10022,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -10354,7 +10032,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -10387,8 +10064,8 @@ "ctxt": 0 }, "value": "r8e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10406,7 +10083,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -10417,7 +10093,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipTypeParameter/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipTypeParameter/input.ts.json index cf72b3ec24cb..47a5dfaf7f63 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipTypeParameter/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipTypeParameter/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -82,7 +79,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "init": null @@ -114,6 +110,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -130,8 +127,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -163,6 +159,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -179,8 +176,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -212,6 +208,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -228,8 +225,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -261,6 +257,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -277,8 +274,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -310,6 +306,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -332,13 +329,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -370,6 +365,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -401,7 +397,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -429,8 +424,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -462,6 +456,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -486,8 +481,7 @@ "kind": "any" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -504,7 +498,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -525,6 +518,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -547,13 +541,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -572,6 +564,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -594,13 +587,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -643,8 +634,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -662,7 +653,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -673,7 +663,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -706,8 +695,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -725,7 +714,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -736,7 +724,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -769,8 +756,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -788,7 +775,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -799,7 +785,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -832,8 +817,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -851,7 +836,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -862,7 +846,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -895,8 +878,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -914,7 +897,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -925,7 +907,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -958,8 +939,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -977,7 +958,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -988,7 +968,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -1021,8 +1000,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1040,7 +1019,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1051,7 +1029,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -1084,8 +1061,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1103,7 +1080,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1114,7 +1090,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -1147,8 +1122,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1166,7 +1141,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1177,7 +1151,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1210,8 +1183,8 @@ "ctxt": 0 }, "value": "r1a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1229,7 +1202,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1240,7 +1212,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1273,8 +1244,8 @@ "ctxt": 0 }, "value": "r1a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1292,7 +1263,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1303,7 +1273,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1336,8 +1305,8 @@ "ctxt": 0 }, "value": "r1a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1355,7 +1324,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1366,7 +1334,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -1399,8 +1366,8 @@ "ctxt": 0 }, "value": "r1a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1418,7 +1385,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1429,7 +1395,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -1462,8 +1427,8 @@ "ctxt": 0 }, "value": "r1a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1481,7 +1446,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1492,7 +1456,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -1525,8 +1488,8 @@ "ctxt": 0 }, "value": "r1a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1544,7 +1507,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1555,7 +1517,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -1588,8 +1549,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1607,7 +1568,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1618,7 +1578,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1651,8 +1610,8 @@ "ctxt": 0 }, "value": "r1b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1670,7 +1629,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1681,7 +1639,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1714,8 +1671,8 @@ "ctxt": 0 }, "value": "r1b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1733,7 +1690,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1744,7 +1700,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1777,8 +1732,8 @@ "ctxt": 0 }, "value": "r1b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1796,7 +1751,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1807,7 +1761,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1840,8 +1793,8 @@ "ctxt": 0 }, "value": "r1b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1859,7 +1812,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -1870,7 +1822,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1903,8 +1854,8 @@ "ctxt": 0 }, "value": "r1b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1922,7 +1873,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -1933,7 +1883,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1966,8 +1915,8 @@ "ctxt": 0 }, "value": "r1b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1985,7 +1934,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -1996,7 +1944,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -2029,8 +1976,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2048,7 +1995,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2059,7 +2005,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2092,8 +2037,8 @@ "ctxt": 0 }, "value": "r2a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2111,7 +2056,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2122,7 +2066,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2155,8 +2098,8 @@ "ctxt": 0 }, "value": "r2a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2174,7 +2117,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2185,7 +2127,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -2218,8 +2159,8 @@ "ctxt": 0 }, "value": "r2a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2237,7 +2178,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2248,7 +2188,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -2281,8 +2220,8 @@ "ctxt": 0 }, "value": "r2a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2300,7 +2239,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2311,7 +2249,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -2344,8 +2281,8 @@ "ctxt": 0 }, "value": "r2a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2363,7 +2300,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2374,7 +2310,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -2407,8 +2342,8 @@ "ctxt": 0 }, "value": "r2a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2426,7 +2361,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2437,7 +2371,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -2470,8 +2403,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2489,7 +2422,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2500,7 +2432,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -2533,8 +2464,8 @@ "ctxt": 0 }, "value": "r2b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2552,7 +2483,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2563,7 +2493,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -2596,8 +2525,8 @@ "ctxt": 0 }, "value": "r2b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2615,7 +2544,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -2626,7 +2554,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -2659,8 +2586,8 @@ "ctxt": 0 }, "value": "r2b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2678,7 +2605,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -2689,7 +2615,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -2722,8 +2647,8 @@ "ctxt": 0 }, "value": "r2b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2741,7 +2666,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -2752,7 +2676,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -2785,8 +2708,8 @@ "ctxt": 0 }, "value": "r2b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2804,7 +2727,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -2815,7 +2737,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -2848,8 +2769,8 @@ "ctxt": 0 }, "value": "r2b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2867,7 +2788,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -2878,7 +2798,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -2911,8 +2830,8 @@ "ctxt": 0 }, "value": "r3a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2930,7 +2849,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2941,7 +2859,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2974,8 +2891,8 @@ "ctxt": 0 }, "value": "r3a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2993,7 +2910,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -3004,7 +2920,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3037,8 +2952,8 @@ "ctxt": 0 }, "value": "r3a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3056,7 +2971,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -3067,7 +2981,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3100,8 +3013,8 @@ "ctxt": 0 }, "value": "r3a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3119,7 +3032,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -3130,7 +3042,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -3163,8 +3074,8 @@ "ctxt": 0 }, "value": "r3a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3182,7 +3093,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -3193,7 +3103,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -3226,8 +3135,8 @@ "ctxt": 0 }, "value": "r3a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3245,7 +3154,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -3256,7 +3164,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -3289,8 +3196,8 @@ "ctxt": 0 }, "value": "r3a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3308,7 +3215,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -3319,7 +3225,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -3352,8 +3257,8 @@ "ctxt": 0 }, "value": "r3b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3371,7 +3276,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3382,7 +3286,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -3415,8 +3318,8 @@ "ctxt": 0 }, "value": "r3b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3434,7 +3337,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3445,7 +3347,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -3478,8 +3379,8 @@ "ctxt": 0 }, "value": "r3b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3497,7 +3398,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3508,7 +3408,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -3541,8 +3440,8 @@ "ctxt": 0 }, "value": "r3b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3560,7 +3459,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -3571,7 +3469,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -3604,8 +3501,8 @@ "ctxt": 0 }, "value": "r3b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3623,7 +3520,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -3634,7 +3530,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -3667,8 +3562,8 @@ "ctxt": 0 }, "value": "r3b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3686,7 +3581,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -3697,7 +3591,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -3730,8 +3623,8 @@ "ctxt": 0 }, "value": "r3b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3749,7 +3642,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -3760,7 +3652,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -3793,8 +3684,8 @@ "ctxt": 0 }, "value": "r4a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3812,7 +3703,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -3823,7 +3713,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3856,8 +3745,8 @@ "ctxt": 0 }, "value": "r4a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3875,7 +3764,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -3886,7 +3774,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3919,8 +3806,8 @@ "ctxt": 0 }, "value": "r4a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3938,7 +3825,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -3949,7 +3835,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3982,8 +3867,8 @@ "ctxt": 0 }, "value": "r4a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4001,7 +3886,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -4012,7 +3896,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -4045,8 +3928,8 @@ "ctxt": 0 }, "value": "r4a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4064,7 +3947,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -4075,7 +3957,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -4108,8 +3989,8 @@ "ctxt": 0 }, "value": "r4a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4127,7 +4008,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -4138,7 +4018,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -4171,8 +4050,8 @@ "ctxt": 0 }, "value": "r4a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4190,7 +4069,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -4201,7 +4079,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -4234,8 +4111,8 @@ "ctxt": 0 }, "value": "r4b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4253,7 +4130,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4264,7 +4140,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4297,8 +4172,8 @@ "ctxt": 0 }, "value": "r4b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4316,7 +4191,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4327,7 +4201,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4360,8 +4233,8 @@ "ctxt": 0 }, "value": "r4b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4379,7 +4252,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4390,7 +4262,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4423,8 +4294,8 @@ "ctxt": 0 }, "value": "r4b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4442,7 +4313,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4453,7 +4323,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4486,8 +4355,8 @@ "ctxt": 0 }, "value": "r4b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4505,7 +4374,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -4516,7 +4384,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4549,8 +4416,8 @@ "ctxt": 0 }, "value": "r4b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4568,7 +4435,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -4579,7 +4445,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4612,8 +4477,8 @@ "ctxt": 0 }, "value": "r4b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4631,7 +4496,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -4642,7 +4506,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4675,8 +4538,8 @@ "ctxt": 0 }, "value": "r5a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4694,7 +4557,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -4705,7 +4567,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4738,8 +4599,8 @@ "ctxt": 0 }, "value": "r5a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4757,7 +4618,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -4768,7 +4628,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4801,8 +4660,8 @@ "ctxt": 0 }, "value": "r5a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4820,7 +4679,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -4831,7 +4689,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -4864,8 +4721,8 @@ "ctxt": 0 }, "value": "r5a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4883,7 +4740,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -4894,7 +4750,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -4927,8 +4782,8 @@ "ctxt": 0 }, "value": "r5a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4946,7 +4801,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -4957,7 +4811,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -4990,8 +4843,8 @@ "ctxt": 0 }, "value": "r5a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5009,7 +4862,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -5020,7 +4872,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -5053,8 +4904,8 @@ "ctxt": 0 }, "value": "r5a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5072,7 +4923,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -5083,7 +4933,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -5116,8 +4965,8 @@ "ctxt": 0 }, "value": "r5b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5135,7 +4984,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -5146,7 +4994,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -5179,8 +5026,8 @@ "ctxt": 0 }, "value": "r5b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5198,7 +5045,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -5209,7 +5055,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -5242,8 +5087,8 @@ "ctxt": 0 }, "value": "r5b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5261,7 +5106,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -5272,7 +5116,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -5305,8 +5148,8 @@ "ctxt": 0 }, "value": "r5b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5324,7 +5167,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -5335,7 +5177,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -5368,8 +5209,8 @@ "ctxt": 0 }, "value": "r5b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5387,7 +5228,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -5398,7 +5238,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -5431,8 +5270,8 @@ "ctxt": 0 }, "value": "r5b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5450,7 +5289,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -5461,7 +5299,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -5494,8 +5331,8 @@ "ctxt": 0 }, "value": "r5b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5513,7 +5350,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -5524,7 +5360,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -5557,8 +5392,8 @@ "ctxt": 0 }, "value": "r6a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5576,7 +5411,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -5587,7 +5421,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -5620,8 +5453,8 @@ "ctxt": 0 }, "value": "r6a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5639,7 +5472,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -5650,7 +5482,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -5683,8 +5514,8 @@ "ctxt": 0 }, "value": "r6a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5702,7 +5533,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -5713,7 +5543,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5746,8 +5575,8 @@ "ctxt": 0 }, "value": "r6a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5765,7 +5594,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -5776,7 +5604,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -5809,8 +5636,8 @@ "ctxt": 0 }, "value": "r6a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5828,7 +5655,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -5839,7 +5665,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -5872,8 +5697,8 @@ "ctxt": 0 }, "value": "r6a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5891,7 +5716,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -5902,7 +5726,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -5935,8 +5758,8 @@ "ctxt": 0 }, "value": "r6a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5954,7 +5777,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -5965,7 +5787,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -5998,8 +5819,8 @@ "ctxt": 0 }, "value": "r6b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6017,7 +5838,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -6028,7 +5848,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -6061,8 +5880,8 @@ "ctxt": 0 }, "value": "r6b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6080,7 +5899,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -6091,7 +5909,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -6124,8 +5941,8 @@ "ctxt": 0 }, "value": "r6b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6143,7 +5960,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -6154,7 +5970,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -6187,8 +6002,8 @@ "ctxt": 0 }, "value": "r6b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6206,7 +6021,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -6217,7 +6031,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -6250,8 +6063,8 @@ "ctxt": 0 }, "value": "r6b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6269,7 +6082,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -6280,7 +6092,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -6313,8 +6124,8 @@ "ctxt": 0 }, "value": "r6b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6332,7 +6143,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -6343,7 +6153,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -6376,8 +6185,8 @@ "ctxt": 0 }, "value": "r6b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6395,7 +6204,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -6406,7 +6214,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -6439,8 +6246,8 @@ "ctxt": 0 }, "value": "r7a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6458,7 +6265,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -6469,7 +6275,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -6502,8 +6307,8 @@ "ctxt": 0 }, "value": "r7a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6521,7 +6326,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -6532,7 +6336,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -6565,8 +6368,8 @@ "ctxt": 0 }, "value": "r7a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6584,7 +6387,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -6595,7 +6397,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -6628,8 +6429,8 @@ "ctxt": 0 }, "value": "r7a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6647,7 +6448,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -6658,7 +6458,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -6691,8 +6490,8 @@ "ctxt": 0 }, "value": "r7a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6710,7 +6509,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -6721,7 +6519,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -6754,8 +6551,8 @@ "ctxt": 0 }, "value": "r7a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6773,7 +6570,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -6784,7 +6580,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -6817,8 +6612,8 @@ "ctxt": 0 }, "value": "r7a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6836,7 +6631,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -6847,7 +6641,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -6880,8 +6673,8 @@ "ctxt": 0 }, "value": "r7b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6899,7 +6692,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -6910,7 +6702,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -6943,8 +6734,8 @@ "ctxt": 0 }, "value": "r7b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6962,7 +6753,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -6973,7 +6763,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -7006,8 +6795,8 @@ "ctxt": 0 }, "value": "r7b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7025,7 +6814,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -7036,7 +6824,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -7069,8 +6856,8 @@ "ctxt": 0 }, "value": "r7b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7088,7 +6875,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -7099,7 +6885,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -7132,8 +6917,8 @@ "ctxt": 0 }, "value": "r7b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7151,7 +6936,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -7162,7 +6946,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -7195,8 +6978,8 @@ "ctxt": 0 }, "value": "r7b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7214,7 +6997,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -7225,7 +7007,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -7258,8 +7039,8 @@ "ctxt": 0 }, "value": "r7b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7277,7 +7058,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -7288,7 +7068,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -7321,8 +7100,8 @@ "ctxt": 0 }, "value": "r8a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7340,7 +7119,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -7351,7 +7129,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -7384,8 +7161,8 @@ "ctxt": 0 }, "value": "r8a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7403,7 +7180,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -7414,7 +7190,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -7447,8 +7222,8 @@ "ctxt": 0 }, "value": "r8a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7466,7 +7241,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -7477,7 +7251,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -7510,8 +7283,8 @@ "ctxt": 0 }, "value": "r8a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7529,7 +7302,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -7540,7 +7312,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -7573,8 +7344,8 @@ "ctxt": 0 }, "value": "r8a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7592,7 +7363,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -7603,7 +7373,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -7636,8 +7405,8 @@ "ctxt": 0 }, "value": "r8a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7655,7 +7424,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -7666,7 +7434,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -7699,8 +7466,8 @@ "ctxt": 0 }, "value": "r8a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7718,7 +7485,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -7729,7 +7495,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -7762,8 +7527,8 @@ "ctxt": 0 }, "value": "r8b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7781,7 +7546,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -7792,7 +7556,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -7825,8 +7588,8 @@ "ctxt": 0 }, "value": "r8b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7844,7 +7607,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -7855,7 +7617,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -7888,8 +7649,8 @@ "ctxt": 0 }, "value": "r8b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7907,7 +7668,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -7918,7 +7678,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -7951,8 +7710,8 @@ "ctxt": 0 }, "value": "r8b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7970,7 +7729,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -7981,7 +7739,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -8014,8 +7771,8 @@ "ctxt": 0 }, "value": "r8b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8033,7 +7790,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -8044,7 +7800,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -8077,8 +7832,8 @@ "ctxt": 0 }, "value": "r8b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8096,7 +7851,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -8107,7 +7861,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -8140,8 +7893,8 @@ "ctxt": 0 }, "value": "r8b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8159,7 +7912,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -8170,7 +7922,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -8205,7 +7956,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8226,7 +7976,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNumericLiteral/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNumericLiteral/input.ts.json index 6115dd25b08f..6021d42449bd 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNumericLiteral/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNumericLiteral/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "BrandedNum", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -67,7 +66,6 @@ "ctxt": 0 }, "value": "__numberBrand", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -123,6 +121,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,13 +144,11 @@ "ctxt": 0 }, "value": "BrandedNum", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -181,7 +178,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -218,7 +214,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -272,7 +267,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -306,7 +300,6 @@ "ctxt": 0 }, "value": "BrandedNum", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -337,7 +330,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -374,7 +366,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -428,7 +419,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -462,7 +452,6 @@ "ctxt": 0 }, "value": "BrandedNum", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -493,7 +482,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -530,7 +518,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -584,7 +571,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -618,7 +604,6 @@ "ctxt": 0 }, "value": "BrandedNum", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -649,7 +634,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -686,7 +670,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -740,7 +723,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -774,7 +756,6 @@ "ctxt": 0 }, "value": "BrandedNum", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -805,7 +786,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -842,7 +822,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -896,7 +875,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -930,7 +908,6 @@ "ctxt": 0 }, "value": "BrandedNum", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -961,7 +938,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -998,7 +974,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1052,7 +1027,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1086,7 +1060,6 @@ "ctxt": 0 }, "value": "BrandedNum", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1117,7 +1090,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1154,7 +1126,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1208,7 +1179,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1242,7 +1212,6 @@ "ctxt": 0 }, "value": "BrandedNum", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1273,7 +1242,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1310,7 +1278,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1364,7 +1331,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1398,7 +1364,6 @@ "ctxt": 0 }, "value": "BrandedNum", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithOneOperandIsAny/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithOneOperandIsAny/input.ts.json index 9ed9585144c1..e17046c67062 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithOneOperandIsAny/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithOneOperandIsAny/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -72,7 +72,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -91,7 +90,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -111,7 +109,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -131,7 +128,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "init": null @@ -148,7 +144,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -169,6 +164,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -191,13 +187,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -240,8 +234,8 @@ "ctxt": 0 }, "value": "foo_r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -259,7 +253,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -270,7 +263,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -303,8 +295,8 @@ "ctxt": 0 }, "value": "foo_r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -322,7 +314,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -333,7 +324,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -366,8 +356,8 @@ "ctxt": 0 }, "value": "foo_r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -385,7 +375,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -396,7 +385,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -429,8 +417,8 @@ "ctxt": 0 }, "value": "foo_r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -448,7 +436,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -459,7 +446,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -492,8 +478,8 @@ "ctxt": 0 }, "value": "foo_r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -511,7 +497,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -522,7 +507,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -555,8 +539,8 @@ "ctxt": 0 }, "value": "foo_r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -574,7 +558,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -585,7 +568,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -618,8 +600,8 @@ "ctxt": 0 }, "value": "foo_r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -637,7 +619,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -648,7 +629,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -681,8 +661,8 @@ "ctxt": 0 }, "value": "foo_r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -700,7 +680,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -711,7 +690,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -744,8 +722,8 @@ "ctxt": 0 }, "value": "foo_r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -763,7 +741,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -774,7 +751,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -807,8 +783,8 @@ "ctxt": 0 }, "value": "foo_r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -826,7 +802,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -837,7 +812,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -870,8 +844,8 @@ "ctxt": 0 }, "value": "foo_r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -889,7 +863,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -900,7 +873,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -933,8 +905,8 @@ "ctxt": 0 }, "value": "foo_r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -952,7 +924,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -963,7 +934,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -996,8 +966,8 @@ "ctxt": 0 }, "value": "foo_r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1015,7 +985,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1026,7 +995,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1059,8 +1027,8 @@ "ctxt": 0 }, "value": "foo_r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1078,7 +1046,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1089,7 +1056,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1122,8 +1088,8 @@ "ctxt": 0 }, "value": "foo_r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1141,7 +1107,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1152,7 +1117,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1185,8 +1149,8 @@ "ctxt": 0 }, "value": "foo_r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1204,7 +1168,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1215,7 +1178,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1250,7 +1212,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1285,6 +1246,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1301,8 +1263,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1334,6 +1295,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1350,8 +1312,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1383,6 +1344,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1399,8 +1361,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1432,6 +1393,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1448,8 +1410,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1481,6 +1442,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1503,13 +1465,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1541,6 +1501,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1557,8 +1518,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1590,6 +1550,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1614,8 +1575,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1647,8 +1607,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1666,7 +1626,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1677,7 +1636,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1710,8 +1668,8 @@ "ctxt": 0 }, "value": "r1a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1729,7 +1687,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1740,7 +1697,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1773,8 +1729,8 @@ "ctxt": 0 }, "value": "r1a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1792,7 +1748,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1803,7 +1758,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1836,8 +1790,8 @@ "ctxt": 0 }, "value": "r1a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1855,7 +1809,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1866,7 +1819,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -1899,8 +1851,8 @@ "ctxt": 0 }, "value": "r1a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1918,7 +1870,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1929,7 +1880,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -1962,8 +1912,8 @@ "ctxt": 0 }, "value": "r1a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1981,7 +1931,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1992,7 +1941,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -2025,8 +1973,8 @@ "ctxt": 0 }, "value": "r1a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2044,7 +1992,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2055,7 +2002,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -2088,8 +2034,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2107,7 +2053,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2118,7 +2063,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2151,8 +2095,8 @@ "ctxt": 0 }, "value": "r1b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2170,7 +2114,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2181,7 +2124,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2214,8 +2156,8 @@ "ctxt": 0 }, "value": "r1b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2233,7 +2175,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -2244,7 +2185,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2277,8 +2217,8 @@ "ctxt": 0 }, "value": "r1b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2296,7 +2236,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -2307,7 +2246,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2340,8 +2278,8 @@ "ctxt": 0 }, "value": "r1b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2359,7 +2297,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -2370,7 +2307,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2403,8 +2339,8 @@ "ctxt": 0 }, "value": "r1b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2422,7 +2358,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -2433,7 +2368,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2466,8 +2400,8 @@ "ctxt": 0 }, "value": "r1b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2485,7 +2419,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -2496,7 +2429,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2529,8 +2461,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2548,7 +2480,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2559,7 +2490,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2592,8 +2522,8 @@ "ctxt": 0 }, "value": "r2a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2611,7 +2541,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2622,7 +2551,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2655,8 +2583,8 @@ "ctxt": 0 }, "value": "r2a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2674,7 +2602,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2685,7 +2612,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -2718,8 +2644,8 @@ "ctxt": 0 }, "value": "r2a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2737,7 +2663,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2748,7 +2673,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -2781,8 +2705,8 @@ "ctxt": 0 }, "value": "r2a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2800,7 +2724,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2811,7 +2734,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -2844,8 +2766,8 @@ "ctxt": 0 }, "value": "r2a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2863,7 +2785,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2874,7 +2795,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -2907,8 +2827,8 @@ "ctxt": 0 }, "value": "r2a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2926,7 +2846,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2937,7 +2856,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -2970,8 +2888,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2989,7 +2907,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3000,7 +2917,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3033,8 +2949,8 @@ "ctxt": 0 }, "value": "r2b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3052,7 +2968,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3063,7 +2978,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3096,8 +3010,8 @@ "ctxt": 0 }, "value": "r2b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3115,7 +3029,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3126,7 +3039,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3159,8 +3071,8 @@ "ctxt": 0 }, "value": "r2b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3178,7 +3090,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -3189,7 +3100,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3222,8 +3132,8 @@ "ctxt": 0 }, "value": "r2b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3241,7 +3151,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -3252,7 +3161,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3285,8 +3193,8 @@ "ctxt": 0 }, "value": "r2b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3304,7 +3212,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -3315,7 +3222,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3348,8 +3254,8 @@ "ctxt": 0 }, "value": "r2b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3367,7 +3273,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -3378,7 +3283,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3411,8 +3315,8 @@ "ctxt": 0 }, "value": "r3a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3430,7 +3334,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -3441,7 +3344,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3474,8 +3376,8 @@ "ctxt": 0 }, "value": "r3a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3493,7 +3395,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -3504,7 +3405,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3537,8 +3437,8 @@ "ctxt": 0 }, "value": "r3a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3556,7 +3456,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -3567,7 +3466,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3600,8 +3498,8 @@ "ctxt": 0 }, "value": "r3a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3619,7 +3517,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -3630,7 +3527,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -3663,8 +3559,8 @@ "ctxt": 0 }, "value": "r3a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3682,7 +3578,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -3693,7 +3588,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -3726,8 +3620,8 @@ "ctxt": 0 }, "value": "r3a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3745,7 +3639,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -3756,7 +3649,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -3789,8 +3681,8 @@ "ctxt": 0 }, "value": "r3a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3808,7 +3700,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -3819,7 +3710,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -3852,8 +3742,8 @@ "ctxt": 0 }, "value": "r3b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3871,7 +3761,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3882,7 +3771,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3915,8 +3803,8 @@ "ctxt": 0 }, "value": "r3b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3934,7 +3822,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3945,7 +3832,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3978,8 +3864,8 @@ "ctxt": 0 }, "value": "r3b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3997,7 +3883,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4008,7 +3893,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -4041,8 +3925,8 @@ "ctxt": 0 }, "value": "r3b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4060,7 +3944,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4071,7 +3954,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -4104,8 +3986,8 @@ "ctxt": 0 }, "value": "r3b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4123,7 +4005,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -4134,7 +4015,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -4167,8 +4047,8 @@ "ctxt": 0 }, "value": "r3b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4186,7 +4066,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -4197,7 +4076,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -4230,8 +4108,8 @@ "ctxt": 0 }, "value": "r3b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4249,7 +4127,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -4260,7 +4137,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -4293,8 +4169,8 @@ "ctxt": 0 }, "value": "r4a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4312,7 +4188,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -4323,7 +4198,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4356,8 +4230,8 @@ "ctxt": 0 }, "value": "r4a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4375,7 +4249,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -4386,7 +4259,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4419,8 +4291,8 @@ "ctxt": 0 }, "value": "r4a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4438,7 +4310,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -4449,7 +4320,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -4482,8 +4352,8 @@ "ctxt": 0 }, "value": "r4a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4501,7 +4371,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -4512,7 +4381,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -4545,8 +4413,8 @@ "ctxt": 0 }, "value": "r4a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4564,7 +4432,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -4575,7 +4442,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -4608,8 +4474,8 @@ "ctxt": 0 }, "value": "r4a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4627,7 +4493,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -4638,7 +4503,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -4671,8 +4535,8 @@ "ctxt": 0 }, "value": "r4a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4690,7 +4554,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -4701,7 +4564,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -4734,8 +4596,8 @@ "ctxt": 0 }, "value": "r4b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4753,7 +4615,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4764,7 +4625,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -4797,8 +4657,8 @@ "ctxt": 0 }, "value": "r4b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4816,7 +4676,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4827,7 +4686,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -4860,8 +4718,8 @@ "ctxt": 0 }, "value": "r4b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4879,7 +4737,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4890,7 +4747,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -4923,8 +4779,8 @@ "ctxt": 0 }, "value": "r4b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4942,7 +4798,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4953,7 +4808,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -4986,8 +4840,8 @@ "ctxt": 0 }, "value": "r4b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5005,7 +4859,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -5016,7 +4869,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5049,8 +4901,8 @@ "ctxt": 0 }, "value": "r4b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5068,7 +4920,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -5079,7 +4930,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5112,8 +4962,8 @@ "ctxt": 0 }, "value": "r4b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5131,7 +4981,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -5142,7 +4991,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5175,8 +5023,8 @@ "ctxt": 0 }, "value": "r5a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5194,7 +5042,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -5205,7 +5052,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -5238,8 +5084,8 @@ "ctxt": 0 }, "value": "r5a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5257,7 +5103,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -5268,7 +5113,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -5301,8 +5145,8 @@ "ctxt": 0 }, "value": "r5a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5320,7 +5164,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -5331,7 +5174,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5364,8 +5206,8 @@ "ctxt": 0 }, "value": "r5a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5383,7 +5225,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -5394,7 +5235,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -5427,8 +5267,8 @@ "ctxt": 0 }, "value": "r5a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5446,7 +5286,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -5457,7 +5296,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -5490,8 +5328,8 @@ "ctxt": 0 }, "value": "r5a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5509,7 +5347,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -5520,7 +5357,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -5553,8 +5389,8 @@ "ctxt": 0 }, "value": "r5a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5572,7 +5408,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -5583,7 +5418,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -5616,8 +5450,8 @@ "ctxt": 0 }, "value": "r5b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5635,7 +5469,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -5646,7 +5479,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5679,8 +5511,8 @@ "ctxt": 0 }, "value": "r5b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5698,7 +5530,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -5709,7 +5540,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5742,8 +5572,8 @@ "ctxt": 0 }, "value": "r5b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5761,7 +5591,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -5772,7 +5601,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5805,8 +5633,8 @@ "ctxt": 0 }, "value": "r5b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5824,7 +5652,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -5835,7 +5662,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5868,8 +5694,8 @@ "ctxt": 0 }, "value": "r5b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5887,7 +5713,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -5898,7 +5723,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5931,8 +5755,8 @@ "ctxt": 0 }, "value": "r5b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5950,7 +5774,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -5961,7 +5784,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5994,8 +5816,8 @@ "ctxt": 0 }, "value": "r5b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6013,7 +5835,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -6024,7 +5845,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -6057,8 +5877,8 @@ "ctxt": 0 }, "value": "r6a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6076,7 +5896,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -6087,7 +5906,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -6120,8 +5938,8 @@ "ctxt": 0 }, "value": "r6a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6139,7 +5957,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -6150,7 +5967,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -6183,8 +5999,8 @@ "ctxt": 0 }, "value": "r6a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6202,7 +6018,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -6213,7 +6028,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -6246,8 +6060,8 @@ "ctxt": 0 }, "value": "r6a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6265,7 +6079,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -6276,7 +6089,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -6309,8 +6121,8 @@ "ctxt": 0 }, "value": "r6a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6328,7 +6140,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -6339,7 +6150,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -6372,8 +6182,8 @@ "ctxt": 0 }, "value": "r6a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6391,7 +6201,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -6402,7 +6211,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -6435,8 +6243,8 @@ "ctxt": 0 }, "value": "r6a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6454,7 +6262,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -6465,7 +6272,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -6498,8 +6304,8 @@ "ctxt": 0 }, "value": "r6b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6517,7 +6323,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -6528,7 +6333,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -6561,8 +6365,8 @@ "ctxt": 0 }, "value": "r6b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6580,7 +6384,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -6591,7 +6394,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -6624,8 +6426,8 @@ "ctxt": 0 }, "value": "r6b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6643,7 +6445,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -6654,7 +6455,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -6687,8 +6487,8 @@ "ctxt": 0 }, "value": "r6b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6706,7 +6506,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -6717,7 +6516,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -6750,8 +6548,8 @@ "ctxt": 0 }, "value": "r6b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6769,7 +6567,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -6780,7 +6577,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -6813,8 +6609,8 @@ "ctxt": 0 }, "value": "r6b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6832,7 +6628,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -6843,7 +6638,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -6876,8 +6670,8 @@ "ctxt": 0 }, "value": "r6b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6895,7 +6689,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -6906,7 +6699,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -6939,8 +6731,8 @@ "ctxt": 0 }, "value": "r7a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6958,7 +6750,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -6969,7 +6760,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -7002,8 +6792,8 @@ "ctxt": 0 }, "value": "r7a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7021,7 +6811,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -7032,7 +6821,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -7065,8 +6853,8 @@ "ctxt": 0 }, "value": "r7a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7084,7 +6872,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -7095,7 +6882,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -7128,8 +6914,8 @@ "ctxt": 0 }, "value": "r7a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7147,7 +6933,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -7158,7 +6943,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -7191,8 +6975,8 @@ "ctxt": 0 }, "value": "r7a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7210,7 +6994,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -7221,7 +7004,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -7254,8 +7036,8 @@ "ctxt": 0 }, "value": "r7a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7273,7 +7055,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -7284,7 +7065,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -7317,8 +7097,8 @@ "ctxt": 0 }, "value": "r7a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7336,7 +7116,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -7347,7 +7126,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -7380,8 +7158,8 @@ "ctxt": 0 }, "value": "r7b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7399,7 +7177,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -7410,7 +7187,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -7443,8 +7219,8 @@ "ctxt": 0 }, "value": "r7b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7462,7 +7238,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -7473,7 +7248,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -7506,8 +7280,8 @@ "ctxt": 0 }, "value": "r7b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7525,7 +7299,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -7536,7 +7309,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -7569,8 +7341,8 @@ "ctxt": 0 }, "value": "r7b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7588,7 +7360,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -7599,7 +7370,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -7632,8 +7402,8 @@ "ctxt": 0 }, "value": "r7b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7651,7 +7421,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -7662,7 +7431,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -7695,8 +7463,8 @@ "ctxt": 0 }, "value": "r7b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7714,7 +7482,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -7725,7 +7492,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -7758,8 +7524,8 @@ "ctxt": 0 }, "value": "r7b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7777,7 +7543,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -7788,7 +7553,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -7821,8 +7585,8 @@ "ctxt": 0 }, "value": "r8a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7840,7 +7604,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -7851,7 +7614,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -7884,8 +7646,8 @@ "ctxt": 0 }, "value": "r8a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7903,7 +7665,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -7914,7 +7675,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -7947,8 +7707,8 @@ "ctxt": 0 }, "value": "r8a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7966,7 +7726,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -7977,7 +7736,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -8010,8 +7768,8 @@ "ctxt": 0 }, "value": "r8a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8029,7 +7787,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -8040,7 +7797,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -8073,8 +7829,8 @@ "ctxt": 0 }, "value": "r8a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8092,7 +7848,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -8103,7 +7858,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -8136,8 +7890,8 @@ "ctxt": 0 }, "value": "r8a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8155,7 +7909,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -8166,7 +7919,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -8199,8 +7951,8 @@ "ctxt": 0 }, "value": "r8a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8218,7 +7970,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -8229,7 +7980,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -8262,8 +8012,8 @@ "ctxt": 0 }, "value": "r8b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8281,7 +8031,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -8292,7 +8041,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -8325,8 +8073,8 @@ "ctxt": 0 }, "value": "r8b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8344,7 +8092,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -8355,7 +8102,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -8388,8 +8134,8 @@ "ctxt": 0 }, "value": "r8b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8407,7 +8153,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -8418,7 +8163,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -8451,8 +8195,8 @@ "ctxt": 0 }, "value": "r8b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8470,7 +8214,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -8481,7 +8224,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -8514,8 +8256,8 @@ "ctxt": 0 }, "value": "r8b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8533,7 +8275,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -8544,7 +8285,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -8577,8 +8317,8 @@ "ctxt": 0 }, "value": "r8b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8596,7 +8336,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -8607,7 +8346,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -8640,8 +8378,8 @@ "ctxt": 0 }, "value": "r8b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8659,7 +8397,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -8670,7 +8407,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithOneOperandIsNull/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithOneOperandIsNull/input.ts.json index 86cdf2e0f07b..e075462807e3 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithOneOperandIsNull/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithOneOperandIsNull/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -82,7 +79,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "init": null @@ -99,7 +95,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -120,6 +115,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -142,13 +138,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -191,8 +185,8 @@ "ctxt": 0 }, "value": "foo_r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -210,7 +204,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -251,8 +244,8 @@ "ctxt": 0 }, "value": "foo_r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -270,7 +263,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -311,8 +303,8 @@ "ctxt": 0 }, "value": "foo_r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -330,7 +322,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -371,8 +362,8 @@ "ctxt": 0 }, "value": "foo_r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -390,7 +381,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -431,8 +421,8 @@ "ctxt": 0 }, "value": "foo_r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -450,7 +440,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -491,8 +480,8 @@ "ctxt": 0 }, "value": "foo_r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -510,7 +499,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -551,8 +539,8 @@ "ctxt": 0 }, "value": "foo_r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -570,7 +558,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -611,8 +598,8 @@ "ctxt": 0 }, "value": "foo_r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -630,7 +617,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -671,8 +657,8 @@ "ctxt": 0 }, "value": "foo_r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -698,7 +684,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -731,8 +716,8 @@ "ctxt": 0 }, "value": "foo_r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -758,7 +743,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -791,8 +775,8 @@ "ctxt": 0 }, "value": "foo_r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -818,7 +802,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -851,8 +834,8 @@ "ctxt": 0 }, "value": "foo_r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -878,7 +861,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -911,8 +893,8 @@ "ctxt": 0 }, "value": "foo_r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -938,7 +920,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -971,8 +952,8 @@ "ctxt": 0 }, "value": "foo_r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -998,7 +979,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1031,8 +1011,8 @@ "ctxt": 0 }, "value": "foo_r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1058,7 +1038,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1091,8 +1070,8 @@ "ctxt": 0 }, "value": "foo_r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1118,7 +1097,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1153,7 +1131,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1188,6 +1165,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1204,8 +1182,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1237,6 +1214,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1253,8 +1231,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1286,6 +1263,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1302,8 +1280,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1335,6 +1312,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1351,8 +1329,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1384,6 +1361,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1406,13 +1384,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1444,6 +1420,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1460,8 +1437,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1493,6 +1469,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1517,8 +1494,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1550,8 +1526,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1577,7 +1553,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1610,8 +1585,8 @@ "ctxt": 0 }, "value": "r1a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1637,7 +1612,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1670,8 +1644,8 @@ "ctxt": 0 }, "value": "r1a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1697,7 +1671,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1730,8 +1703,8 @@ "ctxt": 0 }, "value": "r1a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1757,7 +1730,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -1790,8 +1762,8 @@ "ctxt": 0 }, "value": "r1a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1817,7 +1789,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -1850,8 +1821,8 @@ "ctxt": 0 }, "value": "r1a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1877,7 +1848,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -1910,8 +1880,8 @@ "ctxt": 0 }, "value": "r1a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1937,7 +1907,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -1970,8 +1939,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1989,7 +1958,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2030,8 +1998,8 @@ "ctxt": 0 }, "value": "r1b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2049,7 +2017,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2090,8 +2057,8 @@ "ctxt": 0 }, "value": "r1b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2109,7 +2076,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -2150,8 +2116,8 @@ "ctxt": 0 }, "value": "r1b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2169,7 +2135,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -2210,8 +2175,8 @@ "ctxt": 0 }, "value": "r1b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2229,7 +2194,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -2270,8 +2234,8 @@ "ctxt": 0 }, "value": "r1b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2289,7 +2253,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -2330,8 +2293,8 @@ "ctxt": 0 }, "value": "r1b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2349,7 +2312,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -2390,8 +2352,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2417,7 +2379,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2450,8 +2411,8 @@ "ctxt": 0 }, "value": "r2a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2477,7 +2438,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2510,8 +2470,8 @@ "ctxt": 0 }, "value": "r2a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2537,7 +2497,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -2570,8 +2529,8 @@ "ctxt": 0 }, "value": "r2a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2597,7 +2556,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -2630,8 +2588,8 @@ "ctxt": 0 }, "value": "r2a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2657,7 +2615,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -2690,8 +2647,8 @@ "ctxt": 0 }, "value": "r2a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2717,7 +2674,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -2750,8 +2706,8 @@ "ctxt": 0 }, "value": "r2a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2777,7 +2733,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -2810,8 +2765,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2829,7 +2784,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2870,8 +2824,8 @@ "ctxt": 0 }, "value": "r2b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2889,7 +2843,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2930,8 +2883,8 @@ "ctxt": 0 }, "value": "r2b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2949,7 +2902,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -2990,8 +2942,8 @@ "ctxt": 0 }, "value": "r2b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3009,7 +2961,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -3050,8 +3001,8 @@ "ctxt": 0 }, "value": "r2b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3069,7 +3020,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -3110,8 +3060,8 @@ "ctxt": 0 }, "value": "r2b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3129,7 +3079,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -3170,8 +3119,8 @@ "ctxt": 0 }, "value": "r2b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3189,7 +3138,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -3230,8 +3178,8 @@ "ctxt": 0 }, "value": "r3a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3257,7 +3205,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3290,8 +3237,8 @@ "ctxt": 0 }, "value": "r3a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3317,7 +3264,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3350,8 +3296,8 @@ "ctxt": 0 }, "value": "r3a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3377,7 +3323,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3410,8 +3355,8 @@ "ctxt": 0 }, "value": "r3a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3437,7 +3382,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -3470,8 +3414,8 @@ "ctxt": 0 }, "value": "r3a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3497,7 +3441,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -3530,8 +3473,8 @@ "ctxt": 0 }, "value": "r3a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3557,7 +3500,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -3590,8 +3532,8 @@ "ctxt": 0 }, "value": "r3a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3617,7 +3559,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -3650,8 +3591,8 @@ "ctxt": 0 }, "value": "r3b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3669,7 +3610,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3710,8 +3650,8 @@ "ctxt": 0 }, "value": "r3b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3729,7 +3669,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3770,8 +3709,8 @@ "ctxt": 0 }, "value": "r3b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3789,7 +3728,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3830,8 +3768,8 @@ "ctxt": 0 }, "value": "r3b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3849,7 +3787,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -3890,8 +3827,8 @@ "ctxt": 0 }, "value": "r3b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3909,7 +3846,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -3950,8 +3886,8 @@ "ctxt": 0 }, "value": "r3b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3969,7 +3905,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -4010,8 +3945,8 @@ "ctxt": 0 }, "value": "r3b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4029,7 +3964,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -4070,8 +4004,8 @@ "ctxt": 0 }, "value": "r4a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4097,7 +4031,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4130,8 +4063,8 @@ "ctxt": 0 }, "value": "r4a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4157,7 +4090,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4190,8 +4122,8 @@ "ctxt": 0 }, "value": "r4a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4217,7 +4149,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -4250,8 +4181,8 @@ "ctxt": 0 }, "value": "r4a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4277,7 +4208,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -4310,8 +4240,8 @@ "ctxt": 0 }, "value": "r4a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4337,7 +4267,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -4370,8 +4299,8 @@ "ctxt": 0 }, "value": "r4a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4397,7 +4326,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -4430,8 +4358,8 @@ "ctxt": 0 }, "value": "r4a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4457,7 +4385,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -4490,8 +4417,8 @@ "ctxt": 0 }, "value": "r4b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4509,7 +4436,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4550,8 +4476,8 @@ "ctxt": 0 }, "value": "r4b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4569,7 +4495,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4610,8 +4535,8 @@ "ctxt": 0 }, "value": "r4b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4629,7 +4554,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4670,8 +4594,8 @@ "ctxt": 0 }, "value": "r4b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4689,7 +4613,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4730,8 +4653,8 @@ "ctxt": 0 }, "value": "r4b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4749,7 +4672,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -4790,8 +4712,8 @@ "ctxt": 0 }, "value": "r4b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4809,7 +4731,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -4850,8 +4771,8 @@ "ctxt": 0 }, "value": "r4b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4869,7 +4790,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -4910,8 +4830,8 @@ "ctxt": 0 }, "value": "r5a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4937,7 +4857,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4970,8 +4889,8 @@ "ctxt": 0 }, "value": "r5a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4997,7 +4916,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -5030,8 +4948,8 @@ "ctxt": 0 }, "value": "r5a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5057,7 +4975,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5090,8 +5007,8 @@ "ctxt": 0 }, "value": "r5a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5117,7 +5034,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -5150,8 +5066,8 @@ "ctxt": 0 }, "value": "r5a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5177,7 +5093,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -5210,8 +5125,8 @@ "ctxt": 0 }, "value": "r5a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5237,7 +5152,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -5270,8 +5184,8 @@ "ctxt": 0 }, "value": "r5a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5297,7 +5211,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -5330,8 +5243,8 @@ "ctxt": 0 }, "value": "r5b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5349,7 +5262,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -5390,8 +5302,8 @@ "ctxt": 0 }, "value": "r5b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5409,7 +5321,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -5450,8 +5361,8 @@ "ctxt": 0 }, "value": "r5b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5469,7 +5380,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -5510,8 +5420,8 @@ "ctxt": 0 }, "value": "r5b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5529,7 +5439,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -5570,8 +5479,8 @@ "ctxt": 0 }, "value": "r5b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5589,7 +5498,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -5630,8 +5538,8 @@ "ctxt": 0 }, "value": "r5b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5649,7 +5557,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -5690,8 +5597,8 @@ "ctxt": 0 }, "value": "r5b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5709,7 +5616,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -5750,8 +5656,8 @@ "ctxt": 0 }, "value": "r6a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5777,7 +5683,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -5810,8 +5715,8 @@ "ctxt": 0 }, "value": "r6a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5837,7 +5742,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -5870,8 +5774,8 @@ "ctxt": 0 }, "value": "r6a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5897,7 +5801,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5930,8 +5833,8 @@ "ctxt": 0 }, "value": "r6a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5957,7 +5860,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -5990,8 +5892,8 @@ "ctxt": 0 }, "value": "r6a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6017,7 +5919,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -6050,8 +5951,8 @@ "ctxt": 0 }, "value": "r6a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6077,7 +5978,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -6110,8 +6010,8 @@ "ctxt": 0 }, "value": "r6a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6137,7 +6037,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -6170,8 +6069,8 @@ "ctxt": 0 }, "value": "r6b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6189,7 +6088,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -6230,8 +6128,8 @@ "ctxt": 0 }, "value": "r6b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6249,7 +6147,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -6290,8 +6187,8 @@ "ctxt": 0 }, "value": "r6b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6309,7 +6206,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -6350,8 +6246,8 @@ "ctxt": 0 }, "value": "r6b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6369,7 +6265,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -6410,8 +6305,8 @@ "ctxt": 0 }, "value": "r6b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6429,7 +6324,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -6470,8 +6364,8 @@ "ctxt": 0 }, "value": "r6b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6489,7 +6383,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -6530,8 +6423,8 @@ "ctxt": 0 }, "value": "r6b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6549,7 +6442,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -6590,8 +6482,8 @@ "ctxt": 0 }, "value": "r7a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6617,7 +6509,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -6650,8 +6541,8 @@ "ctxt": 0 }, "value": "r7a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6677,7 +6568,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -6710,8 +6600,8 @@ "ctxt": 0 }, "value": "r7a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6737,7 +6627,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -6770,8 +6659,8 @@ "ctxt": 0 }, "value": "r7a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6797,7 +6686,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -6830,8 +6718,8 @@ "ctxt": 0 }, "value": "r7a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6857,7 +6745,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -6890,8 +6777,8 @@ "ctxt": 0 }, "value": "r7a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6917,7 +6804,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -6950,8 +6836,8 @@ "ctxt": 0 }, "value": "r7a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6977,7 +6863,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -7010,8 +6895,8 @@ "ctxt": 0 }, "value": "r7b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7029,7 +6914,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -7070,8 +6954,8 @@ "ctxt": 0 }, "value": "r7b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7089,7 +6973,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -7130,8 +7013,8 @@ "ctxt": 0 }, "value": "r7b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7149,7 +7032,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -7190,8 +7072,8 @@ "ctxt": 0 }, "value": "r7b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7209,7 +7091,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -7250,8 +7131,8 @@ "ctxt": 0 }, "value": "r7b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7269,7 +7150,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -7310,8 +7190,8 @@ "ctxt": 0 }, "value": "r7b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7329,7 +7209,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -7370,8 +7249,8 @@ "ctxt": 0 }, "value": "r7b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7389,7 +7268,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -7430,8 +7308,8 @@ "ctxt": 0 }, "value": "r8a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7457,7 +7335,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -7490,8 +7367,8 @@ "ctxt": 0 }, "value": "r8a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7517,7 +7394,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -7550,8 +7426,8 @@ "ctxt": 0 }, "value": "r8a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7577,7 +7453,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -7610,8 +7485,8 @@ "ctxt": 0 }, "value": "r8a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7637,7 +7512,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -7670,8 +7544,8 @@ "ctxt": 0 }, "value": "r8a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7697,7 +7571,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -7730,8 +7603,8 @@ "ctxt": 0 }, "value": "r8a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7757,7 +7630,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -7790,8 +7662,8 @@ "ctxt": 0 }, "value": "r8a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7817,7 +7689,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -7850,8 +7721,8 @@ "ctxt": 0 }, "value": "r8b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7869,7 +7740,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -7910,8 +7780,8 @@ "ctxt": 0 }, "value": "r8b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7929,7 +7799,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -7970,8 +7839,8 @@ "ctxt": 0 }, "value": "r8b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7989,7 +7858,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -8030,8 +7898,8 @@ "ctxt": 0 }, "value": "r8b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8049,7 +7917,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -8090,8 +7957,8 @@ "ctxt": 0 }, "value": "r8b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8109,7 +7976,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -8150,8 +8016,8 @@ "ctxt": 0 }, "value": "r8b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8169,7 +8035,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -8210,8 +8075,8 @@ "ctxt": 0 }, "value": "r8b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8229,7 +8094,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithOneOperandIsUndefined/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithOneOperandIsUndefined/input.ts.json index 7109577e84ae..10a8ebef4731 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithOneOperandIsUndefined/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithOneOperandIsUndefined/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,12 +54,10 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -82,7 +81,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -101,7 +99,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -121,7 +118,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -141,7 +137,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "init": null @@ -158,7 +153,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -179,6 +173,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -201,13 +196,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -250,8 +243,8 @@ "ctxt": 0 }, "value": "foo_r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -269,7 +262,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -280,7 +272,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -313,8 +304,8 @@ "ctxt": 0 }, "value": "foo_r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -332,7 +323,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -343,7 +333,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -376,8 +365,8 @@ "ctxt": 0 }, "value": "foo_r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -395,7 +384,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -406,7 +394,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -439,8 +426,8 @@ "ctxt": 0 }, "value": "foo_r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -458,7 +445,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -469,7 +455,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -502,8 +487,8 @@ "ctxt": 0 }, "value": "foo_r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -521,7 +506,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -532,7 +516,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -565,8 +548,8 @@ "ctxt": 0 }, "value": "foo_r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -584,7 +567,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -595,7 +577,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -628,8 +609,8 @@ "ctxt": 0 }, "value": "foo_r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -647,7 +628,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -658,7 +638,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -691,8 +670,8 @@ "ctxt": 0 }, "value": "foo_r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -710,7 +689,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -721,7 +699,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -754,8 +731,8 @@ "ctxt": 0 }, "value": "foo_r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -773,7 +750,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -784,7 +760,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -817,8 +792,8 @@ "ctxt": 0 }, "value": "foo_r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -836,7 +811,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -847,7 +821,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -880,8 +853,8 @@ "ctxt": 0 }, "value": "foo_r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -899,7 +872,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -910,7 +882,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -943,8 +914,8 @@ "ctxt": 0 }, "value": "foo_r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -962,7 +933,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -973,7 +943,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1006,8 +975,8 @@ "ctxt": 0 }, "value": "foo_r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1025,7 +994,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1036,7 +1004,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1069,8 +1036,8 @@ "ctxt": 0 }, "value": "foo_r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1088,7 +1055,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1099,7 +1065,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1132,8 +1097,8 @@ "ctxt": 0 }, "value": "foo_r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1151,7 +1116,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1162,7 +1126,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1195,8 +1158,8 @@ "ctxt": 0 }, "value": "foo_r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1214,7 +1177,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1225,7 +1187,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1260,7 +1221,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1295,6 +1255,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1311,8 +1272,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1344,6 +1304,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1360,8 +1321,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1393,6 +1353,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1409,8 +1370,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1442,6 +1402,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1458,8 +1419,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1491,6 +1451,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1513,13 +1474,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1551,6 +1510,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1567,8 +1527,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1600,6 +1559,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1624,8 +1584,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1657,8 +1616,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1676,7 +1635,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1687,7 +1645,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1720,8 +1677,8 @@ "ctxt": 0 }, "value": "r1a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1739,7 +1696,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1750,7 +1706,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1783,8 +1738,8 @@ "ctxt": 0 }, "value": "r1a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1802,7 +1757,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1813,7 +1767,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1846,8 +1799,8 @@ "ctxt": 0 }, "value": "r1a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1865,7 +1818,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1876,7 +1828,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -1909,8 +1860,8 @@ "ctxt": 0 }, "value": "r1a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1928,7 +1879,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1939,7 +1889,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -1972,8 +1921,8 @@ "ctxt": 0 }, "value": "r1a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1991,7 +1940,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2002,7 +1950,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -2035,8 +1982,8 @@ "ctxt": 0 }, "value": "r1a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2054,7 +2001,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2065,7 +2011,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -2098,8 +2043,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2117,7 +2062,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2128,7 +2072,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2161,8 +2104,8 @@ "ctxt": 0 }, "value": "r1b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2180,7 +2123,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2191,7 +2133,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2224,8 +2165,8 @@ "ctxt": 0 }, "value": "r1b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2243,7 +2184,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -2254,7 +2194,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2287,8 +2226,8 @@ "ctxt": 0 }, "value": "r1b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2306,7 +2245,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -2317,7 +2255,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2350,8 +2287,8 @@ "ctxt": 0 }, "value": "r1b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2369,7 +2306,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -2380,7 +2316,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2413,8 +2348,8 @@ "ctxt": 0 }, "value": "r1b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2432,7 +2367,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -2443,7 +2377,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2476,8 +2409,8 @@ "ctxt": 0 }, "value": "r1b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2495,7 +2428,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -2506,7 +2438,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2539,8 +2470,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2558,7 +2489,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2569,7 +2499,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2602,8 +2531,8 @@ "ctxt": 0 }, "value": "r2a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2621,7 +2550,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2632,7 +2560,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2665,8 +2592,8 @@ "ctxt": 0 }, "value": "r2a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2684,7 +2611,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2695,7 +2621,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -2728,8 +2653,8 @@ "ctxt": 0 }, "value": "r2a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2747,7 +2672,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2758,7 +2682,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -2791,8 +2714,8 @@ "ctxt": 0 }, "value": "r2a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2810,7 +2733,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2821,7 +2743,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -2854,8 +2775,8 @@ "ctxt": 0 }, "value": "r2a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2873,7 +2794,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2884,7 +2804,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -2917,8 +2836,8 @@ "ctxt": 0 }, "value": "r2a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2936,7 +2855,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2947,7 +2865,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -2980,8 +2897,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2999,7 +2916,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3010,7 +2926,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3043,8 +2958,8 @@ "ctxt": 0 }, "value": "r2b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3062,7 +2977,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3073,7 +2987,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3106,8 +3019,8 @@ "ctxt": 0 }, "value": "r2b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3125,7 +3038,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3136,7 +3048,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3169,8 +3080,8 @@ "ctxt": 0 }, "value": "r2b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3188,7 +3099,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -3199,7 +3109,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3232,8 +3141,8 @@ "ctxt": 0 }, "value": "r2b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3251,7 +3160,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -3262,7 +3170,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3295,8 +3202,8 @@ "ctxt": 0 }, "value": "r2b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3314,7 +3221,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -3325,7 +3231,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3358,8 +3263,8 @@ "ctxt": 0 }, "value": "r2b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3377,7 +3282,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -3388,7 +3292,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3421,8 +3324,8 @@ "ctxt": 0 }, "value": "r3a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3440,7 +3343,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -3451,7 +3353,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3484,8 +3385,8 @@ "ctxt": 0 }, "value": "r3a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3503,7 +3404,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -3514,7 +3414,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3547,8 +3446,8 @@ "ctxt": 0 }, "value": "r3a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3566,7 +3465,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -3577,7 +3475,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3610,8 +3507,8 @@ "ctxt": 0 }, "value": "r3a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3629,7 +3526,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -3640,7 +3536,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -3673,8 +3568,8 @@ "ctxt": 0 }, "value": "r3a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3692,7 +3587,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -3703,7 +3597,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -3736,8 +3629,8 @@ "ctxt": 0 }, "value": "r3a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3755,7 +3648,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -3766,7 +3658,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -3799,8 +3690,8 @@ "ctxt": 0 }, "value": "r3a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3818,7 +3709,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -3829,7 +3719,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -3862,8 +3751,8 @@ "ctxt": 0 }, "value": "r3b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3881,7 +3770,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3892,7 +3780,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3925,8 +3812,8 @@ "ctxt": 0 }, "value": "r3b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3944,7 +3831,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3955,7 +3841,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3988,8 +3873,8 @@ "ctxt": 0 }, "value": "r3b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4007,7 +3892,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4018,7 +3902,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -4051,8 +3934,8 @@ "ctxt": 0 }, "value": "r3b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4070,7 +3953,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4081,7 +3963,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -4114,8 +3995,8 @@ "ctxt": 0 }, "value": "r3b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4133,7 +4014,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -4144,7 +4024,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -4177,8 +4056,8 @@ "ctxt": 0 }, "value": "r3b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4196,7 +4075,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -4207,7 +4085,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -4240,8 +4117,8 @@ "ctxt": 0 }, "value": "r3b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4259,7 +4136,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -4270,7 +4146,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -4303,8 +4178,8 @@ "ctxt": 0 }, "value": "r4a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4322,7 +4197,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -4333,7 +4207,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4366,8 +4239,8 @@ "ctxt": 0 }, "value": "r4a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4385,7 +4258,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -4396,7 +4268,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -4429,8 +4300,8 @@ "ctxt": 0 }, "value": "r4a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4448,7 +4319,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -4459,7 +4329,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -4492,8 +4361,8 @@ "ctxt": 0 }, "value": "r4a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4511,7 +4380,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -4522,7 +4390,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -4555,8 +4422,8 @@ "ctxt": 0 }, "value": "r4a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4574,7 +4441,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -4585,7 +4451,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -4618,8 +4483,8 @@ "ctxt": 0 }, "value": "r4a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4637,7 +4502,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -4648,7 +4512,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -4681,8 +4544,8 @@ "ctxt": 0 }, "value": "r4a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4700,7 +4563,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -4711,7 +4573,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -4744,8 +4605,8 @@ "ctxt": 0 }, "value": "r4b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4763,7 +4624,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4774,7 +4634,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -4807,8 +4666,8 @@ "ctxt": 0 }, "value": "r4b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4826,7 +4685,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4837,7 +4695,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -4870,8 +4727,8 @@ "ctxt": 0 }, "value": "r4b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4889,7 +4746,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4900,7 +4756,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -4933,8 +4788,8 @@ "ctxt": 0 }, "value": "r4b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4952,7 +4807,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4963,7 +4817,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -4996,8 +4849,8 @@ "ctxt": 0 }, "value": "r4b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5015,7 +4868,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -5026,7 +4878,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5059,8 +4910,8 @@ "ctxt": 0 }, "value": "r4b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5078,7 +4929,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -5089,7 +4939,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5122,8 +4971,8 @@ "ctxt": 0 }, "value": "r4b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5141,7 +4990,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -5152,7 +5000,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5185,8 +5032,8 @@ "ctxt": 0 }, "value": "r5a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5204,7 +5051,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -5215,7 +5061,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -5248,8 +5093,8 @@ "ctxt": 0 }, "value": "r5a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5267,7 +5112,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -5278,7 +5122,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -5311,8 +5154,8 @@ "ctxt": 0 }, "value": "r5a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5330,7 +5173,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -5341,7 +5183,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5374,8 +5215,8 @@ "ctxt": 0 }, "value": "r5a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5393,7 +5234,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -5404,7 +5244,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -5437,8 +5276,8 @@ "ctxt": 0 }, "value": "r5a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5456,7 +5295,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -5467,7 +5305,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -5500,8 +5337,8 @@ "ctxt": 0 }, "value": "r5a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5519,7 +5356,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -5530,7 +5366,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -5563,8 +5398,8 @@ "ctxt": 0 }, "value": "r5a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5582,7 +5417,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -5593,7 +5427,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -5626,8 +5459,8 @@ "ctxt": 0 }, "value": "r5b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5645,7 +5478,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -5656,7 +5488,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5689,8 +5520,8 @@ "ctxt": 0 }, "value": "r5b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5708,7 +5539,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -5719,7 +5549,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5752,8 +5581,8 @@ "ctxt": 0 }, "value": "r5b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5771,7 +5600,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -5782,7 +5610,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5815,8 +5642,8 @@ "ctxt": 0 }, "value": "r5b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5834,7 +5661,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -5845,7 +5671,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5878,8 +5703,8 @@ "ctxt": 0 }, "value": "r5b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5897,7 +5722,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -5908,7 +5732,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5941,8 +5764,8 @@ "ctxt": 0 }, "value": "r5b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5960,7 +5783,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -5971,7 +5793,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -6004,8 +5825,8 @@ "ctxt": 0 }, "value": "r5b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6023,7 +5844,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -6034,7 +5854,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -6067,8 +5886,8 @@ "ctxt": 0 }, "value": "r6a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6086,7 +5905,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -6097,7 +5915,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -6130,8 +5947,8 @@ "ctxt": 0 }, "value": "r6a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6149,7 +5966,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -6160,7 +5976,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -6193,8 +6008,8 @@ "ctxt": 0 }, "value": "r6a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6212,7 +6027,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -6223,7 +6037,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -6256,8 +6069,8 @@ "ctxt": 0 }, "value": "r6a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6275,7 +6088,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -6286,7 +6098,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -6319,8 +6130,8 @@ "ctxt": 0 }, "value": "r6a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6338,7 +6149,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -6349,7 +6159,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -6382,8 +6191,8 @@ "ctxt": 0 }, "value": "r6a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6401,7 +6210,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -6412,7 +6220,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -6445,8 +6252,8 @@ "ctxt": 0 }, "value": "r6a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6464,7 +6271,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -6475,7 +6281,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -6508,8 +6313,8 @@ "ctxt": 0 }, "value": "r6b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6527,7 +6332,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -6538,7 +6342,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -6571,8 +6374,8 @@ "ctxt": 0 }, "value": "r6b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6590,7 +6393,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -6601,7 +6403,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -6634,8 +6435,8 @@ "ctxt": 0 }, "value": "r6b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6653,7 +6454,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -6664,7 +6464,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -6697,8 +6496,8 @@ "ctxt": 0 }, "value": "r6b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6716,7 +6515,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -6727,7 +6525,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -6760,8 +6557,8 @@ "ctxt": 0 }, "value": "r6b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6779,7 +6576,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -6790,7 +6586,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -6823,8 +6618,8 @@ "ctxt": 0 }, "value": "r6b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6842,7 +6637,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -6853,7 +6647,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -6886,8 +6679,8 @@ "ctxt": 0 }, "value": "r6b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6905,7 +6698,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -6916,7 +6708,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -6949,8 +6740,8 @@ "ctxt": 0 }, "value": "r7a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6968,7 +6759,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -6979,7 +6769,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -7012,8 +6801,8 @@ "ctxt": 0 }, "value": "r7a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7031,7 +6820,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -7042,7 +6830,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -7075,8 +6862,8 @@ "ctxt": 0 }, "value": "r7a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7094,7 +6881,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -7105,7 +6891,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -7138,8 +6923,8 @@ "ctxt": 0 }, "value": "r7a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7157,7 +6942,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -7168,7 +6952,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -7201,8 +6984,8 @@ "ctxt": 0 }, "value": "r7a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7220,7 +7003,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -7231,7 +7013,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -7264,8 +7045,8 @@ "ctxt": 0 }, "value": "r7a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7283,7 +7064,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -7294,7 +7074,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -7327,8 +7106,8 @@ "ctxt": 0 }, "value": "r7a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7346,7 +7125,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -7357,7 +7135,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -7390,8 +7167,8 @@ "ctxt": 0 }, "value": "r7b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7409,7 +7186,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -7420,7 +7196,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -7453,8 +7228,8 @@ "ctxt": 0 }, "value": "r7b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7472,7 +7247,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -7483,7 +7257,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -7516,8 +7289,8 @@ "ctxt": 0 }, "value": "r7b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7535,7 +7308,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -7546,7 +7318,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -7579,8 +7350,8 @@ "ctxt": 0 }, "value": "r7b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7598,7 +7369,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -7609,7 +7379,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -7642,8 +7411,8 @@ "ctxt": 0 }, "value": "r7b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7661,7 +7430,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -7672,7 +7440,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -7705,8 +7472,8 @@ "ctxt": 0 }, "value": "r7b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7724,7 +7491,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -7735,7 +7501,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -7768,8 +7533,8 @@ "ctxt": 0 }, "value": "r7b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7787,7 +7552,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -7798,7 +7562,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -7831,8 +7594,8 @@ "ctxt": 0 }, "value": "r8a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7850,7 +7613,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -7861,7 +7623,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -7894,8 +7655,8 @@ "ctxt": 0 }, "value": "r8a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7913,7 +7674,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -7924,7 +7684,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -7957,8 +7716,8 @@ "ctxt": 0 }, "value": "r8a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7976,7 +7735,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -7987,7 +7745,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -8020,8 +7777,8 @@ "ctxt": 0 }, "value": "r8a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8039,7 +7796,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -8050,7 +7806,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -8083,8 +7838,8 @@ "ctxt": 0 }, "value": "r8a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8102,7 +7857,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -8113,7 +7867,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -8146,8 +7899,8 @@ "ctxt": 0 }, "value": "r8a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8165,7 +7918,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -8176,7 +7928,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -8209,8 +7960,8 @@ "ctxt": 0 }, "value": "r8a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8228,7 +7979,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -8239,7 +7989,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } }, @@ -8272,8 +8021,8 @@ "ctxt": 0 }, "value": "r8b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8291,7 +8040,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -8302,7 +8050,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -8335,8 +8082,8 @@ "ctxt": 0 }, "value": "r8b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8354,7 +8101,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -8365,7 +8111,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -8398,8 +8143,8 @@ "ctxt": 0 }, "value": "r8b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8417,7 +8162,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -8428,7 +8172,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -8461,8 +8204,8 @@ "ctxt": 0 }, "value": "r8b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8480,7 +8223,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -8491,7 +8233,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -8524,8 +8265,8 @@ "ctxt": 0 }, "value": "r8b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8543,7 +8284,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -8554,7 +8294,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -8587,8 +8326,8 @@ "ctxt": 0 }, "value": "r8b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8606,7 +8345,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -8617,7 +8355,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -8650,8 +8387,8 @@ "ctxt": 0 }, "value": "r8b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8669,7 +8406,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -8680,7 +8416,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeEnumAndNumber/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeEnumAndNumber/input.ts.json index 84b7352811e8..57cdf8b3faaf 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeEnumAndNumber/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeEnumAndNumber/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "init": null @@ -82,7 +79,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "init": null @@ -114,6 +110,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -136,13 +133,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -174,6 +169,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -190,8 +186,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -223,8 +218,8 @@ "ctxt": 0 }, "value": "ra1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -242,7 +237,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -253,7 +247,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -286,8 +279,8 @@ "ctxt": 0 }, "value": "ra2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -305,7 +298,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -316,7 +308,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -349,8 +340,8 @@ "ctxt": 0 }, "value": "ra3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -375,7 +366,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -386,7 +376,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -399,7 +388,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -432,8 +420,8 @@ "ctxt": 0 }, "value": "ra4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -451,7 +439,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -469,7 +456,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -480,7 +466,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -515,8 +500,8 @@ "ctxt": 0 }, "value": "ra5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -541,7 +526,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -552,7 +536,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -596,8 +579,8 @@ "ctxt": 0 }, "value": "ra6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -631,7 +614,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -642,7 +624,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -677,8 +658,8 @@ "ctxt": 0 }, "value": "rb1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -696,7 +677,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -707,7 +687,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -740,8 +719,8 @@ "ctxt": 0 }, "value": "rb2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -759,7 +738,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -770,7 +748,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -803,8 +780,8 @@ "ctxt": 0 }, "value": "rb3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -829,7 +806,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -840,7 +816,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -853,7 +828,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -886,8 +860,8 @@ "ctxt": 0 }, "value": "rb4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -905,7 +879,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -923,7 +896,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -934,7 +906,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -969,8 +940,8 @@ "ctxt": 0 }, "value": "rb5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -995,7 +966,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1006,7 +976,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1050,8 +1019,8 @@ "ctxt": 0 }, "value": "rb6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1085,7 +1054,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1096,7 +1064,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1131,8 +1098,8 @@ "ctxt": 0 }, "value": "rc1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1150,7 +1117,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1161,7 +1127,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1194,8 +1159,8 @@ "ctxt": 0 }, "value": "rc2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1213,7 +1178,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1224,7 +1188,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1257,8 +1220,8 @@ "ctxt": 0 }, "value": "rc3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1283,7 +1246,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1294,7 +1256,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1307,7 +1268,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1340,8 +1300,8 @@ "ctxt": 0 }, "value": "rc4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1359,7 +1319,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1377,7 +1336,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1388,7 +1346,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1423,8 +1380,8 @@ "ctxt": 0 }, "value": "rc5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1449,7 +1406,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1460,7 +1416,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1504,8 +1459,8 @@ "ctxt": 0 }, "value": "rc6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1539,7 +1494,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1550,7 +1504,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1585,8 +1538,8 @@ "ctxt": 0 }, "value": "rd1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1604,7 +1557,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1615,7 +1567,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1648,8 +1599,8 @@ "ctxt": 0 }, "value": "rd2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1667,7 +1618,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1678,7 +1628,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1711,8 +1660,8 @@ "ctxt": 0 }, "value": "rd3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1737,7 +1686,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1748,7 +1696,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1761,7 +1708,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1794,8 +1740,8 @@ "ctxt": 0 }, "value": "rd4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1813,7 +1759,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1831,7 +1776,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1842,7 +1786,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1877,8 +1820,8 @@ "ctxt": 0 }, "value": "rd5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1903,7 +1846,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1914,7 +1856,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1958,8 +1899,8 @@ "ctxt": 0 }, "value": "rd6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1993,7 +1934,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2004,7 +1944,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2039,8 +1978,8 @@ "ctxt": 0 }, "value": "re1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2058,7 +1997,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2069,7 +2007,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2102,8 +2039,8 @@ "ctxt": 0 }, "value": "re2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2121,7 +2058,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2132,7 +2068,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2165,8 +2100,8 @@ "ctxt": 0 }, "value": "re3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2191,7 +2126,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2202,7 +2136,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2215,7 +2148,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2248,8 +2180,8 @@ "ctxt": 0 }, "value": "re4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2267,7 +2199,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2285,7 +2216,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2296,7 +2226,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2331,8 +2260,8 @@ "ctxt": 0 }, "value": "re5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2357,7 +2286,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2368,7 +2296,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2412,8 +2339,8 @@ "ctxt": 0 }, "value": "re6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2447,7 +2374,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2458,7 +2384,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2493,8 +2418,8 @@ "ctxt": 0 }, "value": "rf1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2512,7 +2437,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2523,7 +2447,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2556,8 +2479,8 @@ "ctxt": 0 }, "value": "rf2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2575,7 +2498,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2586,7 +2508,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2619,8 +2540,8 @@ "ctxt": 0 }, "value": "rf3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2645,7 +2566,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2656,7 +2576,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2669,7 +2588,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2702,8 +2620,8 @@ "ctxt": 0 }, "value": "rf4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2721,7 +2639,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -2739,7 +2656,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2750,7 +2666,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2785,8 +2700,8 @@ "ctxt": 0 }, "value": "rf5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2811,7 +2726,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2822,7 +2736,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2866,8 +2779,8 @@ "ctxt": 0 }, "value": "rf6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2901,7 +2814,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2912,7 +2824,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2947,8 +2858,8 @@ "ctxt": 0 }, "value": "rg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2966,7 +2877,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2977,7 +2887,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3010,8 +2919,8 @@ "ctxt": 0 }, "value": "rg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3029,7 +2938,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3040,7 +2948,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3073,8 +2980,8 @@ "ctxt": 0 }, "value": "rg3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3099,7 +3006,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3110,7 +3016,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3123,7 +3028,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3156,8 +3060,8 @@ "ctxt": 0 }, "value": "rg4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3175,7 +3079,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3193,7 +3096,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3204,7 +3106,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3239,8 +3140,8 @@ "ctxt": 0 }, "value": "rg5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3265,7 +3166,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3276,7 +3176,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3320,8 +3219,8 @@ "ctxt": 0 }, "value": "rg6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3355,7 +3254,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3366,7 +3264,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3401,8 +3298,8 @@ "ctxt": 0 }, "value": "rh1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3420,7 +3317,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3431,7 +3327,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3464,8 +3359,8 @@ "ctxt": 0 }, "value": "rh2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3483,7 +3378,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3494,7 +3388,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3527,8 +3420,8 @@ "ctxt": 0 }, "value": "rh3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3553,7 +3446,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3564,7 +3456,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3577,7 +3468,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3610,8 +3500,8 @@ "ctxt": 0 }, "value": "rh4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3629,7 +3519,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3647,7 +3536,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3658,7 +3546,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3693,8 +3580,8 @@ "ctxt": 0 }, "value": "rh5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3719,7 +3606,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3730,7 +3616,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3774,8 +3659,8 @@ "ctxt": 0 }, "value": "rh6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3809,7 +3694,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3820,7 +3704,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnCallSignature/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnCallSignature/input.ts.json index 56c9f04ad426..e7d32667ae02 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnCallSignature/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnCallSignature/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -189,6 +184,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -220,7 +216,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -247,8 +242,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -280,6 +274,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -311,7 +306,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -338,8 +332,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -371,6 +364,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -402,7 +396,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -416,6 +409,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -432,8 +426,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -443,6 +436,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -459,8 +453,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -484,8 +477,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -517,6 +509,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -548,7 +541,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -562,6 +554,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -578,8 +571,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -589,6 +581,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -605,8 +598,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -630,8 +622,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -663,6 +654,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -694,7 +686,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -708,6 +699,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -724,8 +716,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -735,6 +726,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -751,8 +743,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -776,8 +767,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -809,6 +799,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -840,7 +831,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -854,6 +844,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -870,8 +861,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -895,8 +885,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -928,6 +917,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -959,7 +949,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -973,6 +962,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -989,8 +979,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1000,6 +989,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1016,8 +1006,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -1041,8 +1030,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1074,6 +1062,7 @@ "ctxt": 0 }, "value": "b4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1105,7 +1094,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1132,8 +1120,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1165,6 +1152,7 @@ "ctxt": 0 }, "value": "a5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1196,7 +1184,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1210,6 +1197,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1232,13 +1220,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1262,8 +1248,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1295,6 +1280,7 @@ "ctxt": 0 }, "value": "b5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1326,7 +1312,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1340,6 +1325,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1362,13 +1348,11 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1392,8 +1376,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1425,6 +1408,7 @@ "ctxt": 0 }, "value": "a6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1456,7 +1440,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1470,6 +1453,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1492,13 +1476,11 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1508,6 +1490,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1530,13 +1513,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1560,8 +1541,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1593,6 +1573,7 @@ "ctxt": 0 }, "value": "b6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1624,7 +1605,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1638,6 +1618,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1660,13 +1641,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1676,6 +1655,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1698,13 +1678,11 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1728,8 +1706,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1761,6 +1738,7 @@ "ctxt": 0 }, "value": "a7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1792,7 +1770,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1819,8 +1796,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1852,6 +1828,7 @@ "ctxt": 0 }, "value": "b7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1883,7 +1860,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1911,7 +1887,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1921,8 +1896,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1954,6 +1928,7 @@ "ctxt": 0 }, "value": "a8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1985,7 +1960,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2013,7 +1987,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2023,8 +1996,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2056,6 +2028,7 @@ "ctxt": 0 }, "value": "b8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2087,7 +2060,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2115,7 +2087,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2125,8 +2096,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2158,6 +2128,7 @@ "ctxt": 0 }, "value": "a9", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2189,7 +2160,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2217,7 +2187,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2227,8 +2196,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2260,6 +2228,7 @@ "ctxt": 0 }, "value": "b9", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2291,7 +2260,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2319,7 +2287,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2329,8 +2296,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2362,6 +2328,7 @@ "ctxt": 0 }, "value": "a10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2393,7 +2360,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2407,6 +2373,7 @@ "ctxt": 0 }, "value": "a", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2429,13 +2396,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnn": { @@ -2459,8 +2424,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2492,6 +2456,7 @@ "ctxt": 0 }, "value": "b10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2523,7 +2488,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2537,6 +2501,7 @@ "ctxt": 0 }, "value": "a", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2559,13 +2524,11 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnn": { @@ -2589,8 +2552,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2622,6 +2584,7 @@ "ctxt": 0 }, "value": "a11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2653,7 +2616,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2679,8 +2641,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2711,7 +2673,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2741,8 +2702,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2774,6 +2734,7 @@ "ctxt": 0 }, "value": "b11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2805,7 +2766,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2831,8 +2791,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2863,7 +2823,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2893,8 +2852,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2926,8 +2884,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2945,7 +2903,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2956,7 +2913,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -2989,8 +2945,8 @@ "ctxt": 0 }, "value": "r1a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3008,7 +2964,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3019,7 +2974,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -3052,8 +3006,8 @@ "ctxt": 0 }, "value": "r1a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3071,7 +3025,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3082,7 +3035,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -3115,8 +3067,8 @@ "ctxt": 0 }, "value": "r1a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3134,7 +3086,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3145,7 +3096,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -3178,8 +3128,8 @@ "ctxt": 0 }, "value": "r1a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3197,7 +3147,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -3208,7 +3157,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -3241,8 +3189,8 @@ "ctxt": 0 }, "value": "r1a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3260,7 +3208,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -3271,7 +3218,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -3304,8 +3250,8 @@ "ctxt": 0 }, "value": "r1a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3323,7 +3269,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -3334,7 +3279,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -3367,8 +3311,8 @@ "ctxt": 0 }, "value": "r1a8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3386,7 +3330,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "right": { @@ -3397,7 +3340,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false } }, @@ -3430,8 +3372,8 @@ "ctxt": 0 }, "value": "r1a9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3449,7 +3391,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "right": { @@ -3460,7 +3401,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false } }, @@ -3493,8 +3433,8 @@ "ctxt": 0 }, "value": "r1a10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3512,7 +3452,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "right": { @@ -3523,7 +3462,6 @@ "ctxt": 0 }, "value": "b10", - "typeAnnotation": null, "optional": false } }, @@ -3556,8 +3494,8 @@ "ctxt": 0 }, "value": "r1a11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3575,7 +3513,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "right": { @@ -3586,7 +3523,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false } }, @@ -3619,8 +3555,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3638,7 +3574,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3649,7 +3584,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -3682,8 +3616,8 @@ "ctxt": 0 }, "value": "r1b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3701,7 +3635,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3712,7 +3645,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -3745,8 +3677,8 @@ "ctxt": 0 }, "value": "r1b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3764,7 +3696,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3775,7 +3706,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -3808,8 +3738,8 @@ "ctxt": 0 }, "value": "r1b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3827,7 +3757,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3838,7 +3767,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -3871,8 +3799,8 @@ "ctxt": 0 }, "value": "r1b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3890,7 +3818,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -3901,7 +3828,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -3934,8 +3860,8 @@ "ctxt": 0 }, "value": "r1b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3953,7 +3879,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -3964,7 +3889,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -3997,8 +3921,8 @@ "ctxt": 0 }, "value": "r1b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4016,7 +3940,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -4027,7 +3950,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -4060,8 +3982,8 @@ "ctxt": 0 }, "value": "r1b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4079,7 +4001,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false }, "right": { @@ -4090,7 +4011,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false } }, @@ -4123,8 +4043,8 @@ "ctxt": 0 }, "value": "r1b9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4142,7 +4062,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false }, "right": { @@ -4153,7 +4072,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false } }, @@ -4186,8 +4104,8 @@ "ctxt": 0 }, "value": "r1b10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4205,7 +4123,6 @@ "ctxt": 0 }, "value": "b10", - "typeAnnotation": null, "optional": false }, "right": { @@ -4216,7 +4133,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false } }, @@ -4249,8 +4165,8 @@ "ctxt": 0 }, "value": "r1b11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4268,7 +4184,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false }, "right": { @@ -4279,7 +4194,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false } }, @@ -4312,8 +4226,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4331,7 +4245,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4342,7 +4255,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -4375,8 +4287,8 @@ "ctxt": 0 }, "value": "r2a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4394,7 +4306,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4405,7 +4316,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -4438,8 +4348,8 @@ "ctxt": 0 }, "value": "r2a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4457,7 +4367,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4468,7 +4377,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -4501,8 +4409,8 @@ "ctxt": 0 }, "value": "r2a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4520,7 +4428,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4531,7 +4438,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -4564,8 +4470,8 @@ "ctxt": 0 }, "value": "r2a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4583,7 +4489,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -4594,7 +4499,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -4627,8 +4531,8 @@ "ctxt": 0 }, "value": "r2a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4646,7 +4550,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -4657,7 +4560,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -4690,8 +4592,8 @@ "ctxt": 0 }, "value": "r2a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4709,7 +4611,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -4720,7 +4621,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -4753,8 +4653,8 @@ "ctxt": 0 }, "value": "r2a8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4772,7 +4672,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "right": { @@ -4783,7 +4682,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false } }, @@ -4816,8 +4714,8 @@ "ctxt": 0 }, "value": "r2a9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4835,7 +4733,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "right": { @@ -4846,7 +4743,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false } }, @@ -4879,8 +4775,8 @@ "ctxt": 0 }, "value": "r2a10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4898,7 +4794,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "right": { @@ -4909,7 +4804,6 @@ "ctxt": 0 }, "value": "b10", - "typeAnnotation": null, "optional": false } }, @@ -4942,8 +4836,8 @@ "ctxt": 0 }, "value": "r2a11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4961,7 +4855,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "right": { @@ -4972,7 +4865,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false } }, @@ -5005,8 +4897,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5024,7 +4916,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -5035,7 +4926,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -5068,8 +4958,8 @@ "ctxt": 0 }, "value": "r2b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5087,7 +4977,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -5098,7 +4987,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -5131,8 +5019,8 @@ "ctxt": 0 }, "value": "r2b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5150,7 +5038,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -5161,7 +5048,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -5194,8 +5080,8 @@ "ctxt": 0 }, "value": "r2b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5213,7 +5099,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -5224,7 +5109,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -5257,8 +5141,8 @@ "ctxt": 0 }, "value": "r2b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5276,7 +5160,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -5287,7 +5170,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -5320,8 +5202,8 @@ "ctxt": 0 }, "value": "r2b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5339,7 +5221,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -5350,7 +5231,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -5383,8 +5263,8 @@ "ctxt": 0 }, "value": "r2b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5402,7 +5282,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -5413,7 +5292,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -5446,8 +5324,8 @@ "ctxt": 0 }, "value": "r2b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5465,7 +5343,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false }, "right": { @@ -5476,7 +5353,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false } }, @@ -5509,8 +5385,8 @@ "ctxt": 0 }, "value": "r2b9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5528,7 +5404,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false }, "right": { @@ -5539,7 +5414,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false } }, @@ -5572,8 +5446,8 @@ "ctxt": 0 }, "value": "r2b10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5591,7 +5465,6 @@ "ctxt": 0 }, "value": "b10", - "typeAnnotation": null, "optional": false }, "right": { @@ -5602,7 +5475,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false } }, @@ -5635,8 +5507,8 @@ "ctxt": 0 }, "value": "r2b11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5654,7 +5526,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false }, "right": { @@ -5665,7 +5536,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false } }, @@ -5698,8 +5568,8 @@ "ctxt": 0 }, "value": "r3a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5717,7 +5587,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -5728,7 +5597,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -5761,8 +5629,8 @@ "ctxt": 0 }, "value": "r3a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5780,7 +5648,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -5791,7 +5658,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -5824,8 +5690,8 @@ "ctxt": 0 }, "value": "r3a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5843,7 +5709,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -5854,7 +5719,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -5887,8 +5751,8 @@ "ctxt": 0 }, "value": "r3a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5906,7 +5770,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -5917,7 +5780,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -5950,8 +5812,8 @@ "ctxt": 0 }, "value": "r3a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5969,7 +5831,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -5980,7 +5841,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -6013,8 +5873,8 @@ "ctxt": 0 }, "value": "r3a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6032,7 +5892,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -6043,7 +5902,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -6076,8 +5934,8 @@ "ctxt": 0 }, "value": "r3a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6095,7 +5953,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -6106,7 +5963,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -6139,8 +5995,8 @@ "ctxt": 0 }, "value": "r3a8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6158,7 +6014,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "right": { @@ -6169,7 +6024,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false } }, @@ -6202,8 +6056,8 @@ "ctxt": 0 }, "value": "r3a9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6221,7 +6075,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "right": { @@ -6232,7 +6085,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false } }, @@ -6265,8 +6117,8 @@ "ctxt": 0 }, "value": "r3a10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6284,7 +6136,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "right": { @@ -6295,7 +6146,6 @@ "ctxt": 0 }, "value": "b10", - "typeAnnotation": null, "optional": false } }, @@ -6328,8 +6178,8 @@ "ctxt": 0 }, "value": "r3a11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6347,7 +6197,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "right": { @@ -6358,7 +6207,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false } }, @@ -6391,8 +6239,8 @@ "ctxt": 0 }, "value": "r3b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6410,7 +6258,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -6421,7 +6268,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -6454,8 +6300,8 @@ "ctxt": 0 }, "value": "r3b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6473,7 +6319,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -6484,7 +6329,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -6517,8 +6361,8 @@ "ctxt": 0 }, "value": "r3b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6536,7 +6380,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -6547,7 +6390,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -6580,8 +6422,8 @@ "ctxt": 0 }, "value": "r3b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6599,7 +6441,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -6610,7 +6451,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -6643,8 +6483,8 @@ "ctxt": 0 }, "value": "r3b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6662,7 +6502,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -6673,7 +6512,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -6706,8 +6544,8 @@ "ctxt": 0 }, "value": "r3b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6725,7 +6563,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -6736,7 +6573,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -6769,8 +6605,8 @@ "ctxt": 0 }, "value": "r3b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6788,7 +6624,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -6799,7 +6634,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -6832,8 +6666,8 @@ "ctxt": 0 }, "value": "r3b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6851,7 +6685,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false }, "right": { @@ -6862,7 +6695,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false } }, @@ -6895,8 +6727,8 @@ "ctxt": 0 }, "value": "r3b9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6914,7 +6746,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false }, "right": { @@ -6925,7 +6756,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false } }, @@ -6958,8 +6788,8 @@ "ctxt": 0 }, "value": "r3b10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6977,7 +6807,6 @@ "ctxt": 0 }, "value": "b10", - "typeAnnotation": null, "optional": false }, "right": { @@ -6988,7 +6817,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false } }, @@ -7021,8 +6849,8 @@ "ctxt": 0 }, "value": "r3b11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7040,7 +6868,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false }, "right": { @@ -7051,7 +6878,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false } }, @@ -7084,8 +6910,8 @@ "ctxt": 0 }, "value": "r4a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7103,7 +6929,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -7114,7 +6939,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -7147,8 +6971,8 @@ "ctxt": 0 }, "value": "r4a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7166,7 +6990,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -7177,7 +7000,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -7210,8 +7032,8 @@ "ctxt": 0 }, "value": "r4a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7229,7 +7051,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -7240,7 +7061,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -7273,8 +7093,8 @@ "ctxt": 0 }, "value": "r4a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7292,7 +7112,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -7303,7 +7122,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -7336,8 +7154,8 @@ "ctxt": 0 }, "value": "r4a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7355,7 +7173,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -7366,7 +7183,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -7399,8 +7215,8 @@ "ctxt": 0 }, "value": "r4a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7418,7 +7234,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -7429,7 +7244,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -7462,8 +7276,8 @@ "ctxt": 0 }, "value": "r4a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7481,7 +7295,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -7492,7 +7305,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -7525,8 +7337,8 @@ "ctxt": 0 }, "value": "r4a8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7544,7 +7356,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "right": { @@ -7555,7 +7366,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false } }, @@ -7588,8 +7398,8 @@ "ctxt": 0 }, "value": "r4a9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7607,7 +7417,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "right": { @@ -7618,7 +7427,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false } }, @@ -7651,8 +7459,8 @@ "ctxt": 0 }, "value": "r4a10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7670,7 +7478,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "right": { @@ -7681,7 +7488,6 @@ "ctxt": 0 }, "value": "b10", - "typeAnnotation": null, "optional": false } }, @@ -7714,8 +7520,8 @@ "ctxt": 0 }, "value": "r4a11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7733,7 +7539,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "right": { @@ -7744,7 +7549,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false } }, @@ -7777,8 +7581,8 @@ "ctxt": 0 }, "value": "r4b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7796,7 +7600,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -7807,7 +7610,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -7840,8 +7642,8 @@ "ctxt": 0 }, "value": "r4b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7859,7 +7661,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -7870,7 +7671,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -7903,8 +7703,8 @@ "ctxt": 0 }, "value": "r4b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7922,7 +7722,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -7933,7 +7732,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -7966,8 +7764,8 @@ "ctxt": 0 }, "value": "r4b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7985,7 +7783,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -7996,7 +7793,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -8029,8 +7825,8 @@ "ctxt": 0 }, "value": "r4b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8048,7 +7844,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -8059,7 +7854,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -8092,8 +7886,8 @@ "ctxt": 0 }, "value": "r4b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8111,7 +7905,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -8122,7 +7915,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -8155,8 +7947,8 @@ "ctxt": 0 }, "value": "r4b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8174,7 +7966,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -8185,7 +7976,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -8218,8 +8008,8 @@ "ctxt": 0 }, "value": "r4b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8237,7 +8027,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false }, "right": { @@ -8248,7 +8037,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false } }, @@ -8281,8 +8069,8 @@ "ctxt": 0 }, "value": "r4b9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8300,7 +8088,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false }, "right": { @@ -8311,7 +8098,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false } }, @@ -8344,8 +8130,8 @@ "ctxt": 0 }, "value": "r4b10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8363,7 +8149,6 @@ "ctxt": 0 }, "value": "b10", - "typeAnnotation": null, "optional": false }, "right": { @@ -8374,7 +8159,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false } }, @@ -8407,8 +8191,8 @@ "ctxt": 0 }, "value": "r4b11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8426,7 +8210,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false }, "right": { @@ -8437,7 +8220,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false } }, @@ -8470,8 +8252,8 @@ "ctxt": 0 }, "value": "r5a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8489,7 +8271,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -8500,7 +8281,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -8533,8 +8313,8 @@ "ctxt": 0 }, "value": "r5a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8552,7 +8332,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -8563,7 +8342,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -8596,8 +8374,8 @@ "ctxt": 0 }, "value": "r5a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8615,7 +8393,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -8626,7 +8403,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -8659,8 +8435,8 @@ "ctxt": 0 }, "value": "r5a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8678,7 +8454,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -8689,7 +8464,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -8722,8 +8496,8 @@ "ctxt": 0 }, "value": "r5a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8741,7 +8515,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -8752,7 +8525,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -8785,8 +8557,8 @@ "ctxt": 0 }, "value": "r5a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8804,7 +8576,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -8815,7 +8586,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -8848,8 +8618,8 @@ "ctxt": 0 }, "value": "r5a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8867,7 +8637,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -8878,7 +8647,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -8911,8 +8679,8 @@ "ctxt": 0 }, "value": "r5a8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8930,7 +8698,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "right": { @@ -8941,7 +8708,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false } }, @@ -8974,8 +8740,8 @@ "ctxt": 0 }, "value": "r5a9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8993,7 +8759,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "right": { @@ -9004,7 +8769,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false } }, @@ -9037,8 +8801,8 @@ "ctxt": 0 }, "value": "r5a10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9056,7 +8820,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "right": { @@ -9067,7 +8830,6 @@ "ctxt": 0 }, "value": "b10", - "typeAnnotation": null, "optional": false } }, @@ -9100,8 +8862,8 @@ "ctxt": 0 }, "value": "r5a11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9119,7 +8881,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "right": { @@ -9130,7 +8891,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false } }, @@ -9163,8 +8923,8 @@ "ctxt": 0 }, "value": "r5b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9182,7 +8942,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -9193,7 +8952,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -9226,8 +8984,8 @@ "ctxt": 0 }, "value": "r5b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9245,7 +9003,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -9256,7 +9013,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -9289,8 +9045,8 @@ "ctxt": 0 }, "value": "r5b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9308,7 +9064,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -9319,7 +9074,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -9352,8 +9106,8 @@ "ctxt": 0 }, "value": "r5b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9371,7 +9125,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -9382,7 +9135,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -9415,8 +9167,8 @@ "ctxt": 0 }, "value": "r5b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9434,7 +9186,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -9445,7 +9196,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -9478,8 +9228,8 @@ "ctxt": 0 }, "value": "r5b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9497,7 +9247,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -9508,7 +9257,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -9541,8 +9289,8 @@ "ctxt": 0 }, "value": "r5b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9560,7 +9308,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -9571,7 +9318,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -9604,8 +9350,8 @@ "ctxt": 0 }, "value": "r5b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9623,7 +9369,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false }, "right": { @@ -9634,7 +9379,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false } }, @@ -9667,8 +9411,8 @@ "ctxt": 0 }, "value": "r5b9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9686,7 +9430,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false }, "right": { @@ -9697,7 +9440,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false } }, @@ -9730,8 +9472,8 @@ "ctxt": 0 }, "value": "r5b10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9749,7 +9491,6 @@ "ctxt": 0 }, "value": "b10", - "typeAnnotation": null, "optional": false }, "right": { @@ -9760,7 +9501,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false } }, @@ -9793,8 +9533,8 @@ "ctxt": 0 }, "value": "r5b11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9812,7 +9552,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false }, "right": { @@ -9823,7 +9562,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false } }, @@ -9856,8 +9594,8 @@ "ctxt": 0 }, "value": "r6a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9875,7 +9613,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -9886,7 +9623,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -9919,8 +9655,8 @@ "ctxt": 0 }, "value": "r6a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9938,7 +9674,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -9949,7 +9684,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -9982,8 +9716,8 @@ "ctxt": 0 }, "value": "r6a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10001,7 +9735,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -10012,7 +9745,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -10045,8 +9777,8 @@ "ctxt": 0 }, "value": "r6a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10064,7 +9796,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -10075,7 +9806,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -10108,8 +9838,8 @@ "ctxt": 0 }, "value": "r6a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10127,7 +9857,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -10138,7 +9867,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -10171,8 +9899,8 @@ "ctxt": 0 }, "value": "r6a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10190,7 +9918,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -10201,7 +9928,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -10234,8 +9960,8 @@ "ctxt": 0 }, "value": "r6a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10253,7 +9979,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -10264,7 +9989,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -10297,8 +10021,8 @@ "ctxt": 0 }, "value": "r6a8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10316,7 +10040,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "right": { @@ -10327,7 +10050,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false } }, @@ -10360,8 +10082,8 @@ "ctxt": 0 }, "value": "r6a9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10379,7 +10101,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "right": { @@ -10390,7 +10111,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false } }, @@ -10423,8 +10143,8 @@ "ctxt": 0 }, "value": "r6a10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10442,7 +10162,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "right": { @@ -10453,7 +10172,6 @@ "ctxt": 0 }, "value": "b10", - "typeAnnotation": null, "optional": false } }, @@ -10486,8 +10204,8 @@ "ctxt": 0 }, "value": "r6a11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10505,7 +10223,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "right": { @@ -10516,7 +10233,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false } }, @@ -10549,8 +10265,8 @@ "ctxt": 0 }, "value": "r6b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10568,7 +10284,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -10579,7 +10294,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -10612,8 +10326,8 @@ "ctxt": 0 }, "value": "r6b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10631,7 +10345,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -10642,7 +10355,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -10675,8 +10387,8 @@ "ctxt": 0 }, "value": "r6b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10694,7 +10406,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -10705,7 +10416,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -10738,8 +10448,8 @@ "ctxt": 0 }, "value": "r6b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10757,7 +10467,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -10768,7 +10477,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -10801,8 +10509,8 @@ "ctxt": 0 }, "value": "r6b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10820,7 +10528,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -10831,7 +10538,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -10864,8 +10570,8 @@ "ctxt": 0 }, "value": "r6b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10883,7 +10589,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -10894,7 +10599,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -10927,8 +10631,8 @@ "ctxt": 0 }, "value": "r6b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10946,7 +10650,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -10957,7 +10660,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -10990,8 +10692,8 @@ "ctxt": 0 }, "value": "r6b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11009,7 +10711,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false }, "right": { @@ -11020,7 +10721,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false } }, @@ -11053,8 +10753,8 @@ "ctxt": 0 }, "value": "r6b9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11072,7 +10772,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false }, "right": { @@ -11083,7 +10782,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false } }, @@ -11116,8 +10814,8 @@ "ctxt": 0 }, "value": "r6b10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11135,7 +10833,6 @@ "ctxt": 0 }, "value": "b10", - "typeAnnotation": null, "optional": false }, "right": { @@ -11146,7 +10843,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false } }, @@ -11179,8 +10875,8 @@ "ctxt": 0 }, "value": "r6b11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11198,7 +10894,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false }, "right": { @@ -11209,7 +10904,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false } }, @@ -11242,8 +10936,8 @@ "ctxt": 0 }, "value": "r7a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11261,7 +10955,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -11272,7 +10965,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -11305,8 +10997,8 @@ "ctxt": 0 }, "value": "r7a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11324,7 +11016,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -11335,7 +11026,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -11368,8 +11058,8 @@ "ctxt": 0 }, "value": "r7a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11387,7 +11077,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -11398,7 +11087,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -11431,8 +11119,8 @@ "ctxt": 0 }, "value": "r7a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11450,7 +11138,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -11461,7 +11148,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -11494,8 +11180,8 @@ "ctxt": 0 }, "value": "r7a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11513,7 +11199,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -11524,7 +11209,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -11557,8 +11241,8 @@ "ctxt": 0 }, "value": "r7a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11576,7 +11260,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -11587,7 +11270,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -11620,8 +11302,8 @@ "ctxt": 0 }, "value": "r7a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11639,7 +11321,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -11650,7 +11331,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -11683,8 +11363,8 @@ "ctxt": 0 }, "value": "r7a8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11702,7 +11382,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "right": { @@ -11713,7 +11392,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false } }, @@ -11746,8 +11424,8 @@ "ctxt": 0 }, "value": "r7a9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11765,7 +11443,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "right": { @@ -11776,7 +11453,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false } }, @@ -11809,8 +11485,8 @@ "ctxt": 0 }, "value": "r7a10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11828,7 +11504,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "right": { @@ -11839,7 +11514,6 @@ "ctxt": 0 }, "value": "b10", - "typeAnnotation": null, "optional": false } }, @@ -11872,8 +11546,8 @@ "ctxt": 0 }, "value": "r7a11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11891,7 +11565,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "right": { @@ -11902,7 +11575,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false } }, @@ -11935,8 +11607,8 @@ "ctxt": 0 }, "value": "r7b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11954,7 +11626,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -11965,7 +11636,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -11998,8 +11668,8 @@ "ctxt": 0 }, "value": "r7b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12017,7 +11687,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -12028,7 +11697,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -12061,8 +11729,8 @@ "ctxt": 0 }, "value": "r7b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12080,7 +11748,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -12091,7 +11758,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -12124,8 +11790,8 @@ "ctxt": 0 }, "value": "r7b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12143,7 +11809,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -12154,7 +11819,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -12187,8 +11851,8 @@ "ctxt": 0 }, "value": "r7b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12206,7 +11870,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -12217,7 +11880,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -12250,8 +11912,8 @@ "ctxt": 0 }, "value": "r7b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12269,7 +11931,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -12280,7 +11941,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -12313,8 +11973,8 @@ "ctxt": 0 }, "value": "r7b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12332,7 +11992,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -12343,7 +12002,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -12376,8 +12034,8 @@ "ctxt": 0 }, "value": "r7b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12395,7 +12053,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false }, "right": { @@ -12406,7 +12063,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false } }, @@ -12439,8 +12095,8 @@ "ctxt": 0 }, "value": "r7b9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12458,7 +12114,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false }, "right": { @@ -12469,7 +12124,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false } }, @@ -12502,8 +12156,8 @@ "ctxt": 0 }, "value": "r7b10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12521,7 +12175,6 @@ "ctxt": 0 }, "value": "b10", - "typeAnnotation": null, "optional": false }, "right": { @@ -12532,7 +12185,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false } }, @@ -12565,8 +12217,8 @@ "ctxt": 0 }, "value": "r7b11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12584,7 +12236,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false }, "right": { @@ -12595,7 +12246,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false } }, @@ -12628,8 +12278,8 @@ "ctxt": 0 }, "value": "r8a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12647,7 +12297,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -12658,7 +12307,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -12691,8 +12339,8 @@ "ctxt": 0 }, "value": "r8a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12710,7 +12358,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -12721,7 +12368,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -12754,8 +12400,8 @@ "ctxt": 0 }, "value": "r8a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12773,7 +12419,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -12784,7 +12429,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -12817,8 +12461,8 @@ "ctxt": 0 }, "value": "r8a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12836,7 +12480,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -12847,7 +12490,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -12880,8 +12522,8 @@ "ctxt": 0 }, "value": "r8a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12899,7 +12541,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -12910,7 +12551,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -12943,8 +12583,8 @@ "ctxt": 0 }, "value": "r8a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12962,7 +12602,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -12973,7 +12612,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -13006,8 +12644,8 @@ "ctxt": 0 }, "value": "r8a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13025,7 +12663,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -13036,7 +12673,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -13069,8 +12705,8 @@ "ctxt": 0 }, "value": "r8a8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13088,7 +12724,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "right": { @@ -13099,7 +12734,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false } }, @@ -13132,8 +12766,8 @@ "ctxt": 0 }, "value": "r8a9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13151,7 +12785,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "right": { @@ -13162,7 +12795,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false } }, @@ -13195,8 +12827,8 @@ "ctxt": 0 }, "value": "r8a10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13214,7 +12846,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "right": { @@ -13225,7 +12856,6 @@ "ctxt": 0 }, "value": "b10", - "typeAnnotation": null, "optional": false } }, @@ -13258,8 +12888,8 @@ "ctxt": 0 }, "value": "r8a11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13277,7 +12907,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "right": { @@ -13288,7 +12917,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false } }, @@ -13321,8 +12949,8 @@ "ctxt": 0 }, "value": "r8b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13340,7 +12968,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -13351,7 +12978,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -13384,8 +13010,8 @@ "ctxt": 0 }, "value": "r8b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13403,7 +13029,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -13414,7 +13039,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -13447,8 +13071,8 @@ "ctxt": 0 }, "value": "r8b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13466,7 +13090,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -13477,7 +13100,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -13510,8 +13132,8 @@ "ctxt": 0 }, "value": "r8b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13529,7 +13151,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -13540,7 +13161,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -13573,8 +13193,8 @@ "ctxt": 0 }, "value": "r8b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13592,7 +13212,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -13603,7 +13222,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -13636,8 +13254,8 @@ "ctxt": 0 }, "value": "r8b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13655,7 +13273,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -13666,7 +13283,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -13699,8 +13315,8 @@ "ctxt": 0 }, "value": "r8b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13718,7 +13334,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -13729,7 +13344,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -13762,8 +13376,8 @@ "ctxt": 0 }, "value": "r8b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13781,7 +13395,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false }, "right": { @@ -13792,7 +13405,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false } }, @@ -13825,8 +13437,8 @@ "ctxt": 0 }, "value": "r8b9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13844,7 +13456,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false }, "right": { @@ -13855,7 +13466,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false } }, @@ -13888,8 +13498,8 @@ "ctxt": 0 }, "value": "r8b10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13907,7 +13517,6 @@ "ctxt": 0 }, "value": "b10", - "typeAnnotation": null, "optional": false }, "right": { @@ -13918,7 +13527,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false } }, @@ -13951,8 +13559,8 @@ "ctxt": 0 }, "value": "r8b11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -13970,7 +13578,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false }, "right": { @@ -13981,7 +13588,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnConstructorSignature/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnConstructorSignature/input.ts.json index 550c9cc7ae15..fbda5d6c2c01 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnConstructorSignature/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnConstructorSignature/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -189,6 +184,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -234,7 +230,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -244,8 +239,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -277,6 +271,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -322,7 +317,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -332,8 +326,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -365,6 +358,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -396,6 +390,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -412,8 +407,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -423,6 +417,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -439,8 +434,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -465,7 +459,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -475,8 +468,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -508,6 +500,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -539,6 +532,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -555,8 +549,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -566,6 +559,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -582,8 +576,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -608,7 +601,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -618,8 +610,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -651,6 +642,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -682,6 +674,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -698,8 +691,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -709,6 +701,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -725,8 +718,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -751,7 +743,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -761,8 +752,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -794,6 +784,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -825,6 +816,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -841,8 +833,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -867,7 +858,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -877,8 +867,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -910,6 +899,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -941,6 +931,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -957,8 +948,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -968,6 +958,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -984,8 +975,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1010,7 +1000,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1020,8 +1009,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1053,6 +1041,7 @@ "ctxt": 0 }, "value": "b4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1098,7 +1087,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1108,8 +1096,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1141,6 +1128,7 @@ "ctxt": 0 }, "value": "a5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1172,6 +1160,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1194,13 +1183,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1225,7 +1212,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1235,8 +1221,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1268,6 +1253,7 @@ "ctxt": 0 }, "value": "b5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1299,6 +1285,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1321,13 +1308,11 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1352,7 +1337,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1362,8 +1346,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1395,6 +1378,7 @@ "ctxt": 0 }, "value": "a6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1426,6 +1410,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1448,13 +1433,11 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1464,6 +1447,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1486,13 +1470,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1517,7 +1499,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1527,8 +1508,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1560,6 +1540,7 @@ "ctxt": 0 }, "value": "b6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1591,6 +1572,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1613,13 +1595,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1629,6 +1609,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1651,13 +1632,11 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1682,7 +1661,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1692,8 +1670,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1725,6 +1702,7 @@ "ctxt": 0 }, "value": "a7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1770,7 +1748,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1780,8 +1757,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1813,6 +1789,7 @@ "ctxt": 0 }, "value": "b7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1858,7 +1835,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1868,8 +1844,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1901,6 +1876,7 @@ "ctxt": 0 }, "value": "a8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1932,6 +1908,7 @@ "ctxt": 0 }, "value": "a", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1954,13 +1931,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnnotation": { @@ -1985,7 +1960,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1995,8 +1969,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2028,6 +2001,7 @@ "ctxt": 0 }, "value": "b8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2059,6 +2033,7 @@ "ctxt": 0 }, "value": "a", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2081,13 +2056,11 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnnotation": { @@ -2112,7 +2085,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2122,8 +2094,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2155,6 +2126,7 @@ "ctxt": 0 }, "value": "a9", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2198,8 +2170,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2230,7 +2202,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2261,7 +2232,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2271,8 +2241,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2304,6 +2273,7 @@ "ctxt": 0 }, "value": "b9", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2347,8 +2317,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2379,7 +2349,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2410,7 +2379,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2420,8 +2388,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2453,8 +2420,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2472,7 +2439,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2483,7 +2449,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -2516,8 +2481,8 @@ "ctxt": 0 }, "value": "r1a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2535,7 +2500,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2546,7 +2510,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -2579,8 +2542,8 @@ "ctxt": 0 }, "value": "r1a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2598,7 +2561,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2609,7 +2571,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -2642,8 +2603,8 @@ "ctxt": 0 }, "value": "r1a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2661,7 +2622,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -2672,7 +2632,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -2705,8 +2664,8 @@ "ctxt": 0 }, "value": "r1a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2724,7 +2683,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -2735,7 +2693,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -2768,8 +2725,8 @@ "ctxt": 0 }, "value": "r1a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2787,7 +2744,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -2798,7 +2754,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -2831,8 +2786,8 @@ "ctxt": 0 }, "value": "r1a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2850,7 +2805,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -2861,7 +2815,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -2894,8 +2847,8 @@ "ctxt": 0 }, "value": "r1a8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2913,7 +2866,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "right": { @@ -2924,7 +2876,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false } }, @@ -2957,8 +2908,8 @@ "ctxt": 0 }, "value": "r1a9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2976,7 +2927,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "right": { @@ -2987,7 +2937,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false } }, @@ -3020,8 +2969,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3039,7 +2988,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3050,7 +2998,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -3083,8 +3030,8 @@ "ctxt": 0 }, "value": "r1b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3102,7 +3049,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3113,7 +3059,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -3146,8 +3091,8 @@ "ctxt": 0 }, "value": "r1b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3165,7 +3110,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3176,7 +3120,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -3209,8 +3152,8 @@ "ctxt": 0 }, "value": "r1b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3228,7 +3171,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3239,7 +3181,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -3272,8 +3213,8 @@ "ctxt": 0 }, "value": "r1b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3291,7 +3232,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -3302,7 +3242,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -3335,8 +3274,8 @@ "ctxt": 0 }, "value": "r1b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3354,7 +3293,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -3365,7 +3303,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -3398,8 +3335,8 @@ "ctxt": 0 }, "value": "r1b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3417,7 +3354,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -3428,7 +3364,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -3461,8 +3396,8 @@ "ctxt": 0 }, "value": "r1b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3480,7 +3415,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false }, "right": { @@ -3491,7 +3425,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false } }, @@ -3524,8 +3457,8 @@ "ctxt": 0 }, "value": "r1b9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3543,7 +3476,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false }, "right": { @@ -3554,7 +3486,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false } }, @@ -3587,8 +3518,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3606,7 +3537,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3617,7 +3547,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -3650,8 +3579,8 @@ "ctxt": 0 }, "value": "r2a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3669,7 +3598,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3680,7 +3608,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -3713,8 +3640,8 @@ "ctxt": 0 }, "value": "r2a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3732,7 +3659,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3743,7 +3669,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -3776,8 +3701,8 @@ "ctxt": 0 }, "value": "r2a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3795,7 +3720,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3806,7 +3730,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -3839,8 +3762,8 @@ "ctxt": 0 }, "value": "r2a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3858,7 +3781,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -3869,7 +3791,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -3902,8 +3823,8 @@ "ctxt": 0 }, "value": "r2a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3921,7 +3842,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -3932,7 +3852,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -3965,8 +3884,8 @@ "ctxt": 0 }, "value": "r2a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3984,7 +3903,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -3995,7 +3913,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -4028,8 +3945,8 @@ "ctxt": 0 }, "value": "r2a8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4047,7 +3964,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "right": { @@ -4058,7 +3974,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false } }, @@ -4091,8 +4006,8 @@ "ctxt": 0 }, "value": "r2a9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4110,7 +4025,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "right": { @@ -4121,7 +4035,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false } }, @@ -4154,8 +4067,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4173,7 +4086,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4184,7 +4096,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -4217,8 +4128,8 @@ "ctxt": 0 }, "value": "r2b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4236,7 +4147,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4247,7 +4157,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -4280,8 +4189,8 @@ "ctxt": 0 }, "value": "r2b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4299,7 +4208,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4310,7 +4218,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -4343,8 +4250,8 @@ "ctxt": 0 }, "value": "r2b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4362,7 +4269,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4373,7 +4279,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -4406,8 +4311,8 @@ "ctxt": 0 }, "value": "r2b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4425,7 +4330,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -4436,7 +4340,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -4469,8 +4372,8 @@ "ctxt": 0 }, "value": "r2b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4488,7 +4391,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -4499,7 +4401,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -4532,8 +4433,8 @@ "ctxt": 0 }, "value": "r2b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4551,7 +4452,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -4562,7 +4462,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -4595,8 +4494,8 @@ "ctxt": 0 }, "value": "r2b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4614,7 +4513,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false }, "right": { @@ -4625,7 +4523,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false } }, @@ -4658,8 +4555,8 @@ "ctxt": 0 }, "value": "r2b9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4677,7 +4574,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false }, "right": { @@ -4688,7 +4584,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false } }, @@ -4721,8 +4616,8 @@ "ctxt": 0 }, "value": "r3a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4740,7 +4635,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4751,7 +4645,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -4784,8 +4677,8 @@ "ctxt": 0 }, "value": "r3a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4803,7 +4696,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4814,7 +4706,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -4847,8 +4738,8 @@ "ctxt": 0 }, "value": "r3a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4866,7 +4757,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4877,7 +4767,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -4910,8 +4799,8 @@ "ctxt": 0 }, "value": "r3a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4929,7 +4818,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4940,7 +4828,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -4973,8 +4860,8 @@ "ctxt": 0 }, "value": "r3a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4992,7 +4879,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -5003,7 +4889,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -5036,8 +4921,8 @@ "ctxt": 0 }, "value": "r3a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5055,7 +4940,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -5066,7 +4950,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -5099,8 +4982,8 @@ "ctxt": 0 }, "value": "r3a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5118,7 +5001,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -5129,7 +5011,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -5162,8 +5043,8 @@ "ctxt": 0 }, "value": "r3a8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5181,7 +5062,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "right": { @@ -5192,7 +5072,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false } }, @@ -5225,8 +5104,8 @@ "ctxt": 0 }, "value": "r3a9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5244,7 +5123,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "right": { @@ -5255,7 +5133,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false } }, @@ -5288,8 +5165,8 @@ "ctxt": 0 }, "value": "r3b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5307,7 +5184,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -5318,7 +5194,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -5351,8 +5226,8 @@ "ctxt": 0 }, "value": "r3b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5370,7 +5245,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -5381,7 +5255,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -5414,8 +5287,8 @@ "ctxt": 0 }, "value": "r3b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5433,7 +5306,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -5444,7 +5316,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -5477,8 +5348,8 @@ "ctxt": 0 }, "value": "r3b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5496,7 +5367,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -5507,7 +5377,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -5540,8 +5409,8 @@ "ctxt": 0 }, "value": "r3b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5559,7 +5428,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -5570,7 +5438,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -5603,8 +5470,8 @@ "ctxt": 0 }, "value": "r3b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5622,7 +5489,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -5633,7 +5499,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -5666,8 +5531,8 @@ "ctxt": 0 }, "value": "r3b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5685,7 +5550,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -5696,7 +5560,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -5729,8 +5592,8 @@ "ctxt": 0 }, "value": "r3b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5748,7 +5611,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false }, "right": { @@ -5759,7 +5621,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false } }, @@ -5792,8 +5653,8 @@ "ctxt": 0 }, "value": "r3b9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5811,7 +5672,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false }, "right": { @@ -5822,7 +5682,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false } }, @@ -5855,8 +5714,8 @@ "ctxt": 0 }, "value": "r4a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5874,7 +5733,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -5885,7 +5743,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -5918,8 +5775,8 @@ "ctxt": 0 }, "value": "r4a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5937,7 +5794,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -5948,7 +5804,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -5981,8 +5836,8 @@ "ctxt": 0 }, "value": "r4a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6000,7 +5855,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -6011,7 +5865,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -6044,8 +5897,8 @@ "ctxt": 0 }, "value": "r4a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6063,7 +5916,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -6074,7 +5926,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -6107,8 +5958,8 @@ "ctxt": 0 }, "value": "r4a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6126,7 +5977,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -6137,7 +5987,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -6170,8 +6019,8 @@ "ctxt": 0 }, "value": "r4a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6189,7 +6038,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -6200,7 +6048,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -6233,8 +6080,8 @@ "ctxt": 0 }, "value": "r4a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6252,7 +6099,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -6263,7 +6109,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -6296,8 +6141,8 @@ "ctxt": 0 }, "value": "r4a8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6315,7 +6160,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "right": { @@ -6326,7 +6170,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false } }, @@ -6359,8 +6202,8 @@ "ctxt": 0 }, "value": "r4a9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6378,7 +6221,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "right": { @@ -6389,7 +6231,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false } }, @@ -6422,8 +6263,8 @@ "ctxt": 0 }, "value": "r4b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6441,7 +6282,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -6452,7 +6292,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -6485,8 +6324,8 @@ "ctxt": 0 }, "value": "r4b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6504,7 +6343,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -6515,7 +6353,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -6548,8 +6385,8 @@ "ctxt": 0 }, "value": "r4b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6567,7 +6404,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -6578,7 +6414,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -6611,8 +6446,8 @@ "ctxt": 0 }, "value": "r4b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6630,7 +6465,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -6641,7 +6475,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -6674,8 +6507,8 @@ "ctxt": 0 }, "value": "r4b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6693,7 +6526,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -6704,7 +6536,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -6737,8 +6568,8 @@ "ctxt": 0 }, "value": "r4b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6756,7 +6587,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -6767,7 +6597,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -6800,8 +6629,8 @@ "ctxt": 0 }, "value": "r4b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6819,7 +6648,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -6830,7 +6658,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -6863,8 +6690,8 @@ "ctxt": 0 }, "value": "r4b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6882,7 +6709,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false }, "right": { @@ -6893,7 +6719,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false } }, @@ -6926,8 +6751,8 @@ "ctxt": 0 }, "value": "r4b9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6945,7 +6770,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false }, "right": { @@ -6956,7 +6780,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false } }, @@ -6989,8 +6812,8 @@ "ctxt": 0 }, "value": "r5a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7008,7 +6831,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -7019,7 +6841,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -7052,8 +6873,8 @@ "ctxt": 0 }, "value": "r5a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7071,7 +6892,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -7082,7 +6902,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -7115,8 +6934,8 @@ "ctxt": 0 }, "value": "r5a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7134,7 +6953,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -7145,7 +6963,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -7178,8 +6995,8 @@ "ctxt": 0 }, "value": "r5a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7197,7 +7014,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -7208,7 +7024,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -7241,8 +7056,8 @@ "ctxt": 0 }, "value": "r5a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7260,7 +7075,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -7271,7 +7085,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -7304,8 +7117,8 @@ "ctxt": 0 }, "value": "r5a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7323,7 +7136,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -7334,7 +7146,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -7367,8 +7178,8 @@ "ctxt": 0 }, "value": "r5a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7386,7 +7197,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -7397,7 +7207,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -7430,8 +7239,8 @@ "ctxt": 0 }, "value": "r5a8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7449,7 +7258,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "right": { @@ -7460,7 +7268,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false } }, @@ -7493,8 +7300,8 @@ "ctxt": 0 }, "value": "r5a9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7512,7 +7319,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "right": { @@ -7523,7 +7329,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false } }, @@ -7556,8 +7361,8 @@ "ctxt": 0 }, "value": "r5b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7575,7 +7380,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -7586,7 +7390,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -7619,8 +7422,8 @@ "ctxt": 0 }, "value": "r5b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7638,7 +7441,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -7649,7 +7451,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -7682,8 +7483,8 @@ "ctxt": 0 }, "value": "r5b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7701,7 +7502,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -7712,7 +7512,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -7745,8 +7544,8 @@ "ctxt": 0 }, "value": "r5b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7764,7 +7563,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -7775,7 +7573,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -7808,8 +7605,8 @@ "ctxt": 0 }, "value": "r5b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7827,7 +7624,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -7838,7 +7634,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -7871,8 +7666,8 @@ "ctxt": 0 }, "value": "r5b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7890,7 +7685,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -7901,7 +7695,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -7934,8 +7727,8 @@ "ctxt": 0 }, "value": "r5b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7953,7 +7746,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -7964,7 +7756,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -7997,8 +7788,8 @@ "ctxt": 0 }, "value": "r5b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8016,7 +7807,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false }, "right": { @@ -8027,7 +7817,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false } }, @@ -8060,8 +7849,8 @@ "ctxt": 0 }, "value": "r5b9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8079,7 +7868,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false }, "right": { @@ -8090,7 +7878,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false } }, @@ -8123,8 +7910,8 @@ "ctxt": 0 }, "value": "r6a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8142,7 +7929,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -8153,7 +7939,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -8186,8 +7971,8 @@ "ctxt": 0 }, "value": "r6a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8205,7 +7990,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -8216,7 +8000,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -8249,8 +8032,8 @@ "ctxt": 0 }, "value": "r6a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8268,7 +8051,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -8279,7 +8061,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -8312,8 +8093,8 @@ "ctxt": 0 }, "value": "r6a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8331,7 +8112,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -8342,7 +8122,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -8375,8 +8154,8 @@ "ctxt": 0 }, "value": "r6a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8394,7 +8173,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -8405,7 +8183,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -8438,8 +8215,8 @@ "ctxt": 0 }, "value": "r6a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8457,7 +8234,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -8468,7 +8244,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -8501,8 +8276,8 @@ "ctxt": 0 }, "value": "r6a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8520,7 +8295,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -8531,7 +8305,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -8564,8 +8337,8 @@ "ctxt": 0 }, "value": "r6a8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8583,7 +8356,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "right": { @@ -8594,7 +8366,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false } }, @@ -8627,8 +8398,8 @@ "ctxt": 0 }, "value": "r6a9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8646,7 +8417,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "right": { @@ -8657,7 +8427,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false } }, @@ -8690,8 +8459,8 @@ "ctxt": 0 }, "value": "r6b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8709,7 +8478,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -8720,7 +8488,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -8753,8 +8520,8 @@ "ctxt": 0 }, "value": "r6b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8772,7 +8539,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -8783,7 +8549,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -8816,8 +8581,8 @@ "ctxt": 0 }, "value": "r6b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8835,7 +8600,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -8846,7 +8610,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -8879,8 +8642,8 @@ "ctxt": 0 }, "value": "r6b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8898,7 +8661,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -8909,7 +8671,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -8942,8 +8703,8 @@ "ctxt": 0 }, "value": "r6b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8961,7 +8722,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -8972,7 +8732,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -9005,8 +8764,8 @@ "ctxt": 0 }, "value": "r6b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9024,7 +8783,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -9035,7 +8793,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -9068,8 +8825,8 @@ "ctxt": 0 }, "value": "r6b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9087,7 +8844,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -9098,7 +8854,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -9131,8 +8886,8 @@ "ctxt": 0 }, "value": "r6b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9150,7 +8905,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false }, "right": { @@ -9161,7 +8915,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false } }, @@ -9194,8 +8947,8 @@ "ctxt": 0 }, "value": "r6b9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9213,7 +8966,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false }, "right": { @@ -9224,7 +8976,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false } }, @@ -9257,8 +9008,8 @@ "ctxt": 0 }, "value": "r7a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9276,7 +9027,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -9287,7 +9037,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -9320,8 +9069,8 @@ "ctxt": 0 }, "value": "r7a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9339,7 +9088,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -9350,7 +9098,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -9383,8 +9130,8 @@ "ctxt": 0 }, "value": "r7a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9402,7 +9149,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -9413,7 +9159,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -9446,8 +9191,8 @@ "ctxt": 0 }, "value": "r7a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9465,7 +9210,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -9476,7 +9220,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -9509,8 +9252,8 @@ "ctxt": 0 }, "value": "r7a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9528,7 +9271,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -9539,7 +9281,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -9572,8 +9313,8 @@ "ctxt": 0 }, "value": "r7a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9591,7 +9332,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -9602,7 +9342,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -9635,8 +9374,8 @@ "ctxt": 0 }, "value": "r7a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9654,7 +9393,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -9665,7 +9403,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -9698,8 +9435,8 @@ "ctxt": 0 }, "value": "r7a8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9717,7 +9454,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "right": { @@ -9728,7 +9464,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false } }, @@ -9761,8 +9496,8 @@ "ctxt": 0 }, "value": "r7a9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9780,7 +9515,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "right": { @@ -9791,7 +9525,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false } }, @@ -9824,8 +9557,8 @@ "ctxt": 0 }, "value": "r7b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9843,7 +9576,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -9854,7 +9586,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -9887,8 +9618,8 @@ "ctxt": 0 }, "value": "r7b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9906,7 +9637,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -9917,7 +9647,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -9950,8 +9679,8 @@ "ctxt": 0 }, "value": "r7b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9969,7 +9698,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -9980,7 +9708,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -10013,8 +9740,8 @@ "ctxt": 0 }, "value": "r7b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10032,7 +9759,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -10043,7 +9769,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -10076,8 +9801,8 @@ "ctxt": 0 }, "value": "r7b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10095,7 +9820,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -10106,7 +9830,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -10139,8 +9862,8 @@ "ctxt": 0 }, "value": "r7b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10158,7 +9881,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -10169,7 +9891,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -10202,8 +9923,8 @@ "ctxt": 0 }, "value": "r7b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10221,7 +9942,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -10232,7 +9952,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -10265,8 +9984,8 @@ "ctxt": 0 }, "value": "r7b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10284,7 +10003,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false }, "right": { @@ -10295,7 +10013,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false } }, @@ -10328,8 +10045,8 @@ "ctxt": 0 }, "value": "r7b9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10347,7 +10064,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false }, "right": { @@ -10358,7 +10074,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false } }, @@ -10391,8 +10106,8 @@ "ctxt": 0 }, "value": "r8a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10410,7 +10125,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -10421,7 +10135,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -10454,8 +10167,8 @@ "ctxt": 0 }, "value": "r8a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10473,7 +10186,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -10484,7 +10196,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -10517,8 +10228,8 @@ "ctxt": 0 }, "value": "r8a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10536,7 +10247,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -10547,7 +10257,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -10580,8 +10289,8 @@ "ctxt": 0 }, "value": "r8a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10599,7 +10308,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -10610,7 +10318,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -10643,8 +10350,8 @@ "ctxt": 0 }, "value": "r8a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10662,7 +10369,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -10673,7 +10379,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -10706,8 +10411,8 @@ "ctxt": 0 }, "value": "r8a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10725,7 +10430,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -10736,7 +10440,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -10769,8 +10472,8 @@ "ctxt": 0 }, "value": "r8a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10788,7 +10491,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -10799,7 +10501,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } }, @@ -10832,8 +10533,8 @@ "ctxt": 0 }, "value": "r8a8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10851,7 +10552,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "right": { @@ -10862,7 +10562,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false } }, @@ -10895,8 +10594,8 @@ "ctxt": 0 }, "value": "r8a9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10914,7 +10613,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "right": { @@ -10925,7 +10623,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false } }, @@ -10958,8 +10655,8 @@ "ctxt": 0 }, "value": "r8b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10977,7 +10674,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -10988,7 +10684,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -11021,8 +10716,8 @@ "ctxt": 0 }, "value": "r8b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11040,7 +10735,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -11051,7 +10745,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -11084,8 +10777,8 @@ "ctxt": 0 }, "value": "r8b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11103,7 +10796,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -11114,7 +10806,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -11147,8 +10838,8 @@ "ctxt": 0 }, "value": "r8b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11166,7 +10857,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -11177,7 +10867,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -11210,8 +10899,8 @@ "ctxt": 0 }, "value": "r8b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11229,7 +10918,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -11240,7 +10928,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -11273,8 +10960,8 @@ "ctxt": 0 }, "value": "r8b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11292,7 +10979,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -11303,7 +10989,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -11336,8 +11021,8 @@ "ctxt": 0 }, "value": "r8b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11355,7 +11040,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false }, "right": { @@ -11366,7 +11050,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } }, @@ -11399,8 +11082,8 @@ "ctxt": 0 }, "value": "r8b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11418,7 +11101,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false }, "right": { @@ -11429,7 +11111,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false } }, @@ -11462,8 +11143,8 @@ "ctxt": 0 }, "value": "r8b9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -11481,7 +11162,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false }, "right": { @@ -11492,7 +11172,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnIndexSignature/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnIndexSignature/input.ts.json index 1137a119e831..1579e23d4afa 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnIndexSignature/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnIndexSignature/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -189,6 +184,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -215,6 +211,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -231,8 +228,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -261,8 +257,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -294,6 +289,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -320,6 +316,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -336,8 +333,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -366,8 +362,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -399,6 +394,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -425,6 +421,7 @@ "ctxt": 0 }, "value": "index", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -441,8 +438,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -467,7 +463,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -482,8 +477,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -515,6 +509,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -541,6 +536,7 @@ "ctxt": 0 }, "value": "index", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -557,8 +553,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -583,7 +578,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -598,8 +592,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -631,6 +624,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -657,6 +651,7 @@ "ctxt": 0 }, "value": "index", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -673,8 +668,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -703,8 +697,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -736,6 +729,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -762,6 +756,7 @@ "ctxt": 0 }, "value": "index", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -778,8 +773,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -808,8 +802,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -841,6 +834,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -867,6 +861,7 @@ "ctxt": 0 }, "value": "index", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -883,8 +878,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -909,7 +903,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -924,8 +917,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -957,6 +949,7 @@ "ctxt": 0 }, "value": "b4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -983,6 +976,7 @@ "ctxt": 0 }, "value": "index", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -999,8 +993,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1025,7 +1018,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1040,8 +1032,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1073,8 +1064,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1092,7 +1083,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1103,7 +1093,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -1136,8 +1125,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1155,7 +1144,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1166,7 +1154,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -1199,8 +1186,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1218,7 +1205,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -1229,7 +1215,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -1262,8 +1247,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1281,7 +1266,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -1292,7 +1276,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -1325,8 +1308,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1344,7 +1327,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1355,7 +1337,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -1388,8 +1369,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1407,7 +1388,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1418,7 +1398,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -1451,8 +1430,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1470,7 +1449,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -1481,7 +1459,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -1514,8 +1491,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1533,7 +1510,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -1544,7 +1520,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -1577,8 +1552,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1596,7 +1571,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1607,7 +1581,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -1640,8 +1613,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1659,7 +1632,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1670,7 +1642,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -1703,8 +1674,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1722,7 +1693,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -1733,7 +1703,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -1766,8 +1735,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1785,7 +1754,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -1796,7 +1764,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -1829,8 +1796,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1848,7 +1815,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1859,7 +1825,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -1892,8 +1857,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1911,7 +1876,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1922,7 +1886,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -1955,8 +1918,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1974,7 +1937,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -1985,7 +1947,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -2018,8 +1979,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2037,7 +1998,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -2048,7 +2008,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -2081,8 +2040,8 @@ "ctxt": 0 }, "value": "r3a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2100,7 +2059,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2111,7 +2069,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -2144,8 +2101,8 @@ "ctxt": 0 }, "value": "r3a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2163,7 +2120,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2174,7 +2130,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -2207,8 +2162,8 @@ "ctxt": 0 }, "value": "r3a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2226,7 +2181,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2237,7 +2191,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -2270,8 +2223,8 @@ "ctxt": 0 }, "value": "r3a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2289,7 +2242,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -2300,7 +2252,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -2333,8 +2284,8 @@ "ctxt": 0 }, "value": "r3b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2352,7 +2303,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2363,7 +2313,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -2396,8 +2345,8 @@ "ctxt": 0 }, "value": "r3b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2415,7 +2364,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2426,7 +2374,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -2459,8 +2406,8 @@ "ctxt": 0 }, "value": "r3b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2478,7 +2425,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2489,7 +2435,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -2522,8 +2467,8 @@ "ctxt": 0 }, "value": "r3b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2541,7 +2486,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -2552,7 +2496,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -2585,8 +2528,8 @@ "ctxt": 0 }, "value": "r4a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2604,7 +2547,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2615,7 +2557,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -2648,8 +2589,8 @@ "ctxt": 0 }, "value": "r4a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2667,7 +2608,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2678,7 +2618,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -2711,8 +2650,8 @@ "ctxt": 0 }, "value": "r4a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2730,7 +2669,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2741,7 +2679,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -2774,8 +2711,8 @@ "ctxt": 0 }, "value": "r4a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2793,7 +2730,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -2804,7 +2740,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -2837,8 +2772,8 @@ "ctxt": 0 }, "value": "r4b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2856,7 +2791,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2867,7 +2801,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -2900,8 +2833,8 @@ "ctxt": 0 }, "value": "r4b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2919,7 +2852,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2930,7 +2862,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -2963,8 +2894,8 @@ "ctxt": 0 }, "value": "r4b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2982,7 +2913,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2993,7 +2923,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -3026,8 +2955,8 @@ "ctxt": 0 }, "value": "r4b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3045,7 +2974,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3056,7 +2984,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -3089,8 +3016,8 @@ "ctxt": 0 }, "value": "r5a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3108,7 +3035,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3119,7 +3045,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -3152,8 +3077,8 @@ "ctxt": 0 }, "value": "r5a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3171,7 +3096,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3182,7 +3106,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -3215,8 +3138,8 @@ "ctxt": 0 }, "value": "r5a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3234,7 +3157,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3245,7 +3167,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -3278,8 +3199,8 @@ "ctxt": 0 }, "value": "r5a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3297,7 +3218,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3308,7 +3228,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -3341,8 +3260,8 @@ "ctxt": 0 }, "value": "r5b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3360,7 +3279,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3371,7 +3289,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -3404,8 +3321,8 @@ "ctxt": 0 }, "value": "r5b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3423,7 +3340,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3434,7 +3350,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -3467,8 +3382,8 @@ "ctxt": 0 }, "value": "r5b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3486,7 +3401,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3497,7 +3411,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -3530,8 +3443,8 @@ "ctxt": 0 }, "value": "r5b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3549,7 +3462,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3560,7 +3472,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -3593,8 +3504,8 @@ "ctxt": 0 }, "value": "r6a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3612,7 +3523,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3623,7 +3533,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -3656,8 +3565,8 @@ "ctxt": 0 }, "value": "r6a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3675,7 +3584,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3686,7 +3594,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -3719,8 +3626,8 @@ "ctxt": 0 }, "value": "r6a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3738,7 +3645,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3749,7 +3655,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -3782,8 +3687,8 @@ "ctxt": 0 }, "value": "r6a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3801,7 +3706,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3812,7 +3716,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -3845,8 +3748,8 @@ "ctxt": 0 }, "value": "r6b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3864,7 +3767,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3875,7 +3777,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -3908,8 +3809,8 @@ "ctxt": 0 }, "value": "r6b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3927,7 +3828,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3938,7 +3838,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -3971,8 +3870,8 @@ "ctxt": 0 }, "value": "r6b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3990,7 +3889,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4001,7 +3899,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -4034,8 +3931,8 @@ "ctxt": 0 }, "value": "r6b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4053,7 +3950,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4064,7 +3960,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -4097,8 +3992,8 @@ "ctxt": 0 }, "value": "r7a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4116,7 +4011,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4127,7 +4021,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -4160,8 +4053,8 @@ "ctxt": 0 }, "value": "r7a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4179,7 +4072,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4190,7 +4082,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -4223,8 +4114,8 @@ "ctxt": 0 }, "value": "r7a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4242,7 +4133,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4253,7 +4143,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -4286,8 +4175,8 @@ "ctxt": 0 }, "value": "r7a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4305,7 +4194,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4316,7 +4204,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -4349,8 +4236,8 @@ "ctxt": 0 }, "value": "r7b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4368,7 +4255,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4379,7 +4265,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -4412,8 +4297,8 @@ "ctxt": 0 }, "value": "r7b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4431,7 +4316,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4442,7 +4326,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -4475,8 +4358,8 @@ "ctxt": 0 }, "value": "r7b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4494,7 +4377,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4505,7 +4387,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -4538,8 +4419,8 @@ "ctxt": 0 }, "value": "r7b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4557,7 +4438,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4568,7 +4448,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -4601,8 +4480,8 @@ "ctxt": 0 }, "value": "r8a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4620,7 +4499,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4631,7 +4509,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -4664,8 +4541,8 @@ "ctxt": 0 }, "value": "r8a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4683,7 +4560,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4694,7 +4570,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -4727,8 +4602,8 @@ "ctxt": 0 }, "value": "r8a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4746,7 +4621,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4757,7 +4631,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -4790,8 +4663,8 @@ "ctxt": 0 }, "value": "r8a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4809,7 +4682,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4820,7 +4692,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -4853,8 +4724,8 @@ "ctxt": 0 }, "value": "r8b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4872,7 +4743,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4883,7 +4753,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -4916,8 +4785,8 @@ "ctxt": 0 }, "value": "r8b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4935,7 +4804,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4946,7 +4814,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -4979,8 +4846,8 @@ "ctxt": 0 }, "value": "r8b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4998,7 +4865,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -5009,7 +4875,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -5042,8 +4907,8 @@ "ctxt": 0 }, "value": "r8b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5061,7 +4926,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -5072,7 +4936,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature/input.ts.json index 46761a68e4c9..47f2f60cda6c 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -189,6 +184,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -220,7 +216,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -234,6 +229,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -256,13 +252,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -287,7 +281,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -316,7 +309,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -327,8 +319,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -360,6 +351,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -391,7 +383,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -405,6 +396,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -421,8 +413,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -446,8 +437,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -479,6 +469,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -510,7 +501,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -524,6 +514,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -546,13 +537,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -577,7 +566,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -606,7 +594,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -617,8 +604,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -650,6 +636,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -681,7 +668,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -695,6 +681,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -711,8 +698,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -722,6 +708,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -738,8 +725,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -763,8 +749,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -796,6 +781,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -827,7 +813,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -841,6 +826,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -863,13 +849,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -879,6 +863,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -901,13 +886,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -932,7 +915,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -961,7 +943,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -982,7 +963,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -993,8 +973,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1026,6 +1005,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1057,7 +1037,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1071,6 +1050,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1087,8 +1067,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1098,6 +1077,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1114,8 +1094,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -1139,8 +1118,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1172,6 +1150,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1203,7 +1182,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1217,6 +1195,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1239,13 +1218,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnn": { @@ -1270,7 +1247,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1299,7 +1275,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1310,8 +1285,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1343,6 +1317,7 @@ "ctxt": 0 }, "value": "b4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1374,7 +1349,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1388,6 +1362,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1404,8 +1379,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "typeAnn": { @@ -1429,8 +1403,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1462,6 +1435,7 @@ "ctxt": 0 }, "value": "a5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1493,7 +1467,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1519,8 +1492,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1551,7 +1524,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1582,7 +1554,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1611,7 +1582,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1622,8 +1592,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1655,6 +1624,7 @@ "ctxt": 0 }, "value": "b5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1686,7 +1656,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1712,8 +1681,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1763,8 +1732,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1796,6 +1764,7 @@ "ctxt": 0 }, "value": "a6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1827,7 +1796,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1841,6 +1809,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1863,13 +1832,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1879,6 +1846,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1901,13 +1869,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1932,7 +1898,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1961,7 +1926,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1972,8 +1936,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2005,6 +1968,7 @@ "ctxt": 0 }, "value": "b6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2036,7 +2000,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2050,6 +2013,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2066,8 +2030,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2077,6 +2040,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2093,8 +2057,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -2118,8 +2081,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2151,6 +2113,7 @@ "ctxt": 0 }, "value": "b7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2182,7 +2145,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2196,6 +2158,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2218,13 +2181,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2234,6 +2195,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2256,13 +2218,11 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -2287,7 +2247,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2297,8 +2256,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2330,8 +2288,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2349,7 +2307,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2360,7 +2317,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -2393,8 +2349,8 @@ "ctxt": 0 }, "value": "r1a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2412,7 +2368,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2423,7 +2378,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -2456,8 +2410,8 @@ "ctxt": 0 }, "value": "r1a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2475,7 +2429,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2486,7 +2439,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -2519,8 +2471,8 @@ "ctxt": 0 }, "value": "r1a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2538,7 +2490,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -2549,7 +2500,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -2582,8 +2532,8 @@ "ctxt": 0 }, "value": "r1a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2601,7 +2551,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -2612,7 +2561,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -2645,8 +2593,8 @@ "ctxt": 0 }, "value": "r1a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2664,7 +2612,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -2675,7 +2622,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -2708,8 +2654,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2727,7 +2673,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2738,7 +2683,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -2771,8 +2715,8 @@ "ctxt": 0 }, "value": "r1b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2790,7 +2734,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2801,7 +2744,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -2834,8 +2776,8 @@ "ctxt": 0 }, "value": "r1b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2853,7 +2795,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2864,7 +2805,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -2897,8 +2837,8 @@ "ctxt": 0 }, "value": "r1b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2916,7 +2856,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -2927,7 +2866,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -2960,8 +2898,8 @@ "ctxt": 0 }, "value": "r1b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2979,7 +2917,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -2990,7 +2927,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -3023,8 +2959,8 @@ "ctxt": 0 }, "value": "r1b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3042,7 +2978,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -3053,7 +2988,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -3086,8 +3020,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3105,7 +3039,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3116,7 +3049,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -3149,8 +3081,8 @@ "ctxt": 0 }, "value": "r2a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3168,7 +3100,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3179,7 +3110,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -3212,8 +3142,8 @@ "ctxt": 0 }, "value": "r2a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3231,7 +3161,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3242,7 +3171,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -3275,8 +3203,8 @@ "ctxt": 0 }, "value": "r2a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3294,7 +3222,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3305,7 +3232,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -3338,8 +3264,8 @@ "ctxt": 0 }, "value": "r2a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3357,7 +3283,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -3368,7 +3293,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -3401,8 +3325,8 @@ "ctxt": 0 }, "value": "r2a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3420,7 +3344,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -3431,7 +3354,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -3464,8 +3386,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3483,7 +3405,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3494,7 +3415,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -3527,8 +3447,8 @@ "ctxt": 0 }, "value": "r2b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3546,7 +3466,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3557,7 +3476,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -3590,8 +3508,8 @@ "ctxt": 0 }, "value": "r2b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3609,7 +3527,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3620,7 +3537,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -3653,8 +3569,8 @@ "ctxt": 0 }, "value": "r2b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3672,7 +3588,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3683,7 +3598,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -3716,8 +3630,8 @@ "ctxt": 0 }, "value": "r2b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3735,7 +3649,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -3746,7 +3659,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -3779,8 +3691,8 @@ "ctxt": 0 }, "value": "r2b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3798,7 +3710,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -3809,7 +3720,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -3842,8 +3752,8 @@ "ctxt": 0 }, "value": "r3a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3861,7 +3771,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3872,7 +3781,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -3905,8 +3813,8 @@ "ctxt": 0 }, "value": "r3a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3924,7 +3832,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3935,7 +3842,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -3968,8 +3874,8 @@ "ctxt": 0 }, "value": "r3a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3987,7 +3893,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3998,7 +3903,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -4031,8 +3935,8 @@ "ctxt": 0 }, "value": "r3a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4050,7 +3954,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4061,7 +3964,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -4094,8 +3996,8 @@ "ctxt": 0 }, "value": "r3a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4113,7 +4015,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -4124,7 +4025,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -4157,8 +4057,8 @@ "ctxt": 0 }, "value": "r3a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4176,7 +4076,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -4187,7 +4086,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -4220,8 +4118,8 @@ "ctxt": 0 }, "value": "r3b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4239,7 +4137,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4250,7 +4147,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -4283,8 +4179,8 @@ "ctxt": 0 }, "value": "r3b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4302,7 +4198,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4313,7 +4208,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -4346,8 +4240,8 @@ "ctxt": 0 }, "value": "r3b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4365,7 +4259,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4376,7 +4269,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -4409,8 +4301,8 @@ "ctxt": 0 }, "value": "r3b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4428,7 +4320,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4439,7 +4330,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -4472,8 +4362,8 @@ "ctxt": 0 }, "value": "r3b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4491,7 +4381,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -4502,7 +4391,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -4535,8 +4423,8 @@ "ctxt": 0 }, "value": "r3b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4554,7 +4442,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -4565,7 +4452,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -4598,8 +4484,8 @@ "ctxt": 0 }, "value": "r4a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4617,7 +4503,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4628,7 +4513,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -4661,8 +4545,8 @@ "ctxt": 0 }, "value": "r4a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4680,7 +4564,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4691,7 +4574,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -4724,8 +4606,8 @@ "ctxt": 0 }, "value": "r4a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4743,7 +4625,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4754,7 +4635,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -4787,8 +4667,8 @@ "ctxt": 0 }, "value": "r4a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4806,7 +4686,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4817,7 +4696,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -4850,8 +4728,8 @@ "ctxt": 0 }, "value": "r4a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4869,7 +4747,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -4880,7 +4757,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -4913,8 +4789,8 @@ "ctxt": 0 }, "value": "r4a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4932,7 +4808,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -4943,7 +4818,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -4976,8 +4850,8 @@ "ctxt": 0 }, "value": "r4b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4995,7 +4869,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -5006,7 +4879,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -5039,8 +4911,8 @@ "ctxt": 0 }, "value": "r4b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5058,7 +4930,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -5069,7 +4940,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -5102,8 +4972,8 @@ "ctxt": 0 }, "value": "r4b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5121,7 +4991,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -5132,7 +5001,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -5165,8 +5033,8 @@ "ctxt": 0 }, "value": "r4b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5184,7 +5052,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -5195,7 +5062,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -5228,8 +5094,8 @@ "ctxt": 0 }, "value": "r4b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5247,7 +5113,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -5258,7 +5123,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -5291,8 +5155,8 @@ "ctxt": 0 }, "value": "r4b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5310,7 +5174,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -5321,7 +5184,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -5354,8 +5216,8 @@ "ctxt": 0 }, "value": "r5a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5373,7 +5235,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -5384,7 +5245,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -5417,8 +5277,8 @@ "ctxt": 0 }, "value": "r5a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5436,7 +5296,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -5447,7 +5306,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -5480,8 +5338,8 @@ "ctxt": 0 }, "value": "r5a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5499,7 +5357,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -5510,7 +5367,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -5543,8 +5399,8 @@ "ctxt": 0 }, "value": "r5a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5562,7 +5418,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -5573,7 +5428,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -5606,8 +5460,8 @@ "ctxt": 0 }, "value": "r5a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5625,7 +5479,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -5636,7 +5489,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -5669,8 +5521,8 @@ "ctxt": 0 }, "value": "r5a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5688,7 +5540,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -5699,7 +5550,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -5732,8 +5582,8 @@ "ctxt": 0 }, "value": "r5b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5751,7 +5601,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -5762,7 +5611,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -5795,8 +5643,8 @@ "ctxt": 0 }, "value": "r5b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5814,7 +5662,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -5825,7 +5672,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -5858,8 +5704,8 @@ "ctxt": 0 }, "value": "r5b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5877,7 +5723,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -5888,7 +5733,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -5921,8 +5765,8 @@ "ctxt": 0 }, "value": "r5b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5940,7 +5784,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -5951,7 +5794,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -5984,8 +5826,8 @@ "ctxt": 0 }, "value": "r5b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6003,7 +5845,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -6014,7 +5855,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -6047,8 +5887,8 @@ "ctxt": 0 }, "value": "r5b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6066,7 +5906,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -6077,7 +5916,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -6110,8 +5948,8 @@ "ctxt": 0 }, "value": "r6a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6129,7 +5967,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -6140,7 +5977,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -6173,8 +6009,8 @@ "ctxt": 0 }, "value": "r6a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6192,7 +6028,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -6203,7 +6038,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -6236,8 +6070,8 @@ "ctxt": 0 }, "value": "r6a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6255,7 +6089,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -6266,7 +6099,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -6299,8 +6131,8 @@ "ctxt": 0 }, "value": "r6a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6318,7 +6150,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -6329,7 +6160,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -6362,8 +6192,8 @@ "ctxt": 0 }, "value": "r6a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6381,7 +6211,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -6392,7 +6221,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -6425,8 +6253,8 @@ "ctxt": 0 }, "value": "r6a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6444,7 +6272,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -6455,7 +6282,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -6488,8 +6314,8 @@ "ctxt": 0 }, "value": "r6b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6507,7 +6333,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -6518,7 +6343,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -6551,8 +6375,8 @@ "ctxt": 0 }, "value": "r6b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6570,7 +6394,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -6581,7 +6404,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -6614,8 +6436,8 @@ "ctxt": 0 }, "value": "r6b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6633,7 +6455,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -6644,7 +6465,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -6677,8 +6497,8 @@ "ctxt": 0 }, "value": "r6b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6696,7 +6516,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -6707,7 +6526,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -6740,8 +6558,8 @@ "ctxt": 0 }, "value": "r6b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6759,7 +6577,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -6770,7 +6587,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -6803,8 +6619,8 @@ "ctxt": 0 }, "value": "r6b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6822,7 +6638,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -6833,7 +6648,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -6866,8 +6680,8 @@ "ctxt": 0 }, "value": "r7a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6885,7 +6699,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -6896,7 +6709,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -6929,8 +6741,8 @@ "ctxt": 0 }, "value": "r7a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6948,7 +6760,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -6959,7 +6770,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -6992,8 +6802,8 @@ "ctxt": 0 }, "value": "r7a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7011,7 +6821,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -7022,7 +6831,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -7055,8 +6863,8 @@ "ctxt": 0 }, "value": "r7a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7074,7 +6882,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -7085,7 +6892,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -7118,8 +6924,8 @@ "ctxt": 0 }, "value": "r7a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7137,7 +6943,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -7148,7 +6953,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -7181,8 +6985,8 @@ "ctxt": 0 }, "value": "r7a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7200,7 +7004,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -7211,7 +7014,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -7244,8 +7046,8 @@ "ctxt": 0 }, "value": "r7b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7263,7 +7065,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -7274,7 +7075,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -7307,8 +7107,8 @@ "ctxt": 0 }, "value": "r7b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7326,7 +7126,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -7337,7 +7136,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -7370,8 +7168,8 @@ "ctxt": 0 }, "value": "r7b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7389,7 +7187,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -7400,7 +7197,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -7433,8 +7229,8 @@ "ctxt": 0 }, "value": "r7b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7452,7 +7248,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -7463,7 +7258,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -7496,8 +7290,8 @@ "ctxt": 0 }, "value": "r7b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7515,7 +7309,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -7526,7 +7319,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -7559,8 +7351,8 @@ "ctxt": 0 }, "value": "r7b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7578,7 +7370,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -7589,7 +7380,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -7622,8 +7412,8 @@ "ctxt": 0 }, "value": "r8a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7641,7 +7431,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -7652,7 +7441,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -7685,8 +7473,8 @@ "ctxt": 0 }, "value": "r8a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7704,7 +7492,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -7715,7 +7502,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -7748,8 +7534,8 @@ "ctxt": 0 }, "value": "r8a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7767,7 +7553,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -7778,7 +7563,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -7811,8 +7595,8 @@ "ctxt": 0 }, "value": "r8a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7830,7 +7614,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -7841,7 +7624,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -7874,8 +7656,8 @@ "ctxt": 0 }, "value": "r8a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7893,7 +7675,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -7904,7 +7685,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -7937,8 +7717,8 @@ "ctxt": 0 }, "value": "r8a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7956,7 +7736,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -7967,7 +7746,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -8000,8 +7778,8 @@ "ctxt": 0 }, "value": "r8b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8019,7 +7797,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -8030,7 +7807,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -8063,8 +7839,8 @@ "ctxt": 0 }, "value": "r8b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8082,7 +7858,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -8093,7 +7868,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -8126,8 +7900,8 @@ "ctxt": 0 }, "value": "r8b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8145,7 +7919,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -8156,7 +7929,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -8189,8 +7961,8 @@ "ctxt": 0 }, "value": "r8b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8208,7 +7980,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -8219,7 +7990,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -8252,8 +8022,8 @@ "ctxt": 0 }, "value": "r8b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8271,7 +8041,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -8282,7 +8051,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -8315,8 +8083,8 @@ "ctxt": 0 }, "value": "r8b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8334,7 +8102,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -8345,7 +8112,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature/input.ts.json index b53f3738fcc2..0e8707c8f0cf 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -189,6 +184,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -220,6 +216,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -242,13 +239,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -273,7 +268,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -302,7 +296,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -313,8 +306,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -346,6 +338,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -377,6 +370,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -393,8 +387,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -418,8 +411,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -451,6 +443,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -482,6 +475,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -504,13 +498,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -535,7 +527,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -564,7 +555,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -575,8 +565,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -608,6 +597,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -639,6 +629,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -655,8 +646,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -666,6 +656,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -682,8 +673,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -707,8 +697,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -740,6 +729,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -771,6 +761,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -793,13 +784,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -809,6 +798,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -831,13 +821,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -862,7 +850,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -891,7 +878,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -912,7 +898,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -923,8 +908,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -956,6 +940,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -987,6 +972,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1003,8 +989,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1014,6 +999,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1030,8 +1016,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1055,8 +1040,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1088,6 +1072,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1119,6 +1104,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1141,13 +1127,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnnotation": { @@ -1172,7 +1156,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1201,7 +1184,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1212,8 +1194,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1245,6 +1226,7 @@ "ctxt": 0 }, "value": "b4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1276,6 +1258,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1292,8 +1275,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -1317,8 +1299,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1350,6 +1331,7 @@ "ctxt": 0 }, "value": "a5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1393,8 +1375,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1425,7 +1407,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1456,7 +1437,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1485,7 +1465,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1496,8 +1475,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1529,6 +1507,7 @@ "ctxt": 0 }, "value": "b5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1572,8 +1551,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1623,8 +1602,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1656,6 +1634,7 @@ "ctxt": 0 }, "value": "a6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1687,6 +1666,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1709,13 +1689,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1725,6 +1703,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1747,13 +1726,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1778,7 +1755,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1807,7 +1783,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1818,8 +1793,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1851,6 +1825,7 @@ "ctxt": 0 }, "value": "b6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1882,6 +1857,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1898,8 +1874,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1909,6 +1884,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1925,8 +1901,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1950,8 +1925,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1983,6 +1957,7 @@ "ctxt": 0 }, "value": "b7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2014,6 +1989,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2036,13 +2012,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2052,6 +2026,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2074,13 +2049,11 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2105,7 +2078,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2115,8 +2087,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2148,8 +2119,8 @@ "ctxt": 0 }, "value": "r1a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2167,7 +2138,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2178,7 +2148,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -2211,8 +2180,8 @@ "ctxt": 0 }, "value": "r1a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2230,7 +2199,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2241,7 +2209,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -2274,8 +2241,8 @@ "ctxt": 0 }, "value": "r1a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2293,7 +2260,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2304,7 +2270,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -2337,8 +2302,8 @@ "ctxt": 0 }, "value": "r1a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2356,7 +2321,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -2367,7 +2331,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -2400,8 +2363,8 @@ "ctxt": 0 }, "value": "r1a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2419,7 +2382,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -2430,7 +2392,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -2463,8 +2424,8 @@ "ctxt": 0 }, "value": "r1a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2482,7 +2443,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -2493,7 +2453,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -2526,8 +2485,8 @@ "ctxt": 0 }, "value": "r1b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2545,7 +2504,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2556,7 +2514,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -2589,8 +2546,8 @@ "ctxt": 0 }, "value": "r1b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2608,7 +2565,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2619,7 +2575,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -2652,8 +2607,8 @@ "ctxt": 0 }, "value": "r1b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2671,7 +2626,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2682,7 +2636,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -2715,8 +2668,8 @@ "ctxt": 0 }, "value": "r1b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2734,7 +2687,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -2745,7 +2697,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -2778,8 +2729,8 @@ "ctxt": 0 }, "value": "r1b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2797,7 +2748,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -2808,7 +2758,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -2841,8 +2790,8 @@ "ctxt": 0 }, "value": "r1b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2860,7 +2809,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -2871,7 +2819,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -2904,8 +2851,8 @@ "ctxt": 0 }, "value": "r2a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2923,7 +2870,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2934,7 +2880,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -2967,8 +2912,8 @@ "ctxt": 0 }, "value": "r2a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2986,7 +2931,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2997,7 +2941,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -3030,8 +2973,8 @@ "ctxt": 0 }, "value": "r2a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3049,7 +2992,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3060,7 +3002,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -3093,8 +3034,8 @@ "ctxt": 0 }, "value": "r2a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3112,7 +3053,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3123,7 +3063,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -3156,8 +3095,8 @@ "ctxt": 0 }, "value": "r2a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3175,7 +3114,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -3186,7 +3124,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -3219,8 +3156,8 @@ "ctxt": 0 }, "value": "r2a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3238,7 +3175,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -3249,7 +3185,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -3282,8 +3217,8 @@ "ctxt": 0 }, "value": "r2b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3301,7 +3236,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3312,7 +3246,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -3345,8 +3278,8 @@ "ctxt": 0 }, "value": "r2b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3364,7 +3297,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3375,7 +3307,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -3408,8 +3339,8 @@ "ctxt": 0 }, "value": "r2b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3427,7 +3358,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3438,7 +3368,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -3471,8 +3400,8 @@ "ctxt": 0 }, "value": "r2b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3490,7 +3419,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3501,7 +3429,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -3534,8 +3461,8 @@ "ctxt": 0 }, "value": "r2b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3553,7 +3480,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -3564,7 +3490,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -3597,8 +3522,8 @@ "ctxt": 0 }, "value": "r2b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3616,7 +3541,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -3627,7 +3551,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -3660,8 +3583,8 @@ "ctxt": 0 }, "value": "r3a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3679,7 +3602,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -3690,7 +3612,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -3723,8 +3644,8 @@ "ctxt": 0 }, "value": "r3a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3742,7 +3663,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -3753,7 +3673,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -3786,8 +3705,8 @@ "ctxt": 0 }, "value": "r3a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3805,7 +3724,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -3816,7 +3734,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -3849,8 +3766,8 @@ "ctxt": 0 }, "value": "r3a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3868,7 +3785,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -3879,7 +3795,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -3912,8 +3827,8 @@ "ctxt": 0 }, "value": "r3a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3931,7 +3846,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -3942,7 +3856,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -3975,8 +3888,8 @@ "ctxt": 0 }, "value": "r3a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3994,7 +3907,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -4005,7 +3917,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -4038,8 +3949,8 @@ "ctxt": 0 }, "value": "r3b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4057,7 +3968,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4068,7 +3978,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -4101,8 +4010,8 @@ "ctxt": 0 }, "value": "r3b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4120,7 +4029,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4131,7 +4039,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -4164,8 +4071,8 @@ "ctxt": 0 }, "value": "r3b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4183,7 +4090,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4194,7 +4100,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -4227,8 +4132,8 @@ "ctxt": 0 }, "value": "r3b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4246,7 +4151,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4257,7 +4161,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -4290,8 +4193,8 @@ "ctxt": 0 }, "value": "r3b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4309,7 +4212,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -4320,7 +4222,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -4353,8 +4254,8 @@ "ctxt": 0 }, "value": "r3b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4372,7 +4273,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -4383,7 +4283,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -4416,8 +4315,8 @@ "ctxt": 0 }, "value": "r4a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4435,7 +4334,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4446,7 +4344,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -4479,8 +4376,8 @@ "ctxt": 0 }, "value": "r4a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4498,7 +4395,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4509,7 +4405,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -4542,8 +4437,8 @@ "ctxt": 0 }, "value": "r4a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4561,7 +4456,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4572,7 +4466,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -4605,8 +4498,8 @@ "ctxt": 0 }, "value": "r4a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4624,7 +4517,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -4635,7 +4527,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -4668,8 +4559,8 @@ "ctxt": 0 }, "value": "r4a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4687,7 +4578,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -4698,7 +4588,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -4731,8 +4620,8 @@ "ctxt": 0 }, "value": "r4a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4750,7 +4639,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -4761,7 +4649,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -4794,8 +4681,8 @@ "ctxt": 0 }, "value": "r4b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4813,7 +4700,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -4824,7 +4710,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -4857,8 +4742,8 @@ "ctxt": 0 }, "value": "r4b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4876,7 +4761,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -4887,7 +4771,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -4920,8 +4803,8 @@ "ctxt": 0 }, "value": "r4b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4939,7 +4822,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -4950,7 +4832,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -4983,8 +4864,8 @@ "ctxt": 0 }, "value": "r4b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5002,7 +4883,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -5013,7 +4893,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -5046,8 +4925,8 @@ "ctxt": 0 }, "value": "r4b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5065,7 +4944,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -5076,7 +4954,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -5109,8 +4986,8 @@ "ctxt": 0 }, "value": "r4b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5128,7 +5005,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -5139,7 +5015,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -5172,8 +5047,8 @@ "ctxt": 0 }, "value": "r5a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5191,7 +5066,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -5202,7 +5076,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -5235,8 +5108,8 @@ "ctxt": 0 }, "value": "r5a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5254,7 +5127,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -5265,7 +5137,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -5298,8 +5169,8 @@ "ctxt": 0 }, "value": "r5a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5317,7 +5188,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -5328,7 +5198,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -5361,8 +5230,8 @@ "ctxt": 0 }, "value": "r5a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5380,7 +5249,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -5391,7 +5259,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -5424,8 +5291,8 @@ "ctxt": 0 }, "value": "r5a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5443,7 +5310,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -5454,7 +5320,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -5487,8 +5352,8 @@ "ctxt": 0 }, "value": "r5a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5506,7 +5371,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -5517,7 +5381,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -5550,8 +5413,8 @@ "ctxt": 0 }, "value": "r5b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5569,7 +5432,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -5580,7 +5442,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -5613,8 +5474,8 @@ "ctxt": 0 }, "value": "r5b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5632,7 +5493,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -5643,7 +5503,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -5676,8 +5535,8 @@ "ctxt": 0 }, "value": "r5b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5695,7 +5554,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -5706,7 +5564,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -5739,8 +5596,8 @@ "ctxt": 0 }, "value": "r5b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5758,7 +5615,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -5769,7 +5625,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -5802,8 +5657,8 @@ "ctxt": 0 }, "value": "r5b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5821,7 +5676,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -5832,7 +5686,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -5865,8 +5718,8 @@ "ctxt": 0 }, "value": "r5b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5884,7 +5737,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -5895,7 +5747,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -5928,8 +5779,8 @@ "ctxt": 0 }, "value": "r6a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5947,7 +5798,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -5958,7 +5808,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -5991,8 +5840,8 @@ "ctxt": 0 }, "value": "r6a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6010,7 +5859,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -6021,7 +5869,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -6054,8 +5901,8 @@ "ctxt": 0 }, "value": "r6a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6073,7 +5920,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -6084,7 +5930,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -6117,8 +5962,8 @@ "ctxt": 0 }, "value": "r6a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6136,7 +5981,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -6147,7 +5991,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -6180,8 +6023,8 @@ "ctxt": 0 }, "value": "r6a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6199,7 +6042,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -6210,7 +6052,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -6243,8 +6084,8 @@ "ctxt": 0 }, "value": "r6a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6262,7 +6103,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -6273,7 +6113,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -6306,8 +6145,8 @@ "ctxt": 0 }, "value": "r6b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6325,7 +6164,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -6336,7 +6174,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -6369,8 +6206,8 @@ "ctxt": 0 }, "value": "r6b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6388,7 +6225,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -6399,7 +6235,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -6432,8 +6267,8 @@ "ctxt": 0 }, "value": "r6b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6451,7 +6286,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -6462,7 +6296,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -6495,8 +6328,8 @@ "ctxt": 0 }, "value": "r6b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6514,7 +6347,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -6525,7 +6357,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -6558,8 +6389,8 @@ "ctxt": 0 }, "value": "r6b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6577,7 +6408,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -6588,7 +6418,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -6621,8 +6450,8 @@ "ctxt": 0 }, "value": "r6b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6640,7 +6469,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -6651,7 +6479,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -6684,8 +6511,8 @@ "ctxt": 0 }, "value": "r7a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6703,7 +6530,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -6714,7 +6540,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -6747,8 +6572,8 @@ "ctxt": 0 }, "value": "r7a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6766,7 +6591,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -6777,7 +6601,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -6810,8 +6633,8 @@ "ctxt": 0 }, "value": "r7a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6829,7 +6652,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -6840,7 +6662,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -6873,8 +6694,8 @@ "ctxt": 0 }, "value": "r7a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6892,7 +6713,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -6903,7 +6723,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -6936,8 +6755,8 @@ "ctxt": 0 }, "value": "r7a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6955,7 +6774,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -6966,7 +6784,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -6999,8 +6816,8 @@ "ctxt": 0 }, "value": "r7a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7018,7 +6835,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -7029,7 +6845,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -7062,8 +6877,8 @@ "ctxt": 0 }, "value": "r7b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7081,7 +6896,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -7092,7 +6906,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -7125,8 +6938,8 @@ "ctxt": 0 }, "value": "r7b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7144,7 +6957,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -7155,7 +6967,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -7188,8 +6999,8 @@ "ctxt": 0 }, "value": "r7b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7207,7 +7018,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -7218,7 +7028,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -7251,8 +7060,8 @@ "ctxt": 0 }, "value": "r7b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7270,7 +7079,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -7281,7 +7089,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -7314,8 +7121,8 @@ "ctxt": 0 }, "value": "r7b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7333,7 +7140,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -7344,7 +7150,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -7377,8 +7182,8 @@ "ctxt": 0 }, "value": "r7b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7396,7 +7201,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -7407,7 +7211,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -7440,8 +7243,8 @@ "ctxt": 0 }, "value": "r8a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7459,7 +7262,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -7470,7 +7272,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -7503,8 +7304,8 @@ "ctxt": 0 }, "value": "r8a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7522,7 +7323,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -7533,7 +7333,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -7566,8 +7365,8 @@ "ctxt": 0 }, "value": "r8a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7585,7 +7384,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -7596,7 +7394,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -7629,8 +7426,8 @@ "ctxt": 0 }, "value": "r8a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7648,7 +7445,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -7659,7 +7455,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -7692,8 +7487,8 @@ "ctxt": 0 }, "value": "r8a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7711,7 +7506,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -7722,7 +7516,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -7755,8 +7548,8 @@ "ctxt": 0 }, "value": "r8a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7774,7 +7567,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -7785,7 +7577,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } }, @@ -7818,8 +7609,8 @@ "ctxt": 0 }, "value": "r8b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7837,7 +7628,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -7848,7 +7638,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -7881,8 +7670,8 @@ "ctxt": 0 }, "value": "r8b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7900,7 +7689,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -7911,7 +7699,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -7944,8 +7731,8 @@ "ctxt": 0 }, "value": "r8b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -7963,7 +7750,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -7974,7 +7760,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -8007,8 +7792,8 @@ "ctxt": 0 }, "value": "r8b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8026,7 +7811,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -8037,7 +7821,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -8070,8 +7853,8 @@ "ctxt": 0 }, "value": "r8b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8089,7 +7872,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false }, "right": { @@ -8100,7 +7882,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -8133,8 +7914,8 @@ "ctxt": 0 }, "value": "r8b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -8152,7 +7933,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false }, "right": { @@ -8163,7 +7943,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnOptionalProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnOptionalProperty/input.ts.json index 111a5ea71b4c..579183aa12ae 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnOptionalProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnOptionalProperty/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -137,7 +134,6 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -167,7 +163,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -221,6 +216,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -243,13 +239,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -281,6 +275,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -303,13 +298,11 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -341,8 +334,8 @@ "ctxt": 0 }, "value": "ra1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -360,7 +353,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -371,7 +363,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -404,8 +395,8 @@ "ctxt": 0 }, "value": "ra2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -423,7 +414,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -434,7 +424,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -467,8 +456,8 @@ "ctxt": 0 }, "value": "rb1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -486,7 +475,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -497,7 +485,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -530,8 +517,8 @@ "ctxt": 0 }, "value": "rb2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -549,7 +536,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -560,7 +546,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -593,8 +578,8 @@ "ctxt": 0 }, "value": "rc1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -612,7 +597,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -623,7 +607,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -656,8 +639,8 @@ "ctxt": 0 }, "value": "rc2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -675,7 +658,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -686,7 +668,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -719,8 +700,8 @@ "ctxt": 0 }, "value": "rd1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -738,7 +719,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -749,7 +729,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -782,8 +761,8 @@ "ctxt": 0 }, "value": "rd2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -801,7 +780,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -812,7 +790,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -845,8 +822,8 @@ "ctxt": 0 }, "value": "re1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -864,7 +841,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -875,7 +851,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -908,8 +883,8 @@ "ctxt": 0 }, "value": "re2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -927,7 +902,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -938,7 +912,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -971,8 +944,8 @@ "ctxt": 0 }, "value": "rf1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -990,7 +963,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1001,7 +973,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1034,8 +1005,8 @@ "ctxt": 0 }, "value": "rf2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1053,7 +1024,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1064,7 +1034,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1097,8 +1066,8 @@ "ctxt": 0 }, "value": "rg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1116,7 +1085,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1127,7 +1095,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1160,8 +1127,8 @@ "ctxt": 0 }, "value": "rg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1179,7 +1146,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1190,7 +1156,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1223,8 +1188,8 @@ "ctxt": 0 }, "value": "rh1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1242,7 +1207,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1253,7 +1217,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1286,8 +1249,8 @@ "ctxt": 0 }, "value": "rh2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1305,7 +1268,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1316,7 +1278,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnProperty/input.ts.json index 474e9f8fd927..97c9bfc14cf1 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithSubtypeObjectOnProperty/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "A1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -226,7 +219,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -257,7 +249,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -283,7 +274,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -316,7 +306,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -342,7 +331,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -368,7 +356,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -399,7 +386,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -425,7 +411,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -458,7 +443,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -484,7 +468,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -516,7 +499,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -542,7 +524,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -566,7 +547,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -599,6 +579,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -621,13 +602,11 @@ "ctxt": 0 }, "value": "A1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -659,6 +638,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -681,13 +661,11 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -719,6 +697,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -741,13 +720,11 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -779,6 +756,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -801,13 +779,11 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -839,8 +815,8 @@ "ctxt": 0 }, "value": "ra1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -858,7 +834,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -869,7 +844,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -902,8 +876,8 @@ "ctxt": 0 }, "value": "ra2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -921,7 +895,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -932,7 +905,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -965,8 +937,8 @@ "ctxt": 0 }, "value": "ra3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -984,7 +956,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -995,7 +966,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -1028,8 +998,8 @@ "ctxt": 0 }, "value": "ra4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1047,7 +1017,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1058,7 +1027,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -1091,8 +1059,8 @@ "ctxt": 0 }, "value": "rb1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1110,7 +1078,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1121,7 +1088,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -1154,8 +1120,8 @@ "ctxt": 0 }, "value": "rb2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1173,7 +1139,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1184,7 +1149,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -1217,8 +1181,8 @@ "ctxt": 0 }, "value": "rb3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1236,7 +1200,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1247,7 +1210,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -1280,8 +1242,8 @@ "ctxt": 0 }, "value": "rb4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1299,7 +1261,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1310,7 +1271,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -1343,8 +1303,8 @@ "ctxt": 0 }, "value": "rc1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1362,7 +1322,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1373,7 +1332,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -1406,8 +1364,8 @@ "ctxt": 0 }, "value": "rc2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1425,7 +1383,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1436,7 +1393,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -1469,8 +1425,8 @@ "ctxt": 0 }, "value": "rc3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1488,7 +1444,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1499,7 +1454,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -1532,8 +1486,8 @@ "ctxt": 0 }, "value": "rc4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1551,7 +1505,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1562,7 +1515,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -1595,8 +1547,8 @@ "ctxt": 0 }, "value": "rd1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1614,7 +1566,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1625,7 +1576,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -1658,8 +1608,8 @@ "ctxt": 0 }, "value": "rd2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1677,7 +1627,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1688,7 +1637,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -1721,8 +1669,8 @@ "ctxt": 0 }, "value": "rd3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1740,7 +1688,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1751,7 +1698,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -1784,8 +1730,8 @@ "ctxt": 0 }, "value": "rd4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1803,7 +1749,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1814,7 +1759,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -1847,8 +1791,8 @@ "ctxt": 0 }, "value": "re1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1866,7 +1810,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1877,7 +1820,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -1910,8 +1852,8 @@ "ctxt": 0 }, "value": "re2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1929,7 +1871,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1940,7 +1881,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -1973,8 +1913,8 @@ "ctxt": 0 }, "value": "re3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1992,7 +1932,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2003,7 +1942,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -2036,8 +1974,8 @@ "ctxt": 0 }, "value": "re4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2055,7 +1993,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2066,7 +2003,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -2099,8 +2035,8 @@ "ctxt": 0 }, "value": "rf1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2118,7 +2054,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2129,7 +2064,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -2162,8 +2096,8 @@ "ctxt": 0 }, "value": "rf2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2181,7 +2115,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2192,7 +2125,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -2225,8 +2157,8 @@ "ctxt": 0 }, "value": "rf3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2244,7 +2176,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2255,7 +2186,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -2288,8 +2218,8 @@ "ctxt": 0 }, "value": "rf4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2307,7 +2237,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2318,7 +2247,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -2351,8 +2279,8 @@ "ctxt": 0 }, "value": "rg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2370,7 +2298,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2381,7 +2308,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -2414,8 +2340,8 @@ "ctxt": 0 }, "value": "rg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2433,7 +2359,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2444,7 +2369,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -2477,8 +2401,8 @@ "ctxt": 0 }, "value": "rg3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2496,7 +2420,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2507,7 +2430,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -2540,8 +2462,8 @@ "ctxt": 0 }, "value": "rg4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2559,7 +2481,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2570,7 +2491,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -2603,8 +2523,8 @@ "ctxt": 0 }, "value": "rh1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2622,7 +2542,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2633,7 +2552,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -2666,8 +2584,8 @@ "ctxt": 0 }, "value": "rh2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2685,7 +2603,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2696,7 +2613,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -2729,8 +2645,8 @@ "ctxt": 0 }, "value": "rh3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2748,7 +2664,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2759,7 +2674,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -2792,8 +2706,8 @@ "ctxt": 0 }, "value": "rh4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2811,7 +2725,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2822,7 +2735,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithTwoOperandsAreAny/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithTwoOperandsAreAny/input.ts.json index 446c2f3a9e49..bea06d607230 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithTwoOperandsAreAny/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithTwoOperandsAreAny/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,8 +80,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -99,7 +99,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -110,7 +109,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -143,8 +141,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -162,7 +160,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -173,7 +170,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -206,8 +202,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -225,7 +221,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -236,7 +231,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -269,8 +263,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -288,7 +282,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -299,7 +292,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -332,8 +324,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -351,7 +343,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -362,7 +353,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -395,8 +385,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -414,7 +404,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -425,7 +414,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -458,8 +446,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -477,7 +465,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -488,7 +475,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -521,8 +507,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -540,7 +526,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -551,7 +536,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithTypeParameter/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithTypeParameter/input.ts.json index 02c386b88c12..b9acc2cb40f7 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithTypeParameter/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithTypeParameter/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,13 +103,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -125,7 +124,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -146,6 +144,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -168,13 +167,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -193,6 +190,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -215,13 +213,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -240,6 +236,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -262,13 +259,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -311,8 +306,8 @@ "ctxt": 0 }, "value": "ra1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -330,7 +325,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -341,7 +335,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -374,8 +367,8 @@ "ctxt": 0 }, "value": "ra2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -393,7 +386,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -404,7 +396,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -437,8 +428,8 @@ "ctxt": 0 }, "value": "ra3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -456,7 +447,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -467,7 +457,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -500,8 +489,8 @@ "ctxt": 0 }, "value": "ra4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -519,7 +508,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -530,7 +518,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -563,8 +550,8 @@ "ctxt": 0 }, "value": "ra5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -582,7 +569,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -593,7 +579,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -626,8 +611,8 @@ "ctxt": 0 }, "value": "ra6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -645,7 +630,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -656,7 +640,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -689,8 +672,8 @@ "ctxt": 0 }, "value": "ra7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -708,7 +691,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -719,7 +701,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -752,8 +733,8 @@ "ctxt": 0 }, "value": "ra8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -771,7 +752,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -782,7 +762,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -815,8 +794,8 @@ "ctxt": 0 }, "value": "rb1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -834,7 +813,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -845,7 +823,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -878,8 +855,8 @@ "ctxt": 0 }, "value": "rb2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -897,7 +874,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -908,7 +884,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -941,8 +916,8 @@ "ctxt": 0 }, "value": "rb3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -960,7 +935,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -971,7 +945,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1004,8 +977,8 @@ "ctxt": 0 }, "value": "rb4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1023,7 +996,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -1034,7 +1006,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1067,8 +1038,8 @@ "ctxt": 0 }, "value": "rb5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1086,7 +1057,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -1097,7 +1067,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1130,8 +1099,8 @@ "ctxt": 0 }, "value": "rb6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1149,7 +1118,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -1160,7 +1128,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1193,8 +1160,8 @@ "ctxt": 0 }, "value": "rb7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1212,7 +1179,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -1223,7 +1189,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1256,8 +1221,8 @@ "ctxt": 0 }, "value": "rb8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1275,7 +1240,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -1286,7 +1250,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1319,8 +1282,8 @@ "ctxt": 0 }, "value": "rc1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1338,7 +1301,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1349,7 +1311,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -1382,8 +1343,8 @@ "ctxt": 0 }, "value": "rc2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1401,7 +1362,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1412,7 +1372,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -1445,8 +1404,8 @@ "ctxt": 0 }, "value": "rc3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1464,7 +1423,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1475,7 +1433,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -1508,8 +1465,8 @@ "ctxt": 0 }, "value": "rc4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1527,7 +1484,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1538,7 +1494,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -1571,8 +1526,8 @@ "ctxt": 0 }, "value": "rc5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1590,7 +1545,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1601,7 +1555,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -1634,8 +1587,8 @@ "ctxt": 0 }, "value": "rc6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1653,7 +1606,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1664,7 +1616,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -1697,8 +1648,8 @@ "ctxt": 0 }, "value": "rc7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1716,7 +1667,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1727,7 +1677,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -1760,8 +1709,8 @@ "ctxt": 0 }, "value": "rc8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1779,7 +1728,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1790,7 +1738,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -1823,8 +1770,8 @@ "ctxt": 0 }, "value": "rd1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1842,7 +1789,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -1853,7 +1799,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1886,8 +1831,8 @@ "ctxt": 0 }, "value": "rd2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1905,7 +1850,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -1916,7 +1860,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1949,8 +1892,8 @@ "ctxt": 0 }, "value": "rd3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1968,7 +1911,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -1979,7 +1921,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -2012,8 +1953,8 @@ "ctxt": 0 }, "value": "rd4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2031,7 +1972,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -2042,7 +1982,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -2075,8 +2014,8 @@ "ctxt": 0 }, "value": "rd5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2094,7 +2033,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -2105,7 +2043,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -2138,8 +2075,8 @@ "ctxt": 0 }, "value": "rd6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2157,7 +2094,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -2168,7 +2104,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -2201,8 +2136,8 @@ "ctxt": 0 }, "value": "rd7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2220,7 +2155,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -2231,7 +2165,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -2264,8 +2197,8 @@ "ctxt": 0 }, "value": "rd8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2283,7 +2216,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -2294,7 +2226,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -2327,8 +2258,8 @@ "ctxt": 0 }, "value": "re1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2346,7 +2277,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2357,7 +2287,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2390,8 +2319,8 @@ "ctxt": 0 }, "value": "re2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2409,7 +2338,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2420,7 +2348,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2453,8 +2380,8 @@ "ctxt": 0 }, "value": "re3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2472,7 +2399,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2483,7 +2409,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2516,8 +2441,8 @@ "ctxt": 0 }, "value": "re4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2535,7 +2460,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2546,7 +2470,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2579,8 +2502,8 @@ "ctxt": 0 }, "value": "re5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2598,7 +2521,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2609,7 +2531,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2642,8 +2563,8 @@ "ctxt": 0 }, "value": "re6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2661,7 +2582,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2672,7 +2592,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2705,8 +2624,8 @@ "ctxt": 0 }, "value": "re7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2724,7 +2643,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2735,7 +2653,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2768,8 +2685,8 @@ "ctxt": 0 }, "value": "re8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2787,7 +2704,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2798,7 +2714,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2831,8 +2746,8 @@ "ctxt": 0 }, "value": "rf1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2850,7 +2765,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2861,7 +2775,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -2894,8 +2807,8 @@ "ctxt": 0 }, "value": "rf2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2913,7 +2826,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2924,7 +2836,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -2957,8 +2868,8 @@ "ctxt": 0 }, "value": "rf3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2976,7 +2887,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2987,7 +2897,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -3020,8 +2929,8 @@ "ctxt": 0 }, "value": "rf4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3039,7 +2948,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3050,7 +2958,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -3083,8 +2990,8 @@ "ctxt": 0 }, "value": "rf5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3102,7 +3009,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3113,7 +3019,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -3146,8 +3051,8 @@ "ctxt": 0 }, "value": "rf6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3165,7 +3070,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3176,7 +3080,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -3209,8 +3112,8 @@ "ctxt": 0 }, "value": "rf7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3228,7 +3131,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3239,7 +3141,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -3272,8 +3173,8 @@ "ctxt": 0 }, "value": "rf8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3291,7 +3192,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3302,7 +3202,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -3335,8 +3234,8 @@ "ctxt": 0 }, "value": "rg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3354,7 +3253,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -3365,7 +3263,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3398,8 +3295,8 @@ "ctxt": 0 }, "value": "rg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3417,7 +3314,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -3428,7 +3324,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3461,8 +3356,8 @@ "ctxt": 0 }, "value": "rg3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3480,7 +3375,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -3491,7 +3385,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3524,8 +3417,8 @@ "ctxt": 0 }, "value": "rg4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3543,7 +3436,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -3554,7 +3446,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3587,8 +3478,8 @@ "ctxt": 0 }, "value": "rg5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3606,7 +3497,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -3617,7 +3507,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3650,8 +3539,8 @@ "ctxt": 0 }, "value": "rg6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3669,7 +3558,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -3680,7 +3568,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3713,8 +3600,8 @@ "ctxt": 0 }, "value": "rg7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3732,7 +3619,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -3743,7 +3629,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3776,8 +3661,8 @@ "ctxt": 0 }, "value": "rg8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3795,7 +3680,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -3806,7 +3690,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3839,8 +3722,8 @@ "ctxt": 0 }, "value": "rh1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3858,7 +3741,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3869,7 +3751,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -3902,8 +3783,8 @@ "ctxt": 0 }, "value": "rh2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3921,7 +3802,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3932,7 +3812,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -3965,8 +3844,8 @@ "ctxt": 0 }, "value": "rh3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3984,7 +3863,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3995,7 +3873,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4028,8 +3905,8 @@ "ctxt": 0 }, "value": "rh4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4047,7 +3924,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4058,7 +3934,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4091,8 +3966,8 @@ "ctxt": 0 }, "value": "rh5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4110,7 +3985,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4121,7 +3995,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4154,8 +4027,8 @@ "ctxt": 0 }, "value": "rh6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4173,7 +4046,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4184,7 +4056,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4217,8 +4088,8 @@ "ctxt": 0 }, "value": "rh7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4236,7 +4107,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4247,7 +4117,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4280,8 +4149,8 @@ "ctxt": 0 }, "value": "rh8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4299,7 +4168,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4310,7 +4178,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4345,7 +4212,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4366,7 +4232,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4387,7 +4252,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands/input.ts.json index c82abc95c12d..2a21f59efacb 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "init": null @@ -101,6 +98,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -117,8 +115,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -150,6 +147,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -166,8 +164,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -199,6 +196,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -215,8 +213,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -248,6 +245,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -264,8 +262,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -297,6 +294,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -319,13 +317,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -357,6 +353,7 @@ "ctxt": 0 }, "value": "a5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -387,7 +384,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -403,8 +399,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -436,6 +431,7 @@ "ctxt": 0 }, "value": "a6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -458,13 +454,11 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -496,8 +490,8 @@ "ctxt": 0 }, "value": "ra1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -515,7 +509,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -526,7 +519,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -559,8 +551,8 @@ "ctxt": 0 }, "value": "ra2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -578,7 +570,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -589,7 +580,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -622,8 +612,8 @@ "ctxt": 0 }, "value": "ra3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -641,7 +631,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -652,7 +641,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -685,8 +673,8 @@ "ctxt": 0 }, "value": "ra4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -704,7 +692,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -715,7 +702,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -748,8 +734,8 @@ "ctxt": 0 }, "value": "ra5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -775,7 +761,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -808,8 +793,8 @@ "ctxt": 0 }, "value": "ra6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -827,7 +812,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -838,7 +822,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -871,8 +854,8 @@ "ctxt": 0 }, "value": "ra7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -897,7 +880,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -908,7 +890,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -921,7 +902,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -954,8 +934,8 @@ "ctxt": 0 }, "value": "ra8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -982,7 +962,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1015,8 +994,8 @@ "ctxt": 0 }, "value": "ra9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1043,7 +1022,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1076,8 +1054,8 @@ "ctxt": 0 }, "value": "ra10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1095,7 +1073,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -1106,7 +1083,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1139,8 +1115,8 @@ "ctxt": 0 }, "value": "ra11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1158,7 +1134,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -1169,7 +1144,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1202,6 +1176,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1218,8 +1193,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1251,6 +1225,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1267,8 +1242,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1300,6 +1274,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1316,8 +1291,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1349,6 +1323,7 @@ "ctxt": 0 }, "value": "b4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1365,8 +1340,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1398,6 +1372,7 @@ "ctxt": 0 }, "value": "b5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1433,8 +1408,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1466,8 +1440,8 @@ "ctxt": 0 }, "value": "rb1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1485,7 +1459,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1496,7 +1469,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -1529,8 +1501,8 @@ "ctxt": 0 }, "value": "rb2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1548,7 +1520,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1559,7 +1530,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -1592,8 +1562,8 @@ "ctxt": 0 }, "value": "rb3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1611,7 +1581,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1622,7 +1591,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -1655,8 +1623,8 @@ "ctxt": 0 }, "value": "rb4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1674,7 +1642,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1685,7 +1652,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -1718,8 +1684,8 @@ "ctxt": 0 }, "value": "rb5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1737,7 +1703,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1748,7 +1713,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } }, @@ -1781,8 +1745,8 @@ "ctxt": 0 }, "value": "rb6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1800,7 +1764,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1842,8 +1805,8 @@ "ctxt": 0 }, "value": "rb7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1861,7 +1824,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1903,8 +1865,8 @@ "ctxt": 0 }, "value": "rb8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1922,7 +1884,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1969,8 +1930,8 @@ "ctxt": 0 }, "value": "rb9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1988,7 +1949,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2029,8 +1989,8 @@ "ctxt": 0 }, "value": "rb10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2048,7 +2008,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2059,7 +2018,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2092,8 +2050,8 @@ "ctxt": 0 }, "value": "rc1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/inOperator/inOperatorWithValidOperands/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/inOperator/inOperatorWithValidOperands/input.ts.json index bd27bf9e3932..5902256ccc2c 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/inOperator/inOperatorWithValidOperands/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/inOperator/inOperatorWithValidOperands/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,6 +178,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -222,8 +223,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -255,6 +255,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -271,8 +272,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -304,8 +304,8 @@ "ctxt": 0 }, "value": "ra1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -323,7 +323,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -334,7 +333,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -367,8 +365,8 @@ "ctxt": 0 }, "value": "ra2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -386,7 +384,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -397,7 +394,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -430,8 +426,8 @@ "ctxt": 0 }, "value": "ra3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -449,7 +445,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -460,7 +455,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -493,8 +487,8 @@ "ctxt": 0 }, "value": "ra4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -526,7 +520,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -559,8 +552,8 @@ "ctxt": 0 }, "value": "ra5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -587,7 +580,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -620,8 +612,8 @@ "ctxt": 0 }, "value": "ra6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -639,7 +631,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -650,7 +641,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -683,8 +673,8 @@ "ctxt": 0 }, "value": "ra7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -702,7 +692,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -713,7 +702,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -746,6 +734,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -762,8 +751,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -795,8 +783,8 @@ "ctxt": 0 }, "value": "rb1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -814,7 +802,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -825,7 +812,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -858,8 +844,8 @@ "ctxt": 0 }, "value": "rb2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -877,7 +863,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -904,7 +889,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -925,6 +909,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -947,13 +932,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -996,8 +979,8 @@ "ctxt": 0 }, "value": "rb3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1015,7 +998,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1026,7 +1008,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1061,7 +1042,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1081,7 +1061,6 @@ "ctxt": 0 }, "value": "unionCase", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1102,6 +1081,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1132,7 +1112,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1152,15 +1131,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -1203,8 +1180,8 @@ "ctxt": 0 }, "value": "rb4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1222,7 +1199,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1233,7 +1209,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1268,7 +1243,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1289,7 +1263,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1309,7 +1282,6 @@ "ctxt": 0 }, "value": "unionCase2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1330,6 +1302,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1360,7 +1333,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1376,8 +1348,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1420,8 +1391,8 @@ "ctxt": 0 }, "value": "rb5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1439,7 +1410,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1450,7 +1420,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1485,7 +1454,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1510,7 +1478,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1540,7 +1507,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1584,7 +1550,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1614,7 +1579,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1668,6 +1632,7 @@ "ctxt": 0 }, "value": "c1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1698,7 +1663,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1718,15 +1682,13 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1758,6 +1720,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1780,13 +1743,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1818,6 +1779,7 @@ "ctxt": 0 }, "value": "c3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1840,13 +1802,11 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1878,8 +1838,8 @@ "ctxt": 0 }, "value": "rc1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1897,7 +1857,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1908,7 +1867,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } }, @@ -1941,8 +1899,8 @@ "ctxt": 0 }, "value": "rc2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1960,7 +1918,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1986,7 +1943,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1997,7 +1953,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithAny/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithAny/input.ts.json index 2f56d20669d5..4b8205650112 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithAny/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithAny/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -115,7 +115,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -126,7 +125,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidOperands/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidOperands/input.ts.json index 28bd5f34871a..001422b8ac4c 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidOperands/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidOperands/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -105,6 +103,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,8 +120,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -154,6 +152,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -170,8 +169,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -203,6 +201,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -219,8 +218,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -252,6 +250,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -268,8 +267,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -301,6 +299,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -317,8 +316,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -350,8 +348,8 @@ "ctxt": 0 }, "value": "ra1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -369,7 +367,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -380,7 +377,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -413,8 +409,8 @@ "ctxt": 0 }, "value": "ra2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -432,7 +428,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -443,7 +438,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -476,8 +470,8 @@ "ctxt": 0 }, "value": "ra3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -495,7 +489,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -506,7 +499,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -539,8 +531,8 @@ "ctxt": 0 }, "value": "ra4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -558,7 +550,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -569,7 +560,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -602,8 +592,8 @@ "ctxt": 0 }, "value": "ra5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -630,7 +620,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -663,8 +652,8 @@ "ctxt": 0 }, "value": "ra6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -691,7 +680,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -724,8 +712,8 @@ "ctxt": 0 }, "value": "ra7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -757,7 +745,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -790,8 +777,8 @@ "ctxt": 0 }, "value": "ra8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -817,7 +804,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -850,8 +836,8 @@ "ctxt": 0 }, "value": "ra9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -869,7 +855,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -880,7 +865,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -913,6 +897,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -929,8 +914,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -962,6 +946,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -978,8 +963,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1011,6 +995,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1027,8 +1012,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1060,6 +1044,7 @@ "ctxt": 0 }, "value": "b4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1076,8 +1061,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1109,6 +1093,7 @@ "ctxt": 0 }, "value": "o1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1125,8 +1110,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1158,6 +1142,7 @@ "ctxt": 0 }, "value": "o2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1180,13 +1165,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1218,6 +1201,7 @@ "ctxt": 0 }, "value": "o3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1240,13 +1224,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1278,8 +1260,8 @@ "ctxt": 0 }, "value": "rb1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1297,7 +1279,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1308,7 +1289,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -1341,8 +1321,8 @@ "ctxt": 0 }, "value": "rb2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1360,7 +1340,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1371,7 +1350,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -1404,8 +1382,8 @@ "ctxt": 0 }, "value": "rb3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1423,7 +1401,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1434,7 +1411,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -1467,8 +1443,8 @@ "ctxt": 0 }, "value": "rb4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1486,7 +1462,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1497,7 +1472,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -1530,8 +1504,8 @@ "ctxt": 0 }, "value": "rb5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1549,7 +1523,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1591,8 +1564,8 @@ "ctxt": 0 }, "value": "rb6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1610,7 +1583,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1652,8 +1624,8 @@ "ctxt": 0 }, "value": "rb7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1671,7 +1643,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1718,8 +1689,8 @@ "ctxt": 0 }, "value": "rb8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1737,7 +1708,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1748,7 +1718,6 @@ "ctxt": 0 }, "value": "o1", - "typeAnnotation": null, "optional": false } }, @@ -1781,8 +1750,8 @@ "ctxt": 0 }, "value": "rb9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1800,7 +1769,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1811,7 +1779,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false } }, @@ -1844,8 +1811,8 @@ "ctxt": 0 }, "value": "rb10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1863,7 +1830,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1874,7 +1840,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false } }, @@ -1907,8 +1872,8 @@ "ctxt": 0 }, "value": "rc1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidStaticToString/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidStaticToString/input.ts.json index d9e49ca6c8fb..9393351ffc3e 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidStaticToString/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidStaticToString/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "StaticToString", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "function": { @@ -98,7 +96,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -119,6 +116,7 @@ "ctxt": 0 }, "value": "staticToString", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -141,13 +139,11 @@ "ctxt": 0 }, "value": "StaticToString", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -188,7 +184,6 @@ "ctxt": 0 }, "value": "staticToString", - "typeAnnotation": null, "optional": false }, "right": { @@ -199,7 +194,6 @@ "ctxt": 0 }, "value": "StaticToString", - "typeAnnotation": null, "optional": false } } @@ -221,7 +215,6 @@ "ctxt": 0 }, "value": "StaticToNumber", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -247,7 +240,6 @@ "ctxt": 0 }, "value": "toNumber", - "typeAnnotation": null, "optional": false }, "function": { @@ -303,7 +295,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -324,6 +315,7 @@ "ctxt": 0 }, "value": "staticToNumber", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -346,13 +338,11 @@ "ctxt": 0 }, "value": "StaticToNumber", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -393,7 +383,6 @@ "ctxt": 0 }, "value": "staticToNumber", - "typeAnnotation": null, "optional": false }, "right": { @@ -404,7 +393,6 @@ "ctxt": 0 }, "value": "StaticToNumber", - "typeAnnotation": null, "optional": false } } @@ -426,7 +414,6 @@ "ctxt": 0 }, "value": "NormalToString", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -452,7 +439,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "function": { @@ -508,7 +494,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -529,6 +514,7 @@ "ctxt": 0 }, "value": "normal", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -551,13 +537,11 @@ "ctxt": 0 }, "value": "NormalToString", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -598,7 +582,6 @@ "ctxt": 0 }, "value": "normal", - "typeAnnotation": null, "optional": false }, "right": { @@ -609,7 +592,6 @@ "ctxt": 0 }, "value": "NormalToString", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithLHSIsObject/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithLHSIsObject/input.ts.json index eb2feb0131c4..b06ac49178ca 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithLHSIsObject/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithLHSIsObject/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,6 +57,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -74,8 +74,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -107,6 +106,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -129,13 +129,11 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -167,6 +165,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -183,8 +182,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -216,6 +214,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -238,13 +237,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -276,6 +273,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -298,13 +296,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -336,6 +332,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -375,15 +372,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -415,8 +410,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -434,7 +429,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -445,7 +439,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false } }, @@ -478,8 +471,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -497,7 +490,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -508,7 +500,6 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, "optional": false } }, @@ -541,8 +532,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -560,7 +551,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -571,7 +561,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false } }, @@ -604,8 +593,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -623,7 +612,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -634,7 +622,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithLHSIsTypeParameter/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithLHSIsTypeParameter/input.ts.json index 2f7dc72e382d..e71f7fe1f6f8 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithLHSIsTypeParameter/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithLHSIsTypeParameter/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -108,6 +106,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -124,8 +123,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -157,8 +155,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -176,7 +174,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -187,7 +184,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -222,7 +218,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithRHSIsSubtypeOfFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithRHSIsSubtypeOfFunction/input.ts.json index f8c5b679c107..ca2f62bc99e2 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithRHSIsSubtypeOfFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithRHSIsSubtypeOfFunction/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -83,6 +81,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -99,8 +98,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -132,6 +130,7 @@ "ctxt": 0 }, "value": "f1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -154,13 +153,11 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -192,6 +189,7 @@ "ctxt": 0 }, "value": "f2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -214,13 +212,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -252,6 +248,7 @@ "ctxt": 0 }, "value": "f3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -296,8 +293,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -329,6 +325,7 @@ "ctxt": 0 }, "value": "f4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -373,8 +370,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -406,8 +402,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -425,7 +421,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -436,7 +431,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } }, @@ -469,8 +463,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -488,7 +482,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -499,7 +492,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false } }, @@ -532,8 +524,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -551,7 +543,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -562,7 +553,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false } }, @@ -595,8 +585,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -614,7 +604,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -625,7 +614,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false } }, @@ -658,8 +646,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -677,7 +665,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -718,8 +705,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -737,7 +724,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -748,7 +734,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/logicalAndOperator/logicalAndOperatorWithTypeParameters/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/logicalAndOperator/logicalAndOperatorWithTypeParameters/input.ts.json index 4ad4aa68ff4f..d058636c5eb1 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/logicalAndOperator/logicalAndOperatorWithTypeParameters/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/logicalAndOperator/logicalAndOperatorWithTypeParameters/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -106,13 +105,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -131,6 +128,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -153,13 +151,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -202,8 +198,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -221,7 +217,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -232,7 +227,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -265,8 +259,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -284,7 +278,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -295,7 +288,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -328,8 +320,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -347,7 +339,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -358,7 +349,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -391,8 +381,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -410,7 +400,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -421,7 +410,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -454,8 +442,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -473,7 +461,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -484,7 +471,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -517,8 +503,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -536,7 +522,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -547,7 +532,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -580,8 +564,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -599,7 +583,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -610,7 +593,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -643,8 +625,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -662,7 +644,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -673,7 +654,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -706,8 +686,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -725,7 +705,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -736,7 +715,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -769,6 +747,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,8 +764,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -818,8 +796,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -837,7 +815,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -848,7 +825,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -883,7 +859,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -904,7 +879,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -925,7 +899,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/logicalOrOperator/logicalOrExpressionIsContextuallyTyped/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/logicalOrOperator/logicalOrExpressionIsContextuallyTyped/input.ts.json index ceb29c67d537..1e56bac42ad1 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/logicalOrOperator/logicalOrExpressionIsContextuallyTyped/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/logicalOrOperator/logicalOrExpressionIsContextuallyTyped/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,8 +90,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -119,7 +118,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -147,7 +145,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -180,7 +177,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -208,7 +204,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/logicalOrOperator/logicalOrExpressionIsNotContextuallyTyped/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/logicalOrOperator/logicalOrExpressionIsNotContextuallyTyped/input.ts.json index f2ead80288b9..749864448552 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/logicalOrOperator/logicalOrExpressionIsNotContextuallyTyped/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/logicalOrOperator/logicalOrExpressionIsNotContextuallyTyped/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,6 +55,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -70,8 +72,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -93,8 +94,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -126,8 +126,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -145,7 +145,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -171,8 +170,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -197,7 +196,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -208,7 +206,6 @@ "ctxt": 0 }, "value": "toLowerCase", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/logicalOrOperator/logicalOrOperatorWithTypeParameters/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/logicalOrOperator/logicalOrOperatorWithTypeParameters/input.ts.json index 468df86f6d8a..26022cb7d039 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/logicalOrOperator/logicalOrOperatorWithTypeParameters/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/binaryOperators/logicalOrOperator/logicalOrOperatorWithTypeParameters/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -106,13 +105,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -155,8 +152,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -174,7 +171,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -185,7 +181,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -218,6 +213,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -240,13 +236,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -264,7 +258,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -275,7 +268,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -308,8 +300,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -327,7 +319,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -338,7 +329,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -371,6 +361,7 @@ "ctxt": 0 }, "value": "r4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -387,8 +378,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -406,7 +396,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -417,7 +406,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -452,7 +440,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -473,7 +460,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -493,7 +479,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -514,6 +499,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -536,13 +522,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -561,6 +545,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,13 +568,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -608,6 +591,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -630,13 +614,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -679,8 +661,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -698,7 +680,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -709,7 +690,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -742,8 +722,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -761,7 +741,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -772,7 +751,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -805,6 +783,7 @@ "ctxt": 0 }, "value": "r4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -827,13 +806,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -851,7 +828,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -862,7 +838,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -895,8 +870,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -914,7 +889,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -925,7 +899,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -958,6 +931,7 @@ "ctxt": 0 }, "value": "r6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -974,8 +948,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -993,7 +966,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -1004,7 +976,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -1039,7 +1010,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1060,7 +1030,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1081,7 +1050,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1101,7 +1069,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1122,6 +1089,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1144,13 +1112,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1169,6 +1135,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1191,13 +1158,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1240,8 +1205,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1259,7 +1224,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1270,7 +1234,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -1303,6 +1266,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1319,8 +1283,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -1338,7 +1301,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1349,7 +1311,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -1382,8 +1343,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1401,7 +1362,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1422,7 +1382,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1472,6 +1431,7 @@ "ctxt": 0 }, "value": "r4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1503,7 +1463,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1531,8 +1490,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -1550,7 +1508,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1561,7 +1518,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -1596,7 +1552,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1623,7 +1578,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1665,7 +1619,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1710,7 +1663,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1737,7 +1689,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1779,7 +1730,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorInvalidAssignmentType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorInvalidAssignmentType/input.ts.json index b9e6a6928dbe..675722fae9b4 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorInvalidAssignmentType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorInvalidAssignmentType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "BOOLEAN", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "NUMBER", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "STRING", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,6 +178,7 @@ "ctxt": 0 }, "value": "resultIsBoolean", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -194,8 +195,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -227,6 +227,7 @@ "ctxt": 0 }, "value": "resultIsNumber", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -243,8 +244,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -276,6 +276,7 @@ "ctxt": 0 }, "value": "resultIsString", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -292,8 +293,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -323,8 +323,8 @@ "ctxt": 0 }, "value": "resultIsBoolean", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -349,7 +349,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false }, { @@ -360,7 +359,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } ] @@ -391,8 +389,8 @@ "ctxt": 0 }, "value": "resultIsBoolean", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -417,7 +415,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false }, { @@ -428,7 +425,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } ] @@ -459,8 +455,8 @@ "ctxt": 0 }, "value": "resultIsNumber", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -485,7 +481,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, { @@ -496,7 +491,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } ] @@ -527,8 +521,8 @@ "ctxt": 0 }, "value": "resultIsNumber", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -553,7 +547,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, { @@ -564,7 +557,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } ] @@ -595,8 +587,8 @@ "ctxt": 0 }, "value": "resultIsString", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -621,7 +613,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, { @@ -632,7 +623,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } ] @@ -663,8 +653,8 @@ "ctxt": 0 }, "value": "resultIsString", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -689,7 +679,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, { @@ -700,7 +689,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorOtherInvalidOperation/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorOtherInvalidOperation/input.ts.json index 126973981afa..6e736fd6e002 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorOtherInvalidOperation/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorOtherInvalidOperation/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -73,6 +72,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -89,8 +89,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -131,7 +130,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, { @@ -142,7 +140,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } ] @@ -180,6 +177,7 @@ "ctxt": 0 }, "value": "resultIsString", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -196,8 +194,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -214,7 +211,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -264,7 +260,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -308,6 +303,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -330,13 +326,11 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -368,6 +362,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -390,13 +385,11 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -428,6 +421,7 @@ "ctxt": 0 }, "value": "result", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -450,13 +444,11 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ParenthesisExpression", @@ -481,7 +473,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, { @@ -492,7 +483,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } ] @@ -529,7 +519,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -550,7 +539,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorOtherValidOperation/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorOtherValidOperation/input.ts.json index 9937f33ad857..479963eb25b4 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorOtherValidOperation/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorOtherValidOperation/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -67,8 +67,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -99,7 +99,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "right": { @@ -110,7 +109,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false } }, @@ -139,7 +137,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -160,7 +157,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false } } @@ -186,7 +182,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -207,6 +202,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -223,8 +219,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -243,6 +238,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -259,8 +255,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -301,7 +296,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, { @@ -312,7 +306,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } ] @@ -350,8 +343,8 @@ "ctxt": 0 }, "value": "resultIsString", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -368,7 +361,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -418,7 +410,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -462,6 +453,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -484,13 +476,11 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -522,6 +512,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -544,13 +535,11 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -580,7 +569,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, { @@ -591,7 +579,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } ] @@ -622,8 +609,8 @@ "ctxt": 0 }, "value": "resultIsT1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -648,7 +635,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, { @@ -659,7 +645,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } ] @@ -696,7 +681,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -717,7 +701,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorWithSecondOperandAnyType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorWithSecondOperandAnyType/input.ts.json index 0e280bbb489f..dbc3fbd0e78d 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorWithSecondOperandAnyType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorWithSecondOperandAnyType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "ANY", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "BOOLEAN", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "NUMBER", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,6 +178,7 @@ "ctxt": 0 }, "value": "STRING", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -194,8 +195,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -227,6 +227,7 @@ "ctxt": 0 }, "value": "OBJECT", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -249,13 +250,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -285,7 +284,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false }, { @@ -296,7 +294,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } ] @@ -325,7 +322,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false }, { @@ -336,7 +332,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } ] @@ -365,7 +360,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, { @@ -376,7 +370,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } ] @@ -405,7 +398,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, { @@ -416,7 +408,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } ] @@ -445,7 +436,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false }, { @@ -456,7 +446,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } ] @@ -487,8 +476,8 @@ "ctxt": 0 }, "value": "resultIsAny1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -513,7 +502,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false }, { @@ -524,7 +512,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } ] @@ -559,8 +546,8 @@ "ctxt": 0 }, "value": "resultIsAny2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -585,7 +572,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false }, { @@ -596,7 +582,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } ] @@ -631,8 +616,8 @@ "ctxt": 0 }, "value": "resultIsAny3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -657,7 +642,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, { @@ -668,7 +652,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } ] @@ -703,8 +686,8 @@ "ctxt": 0 }, "value": "resultIsAny4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -729,7 +712,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, { @@ -740,7 +722,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } ] @@ -775,8 +756,8 @@ "ctxt": 0 }, "value": "resultIsAny5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -801,7 +782,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false }, { @@ -812,7 +792,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } ] @@ -847,6 +826,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -863,8 +843,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -903,7 +882,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } ] @@ -941,7 +919,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } }, @@ -953,7 +930,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } ] @@ -1075,7 +1051,6 @@ "ctxt": 0 }, "value": "charAt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1171,7 +1146,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1229,7 +1203,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } }, @@ -1255,7 +1228,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1266,7 +1238,6 @@ "ctxt": 0 }, "value": "doSomeThing", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1302,8 +1273,8 @@ "ctxt": 0 }, "value": "resultIsAny6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1337,7 +1308,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } ] @@ -1372,8 +1342,8 @@ "ctxt": 0 }, "value": "resultIsAny7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1407,7 +1377,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } }, @@ -1419,7 +1388,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } ] @@ -1454,8 +1422,8 @@ "ctxt": 0 }, "value": "resultIsAny8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1526,8 +1494,8 @@ "ctxt": 0 }, "value": "resultIsAny9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1580,7 +1548,6 @@ "ctxt": 0 }, "value": "charAt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1609,7 +1576,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } ] @@ -1644,8 +1610,8 @@ "ctxt": 0 }, "value": "resultIsAny10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1686,7 +1652,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1742,8 +1707,8 @@ "ctxt": 0 }, "value": "resultIsAny11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1776,7 +1741,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } }, @@ -1802,7 +1766,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1813,7 +1776,6 @@ "ctxt": 0 }, "value": "doSomeThing", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorWithSecondOperandBooleanType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorWithSecondOperandBooleanType/input.ts.json index a1c7a7f092e0..72189aa3ded6 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorWithSecondOperandBooleanType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorWithSecondOperandBooleanType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "ANY", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "BOOLEAN", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "NUMBER", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,6 +178,7 @@ "ctxt": 0 }, "value": "STRING", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -194,8 +195,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -227,6 +227,7 @@ "ctxt": 0 }, "value": "OBJECT", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -249,13 +250,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -285,7 +284,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false }, { @@ -296,7 +294,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } ] @@ -325,7 +322,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false }, { @@ -336,7 +332,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } ] @@ -365,7 +360,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, { @@ -376,7 +370,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } ] @@ -405,7 +398,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, { @@ -416,7 +408,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } ] @@ -445,7 +436,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false }, { @@ -456,7 +446,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } ] @@ -487,8 +476,8 @@ "ctxt": 0 }, "value": "resultIsBoolean1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -513,7 +502,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false }, { @@ -524,7 +512,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } ] @@ -559,8 +546,8 @@ "ctxt": 0 }, "value": "resultIsBoolean2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -585,7 +572,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false }, { @@ -596,7 +582,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } ] @@ -631,8 +616,8 @@ "ctxt": 0 }, "value": "resultIsBoolean3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -657,7 +642,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, { @@ -668,7 +652,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } ] @@ -703,8 +686,8 @@ "ctxt": 0 }, "value": "resultIsBoolean4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -729,7 +712,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, { @@ -740,7 +722,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } ] @@ -775,8 +756,8 @@ "ctxt": 0 }, "value": "resultIsBoolean5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -801,7 +782,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false }, { @@ -812,7 +792,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } ] @@ -853,7 +832,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } ] @@ -890,8 +868,8 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -901,7 +879,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -913,7 +890,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } ] @@ -987,7 +963,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } }, @@ -1080,7 +1055,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } } @@ -1118,8 +1092,8 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -1184,8 +1158,8 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -1225,8 +1199,8 @@ "ctxt": 0 }, "value": "resultIsBoolean6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1259,7 +1233,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } ] @@ -1294,8 +1267,8 @@ "ctxt": 0 }, "value": "resultIsBoolean7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1328,8 +1301,8 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1339,7 +1312,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1351,7 +1323,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } ] @@ -1386,8 +1357,8 @@ "ctxt": 0 }, "value": "resultIsBoolean8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1454,8 +1425,8 @@ "ctxt": 0 }, "value": "resultIsBoolean9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1489,7 +1460,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } }, @@ -1534,8 +1504,8 @@ "ctxt": 0 }, "value": "resultIsBoolean10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1614,7 +1584,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } } @@ -1650,8 +1619,8 @@ "ctxt": 0 }, "value": "resultIsBoolean11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1684,8 +1653,8 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -1750,8 +1719,8 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorWithSecondOperandNumberType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorWithSecondOperandNumberType/input.ts.json index e800a1aadcf9..3544bad4ad6f 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorWithSecondOperandNumberType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorWithSecondOperandNumberType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "ANY", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "BOOLEAN", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "NUMBER", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,6 +178,7 @@ "ctxt": 0 }, "value": "STRING", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -194,8 +195,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -227,6 +227,7 @@ "ctxt": 0 }, "value": "OBJECT", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -249,13 +250,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -285,7 +284,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false }, { @@ -296,7 +294,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } ] @@ -325,7 +322,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false }, { @@ -336,7 +332,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } ] @@ -365,7 +360,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, { @@ -376,7 +370,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } ] @@ -405,7 +398,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, { @@ -416,7 +408,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } ] @@ -445,7 +436,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false }, { @@ -456,7 +446,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } ] @@ -487,8 +476,8 @@ "ctxt": 0 }, "value": "resultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -513,7 +502,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false }, { @@ -524,7 +512,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } ] @@ -559,8 +546,8 @@ "ctxt": 0 }, "value": "resultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -585,7 +572,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false }, { @@ -596,7 +582,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } ] @@ -631,8 +616,8 @@ "ctxt": 0 }, "value": "resultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -657,7 +642,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, { @@ -668,7 +652,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } ] @@ -703,8 +686,8 @@ "ctxt": 0 }, "value": "resultIsNumber4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -729,7 +712,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, { @@ -740,7 +722,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } ] @@ -775,8 +756,8 @@ "ctxt": 0 }, "value": "resultIsNumber5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -801,7 +782,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false }, { @@ -812,7 +792,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } ] @@ -853,7 +832,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } ] @@ -890,8 +868,8 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -901,7 +879,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -913,7 +890,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } ] @@ -986,8 +962,8 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -1056,8 +1032,8 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1109,7 +1085,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "property": { @@ -1120,7 +1095,6 @@ "ctxt": 0 }, "value": "trim", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1144,8 +1118,8 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1185,8 +1159,8 @@ "ctxt": 0 }, "value": "resultIsNumber6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1219,7 +1193,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } ] @@ -1254,8 +1227,8 @@ "ctxt": 0 }, "value": "resultIsNumber7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1288,8 +1261,8 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1299,7 +1272,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1311,7 +1283,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } ] @@ -1346,8 +1317,8 @@ "ctxt": 0 }, "value": "resultIsNumber8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1414,8 +1385,8 @@ "ctxt": 0 }, "value": "resultIsNumber9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1448,8 +1419,8 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -1502,8 +1473,8 @@ "ctxt": 0 }, "value": "resultIsNumber10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1550,8 +1521,8 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1595,8 +1566,8 @@ "ctxt": 0 }, "value": "resultIsNumber11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1635,7 +1606,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "property": { @@ -1646,7 +1616,6 @@ "ctxt": 0 }, "value": "trim", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1670,8 +1639,8 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorWithSecondOperandObjectType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorWithSecondOperandObjectType/input.ts.json index 6ea07cbe090d..1f3a69bda552 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorWithSecondOperandObjectType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorWithSecondOperandObjectType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "ANY", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "BOOLEAN", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "NUMBER", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,6 +178,7 @@ "ctxt": 0 }, "value": "STRING", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -194,8 +195,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -227,6 +227,7 @@ "ctxt": 0 }, "value": "OBJECT", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -249,13 +250,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -272,7 +271,6 @@ "ctxt": 0 }, "value": "CLASS", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -298,7 +296,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false }, "value": null, @@ -359,7 +356,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false }, { @@ -370,7 +366,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false } ] @@ -399,7 +394,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false }, { @@ -410,7 +404,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false } ] @@ -439,7 +432,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, { @@ -450,7 +442,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false } ] @@ -479,7 +470,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, { @@ -490,7 +480,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false } ] @@ -519,7 +508,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false }, { @@ -530,7 +518,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false } ] @@ -561,8 +548,8 @@ "ctxt": 0 }, "value": "resultIsObject1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -587,7 +574,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false }, { @@ -598,7 +584,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false } ] @@ -633,8 +618,8 @@ "ctxt": 0 }, "value": "resultIsObject2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -659,7 +644,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false }, { @@ -670,7 +654,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false } ] @@ -705,8 +688,8 @@ "ctxt": 0 }, "value": "resultIsObject3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -731,7 +714,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, { @@ -742,7 +724,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false } ] @@ -777,8 +758,8 @@ "ctxt": 0 }, "value": "resultIsObject4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -803,7 +784,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, { @@ -814,7 +794,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false } ] @@ -849,8 +828,8 @@ "ctxt": 0 }, "value": "resultIsObject5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -875,7 +854,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false }, { @@ -886,7 +864,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false } ] @@ -927,7 +904,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false } ] @@ -964,8 +940,8 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -984,7 +960,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false } ] @@ -1057,7 +1032,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } }, @@ -1117,7 +1091,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1163,7 +1136,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "property": { @@ -1174,7 +1146,6 @@ "ctxt": 0 }, "value": "toLowerCase", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1197,7 +1168,6 @@ "ctxt": 0 }, "value": "CLASS", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1231,8 +1201,8 @@ "ctxt": 0 }, "value": "resultIsObject6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1265,7 +1235,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false } ] @@ -1300,8 +1269,8 @@ "ctxt": 0 }, "value": "resultIsObject7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1334,8 +1303,8 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -1354,7 +1323,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false } ] @@ -1389,8 +1357,8 @@ "ctxt": 0 }, "value": "resultIsObject8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1457,8 +1425,8 @@ "ctxt": 0 }, "value": "resultIsObject9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1491,7 +1459,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } }, @@ -1513,7 +1480,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1536,7 +1502,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1588,8 +1553,8 @@ "ctxt": 0 }, "value": "resultIsObject10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1635,7 +1600,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1673,8 +1637,8 @@ "ctxt": 0 }, "value": "resultIsObject11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1713,7 +1677,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "property": { @@ -1724,7 +1687,6 @@ "ctxt": 0 }, "value": "toLowerCase", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1747,7 +1709,6 @@ "ctxt": 0 }, "value": "CLASS", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorWithSecondOperandStringType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorWithSecondOperandStringType/input.ts.json index fba3de841bf9..fcc4e42d636f 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorWithSecondOperandStringType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorWithSecondOperandStringType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "ANY", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "BOOLEAN", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "NUMBER", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,6 +178,7 @@ "ctxt": 0 }, "value": "STRING", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -194,8 +195,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -227,6 +227,7 @@ "ctxt": 0 }, "value": "OBJECT", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -249,13 +250,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -287,6 +286,7 @@ "ctxt": 0 }, "value": "resultIsString", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -303,8 +303,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -334,7 +333,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false }, { @@ -345,7 +343,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } ] @@ -374,7 +371,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false }, { @@ -385,7 +381,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } ] @@ -414,7 +409,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, { @@ -425,7 +419,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } ] @@ -454,7 +447,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, { @@ -465,7 +457,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } ] @@ -494,7 +485,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false }, { @@ -505,7 +495,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } ] @@ -536,8 +525,8 @@ "ctxt": 0 }, "value": "resultIsString1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -562,7 +551,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false }, { @@ -573,7 +561,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } ] @@ -608,8 +595,8 @@ "ctxt": 0 }, "value": "resultIsString2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -634,7 +621,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false }, { @@ -645,7 +631,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } ] @@ -680,8 +665,8 @@ "ctxt": 0 }, "value": "resultIsString3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -706,7 +691,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, { @@ -717,7 +701,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } ] @@ -752,8 +735,8 @@ "ctxt": 0 }, "value": "resultIsString4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -778,7 +761,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, { @@ -789,7 +771,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } ] @@ -824,8 +805,8 @@ "ctxt": 0 }, "value": "resultIsString5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -850,7 +831,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false }, { @@ -861,7 +841,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } ] @@ -902,7 +881,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } ] @@ -939,8 +917,8 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -957,7 +935,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -972,7 +949,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } ] @@ -1050,7 +1026,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false }, "right": { @@ -1061,7 +1036,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1163,7 +1137,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, "property": { @@ -1174,7 +1147,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1216,8 +1188,8 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -1234,7 +1206,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -1257,7 +1228,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "right": { @@ -1303,8 +1273,8 @@ "ctxt": 0 }, "value": "resultIsString6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1337,7 +1307,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } ] @@ -1372,8 +1341,8 @@ "ctxt": 0 }, "value": "resultIsString7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1406,8 +1375,8 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -1424,7 +1393,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1439,7 +1407,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } ] @@ -1474,8 +1441,8 @@ "ctxt": 0 }, "value": "resultIsString8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1547,8 +1514,8 @@ "ctxt": 0 }, "value": "resultIsString9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1581,7 +1548,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false }, "right": { @@ -1592,7 +1558,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1642,8 +1607,8 @@ "ctxt": 0 }, "value": "resultIsString10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1726,7 +1691,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, "property": { @@ -1737,7 +1701,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1777,8 +1740,8 @@ "ctxt": 0 }, "value": "resultIsString11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1810,7 +1773,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -1832,7 +1794,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "right": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorsMultipleOperators/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorsMultipleOperators/input.ts.json index fe3967f23946..6f67b975d510 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorsMultipleOperators/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/commaOperator/commaOperatorsMultipleOperators/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "ANY", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "BOOLEAN", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "NUMBER", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,6 +178,7 @@ "ctxt": 0 }, "value": "STRING", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -194,8 +195,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -227,6 +227,7 @@ "ctxt": 0 }, "value": "OBJECT", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -249,13 +250,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -285,7 +284,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false }, { @@ -296,7 +294,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false }, { @@ -307,7 +304,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } ] @@ -336,7 +332,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false }, { @@ -347,7 +342,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, { @@ -358,7 +352,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } ] @@ -387,7 +380,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, { @@ -398,7 +390,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, { @@ -409,7 +400,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false } ] @@ -438,7 +428,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, { @@ -449,7 +438,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false }, { @@ -460,7 +448,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } ] @@ -489,7 +476,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false }, { @@ -500,7 +486,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false }, { @@ -511,7 +496,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } ] @@ -542,8 +526,8 @@ "ctxt": 0 }, "value": "resultIsAny1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -568,7 +552,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, { @@ -579,7 +562,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false }, { @@ -590,7 +572,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } ] @@ -625,8 +606,8 @@ "ctxt": 0 }, "value": "resultIsBoolean1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -651,7 +632,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false }, { @@ -662,7 +642,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false }, { @@ -673,7 +652,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } ] @@ -708,8 +686,8 @@ "ctxt": 0 }, "value": "resultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -734,7 +712,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false }, { @@ -745,7 +722,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false }, { @@ -756,7 +732,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } ] @@ -791,8 +766,8 @@ "ctxt": 0 }, "value": "resultIsString1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -817,7 +792,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false }, { @@ -828,7 +802,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, { @@ -839,7 +812,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } ] @@ -874,8 +846,8 @@ "ctxt": 0 }, "value": "resultIsObject1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -900,7 +872,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, { @@ -911,7 +882,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, { @@ -922,7 +892,6 @@ "ctxt": 0 }, "value": "OBJECT", - "typeAnnotation": null, "optional": false } ] @@ -1008,7 +977,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } }, @@ -1034,7 +1002,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "property": { @@ -1045,7 +1012,6 @@ "ctxt": 0 }, "value": "charAt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1081,7 +1047,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1115,8 +1080,8 @@ "ctxt": 0 }, "value": "resultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1191,8 +1156,8 @@ "ctxt": 0 }, "value": "resultIsObject2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1226,7 +1191,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } }, @@ -1252,7 +1216,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "property": { @@ -1263,7 +1226,6 @@ "ctxt": 0 }, "value": "charAt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1299,7 +1261,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/conditonalOperator/conditionalOperatorConditionIsBooleanType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/conditonalOperator/conditionalOperatorConditionIsBooleanType/input.ts.json index 41f2c3ef7bb9..f9141eb17c5e 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/conditonalOperator/conditionalOperatorConditionIsBooleanType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/conditonalOperator/conditionalOperatorConditionIsBooleanType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "condBoolean", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "exprAny1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "exprBoolean1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,6 +178,7 @@ "ctxt": 0 }, "value": "exprNumber1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -194,8 +195,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -227,6 +227,7 @@ "ctxt": 0 }, "value": "exprString1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -243,8 +244,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -276,6 +276,7 @@ "ctxt": 0 }, "value": "exprIsObject1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -298,13 +299,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -336,6 +335,7 @@ "ctxt": 0 }, "value": "exprAny2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -352,8 +352,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -385,6 +384,7 @@ "ctxt": 0 }, "value": "exprBoolean2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -401,8 +401,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -434,6 +433,7 @@ "ctxt": 0 }, "value": "exprNumber2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -450,8 +450,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +482,7 @@ "ctxt": 0 }, "value": "exprString2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -499,8 +499,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -532,6 +531,7 @@ "ctxt": 0 }, "value": "exprIsObject2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -554,13 +554,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -589,7 +587,6 @@ "ctxt": 0 }, "value": "condBoolean", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -600,7 +597,6 @@ "ctxt": 0 }, "value": "exprAny1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -611,7 +607,6 @@ "ctxt": 0 }, "value": "exprAny2", - "typeAnnotation": null, "optional": false } } @@ -638,7 +633,6 @@ "ctxt": 0 }, "value": "condBoolean", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -649,7 +643,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -660,7 +653,6 @@ "ctxt": 0 }, "value": "exprBoolean2", - "typeAnnotation": null, "optional": false } } @@ -687,7 +679,6 @@ "ctxt": 0 }, "value": "condBoolean", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -698,7 +689,6 @@ "ctxt": 0 }, "value": "exprNumber1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -709,7 +699,6 @@ "ctxt": 0 }, "value": "exprNumber2", - "typeAnnotation": null, "optional": false } } @@ -736,7 +725,6 @@ "ctxt": 0 }, "value": "condBoolean", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -747,7 +735,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -758,7 +745,6 @@ "ctxt": 0 }, "value": "exprString2", - "typeAnnotation": null, "optional": false } } @@ -785,7 +771,6 @@ "ctxt": 0 }, "value": "condBoolean", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -796,7 +781,6 @@ "ctxt": 0 }, "value": "exprIsObject1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -807,7 +791,6 @@ "ctxt": 0 }, "value": "exprIsObject2", - "typeAnnotation": null, "optional": false } } @@ -834,7 +817,6 @@ "ctxt": 0 }, "value": "condBoolean", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -845,7 +827,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -856,7 +837,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } } @@ -892,7 +872,6 @@ "ctxt": 0 }, "value": "exprAny1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -903,7 +882,6 @@ "ctxt": 0 }, "value": "exprAny2", - "typeAnnotation": null, "optional": false } } @@ -939,7 +917,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -950,7 +927,6 @@ "ctxt": 0 }, "value": "exprBoolean2", - "typeAnnotation": null, "optional": false } } @@ -986,7 +962,6 @@ "ctxt": 0 }, "value": "exprNumber1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -997,7 +972,6 @@ "ctxt": 0 }, "value": "exprNumber2", - "typeAnnotation": null, "optional": false } } @@ -1033,7 +1007,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1044,7 +1017,6 @@ "ctxt": 0 }, "value": "exprString2", - "typeAnnotation": null, "optional": false } } @@ -1080,7 +1052,6 @@ "ctxt": 0 }, "value": "exprIsObject1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1091,7 +1062,6 @@ "ctxt": 0 }, "value": "exprIsObject2", - "typeAnnotation": null, "optional": false } } @@ -1127,7 +1097,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1138,7 +1107,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } } @@ -1183,7 +1151,6 @@ "ctxt": 0 }, "value": "exprAny1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1194,7 +1161,6 @@ "ctxt": 0 }, "value": "exprAny2", - "typeAnnotation": null, "optional": false } } @@ -1267,7 +1233,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1278,7 +1243,6 @@ "ctxt": 0 }, "value": "exprBoolean2", - "typeAnnotation": null, "optional": false } } @@ -1332,7 +1296,6 @@ "ctxt": 0 }, "value": "exprNumber1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1343,7 +1306,6 @@ "ctxt": 0 }, "value": "exprNumber2", - "typeAnnotation": null, "optional": false } } @@ -1386,7 +1348,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1398,7 +1359,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1409,7 +1369,6 @@ "ctxt": 0 }, "value": "exprString2", - "typeAnnotation": null, "optional": false } } @@ -1463,7 +1422,6 @@ "ctxt": 0 }, "value": "exprIsObject1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1474,7 +1432,6 @@ "ctxt": 0 }, "value": "exprIsObject2", - "typeAnnotation": null, "optional": false } } @@ -1517,7 +1474,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1529,7 +1485,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1540,7 +1495,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } } @@ -1570,8 +1524,8 @@ "ctxt": 0 }, "value": "resultIsAny1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1588,7 +1542,6 @@ "ctxt": 0 }, "value": "condBoolean", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1599,7 +1552,6 @@ "ctxt": 0 }, "value": "exprAny1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1610,7 +1562,6 @@ "ctxt": 0 }, "value": "exprAny2", - "typeAnnotation": null, "optional": false } }, @@ -1643,8 +1594,8 @@ "ctxt": 0 }, "value": "resultIsBoolean1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1661,7 +1612,6 @@ "ctxt": 0 }, "value": "condBoolean", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1672,7 +1622,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1683,7 +1632,6 @@ "ctxt": 0 }, "value": "exprBoolean2", - "typeAnnotation": null, "optional": false } }, @@ -1716,8 +1664,8 @@ "ctxt": 0 }, "value": "resultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1734,7 +1682,6 @@ "ctxt": 0 }, "value": "condBoolean", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1745,7 +1692,6 @@ "ctxt": 0 }, "value": "exprNumber1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1756,7 +1702,6 @@ "ctxt": 0 }, "value": "exprNumber2", - "typeAnnotation": null, "optional": false } }, @@ -1789,8 +1734,8 @@ "ctxt": 0 }, "value": "resultIsString1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1807,7 +1752,6 @@ "ctxt": 0 }, "value": "condBoolean", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1818,7 +1762,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1829,7 +1772,6 @@ "ctxt": 0 }, "value": "exprString2", - "typeAnnotation": null, "optional": false } }, @@ -1862,8 +1804,8 @@ "ctxt": 0 }, "value": "resultIsObject1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1880,7 +1822,6 @@ "ctxt": 0 }, "value": "condBoolean", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1891,7 +1832,6 @@ "ctxt": 0 }, "value": "exprIsObject1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1902,7 +1842,6 @@ "ctxt": 0 }, "value": "exprIsObject2", - "typeAnnotation": null, "optional": false } }, @@ -1935,8 +1874,8 @@ "ctxt": 0 }, "value": "resultIsStringOrBoolean1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1953,7 +1892,6 @@ "ctxt": 0 }, "value": "condBoolean", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1964,7 +1902,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1975,7 +1912,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } }, @@ -2008,8 +1944,8 @@ "ctxt": 0 }, "value": "resultIsAny2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2035,7 +1971,6 @@ "ctxt": 0 }, "value": "exprAny1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2046,7 +1981,6 @@ "ctxt": 0 }, "value": "exprAny2", - "typeAnnotation": null, "optional": false } }, @@ -2079,8 +2013,8 @@ "ctxt": 0 }, "value": "resultIsBoolean2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2106,7 +2040,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2117,7 +2050,6 @@ "ctxt": 0 }, "value": "exprBoolean2", - "typeAnnotation": null, "optional": false } }, @@ -2150,8 +2082,8 @@ "ctxt": 0 }, "value": "resultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2177,7 +2109,6 @@ "ctxt": 0 }, "value": "exprNumber1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2188,7 +2119,6 @@ "ctxt": 0 }, "value": "exprNumber2", - "typeAnnotation": null, "optional": false } }, @@ -2221,8 +2151,8 @@ "ctxt": 0 }, "value": "resultIsString2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2248,7 +2178,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2259,7 +2188,6 @@ "ctxt": 0 }, "value": "exprString2", - "typeAnnotation": null, "optional": false } }, @@ -2292,8 +2220,8 @@ "ctxt": 0 }, "value": "resultIsObject2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2319,7 +2247,6 @@ "ctxt": 0 }, "value": "exprIsObject1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2330,7 +2257,6 @@ "ctxt": 0 }, "value": "exprIsObject2", - "typeAnnotation": null, "optional": false } }, @@ -2363,8 +2289,8 @@ "ctxt": 0 }, "value": "resultIsStringOrBoolean2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2390,7 +2316,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2401,7 +2326,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } }, @@ -2434,8 +2358,8 @@ "ctxt": 0 }, "value": "resultIsStringOrBoolean3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2461,7 +2385,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2472,7 +2395,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } }, @@ -2505,8 +2427,8 @@ "ctxt": 0 }, "value": "resultIsAny3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2541,7 +2463,6 @@ "ctxt": 0 }, "value": "exprAny1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2552,7 +2473,6 @@ "ctxt": 0 }, "value": "exprAny2", - "typeAnnotation": null, "optional": false } }, @@ -2585,8 +2505,8 @@ "ctxt": 0 }, "value": "resultIsBoolean3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2649,7 +2569,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2660,7 +2579,6 @@ "ctxt": 0 }, "value": "exprBoolean2", - "typeAnnotation": null, "optional": false } }, @@ -2693,8 +2611,8 @@ "ctxt": 0 }, "value": "resultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2738,7 +2656,6 @@ "ctxt": 0 }, "value": "exprNumber1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2749,7 +2666,6 @@ "ctxt": 0 }, "value": "exprNumber2", - "typeAnnotation": null, "optional": false } }, @@ -2782,8 +2698,8 @@ "ctxt": 0 }, "value": "resultIsString3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2816,7 +2732,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2828,7 +2743,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2839,7 +2753,6 @@ "ctxt": 0 }, "value": "exprString2", - "typeAnnotation": null, "optional": false } }, @@ -2872,8 +2785,8 @@ "ctxt": 0 }, "value": "resultIsObject3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2917,7 +2830,6 @@ "ctxt": 0 }, "value": "exprIsObject1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2928,7 +2840,6 @@ "ctxt": 0 }, "value": "exprIsObject2", - "typeAnnotation": null, "optional": false } }, @@ -2961,8 +2872,8 @@ "ctxt": 0 }, "value": "resultIsStringOrBoolean4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3025,7 +2936,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3036,7 +2946,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/conditonalOperator/conditionalOperatorConditionIsNumberType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/conditonalOperator/conditionalOperatorConditionIsNumberType/input.ts.json index 71a34a2c8116..f47b7d51aea6 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/conditonalOperator/conditionalOperatorConditionIsNumberType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/conditonalOperator/conditionalOperatorConditionIsNumberType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "condNumber", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "exprAny1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "exprBoolean1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,6 +178,7 @@ "ctxt": 0 }, "value": "exprNumber1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -194,8 +195,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -227,6 +227,7 @@ "ctxt": 0 }, "value": "exprString1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -243,8 +244,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -276,6 +276,7 @@ "ctxt": 0 }, "value": "exprIsObject1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -298,13 +299,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -336,6 +335,7 @@ "ctxt": 0 }, "value": "exprAny2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -352,8 +352,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -385,6 +384,7 @@ "ctxt": 0 }, "value": "exprBoolean2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -401,8 +401,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -434,6 +433,7 @@ "ctxt": 0 }, "value": "exprNumber2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -450,8 +450,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +482,7 @@ "ctxt": 0 }, "value": "exprString2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -499,8 +499,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -532,6 +531,7 @@ "ctxt": 0 }, "value": "exprIsObject2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -554,13 +554,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -589,7 +587,6 @@ "ctxt": 0 }, "value": "condNumber", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -600,7 +597,6 @@ "ctxt": 0 }, "value": "exprAny1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -611,7 +607,6 @@ "ctxt": 0 }, "value": "exprAny2", - "typeAnnotation": null, "optional": false } } @@ -638,7 +633,6 @@ "ctxt": 0 }, "value": "condNumber", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -649,7 +643,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -660,7 +653,6 @@ "ctxt": 0 }, "value": "exprBoolean2", - "typeAnnotation": null, "optional": false } } @@ -687,7 +679,6 @@ "ctxt": 0 }, "value": "condNumber", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -698,7 +689,6 @@ "ctxt": 0 }, "value": "exprNumber1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -709,7 +699,6 @@ "ctxt": 0 }, "value": "exprNumber2", - "typeAnnotation": null, "optional": false } } @@ -736,7 +725,6 @@ "ctxt": 0 }, "value": "condNumber", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -747,7 +735,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -758,7 +745,6 @@ "ctxt": 0 }, "value": "exprString2", - "typeAnnotation": null, "optional": false } } @@ -785,7 +771,6 @@ "ctxt": 0 }, "value": "condNumber", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -796,7 +781,6 @@ "ctxt": 0 }, "value": "exprIsObject1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -807,7 +791,6 @@ "ctxt": 0 }, "value": "exprIsObject2", - "typeAnnotation": null, "optional": false } } @@ -834,7 +817,6 @@ "ctxt": 0 }, "value": "condNumber", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -845,7 +827,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -856,7 +837,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } } @@ -892,7 +872,6 @@ "ctxt": 0 }, "value": "exprAny1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -903,7 +882,6 @@ "ctxt": 0 }, "value": "exprAny2", - "typeAnnotation": null, "optional": false } } @@ -939,7 +917,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -950,7 +927,6 @@ "ctxt": 0 }, "value": "exprBoolean2", - "typeAnnotation": null, "optional": false } } @@ -986,7 +962,6 @@ "ctxt": 0 }, "value": "exprNumber1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -997,7 +972,6 @@ "ctxt": 0 }, "value": "exprNumber2", - "typeAnnotation": null, "optional": false } } @@ -1042,7 +1016,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1053,7 +1026,6 @@ "ctxt": 0 }, "value": "exprString2", - "typeAnnotation": null, "optional": false } } @@ -1089,7 +1061,6 @@ "ctxt": 0 }, "value": "exprIsObject1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1100,7 +1071,6 @@ "ctxt": 0 }, "value": "exprIsObject2", - "typeAnnotation": null, "optional": false } } @@ -1136,7 +1106,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1147,7 +1116,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } } @@ -1162,7 +1130,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1238,8 +1205,8 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1340,7 +1307,6 @@ "ctxt": 0 }, "value": "exprAny1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1351,7 +1317,6 @@ "ctxt": 0 }, "value": "exprAny2", - "typeAnnotation": null, "optional": false } } @@ -1405,7 +1370,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1416,7 +1380,6 @@ "ctxt": 0 }, "value": "exprBoolean2", - "typeAnnotation": null, "optional": false } } @@ -1464,7 +1427,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1477,7 +1439,6 @@ "ctxt": 0 }, "value": "exprNumber1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1488,7 +1449,6 @@ "ctxt": 0 }, "value": "exprNumber2", - "typeAnnotation": null, "optional": false } } @@ -1522,7 +1482,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1536,7 +1495,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1547,7 +1505,6 @@ "ctxt": 0 }, "value": "exprString2", - "typeAnnotation": null, "optional": false } } @@ -1589,7 +1546,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1610,7 +1566,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false }, "property": { @@ -1633,7 +1588,6 @@ "ctxt": 0 }, "value": "exprIsObject1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1644,7 +1598,6 @@ "ctxt": 0 }, "value": "exprIsObject2", - "typeAnnotation": null, "optional": false } } @@ -1678,7 +1631,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1692,7 +1644,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1703,7 +1654,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } } @@ -1733,8 +1683,8 @@ "ctxt": 0 }, "value": "resultIsAny1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1751,7 +1701,6 @@ "ctxt": 0 }, "value": "condNumber", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1762,7 +1711,6 @@ "ctxt": 0 }, "value": "exprAny1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1773,7 +1721,6 @@ "ctxt": 0 }, "value": "exprAny2", - "typeAnnotation": null, "optional": false } }, @@ -1806,8 +1753,8 @@ "ctxt": 0 }, "value": "resultIsBoolean1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1824,7 +1771,6 @@ "ctxt": 0 }, "value": "condNumber", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1835,7 +1781,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1846,7 +1791,6 @@ "ctxt": 0 }, "value": "exprBoolean2", - "typeAnnotation": null, "optional": false } }, @@ -1879,8 +1823,8 @@ "ctxt": 0 }, "value": "resultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1897,7 +1841,6 @@ "ctxt": 0 }, "value": "condNumber", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1908,7 +1851,6 @@ "ctxt": 0 }, "value": "exprNumber1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1919,7 +1861,6 @@ "ctxt": 0 }, "value": "exprNumber2", - "typeAnnotation": null, "optional": false } }, @@ -1952,8 +1893,8 @@ "ctxt": 0 }, "value": "resultIsString1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1970,7 +1911,6 @@ "ctxt": 0 }, "value": "condNumber", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1981,7 +1921,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1992,7 +1931,6 @@ "ctxt": 0 }, "value": "exprString2", - "typeAnnotation": null, "optional": false } }, @@ -2025,8 +1963,8 @@ "ctxt": 0 }, "value": "resultIsObject1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2043,7 +1981,6 @@ "ctxt": 0 }, "value": "condNumber", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -2054,7 +1991,6 @@ "ctxt": 0 }, "value": "exprIsObject1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2065,7 +2001,6 @@ "ctxt": 0 }, "value": "exprIsObject2", - "typeAnnotation": null, "optional": false } }, @@ -2098,8 +2033,8 @@ "ctxt": 0 }, "value": "resultIsStringOrBoolean1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2116,7 +2051,6 @@ "ctxt": 0 }, "value": "condNumber", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -2127,7 +2061,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2138,7 +2071,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } }, @@ -2171,8 +2103,8 @@ "ctxt": 0 }, "value": "resultIsAny2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2198,7 +2130,6 @@ "ctxt": 0 }, "value": "exprAny1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2209,7 +2140,6 @@ "ctxt": 0 }, "value": "exprAny2", - "typeAnnotation": null, "optional": false } }, @@ -2242,8 +2172,8 @@ "ctxt": 0 }, "value": "resultIsBoolean2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2269,7 +2199,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2280,7 +2209,6 @@ "ctxt": 0 }, "value": "exprBoolean2", - "typeAnnotation": null, "optional": false } }, @@ -2313,8 +2241,8 @@ "ctxt": 0 }, "value": "resultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2340,7 +2268,6 @@ "ctxt": 0 }, "value": "exprNumber1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2351,7 +2278,6 @@ "ctxt": 0 }, "value": "exprNumber2", - "typeAnnotation": null, "optional": false } }, @@ -2384,8 +2310,8 @@ "ctxt": 0 }, "value": "resultIsString2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2420,7 +2346,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2431,7 +2356,6 @@ "ctxt": 0 }, "value": "exprString2", - "typeAnnotation": null, "optional": false } }, @@ -2464,8 +2388,8 @@ "ctxt": 0 }, "value": "resultIsObject2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2491,7 +2415,6 @@ "ctxt": 0 }, "value": "exprIsObject1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2502,7 +2425,6 @@ "ctxt": 0 }, "value": "exprIsObject2", - "typeAnnotation": null, "optional": false } }, @@ -2535,8 +2457,8 @@ "ctxt": 0 }, "value": "resultIsStringOrBoolean2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2562,7 +2484,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2573,7 +2494,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } }, @@ -2606,8 +2526,8 @@ "ctxt": 0 }, "value": "resultIsAny3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2651,7 +2571,6 @@ "ctxt": 0 }, "value": "exprAny1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2662,7 +2581,6 @@ "ctxt": 0 }, "value": "exprAny2", - "typeAnnotation": null, "optional": false } }, @@ -2695,8 +2613,8 @@ "ctxt": 0 }, "value": "resultIsBoolean3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2740,7 +2658,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2751,7 +2668,6 @@ "ctxt": 0 }, "value": "exprBoolean2", - "typeAnnotation": null, "optional": false } }, @@ -2784,8 +2700,8 @@ "ctxt": 0 }, "value": "resultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2823,7 +2739,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2836,7 +2751,6 @@ "ctxt": 0 }, "value": "exprNumber1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2847,7 +2761,6 @@ "ctxt": 0 }, "value": "exprNumber2", - "typeAnnotation": null, "optional": false } }, @@ -2880,8 +2793,8 @@ "ctxt": 0 }, "value": "resultIsString3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2905,7 +2818,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2919,7 +2831,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2930,7 +2841,6 @@ "ctxt": 0 }, "value": "exprString2", - "typeAnnotation": null, "optional": false } }, @@ -2963,8 +2873,8 @@ "ctxt": 0 }, "value": "resultIsObject3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2996,7 +2906,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3017,7 +2926,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false }, "property": { @@ -3040,7 +2948,6 @@ "ctxt": 0 }, "value": "exprIsObject1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3051,7 +2958,6 @@ "ctxt": 0 }, "value": "exprIsObject2", - "typeAnnotation": null, "optional": false } }, @@ -3084,8 +2990,8 @@ "ctxt": 0 }, "value": "resultIsStringOrBoolean3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3117,7 +3023,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3138,7 +3043,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false }, "property": { @@ -3161,7 +3065,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3172,7 +3075,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/conditonalOperator/conditionalOperatorConditoinIsAnyType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/conditonalOperator/conditionalOperatorConditoinIsAnyType/input.ts.json index 609b671fd486..fece61950647 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/conditonalOperator/conditionalOperatorConditoinIsAnyType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/conditonalOperator/conditionalOperatorConditoinIsAnyType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "condAny", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "exprAny1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,6 +178,7 @@ "ctxt": 0 }, "value": "exprBoolean1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -194,8 +195,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -227,6 +227,7 @@ "ctxt": 0 }, "value": "exprNumber1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -243,8 +244,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -276,6 +276,7 @@ "ctxt": 0 }, "value": "exprString1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -292,8 +293,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -325,6 +325,7 @@ "ctxt": 0 }, "value": "exprIsObject1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -347,13 +348,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -385,6 +384,7 @@ "ctxt": 0 }, "value": "exprAny2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -401,8 +401,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -434,6 +433,7 @@ "ctxt": 0 }, "value": "exprBoolean2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -450,8 +450,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +482,7 @@ "ctxt": 0 }, "value": "exprNumber2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -499,8 +499,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -532,6 +531,7 @@ "ctxt": 0 }, "value": "exprString2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -548,8 +548,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -581,6 +580,7 @@ "ctxt": 0 }, "value": "exprIsObject2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -603,13 +603,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -638,7 +636,6 @@ "ctxt": 0 }, "value": "condAny", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -649,7 +646,6 @@ "ctxt": 0 }, "value": "exprAny1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -660,7 +656,6 @@ "ctxt": 0 }, "value": "exprAny2", - "typeAnnotation": null, "optional": false } } @@ -687,7 +682,6 @@ "ctxt": 0 }, "value": "condAny", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -698,7 +692,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -709,7 +702,6 @@ "ctxt": 0 }, "value": "exprBoolean2", - "typeAnnotation": null, "optional": false } } @@ -736,7 +728,6 @@ "ctxt": 0 }, "value": "condAny", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -747,7 +738,6 @@ "ctxt": 0 }, "value": "exprNumber1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -758,7 +748,6 @@ "ctxt": 0 }, "value": "exprNumber2", - "typeAnnotation": null, "optional": false } } @@ -785,7 +774,6 @@ "ctxt": 0 }, "value": "condAny", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -796,7 +784,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -807,7 +794,6 @@ "ctxt": 0 }, "value": "exprString2", - "typeAnnotation": null, "optional": false } } @@ -834,7 +820,6 @@ "ctxt": 0 }, "value": "condAny", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -845,7 +830,6 @@ "ctxt": 0 }, "value": "exprIsObject1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -856,7 +840,6 @@ "ctxt": 0 }, "value": "exprIsObject2", - "typeAnnotation": null, "optional": false } } @@ -883,7 +866,6 @@ "ctxt": 0 }, "value": "condAny", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -894,7 +876,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -905,7 +886,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } } @@ -940,7 +920,6 @@ "ctxt": 0 }, "value": "exprAny1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -951,7 +930,6 @@ "ctxt": 0 }, "value": "exprAny2", - "typeAnnotation": null, "optional": false } } @@ -986,7 +964,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -997,7 +974,6 @@ "ctxt": 0 }, "value": "exprBoolean2", - "typeAnnotation": null, "optional": false } } @@ -1024,7 +1000,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1035,7 +1010,6 @@ "ctxt": 0 }, "value": "exprNumber1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1046,7 +1020,6 @@ "ctxt": 0 }, "value": "exprNumber2", - "typeAnnotation": null, "optional": false } } @@ -1094,7 +1067,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1108,7 +1080,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1119,7 +1090,6 @@ "ctxt": 0 }, "value": "exprString2", - "typeAnnotation": null, "optional": false } } @@ -1167,7 +1137,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1181,7 +1150,6 @@ "ctxt": 0 }, "value": "exprIsObject1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1192,7 +1160,6 @@ "ctxt": 0 }, "value": "exprIsObject2", - "typeAnnotation": null, "optional": false } } @@ -1219,7 +1186,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1230,7 +1196,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1241,7 +1206,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } } @@ -1282,7 +1246,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1293,7 +1256,6 @@ "ctxt": 0 }, "value": "doSomeThing", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1309,7 +1271,6 @@ "ctxt": 0 }, "value": "exprAny1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1320,7 +1281,6 @@ "ctxt": 0 }, "value": "exprAny2", - "typeAnnotation": null, "optional": false } } @@ -1354,7 +1314,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1386,7 +1345,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1397,7 +1355,6 @@ "ctxt": 0 }, "value": "exprBoolean2", - "typeAnnotation": null, "optional": false } } @@ -1431,7 +1388,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1445,7 +1401,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1460,7 +1415,6 @@ "ctxt": 0 }, "value": "exprNumber1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1471,7 +1425,6 @@ "ctxt": 0 }, "value": "exprNumber2", - "typeAnnotation": null, "optional": false } } @@ -1505,7 +1458,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1537,7 +1489,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1548,7 +1499,6 @@ "ctxt": 0 }, "value": "exprString2", - "typeAnnotation": null, "optional": false } } @@ -1589,7 +1539,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1600,7 +1549,6 @@ "ctxt": 0 }, "value": "doSomeThing", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1616,7 +1564,6 @@ "ctxt": 0 }, "value": "exprIsObject1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1627,7 +1574,6 @@ "ctxt": 0 }, "value": "exprIsObject2", - "typeAnnotation": null, "optional": false } } @@ -1668,7 +1614,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1679,7 +1624,6 @@ "ctxt": 0 }, "value": "doSomeThing", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1695,7 +1639,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1706,7 +1649,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } } @@ -1736,8 +1678,8 @@ "ctxt": 0 }, "value": "resultIsAny1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1754,7 +1696,6 @@ "ctxt": 0 }, "value": "condAny", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1765,7 +1706,6 @@ "ctxt": 0 }, "value": "exprAny1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1776,7 +1716,6 @@ "ctxt": 0 }, "value": "exprAny2", - "typeAnnotation": null, "optional": false } }, @@ -1809,8 +1748,8 @@ "ctxt": 0 }, "value": "resultIsBoolean1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1827,7 +1766,6 @@ "ctxt": 0 }, "value": "condAny", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1838,7 +1776,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1849,7 +1786,6 @@ "ctxt": 0 }, "value": "exprBoolean2", - "typeAnnotation": null, "optional": false } }, @@ -1882,8 +1818,8 @@ "ctxt": 0 }, "value": "resultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1900,7 +1836,6 @@ "ctxt": 0 }, "value": "condAny", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1911,7 +1846,6 @@ "ctxt": 0 }, "value": "exprNumber1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1922,7 +1856,6 @@ "ctxt": 0 }, "value": "exprNumber2", - "typeAnnotation": null, "optional": false } }, @@ -1955,8 +1888,8 @@ "ctxt": 0 }, "value": "resultIsString1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1973,7 +1906,6 @@ "ctxt": 0 }, "value": "condAny", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1984,7 +1916,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1995,7 +1926,6 @@ "ctxt": 0 }, "value": "exprString2", - "typeAnnotation": null, "optional": false } }, @@ -2028,8 +1958,8 @@ "ctxt": 0 }, "value": "resultIsObject1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2046,7 +1976,6 @@ "ctxt": 0 }, "value": "condAny", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -2057,7 +1986,6 @@ "ctxt": 0 }, "value": "exprIsObject1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2068,7 +1996,6 @@ "ctxt": 0 }, "value": "exprIsObject2", - "typeAnnotation": null, "optional": false } }, @@ -2101,8 +2028,8 @@ "ctxt": 0 }, "value": "resultIsStringOrBoolean1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2119,7 +2046,6 @@ "ctxt": 0 }, "value": "condAny", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -2130,7 +2056,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2141,7 +2066,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } }, @@ -2174,8 +2098,8 @@ "ctxt": 0 }, "value": "resultIsAny2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2200,7 +2124,6 @@ "ctxt": 0 }, "value": "exprAny1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2211,7 +2134,6 @@ "ctxt": 0 }, "value": "exprAny2", - "typeAnnotation": null, "optional": false } }, @@ -2244,8 +2166,8 @@ "ctxt": 0 }, "value": "resultIsBoolean2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2270,7 +2192,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2281,7 +2202,6 @@ "ctxt": 0 }, "value": "exprBoolean2", - "typeAnnotation": null, "optional": false } }, @@ -2314,8 +2234,8 @@ "ctxt": 0 }, "value": "resultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2332,7 +2252,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -2343,7 +2262,6 @@ "ctxt": 0 }, "value": "exprNumber1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2354,7 +2272,6 @@ "ctxt": 0 }, "value": "exprNumber2", - "typeAnnotation": null, "optional": false } }, @@ -2387,8 +2304,8 @@ "ctxt": 0 }, "value": "resultIsString2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2426,7 +2343,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2440,7 +2356,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2451,7 +2366,6 @@ "ctxt": 0 }, "value": "exprString2", - "typeAnnotation": null, "optional": false } }, @@ -2484,8 +2398,8 @@ "ctxt": 0 }, "value": "resultIsObject2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2523,7 +2437,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2537,7 +2450,6 @@ "ctxt": 0 }, "value": "exprIsObject1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2548,7 +2460,6 @@ "ctxt": 0 }, "value": "exprIsObject2", - "typeAnnotation": null, "optional": false } }, @@ -2581,8 +2492,8 @@ "ctxt": 0 }, "value": "resultIsStringOrBoolean2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2607,7 +2518,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2618,7 +2528,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } }, @@ -2651,8 +2560,8 @@ "ctxt": 0 }, "value": "resultIsStringOrBoolean3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2669,7 +2578,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -2680,7 +2588,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2691,7 +2598,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } }, @@ -2724,8 +2630,8 @@ "ctxt": 0 }, "value": "resultIsStringOrBoolean4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2763,7 +2669,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2777,7 +2682,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2788,7 +2692,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } }, @@ -2821,8 +2724,8 @@ "ctxt": 0 }, "value": "resultIsAny3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2853,7 +2756,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2864,7 +2766,6 @@ "ctxt": 0 }, "value": "doSomeThing", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2880,7 +2781,6 @@ "ctxt": 0 }, "value": "exprAny1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2891,7 +2791,6 @@ "ctxt": 0 }, "value": "exprAny2", - "typeAnnotation": null, "optional": false } }, @@ -2924,8 +2823,8 @@ "ctxt": 0 }, "value": "resultIsBoolean3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2949,7 +2848,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2981,7 +2879,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2992,7 +2889,6 @@ "ctxt": 0 }, "value": "exprBoolean2", - "typeAnnotation": null, "optional": false } }, @@ -3025,8 +2921,8 @@ "ctxt": 0 }, "value": "resultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3050,7 +2946,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3064,7 +2959,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3079,7 +2973,6 @@ "ctxt": 0 }, "value": "exprNumber1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3090,7 +2983,6 @@ "ctxt": 0 }, "value": "exprNumber2", - "typeAnnotation": null, "optional": false } }, @@ -3123,8 +3015,8 @@ "ctxt": 0 }, "value": "resultIsString3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3148,7 +3040,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3180,7 +3071,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3191,7 +3081,6 @@ "ctxt": 0 }, "value": "exprString2", - "typeAnnotation": null, "optional": false } }, @@ -3224,8 +3113,8 @@ "ctxt": 0 }, "value": "resultIsObject3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3256,7 +3145,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3267,7 +3155,6 @@ "ctxt": 0 }, "value": "doSomeThing", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3283,7 +3170,6 @@ "ctxt": 0 }, "value": "exprIsObject1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3294,7 +3180,6 @@ "ctxt": 0 }, "value": "exprIsObject2", - "typeAnnotation": null, "optional": false } }, @@ -3327,8 +3212,8 @@ "ctxt": 0 }, "value": "resultIsStringOrBoolean5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3359,7 +3244,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3370,7 +3254,6 @@ "ctxt": 0 }, "value": "doSomeThing", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3386,7 +3269,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3397,7 +3279,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/conditonalOperator/conditionalOperatorConditoinIsStringType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/conditonalOperator/conditionalOperatorConditoinIsStringType/input.ts.json index 1cc3d341bb4c..e8394ee58cc2 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/conditonalOperator/conditionalOperatorConditoinIsStringType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/conditonalOperator/conditionalOperatorConditoinIsStringType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "condString", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "exprAny1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "exprBoolean1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,6 +178,7 @@ "ctxt": 0 }, "value": "exprNumber1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -194,8 +195,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -227,6 +227,7 @@ "ctxt": 0 }, "value": "exprString1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -243,8 +244,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -276,6 +276,7 @@ "ctxt": 0 }, "value": "exprIsObject1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -298,13 +299,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -336,6 +335,7 @@ "ctxt": 0 }, "value": "exprAny2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -352,8 +352,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -385,6 +384,7 @@ "ctxt": 0 }, "value": "exprBoolean2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -401,8 +401,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -434,6 +433,7 @@ "ctxt": 0 }, "value": "exprNumber2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -450,8 +450,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,6 +482,7 @@ "ctxt": 0 }, "value": "exprString2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -499,8 +499,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -532,6 +531,7 @@ "ctxt": 0 }, "value": "exprIsObject2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -554,13 +554,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -589,7 +587,6 @@ "ctxt": 0 }, "value": "condString", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -600,7 +597,6 @@ "ctxt": 0 }, "value": "exprAny1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -611,7 +607,6 @@ "ctxt": 0 }, "value": "exprAny2", - "typeAnnotation": null, "optional": false } } @@ -638,7 +633,6 @@ "ctxt": 0 }, "value": "condString", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -649,7 +643,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -660,7 +653,6 @@ "ctxt": 0 }, "value": "exprBoolean2", - "typeAnnotation": null, "optional": false } } @@ -687,7 +679,6 @@ "ctxt": 0 }, "value": "condString", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -698,7 +689,6 @@ "ctxt": 0 }, "value": "exprNumber1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -709,7 +699,6 @@ "ctxt": 0 }, "value": "exprNumber2", - "typeAnnotation": null, "optional": false } } @@ -736,7 +725,6 @@ "ctxt": 0 }, "value": "condString", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -747,7 +735,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -758,7 +745,6 @@ "ctxt": 0 }, "value": "exprString2", - "typeAnnotation": null, "optional": false } } @@ -785,7 +771,6 @@ "ctxt": 0 }, "value": "condString", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -796,7 +781,6 @@ "ctxt": 0 }, "value": "exprIsObject1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -807,7 +791,6 @@ "ctxt": 0 }, "value": "exprIsObject2", - "typeAnnotation": null, "optional": false } } @@ -834,7 +817,6 @@ "ctxt": 0 }, "value": "condString", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -845,7 +827,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -856,7 +837,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } } @@ -897,7 +877,6 @@ "ctxt": 0 }, "value": "exprAny1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -908,7 +887,6 @@ "ctxt": 0 }, "value": "exprAny2", - "typeAnnotation": null, "optional": false } } @@ -949,7 +927,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -960,7 +937,6 @@ "ctxt": 0 }, "value": "exprBoolean2", - "typeAnnotation": null, "optional": false } } @@ -1001,7 +977,6 @@ "ctxt": 0 }, "value": "exprNumber1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1012,7 +987,6 @@ "ctxt": 0 }, "value": "exprNumber2", - "typeAnnotation": null, "optional": false } } @@ -1053,7 +1027,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1064,7 +1037,6 @@ "ctxt": 0 }, "value": "exprString2", - "typeAnnotation": null, "optional": false } } @@ -1105,7 +1077,6 @@ "ctxt": 0 }, "value": "exprIsObject1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1116,7 +1087,6 @@ "ctxt": 0 }, "value": "exprIsObject2", - "typeAnnotation": null, "optional": false } } @@ -1157,7 +1127,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1168,7 +1137,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } } @@ -1183,7 +1151,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1264,8 +1231,8 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1362,7 +1329,6 @@ "ctxt": 0 }, "value": "condString", - "typeAnnotation": null, "optional": false } }, @@ -1374,7 +1340,6 @@ "ctxt": 0 }, "value": "exprAny1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1385,7 +1350,6 @@ "ctxt": 0 }, "value": "exprAny2", - "typeAnnotation": null, "optional": false } } @@ -1419,7 +1383,6 @@ "ctxt": 0 }, "value": "condString", - "typeAnnotation": null, "optional": false }, "property": { @@ -1430,7 +1393,6 @@ "ctxt": 0 }, "value": "toUpperCase", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1443,7 +1405,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1454,7 +1415,6 @@ "ctxt": 0 }, "value": "exprBoolean2", - "typeAnnotation": null, "optional": false } } @@ -1489,7 +1449,6 @@ "ctxt": 0 }, "value": "condString", - "typeAnnotation": null, "optional": false }, "right": { @@ -1515,7 +1474,6 @@ "ctxt": 0 }, "value": "exprNumber1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1526,7 +1484,6 @@ "ctxt": 0 }, "value": "exprNumber2", - "typeAnnotation": null, "optional": false } } @@ -1560,7 +1517,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1574,7 +1530,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1585,7 +1540,6 @@ "ctxt": 0 }, "value": "exprString2", - "typeAnnotation": null, "optional": false } } @@ -1619,7 +1573,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false }, "property": { @@ -1641,7 +1594,6 @@ "ctxt": 0 }, "value": "exprIsObject1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1652,7 +1604,6 @@ "ctxt": 0 }, "value": "exprIsObject2", - "typeAnnotation": null, "optional": false } } @@ -1686,7 +1637,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1700,7 +1650,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1711,7 +1660,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } } @@ -1741,8 +1689,8 @@ "ctxt": 0 }, "value": "resultIsAny1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1759,7 +1707,6 @@ "ctxt": 0 }, "value": "condString", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1770,7 +1717,6 @@ "ctxt": 0 }, "value": "exprAny1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1781,7 +1727,6 @@ "ctxt": 0 }, "value": "exprAny2", - "typeAnnotation": null, "optional": false } }, @@ -1814,8 +1759,8 @@ "ctxt": 0 }, "value": "resultIsBoolean1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1832,7 +1777,6 @@ "ctxt": 0 }, "value": "condString", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1843,7 +1787,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1854,7 +1797,6 @@ "ctxt": 0 }, "value": "exprBoolean2", - "typeAnnotation": null, "optional": false } }, @@ -1887,8 +1829,8 @@ "ctxt": 0 }, "value": "resultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1905,7 +1847,6 @@ "ctxt": 0 }, "value": "condString", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1916,7 +1857,6 @@ "ctxt": 0 }, "value": "exprNumber1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1927,7 +1867,6 @@ "ctxt": 0 }, "value": "exprNumber2", - "typeAnnotation": null, "optional": false } }, @@ -1960,8 +1899,8 @@ "ctxt": 0 }, "value": "resultIsString1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1978,7 +1917,6 @@ "ctxt": 0 }, "value": "condString", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1989,7 +1927,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2000,7 +1937,6 @@ "ctxt": 0 }, "value": "exprString2", - "typeAnnotation": null, "optional": false } }, @@ -2033,8 +1969,8 @@ "ctxt": 0 }, "value": "resultIsObject1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2051,7 +1987,6 @@ "ctxt": 0 }, "value": "condString", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -2062,7 +1997,6 @@ "ctxt": 0 }, "value": "exprIsObject1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2073,7 +2007,6 @@ "ctxt": 0 }, "value": "exprIsObject2", - "typeAnnotation": null, "optional": false } }, @@ -2106,8 +2039,8 @@ "ctxt": 0 }, "value": "resultIsStringOrBoolean1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2124,7 +2057,6 @@ "ctxt": 0 }, "value": "condString", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -2135,7 +2067,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2146,7 +2077,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } }, @@ -2179,8 +2109,8 @@ "ctxt": 0 }, "value": "resultIsAny2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2211,7 +2141,6 @@ "ctxt": 0 }, "value": "exprAny1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2222,7 +2151,6 @@ "ctxt": 0 }, "value": "exprAny2", - "typeAnnotation": null, "optional": false } }, @@ -2255,8 +2183,8 @@ "ctxt": 0 }, "value": "resultIsBoolean2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2287,7 +2215,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2298,7 +2225,6 @@ "ctxt": 0 }, "value": "exprBoolean2", - "typeAnnotation": null, "optional": false } }, @@ -2331,8 +2257,8 @@ "ctxt": 0 }, "value": "resultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2363,7 +2289,6 @@ "ctxt": 0 }, "value": "exprNumber1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2374,7 +2299,6 @@ "ctxt": 0 }, "value": "exprNumber2", - "typeAnnotation": null, "optional": false } }, @@ -2407,8 +2331,8 @@ "ctxt": 0 }, "value": "resultIsString2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2439,7 +2363,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2450,7 +2373,6 @@ "ctxt": 0 }, "value": "exprString2", - "typeAnnotation": null, "optional": false } }, @@ -2483,8 +2405,8 @@ "ctxt": 0 }, "value": "resultIsObject2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2515,7 +2437,6 @@ "ctxt": 0 }, "value": "exprIsObject1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2526,7 +2447,6 @@ "ctxt": 0 }, "value": "exprIsObject2", - "typeAnnotation": null, "optional": false } }, @@ -2559,8 +2479,8 @@ "ctxt": 0 }, "value": "resultIsStringOrBoolean2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2591,7 +2511,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2602,7 +2521,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } }, @@ -2635,8 +2553,8 @@ "ctxt": 0 }, "value": "resultIsAny3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2661,7 +2579,6 @@ "ctxt": 0 }, "value": "condString", - "typeAnnotation": null, "optional": false } }, @@ -2673,7 +2590,6 @@ "ctxt": 0 }, "value": "exprAny1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2684,7 +2600,6 @@ "ctxt": 0 }, "value": "exprAny2", - "typeAnnotation": null, "optional": false } }, @@ -2717,8 +2632,8 @@ "ctxt": 0 }, "value": "resultIsBoolean3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2742,7 +2657,6 @@ "ctxt": 0 }, "value": "condString", - "typeAnnotation": null, "optional": false }, "property": { @@ -2753,7 +2667,6 @@ "ctxt": 0 }, "value": "toUpperCase", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2766,7 +2679,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2777,7 +2689,6 @@ "ctxt": 0 }, "value": "exprBoolean2", - "typeAnnotation": null, "optional": false } }, @@ -2810,8 +2721,8 @@ "ctxt": 0 }, "value": "resultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2836,7 +2747,6 @@ "ctxt": 0 }, "value": "condString", - "typeAnnotation": null, "optional": false }, "right": { @@ -2862,7 +2772,6 @@ "ctxt": 0 }, "value": "exprNumber1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2873,7 +2782,6 @@ "ctxt": 0 }, "value": "exprNumber2", - "typeAnnotation": null, "optional": false } }, @@ -2906,8 +2814,8 @@ "ctxt": 0 }, "value": "resultIsString3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2931,7 +2839,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2945,7 +2852,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2956,7 +2862,6 @@ "ctxt": 0 }, "value": "exprString2", - "typeAnnotation": null, "optional": false } }, @@ -2989,8 +2894,8 @@ "ctxt": 0 }, "value": "resultIsObject3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3014,7 +2919,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false }, "property": { @@ -3036,7 +2940,6 @@ "ctxt": 0 }, "value": "exprIsObject1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3047,7 +2950,6 @@ "ctxt": 0 }, "value": "exprIsObject2", - "typeAnnotation": null, "optional": false } }, @@ -3080,8 +2982,8 @@ "ctxt": 0 }, "value": "resultIsStringOrBoolean3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3106,7 +3008,6 @@ "ctxt": 0 }, "value": "condString", - "typeAnnotation": null, "optional": false } }, @@ -3118,7 +3019,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3129,7 +3029,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } }, @@ -3162,8 +3061,8 @@ "ctxt": 0 }, "value": "resultIsStringOrBoolean4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3187,7 +3086,6 @@ "ctxt": 0 }, "value": "condString", - "typeAnnotation": null, "optional": false }, "property": { @@ -3198,7 +3096,6 @@ "ctxt": 0 }, "value": "toUpperCase", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3211,7 +3108,6 @@ "ctxt": 0 }, "value": "exprString1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3222,7 +3118,6 @@ "ctxt": 0 }, "value": "exprBoolean1", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/conditonalOperator/conditionalOperatorWithIdenticalBCT/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/conditonalOperator/conditionalOperatorWithIdenticalBCT/input.ts.json index 2cff3d362ff3..3f26417aa568 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/conditonalOperator/conditionalOperatorWithIdenticalBCT/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/conditonalOperator/conditionalOperatorWithIdenticalBCT/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "propertyX", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "propertyX1", - "typeAnnotation": null, "optional": false }, "value": null, @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "propertyX2", - "typeAnnotation": null, "optional": false }, "value": null, @@ -190,7 +186,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -216,7 +211,6 @@ "ctxt": 0 }, "value": "propertyA", - "typeAnnotation": null, "optional": false }, "value": null, @@ -256,7 +250,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -282,7 +275,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -308,7 +300,6 @@ "ctxt": 0 }, "value": "propertyB", - "typeAnnotation": null, "optional": false }, "value": null, @@ -348,7 +339,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -389,6 +379,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -411,13 +402,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -449,6 +438,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -471,13 +461,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -509,6 +497,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -531,13 +520,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -575,7 +562,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -586,7 +572,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -616,8 +601,8 @@ "ctxt": 0 }, "value": "result1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -643,7 +628,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -654,7 +638,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -746,7 +729,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -779,7 +761,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -802,7 +783,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -849,8 +829,8 @@ "ctxt": 0 }, "value": "result2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -916,8 +896,8 @@ "ctxt": 0 }, "value": "result3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -953,7 +933,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -986,7 +965,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1009,7 +987,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1059,6 +1036,7 @@ "ctxt": 0 }, "value": "resultIsX1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1081,13 +1059,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -1113,7 +1089,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1124,7 +1099,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1157,6 +1131,7 @@ "ctxt": 0 }, "value": "result4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1180,6 +1155,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1202,13 +1178,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1230,8 +1204,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -1265,8 +1238,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1284,7 +1257,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -1295,7 +1267,6 @@ "ctxt": 0 }, "value": "propertyX", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1321,8 +1292,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1340,7 +1311,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -1351,7 +1321,6 @@ "ctxt": 0 }, "value": "propertyA", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1397,7 +1366,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1408,7 +1376,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1438,8 +1405,8 @@ "ctxt": 0 }, "value": "result5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1465,7 +1432,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1476,7 +1442,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1568,7 +1533,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1591,7 +1555,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1629,7 +1592,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1671,8 +1633,8 @@ "ctxt": 0 }, "value": "result6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1738,8 +1700,8 @@ "ctxt": 0 }, "value": "result7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1775,7 +1737,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1798,7 +1759,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1836,7 +1796,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1881,6 +1840,7 @@ "ctxt": 0 }, "value": "resultIsX2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1903,13 +1863,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -1935,7 +1893,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1946,7 +1903,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1979,6 +1935,7 @@ "ctxt": 0 }, "value": "result8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2002,6 +1959,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2024,13 +1982,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2052,8 +2008,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -2087,8 +2042,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2106,7 +2061,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -2117,7 +2071,6 @@ "ctxt": 0 }, "value": "propertyA", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2143,8 +2096,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2162,7 +2115,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -2173,7 +2125,6 @@ "ctxt": 0 }, "value": "propertyX", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2213,6 +2164,7 @@ "ctxt": 0 }, "value": "resultIsX3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2235,13 +2187,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -2267,7 +2217,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2278,7 +2227,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2311,6 +2259,7 @@ "ctxt": 0 }, "value": "result10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2334,6 +2283,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2356,13 +2306,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2384,8 +2332,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -2419,8 +2366,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2438,7 +2385,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -2449,7 +2395,6 @@ "ctxt": 0 }, "value": "propertyX1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2475,8 +2420,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2494,7 +2439,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -2505,7 +2449,6 @@ "ctxt": 0 }, "value": "propertyX2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2545,6 +2488,7 @@ "ctxt": 0 }, "value": "result11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2561,8 +2505,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/conditonalOperator/conditionalOperatorWithoutIdenticalBCT/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/conditonalOperator/conditionalOperatorWithoutIdenticalBCT/input.ts.json index c85d5e73caca..07bbf9d75535 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/conditonalOperator/conditionalOperatorWithoutIdenticalBCT/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/conditonalOperator/conditionalOperatorWithoutIdenticalBCT/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "propertyX", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "propertyX1", - "typeAnnotation": null, "optional": false }, "value": null, @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "propertyX2", - "typeAnnotation": null, "optional": false }, "value": null, @@ -190,7 +186,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -216,7 +211,6 @@ "ctxt": 0 }, "value": "propertyA", - "typeAnnotation": null, "optional": false }, "value": null, @@ -256,7 +250,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -282,7 +275,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -308,7 +300,6 @@ "ctxt": 0 }, "value": "propertyB", - "typeAnnotation": null, "optional": false }, "value": null, @@ -348,7 +339,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -389,6 +379,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -411,13 +402,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -449,6 +438,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -471,13 +461,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -509,6 +497,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -531,13 +520,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -575,7 +562,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -586,7 +572,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -616,8 +601,8 @@ "ctxt": 0 }, "value": "result1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -643,7 +628,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -654,7 +638,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -687,6 +670,7 @@ "ctxt": 0 }, "value": "result2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -709,13 +693,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -741,7 +723,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -752,7 +733,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -785,6 +765,7 @@ "ctxt": 0 }, "value": "result3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -807,13 +788,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -839,7 +818,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -850,7 +828,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -883,6 +860,7 @@ "ctxt": 0 }, "value": "result31", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -913,7 +891,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -933,15 +910,13 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -967,7 +942,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -978,7 +952,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1011,6 +984,7 @@ "ctxt": 0 }, "value": "result4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1034,6 +1008,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1056,13 +1031,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1084,8 +1057,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -1119,8 +1091,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1138,7 +1110,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -1149,7 +1120,6 @@ "ctxt": 0 }, "value": "propertyX1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1175,8 +1145,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1194,7 +1164,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -1205,7 +1174,6 @@ "ctxt": 0 }, "value": "propertyX2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1245,6 +1213,7 @@ "ctxt": 0 }, "value": "result5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1268,6 +1237,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1290,13 +1260,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1318,8 +1286,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -1353,8 +1320,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1372,7 +1339,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -1383,7 +1349,6 @@ "ctxt": 0 }, "value": "propertyX1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1409,8 +1374,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1428,7 +1393,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -1439,7 +1403,6 @@ "ctxt": 0 }, "value": "propertyX2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1479,6 +1442,7 @@ "ctxt": 0 }, "value": "result6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1502,6 +1466,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1524,13 +1489,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1552,8 +1515,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -1587,8 +1549,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1606,7 +1568,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -1617,7 +1578,6 @@ "ctxt": 0 }, "value": "propertyX1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1643,8 +1603,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1662,7 +1622,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -1673,7 +1632,6 @@ "ctxt": 0 }, "value": "propertyX2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1713,6 +1671,7 @@ "ctxt": 0 }, "value": "result61", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1736,6 +1695,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1758,13 +1718,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1805,8 +1763,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -1840,8 +1797,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1859,7 +1816,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -1870,7 +1826,6 @@ "ctxt": 0 }, "value": "propertyX1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1896,8 +1851,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1915,7 +1870,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -1926,7 +1880,6 @@ "ctxt": 0 }, "value": "propertyX2", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/argumentExpressionContextualTyping/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/argumentExpressionContextualTyping/input.ts.json index 483fa9abc6f6..01c73185b3ec 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/argumentExpressionContextualTyping/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/argumentExpressionContextualTyping/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -66,8 +64,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -77,8 +75,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -121,7 +118,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null @@ -141,7 +137,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null @@ -161,7 +156,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": null @@ -207,7 +201,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -238,7 +231,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -257,8 +249,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "AssignmentPattern", @@ -275,8 +267,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -304,7 +296,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -330,7 +321,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null @@ -350,7 +340,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null @@ -370,7 +359,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": { @@ -391,7 +379,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -448,7 +435,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -469,6 +455,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -540,8 +527,7 @@ } ] } - }, - "optional": false + } } } ], @@ -590,8 +576,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -611,7 +597,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -664,7 +649,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -685,7 +669,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -708,7 +691,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -736,7 +718,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": { @@ -783,6 +764,7 @@ "ctxt": 0 }, "value": "o1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -814,7 +796,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -893,7 +874,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -931,7 +911,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -973,7 +952,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1015,7 +993,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1048,8 +1025,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1069,7 +1045,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1122,7 +1097,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1143,7 +1117,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -1166,7 +1139,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -1194,7 +1166,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": { @@ -1238,7 +1209,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1252,7 +1222,6 @@ "ctxt": 0 }, "value": "o1", - "typeAnnotation": null, "optional": false } } @@ -1282,7 +1251,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1306,7 +1274,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1359,7 +1326,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1380,7 +1346,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -1403,7 +1368,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -1431,7 +1395,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": { @@ -1479,8 +1442,8 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1562,6 +1525,7 @@ "ctxt": 0 }, "value": "tuple", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1633,8 +1597,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1713,7 +1676,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1727,7 +1689,6 @@ "ctxt": 0 }, "value": "tuple", - "typeAnnotation": null, "optional": false } } @@ -1757,7 +1718,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1841,7 +1801,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1855,7 +1814,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false } } @@ -1885,7 +1843,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1954,7 +1911,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false } } @@ -1987,7 +1943,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2001,7 +1956,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/arrayLiteralExpressionContextualTyping/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/arrayLiteralExpressionContextualTyping/input.ts.json index fbfc96094a61..49e4b68ebef7 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/arrayLiteralExpressionContextualTyping/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/arrayLiteralExpressionContextualTyping/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -109,8 +109,8 @@ "ctxt": 0 }, "value": "array1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -187,6 +187,7 @@ "ctxt": 0 }, "value": "tup", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -258,8 +259,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -348,6 +348,7 @@ "ctxt": 0 }, "value": "tup1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -476,8 +477,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -571,6 +571,7 @@ "ctxt": 0 }, "value": "tup2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -642,8 +643,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -737,8 +737,8 @@ "ctxt": 0 }, "value": "spr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -798,7 +798,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false } } @@ -833,8 +832,8 @@ "ctxt": 0 }, "value": "spr1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -894,7 +893,6 @@ "ctxt": 0 }, "value": "tup", - "typeAnnotation": null, "optional": false } } @@ -929,6 +927,7 @@ "ctxt": 0 }, "value": "spr2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1000,8 +999,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1061,7 +1059,6 @@ "ctxt": 0 }, "value": "tup", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/functionExpressionContextualTyping1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/functionExpressionContextualTyping1/input.ts.json index 4e4f32ca8127..af6fefee345e 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/functionExpressionContextualTyping1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/functionExpressionContextualTyping1/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "red", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "blue", - "typeAnnotation": null, "optional": false }, "init": null @@ -94,6 +91,7 @@ "ctxt": 0 }, "value": "a0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -117,6 +115,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -133,8 +132,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -144,6 +142,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -160,8 +159,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -183,8 +181,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -202,8 +199,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -213,8 +210,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -254,7 +251,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false }, "property": { @@ -265,7 +261,6 @@ "ctxt": 0 }, "value": "toExponential", - "typeAnnotation": null, "optional": false }, "computed": false @@ -312,7 +307,6 @@ "ctxt": 0 }, "value": "Class", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -338,7 +332,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -395,7 +388,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -431,6 +423,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -454,6 +447,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -476,7 +470,6 @@ "ctxt": 0 }, "value": "Class", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -502,7 +495,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -510,8 +502,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -533,8 +524,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -552,8 +542,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -593,7 +583,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "property": { @@ -604,7 +593,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -666,6 +654,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -704,6 +693,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -720,8 +710,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -731,6 +720,7 @@ "ctxt": 0 }, "value": "w", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -747,8 +737,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeParams": null, @@ -794,6 +783,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -810,8 +800,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -821,6 +810,7 @@ "ctxt": 0 }, "value": "w", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -837,8 +827,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeParams": null, @@ -863,8 +852,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -894,8 +882,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -913,8 +901,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -924,8 +912,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -969,6 +957,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -999,7 +988,6 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, "optional": false } }, @@ -1026,6 +1014,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1042,8 +1031,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1053,6 +1041,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1069,8 +1058,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -1095,8 +1083,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1126,8 +1113,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1145,8 +1132,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1156,8 +1143,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1191,7 +1178,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "right": { @@ -1237,8 +1223,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1256,8 +1242,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1267,8 +1253,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1335,6 +1321,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1358,6 +1345,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1374,8 +1362,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1385,6 +1372,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1401,8 +1389,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1412,6 +1399,7 @@ "ctxt": 0 }, "value": "boo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1428,8 +1416,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeParams": null, @@ -1451,8 +1438,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1482,8 +1468,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1501,8 +1487,8 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1512,8 +1498,8 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1557,6 +1543,7 @@ "ctxt": 0 }, "value": "b4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1580,6 +1567,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1602,13 +1590,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1630,8 +1616,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -1656,8 +1641,8 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1737,6 +1722,7 @@ "ctxt": 0 }, "value": "b5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1760,6 +1746,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1776,8 +1763,7 @@ }, "members": [] } - }, - "optional": false + } } ], "typeParams": null, @@ -1799,8 +1785,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -1825,8 +1810,8 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -1911,6 +1896,7 @@ "ctxt": 0 }, "value": "b6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1949,6 +1935,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1965,8 +1952,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1976,6 +1962,7 @@ "ctxt": 0 }, "value": "w", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1992,8 +1979,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeParams": null, @@ -2039,6 +2025,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2055,8 +2042,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -2081,8 +2067,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2114,6 +2099,7 @@ "ctxt": 0 }, "value": "b7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2152,6 +2138,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2168,8 +2155,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2179,6 +2165,7 @@ "ctxt": 0 }, "value": "w", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2195,8 +2182,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeParams": null, @@ -2242,6 +2228,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2258,8 +2245,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2269,6 +2255,7 @@ "ctxt": 0 }, "value": "w", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2285,8 +2272,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -2311,8 +2297,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2342,8 +2327,8 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -2361,8 +2346,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2402,7 +2387,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "property": { @@ -2413,7 +2397,6 @@ "ctxt": 0 }, "value": "toLowerCase", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2454,8 +2437,8 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -2473,8 +2456,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2514,7 +2497,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -2525,7 +2507,6 @@ "ctxt": 0 }, "value": "toExponential", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2549,7 +2530,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -2585,8 +2565,8 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -2604,8 +2584,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2615,8 +2595,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2645,7 +2625,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2671,7 +2650,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -2708,6 +2686,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2746,6 +2725,7 @@ "ctxt": 0 }, "value": "j", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2768,13 +2748,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2784,6 +2762,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2806,13 +2785,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2860,7 +2837,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2880,7 +2856,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2915,6 +2890,7 @@ "ctxt": 0 }, "value": "j", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2931,8 +2907,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2942,6 +2917,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2964,13 +2940,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3003,8 +2977,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -3022,8 +2995,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3033,8 +3006,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3070,7 +3043,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false } }, @@ -3084,7 +3056,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false } } @@ -3133,7 +3104,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3154,7 +3124,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/functionExpressionContextualTyping2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/functionExpressionContextualTyping2/input.ts.json index 6b631cd6d518..1d5e32f5acaa 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/functionExpressionContextualTyping2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/functionExpressionContextualTyping2/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,6 +55,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -70,8 +72,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -81,6 +82,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -97,8 +99,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -120,8 +121,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -153,6 +153,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -183,7 +184,6 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, "optional": false } }, @@ -210,6 +210,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -226,8 +227,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -237,6 +237,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -253,8 +254,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -279,8 +279,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -310,8 +309,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -329,8 +328,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -340,8 +339,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/functionExpressionContextualTyping3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/functionExpressionContextualTyping3/input.ts.json index 23ce6fde9116..dd23e7c9936f 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/functionExpressionContextualTyping3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/functionExpressionContextualTyping3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -67,7 +67,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -83,8 +82,7 @@ } ] } - }, - "optional": false + } } } ], @@ -120,7 +118,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -168,7 +165,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -190,6 +186,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -206,8 +203,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/generatedContextualTyping/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/generatedContextualTyping/input.ts.json index 0e51d4d26f29..91d2780e3ca9 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/generatedContextualTyping/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/generatedContextualTyping/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": null, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": null, @@ -124,7 +120,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -142,7 +137,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -168,7 +162,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": null, @@ -192,7 +185,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -215,7 +207,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -242,7 +233,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -275,7 +265,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -289,6 +278,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -318,14 +308,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeAnn": null, @@ -359,8 +347,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -377,7 +365,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -400,8 +387,8 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -418,7 +405,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -441,8 +427,8 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -459,7 +445,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -494,6 +479,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -539,7 +525,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -547,8 +532,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -576,7 +560,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -590,7 +573,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -630,6 +612,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -675,7 +658,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -683,8 +665,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -729,7 +710,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -743,7 +723,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -786,6 +765,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -831,7 +811,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -839,8 +818,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -852,7 +830,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -895,7 +872,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -909,7 +885,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -952,6 +927,7 @@ "ctxt": 0 }, "value": "x4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1004,7 +980,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1015,8 +990,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -1044,7 +1018,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -1058,7 +1031,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -1098,6 +1070,7 @@ "ctxt": 0 }, "value": "x5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1150,7 +1123,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1161,8 +1133,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -1207,7 +1178,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -1221,7 +1191,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -1264,6 +1233,7 @@ "ctxt": 0 }, "value": "x6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1316,7 +1286,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1327,8 +1296,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -1340,7 +1308,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1383,7 +1350,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -1397,7 +1363,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -1440,6 +1405,7 @@ "ctxt": 0 }, "value": "x7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1469,14 +1435,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1496,7 +1460,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -1510,7 +1473,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -1545,6 +1507,7 @@ "ctxt": 0 }, "value": "x8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1567,7 +1530,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1593,7 +1555,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1601,8 +1562,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1622,7 +1582,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -1636,7 +1595,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -1671,6 +1629,7 @@ "ctxt": 0 }, "value": "x9", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1697,6 +1656,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1713,8 +1673,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1739,7 +1698,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1754,8 +1712,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1775,7 +1732,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -1789,7 +1745,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -1824,6 +1779,7 @@ "ctxt": 0 }, "value": "x10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1855,7 +1811,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1891,7 +1846,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1902,8 +1856,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1923,7 +1876,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -1944,7 +1896,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -1958,7 +1909,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -1996,6 +1946,7 @@ "ctxt": 0 }, "value": "x11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2019,6 +1970,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2048,14 +2000,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -2077,8 +2027,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -2096,8 +2045,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2133,6 +2082,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2162,14 +2112,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2228,6 +2176,7 @@ "ctxt": 0 }, "value": "x12", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2250,7 +2199,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2276,7 +2224,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2284,8 +2231,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -2305,7 +2251,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -2324,8 +2269,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2361,7 +2306,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -2375,7 +2319,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -2406,7 +2349,6 @@ "ctxt": 0 }, "value": "x13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2432,7 +2374,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -2461,7 +2402,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -2475,7 +2415,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -2531,7 +2470,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2567,7 +2505,6 @@ "ctxt": 0 }, "value": "x14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2593,7 +2530,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -2639,7 +2575,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -2653,7 +2588,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -2712,7 +2646,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2748,7 +2681,6 @@ "ctxt": 0 }, "value": "x15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2774,7 +2706,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -2787,7 +2718,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -2830,7 +2760,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -2844,7 +2773,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -2903,7 +2831,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2939,7 +2866,6 @@ "ctxt": 0 }, "value": "x16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2965,7 +2891,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -2994,7 +2919,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -3008,7 +2932,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -3071,7 +2994,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3110,7 +3032,6 @@ "ctxt": 0 }, "value": "x17", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3136,7 +3057,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -3182,7 +3102,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -3196,7 +3115,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -3262,7 +3180,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3301,7 +3218,6 @@ "ctxt": 0 }, "value": "x18", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3327,7 +3243,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -3340,7 +3255,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -3383,7 +3297,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -3397,7 +3310,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -3463,7 +3375,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3502,7 +3413,6 @@ "ctxt": 0 }, "value": "x19", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3528,7 +3438,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -3549,7 +3458,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -3563,7 +3471,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -3598,7 +3505,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3632,7 +3538,6 @@ "ctxt": 0 }, "value": "x20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3658,7 +3563,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -3679,7 +3583,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -3693,7 +3596,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -3721,7 +3623,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3747,7 +3648,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3783,7 +3683,6 @@ "ctxt": 0 }, "value": "x21", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3809,7 +3708,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -3830,7 +3728,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -3844,7 +3741,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -3876,6 +3772,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3892,8 +3789,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3918,7 +3814,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3961,7 +3856,6 @@ "ctxt": 0 }, "value": "x22", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3987,7 +3881,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -4008,7 +3901,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -4029,7 +3921,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -4043,7 +3934,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -4083,7 +3973,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4119,7 +4008,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4158,7 +4046,6 @@ "ctxt": 0 }, "value": "x23", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4184,7 +4071,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -4203,8 +4089,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4240,6 +4126,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4269,14 +4156,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4329,6 +4214,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4358,14 +4244,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -4415,7 +4299,6 @@ "ctxt": 0 }, "value": "x24", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4441,7 +4324,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -4462,7 +4344,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -4481,8 +4362,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4518,7 +4399,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -4532,7 +4412,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -4571,7 +4450,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4597,7 +4475,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4633,7 +4510,6 @@ "ctxt": 0 }, "value": "x25", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4659,7 +4535,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -4688,7 +4563,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -4702,7 +4576,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -4758,7 +4631,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4794,7 +4666,6 @@ "ctxt": 0 }, "value": "x26", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4820,7 +4691,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -4866,7 +4736,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -4880,7 +4749,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -4939,7 +4807,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4975,7 +4842,6 @@ "ctxt": 0 }, "value": "x27", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5001,7 +4867,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -5014,7 +4879,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -5057,7 +4921,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -5071,7 +4934,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -5130,7 +4992,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5166,7 +5027,6 @@ "ctxt": 0 }, "value": "x28", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5192,7 +5052,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -5221,7 +5080,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -5235,7 +5093,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -5298,7 +5155,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5337,7 +5193,6 @@ "ctxt": 0 }, "value": "x29", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5363,7 +5218,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -5409,7 +5263,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -5423,7 +5276,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -5489,7 +5341,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5528,7 +5379,6 @@ "ctxt": 0 }, "value": "x30", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5554,7 +5404,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -5567,7 +5416,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -5610,7 +5458,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -5624,7 +5471,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -5690,7 +5536,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5729,7 +5574,6 @@ "ctxt": 0 }, "value": "x31", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5755,7 +5599,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -5776,7 +5619,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -5790,7 +5632,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -5825,7 +5666,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5859,7 +5699,6 @@ "ctxt": 0 }, "value": "x32", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5885,7 +5724,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -5906,7 +5744,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -5920,7 +5757,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -5948,7 +5784,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5974,7 +5809,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6010,7 +5844,6 @@ "ctxt": 0 }, "value": "x33", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6036,7 +5869,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -6057,7 +5889,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -6071,7 +5902,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -6103,6 +5933,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6119,8 +5950,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -6145,7 +5975,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6188,7 +6017,6 @@ "ctxt": 0 }, "value": "x34", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6214,7 +6042,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -6235,7 +6062,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -6256,7 +6082,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -6270,7 +6095,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -6310,7 +6134,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6346,7 +6169,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6385,7 +6207,6 @@ "ctxt": 0 }, "value": "x35", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6411,7 +6232,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -6430,8 +6250,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -6467,6 +6287,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6496,14 +6317,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -6556,6 +6375,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6585,14 +6405,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -6642,7 +6460,6 @@ "ctxt": 0 }, "value": "x36", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6668,7 +6485,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -6689,7 +6505,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -6708,8 +6523,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -6745,7 +6560,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -6759,7 +6573,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -6798,7 +6611,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6824,7 +6636,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6860,7 +6671,6 @@ "ctxt": 0 }, "value": "x37", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6886,7 +6696,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -6915,7 +6724,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -6929,7 +6737,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -6985,7 +6792,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7021,7 +6827,6 @@ "ctxt": 0 }, "value": "x38", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7047,7 +6852,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -7093,7 +6897,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -7107,7 +6910,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -7166,7 +6968,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7202,7 +7003,6 @@ "ctxt": 0 }, "value": "x39", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7228,7 +7028,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -7241,7 +7040,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -7284,7 +7082,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -7298,7 +7095,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -7357,7 +7153,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7393,7 +7188,6 @@ "ctxt": 0 }, "value": "x40", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7419,7 +7213,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -7448,7 +7241,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -7462,7 +7254,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -7525,7 +7316,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7564,7 +7354,6 @@ "ctxt": 0 }, "value": "x41", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7590,7 +7379,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -7636,7 +7424,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -7650,7 +7437,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -7716,7 +7502,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7755,7 +7540,6 @@ "ctxt": 0 }, "value": "x42", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7781,7 +7565,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -7794,7 +7577,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -7837,7 +7619,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -7851,7 +7632,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -7917,7 +7697,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7956,7 +7735,6 @@ "ctxt": 0 }, "value": "x43", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7982,7 +7760,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -8003,7 +7780,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -8017,7 +7793,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -8052,7 +7827,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8086,7 +7860,6 @@ "ctxt": 0 }, "value": "x44", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8112,7 +7885,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -8133,7 +7905,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -8147,7 +7918,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -8175,7 +7945,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8201,7 +7970,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8237,7 +8005,6 @@ "ctxt": 0 }, "value": "x45", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8263,7 +8030,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -8284,7 +8050,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -8298,7 +8063,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -8330,6 +8094,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8346,8 +8111,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -8372,7 +8136,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8415,7 +8178,6 @@ "ctxt": 0 }, "value": "x46", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8441,7 +8203,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -8462,7 +8223,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -8483,7 +8243,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -8497,7 +8256,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -8537,7 +8295,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8573,7 +8330,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8612,7 +8368,6 @@ "ctxt": 0 }, "value": "x47", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8638,7 +8393,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -8657,8 +8411,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -8694,6 +8448,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8723,14 +8478,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -8783,6 +8536,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8812,14 +8566,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -8869,7 +8621,6 @@ "ctxt": 0 }, "value": "x48", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8895,7 +8646,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -8916,7 +8666,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -8935,8 +8684,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -8972,7 +8721,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -8986,7 +8734,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -9025,7 +8772,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9051,7 +8797,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9087,7 +8832,6 @@ "ctxt": 0 }, "value": "x49", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9113,7 +8857,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -9142,7 +8885,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -9156,7 +8898,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -9212,7 +8953,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9248,7 +8988,6 @@ "ctxt": 0 }, "value": "x50", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9274,7 +9013,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -9320,7 +9058,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -9334,7 +9071,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -9393,7 +9129,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9429,7 +9164,6 @@ "ctxt": 0 }, "value": "x51", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9455,7 +9189,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -9468,7 +9201,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -9511,7 +9243,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -9525,7 +9256,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -9584,7 +9314,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9620,7 +9349,6 @@ "ctxt": 0 }, "value": "x52", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9646,7 +9374,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -9675,7 +9402,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -9689,7 +9415,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -9752,7 +9477,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9791,7 +9515,6 @@ "ctxt": 0 }, "value": "x53", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9817,7 +9540,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -9863,7 +9585,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -9877,7 +9598,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -9943,7 +9663,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9982,7 +9701,6 @@ "ctxt": 0 }, "value": "x54", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10008,7 +9726,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -10021,7 +9738,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -10064,7 +9780,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -10078,7 +9793,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -10144,7 +9858,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10183,7 +9896,6 @@ "ctxt": 0 }, "value": "x55", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10209,7 +9921,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -10230,7 +9941,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -10244,7 +9954,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -10279,7 +9988,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10313,7 +10021,6 @@ "ctxt": 0 }, "value": "x56", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10339,7 +10046,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -10360,7 +10066,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -10374,7 +10079,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -10402,7 +10106,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10428,7 +10131,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10464,7 +10166,6 @@ "ctxt": 0 }, "value": "x57", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10490,7 +10191,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -10511,7 +10211,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -10525,7 +10224,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -10557,6 +10255,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10573,8 +10272,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -10599,7 +10297,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10642,7 +10339,6 @@ "ctxt": 0 }, "value": "x58", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10668,7 +10364,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -10689,7 +10384,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -10710,7 +10404,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -10724,7 +10417,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -10764,7 +10456,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -10800,7 +10491,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10839,7 +10529,6 @@ "ctxt": 0 }, "value": "x59", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10865,7 +10554,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -10884,8 +10572,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -10921,6 +10609,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10950,14 +10639,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -11010,6 +10697,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11039,14 +10727,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -11096,7 +10782,6 @@ "ctxt": 0 }, "value": "x60", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -11122,7 +10807,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -11143,7 +10827,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -11162,8 +10845,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -11199,7 +10882,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -11213,7 +10895,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -11252,7 +10933,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -11278,7 +10958,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11314,7 +10993,6 @@ "ctxt": 0 }, "value": "x61", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -11340,7 +11018,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -11369,7 +11046,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -11383,7 +11059,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -11439,7 +11114,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11475,7 +11149,6 @@ "ctxt": 0 }, "value": "x62", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -11501,7 +11174,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -11547,7 +11219,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -11561,7 +11232,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -11620,7 +11290,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11656,7 +11325,6 @@ "ctxt": 0 }, "value": "x63", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -11682,7 +11350,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -11695,7 +11362,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -11738,7 +11404,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -11752,7 +11417,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -11811,7 +11475,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11847,7 +11510,6 @@ "ctxt": 0 }, "value": "x64", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -11873,7 +11535,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -11902,7 +11563,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -11916,7 +11576,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -11979,7 +11638,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12018,7 +11676,6 @@ "ctxt": 0 }, "value": "x65", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -12044,7 +11701,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -12090,7 +11746,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -12104,7 +11759,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -12170,7 +11824,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12209,7 +11862,6 @@ "ctxt": 0 }, "value": "x66", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -12235,7 +11887,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -12248,7 +11899,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -12291,7 +11941,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -12305,7 +11954,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -12371,7 +12019,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12410,7 +12057,6 @@ "ctxt": 0 }, "value": "x67", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -12436,7 +12082,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -12457,7 +12102,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -12471,7 +12115,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -12506,7 +12149,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12540,7 +12182,6 @@ "ctxt": 0 }, "value": "x68", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -12566,7 +12207,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -12587,7 +12227,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -12601,7 +12240,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -12629,7 +12267,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -12655,7 +12292,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12691,7 +12327,6 @@ "ctxt": 0 }, "value": "x69", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -12717,7 +12352,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -12738,7 +12372,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -12752,7 +12385,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -12784,6 +12416,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12800,8 +12433,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -12826,7 +12458,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12869,7 +12500,6 @@ "ctxt": 0 }, "value": "x70", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -12895,7 +12525,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -12916,7 +12545,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -12937,7 +12565,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -12951,7 +12578,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -12991,7 +12617,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -13027,7 +12652,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13066,7 +12690,6 @@ "ctxt": 0 }, "value": "x71", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -13092,7 +12715,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -13111,8 +12733,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -13148,6 +12770,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13177,14 +12800,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -13237,6 +12858,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13266,14 +12888,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -13323,7 +12943,6 @@ "ctxt": 0 }, "value": "x72", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -13349,7 +12968,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -13370,7 +12988,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -13389,8 +13006,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -13426,7 +13043,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -13440,7 +13056,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -13479,7 +13094,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13505,7 +13119,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13541,7 +13154,6 @@ "ctxt": 0 }, "value": "x73", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -13567,7 +13179,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -13596,7 +13207,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -13610,7 +13220,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -13666,7 +13275,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13702,7 +13310,6 @@ "ctxt": 0 }, "value": "x74", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -13728,7 +13335,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -13774,7 +13380,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -13788,7 +13393,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -13847,7 +13451,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13883,7 +13486,6 @@ "ctxt": 0 }, "value": "x75", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -13909,7 +13511,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -13922,7 +13523,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -13965,7 +13565,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -13979,7 +13578,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -14038,7 +13636,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14074,7 +13671,6 @@ "ctxt": 0 }, "value": "x76", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -14100,7 +13696,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -14129,7 +13724,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -14143,7 +13737,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -14206,7 +13799,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14245,7 +13837,6 @@ "ctxt": 0 }, "value": "x77", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -14271,7 +13862,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -14317,7 +13907,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -14331,7 +13920,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -14397,7 +13985,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14436,7 +14023,6 @@ "ctxt": 0 }, "value": "x78", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -14462,7 +14048,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -14475,7 +14060,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -14518,7 +14102,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -14532,7 +14115,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -14598,7 +14180,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14637,7 +14218,6 @@ "ctxt": 0 }, "value": "x79", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -14663,7 +14243,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -14684,7 +14263,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -14698,7 +14276,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -14733,7 +14310,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14767,7 +14343,6 @@ "ctxt": 0 }, "value": "x80", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -14793,7 +14368,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -14814,7 +14388,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -14828,7 +14401,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -14856,7 +14428,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14882,7 +14453,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14918,7 +14488,6 @@ "ctxt": 0 }, "value": "x81", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -14944,7 +14513,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -14965,7 +14533,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -14979,7 +14546,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -15011,6 +14577,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -15027,8 +14594,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -15053,7 +14619,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -15096,7 +14661,6 @@ "ctxt": 0 }, "value": "x82", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -15122,7 +14686,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -15143,7 +14706,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -15164,7 +14726,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -15178,7 +14739,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -15218,7 +14778,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -15254,7 +14813,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -15293,7 +14851,6 @@ "ctxt": 0 }, "value": "x83", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -15319,7 +14876,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -15338,8 +14894,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -15375,6 +14931,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -15404,14 +14961,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -15464,6 +15019,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -15493,14 +15049,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -15550,7 +15104,6 @@ "ctxt": 0 }, "value": "x84", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -15576,7 +15129,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -15597,7 +15149,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -15616,8 +15167,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -15653,7 +15204,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -15667,7 +15217,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -15706,7 +15255,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -15732,7 +15280,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -15768,7 +15315,6 @@ "ctxt": 0 }, "value": "x85", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -15794,7 +15340,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -15821,6 +15366,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -15866,7 +15412,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -15874,8 +15419,7 @@ } } } - }, - "optional": false + } }, "right": { "type": "ArrowFunctionExpression", @@ -15903,7 +15447,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -15917,7 +15460,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -15961,7 +15503,6 @@ "ctxt": 0 }, "value": "x86", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -15987,7 +15528,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -16014,6 +15554,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -16059,7 +15600,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -16067,8 +15607,7 @@ } } } - }, - "optional": false + } }, "right": { "type": "FunctionExpression", @@ -16113,7 +15652,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -16127,7 +15665,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -16174,7 +15711,6 @@ "ctxt": 0 }, "value": "x87", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -16200,7 +15736,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -16227,6 +15762,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -16272,7 +15808,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -16280,8 +15815,7 @@ } } } - }, - "optional": false + } }, "right": { "type": "FunctionExpression", @@ -16293,7 +15827,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -16336,7 +15869,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -16350,7 +15882,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -16397,7 +15928,6 @@ "ctxt": 0 }, "value": "x88", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -16423,7 +15953,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -16450,6 +15979,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -16502,7 +16032,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -16513,8 +16042,7 @@ } ] } - }, - "optional": false + } }, "right": { "type": "ArrowFunctionExpression", @@ -16542,7 +16070,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -16556,7 +16083,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -16600,7 +16126,6 @@ "ctxt": 0 }, "value": "x89", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -16626,7 +16151,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -16653,6 +16177,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -16705,7 +16230,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -16716,8 +16240,7 @@ } ] } - }, - "optional": false + } }, "right": { "type": "FunctionExpression", @@ -16762,7 +16285,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -16776,7 +16298,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -16823,7 +16344,6 @@ "ctxt": 0 }, "value": "x90", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -16849,7 +16369,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -16876,6 +16395,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -16928,7 +16448,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -16939,8 +16458,7 @@ } ] } - }, - "optional": false + } }, "right": { "type": "FunctionExpression", @@ -16952,7 +16470,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -16995,7 +16512,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -17009,7 +16525,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -17056,7 +16571,6 @@ "ctxt": 0 }, "value": "x91", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -17082,7 +16596,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -17109,6 +16622,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -17138,14 +16652,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "right": { "type": "ArrayExpression", @@ -17165,7 +16677,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -17179,7 +16690,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -17218,7 +16728,6 @@ "ctxt": 0 }, "value": "x92", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -17244,7 +16753,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -17271,6 +16779,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -17293,7 +16802,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -17319,7 +16827,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -17327,8 +16834,7 @@ ] } } - }, - "optional": false + } }, "right": { "type": "ArrayExpression", @@ -17348,7 +16854,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -17362,7 +16867,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -17401,7 +16905,6 @@ "ctxt": 0 }, "value": "x93", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -17427,7 +16930,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -17454,6 +16956,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -17480,6 +16983,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -17496,8 +17000,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -17522,7 +17025,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -17537,8 +17039,7 @@ } ] } - }, - "optional": false + } }, "right": { "type": "ArrayExpression", @@ -17558,7 +17059,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -17572,7 +17072,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -17611,7 +17110,6 @@ "ctxt": 0 }, "value": "x94", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -17637,7 +17135,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -17664,6 +17161,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -17695,7 +17193,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -17731,7 +17228,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -17742,8 +17238,7 @@ } ] } - }, - "optional": false + } }, "right": { "type": "ObjectExpression", @@ -17763,7 +17258,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -17784,7 +17278,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -17798,7 +17291,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -17840,7 +17332,6 @@ "ctxt": 0 }, "value": "x95", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -17866,7 +17357,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -17893,6 +17383,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -17916,6 +17407,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -17945,14 +17437,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -17974,8 +17464,7 @@ } } } - }, - "optional": false + } }, "right": { "type": "ArrowFunctionExpression", @@ -17993,8 +17482,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -18030,6 +17519,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -18059,14 +17549,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -18129,7 +17617,6 @@ "ctxt": 0 }, "value": "x96", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -18155,7 +17642,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -18182,6 +17668,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -18204,7 +17691,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -18230,7 +17716,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -18238,8 +17723,7 @@ ] } } - }, - "optional": false + } }, "right": { "type": "ObjectExpression", @@ -18259,7 +17743,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -18278,8 +17761,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -18315,7 +17798,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -18329,7 +17811,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -18379,7 +17860,6 @@ "ctxt": 0 }, "value": "x97", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -18405,7 +17885,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -18434,6 +17913,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -18479,7 +17959,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -18487,8 +17966,7 @@ } } } - }, - "optional": false + } }, "right": { "type": "ArrowFunctionExpression", @@ -18516,7 +17994,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -18530,7 +18007,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -18574,7 +18050,6 @@ "ctxt": 0 }, "value": "x98", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -18600,7 +18075,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -18629,6 +18103,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -18674,7 +18149,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -18682,8 +18156,7 @@ } } } - }, - "optional": false + } }, "right": { "type": "FunctionExpression", @@ -18728,7 +18201,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -18742,7 +18214,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -18789,7 +18260,6 @@ "ctxt": 0 }, "value": "x99", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -18815,7 +18285,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -18844,6 +18313,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -18889,7 +18359,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -18897,8 +18366,7 @@ } } } - }, - "optional": false + } }, "right": { "type": "FunctionExpression", @@ -18910,7 +18378,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -18953,7 +18420,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -18967,7 +18433,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -19014,7 +18479,6 @@ "ctxt": 0 }, "value": "x100", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -19040,7 +18504,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -19069,6 +18532,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -19121,7 +18585,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -19132,8 +18595,7 @@ } ] } - }, - "optional": false + } }, "right": { "type": "ArrowFunctionExpression", @@ -19161,7 +18623,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -19175,7 +18636,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -19219,7 +18679,6 @@ "ctxt": 0 }, "value": "x101", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -19245,7 +18704,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -19274,6 +18732,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -19326,7 +18785,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -19337,8 +18795,7 @@ } ] } - }, - "optional": false + } }, "right": { "type": "FunctionExpression", @@ -19383,7 +18840,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -19397,7 +18853,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -19444,7 +18899,6 @@ "ctxt": 0 }, "value": "x102", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -19470,7 +18924,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -19499,6 +18952,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -19551,7 +19005,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -19562,8 +19015,7 @@ } ] } - }, - "optional": false + } }, "right": { "type": "FunctionExpression", @@ -19575,7 +19027,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -19618,7 +19069,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -19632,7 +19082,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -19679,7 +19128,6 @@ "ctxt": 0 }, "value": "x103", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -19705,7 +19153,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -19734,6 +19181,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -19763,14 +19211,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "right": { "type": "ArrayExpression", @@ -19790,7 +19236,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -19804,7 +19249,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -19843,7 +19287,6 @@ "ctxt": 0 }, "value": "x104", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -19869,7 +19312,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -19898,6 +19340,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -19920,7 +19363,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -19946,7 +19388,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -19954,8 +19395,7 @@ ] } } - }, - "optional": false + } }, "right": { "type": "ArrayExpression", @@ -19975,7 +19415,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -19989,7 +19428,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -20028,7 +19466,6 @@ "ctxt": 0 }, "value": "x105", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -20054,7 +19491,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -20083,6 +19519,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -20109,6 +19546,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -20125,8 +19563,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -20151,7 +19588,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -20166,8 +19602,7 @@ } ] } - }, - "optional": false + } }, "right": { "type": "ArrayExpression", @@ -20187,7 +19622,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -20201,7 +19635,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -20240,7 +19673,6 @@ "ctxt": 0 }, "value": "x106", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -20266,7 +19698,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -20295,6 +19726,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -20326,7 +19758,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -20362,7 +19793,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -20373,8 +19803,7 @@ } ] } - }, - "optional": false + } }, "right": { "type": "ObjectExpression", @@ -20394,7 +19823,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -20415,7 +19843,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -20429,7 +19856,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -20471,7 +19897,6 @@ "ctxt": 0 }, "value": "x107", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -20497,7 +19922,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -20526,6 +19950,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -20549,6 +19974,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -20578,14 +20004,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -20607,8 +20031,7 @@ } } } - }, - "optional": false + } }, "right": { "type": "ArrowFunctionExpression", @@ -20626,8 +20049,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -20663,6 +20086,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -20692,14 +20116,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -20762,7 +20184,6 @@ "ctxt": 0 }, "value": "x108", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -20788,7 +20209,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -20817,6 +20237,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -20839,7 +20260,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -20865,7 +20285,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -20873,8 +20292,7 @@ ] } } - }, - "optional": false + } }, "right": { "type": "ObjectExpression", @@ -20894,7 +20312,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -20913,8 +20330,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -20950,7 +20367,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -20964,7 +20380,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -21014,7 +20429,6 @@ "ctxt": 0 }, "value": "x109", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -21040,7 +20454,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -21069,6 +20482,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -21114,7 +20528,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -21122,8 +20535,7 @@ } } } - }, - "optional": false + } }, "right": { "type": "ArrowFunctionExpression", @@ -21151,7 +20563,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -21165,7 +20576,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -21209,7 +20619,6 @@ "ctxt": 0 }, "value": "x110", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -21235,7 +20644,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -21264,6 +20672,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -21309,7 +20718,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -21317,8 +20725,7 @@ } } } - }, - "optional": false + } }, "right": { "type": "FunctionExpression", @@ -21363,7 +20770,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -21377,7 +20783,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -21424,7 +20829,6 @@ "ctxt": 0 }, "value": "x111", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -21450,7 +20854,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -21479,6 +20882,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -21524,7 +20928,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -21532,8 +20935,7 @@ } } } - }, - "optional": false + } }, "right": { "type": "FunctionExpression", @@ -21545,7 +20947,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -21588,7 +20989,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -21602,7 +21002,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -21649,7 +21048,6 @@ "ctxt": 0 }, "value": "x112", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -21675,7 +21073,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -21704,6 +21101,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -21756,7 +21154,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -21767,8 +21164,7 @@ } ] } - }, - "optional": false + } }, "right": { "type": "ArrowFunctionExpression", @@ -21796,7 +21192,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -21810,7 +21205,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -21854,7 +21248,6 @@ "ctxt": 0 }, "value": "x113", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -21880,7 +21273,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -21909,6 +21301,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -21961,7 +21354,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -21972,8 +21364,7 @@ } ] } - }, - "optional": false + } }, "right": { "type": "FunctionExpression", @@ -22018,7 +21409,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -22032,7 +21422,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -22079,7 +21468,6 @@ "ctxt": 0 }, "value": "x114", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -22105,7 +21493,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -22134,6 +21521,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -22186,7 +21574,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -22197,8 +21584,7 @@ } ] } - }, - "optional": false + } }, "right": { "type": "FunctionExpression", @@ -22210,7 +21596,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -22253,7 +21638,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -22267,7 +21651,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -22314,7 +21697,6 @@ "ctxt": 0 }, "value": "x115", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -22340,7 +21722,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -22369,6 +21750,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -22398,14 +21780,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "right": { "type": "ArrayExpression", @@ -22425,7 +21805,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -22439,7 +21818,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -22478,7 +21856,6 @@ "ctxt": 0 }, "value": "x116", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -22504,7 +21881,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -22533,6 +21909,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -22555,7 +21932,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -22581,7 +21957,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -22589,8 +21964,7 @@ ] } } - }, - "optional": false + } }, "right": { "type": "ArrayExpression", @@ -22610,7 +21984,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -22624,7 +21997,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -22663,7 +22035,6 @@ "ctxt": 0 }, "value": "x117", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -22689,7 +22060,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -22718,6 +22088,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -22744,6 +22115,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -22760,8 +22132,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -22786,7 +22157,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -22801,8 +22171,7 @@ } ] } - }, - "optional": false + } }, "right": { "type": "ArrayExpression", @@ -22822,7 +22191,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -22836,7 +22204,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -22875,7 +22242,6 @@ "ctxt": 0 }, "value": "x118", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -22901,7 +22267,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -22930,6 +22295,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -22961,7 +22327,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -22997,7 +22362,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -23008,8 +22372,7 @@ } ] } - }, - "optional": false + } }, "right": { "type": "ObjectExpression", @@ -23029,7 +22392,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -23050,7 +22412,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -23064,7 +22425,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -23106,7 +22466,6 @@ "ctxt": 0 }, "value": "x119", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -23132,7 +22491,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -23161,6 +22519,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -23184,6 +22543,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -23213,14 +22573,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -23242,8 +22600,7 @@ } } } - }, - "optional": false + } }, "right": { "type": "ArrowFunctionExpression", @@ -23261,8 +22618,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -23298,6 +22655,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -23327,14 +22685,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -23397,7 +22753,6 @@ "ctxt": 0 }, "value": "x120", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -23423,7 +22778,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -23452,6 +22806,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -23474,7 +22829,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -23500,7 +22854,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -23508,8 +22861,7 @@ ] } } - }, - "optional": false + } }, "right": { "type": "ObjectExpression", @@ -23529,7 +22881,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -23548,8 +22899,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -23585,7 +22936,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -23599,7 +22949,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -23649,7 +22998,6 @@ "ctxt": 0 }, "value": "x121", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -23677,6 +23025,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -23722,7 +23071,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -23730,8 +23078,7 @@ } } } - }, - "optional": false + } }, "right": { "type": "ArrowFunctionExpression", @@ -23759,7 +23106,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -23773,7 +23119,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -23818,7 +23163,6 @@ "ctxt": 0 }, "value": "x122", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -23846,6 +23190,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -23891,7 +23236,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -23899,8 +23243,7 @@ } } } - }, - "optional": false + } }, "right": { "type": "FunctionExpression", @@ -23945,7 +23288,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -23959,7 +23301,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -24007,7 +23348,6 @@ "ctxt": 0 }, "value": "x123", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -24035,6 +23375,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -24080,7 +23421,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24088,8 +23428,7 @@ } } } - }, - "optional": false + } }, "right": { "type": "FunctionExpression", @@ -24101,7 +23440,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -24144,7 +23482,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -24158,7 +23495,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -24206,7 +23542,6 @@ "ctxt": 0 }, "value": "x124", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -24234,6 +23569,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -24286,7 +23622,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24297,8 +23632,7 @@ } ] } - }, - "optional": false + } }, "right": { "type": "ArrowFunctionExpression", @@ -24326,7 +23660,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -24340,7 +23673,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -24385,7 +23717,6 @@ "ctxt": 0 }, "value": "x125", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -24413,6 +23744,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -24465,7 +23797,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24476,8 +23807,7 @@ } ] } - }, - "optional": false + } }, "right": { "type": "FunctionExpression", @@ -24522,7 +23852,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -24536,7 +23865,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -24584,7 +23912,6 @@ "ctxt": 0 }, "value": "x126", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -24612,6 +23939,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -24664,7 +23992,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24675,8 +24002,7 @@ } ] } - }, - "optional": false + } }, "right": { "type": "FunctionExpression", @@ -24688,7 +24014,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -24731,7 +24056,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -24745,7 +24069,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -24793,7 +24116,6 @@ "ctxt": 0 }, "value": "x127", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -24821,6 +24143,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -24850,14 +24173,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "right": { "type": "ArrayExpression", @@ -24877,7 +24198,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -24891,7 +24211,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -24931,7 +24250,6 @@ "ctxt": 0 }, "value": "x128", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -24959,6 +24277,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -24981,7 +24300,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -25007,7 +24325,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -25015,8 +24332,7 @@ ] } } - }, - "optional": false + } }, "right": { "type": "ArrayExpression", @@ -25036,7 +24352,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -25050,7 +24365,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -25090,7 +24404,6 @@ "ctxt": 0 }, "value": "x129", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -25118,6 +24431,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -25144,6 +24458,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -25160,8 +24475,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -25186,7 +24500,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -25201,8 +24514,7 @@ } ] } - }, - "optional": false + } }, "right": { "type": "ArrayExpression", @@ -25222,7 +24534,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -25236,7 +24547,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -25276,7 +24586,6 @@ "ctxt": 0 }, "value": "x130", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -25304,6 +24613,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -25335,7 +24645,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -25371,7 +24680,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -25382,8 +24690,7 @@ } ] } - }, - "optional": false + } }, "right": { "type": "ObjectExpression", @@ -25403,7 +24710,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -25424,7 +24730,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -25438,7 +24743,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -25481,7 +24785,6 @@ "ctxt": 0 }, "value": "x131", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -25509,6 +24812,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -25532,6 +24836,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -25561,14 +24866,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -25590,8 +24893,7 @@ } } } - }, - "optional": false + } }, "right": { "type": "ArrowFunctionExpression", @@ -25609,8 +24911,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -25646,6 +24948,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -25675,14 +24978,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -25746,7 +25047,6 @@ "ctxt": 0 }, "value": "x132", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -25774,6 +25074,7 @@ "ctxt": 0 }, "value": "parm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -25796,7 +25097,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -25822,7 +25122,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -25830,8 +25129,7 @@ ] } } - }, - "optional": false + } }, "right": { "type": "ObjectExpression", @@ -25851,7 +25149,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -25870,8 +25167,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -25907,7 +25204,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -25921,7 +25217,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -25972,7 +25267,6 @@ "ctxt": 0 }, "value": "x133", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -26024,7 +25318,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -26038,7 +25331,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -26100,7 +25392,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26120,7 +25411,6 @@ "ctxt": 0 }, "value": "x134", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -26189,7 +25479,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -26203,7 +25492,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -26268,7 +25556,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26288,7 +25575,6 @@ "ctxt": 0 }, "value": "x135", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -26324,7 +25610,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -26367,7 +25652,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -26381,7 +25665,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -26446,7 +25729,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26466,7 +25748,6 @@ "ctxt": 0 }, "value": "x136", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -26518,7 +25799,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -26532,7 +25812,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -26601,7 +25880,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26624,7 +25902,6 @@ "ctxt": 0 }, "value": "x137", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -26693,7 +25970,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -26707,7 +25983,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -26779,7 +26054,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26802,7 +26076,6 @@ "ctxt": 0 }, "value": "x138", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -26838,7 +26111,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -26881,7 +26153,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -26895,7 +26166,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -26967,7 +26237,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26990,7 +26259,6 @@ "ctxt": 0 }, "value": "x139", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -27034,7 +26302,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -27048,7 +26315,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -27089,7 +26355,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -27107,7 +26372,6 @@ "ctxt": 0 }, "value": "x140", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -27151,7 +26415,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -27165,7 +26428,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -27199,7 +26461,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -27225,7 +26486,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -27245,7 +26505,6 @@ "ctxt": 0 }, "value": "x141", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -27289,7 +26548,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -27303,7 +26561,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -27341,6 +26598,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -27357,8 +26615,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -27383,7 +26640,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -27410,7 +26666,6 @@ "ctxt": 0 }, "value": "x142", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -27454,7 +26709,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -27475,7 +26729,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -27489,7 +26742,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -27535,7 +26787,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -27571,7 +26822,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -27594,7 +26844,6 @@ "ctxt": 0 }, "value": "x143", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -27636,8 +26885,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -27673,6 +26922,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -27702,14 +26952,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -27768,6 +27016,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -27797,14 +27046,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -27838,7 +27085,6 @@ "ctxt": 0 }, "value": "x144", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -27882,7 +27128,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -27901,8 +27146,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -27938,7 +27183,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -27952,7 +27196,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -27997,7 +27240,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -28023,7 +27265,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -28043,7 +27284,6 @@ "ctxt": 0 }, "value": "x145", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -28095,7 +27335,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -28109,7 +27348,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -28154,7 +27392,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -28168,7 +27405,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -28230,7 +27466,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -28250,7 +27485,6 @@ "ctxt": 0 }, "value": "x146", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -28319,7 +27553,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -28333,7 +27566,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -28398,7 +27630,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -28412,7 +27643,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -28477,7 +27707,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -28497,7 +27726,6 @@ "ctxt": 0 }, "value": "x147", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -28533,7 +27761,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -28576,7 +27803,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -28590,7 +27816,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -28622,7 +27847,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -28665,7 +27889,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -28679,7 +27902,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -28744,7 +27966,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -28764,7 +27985,6 @@ "ctxt": 0 }, "value": "x148", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -28816,7 +28036,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -28830,7 +28049,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -28875,7 +28093,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -28889,7 +28106,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -28958,7 +28174,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -28981,7 +28196,6 @@ "ctxt": 0 }, "value": "x149", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -29050,7 +28264,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -29064,7 +28277,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -29129,7 +28341,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -29143,7 +28354,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -29215,7 +28425,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -29238,7 +28447,6 @@ "ctxt": 0 }, "value": "x150", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -29274,7 +28482,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -29317,7 +28524,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -29331,7 +28537,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -29363,7 +28568,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -29406,7 +28610,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -29420,7 +28623,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -29492,7 +28694,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -29515,7 +28716,6 @@ "ctxt": 0 }, "value": "x151", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -29559,7 +28759,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -29573,7 +28772,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -29605,7 +28803,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -29619,7 +28816,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -29660,7 +28856,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -29678,7 +28873,6 @@ "ctxt": 0 }, "value": "x152", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -29722,7 +28916,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -29736,7 +28929,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -29768,7 +28960,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -29782,7 +28973,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -29816,7 +29006,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -29842,7 +29031,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -29862,7 +29050,6 @@ "ctxt": 0 }, "value": "x153", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -29906,7 +29093,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -29920,7 +29106,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -29952,7 +29137,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -29966,7 +29150,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -30004,6 +29187,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -30020,8 +29204,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -30046,7 +29229,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -30073,7 +29255,6 @@ "ctxt": 0 }, "value": "x154", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -30117,7 +29298,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -30138,7 +29318,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -30152,7 +29331,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -30187,7 +29365,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -30208,7 +29385,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -30222,7 +29398,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -30268,7 +29443,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -30304,7 +29478,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -30327,7 +29500,6 @@ "ctxt": 0 }, "value": "x155", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -30369,8 +29541,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -30406,6 +29578,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -30435,14 +29608,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -30496,8 +29667,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -30533,6 +29704,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -30562,14 +29734,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -30628,6 +29798,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -30657,14 +29828,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -30698,7 +29867,6 @@ "ctxt": 0 }, "value": "x156", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -30742,7 +29910,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -30761,8 +29928,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -30798,7 +29965,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -30812,7 +29978,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -30855,7 +30020,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -30874,8 +30038,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -30911,7 +30075,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -30925,7 +30088,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -30970,7 +30132,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -30996,7 +30157,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -31031,6 +30191,7 @@ "ctxt": 0 }, "value": "x157", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -31092,7 +30253,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -31102,8 +30262,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -31154,7 +30313,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -31168,7 +30326,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -31216,6 +30373,7 @@ "ctxt": 0 }, "value": "x158", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -31277,7 +30435,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -31287,8 +30444,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -31356,7 +30512,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -31370,7 +30525,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -31421,6 +30575,7 @@ "ctxt": 0 }, "value": "x159", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -31482,7 +30637,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -31492,8 +30646,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -31528,7 +30681,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -31571,7 +30723,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -31585,7 +30736,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -31636,6 +30786,7 @@ "ctxt": 0 }, "value": "x160", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -31704,7 +30855,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -31717,8 +30867,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -31769,7 +30918,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -31783,7 +30931,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -31831,6 +30978,7 @@ "ctxt": 0 }, "value": "x161", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -31899,7 +31047,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -31912,8 +31059,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -31981,7 +31127,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -31995,7 +31140,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -32046,6 +31190,7 @@ "ctxt": 0 }, "value": "x162", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -32114,7 +31259,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -32127,8 +31271,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -32163,7 +31306,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -32206,7 +31348,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -32220,7 +31361,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -32271,6 +31411,7 @@ "ctxt": 0 }, "value": "x163", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -32316,7 +31457,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -32324,8 +31464,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -32368,7 +31507,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -32382,7 +31520,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -32425,6 +31562,7 @@ "ctxt": 0 }, "value": "x164", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -32463,7 +31601,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -32489,7 +31626,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -32499,8 +31635,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -32543,7 +31678,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -32557,7 +31691,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -32600,6 +31733,7 @@ "ctxt": 0 }, "value": "x165", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -32642,6 +31776,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -32658,8 +31793,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -32684,7 +31818,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -32701,8 +31834,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -32745,7 +31877,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -32759,7 +31890,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -32802,6 +31932,7 @@ "ctxt": 0 }, "value": "x166", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -32849,7 +31980,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -32885,7 +32015,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -32898,8 +32027,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -32942,7 +32070,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -32963,7 +32090,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -32977,7 +32103,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -33023,6 +32148,7 @@ "ctxt": 0 }, "value": "x167", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -33062,6 +32188,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -33091,14 +32218,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -33122,8 +32247,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -33164,8 +32288,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -33201,6 +32325,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -33230,14 +32355,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -33304,6 +32427,7 @@ "ctxt": 0 }, "value": "x168", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -33342,7 +32466,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -33368,7 +32491,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -33378,8 +32500,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -33422,7 +32543,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -33441,8 +32561,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -33478,7 +32598,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -33492,7 +32611,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -33546,6 +32664,7 @@ "ctxt": 0 }, "value": "x169", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -33607,7 +32726,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -33617,8 +32735,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -33671,7 +32788,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -33685,7 +32801,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -33733,6 +32848,7 @@ "ctxt": 0 }, "value": "x170", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -33794,7 +32910,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -33804,8 +32919,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -33875,7 +32989,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -33889,7 +33002,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -33940,6 +33052,7 @@ "ctxt": 0 }, "value": "x171", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -34001,7 +33114,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -34011,8 +33123,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -34049,7 +33160,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -34092,7 +33202,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -34106,7 +33215,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -34157,6 +33265,7 @@ "ctxt": 0 }, "value": "x172", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -34225,7 +33334,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -34238,8 +33346,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -34292,7 +33399,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -34306,7 +33412,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -34354,6 +33459,7 @@ "ctxt": 0 }, "value": "x173", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -34422,7 +33528,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -34435,8 +33540,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -34506,7 +33610,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -34520,7 +33623,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -34571,6 +33673,7 @@ "ctxt": 0 }, "value": "x174", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -34639,7 +33742,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -34652,8 +33754,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -34690,7 +33791,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -34733,7 +33833,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -34747,7 +33846,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -34798,6 +33896,7 @@ "ctxt": 0 }, "value": "x175", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -34843,7 +33942,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -34851,8 +33949,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -34897,7 +33994,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -34911,7 +34007,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -34954,6 +34049,7 @@ "ctxt": 0 }, "value": "x176", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -34992,7 +34088,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -35018,7 +34113,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -35028,8 +34122,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -35074,7 +34167,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -35088,7 +34180,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -35131,6 +34222,7 @@ "ctxt": 0 }, "value": "x177", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -35173,6 +34265,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -35189,8 +34282,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -35215,7 +34307,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -35232,8 +34323,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -35278,7 +34368,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -35292,7 +34381,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -35335,6 +34423,7 @@ "ctxt": 0 }, "value": "x178", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -35382,7 +34471,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -35418,7 +34506,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -35431,8 +34518,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -35477,7 +34563,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -35498,7 +34583,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -35512,7 +34596,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -35558,6 +34641,7 @@ "ctxt": 0 }, "value": "x179", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -35597,6 +34681,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -35626,14 +34711,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -35657,8 +34740,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -35701,8 +34783,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -35738,6 +34820,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -35767,14 +34850,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -35841,6 +34922,7 @@ "ctxt": 0 }, "value": "x180", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -35879,7 +34961,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -35905,7 +34986,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -35915,8 +34995,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -35961,7 +35040,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -35980,8 +35058,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -36017,7 +35095,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -36031,7 +35108,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -36077,7 +35153,6 @@ "ctxt": 0 }, "value": "x181", - "typeAnnotation": null, "optional": false }, "body": { @@ -36113,6 +35188,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -36158,7 +35234,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -36166,8 +35241,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -36195,7 +35269,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -36209,7 +35282,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -36244,7 +35316,6 @@ "ctxt": 0 }, "value": "x182", - "typeAnnotation": null, "optional": false }, "body": { @@ -36280,6 +35351,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -36325,7 +35397,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -36333,8 +35404,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -36379,7 +35449,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -36393,7 +35462,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -36431,7 +35499,6 @@ "ctxt": 0 }, "value": "x183", - "typeAnnotation": null, "optional": false }, "body": { @@ -36467,6 +35534,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -36512,7 +35580,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -36520,8 +35587,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -36533,7 +35599,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -36576,7 +35641,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -36590,7 +35654,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -36628,7 +35691,6 @@ "ctxt": 0 }, "value": "x184", - "typeAnnotation": null, "optional": false }, "body": { @@ -36664,6 +35726,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -36716,7 +35779,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -36727,8 +35789,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -36756,7 +35817,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -36770,7 +35830,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -36805,7 +35864,6 @@ "ctxt": 0 }, "value": "x185", - "typeAnnotation": null, "optional": false }, "body": { @@ -36841,6 +35899,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -36893,7 +35952,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -36904,8 +35962,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -36950,7 +36007,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -36964,7 +36020,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -37002,7 +36057,6 @@ "ctxt": 0 }, "value": "x186", - "typeAnnotation": null, "optional": false }, "body": { @@ -37038,6 +36092,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -37090,7 +36145,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -37101,8 +36155,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -37114,7 +36167,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -37157,7 +36209,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -37171,7 +36222,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -37209,7 +36259,6 @@ "ctxt": 0 }, "value": "x187", - "typeAnnotation": null, "optional": false }, "body": { @@ -37245,6 +36294,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -37274,14 +36324,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -37301,7 +36349,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -37315,7 +36362,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -37345,7 +36391,6 @@ "ctxt": 0 }, "value": "x188", - "typeAnnotation": null, "optional": false }, "body": { @@ -37381,6 +36426,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -37403,7 +36449,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -37429,7 +36474,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -37437,8 +36481,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -37458,7 +36501,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -37472,7 +36514,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -37502,7 +36543,6 @@ "ctxt": 0 }, "value": "x189", - "typeAnnotation": null, "optional": false }, "body": { @@ -37538,6 +36578,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -37564,6 +36605,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -37580,8 +36622,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -37606,7 +36647,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -37621,8 +36661,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -37642,7 +36681,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -37656,7 +36694,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -37686,7 +36723,6 @@ "ctxt": 0 }, "value": "x190", - "typeAnnotation": null, "optional": false }, "body": { @@ -37722,6 +36758,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -37753,7 +36790,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -37789,7 +36825,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -37800,8 +36835,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -37821,7 +36855,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -37842,7 +36875,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -37856,7 +36888,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -37889,7 +36920,6 @@ "ctxt": 0 }, "value": "x191", - "typeAnnotation": null, "optional": false }, "body": { @@ -37925,6 +36955,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -37948,6 +36979,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -37977,14 +37009,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -38006,8 +37036,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -38025,8 +37054,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -38062,6 +37091,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -38091,14 +37121,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -38152,7 +37180,6 @@ "ctxt": 0 }, "value": "x192", - "typeAnnotation": null, "optional": false }, "body": { @@ -38188,6 +37215,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -38210,7 +37238,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -38236,7 +37263,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -38244,8 +37270,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -38265,7 +37290,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -38284,8 +37308,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -38321,7 +37345,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -38335,7 +37358,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -38376,7 +37398,6 @@ "ctxt": 0 }, "value": "x193", - "typeAnnotation": null, "optional": false }, "body": { @@ -38419,6 +37440,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -38464,7 +37486,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -38472,8 +37493,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -38501,7 +37521,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -38515,7 +37534,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -38551,7 +37569,6 @@ "ctxt": 0 }, "value": "x194", - "typeAnnotation": null, "optional": false }, "body": { @@ -38594,6 +37611,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -38639,7 +37657,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -38647,8 +37664,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -38693,7 +37709,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -38707,7 +37722,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -38746,7 +37760,6 @@ "ctxt": 0 }, "value": "x195", - "typeAnnotation": null, "optional": false }, "body": { @@ -38789,6 +37802,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -38834,7 +37848,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -38842,8 +37855,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -38855,7 +37867,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -38898,7 +37909,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -38912,7 +37922,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -38951,7 +37960,6 @@ "ctxt": 0 }, "value": "x196", - "typeAnnotation": null, "optional": false }, "body": { @@ -38994,6 +38002,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -39046,7 +38055,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -39057,8 +38065,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -39086,7 +38093,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -39100,7 +38106,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -39136,7 +38141,6 @@ "ctxt": 0 }, "value": "x197", - "typeAnnotation": null, "optional": false }, "body": { @@ -39179,6 +38183,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -39231,7 +38236,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -39242,8 +38246,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -39288,7 +38291,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -39302,7 +38304,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -39341,7 +38342,6 @@ "ctxt": 0 }, "value": "x198", - "typeAnnotation": null, "optional": false }, "body": { @@ -39384,6 +38384,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -39436,7 +38437,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -39447,8 +38447,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -39460,7 +38459,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -39503,7 +38501,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -39517,7 +38514,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -39556,7 +38552,6 @@ "ctxt": 0 }, "value": "x199", - "typeAnnotation": null, "optional": false }, "body": { @@ -39599,6 +38594,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -39628,14 +38624,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -39655,7 +38649,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -39669,7 +38662,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -39700,7 +38692,6 @@ "ctxt": 0 }, "value": "x200", - "typeAnnotation": null, "optional": false }, "body": { @@ -39743,6 +38734,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -39765,7 +38757,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -39791,7 +38782,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -39799,8 +38789,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -39820,7 +38809,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -39834,7 +38822,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -39865,7 +38852,6 @@ "ctxt": 0 }, "value": "x201", - "typeAnnotation": null, "optional": false }, "body": { @@ -39908,6 +38894,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -39934,6 +38921,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -39950,8 +38938,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -39976,7 +38963,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -39991,8 +38977,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -40012,7 +38997,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -40026,7 +39010,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -40057,7 +39040,6 @@ "ctxt": 0 }, "value": "x202", - "typeAnnotation": null, "optional": false }, "body": { @@ -40100,6 +39082,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -40131,7 +39114,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -40167,7 +39149,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -40178,8 +39159,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -40199,7 +39179,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -40220,7 +39199,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -40234,7 +39212,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -40268,7 +39245,6 @@ "ctxt": 0 }, "value": "x203", - "typeAnnotation": null, "optional": false }, "body": { @@ -40311,6 +39287,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -40334,6 +39311,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -40363,14 +39341,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -40392,8 +39368,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -40411,8 +39386,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -40448,6 +39423,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -40477,14 +39453,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -40539,7 +39513,6 @@ "ctxt": 0 }, "value": "x204", - "typeAnnotation": null, "optional": false }, "body": { @@ -40582,6 +39555,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -40604,7 +39578,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -40630,7 +39603,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -40638,8 +39610,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -40659,7 +39630,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -40678,8 +39648,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -40715,7 +39685,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -40729,7 +39698,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -40779,8 +39747,8 @@ "ctxt": 0 }, "value": "x206", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -40832,7 +39800,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -40846,7 +39813,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -40898,7 +39864,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -40936,8 +39901,8 @@ "ctxt": 0 }, "value": "x207", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -40956,7 +39921,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -40999,7 +39963,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -41013,7 +39976,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -41065,7 +40027,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -41103,8 +40064,8 @@ "ctxt": 0 }, "value": "x209", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -41156,7 +40117,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -41170,7 +40130,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -41229,7 +40188,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -41270,8 +40228,8 @@ "ctxt": 0 }, "value": "x210", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -41290,7 +40248,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -41333,7 +40290,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -41347,7 +40303,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -41406,7 +40361,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -41447,8 +40401,8 @@ "ctxt": 0 }, "value": "x211", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -41475,7 +40429,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -41489,7 +40442,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -41517,7 +40469,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -41553,8 +40504,8 @@ "ctxt": 0 }, "value": "x212", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -41581,7 +40532,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -41595,7 +40545,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -41616,7 +40565,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -41642,7 +40590,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -41680,8 +40627,8 @@ "ctxt": 0 }, "value": "x213", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -41708,7 +40655,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -41722,7 +40668,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -41747,6 +40692,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -41763,8 +40709,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -41789,7 +40734,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -41834,8 +40778,8 @@ "ctxt": 0 }, "value": "x214", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -41862,7 +40806,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -41883,7 +40826,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -41897,7 +40839,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -41930,7 +40871,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -41966,7 +40906,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -42007,8 +40946,8 @@ "ctxt": 0 }, "value": "x216", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -42035,7 +40974,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -42054,8 +40992,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -42091,7 +41029,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -42105,7 +41042,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -42137,7 +41073,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -42163,7 +41098,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -42201,8 +41135,8 @@ "ctxt": 0 }, "value": "x217", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -42234,7 +41168,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -42275,7 +41208,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -42328,7 +41260,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -42342,7 +41273,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -42386,8 +41316,8 @@ "ctxt": 0 }, "value": "x218", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -42419,7 +41349,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -42460,7 +41389,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -42480,7 +41408,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -42523,7 +41450,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -42537,7 +41463,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -42581,8 +41506,8 @@ "ctxt": 0 }, "value": "x219", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -42614,7 +41539,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -42662,7 +41586,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -42718,7 +41641,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -42732,7 +41654,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -42776,8 +41697,8 @@ "ctxt": 0 }, "value": "x220", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -42809,7 +41730,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -42857,7 +41777,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -42880,7 +41799,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -42923,7 +41841,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -42937,7 +41854,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -42981,8 +41897,8 @@ "ctxt": 0 }, "value": "x221", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -43014,7 +41930,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -43039,7 +41954,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -43065,7 +41979,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -43079,7 +41992,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -43115,8 +42027,8 @@ "ctxt": 0 }, "value": "x222", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -43148,7 +42060,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -43166,7 +42077,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -43192,7 +42102,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -43220,7 +42129,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -43234,7 +42142,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -43270,8 +42177,8 @@ "ctxt": 0 }, "value": "x223", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -43303,7 +42210,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -43325,6 +42231,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -43341,8 +42248,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -43367,7 +42273,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -43402,7 +42307,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -43416,7 +42320,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -43452,8 +42355,8 @@ "ctxt": 0 }, "value": "x224", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -43485,7 +42388,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -43512,7 +42414,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -43548,7 +42449,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -43579,7 +42479,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -43600,7 +42499,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -43614,7 +42512,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -43653,6 +42550,7 @@ "ctxt": 0 }, "value": "x225", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -43698,7 +42596,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -43706,8 +42603,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -43737,8 +42633,8 @@ "ctxt": 0 }, "value": "x225", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -43766,7 +42662,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -43780,7 +42675,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -43818,6 +42712,7 @@ "ctxt": 0 }, "value": "x226", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -43863,7 +42758,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -43871,8 +42765,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -43902,8 +42795,8 @@ "ctxt": 0 }, "value": "x226", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "FunctionExpression", @@ -43948,7 +42841,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -43962,7 +42854,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -44003,6 +42894,7 @@ "ctxt": 0 }, "value": "x227", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -44048,7 +42940,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -44056,8 +42947,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -44087,8 +42977,8 @@ "ctxt": 0 }, "value": "x227", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "FunctionExpression", @@ -44100,7 +42990,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -44143,7 +43032,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -44157,7 +43045,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -44198,6 +43085,7 @@ "ctxt": 0 }, "value": "x228", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -44250,7 +43138,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -44261,8 +43148,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -44292,8 +43178,8 @@ "ctxt": 0 }, "value": "x228", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -44321,7 +43207,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -44335,7 +43220,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -44373,6 +43257,7 @@ "ctxt": 0 }, "value": "x229", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -44425,7 +43310,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -44436,8 +43320,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -44467,8 +43350,8 @@ "ctxt": 0 }, "value": "x229", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "FunctionExpression", @@ -44513,7 +43396,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -44527,7 +43409,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -44568,6 +43449,7 @@ "ctxt": 0 }, "value": "x230", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -44620,7 +43502,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -44631,8 +43512,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -44662,8 +43542,8 @@ "ctxt": 0 }, "value": "x230", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "FunctionExpression", @@ -44675,7 +43555,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -44718,7 +43597,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -44732,7 +43610,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -44773,6 +43650,7 @@ "ctxt": 0 }, "value": "x231", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -44802,14 +43680,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -44839,8 +43715,8 @@ "ctxt": 0 }, "value": "x231", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -44860,7 +43736,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -44874,7 +43749,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -44907,6 +43781,7 @@ "ctxt": 0 }, "value": "x232", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -44929,7 +43804,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -44955,7 +43829,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -44963,8 +43836,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -44994,8 +43866,8 @@ "ctxt": 0 }, "value": "x232", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -45015,7 +43887,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -45029,7 +43900,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -45062,6 +43932,7 @@ "ctxt": 0 }, "value": "x233", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -45088,6 +43959,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -45104,8 +43976,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -45130,7 +44001,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -45145,8 +44015,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -45176,8 +44045,8 @@ "ctxt": 0 }, "value": "x233", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -45197,7 +44066,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -45211,7 +44079,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -45244,6 +44111,7 @@ "ctxt": 0 }, "value": "x234", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -45275,7 +44143,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -45311,7 +44178,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -45322,8 +44188,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -45353,8 +44218,8 @@ "ctxt": 0 }, "value": "x234", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -45374,7 +44239,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -45395,7 +44259,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -45409,7 +44272,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -45445,6 +44307,7 @@ "ctxt": 0 }, "value": "x235", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -45468,6 +44331,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -45497,14 +44361,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -45526,8 +44388,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -45557,8 +44418,8 @@ "ctxt": 0 }, "value": "x235", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -45576,8 +44437,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -45613,6 +44474,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -45642,14 +44504,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -45706,6 +44566,7 @@ "ctxt": 0 }, "value": "x236", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -45728,7 +44589,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -45754,7 +44614,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -45762,8 +44621,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -45793,8 +44651,8 @@ "ctxt": 0 }, "value": "x236", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -45814,7 +44672,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -45833,8 +44690,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -45870,7 +44727,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -45884,7 +44740,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -45928,6 +44783,7 @@ "ctxt": 0 }, "value": "x237", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -45959,7 +44815,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -46011,7 +44866,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -46024,8 +44878,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -46045,7 +44898,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -46074,7 +44926,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -46088,7 +44939,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -46131,6 +44981,7 @@ "ctxt": 0 }, "value": "x238", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -46162,7 +45013,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -46214,7 +45064,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -46227,8 +45076,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -46248,7 +45096,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -46294,7 +45141,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -46308,7 +45154,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -46354,6 +45199,7 @@ "ctxt": 0 }, "value": "x239", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -46385,7 +45231,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -46437,7 +45282,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -46450,8 +45294,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -46471,7 +45314,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -46484,7 +45326,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -46527,7 +45368,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -46541,7 +45381,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -46587,6 +45426,7 @@ "ctxt": 0 }, "value": "x240", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -46618,7 +45458,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -46677,7 +45516,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -46693,8 +45531,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -46714,7 +45551,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -46743,7 +45579,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -46757,7 +45592,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -46800,6 +45634,7 @@ "ctxt": 0 }, "value": "x241", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -46831,7 +45666,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -46890,7 +45724,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -46906,8 +45739,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -46927,7 +45759,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -46973,7 +45804,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -46987,7 +45817,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -47033,6 +45862,7 @@ "ctxt": 0 }, "value": "x242", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47064,7 +45894,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -47123,7 +45952,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -47139,8 +45967,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -47160,7 +45987,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -47173,7 +45999,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -47216,7 +46041,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -47230,7 +46054,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -47276,6 +46099,7 @@ "ctxt": 0 }, "value": "x243", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47307,7 +46131,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -47343,7 +46166,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -47354,8 +46176,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -47375,7 +46196,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -47396,7 +46216,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -47410,7 +46229,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -47448,6 +46266,7 @@ "ctxt": 0 }, "value": "x244", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47479,7 +46298,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -47508,7 +46326,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -47534,7 +46351,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -47547,8 +46363,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -47568,7 +46383,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -47589,7 +46403,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -47603,7 +46416,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -47641,6 +46453,7 @@ "ctxt": 0 }, "value": "x245", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47672,7 +46485,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -47705,6 +46517,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47721,8 +46534,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -47747,7 +46559,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -47767,8 +46578,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -47788,7 +46598,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -47809,7 +46618,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -47823,7 +46631,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -47861,6 +46668,7 @@ "ctxt": 0 }, "value": "x246", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47892,7 +46700,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -47930,7 +46737,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -47966,7 +46772,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -47982,8 +46787,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -48003,7 +46807,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -48024,7 +46827,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -48045,7 +46847,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -48059,7 +46860,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -48100,6 +46900,7 @@ "ctxt": 0 }, "value": "x247", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -48131,7 +46932,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -48161,6 +46961,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -48190,14 +46991,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -48224,8 +47023,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -48245,7 +47043,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -48264,8 +47061,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -48301,6 +47098,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -48330,14 +47128,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -48399,6 +47195,7 @@ "ctxt": 0 }, "value": "x248", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -48430,7 +47227,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -48459,7 +47255,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48485,7 +47280,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -48498,8 +47292,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -48519,7 +47312,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -48540,7 +47332,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -48559,8 +47350,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -48596,7 +47387,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -48610,7 +47400,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -48659,6 +47448,7 @@ "ctxt": 0 }, "value": "x252", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -48718,7 +47508,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -48730,8 +47519,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -48769,7 +47557,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -48783,7 +47570,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -48826,6 +47612,7 @@ "ctxt": 0 }, "value": "x253", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -48885,7 +47672,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -48897,8 +47683,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -48953,7 +47738,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -48967,7 +47751,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -49013,6 +47796,7 @@ "ctxt": 0 }, "value": "x254", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -49072,7 +47856,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -49084,8 +47867,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -49107,7 +47889,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -49150,7 +47931,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -49164,7 +47944,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -49210,6 +47989,7 @@ "ctxt": 0 }, "value": "x255", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -49246,15 +48026,13 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -49284,7 +48062,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -49298,7 +48075,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -49336,6 +48112,7 @@ "ctxt": 0 }, "value": "x256", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -49365,7 +48142,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -49391,7 +48167,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -49400,8 +48175,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -49431,7 +48205,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -49445,7 +48218,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -49483,6 +48255,7 @@ "ctxt": 0 }, "value": "x257", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -49516,6 +48289,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -49532,8 +48306,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -49558,7 +48331,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -49574,8 +48346,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -49605,7 +48376,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -49619,7 +48389,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -49657,6 +48426,7 @@ "ctxt": 0 }, "value": "x258", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -49695,7 +48465,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -49731,7 +48500,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -49743,8 +48511,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -49774,7 +48541,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -49795,7 +48561,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -49809,7 +48574,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -49850,6 +48614,7 @@ "ctxt": 0 }, "value": "x260", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -49879,7 +48644,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -49905,7 +48669,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -49914,8 +48677,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -49945,7 +48707,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -49964,8 +48725,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -50001,7 +48762,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -50015,7 +48775,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -50064,6 +48823,7 @@ "ctxt": 0 }, "value": "x261", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -50109,7 +48869,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -50117,8 +48876,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -50171,7 +48929,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -50185,7 +48942,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -50207,7 +48963,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -50240,6 +48995,7 @@ "ctxt": 0 }, "value": "x262", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -50285,7 +49041,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -50293,8 +49048,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -50314,7 +49068,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -50357,7 +49110,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -50371,7 +49123,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -50393,7 +49144,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -50426,6 +49176,7 @@ "ctxt": 0 }, "value": "x263", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -50478,7 +49229,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -50489,8 +49239,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -50543,7 +49292,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -50557,7 +49305,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -50579,7 +49326,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -50612,6 +49358,7 @@ "ctxt": 0 }, "value": "x264", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -50664,7 +49411,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -50675,8 +49421,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -50696,7 +49441,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -50739,7 +49483,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -50753,7 +49496,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -50775,7 +49517,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -50808,6 +49549,7 @@ "ctxt": 0 }, "value": "x265", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -50837,14 +49579,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -50872,7 +49612,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -50886,7 +49625,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -50900,7 +49638,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -50933,6 +49670,7 @@ "ctxt": 0 }, "value": "x266", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -50955,7 +49693,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -50981,7 +49718,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -50989,8 +49725,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -51018,7 +49753,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -51032,7 +49766,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -51046,7 +49779,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -51079,6 +49811,7 @@ "ctxt": 0 }, "value": "x267", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -51105,6 +49838,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -51121,8 +49855,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -51147,7 +49880,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -51162,8 +49894,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -51191,7 +49922,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -51205,7 +49935,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -51219,7 +49948,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -51252,6 +49980,7 @@ "ctxt": 0 }, "value": "x268", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -51283,7 +50012,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -51319,7 +50047,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -51330,8 +50057,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -51359,7 +50085,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -51380,7 +50105,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -51394,7 +50118,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -51411,7 +50134,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -51444,6 +50166,7 @@ "ctxt": 0 }, "value": "x269", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -51489,7 +50212,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -51497,8 +50219,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -51516,7 +50237,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -51562,7 +50282,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -51576,7 +50295,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -51620,6 +50338,7 @@ "ctxt": 0 }, "value": "x270", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -51665,7 +50384,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -51673,8 +50391,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -51692,7 +50409,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -51705,7 +50421,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -51748,7 +50463,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -51762,7 +50476,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -51806,6 +50519,7 @@ "ctxt": 0 }, "value": "x271", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -51858,7 +50572,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -51869,8 +50582,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -51888,7 +50600,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -51934,7 +50645,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -51948,7 +50658,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -51992,6 +50701,7 @@ "ctxt": 0 }, "value": "x272", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -52044,7 +50754,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -52055,8 +50764,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -52074,7 +50782,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -52087,7 +50794,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -52130,7 +50836,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -52144,7 +50849,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -52188,6 +50892,7 @@ "ctxt": 0 }, "value": "x273", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -52217,14 +50922,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -52242,7 +50945,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -52263,7 +50965,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -52277,7 +50978,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -52313,6 +51013,7 @@ "ctxt": 0 }, "value": "x274", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -52335,7 +51036,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -52361,7 +51061,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -52369,8 +51068,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -52388,7 +51086,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -52409,7 +51106,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -52423,7 +51119,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -52459,6 +51154,7 @@ "ctxt": 0 }, "value": "x275", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -52485,6 +51181,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -52501,8 +51198,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -52527,7 +51223,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -52542,8 +51237,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -52561,7 +51255,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -52582,7 +51275,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -52596,7 +51288,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -52632,6 +51323,7 @@ "ctxt": 0 }, "value": "x276", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -52663,7 +51355,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -52699,7 +51390,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -52710,8 +51400,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -52729,7 +51418,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -52750,7 +51438,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -52771,7 +51458,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -52785,7 +51471,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -52824,6 +51509,7 @@ "ctxt": 0 }, "value": "x277", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -52869,7 +51555,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -52877,8 +51562,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -52931,7 +51615,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -52945,7 +51628,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -53002,7 +51684,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -53016,7 +51697,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -53060,6 +51740,7 @@ "ctxt": 0 }, "value": "x278", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53105,7 +51786,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -53113,8 +51793,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -53134,7 +51813,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -53177,7 +51855,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -53191,7 +51868,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -53215,7 +51891,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -53258,7 +51933,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -53272,7 +51946,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -53316,6 +51989,7 @@ "ctxt": 0 }, "value": "x279", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53368,7 +52042,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -53379,8 +52052,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -53433,7 +52105,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -53447,7 +52118,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -53504,7 +52174,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -53518,7 +52187,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -53562,6 +52230,7 @@ "ctxt": 0 }, "value": "x280", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53614,7 +52283,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -53625,8 +52293,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -53646,7 +52313,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -53689,7 +52355,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -53703,7 +52368,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -53727,7 +52391,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -53770,7 +52433,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -53784,7 +52446,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -53828,6 +52489,7 @@ "ctxt": 0 }, "value": "x281", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53857,14 +52519,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -53892,7 +52552,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -53906,7 +52565,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -53930,7 +52588,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -53944,7 +52601,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -53980,6 +52636,7 @@ "ctxt": 0 }, "value": "x282", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54002,7 +52659,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -54028,7 +52684,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -54036,8 +52691,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -54065,7 +52719,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -54079,7 +52732,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -54103,7 +52755,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -54117,7 +52768,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -54153,6 +52803,7 @@ "ctxt": 0 }, "value": "x283", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54179,6 +52830,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54195,8 +52847,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -54221,7 +52872,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -54236,8 +52886,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -54265,7 +52914,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -54279,7 +52927,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -54303,7 +52950,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -54317,7 +52963,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -54353,6 +52998,7 @@ "ctxt": 0 }, "value": "x284", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54384,7 +53030,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -54420,7 +53065,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -54431,8 +53075,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -54460,7 +53103,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -54481,7 +53123,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -54495,7 +53136,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -54522,7 +53162,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -54543,7 +53182,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -54557,7 +53195,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -54596,6 +53233,7 @@ "ctxt": 0 }, "value": "x285", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54641,7 +53279,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -54649,8 +53286,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -54694,7 +53330,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -54708,7 +53343,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -54745,7 +53379,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -54759,7 +53392,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -54800,6 +53432,7 @@ "ctxt": 0 }, "value": "x286", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54845,7 +53478,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -54853,8 +53485,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -54915,7 +53546,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -54929,7 +53559,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -54986,7 +53615,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -55000,7 +53628,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -55044,6 +53671,7 @@ "ctxt": 0 }, "value": "x287", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -55089,7 +53717,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -55097,8 +53724,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -55126,7 +53752,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -55169,7 +53794,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -55183,7 +53807,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -55207,7 +53830,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -55250,7 +53872,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -55264,7 +53885,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -55308,6 +53928,7 @@ "ctxt": 0 }, "value": "x288", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -55360,7 +53981,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -55371,8 +53991,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -55416,7 +54035,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -55430,7 +54048,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -55467,7 +54084,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -55481,7 +54097,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -55522,6 +54137,7 @@ "ctxt": 0 }, "value": "x289", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -55574,7 +54190,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -55585,8 +54200,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -55647,7 +54261,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -55661,7 +54274,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -55718,7 +54330,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -55732,7 +54343,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -55776,6 +54386,7 @@ "ctxt": 0 }, "value": "x290", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -55828,7 +54439,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -55839,8 +54449,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -55868,7 +54477,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -55911,7 +54519,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -55925,7 +54532,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -55949,7 +54555,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -55992,7 +54597,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -56006,7 +54610,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -56050,6 +54653,7 @@ "ctxt": 0 }, "value": "x291", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -56079,14 +54683,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -56122,7 +54724,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -56136,7 +54737,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -56160,7 +54760,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -56174,7 +54773,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -56210,6 +54808,7 @@ "ctxt": 0 }, "value": "x292", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -56232,7 +54831,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -56258,7 +54856,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -56266,8 +54863,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -56303,7 +54899,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -56317,7 +54912,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -56341,7 +54935,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -56355,7 +54948,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -56391,6 +54983,7 @@ "ctxt": 0 }, "value": "x293", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -56417,6 +55010,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -56433,8 +55027,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -56459,7 +55052,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -56474,8 +55066,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -56511,7 +55102,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -56525,7 +55115,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -56549,7 +55138,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -56563,7 +55151,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -56599,6 +55186,7 @@ "ctxt": 0 }, "value": "x294", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -56630,7 +55218,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -56666,7 +55253,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -56677,8 +55263,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -56714,7 +55299,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -56735,7 +55319,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -56749,7 +55332,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -56776,7 +55358,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -56797,7 +55378,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -56811,7 +55391,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -56850,6 +55429,7 @@ "ctxt": 0 }, "value": "x295", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -56873,6 +55453,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -56902,14 +55483,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -56931,8 +55510,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -56966,8 +55544,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -57003,6 +55581,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -57032,14 +55611,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -57085,8 +55662,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -57122,6 +55699,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -57151,14 +55729,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -57218,6 +55794,7 @@ "ctxt": 0 }, "value": "x296", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -57240,7 +55817,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -57266,7 +55842,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -57274,8 +55849,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -57311,7 +55885,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -57330,8 +55903,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -57367,7 +55940,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -57381,7 +55953,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -57416,7 +55987,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -57435,8 +56005,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -57472,7 +56042,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -57486,7 +56055,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -57533,6 +56101,7 @@ "ctxt": 0 }, "value": "x297", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -57578,7 +56147,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -57586,8 +56154,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -57613,7 +56180,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -57642,7 +56208,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -57656,7 +56221,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -57697,6 +56261,7 @@ "ctxt": 0 }, "value": "x298", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -57742,7 +56307,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -57750,8 +56314,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -57777,7 +56340,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -57823,7 +56385,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -57837,7 +56398,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -57881,6 +56441,7 @@ "ctxt": 0 }, "value": "x299", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -57926,7 +56487,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -57934,8 +56494,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -57961,7 +56520,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -57974,7 +56532,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -58017,7 +56574,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -58031,7 +56587,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -58075,6 +56630,7 @@ "ctxt": 0 }, "value": "x300", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -58127,7 +56683,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -58138,8 +56693,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -58165,7 +56719,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -58194,7 +56747,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -58208,7 +56760,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -58249,6 +56800,7 @@ "ctxt": 0 }, "value": "x301", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -58301,7 +56853,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -58312,8 +56863,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -58339,7 +56889,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -58385,7 +56934,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -58399,7 +56947,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -58443,6 +56990,7 @@ "ctxt": 0 }, "value": "x302", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -58495,7 +57043,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -58506,8 +57053,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -58533,7 +57079,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -58546,7 +57091,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -58589,7 +57133,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -58603,7 +57146,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -58647,6 +57189,7 @@ "ctxt": 0 }, "value": "x303", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -58676,14 +57219,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -58709,7 +57250,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -58730,7 +57270,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -58744,7 +57283,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -58780,6 +57318,7 @@ "ctxt": 0 }, "value": "x304", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -58802,7 +57341,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -58828,7 +57366,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -58836,8 +57373,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -58863,7 +57399,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -58884,7 +57419,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -58898,7 +57432,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -58934,6 +57467,7 @@ "ctxt": 0 }, "value": "x305", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -58960,6 +57494,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -58976,8 +57511,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -59002,7 +57536,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -59017,8 +57550,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -59044,7 +57576,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -59065,7 +57596,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -59079,7 +57609,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -59115,6 +57644,7 @@ "ctxt": 0 }, "value": "x306", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59146,7 +57676,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -59182,7 +57711,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -59193,8 +57721,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -59220,7 +57747,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -59241,7 +57767,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -59262,7 +57787,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -59276,7 +57800,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -59315,6 +57838,7 @@ "ctxt": 0 }, "value": "x307", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59338,6 +57862,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59367,14 +57892,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -59396,8 +57919,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -59423,7 +57945,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -59442,8 +57963,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -59479,6 +58000,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59508,14 +58030,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -59575,6 +58095,7 @@ "ctxt": 0 }, "value": "x308", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59597,7 +58118,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -59623,7 +58143,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -59631,8 +58150,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -59658,7 +58176,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -59679,7 +58196,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -59698,8 +58214,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -59735,7 +58251,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -59749,7 +58264,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -59796,6 +58310,7 @@ "ctxt": 0 }, "value": "x309", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59841,7 +58356,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -59849,8 +58363,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -59894,7 +58407,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -59908,7 +58420,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -59927,7 +58438,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -59960,6 +58470,7 @@ "ctxt": 0 }, "value": "x310", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60005,7 +58516,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -60013,8 +58523,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -60075,7 +58584,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -60089,7 +58597,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -60111,7 +58618,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -60144,6 +58650,7 @@ "ctxt": 0 }, "value": "x311", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60189,7 +58696,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -60197,8 +58703,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -60226,7 +58731,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -60269,7 +58773,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -60283,7 +58786,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -60305,7 +58807,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -60338,6 +58839,7 @@ "ctxt": 0 }, "value": "x312", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60390,7 +58892,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -60401,8 +58902,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -60446,7 +58946,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -60460,7 +58959,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -60479,7 +58977,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -60512,6 +59009,7 @@ "ctxt": 0 }, "value": "x313", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60564,7 +59062,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -60575,8 +59072,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -60637,7 +59133,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -60651,7 +59146,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -60673,7 +59167,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -60706,6 +59199,7 @@ "ctxt": 0 }, "value": "x314", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60758,7 +59252,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -60769,8 +59262,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -60798,7 +59290,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -60841,7 +59332,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -60855,7 +59345,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -60877,7 +59366,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -60910,6 +59398,7 @@ "ctxt": 0 }, "value": "x315", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60939,14 +59428,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -60982,7 +59469,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -60996,7 +59482,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -61010,7 +59495,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -61043,6 +59527,7 @@ "ctxt": 0 }, "value": "x316", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -61065,7 +59550,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -61091,7 +59575,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -61099,8 +59582,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -61136,7 +59618,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -61150,7 +59631,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -61164,7 +59644,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -61197,6 +59676,7 @@ "ctxt": 0 }, "value": "x317", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -61223,6 +59703,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -61239,8 +59720,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -61265,7 +59745,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -61280,8 +59759,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -61317,7 +59795,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -61331,7 +59808,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -61345,7 +59821,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -61378,6 +59853,7 @@ "ctxt": 0 }, "value": "x318", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -61409,7 +59885,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -61445,7 +59920,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -61456,8 +59930,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -61493,7 +59966,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -61514,7 +59986,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -61528,7 +59999,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -61545,7 +60015,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -61578,6 +60047,7 @@ "ctxt": 0 }, "value": "x319", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -61601,6 +60071,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -61630,14 +60101,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -61659,8 +60128,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -61694,8 +60162,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -61731,6 +60199,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -61760,14 +60229,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -61805,7 +60272,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -61838,6 +60304,7 @@ "ctxt": 0 }, "value": "x320", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -61860,7 +60327,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -61886,7 +60352,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -61894,8 +60359,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -61931,7 +60395,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -61950,8 +60413,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -61987,7 +60450,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -62001,7 +60463,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -62026,7 +60487,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -62044,7 +60504,6 @@ "ctxt": 0 }, "value": "x321", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -62065,6 +60524,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62110,7 +60570,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -62118,8 +60577,7 @@ } } } - }, - "optional": false + } } } ], @@ -62173,7 +60631,6 @@ "ctxt": 0 }, "value": "x321", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -62205,7 +60662,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -62219,7 +60675,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -62245,7 +60700,6 @@ "ctxt": 0 }, "value": "x322", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -62266,6 +60720,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62311,7 +60766,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -62319,8 +60773,7 @@ } } } - }, - "optional": false + } } } ], @@ -62374,7 +60827,6 @@ "ctxt": 0 }, "value": "x322", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -62423,7 +60875,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -62437,7 +60888,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -62466,7 +60916,6 @@ "ctxt": 0 }, "value": "x323", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -62487,6 +60936,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62532,7 +60982,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -62540,8 +60989,7 @@ } } } - }, - "optional": false + } } } ], @@ -62595,7 +61043,6 @@ "ctxt": 0 }, "value": "x323", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -62611,7 +61058,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -62654,7 +61100,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -62668,7 +61113,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -62697,7 +61141,6 @@ "ctxt": 0 }, "value": "x324", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -62718,6 +61161,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62770,7 +61214,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -62781,8 +61224,7 @@ } ] } - }, - "optional": false + } } } ], @@ -62836,7 +61278,6 @@ "ctxt": 0 }, "value": "x324", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -62868,7 +61309,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -62882,7 +61322,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -62908,7 +61347,6 @@ "ctxt": 0 }, "value": "x325", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -62929,6 +61367,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62981,7 +61420,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -62992,8 +61430,7 @@ } ] } - }, - "optional": false + } } } ], @@ -63047,7 +61484,6 @@ "ctxt": 0 }, "value": "x325", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -63096,7 +61532,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -63110,7 +61545,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -63139,7 +61573,6 @@ "ctxt": 0 }, "value": "x326", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -63160,6 +61593,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -63212,7 +61646,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -63223,8 +61656,7 @@ } ] } - }, - "optional": false + } } } ], @@ -63278,7 +61710,6 @@ "ctxt": 0 }, "value": "x326", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -63294,7 +61725,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -63337,7 +61767,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -63351,7 +61780,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -63380,7 +61808,6 @@ "ctxt": 0 }, "value": "x327", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -63401,6 +61828,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -63430,14 +61858,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -63491,7 +61917,6 @@ "ctxt": 0 }, "value": "x327", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -63515,7 +61940,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -63529,7 +61953,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -63550,7 +61973,6 @@ "ctxt": 0 }, "value": "x328", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -63571,6 +61993,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -63593,7 +62016,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -63619,7 +62041,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -63627,8 +62048,7 @@ ] } } - }, - "optional": false + } } } ], @@ -63682,7 +62102,6 @@ "ctxt": 0 }, "value": "x328", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -63706,7 +62125,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -63720,7 +62138,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -63741,7 +62158,6 @@ "ctxt": 0 }, "value": "x329", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -63762,6 +62178,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -63788,6 +62205,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -63804,8 +62222,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -63830,7 +62247,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -63845,8 +62261,7 @@ } ] } - }, - "optional": false + } } } ], @@ -63900,7 +62315,6 @@ "ctxt": 0 }, "value": "x329", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -63924,7 +62338,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -63938,7 +62351,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -63959,7 +62371,6 @@ "ctxt": 0 }, "value": "x330", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -63980,6 +62391,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -64011,7 +62423,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -64047,7 +62458,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -64058,8 +62468,7 @@ } ] } - }, - "optional": false + } } } ], @@ -64113,7 +62522,6 @@ "ctxt": 0 }, "value": "x330", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -64137,7 +62545,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -64158,7 +62565,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -64172,7 +62578,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -64196,7 +62601,6 @@ "ctxt": 0 }, "value": "x331", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -64217,6 +62621,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -64240,6 +62645,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -64269,14 +62675,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -64298,8 +62702,7 @@ } } } - }, - "optional": false + } } } ], @@ -64353,7 +62756,6 @@ "ctxt": 0 }, "value": "x331", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -64375,8 +62777,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -64412,6 +62814,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -64441,14 +62844,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -64493,7 +62894,6 @@ "ctxt": 0 }, "value": "x332", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -64514,6 +62914,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -64536,7 +62937,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -64562,7 +62962,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -64570,8 +62969,7 @@ ] } } - }, - "optional": false + } } } ], @@ -64625,7 +63023,6 @@ "ctxt": 0 }, "value": "x332", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -64649,7 +63046,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -64668,8 +63064,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -64705,7 +63101,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -64719,7 +63114,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -64766,8 +63160,8 @@ "ctxt": 0 }, "value": "x333", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -64785,6 +63179,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -64830,7 +63225,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -64838,8 +63232,7 @@ } } } - }, - "optional": false + } } ], "body": { @@ -64850,7 +63243,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -64884,7 +63276,6 @@ "ctxt": 0 }, "value": "x333", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -64916,7 +63307,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -64930,7 +63320,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -64971,8 +63360,8 @@ "ctxt": 0 }, "value": "x334", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -64990,6 +63379,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -65035,7 +63425,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -65043,8 +63432,7 @@ } } } - }, - "optional": false + } } ], "body": { @@ -65055,7 +63443,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -65089,7 +63476,6 @@ "ctxt": 0 }, "value": "x334", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -65138,7 +63524,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -65152,7 +63537,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -65196,8 +63580,8 @@ "ctxt": 0 }, "value": "x335", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -65215,6 +63599,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -65260,7 +63645,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -65268,8 +63652,7 @@ } } } - }, - "optional": false + } } ], "body": { @@ -65280,7 +63663,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -65314,7 +63696,6 @@ "ctxt": 0 }, "value": "x335", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -65330,7 +63711,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -65373,7 +63753,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -65387,7 +63766,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -65431,8 +63809,8 @@ "ctxt": 0 }, "value": "x336", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -65450,6 +63828,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -65502,7 +63881,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -65513,8 +63891,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -65525,7 +63902,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -65559,7 +63935,6 @@ "ctxt": 0 }, "value": "x336", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -65591,7 +63966,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -65605,7 +63979,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -65646,8 +64019,8 @@ "ctxt": 0 }, "value": "x337", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -65665,6 +64038,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -65717,7 +64091,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -65728,8 +64101,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -65740,7 +64112,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -65774,7 +64145,6 @@ "ctxt": 0 }, "value": "x337", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -65823,7 +64193,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -65837,7 +64206,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -65881,8 +64249,8 @@ "ctxt": 0 }, "value": "x338", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -65900,6 +64268,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -65952,7 +64321,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -65963,8 +64331,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -65975,7 +64342,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -66009,7 +64375,6 @@ "ctxt": 0 }, "value": "x338", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -66025,7 +64390,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -66068,7 +64432,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -66082,7 +64445,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -66126,8 +64488,8 @@ "ctxt": 0 }, "value": "x339", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -66145,6 +64507,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66174,14 +64537,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "body": { @@ -66192,7 +64553,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -66226,7 +64586,6 @@ "ctxt": 0 }, "value": "x339", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -66250,7 +64609,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -66264,7 +64622,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -66300,8 +64657,8 @@ "ctxt": 0 }, "value": "x340", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -66319,6 +64676,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66341,7 +64699,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -66367,7 +64724,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -66375,8 +64731,7 @@ ] } } - }, - "optional": false + } } ], "body": { @@ -66387,7 +64742,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -66421,7 +64775,6 @@ "ctxt": 0 }, "value": "x340", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -66445,7 +64798,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -66459,7 +64811,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -66495,8 +64846,8 @@ "ctxt": 0 }, "value": "x341", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -66514,6 +64865,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66540,6 +64892,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66556,8 +64909,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -66582,7 +64934,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -66597,8 +64948,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -66609,7 +64959,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -66643,7 +64992,6 @@ "ctxt": 0 }, "value": "x341", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -66667,7 +65015,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -66681,7 +65028,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -66717,8 +65063,8 @@ "ctxt": 0 }, "value": "x342", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -66736,6 +65082,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66767,7 +65114,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -66803,7 +65149,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -66814,8 +65159,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -66826,7 +65170,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -66860,7 +65203,6 @@ "ctxt": 0 }, "value": "x342", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -66884,7 +65226,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -66905,7 +65246,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -66919,7 +65259,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -66958,8 +65297,8 @@ "ctxt": 0 }, "value": "x343", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -66977,6 +65316,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -67000,6 +65340,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -67029,14 +65370,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -67058,8 +65397,7 @@ } } } - }, - "optional": false + } } ], "body": { @@ -67070,7 +65408,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -67104,7 +65441,6 @@ "ctxt": 0 }, "value": "x343", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -67126,8 +65462,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -67163,6 +65499,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -67192,14 +65529,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -67259,8 +65594,8 @@ "ctxt": 0 }, "value": "x344", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -67278,6 +65613,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -67300,7 +65636,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -67326,7 +65661,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -67334,8 +65668,7 @@ ] } } - }, - "optional": false + } } ], "body": { @@ -67346,7 +65679,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -67380,7 +65712,6 @@ "ctxt": 0 }, "value": "x344", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -67404,7 +65735,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -67423,8 +65753,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -67460,7 +65790,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -67474,7 +65803,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -67521,8 +65849,8 @@ "ctxt": 0 }, "value": "x345", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -67544,6 +65872,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -67589,7 +65918,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -67597,8 +65925,7 @@ } } } - }, - "optional": false + } } } ], @@ -67648,7 +65975,6 @@ "ctxt": 0 }, "value": "x345", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -67680,7 +66006,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -67694,7 +66019,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -67735,8 +66059,8 @@ "ctxt": 0 }, "value": "x346", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -67758,6 +66082,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -67803,7 +66128,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -67811,8 +66135,7 @@ } } } - }, - "optional": false + } } } ], @@ -67862,7 +66185,6 @@ "ctxt": 0 }, "value": "x346", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -67911,7 +66233,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -67925,7 +66246,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -67969,8 +66289,8 @@ "ctxt": 0 }, "value": "x347", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -67992,6 +66312,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -68037,7 +66358,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -68045,8 +66365,7 @@ } } } - }, - "optional": false + } } } ], @@ -68096,7 +66415,6 @@ "ctxt": 0 }, "value": "x347", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -68112,7 +66430,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -68155,7 +66472,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -68169,7 +66485,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -68213,8 +66528,8 @@ "ctxt": 0 }, "value": "x348", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -68236,6 +66551,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -68288,7 +66604,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -68299,8 +66614,7 @@ } ] } - }, - "optional": false + } } } ], @@ -68350,7 +66664,6 @@ "ctxt": 0 }, "value": "x348", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -68382,7 +66695,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -68396,7 +66708,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -68437,8 +66748,8 @@ "ctxt": 0 }, "value": "x349", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -68460,6 +66771,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -68512,7 +66824,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -68523,8 +66834,7 @@ } ] } - }, - "optional": false + } } } ], @@ -68574,7 +66884,6 @@ "ctxt": 0 }, "value": "x349", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -68623,7 +66932,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -68637,7 +66945,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -68681,8 +66988,8 @@ "ctxt": 0 }, "value": "x350", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -68704,6 +67011,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -68756,7 +67064,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -68767,8 +67074,7 @@ } ] } - }, - "optional": false + } } } ], @@ -68818,7 +67124,6 @@ "ctxt": 0 }, "value": "x350", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -68834,7 +67139,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "params": [], @@ -68877,7 +67181,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -68891,7 +67194,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -68935,8 +67237,8 @@ "ctxt": 0 }, "value": "x351", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -68958,6 +67260,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -68987,14 +67290,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -69044,7 +67345,6 @@ "ctxt": 0 }, "value": "x351", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -69068,7 +67368,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -69082,7 +67381,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -69118,8 +67416,8 @@ "ctxt": 0 }, "value": "x352", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -69141,6 +67439,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -69163,7 +67462,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -69189,7 +67487,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -69197,8 +67494,7 @@ ] } } - }, - "optional": false + } } } ], @@ -69248,7 +67544,6 @@ "ctxt": 0 }, "value": "x352", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -69272,7 +67567,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -69286,7 +67580,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -69322,8 +67615,8 @@ "ctxt": 0 }, "value": "x353", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -69345,6 +67638,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -69371,6 +67665,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -69387,8 +67682,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -69413,7 +67707,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -69428,8 +67721,7 @@ } ] } - }, - "optional": false + } } } ], @@ -69479,7 +67771,6 @@ "ctxt": 0 }, "value": "x353", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -69503,7 +67794,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -69517,7 +67807,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -69553,8 +67842,8 @@ "ctxt": 0 }, "value": "x354", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -69576,6 +67865,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -69607,7 +67897,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -69643,7 +67932,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -69654,8 +67942,7 @@ } ] } - }, - "optional": false + } } } ], @@ -69705,7 +67992,6 @@ "ctxt": 0 }, "value": "x354", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -69729,7 +68015,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -69750,7 +68035,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -69764,7 +68048,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -69803,8 +68086,8 @@ "ctxt": 0 }, "value": "x355", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -69826,6 +68109,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -69849,6 +68133,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -69878,14 +68163,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -69907,8 +68190,7 @@ } } } - }, - "optional": false + } } } ], @@ -69958,7 +68240,6 @@ "ctxt": 0 }, "value": "x355", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -69980,8 +68261,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -70017,6 +68298,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -70046,14 +68328,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -70113,8 +68393,8 @@ "ctxt": 0 }, "value": "x356", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -70136,6 +68416,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -70158,7 +68439,6 @@ "ctxt": 0 }, "value": "Genric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -70184,7 +68464,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -70192,8 +68471,7 @@ ] } } - }, - "optional": false + } } } ], @@ -70243,7 +68521,6 @@ "ctxt": 0 }, "value": "x356", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -70267,7 +68544,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -70286,8 +68562,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -70323,7 +68599,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -70337,7 +68612,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/getSetAccessorContextualTyping/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/getSetAccessorContextualTyping/input.ts.json index bbedaaa5fd47..38812ae4a9ae 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/getSetAccessorContextualTyping/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/getSetAccessorContextualTyping/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -79,8 +78,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -125,7 +123,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "function": { @@ -194,7 +191,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "function": { @@ -215,8 +211,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -261,7 +257,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "function": { @@ -325,7 +320,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "function": { @@ -346,8 +340,8 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -392,7 +386,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "function": { @@ -472,7 +465,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "function": { @@ -493,6 +485,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -509,8 +502,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -555,7 +547,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/iterableContextualTyping1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/iterableContextualTyping1/input.ts.json index 54487ff5b0cc..60888d21ff82 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/iterableContextualTyping1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/iterableContextualTyping1/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "iter", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,7 +54,6 @@ "ctxt": 0 }, "value": "Iterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -122,8 +122,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -151,8 +150,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -170,7 +169,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -181,7 +179,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/objectLiteralContextualTyping/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/objectLiteralContextualTyping/input.ts.json index 63794b3a272c..f3b7c2c6018a 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/objectLiteralContextualTyping/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/objectLiteralContextualTyping/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "description", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -132,7 +129,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -153,6 +149,7 @@ "ctxt": 0 }, "value": "item", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -175,13 +172,11 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -223,7 +218,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -244,6 +238,7 @@ "ctxt": 0 }, "value": "item", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -260,8 +255,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -318,8 +312,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -336,7 +330,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -360,7 +353,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -413,6 +405,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -429,8 +422,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -462,8 +454,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -480,7 +472,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -504,7 +495,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -532,7 +522,6 @@ "ctxt": 0 }, "value": "description", - "typeAnnotation": null, "optional": false }, "value": { @@ -585,6 +574,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -601,8 +591,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -634,8 +623,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -652,7 +641,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -676,7 +664,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -704,7 +691,6 @@ "ctxt": 0 }, "value": "description", - "typeAnnotation": null, "optional": false }, "value": { @@ -752,6 +738,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -768,8 +755,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -801,8 +787,8 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -819,7 +805,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -843,7 +828,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -891,6 +875,7 @@ "ctxt": 0 }, "value": "w", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -907,8 +892,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -925,7 +909,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -946,6 +929,7 @@ "ctxt": 0 }, "value": "param", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -977,7 +961,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1006,7 +989,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1016,8 +998,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1053,7 +1034,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1083,7 +1063,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1115,8 +1094,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1133,7 +1112,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1181,6 +1159,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1197,8 +1176,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/parenthesizedContexualTyping1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/parenthesizedContexualTyping1/input.ts.json index 735e0f4847c4..a56f283178f9 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/parenthesizedContexualTyping1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/parenthesizedContexualTyping1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -82,13 +83,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -114,15 +113,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -141,6 +138,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -163,13 +161,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -205,7 +201,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -235,7 +230,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -252,7 +246,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -273,6 +266,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -296,6 +290,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -318,13 +313,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -350,15 +343,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -377,6 +368,7 @@ "ctxt": 0 }, "value": "h", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -400,6 +392,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -422,13 +415,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -454,15 +445,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -481,6 +470,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -503,13 +493,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -545,7 +533,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -575,7 +562,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -592,7 +578,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -613,6 +598,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -636,6 +622,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -658,13 +645,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -690,15 +675,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -717,6 +700,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -739,13 +723,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -785,7 +767,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -799,7 +780,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -834,7 +814,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -864,7 +843,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -896,8 +874,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -914,7 +892,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -936,8 +913,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -948,7 +925,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1001,8 +977,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1019,7 +995,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1048,8 +1023,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1060,7 +1035,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1114,8 +1088,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1132,7 +1106,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1168,8 +1141,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1180,7 +1153,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1235,8 +1207,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1253,7 +1225,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1296,8 +1267,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1308,7 +1279,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1364,8 +1334,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1382,7 +1352,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1404,8 +1373,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1416,7 +1385,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1443,8 +1411,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1455,7 +1423,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1508,8 +1475,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1526,7 +1493,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1555,8 +1521,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1567,7 +1533,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1602,8 +1567,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1614,7 +1579,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1668,8 +1632,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1686,7 +1650,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1722,8 +1685,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1734,7 +1697,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1777,8 +1739,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1789,7 +1751,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1844,8 +1805,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1862,7 +1823,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1905,8 +1865,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1917,7 +1877,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1961,8 +1920,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1973,7 +1932,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2028,8 +1986,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2046,7 +2004,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2096,7 +2053,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -2107,7 +2063,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2141,8 +2096,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2153,7 +2108,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2177,8 +2131,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2189,7 +2143,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2244,8 +2197,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2262,7 +2215,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2312,7 +2264,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -2323,7 +2274,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2364,8 +2314,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2376,7 +2326,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2408,8 +2357,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2420,7 +2369,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2476,8 +2424,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2494,7 +2442,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2544,7 +2491,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -2555,7 +2501,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2596,8 +2541,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2608,7 +2553,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2640,8 +2584,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2652,7 +2596,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2682,8 +2625,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2694,7 +2637,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2747,8 +2689,8 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2765,7 +2707,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2822,7 +2763,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -2833,7 +2773,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2881,8 +2820,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2893,7 +2832,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2933,8 +2871,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2945,7 +2883,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2991,8 +2928,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3003,7 +2940,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3058,6 +2994,7 @@ "ctxt": 0 }, "value": "lambda1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3081,6 +3018,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3097,8 +3035,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -3120,8 +3057,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -3139,8 +3075,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3151,7 +3087,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3188,6 +3123,7 @@ "ctxt": 0 }, "value": "lambda2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3211,6 +3147,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3227,8 +3164,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -3250,8 +3186,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ParenthesisExpression", @@ -3276,8 +3211,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3288,7 +3223,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3317,7 +3251,6 @@ "ctxt": 0 }, "value": "ObjType", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3345,7 +3278,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3375,6 +3307,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3391,8 +3324,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -3433,7 +3365,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3463,6 +3394,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3479,8 +3411,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -3533,6 +3464,7 @@ "ctxt": 0 }, "value": "obj1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3555,13 +3487,11 @@ "ctxt": 0 }, "value": "ObjType", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -3581,7 +3511,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -3600,8 +3529,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3627,7 +3556,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, { @@ -3638,7 +3566,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } ] @@ -3660,7 +3587,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -3679,8 +3605,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3706,7 +3632,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, { @@ -3717,7 +3642,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } ] @@ -3760,6 +3684,7 @@ "ctxt": 0 }, "value": "obj2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3782,13 +3707,11 @@ "ctxt": 0 }, "value": "ObjType", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ParenthesisExpression", @@ -3815,7 +3738,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -3834,8 +3756,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3861,7 +3783,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, { @@ -3872,7 +3793,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } ] @@ -3894,7 +3814,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -3913,8 +3832,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3940,7 +3859,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, { @@ -3951,7 +3869,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/parenthesizedContexualTyping2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/parenthesizedContexualTyping2/input.ts.json index 28d96cce3397..9d6e29cad3f8 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/parenthesizedContexualTyping2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/parenthesizedContexualTyping2/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "FuncType", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -42,6 +41,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -65,6 +65,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -87,13 +88,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -119,7 +118,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -149,15 +147,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -183,7 +179,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -200,7 +195,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -221,6 +215,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -243,13 +238,11 @@ "ctxt": 0 }, "value": "FuncType", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -268,6 +261,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -290,13 +284,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -332,7 +324,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -362,7 +353,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -379,7 +369,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -400,6 +389,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -422,13 +412,11 @@ "ctxt": 0 }, "value": "FuncType", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -447,6 +435,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -469,13 +458,11 @@ "ctxt": 0 }, "value": "FuncType", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -494,6 +481,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -516,13 +504,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -558,7 +544,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -588,7 +573,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -605,7 +589,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -638,8 +621,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -698,7 +681,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -729,7 +711,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -759,7 +740,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -791,8 +771,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -809,7 +789,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -831,8 +810,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -865,7 +844,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -879,7 +857,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -920,7 +897,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -976,8 +952,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -994,7 +970,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1023,8 +998,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1057,7 +1032,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1071,7 +1045,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1112,7 +1085,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1169,8 +1141,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1187,7 +1159,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1223,8 +1194,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1257,7 +1228,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1271,7 +1241,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1312,7 +1281,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1370,8 +1338,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1388,7 +1356,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1431,8 +1398,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1465,7 +1432,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1479,7 +1445,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1520,7 +1485,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1579,8 +1543,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1597,7 +1561,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1619,8 +1582,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1653,7 +1616,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1667,7 +1629,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1708,7 +1669,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1738,8 +1698,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1772,7 +1732,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1786,7 +1745,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1827,7 +1785,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1883,8 +1840,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1901,7 +1858,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1930,8 +1886,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1964,7 +1920,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1978,7 +1933,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2019,7 +1973,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2057,8 +2010,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2091,7 +2044,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2105,7 +2057,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2146,7 +2097,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2203,8 +2153,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2221,7 +2171,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2257,8 +2206,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2291,7 +2240,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2305,7 +2253,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2346,7 +2293,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2392,8 +2338,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2426,7 +2372,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2440,7 +2385,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2481,7 +2425,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2539,8 +2482,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2557,7 +2500,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2600,8 +2542,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2634,7 +2576,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2648,7 +2589,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2689,7 +2629,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2736,8 +2675,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2770,7 +2709,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2784,7 +2722,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2825,7 +2762,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2883,8 +2819,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2901,7 +2837,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2951,7 +2886,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -2962,7 +2896,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2996,8 +2929,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3030,7 +2963,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3044,7 +2976,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -3085,7 +3016,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3112,8 +3042,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3124,7 +3054,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3179,8 +3108,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3197,7 +3126,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3247,7 +3175,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -3258,7 +3185,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3299,8 +3225,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3333,7 +3259,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3347,7 +3272,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -3388,7 +3312,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3423,8 +3346,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3435,7 +3358,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3491,8 +3413,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3509,7 +3431,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3559,7 +3480,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -3570,7 +3490,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3611,8 +3530,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3645,7 +3564,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3659,7 +3577,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -3700,7 +3617,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3735,8 +3651,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3747,7 +3663,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3777,8 +3692,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3811,7 +3726,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3825,7 +3739,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -3866,7 +3779,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3922,8 +3834,8 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3940,7 +3852,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3997,7 +3908,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -4008,7 +3918,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4056,8 +3965,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4090,7 +3999,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4104,7 +4012,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -4145,7 +4052,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4188,8 +4094,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4200,7 +4106,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4246,8 +4151,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4280,7 +4185,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4294,7 +4198,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -4335,7 +4238,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4393,6 +4295,7 @@ "ctxt": 0 }, "value": "lambda1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4415,13 +4318,11 @@ "ctxt": 0 }, "value": "FuncType", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -4439,8 +4340,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4473,7 +4374,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4487,7 +4387,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -4528,7 +4427,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4568,6 +4466,7 @@ "ctxt": 0 }, "value": "lambda2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4590,13 +4489,11 @@ "ctxt": 0 }, "value": "FuncType", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ParenthesisExpression", @@ -4621,8 +4518,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4655,7 +4552,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4669,7 +4565,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -4710,7 +4605,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4742,7 +4636,6 @@ "ctxt": 0 }, "value": "ObjType", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -4770,7 +4663,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4800,6 +4692,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4816,8 +4709,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -4858,7 +4750,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4888,6 +4779,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4904,8 +4796,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -4958,6 +4849,7 @@ "ctxt": 0 }, "value": "obj1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4980,13 +4872,11 @@ "ctxt": 0 }, "value": "ObjType", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -5006,7 +4896,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -5025,8 +4914,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5052,7 +4941,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, { @@ -5063,7 +4951,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } ] @@ -5085,7 +4972,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -5104,8 +4990,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5131,7 +5017,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, { @@ -5142,7 +5027,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } ] @@ -5185,6 +5069,7 @@ "ctxt": 0 }, "value": "obj2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5207,13 +5092,11 @@ "ctxt": 0 }, "value": "ObjType", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ParenthesisExpression", @@ -5240,7 +5123,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -5259,8 +5141,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5286,7 +5168,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, { @@ -5297,7 +5178,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } ] @@ -5319,7 +5199,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -5338,8 +5217,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5365,7 +5244,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, { @@ -5376,7 +5254,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/parenthesizedContexualTyping3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/parenthesizedContexualTyping3/input.ts.json index f2a674ce51a2..94ee1ff04483 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/parenthesizedContexualTyping3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/parenthesizedContexualTyping3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "tempFun", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "tempStrs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -107,6 +106,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -129,13 +129,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -161,15 +159,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -188,6 +184,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -210,13 +207,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -252,7 +247,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -282,7 +276,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -299,7 +292,6 @@ "ctxt": 0 }, "value": "tempFun", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -320,6 +312,7 @@ "ctxt": 0 }, "value": "tempStrs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -342,13 +335,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -367,6 +358,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -390,6 +382,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -412,13 +405,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -444,15 +435,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -471,6 +460,7 @@ "ctxt": 0 }, "value": "h", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -494,6 +484,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -516,13 +507,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -548,15 +537,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -575,6 +562,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -597,13 +585,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -639,7 +625,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -669,7 +654,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -686,7 +670,6 @@ "ctxt": 0 }, "value": "tempFun", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -707,6 +690,7 @@ "ctxt": 0 }, "value": "tempStrs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -729,13 +713,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -754,6 +736,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -777,6 +760,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -799,13 +783,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -831,15 +813,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -858,6 +838,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -880,13 +861,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -926,7 +905,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -940,7 +918,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -975,7 +952,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1005,7 +981,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1037,8 +1012,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -1055,7 +1030,6 @@ "ctxt": 0 }, "value": "tempFun", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1075,8 +1049,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1087,7 +1061,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1249,8 +1222,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -1267,7 +1240,6 @@ "ctxt": 0 }, "value": "tempFun", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1294,8 +1266,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1306,7 +1278,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1469,8 +1440,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -1487,7 +1458,6 @@ "ctxt": 0 }, "value": "tempFun", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1521,8 +1491,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1533,7 +1503,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1697,8 +1666,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -1715,7 +1684,6 @@ "ctxt": 0 }, "value": "tempFun", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1735,8 +1703,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1747,7 +1715,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1771,8 +1738,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1783,7 +1750,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1982,8 +1948,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -2000,7 +1966,6 @@ "ctxt": 0 }, "value": "tempFun", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -2020,8 +1985,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2032,7 +1997,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2063,8 +2027,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2075,7 +2039,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2275,8 +2238,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -2293,7 +2256,6 @@ "ctxt": 0 }, "value": "tempFun", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -2313,8 +2275,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2325,7 +2287,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2363,8 +2324,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2375,7 +2336,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2576,8 +2536,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -2594,7 +2554,6 @@ "ctxt": 0 }, "value": "tempFun", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -2621,8 +2580,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2633,7 +2592,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2679,8 +2637,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2691,7 +2649,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2893,8 +2850,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TaggedTemplateExpression", @@ -2911,7 +2868,6 @@ "ctxt": 0 }, "value": "tempFun", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -2938,8 +2894,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2950,7 +2906,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2996,8 +2951,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3008,7 +2963,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3027,7 +2981,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } ], diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/superCallParameterContextualTyping1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/superCallParameterContextualTyping1/input.ts.json index acb7c22e8d70..01561a77cfc9 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/superCallParameterContextualTyping1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/superCallParameterContextualTyping1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -64,6 +62,7 @@ "ctxt": 0 }, "value": "map", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -87,6 +86,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -109,13 +109,11 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -141,15 +139,13 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -191,7 +187,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -212,7 +207,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -233,7 +227,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -259,7 +252,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -312,8 +304,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -331,7 +323,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -359,7 +350,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "property": { @@ -370,7 +360,6 @@ "ctxt": 0 }, "value": "toExponential", - "typeAnnotation": null, "optional": false }, "computed": false @@ -406,7 +395,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/superCallParameterContextualTyping2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/superCallParameterContextualTyping2/input.ts.json index de26abe381e4..874199922cc1 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/superCallParameterContextualTyping2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/superCallParameterContextualTyping2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -64,6 +62,7 @@ "ctxt": 0 }, "value": "map", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -87,6 +86,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -109,13 +109,11 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -141,15 +139,13 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -191,7 +187,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -212,7 +207,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -233,7 +227,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -259,7 +252,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -312,8 +304,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -331,7 +323,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -352,7 +343,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -404,7 +394,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/superCallParameterContextualTyping3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/superCallParameterContextualTyping3/input.ts.json index c0e7fc4b618b..4db30500f094 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/superCallParameterContextualTyping3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/superCallParameterContextualTyping3/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "ContextualType", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,6 +92,7 @@ "ctxt": 0 }, "value": "parameter", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -117,13 +115,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -158,7 +154,6 @@ "ctxt": 0 }, "value": "CBase", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -204,6 +198,7 @@ "ctxt": 0 }, "value": "param", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -226,7 +221,6 @@ "ctxt": 0 }, "value": "ContextualType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -252,7 +246,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -260,8 +253,7 @@ ] } } - }, - "optional": false + } } } ], @@ -292,7 +284,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -313,6 +304,7 @@ "ctxt": 0 }, "value": "param", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -335,7 +327,6 @@ "ctxt": 0 }, "value": "ContextualType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -361,7 +352,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -369,8 +359,7 @@ ] } } - }, - "optional": false + } } } ], @@ -426,7 +415,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -447,7 +435,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -473,7 +460,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -528,7 +514,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "params": [ @@ -548,8 +533,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -589,7 +574,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -600,7 +584,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -657,7 +640,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -683,7 +665,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "params": [ @@ -703,8 +684,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -744,7 +725,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -755,7 +735,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -789,7 +768,6 @@ "ctxt": 0 }, "value": "CBase", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/taggedTemplateContextualTyping1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/taggedTemplateContextualTyping1/input.ts.json index 7a4566f95528..d99fe831b8d2 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/taggedTemplateContextualTyping1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/taggedTemplateContextualTyping1/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "FuncType", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -42,6 +41,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -65,6 +65,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -87,13 +88,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -119,7 +118,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -149,15 +147,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -183,7 +179,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -200,7 +195,6 @@ "ctxt": 0 }, "value": "tempTag1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -221,6 +215,7 @@ "ctxt": 0 }, "value": "templateStrs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -243,13 +238,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -268,6 +261,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -290,13 +284,11 @@ "ctxt": 0 }, "value": "FuncType", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -315,6 +307,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -337,13 +330,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -379,7 +370,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -409,7 +399,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -426,7 +415,6 @@ "ctxt": 0 }, "value": "tempTag1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -447,6 +435,7 @@ "ctxt": 0 }, "value": "templateStrs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -469,13 +458,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -494,6 +481,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -516,13 +504,11 @@ "ctxt": 0 }, "value": "FuncType", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -541,6 +527,7 @@ "ctxt": 0 }, "value": "h", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -563,13 +550,11 @@ "ctxt": 0 }, "value": "FuncType", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -588,6 +573,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,13 +596,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -652,7 +636,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -682,7 +665,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -699,7 +681,6 @@ "ctxt": 0 }, "value": "tempTag1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -732,8 +713,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -792,7 +773,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -823,7 +803,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -853,7 +832,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -882,7 +860,6 @@ "ctxt": 0 }, "value": "tempTag1", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -902,8 +879,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -936,7 +913,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -950,7 +926,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -991,7 +966,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1150,7 +1124,6 @@ "ctxt": 0 }, "value": "tempTag1", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1170,8 +1143,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1204,7 +1177,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1218,7 +1190,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1259,7 +1230,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1286,8 +1256,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1320,7 +1290,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1334,7 +1303,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1375,7 +1343,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1571,7 +1538,6 @@ "ctxt": 0 }, "value": "tempTag1", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1591,8 +1557,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1625,7 +1591,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1639,7 +1604,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1680,7 +1644,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1707,6 +1670,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1730,6 +1694,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1752,13 +1717,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -1784,7 +1747,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1814,15 +1776,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "body": { @@ -1855,7 +1815,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1869,7 +1828,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1910,7 +1868,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1929,7 +1886,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } ], @@ -2108,7 +2064,6 @@ "ctxt": 0 }, "value": "tempTag1", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -2128,6 +2083,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2151,6 +2107,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2173,13 +2130,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -2205,7 +2160,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2235,15 +2189,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "body": { @@ -2276,7 +2228,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2290,7 +2241,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2331,7 +2281,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2358,8 +2307,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2392,7 +2341,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2406,7 +2354,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2447,7 +2394,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -2466,7 +2412,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } ], diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/taggedTemplateContextualTyping2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/taggedTemplateContextualTyping2/input.ts.json index ebf808853895..5b800c73e50b 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/taggedTemplateContextualTyping2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/contextualTyping/taggedTemplateContextualTyping2/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "FuncType1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -42,6 +41,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -65,6 +65,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -87,13 +88,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -119,7 +118,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -149,15 +147,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -183,7 +179,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -206,7 +201,6 @@ "ctxt": 0 }, "value": "FuncType2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -226,6 +220,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -249,6 +244,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -271,13 +267,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -303,7 +297,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -324,7 +317,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -354,15 +346,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -388,7 +378,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -405,7 +394,6 @@ "ctxt": 0 }, "value": "tempTag2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -426,6 +414,7 @@ "ctxt": 0 }, "value": "templateStrs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -448,13 +437,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -473,6 +460,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -495,13 +483,11 @@ "ctxt": 0 }, "value": "FuncType1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -520,6 +506,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -536,8 +523,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -579,7 +565,6 @@ "ctxt": 0 }, "value": "tempTag2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -600,6 +585,7 @@ "ctxt": 0 }, "value": "templateStrs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -622,13 +608,11 @@ "ctxt": 0 }, "value": "TemplateStringsArray", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -647,6 +631,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -669,13 +654,11 @@ "ctxt": 0 }, "value": "FuncType2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -694,6 +677,7 @@ "ctxt": 0 }, "value": "h", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -716,13 +700,11 @@ "ctxt": 0 }, "value": "FuncType2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -741,6 +723,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -757,8 +740,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -800,7 +782,6 @@ "ctxt": 0 }, "value": "tempTag2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -833,8 +814,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -893,7 +874,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -942,7 +922,6 @@ "ctxt": 0 }, "value": "tempTag2", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -962,8 +941,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -996,7 +975,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1010,7 +988,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1051,7 +1028,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1210,7 +1186,6 @@ "ctxt": 0 }, "value": "tempTag2", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1230,8 +1205,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1264,7 +1239,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1278,7 +1252,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1328,7 +1301,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1355,8 +1327,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1389,7 +1361,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1450,7 +1421,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1651,7 +1621,6 @@ "ctxt": 0 }, "value": "tempTag2", - "typeAnnotation": null, "optional": false }, "expressions": [ @@ -1671,8 +1640,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1705,7 +1674,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1719,7 +1687,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1769,7 +1736,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1788,7 +1754,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/elementAccess/letIdentifierInElementAccess01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/elementAccess/letIdentifierInElementAccess01/input.ts.json index 1b86abd3296c..d4defae1fcdd 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/elementAccess/letIdentifierInElementAccess01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/elementAccess/letIdentifierInElementAccess01/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "let", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -100,7 +100,6 @@ "ctxt": 0 }, "value": "let", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/elementAccess/stringEnumInElementAccess01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/elementAccess/stringEnumInElementAccess01/input.ts.json index 2c4ab97075cd..b8d4b7f2b1fb 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/elementAccess/stringEnumInElementAccess01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/elementAccess/stringEnumInElementAccess01/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": { @@ -75,7 +73,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": { @@ -108,7 +105,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": { @@ -143,7 +139,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -173,7 +168,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -215,7 +209,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -257,7 +250,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -311,6 +303,7 @@ "ctxt": 0 }, "value": "item", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -333,13 +326,11 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -371,6 +362,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -393,13 +385,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -431,6 +421,7 @@ "ctxt": 0 }, "value": "snb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -475,8 +466,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -493,7 +483,6 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, "optional": false }, "property": { @@ -504,7 +493,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": true diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callOverload/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callOverload/input.ts.json index 21e7a6d1b35b..9551d16bd659 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callOverload/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callOverload/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -96,7 +95,6 @@ "ctxt": 0 }, "value": "takeTwo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -117,6 +115,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -133,8 +132,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -153,6 +151,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -169,8 +168,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -212,7 +210,6 @@ "ctxt": 0 }, "value": "withRest", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -233,6 +230,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -249,8 +247,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -281,8 +278,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -306,7 +303,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -386,6 +382,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -410,8 +407,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -440,7 +436,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -482,7 +477,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -560,7 +554,6 @@ "ctxt": 0 }, "value": "takeTwo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -638,7 +631,6 @@ "ctxt": 0 }, "value": "withRest", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -673,7 +665,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -703,7 +694,6 @@ "ctxt": 0 }, "value": "withRest", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -732,7 +722,6 @@ "ctxt": 0 }, "value": "withRest", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -750,7 +739,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callWithMissingVoid/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callWithMissingVoid/input.ts.json index 2ad74b2871bd..8a0e7655f808 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callWithMissingVoid/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callWithMissingVoid/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -85,13 +84,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -145,7 +141,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -191,7 +186,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -227,6 +221,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -249,7 +244,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -272,8 +266,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -309,7 +302,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -320,7 +312,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -354,6 +345,7 @@ "ctxt": 0 }, "value": "xUnion", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -376,7 +368,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -418,8 +409,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -455,7 +445,6 @@ "ctxt": 0 }, "value": "xUnion", - "typeAnnotation": null, "optional": false }, "property": { @@ -466,7 +455,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -517,7 +505,6 @@ "ctxt": 0 }, "value": "xUnion", - "typeAnnotation": null, "optional": false }, "property": { @@ -528,7 +515,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -562,6 +548,7 @@ "ctxt": 0 }, "value": "xAny", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -584,7 +571,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -607,8 +593,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -644,7 +629,6 @@ "ctxt": 0 }, "value": "xAny", - "typeAnnotation": null, "optional": false }, "property": { @@ -655,7 +639,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -689,6 +672,7 @@ "ctxt": 0 }, "value": "xUnknown", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -711,7 +695,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -734,8 +717,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -771,7 +753,6 @@ "ctxt": 0 }, "value": "xUnknown", - "typeAnnotation": null, "optional": false }, "property": { @@ -782,7 +763,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -816,6 +796,7 @@ "ctxt": 0 }, "value": "xNever", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -838,7 +819,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -861,8 +841,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -898,7 +877,6 @@ "ctxt": 0 }, "value": "xNever", - "typeAnnotation": null, "optional": false }, "property": { @@ -909,7 +887,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -928,7 +905,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -954,7 +930,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -974,6 +949,7 @@ "ctxt": 0 }, "value": "executor", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -997,6 +973,7 @@ "ctxt": 0 }, "value": "resolve", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1020,6 +997,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1042,13 +1020,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1070,8 +1046,7 @@ } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1093,8 +1068,7 @@ } } } - }, - "optional": false + } } } ], @@ -1136,7 +1110,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1169,7 +1142,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1191,8 +1163,8 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1210,7 +1182,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1266,7 +1237,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1288,8 +1258,8 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1307,7 +1277,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1382,7 +1351,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1404,8 +1372,8 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1423,7 +1391,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1479,7 +1446,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1501,8 +1467,8 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1520,7 +1486,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1576,7 +1541,6 @@ "ctxt": 0 }, "value": "MyPromise", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1598,8 +1562,8 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1617,7 +1581,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1661,7 +1624,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1682,6 +1644,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1698,8 +1661,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -1718,6 +1680,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1734,8 +1697,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -1754,6 +1716,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1770,8 +1733,7 @@ }, "kind": "void" } - }, - "optional": false + } } } ], @@ -1833,7 +1795,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1892,7 +1853,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1972,7 +1932,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2002,7 +1961,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2023,6 +1981,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2039,8 +1998,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -2059,6 +2017,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2075,8 +2034,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -2095,6 +2053,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2111,8 +2070,7 @@ }, "kind": "void" } - }, - "optional": false + } } }, { @@ -2131,6 +2089,7 @@ "ctxt": 0 }, "value": "what", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2147,8 +2106,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -2210,7 +2168,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2302,7 +2259,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2361,7 +2317,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2441,7 +2396,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2471,7 +2425,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2492,6 +2445,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2527,8 +2481,7 @@ } ] } - }, - "optional": false + } } }, { @@ -2547,6 +2500,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2563,8 +2517,7 @@ }, "kind": "void" } - }, - "optional": false + } } }, { @@ -2583,6 +2536,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2627,8 +2581,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2690,7 +2643,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2774,7 +2726,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2837,7 +2788,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2879,7 +2829,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2896,7 +2845,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2917,6 +2865,7 @@ "ctxt": 0 }, "value": "handler", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2952,8 +2901,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2977,7 +2926,6 @@ "ctxt": 0 }, "value": "TS", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3004,8 +2952,7 @@ } } } - }, - "optional": false + } } }, { @@ -3036,8 +2983,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -3061,7 +3008,6 @@ "ctxt": 0 }, "value": "TS", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3102,7 +3048,6 @@ "ctxt": 0 }, "value": "TS", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3166,7 +3111,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3188,6 +3132,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3204,8 +3149,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -3215,6 +3159,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3231,8 +3176,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -3251,7 +3195,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -3262,7 +3205,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -3298,7 +3240,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3320,6 +3261,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3336,8 +3278,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -3347,6 +3288,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3363,8 +3305,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -3383,7 +3324,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -3394,7 +3334,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -3454,7 +3393,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3476,6 +3414,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3492,8 +3431,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -3503,6 +3441,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3519,8 +3458,7 @@ }, "kind": "void" } - }, - "optional": false + } } ], "body": { @@ -3531,7 +3469,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3599,7 +3536,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3621,6 +3557,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3637,8 +3574,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -3648,6 +3584,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3664,8 +3601,7 @@ }, "kind": "void" } - }, - "optional": false + } } ], "body": { @@ -3676,7 +3612,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3723,7 +3658,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3745,6 +3679,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3761,8 +3696,7 @@ }, "kind": "void" } - }, - "optional": false + } }, { "type": "Identifier", @@ -3772,6 +3706,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3788,8 +3723,7 @@ }, "kind": "void" } - }, - "optional": false + } } ], "body": { @@ -3833,7 +3767,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3855,6 +3788,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3890,8 +3824,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -3901,6 +3834,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3936,8 +3870,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -3981,7 +3914,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4003,6 +3935,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4038,8 +3971,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -4049,6 +3981,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4084,8 +4017,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -4141,7 +4073,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4163,6 +4094,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4198,8 +4130,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -4209,6 +4140,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4244,8 +4176,7 @@ } ] } - }, - "optional": false + } } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callWithMissingVoidUndefinedUnknownAnyInJs/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callWithMissingVoidUndefinedUnknownAnyInJs/input.ts.json index 2a7bf1436a3a..4103da1a190e 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callWithMissingVoidUndefinedUnknownAnyInJs/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callWithMissingVoidUndefinedUnknownAnyInJs/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "void" } - }, - "optional": false + } } } ], @@ -96,7 +95,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -117,6 +115,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -133,8 +132,7 @@ }, "kind": "undefined" } - }, - "optional": false + } } } ], @@ -176,7 +174,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -197,6 +194,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -213,8 +211,7 @@ }, "kind": "unknown" } - }, - "optional": false + } } } ], @@ -256,7 +253,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -277,6 +273,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -293,8 +290,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -341,7 +337,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -368,7 +363,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -401,7 +395,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -415,6 +408,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -437,13 +431,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -493,6 +485,7 @@ "ctxt": 0 }, "value": "o1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -515,7 +508,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -538,8 +530,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -571,6 +562,7 @@ "ctxt": 0 }, "value": "o2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -593,7 +585,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -616,8 +607,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -649,6 +639,7 @@ "ctxt": 0 }, "value": "o3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -671,7 +662,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -694,8 +684,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -727,6 +716,7 @@ "ctxt": 0 }, "value": "o4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -749,7 +739,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -772,8 +761,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -802,7 +790,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -838,7 +825,6 @@ "ctxt": 0 }, "value": "o1", - "typeAnnotation": null, "optional": false }, "property": { @@ -849,7 +835,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -880,7 +865,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -909,7 +893,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -938,7 +921,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -974,7 +956,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { @@ -985,7 +966,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1023,7 +1003,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1034,7 +1013,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1072,7 +1050,6 @@ "ctxt": 0 }, "value": "o4", - "typeAnnotation": null, "optional": false }, "property": { @@ -1083,7 +1060,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1114,7 +1090,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1150,7 +1125,6 @@ "ctxt": 0 }, "value": "o1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1161,7 +1135,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1192,7 +1165,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1221,7 +1193,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1250,7 +1221,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1286,7 +1256,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1297,7 +1266,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1335,7 +1303,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1346,7 +1313,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1384,7 +1350,6 @@ "ctxt": 0 }, "value": "o4", - "typeAnnotation": null, "optional": false }, "property": { @@ -1395,7 +1360,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callWithSpread/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callWithSpread/input.ts.json index d6fb4adf4124..7c4101f48672 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callWithSpread/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callWithSpread/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -65,6 +63,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -81,8 +80,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -92,6 +90,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -108,8 +107,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -131,8 +129,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -183,7 +181,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -204,7 +201,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -225,6 +221,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -241,8 +238,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -261,6 +257,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -277,8 +274,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -309,8 +305,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -385,6 +381,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -409,8 +406,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -442,6 +438,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -466,8 +463,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -499,6 +495,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -521,13 +518,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -559,6 +554,7 @@ "ctxt": 0 }, "value": "xa", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -588,14 +584,12 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -624,7 +618,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -695,7 +688,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -737,7 +729,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -767,7 +758,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -809,7 +799,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -863,7 +852,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -874,7 +862,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -954,7 +941,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -965,7 +951,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1009,7 +994,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1046,7 +1030,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1057,7 +1040,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1101,7 +1083,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1169,7 +1150,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1180,7 +1160,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1224,7 +1203,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1239,7 +1217,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1333,7 +1310,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1344,7 +1320,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1388,7 +1363,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1403,7 +1377,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1447,7 +1420,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1498,7 +1470,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1509,7 +1480,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1553,7 +1523,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1568,7 +1537,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1612,7 +1580,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1673,7 +1640,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1684,7 +1650,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1772,7 +1737,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1783,7 +1747,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1828,7 +1791,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1872,7 +1834,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1883,7 +1844,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1928,7 +1888,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2010,7 +1969,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -2021,7 +1979,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2066,7 +2023,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2081,7 +2037,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2190,7 +2145,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -2201,7 +2155,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2246,7 +2199,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2261,7 +2213,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2306,7 +2257,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2371,7 +2321,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -2382,7 +2331,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2427,7 +2375,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2442,7 +2389,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2487,7 +2433,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2548,7 +2493,6 @@ "ctxt": 0 }, "value": "xa", - "typeAnnotation": null, "optional": false }, "property": { @@ -2570,7 +2514,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2657,7 +2600,6 @@ "ctxt": 0 }, "value": "xa", - "typeAnnotation": null, "optional": false }, "property": { @@ -2679,7 +2621,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2723,7 +2664,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2767,7 +2707,6 @@ "ctxt": 0 }, "value": "xa", - "typeAnnotation": null, "optional": false }, "property": { @@ -2789,7 +2728,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2833,7 +2771,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2908,7 +2845,6 @@ "ctxt": 0 }, "value": "xa", - "typeAnnotation": null, "optional": false }, "property": { @@ -2930,7 +2866,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2950,7 +2885,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3030,7 +2964,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3056,7 +2989,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -3076,6 +3008,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3092,8 +3025,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -3112,6 +3044,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3128,8 +3061,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -3160,8 +3092,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -3236,7 +3168,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3252,7 +3183,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3266,7 +3196,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -3311,7 +3240,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3327,7 +3255,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3341,7 +3268,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -3359,7 +3285,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -3387,7 +3312,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -3408,6 +3332,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3424,8 +3349,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -3444,6 +3368,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3460,8 +3385,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -3492,8 +3416,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -3566,7 +3490,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3592,7 +3515,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -3716,7 +3638,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3744,7 +3665,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -3800,7 +3720,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3871,7 +3790,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3915,7 +3833,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3945,7 +3862,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callWithSpread2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callWithSpread2/input.ts.json index 6b5837c60545..9222e2db5383 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callWithSpread2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callWithSpread2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "all", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "a", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "number" } - }, - "optional": true + } } }, { @@ -73,6 +72,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -89,8 +89,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -132,7 +131,6 @@ "ctxt": 0 }, "value": "weird", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -153,6 +151,7 @@ "ctxt": 0 }, "value": "a", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -188,8 +187,7 @@ } ] } - }, - "optional": true + } } }, { @@ -208,6 +206,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -243,8 +242,7 @@ } ] } - }, - "optional": true + } } } ], @@ -286,7 +284,6 @@ "ctxt": 0 }, "value": "prefix", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -307,6 +304,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -323,8 +321,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -343,6 +340,7 @@ "ctxt": 0 }, "value": "a", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -359,8 +357,7 @@ }, "kind": "number" } - }, - "optional": true + } } }, { @@ -379,6 +376,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -395,8 +393,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -438,7 +435,6 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -459,6 +455,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -475,8 +472,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -495,6 +491,7 @@ "ctxt": 0 }, "value": "a", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -511,8 +508,7 @@ }, "kind": "number" } - }, - "optional": true + } } }, { @@ -531,6 +527,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -547,8 +544,7 @@ }, "kind": "number" } - }, - "optional": true + } } }, { @@ -579,8 +575,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -648,7 +644,6 @@ "ctxt": 0 }, "value": "normal", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -669,6 +664,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -685,8 +681,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -728,7 +723,6 @@ "ctxt": 0 }, "value": "thunk", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -771,7 +765,6 @@ "ctxt": 0 }, "value": "prefix2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -792,6 +785,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -808,8 +802,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -828,6 +821,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -844,8 +838,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -864,6 +857,7 @@ "ctxt": 0 }, "value": "a", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -880,8 +874,7 @@ }, "kind": "number" } - }, - "optional": true + } } }, { @@ -900,6 +893,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -916,8 +910,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -974,6 +967,7 @@ "ctxt": 0 }, "value": "ns", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -998,8 +992,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1031,6 +1024,7 @@ "ctxt": 0 }, "value": "mixed", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1082,8 +1076,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1115,6 +1108,7 @@ "ctxt": 0 }, "value": "tuple", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1168,8 +1162,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1198,7 +1191,6 @@ "ctxt": 0 }, "value": "all", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1216,7 +1208,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } } @@ -1246,7 +1237,6 @@ "ctxt": 0 }, "value": "weird", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1264,7 +1254,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } } @@ -1294,7 +1283,6 @@ "ctxt": 0 }, "value": "weird", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1312,7 +1300,6 @@ "ctxt": 0 }, "value": "mixed", - "typeAnnotation": null, "optional": false } } @@ -1342,7 +1329,6 @@ "ctxt": 0 }, "value": "weird", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1360,7 +1346,6 @@ "ctxt": 0 }, "value": "tuple", - "typeAnnotation": null, "optional": false } } @@ -1390,7 +1375,6 @@ "ctxt": 0 }, "value": "prefix", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1425,7 +1409,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } } @@ -1455,7 +1438,6 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1490,7 +1472,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } } @@ -1520,7 +1501,6 @@ "ctxt": 0 }, "value": "normal", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1555,7 +1535,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } } @@ -1585,7 +1564,6 @@ "ctxt": 0 }, "value": "thunk", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1603,7 +1581,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } } @@ -1633,7 +1610,6 @@ "ctxt": 0 }, "value": "all", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1651,7 +1627,6 @@ "ctxt": 0 }, "value": "mixed", - "typeAnnotation": null, "optional": false } } @@ -1681,7 +1656,6 @@ "ctxt": 0 }, "value": "all", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1699,7 +1673,6 @@ "ctxt": 0 }, "value": "tuple", - "typeAnnotation": null, "optional": false } } @@ -1729,7 +1702,6 @@ "ctxt": 0 }, "value": "prefix", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1764,7 +1736,6 @@ "ctxt": 0 }, "value": "mixed", - "typeAnnotation": null, "optional": false } } @@ -1794,7 +1765,6 @@ "ctxt": 0 }, "value": "prefix", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1829,7 +1799,6 @@ "ctxt": 0 }, "value": "tuple", - "typeAnnotation": null, "optional": false } } @@ -1859,7 +1828,6 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1894,7 +1862,6 @@ "ctxt": 0 }, "value": "mixed", - "typeAnnotation": null, "optional": false } } @@ -1924,7 +1891,6 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1959,7 +1925,6 @@ "ctxt": 0 }, "value": "tuple", - "typeAnnotation": null, "optional": false } } @@ -1989,7 +1954,6 @@ "ctxt": 0 }, "value": "prefix", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2007,7 +1971,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } } @@ -2037,7 +2000,6 @@ "ctxt": 0 }, "value": "prefix", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2055,7 +2017,6 @@ "ctxt": 0 }, "value": "mixed", - "typeAnnotation": null, "optional": false } } @@ -2085,7 +2046,6 @@ "ctxt": 0 }, "value": "prefix", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2103,7 +2063,6 @@ "ctxt": 0 }, "value": "tuple", - "typeAnnotation": null, "optional": false } } @@ -2133,7 +2092,6 @@ "ctxt": 0 }, "value": "prefix2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2168,7 +2126,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callWithSpread3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callWithSpread3/input.ts.json index d0fd1d04d527..d52ed8a164d8 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callWithSpread3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callWithSpread3/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "s2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,8 +85,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -117,6 +117,7 @@ "ctxt": 0 }, "value": "s3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -188,8 +189,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -221,6 +221,7 @@ "ctxt": 0 }, "value": "s2_", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -308,8 +309,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -341,6 +341,7 @@ "ctxt": 0 }, "value": "s_", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -365,8 +366,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -398,6 +398,7 @@ "ctxt": 0 }, "value": "n_", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -422,8 +423,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -455,6 +455,7 @@ "ctxt": 0 }, "value": "s2n_", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -542,8 +543,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -560,7 +560,6 @@ "ctxt": 0 }, "value": "fs2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -581,6 +580,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -597,8 +597,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -617,6 +616,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -633,8 +633,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -676,7 +675,6 @@ "ctxt": 0 }, "value": "fs2_", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -697,6 +695,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -713,8 +712,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -733,6 +731,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -749,8 +748,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -781,8 +779,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -850,7 +848,6 @@ "ctxt": 0 }, "value": "fs2n_", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -871,6 +868,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -887,8 +885,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -907,6 +904,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -923,8 +921,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -955,8 +952,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1024,7 +1021,6 @@ "ctxt": 0 }, "value": "fs5", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1045,6 +1041,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1061,8 +1058,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -1081,6 +1077,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1097,8 +1094,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -1117,6 +1113,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1133,8 +1130,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -1153,6 +1149,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1169,8 +1166,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -1189,6 +1185,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1205,8 +1202,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1260,7 +1256,6 @@ "ctxt": 0 }, "value": "fs2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1295,7 +1290,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -1325,7 +1319,6 @@ "ctxt": 0 }, "value": "fs2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1394,7 +1387,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -1424,7 +1416,6 @@ "ctxt": 0 }, "value": "fs2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1476,7 +1467,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } }, @@ -1523,7 +1513,6 @@ "ctxt": 0 }, "value": "fs2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1592,7 +1581,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } }, @@ -1639,7 +1627,6 @@ "ctxt": 0 }, "value": "fs2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1657,7 +1644,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } }, @@ -1704,7 +1690,6 @@ "ctxt": 0 }, "value": "fs2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1722,7 +1707,6 @@ "ctxt": 0 }, "value": "s3", - "typeAnnotation": null, "optional": false } } @@ -1752,7 +1736,6 @@ "ctxt": 0 }, "value": "fs2_", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1770,7 +1753,6 @@ "ctxt": 0 }, "value": "s_", - "typeAnnotation": null, "optional": false } } @@ -1800,7 +1782,6 @@ "ctxt": 0 }, "value": "fs2_", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1818,7 +1799,6 @@ "ctxt": 0 }, "value": "s2n_", - "typeAnnotation": null, "optional": false } } @@ -1848,7 +1828,6 @@ "ctxt": 0 }, "value": "fs2_", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1866,7 +1845,6 @@ "ctxt": 0 }, "value": "s_", - "typeAnnotation": null, "optional": false } }, @@ -1884,7 +1862,6 @@ "ctxt": 0 }, "value": "s_", - "typeAnnotation": null, "optional": false } } @@ -1914,7 +1891,6 @@ "ctxt": 0 }, "value": "fs2_", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1932,7 +1908,6 @@ "ctxt": 0 }, "value": "s_", - "typeAnnotation": null, "optional": false } }, @@ -1950,7 +1925,6 @@ "ctxt": 0 }, "value": "s_", - "typeAnnotation": null, "optional": false } }, @@ -1968,7 +1942,6 @@ "ctxt": 0 }, "value": "s_", - "typeAnnotation": null, "optional": false } } @@ -1998,7 +1971,6 @@ "ctxt": 0 }, "value": "fs2n_", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2016,7 +1988,6 @@ "ctxt": 0 }, "value": "s2_", - "typeAnnotation": null, "optional": false } } @@ -2046,7 +2017,6 @@ "ctxt": 0 }, "value": "fs2_", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2064,7 +2034,6 @@ "ctxt": 0 }, "value": "s2_", - "typeAnnotation": null, "optional": false } } @@ -2094,7 +2063,6 @@ "ctxt": 0 }, "value": "fs2_", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2112,7 +2080,6 @@ "ctxt": 0 }, "value": "s2_", - "typeAnnotation": null, "optional": false } }, @@ -2130,7 +2097,6 @@ "ctxt": 0 }, "value": "s_", - "typeAnnotation": null, "optional": false } } @@ -2160,7 +2126,6 @@ "ctxt": 0 }, "value": "fs2_", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2178,7 +2143,6 @@ "ctxt": 0 }, "value": "s2_", - "typeAnnotation": null, "optional": false } }, @@ -2196,7 +2160,6 @@ "ctxt": 0 }, "value": "s2_", - "typeAnnotation": null, "optional": false } } @@ -2226,7 +2189,6 @@ "ctxt": 0 }, "value": "fs2_", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2244,7 +2206,6 @@ "ctxt": 0 }, "value": "s_", - "typeAnnotation": null, "optional": false } }, @@ -2262,7 +2223,6 @@ "ctxt": 0 }, "value": "s2_", - "typeAnnotation": null, "optional": false } } @@ -2292,7 +2252,6 @@ "ctxt": 0 }, "value": "fs2n_", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2310,7 +2269,6 @@ "ctxt": 0 }, "value": "s2n_", - "typeAnnotation": null, "optional": false } } @@ -2340,7 +2298,6 @@ "ctxt": 0 }, "value": "fs2n_", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2358,7 +2315,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -2388,7 +2344,6 @@ "ctxt": 0 }, "value": "fs5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2406,7 +2361,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } }, @@ -2441,7 +2395,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callWithSpreadES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callWithSpreadES6/input.ts.json index a882b30a425a..a2801b0d3eee 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callWithSpreadES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/callWithSpreadES6/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -65,6 +63,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -81,8 +80,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -92,6 +90,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -108,8 +107,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -131,8 +129,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -177,7 +175,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -198,6 +195,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -214,8 +212,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -234,6 +231,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -250,8 +248,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -282,8 +279,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -358,6 +355,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -382,8 +380,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -415,6 +412,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -439,8 +437,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -472,6 +469,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -494,13 +492,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -532,6 +528,7 @@ "ctxt": 0 }, "value": "xa", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -561,14 +558,12 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -597,7 +592,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -668,7 +662,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -710,7 +703,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -740,7 +732,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -782,7 +773,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -836,7 +826,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -847,7 +836,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -927,7 +915,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -938,7 +925,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -982,7 +968,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1019,7 +1004,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1030,7 +1014,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1074,7 +1057,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1135,7 +1117,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1146,7 +1127,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1234,7 +1214,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1245,7 +1224,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1290,7 +1268,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1334,7 +1311,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1345,7 +1321,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1390,7 +1365,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1451,7 +1425,6 @@ "ctxt": 0 }, "value": "xa", - "typeAnnotation": null, "optional": false }, "property": { @@ -1473,7 +1446,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1560,7 +1532,6 @@ "ctxt": 0 }, "value": "xa", - "typeAnnotation": null, "optional": false }, "property": { @@ -1582,7 +1553,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1626,7 +1596,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1670,7 +1639,6 @@ "ctxt": 0 }, "value": "xa", - "typeAnnotation": null, "optional": false }, "property": { @@ -1692,7 +1660,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1736,7 +1703,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1811,7 +1777,6 @@ "ctxt": 0 }, "value": "xa", - "typeAnnotation": null, "optional": false }, "property": { @@ -1833,7 +1798,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1853,7 +1817,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1933,7 +1896,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1959,7 +1921,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1979,6 +1940,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1995,8 +1957,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -2015,6 +1976,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2031,8 +1993,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -2063,8 +2024,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2139,7 +2100,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2155,7 +2115,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2169,7 +2128,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -2214,7 +2172,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2230,7 +2187,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2244,7 +2200,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -2262,7 +2217,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -2290,7 +2244,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -2311,6 +2264,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2327,8 +2281,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -2347,6 +2300,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2363,8 +2317,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -2395,8 +2348,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2469,7 +2422,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2495,7 +2447,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -2619,7 +2570,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2647,7 +2597,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -2703,7 +2652,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2774,7 +2722,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2818,7 +2765,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2848,7 +2794,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/forgottenNew/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/forgottenNew/input.ts.json index d8f68e911872..20d407e0c926 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/forgottenNew/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/forgottenNew/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Tools", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "NullLogger", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -97,8 +95,8 @@ "ctxt": 0 }, "value": "logger", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -122,7 +120,6 @@ "ctxt": 0 }, "value": "Tools", - "typeAnnotation": null, "optional": false }, "property": { @@ -133,7 +130,6 @@ "ctxt": 0 }, "value": "NullLogger", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/functionCalls/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/functionCalls/input.ts.json index 698781ee96c7..96ec11150a11 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/functionCalls/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/functionCalls/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "anyVar", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "anyVar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -119,7 +118,6 @@ "ctxt": 0 }, "value": "anyVar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -166,7 +164,6 @@ "ctxt": 0 }, "value": "anyVar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -231,7 +228,6 @@ "ctxt": 0 }, "value": "anyVar", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -278,7 +274,6 @@ "ctxt": 0 }, "value": "anyVar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -292,7 +287,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -320,7 +314,6 @@ "ctxt": 0 }, "value": "Window", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -344,7 +337,6 @@ "ctxt": 0 }, "value": "SubFunc", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -365,7 +357,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -395,7 +386,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -449,6 +439,7 @@ "ctxt": 0 }, "value": "subFunc", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -471,13 +462,11 @@ "ctxt": 0 }, "value": "SubFunc", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -506,7 +495,6 @@ "ctxt": 0 }, "value": "subFunc", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -548,7 +536,6 @@ "ctxt": 0 }, "value": "subFunc", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -595,7 +582,6 @@ "ctxt": 0 }, "value": "subFunc", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -624,7 +610,6 @@ "ctxt": 0 }, "value": "subFunc", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -684,7 +669,6 @@ "ctxt": 0 }, "value": "subFunc", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -749,7 +733,6 @@ "ctxt": 0 }, "value": "subFunc", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -799,6 +782,7 @@ "ctxt": 0 }, "value": "func", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -821,13 +805,11 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -856,7 +838,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -916,7 +897,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -981,7 +961,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/grammarAmbiguities/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/grammarAmbiguities/input.ts.json index 64c1035901d3..44241a37db38 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/grammarAmbiguities/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/grammarAmbiguities/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -105,7 +104,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -126,6 +124,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -142,8 +141,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -204,7 +202,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -225,7 +222,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -250,7 +246,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -281,7 +276,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -322,8 +316,8 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -343,8 +337,8 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -373,7 +367,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -394,7 +387,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -434,7 +426,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -454,7 +445,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -489,7 +479,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -511,7 +500,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -522,7 +510,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } @@ -545,7 +532,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "right": { @@ -585,7 +571,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -607,7 +592,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -618,7 +602,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } @@ -641,7 +624,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "right": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/newWithSpread/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/newWithSpread/input.ts.json index 1ec46acbd324..0bcd9f16f3ad 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/newWithSpread/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/newWithSpread/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -73,6 +72,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -89,8 +89,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -121,8 +120,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -182,7 +181,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -215,8 +213,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -281,7 +279,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -311,7 +308,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -349,6 +345,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -365,8 +362,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -376,6 +372,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -392,8 +389,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -415,8 +411,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -466,7 +462,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -492,7 +487,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -512,6 +506,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -528,8 +523,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -548,6 +542,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -564,8 +559,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -596,8 +590,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -661,7 +655,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -723,7 +716,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } } @@ -748,7 +740,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -805,7 +796,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } } @@ -840,6 +830,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -864,8 +855,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -897,6 +887,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -919,13 +910,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -957,6 +946,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -979,13 +969,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1017,6 +1005,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1046,14 +1035,12 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1085,6 +1072,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1111,6 +1099,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1127,8 +1116,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1153,7 +1141,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1168,8 +1155,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1201,6 +1187,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1230,14 +1217,12 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1269,6 +1254,7 @@ "ctxt": 0 }, "value": "h", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1295,6 +1281,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1311,8 +1298,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1337,7 +1323,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1352,8 +1337,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1385,6 +1369,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1421,15 +1406,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1458,7 +1441,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1529,7 +1511,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1571,7 +1552,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1601,7 +1581,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1643,7 +1622,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1690,7 +1668,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1708,7 +1685,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1726,7 +1702,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1756,7 +1731,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1798,7 +1772,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1816,7 +1789,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1853,7 +1825,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1934,7 +1905,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1976,7 +1946,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2016,7 +1985,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2058,7 +2026,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2115,7 +2082,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2126,7 +2092,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2206,7 +2171,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2217,7 +2181,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2261,7 +2224,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2298,7 +2260,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2309,7 +2270,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2353,7 +2313,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2414,7 +2373,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2425,7 +2383,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2513,7 +2470,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2524,7 +2480,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2569,7 +2524,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2613,7 +2567,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2624,7 +2577,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2669,7 +2621,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2730,7 +2681,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -2752,7 +2702,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2839,7 +2788,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -2861,7 +2809,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2905,7 +2852,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2949,7 +2895,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -2971,7 +2916,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3015,7 +2959,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3076,7 +3019,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "property": { @@ -3103,7 +3045,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3190,7 +3131,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "property": { @@ -3217,7 +3157,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3261,7 +3200,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3305,7 +3243,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "property": { @@ -3332,7 +3269,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3376,7 +3312,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3423,7 +3358,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3494,7 +3428,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3536,7 +3469,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3566,7 +3498,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3608,7 +3539,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3662,7 +3592,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3756,7 +3685,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3814,7 +3742,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3851,7 +3778,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3909,7 +3835,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3970,7 +3895,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4072,7 +3996,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4131,7 +4054,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4175,7 +4097,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4234,7 +4155,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4295,7 +4215,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "property": { @@ -4407,7 +4326,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "property": { @@ -4476,7 +4394,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4520,7 +4437,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "property": { @@ -4589,7 +4505,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4650,7 +4565,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "property": { @@ -4767,7 +4681,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "property": { @@ -4841,7 +4754,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4885,7 +4797,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "property": { @@ -4959,7 +4870,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -5020,7 +4930,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -5132,7 +5041,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -5201,7 +5109,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -5245,7 +5152,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -5314,7 +5220,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/newWithSpreadES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/newWithSpreadES5/input.ts.json index 588d0f3dd71d..0db85a4bb9a8 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/newWithSpreadES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/newWithSpreadES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -73,6 +72,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -89,8 +89,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -121,8 +120,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -182,7 +181,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -215,8 +213,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -281,7 +279,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -311,7 +308,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -349,6 +345,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -365,8 +362,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -376,6 +372,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -392,8 +389,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -415,8 +411,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -466,7 +462,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -492,7 +487,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -512,6 +506,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -528,8 +523,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -548,6 +542,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -564,8 +559,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -596,8 +590,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -661,7 +655,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -723,7 +716,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } } @@ -748,7 +740,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -805,7 +796,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } } @@ -840,6 +830,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -864,8 +855,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -897,6 +887,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -919,13 +910,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -957,6 +946,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -979,13 +969,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1017,6 +1005,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1046,14 +1035,12 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1085,6 +1072,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1111,6 +1099,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1127,8 +1116,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1153,7 +1141,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1168,8 +1155,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1201,6 +1187,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1230,14 +1217,12 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1269,6 +1254,7 @@ "ctxt": 0 }, "value": "h", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1295,6 +1281,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1311,8 +1298,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1337,7 +1323,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1352,8 +1337,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1385,6 +1369,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1421,15 +1406,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1458,7 +1441,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1529,7 +1511,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1571,7 +1552,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1601,7 +1581,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1643,7 +1622,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1690,7 +1668,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1708,7 +1685,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1726,7 +1702,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1756,7 +1731,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1798,7 +1772,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1816,7 +1789,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1853,7 +1825,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1934,7 +1905,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1976,7 +1946,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2016,7 +1985,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2058,7 +2026,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2115,7 +2082,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2126,7 +2092,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2206,7 +2171,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2217,7 +2181,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2261,7 +2224,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2298,7 +2260,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2309,7 +2270,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2353,7 +2313,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2414,7 +2373,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2425,7 +2383,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2513,7 +2470,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2524,7 +2480,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2569,7 +2524,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2613,7 +2567,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2624,7 +2577,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2669,7 +2621,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2730,7 +2681,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -2752,7 +2702,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2839,7 +2788,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -2861,7 +2809,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2905,7 +2852,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2949,7 +2895,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -2971,7 +2916,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3015,7 +2959,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3076,7 +3019,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "property": { @@ -3103,7 +3045,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3190,7 +3131,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "property": { @@ -3217,7 +3157,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3261,7 +3200,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3305,7 +3243,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "property": { @@ -3332,7 +3269,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3376,7 +3312,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3423,7 +3358,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3494,7 +3428,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3536,7 +3469,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3566,7 +3498,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3608,7 +3539,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3662,7 +3592,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3756,7 +3685,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3814,7 +3742,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3851,7 +3778,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3909,7 +3835,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3970,7 +3895,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4072,7 +3996,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4131,7 +4054,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4175,7 +4097,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4234,7 +4155,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4295,7 +4215,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "property": { @@ -4407,7 +4326,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "property": { @@ -4476,7 +4394,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4520,7 +4437,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "property": { @@ -4589,7 +4505,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4650,7 +4565,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "property": { @@ -4767,7 +4681,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "property": { @@ -4841,7 +4754,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4885,7 +4797,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "property": { @@ -4959,7 +4870,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -5020,7 +4930,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -5132,7 +5041,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -5201,7 +5109,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -5245,7 +5152,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -5314,7 +5220,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/newWithSpreadES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/newWithSpreadES6/input.ts.json index 8e66a3d2641a..19cd57627130 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/newWithSpreadES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/newWithSpreadES6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -73,6 +72,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -89,8 +89,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -121,8 +120,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -182,7 +181,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -215,8 +213,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -281,7 +279,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -311,7 +308,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -349,6 +345,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -365,8 +362,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -376,6 +372,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -392,8 +389,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -415,8 +411,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -466,7 +462,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -492,7 +487,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -512,6 +506,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -528,8 +523,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -548,6 +542,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -564,8 +559,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -596,8 +590,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -661,7 +655,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -723,7 +716,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } } @@ -748,7 +740,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -805,7 +796,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } } @@ -840,6 +830,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -864,8 +855,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -897,6 +887,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -919,13 +910,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -957,6 +946,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -979,13 +969,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1017,6 +1005,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1046,14 +1035,12 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1085,6 +1072,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1111,6 +1099,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1127,8 +1116,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1153,7 +1141,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1168,8 +1155,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1201,6 +1187,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1230,14 +1217,12 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1269,6 +1254,7 @@ "ctxt": 0 }, "value": "h", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1295,6 +1281,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1311,8 +1298,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1337,7 +1323,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1352,8 +1337,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1385,6 +1369,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1421,15 +1406,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1458,7 +1441,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1529,7 +1511,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1571,7 +1552,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1601,7 +1581,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1643,7 +1622,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1690,7 +1668,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1708,7 +1685,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1726,7 +1702,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1756,7 +1731,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1798,7 +1772,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1816,7 +1789,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1853,7 +1825,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1934,7 +1905,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1976,7 +1946,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2016,7 +1985,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2058,7 +2026,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2115,7 +2082,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2126,7 +2092,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2206,7 +2171,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2217,7 +2181,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2261,7 +2224,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2298,7 +2260,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2309,7 +2270,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2353,7 +2313,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2414,7 +2373,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2425,7 +2383,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2513,7 +2470,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2524,7 +2480,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2569,7 +2524,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2613,7 +2567,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2624,7 +2577,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2669,7 +2621,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2730,7 +2681,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -2752,7 +2702,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2839,7 +2788,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -2861,7 +2809,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2905,7 +2852,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2949,7 +2895,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -2971,7 +2916,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3015,7 +2959,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3076,7 +3019,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "property": { @@ -3103,7 +3045,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3190,7 +3131,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "property": { @@ -3217,7 +3157,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3261,7 +3200,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3305,7 +3243,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "property": { @@ -3332,7 +3269,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3376,7 +3312,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3423,7 +3358,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3494,7 +3428,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3536,7 +3469,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3566,7 +3498,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3608,7 +3539,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3662,7 +3592,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3756,7 +3685,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3814,7 +3742,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3851,7 +3778,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3909,7 +3835,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3970,7 +3895,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4072,7 +3996,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4131,7 +4054,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4175,7 +4097,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4234,7 +4155,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4295,7 +4215,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "property": { @@ -4407,7 +4326,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "property": { @@ -4476,7 +4394,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4520,7 +4437,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "property": { @@ -4589,7 +4505,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4650,7 +4565,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "property": { @@ -4767,7 +4681,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "property": { @@ -4841,7 +4754,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4885,7 +4797,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "property": { @@ -4959,7 +4870,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -5020,7 +4930,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -5132,7 +5041,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -5201,7 +5109,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -5245,7 +5152,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -5314,7 +5220,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/overloadResolution/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/overloadResolution/input.ts.json index 29a88d22f790..ce4a6f4f1757 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/overloadResolution/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/overloadResolution/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "SomeBase", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": null, @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": null, @@ -120,7 +117,6 @@ "ctxt": 0 }, "value": "SomeDerived1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": null, @@ -170,7 +165,6 @@ "ctxt": 0 }, "value": "SomeBase", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -188,7 +182,6 @@ "ctxt": 0 }, "value": "SomeDerived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -214,7 +207,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": null, @@ -238,7 +230,6 @@ "ctxt": 0 }, "value": "SomeBase", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -256,7 +247,6 @@ "ctxt": 0 }, "value": "SomeDerived3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -282,7 +272,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": null, @@ -306,7 +295,6 @@ "ctxt": 0 }, "value": "SomeBase", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -324,7 +312,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -345,6 +332,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -361,8 +349,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -404,7 +391,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -425,6 +411,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -441,8 +428,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -484,7 +470,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -551,8 +536,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -569,7 +554,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -583,7 +567,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -619,6 +602,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -635,8 +619,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -665,7 +648,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -695,7 +677,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -716,6 +697,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -732,8 +714,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -752,6 +733,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -768,8 +750,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -811,7 +792,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -832,6 +812,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -848,8 +829,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -868,6 +848,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -890,13 +871,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -932,7 +911,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -962,7 +940,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -979,7 +956,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1013,7 +989,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1049,8 +1024,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1067,7 +1042,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1093,7 +1067,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1121,7 +1094,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1158,6 +1130,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1180,13 +1153,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1218,8 +1189,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1236,7 +1207,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1298,7 +1268,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1355,7 +1324,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1386,7 +1354,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1433,7 +1400,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1454,6 +1420,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1476,13 +1443,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1518,7 +1483,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1554,7 +1518,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1575,6 +1538,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1591,8 +1555,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -1611,6 +1574,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1633,13 +1597,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1658,6 +1620,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1680,13 +1643,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1722,7 +1683,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1743,7 +1703,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1773,7 +1732,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1790,7 +1748,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1811,6 +1768,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1833,13 +1791,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1858,6 +1814,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1880,13 +1837,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1905,6 +1860,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1927,13 +1883,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1969,7 +1923,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1990,7 +1943,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2011,7 +1963,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2047,7 +1998,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2114,8 +2064,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2132,7 +2082,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2180,8 +2129,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2198,7 +2147,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2280,8 +2228,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2298,7 +2246,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2370,6 +2317,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2386,8 +2334,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2419,8 +2366,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2437,7 +2384,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2503,8 +2449,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2521,7 +2467,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2635,8 +2580,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2653,7 +2598,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2768,7 +2712,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2830,7 +2773,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2851,6 +2793,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2873,13 +2816,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2898,6 +2839,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2920,13 +2862,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2962,7 +2902,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2991,7 +2930,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3019,7 +2957,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3040,6 +2977,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3062,13 +3000,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3087,6 +3023,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3109,13 +3046,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3151,7 +3086,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3180,7 +3114,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3208,7 +3141,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3255,7 +3187,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3341,7 +3272,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3427,7 +3357,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3513,7 +3442,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3599,7 +3527,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3658,7 +3585,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3717,7 +3643,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3743,7 +3668,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -3773,7 +3697,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3831,7 +3754,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3890,7 +3812,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3921,7 +3842,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3974,7 +3894,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4015,7 +3934,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4036,6 +3954,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4059,6 +3978,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4075,8 +3995,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -4098,8 +4017,7 @@ } } } - }, - "optional": false + } } } ], @@ -4141,7 +4059,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4162,6 +4079,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4185,6 +4103,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4201,8 +4120,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -4224,8 +4142,7 @@ } } } - }, - "optional": false + } } } ], @@ -4267,7 +4184,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4301,7 +4217,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -4337,8 +4252,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4355,7 +4270,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4377,8 +4291,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4403,7 +4317,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -4414,7 +4327,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4460,8 +4372,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4478,7 +4390,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4500,8 +4411,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4526,7 +4437,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -4537,7 +4447,6 @@ "ctxt": 0 }, "value": "substr", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/overloadResolutionClassConstructors/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/overloadResolutionClassConstructors/input.ts.json index 60789834eaed..ae057ce5dc11 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/overloadResolutionClassConstructors/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/overloadResolutionClassConstructors/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "SomeBase", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": null, @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": null, @@ -120,7 +117,6 @@ "ctxt": 0 }, "value": "SomeDerived1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": null, @@ -170,7 +165,6 @@ "ctxt": 0 }, "value": "SomeBase", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -188,7 +182,6 @@ "ctxt": 0 }, "value": "SomeDerived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -214,7 +207,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": null, @@ -238,7 +230,6 @@ "ctxt": 0 }, "value": "SomeBase", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -256,7 +247,6 @@ "ctxt": 0 }, "value": "SomeDerived3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -282,7 +272,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": null, @@ -306,7 +295,6 @@ "ctxt": 0 }, "value": "SomeBase", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -324,7 +312,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -350,7 +337,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -370,6 +356,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -386,8 +373,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -410,7 +396,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -430,6 +415,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -446,8 +432,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -470,7 +455,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -515,7 +499,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -529,7 +512,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -559,7 +541,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -589,7 +570,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -615,7 +595,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -635,6 +614,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -651,8 +631,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -671,6 +650,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -687,8 +667,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -711,7 +690,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -731,6 +709,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -747,8 +726,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -767,6 +745,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -789,13 +768,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -818,7 +795,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -860,7 +836,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -896,8 +871,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -914,7 +889,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -940,7 +914,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -968,7 +941,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1005,8 +977,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1023,7 +995,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1085,7 +1056,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1142,7 +1112,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1173,7 +1142,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1220,7 +1188,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1246,7 +1213,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1266,6 +1232,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1288,13 +1255,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1317,7 +1282,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1337,6 +1301,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1353,8 +1318,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -1373,6 +1337,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1395,13 +1360,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1420,6 +1383,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1442,13 +1406,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1471,7 +1433,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1491,6 +1452,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1513,13 +1475,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1538,6 +1498,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1560,13 +1521,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1585,6 +1544,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1607,13 +1567,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1636,7 +1594,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1678,7 +1635,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1699,7 +1655,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1720,7 +1675,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1753,7 +1707,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1795,7 +1748,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1871,7 +1823,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1937,7 +1888,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1997,7 +1947,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2105,7 +2054,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2217,7 +2165,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2279,7 +2226,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2305,7 +2251,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2325,6 +2270,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2347,13 +2293,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2372,6 +2316,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2394,13 +2339,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2423,7 +2366,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -2465,7 +2407,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2494,7 +2435,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2535,7 +2475,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2621,7 +2560,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2707,7 +2645,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2793,7 +2730,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2879,7 +2815,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2938,7 +2873,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2997,7 +2931,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3023,7 +2956,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -3053,7 +2985,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3111,7 +3042,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3170,7 +3100,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3201,7 +3130,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3254,7 +3182,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3295,7 +3222,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3321,7 +3247,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -3341,6 +3266,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3364,6 +3290,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3380,8 +3307,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -3403,8 +3329,7 @@ } } } - }, - "optional": false + } } } ], @@ -3427,7 +3352,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -3447,6 +3371,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3470,6 +3395,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3486,8 +3412,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -3509,8 +3434,7 @@ } } } - }, - "optional": false + } } } ], @@ -3533,7 +3457,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -3560,7 +3483,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -3598,7 +3520,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3620,8 +3541,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3646,7 +3567,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -3657,7 +3577,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3697,7 +3616,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3719,8 +3637,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3745,7 +3663,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -3756,7 +3673,6 @@ "ctxt": 0 }, "value": "substr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3809,7 +3725,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3831,8 +3746,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3850,7 +3765,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -3861,7 +3775,6 @@ "ctxt": 0 }, "value": "blah", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/overloadResolutionConstructors/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/overloadResolutionConstructors/input.ts.json index 07f1d83c869a..94f9ca2542c2 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/overloadResolutionConstructors/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/overloadResolutionConstructors/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "SomeBase", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": null, @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": null, @@ -120,7 +117,6 @@ "ctxt": 0 }, "value": "SomeDerived1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": null, @@ -170,7 +165,6 @@ "ctxt": 0 }, "value": "SomeBase", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -188,7 +182,6 @@ "ctxt": 0 }, "value": "SomeDerived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -214,7 +207,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": null, @@ -238,7 +230,6 @@ "ctxt": 0 }, "value": "SomeBase", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -256,7 +247,6 @@ "ctxt": 0 }, "value": "SomeDerived3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -282,7 +272,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": null, @@ -306,7 +295,6 @@ "ctxt": 0 }, "value": "SomeBase", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -329,7 +317,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -359,6 +346,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -375,8 +363,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -414,6 +401,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -430,8 +418,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -481,6 +468,7 @@ "ctxt": 0 }, "value": "fn1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -503,13 +491,11 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -541,8 +527,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -559,7 +545,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -573,7 +558,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -609,6 +593,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -625,8 +610,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -655,7 +639,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -690,7 +673,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -720,6 +702,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -736,8 +719,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -747,6 +729,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -763,8 +746,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -802,6 +784,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -818,8 +801,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -829,6 +811,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -851,13 +834,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -882,7 +863,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -911,7 +891,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -948,6 +927,7 @@ "ctxt": 0 }, "value": "fn2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -970,13 +950,11 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1008,8 +986,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1026,7 +1004,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1052,7 +1029,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1080,7 +1056,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1117,6 +1092,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1139,13 +1115,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1177,8 +1151,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1195,7 +1169,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1257,7 +1230,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1314,7 +1286,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1345,7 +1316,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1397,7 +1367,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1427,6 +1396,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1449,13 +1419,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1498,7 +1466,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1523,6 +1490,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1539,8 +1507,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1550,6 +1517,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1572,13 +1540,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1588,6 +1554,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1610,13 +1577,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1641,7 +1606,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1670,7 +1634,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1691,7 +1654,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1716,6 +1678,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1738,13 +1701,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1754,6 +1715,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1776,13 +1738,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1792,6 +1752,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1814,13 +1775,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1863,7 +1822,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1884,7 +1842,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1905,7 +1862,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1942,6 +1898,7 @@ "ctxt": 0 }, "value": "fn3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1964,13 +1921,11 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2002,8 +1957,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2020,7 +1975,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2068,8 +2022,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2086,7 +2040,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2168,8 +2121,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2186,7 +2139,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2258,6 +2210,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2274,8 +2227,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2307,8 +2259,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2325,7 +2277,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2391,8 +2342,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2409,7 +2360,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2523,8 +2473,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2541,7 +2491,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2656,7 +2605,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2723,7 +2671,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2753,6 +2700,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2775,13 +2723,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2791,6 +2737,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2813,13 +2760,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -2846,7 +2791,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2875,7 +2819,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2908,6 +2851,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2930,13 +2874,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2946,6 +2888,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2968,13 +2911,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -3001,7 +2942,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3030,7 +2970,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3075,6 +3014,7 @@ "ctxt": 0 }, "value": "fn4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3097,13 +3037,11 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3132,7 +3070,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3218,7 +3155,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3304,7 +3240,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3390,7 +3325,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3476,7 +3410,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3535,7 +3468,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3594,7 +3526,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3620,7 +3551,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -3650,7 +3580,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3708,7 +3637,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3767,7 +3695,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3798,7 +3725,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3851,7 +3777,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3897,7 +3822,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3927,6 +3851,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3950,6 +3875,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3966,8 +3892,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -3989,8 +3914,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4028,6 +3952,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4051,6 +3976,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4067,8 +3993,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -4090,8 +4015,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4141,6 +4065,7 @@ "ctxt": 0 }, "value": "fn5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4163,13 +4088,11 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -4201,8 +4124,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -4219,7 +4142,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4241,8 +4163,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4267,7 +4189,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -4278,7 +4199,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4324,8 +4244,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -4342,7 +4262,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4364,8 +4283,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4390,7 +4309,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -4401,7 +4319,6 @@ "ctxt": 0 }, "value": "substr", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/typeArgumentInference/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/typeArgumentInference/input.ts.json index c7370804f3c5..8369d889bbe7 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/typeArgumentInference/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/typeArgumentInference/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "noParams", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -61,7 +60,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "noParams", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -122,7 +119,6 @@ "ctxt": 0 }, "value": "noParams", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "noParams", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -204,7 +199,6 @@ "ctxt": 0 }, "value": "noGenericParams", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -225,6 +219,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -241,8 +236,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -286,7 +280,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -318,7 +311,6 @@ "ctxt": 0 }, "value": "noGenericParams", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -365,7 +357,6 @@ "ctxt": 0 }, "value": "noGenericParams", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -430,7 +421,6 @@ "ctxt": 0 }, "value": "noGenericParams", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -483,7 +473,6 @@ "ctxt": 0 }, "value": "someGenerics1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -504,6 +493,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -526,13 +516,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -551,6 +539,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -567,8 +556,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -612,7 +600,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -633,7 +620,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -665,7 +651,6 @@ "ctxt": 0 }, "value": "someGenerics1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -719,7 +704,6 @@ "ctxt": 0 }, "value": "someGenerics1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -788,7 +772,6 @@ "ctxt": 0 }, "value": "someGenerics2a", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -809,6 +792,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -832,6 +816,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -854,13 +839,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -882,8 +865,7 @@ } } } - }, - "optional": false + } } } ], @@ -927,7 +909,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -959,7 +940,6 @@ "ctxt": 0 }, "value": "someGenerics2a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -981,6 +961,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -997,8 +978,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -1009,7 +989,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1044,7 +1023,6 @@ "ctxt": 0 }, "value": "someGenerics2a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1066,6 +1044,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1082,8 +1061,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -1094,7 +1072,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1147,7 +1124,6 @@ "ctxt": 0 }, "value": "someGenerics2a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1169,8 +1145,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1195,7 +1171,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -1206,7 +1181,6 @@ "ctxt": 0 }, "value": "substr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1265,7 +1239,6 @@ "ctxt": 0 }, "value": "someGenerics2b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1286,6 +1259,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1309,6 +1283,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1331,13 +1306,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1347,6 +1320,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1369,13 +1343,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1397,8 +1369,7 @@ } } } - }, - "optional": false + } } } ], @@ -1442,7 +1413,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1463,7 +1433,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1495,7 +1464,6 @@ "ctxt": 0 }, "value": "someGenerics2b", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1517,6 +1485,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1533,8 +1502,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1544,6 +1512,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1560,8 +1529,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1572,7 +1540,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1607,7 +1574,6 @@ "ctxt": 0 }, "value": "someGenerics2b", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1629,6 +1595,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1645,8 +1612,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1656,6 +1622,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1672,8 +1639,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1684,7 +1650,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1746,7 +1711,6 @@ "ctxt": 0 }, "value": "someGenerics2b", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1768,8 +1732,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1779,8 +1743,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1805,7 +1769,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -1816,7 +1779,6 @@ "ctxt": 0 }, "value": "substr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1840,7 +1802,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1851,7 +1812,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -1906,7 +1866,6 @@ "ctxt": 0 }, "value": "someGenerics3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1927,6 +1886,7 @@ "ctxt": 0 }, "value": "producer", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1965,15 +1925,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -2017,7 +1975,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2049,7 +2006,6 @@ "ctxt": 0 }, "value": "someGenerics3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2109,7 +2065,6 @@ "ctxt": 0 }, "value": "someGenerics3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2131,7 +2086,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2164,7 +2118,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2195,7 +2148,6 @@ "ctxt": 0 }, "value": "someGenerics3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2256,7 +2208,6 @@ "ctxt": 0 }, "value": "someGenerics4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2277,6 +2228,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2299,13 +2251,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2324,6 +2274,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2347,6 +2298,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2369,13 +2321,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2397,8 +2347,7 @@ } } } - }, - "optional": false + } } } ], @@ -2442,7 +2391,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2463,7 +2411,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2495,7 +2442,6 @@ "ctxt": 0 }, "value": "someGenerics4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2561,7 +2507,6 @@ "ctxt": 0 }, "value": "someGenerics4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2660,7 +2605,6 @@ "ctxt": 0 }, "value": "someGenerics4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2727,7 +2671,6 @@ "ctxt": 0 }, "value": "someGenerics5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2748,6 +2691,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2770,13 +2714,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2795,6 +2737,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2818,6 +2761,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2840,13 +2784,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2868,8 +2810,7 @@ } } } - }, - "optional": false + } } } ], @@ -2913,7 +2854,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2934,7 +2874,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2966,7 +2905,6 @@ "ctxt": 0 }, "value": "someGenerics5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3032,7 +2970,6 @@ "ctxt": 0 }, "value": "someGenerics5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3131,7 +3068,6 @@ "ctxt": 0 }, "value": "someGenerics5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3198,7 +3134,6 @@ "ctxt": 0 }, "value": "someGenerics6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3219,6 +3154,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3242,6 +3178,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3264,13 +3201,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3296,15 +3231,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -3323,6 +3256,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3346,6 +3280,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3368,13 +3303,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3400,15 +3333,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -3427,6 +3358,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3450,6 +3382,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3472,13 +3405,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3504,15 +3435,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -3556,7 +3485,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3588,7 +3516,6 @@ "ctxt": 0 }, "value": "someGenerics6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3610,8 +3537,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3622,7 +3549,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3649,8 +3575,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3661,7 +3587,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3688,8 +3613,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3700,7 +3625,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3735,7 +3659,6 @@ "ctxt": 0 }, "value": "someGenerics6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3757,8 +3680,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3769,7 +3692,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3796,8 +3718,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3808,7 +3730,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3835,8 +3756,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3847,7 +3768,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3900,7 +3820,6 @@ "ctxt": 0 }, "value": "someGenerics6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3922,6 +3841,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3938,8 +3858,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -3950,7 +3869,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3977,6 +3895,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3993,8 +3912,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -4005,7 +3923,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4032,6 +3949,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4048,8 +3966,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -4060,7 +3977,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4101,7 +4017,6 @@ "ctxt": 0 }, "value": "someGenerics7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4122,6 +4037,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4145,6 +4061,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4167,13 +4084,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4199,15 +4114,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -4226,6 +4139,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4249,6 +4163,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4271,13 +4186,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4303,15 +4216,13 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -4330,6 +4241,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4353,6 +4265,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4375,13 +4288,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4407,15 +4318,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -4459,7 +4368,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4480,7 +4388,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4501,7 +4408,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4533,7 +4439,6 @@ "ctxt": 0 }, "value": "someGenerics7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4555,8 +4460,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4567,7 +4472,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4594,8 +4498,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4606,7 +4510,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4633,8 +4536,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4645,7 +4548,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4680,7 +4582,6 @@ "ctxt": 0 }, "value": "someGenerics7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4702,8 +4603,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4714,7 +4615,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4741,8 +4641,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4753,7 +4653,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4780,8 +4679,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4792,7 +4691,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4863,7 +4761,6 @@ "ctxt": 0 }, "value": "someGenerics7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4885,6 +4782,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4901,8 +4799,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -4913,7 +4810,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4940,6 +4836,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4956,8 +4853,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -4968,7 +4864,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4995,6 +4890,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5011,8 +4907,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -5023,7 +4918,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5082,7 +4976,6 @@ "ctxt": 0 }, "value": "someGenerics8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5103,6 +4996,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5125,13 +5019,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5164,7 +5056,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -5195,7 +5086,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5225,7 +5115,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5257,8 +5146,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5275,7 +5164,6 @@ "ctxt": 0 }, "value": "someGenerics8", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5289,7 +5177,6 @@ "ctxt": 0 }, "value": "someGenerics7", - "typeAnnotation": null, "optional": false } } @@ -5322,7 +5209,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5409,7 +5295,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5430,6 +5315,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5452,13 +5338,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -5477,6 +5361,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5499,13 +5384,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -5524,6 +5407,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5546,13 +5430,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5613,7 +5495,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5643,7 +5524,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5675,8 +5555,8 @@ "ctxt": 0 }, "value": "a9a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5693,7 +5573,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5770,6 +5649,7 @@ "ctxt": 0 }, "value": "a9a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5786,8 +5666,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -5819,8 +5698,8 @@ "ctxt": 0 }, "value": "a9b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5837,7 +5716,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5861,7 +5739,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -5897,7 +5774,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -5962,7 +5838,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6004,7 +5879,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6064,6 +5938,7 @@ "ctxt": 0 }, "value": "a9b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6095,7 +5970,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6137,7 +6011,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6165,8 +6038,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -6188,7 +6060,6 @@ "ctxt": 0 }, "value": "A91", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6218,7 +6089,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6260,7 +6130,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6304,7 +6173,6 @@ "ctxt": 0 }, "value": "A92", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6334,7 +6202,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6376,7 +6243,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6405,7 +6271,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6441,8 +6306,8 @@ "ctxt": 0 }, "value": "a9e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6459,7 +6324,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6473,7 +6337,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -6497,7 +6360,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -6520,7 +6382,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -6538,7 +6399,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -6568,7 +6428,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -6591,7 +6450,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -6644,6 +6502,7 @@ "ctxt": 0 }, "value": "a9e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6660,8 +6519,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -6693,8 +6551,8 @@ "ctxt": 0 }, "value": "a9f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6711,7 +6569,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6725,7 +6582,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -6749,7 +6605,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -6772,7 +6627,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -6790,7 +6644,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -6820,7 +6673,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -6843,7 +6695,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -6888,7 +6739,6 @@ "ctxt": 0 }, "value": "A92", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6925,6 +6775,7 @@ "ctxt": 0 }, "value": "a9f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6947,13 +6798,11 @@ "ctxt": 0 }, "value": "A92", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -6985,8 +6834,8 @@ "ctxt": 0 }, "value": "a9d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7003,7 +6852,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7027,7 +6875,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -7063,7 +6910,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -7099,7 +6945,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -7147,6 +6992,7 @@ "ctxt": 0 }, "value": "a9d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7178,7 +7024,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7206,8 +7051,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -7239,6 +7083,7 @@ "ctxt": 0 }, "value": "anyVar", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7255,8 +7100,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -7288,8 +7132,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7306,7 +7150,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7332,7 +7175,6 @@ "ctxt": 0 }, "value": "anyVar", - "typeAnnotation": null, "optional": false } }, @@ -7380,6 +7222,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7396,8 +7239,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -7429,8 +7271,8 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7447,7 +7289,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7484,7 +7325,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -7520,6 +7360,7 @@ "ctxt": 0 }, "value": "arr", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7544,8 +7385,7 @@ "kind": "any" } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/typeArgumentInferenceConstructSignatures/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/typeArgumentInferenceConstructSignatures/input.ts.json index 8a6c8eeb0cc9..8349e7570f65 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/typeArgumentInferenceConstructSignatures/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/typeArgumentInferenceConstructSignatures/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "NoParams", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -67,7 +66,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -104,6 +102,7 @@ "ctxt": 0 }, "value": "noParams", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -126,13 +125,11 @@ "ctxt": 0 }, "value": "NoParams", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -161,7 +158,6 @@ "ctxt": 0 }, "value": "noParams", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -190,7 +186,6 @@ "ctxt": 0 }, "value": "noParams", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -237,7 +232,6 @@ "ctxt": 0 }, "value": "noParams", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -277,7 +271,6 @@ "ctxt": 0 }, "value": "noGenericParams", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -307,6 +300,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -323,8 +317,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -351,7 +344,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -388,6 +380,7 @@ "ctxt": 0 }, "value": "noGenericParams", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -410,13 +403,11 @@ "ctxt": 0 }, "value": "noGenericParams", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -445,7 +436,6 @@ "ctxt": 0 }, "value": "noGenericParams", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -492,7 +482,6 @@ "ctxt": 0 }, "value": "noGenericParams", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -557,7 +546,6 @@ "ctxt": 0 }, "value": "noGenericParams", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -615,7 +603,6 @@ "ctxt": 0 }, "value": "someGenerics1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -645,6 +632,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -667,13 +655,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -683,6 +669,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -699,8 +686,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -727,7 +713,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -748,7 +733,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -785,6 +769,7 @@ "ctxt": 0 }, "value": "someGenerics1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -807,13 +792,11 @@ "ctxt": 0 }, "value": "someGenerics1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -842,7 +825,6 @@ "ctxt": 0 }, "value": "someGenerics1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -896,7 +878,6 @@ "ctxt": 0 }, "value": "someGenerics1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -977,7 +958,6 @@ "ctxt": 0 }, "value": "someGenerics1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1051,7 +1031,6 @@ "ctxt": 0 }, "value": "someGenerics2a", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1081,6 +1060,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1104,6 +1084,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1126,13 +1107,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1154,8 +1133,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -1182,7 +1160,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1219,6 +1196,7 @@ "ctxt": 0 }, "value": "someGenerics2a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1241,13 +1219,11 @@ "ctxt": 0 }, "value": "someGenerics2a", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1276,7 +1252,6 @@ "ctxt": 0 }, "value": "someGenerics2a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1298,6 +1273,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1314,8 +1290,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -1326,7 +1301,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1361,7 +1335,6 @@ "ctxt": 0 }, "value": "someGenerics2a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1383,6 +1356,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1399,8 +1373,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -1411,7 +1384,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1464,7 +1436,6 @@ "ctxt": 0 }, "value": "someGenerics2a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1486,8 +1457,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1512,7 +1483,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -1523,7 +1493,6 @@ "ctxt": 0 }, "value": "substr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1587,7 +1556,6 @@ "ctxt": 0 }, "value": "someGenerics2b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1617,6 +1585,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1640,6 +1609,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1662,13 +1632,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1678,6 +1646,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1700,13 +1669,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1728,8 +1695,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -1756,7 +1722,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1777,7 +1742,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1814,6 +1778,7 @@ "ctxt": 0 }, "value": "someGenerics2b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1836,13 +1801,11 @@ "ctxt": 0 }, "value": "someGenerics2b", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1871,7 +1834,6 @@ "ctxt": 0 }, "value": "someGenerics2b", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1893,6 +1855,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1909,8 +1872,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1920,6 +1882,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1936,8 +1899,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1948,7 +1910,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1983,7 +1944,6 @@ "ctxt": 0 }, "value": "someGenerics2b", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2005,6 +1965,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2021,8 +1982,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2032,6 +1992,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2048,8 +2009,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -2060,7 +2020,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2122,7 +2081,6 @@ "ctxt": 0 }, "value": "someGenerics2b", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2144,8 +2102,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2155,8 +2113,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2181,7 +2139,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -2192,7 +2149,6 @@ "ctxt": 0 }, "value": "substr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2216,7 +2172,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2227,7 +2182,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -2287,7 +2241,6 @@ "ctxt": 0 }, "value": "someGenerics3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2317,6 +2270,7 @@ "ctxt": 0 }, "value": "producer", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2355,15 +2309,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -2390,7 +2342,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2427,6 +2378,7 @@ "ctxt": 0 }, "value": "someGenerics3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2449,13 +2401,11 @@ "ctxt": 0 }, "value": "someGenerics3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2484,7 +2434,6 @@ "ctxt": 0 }, "value": "someGenerics3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2544,7 +2493,6 @@ "ctxt": 0 }, "value": "someGenerics3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2566,7 +2514,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2599,7 +2546,6 @@ "ctxt": 0 }, "value": "Window", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2630,7 +2576,6 @@ "ctxt": 0 }, "value": "someGenerics3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2696,7 +2641,6 @@ "ctxt": 0 }, "value": "someGenerics4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2726,6 +2670,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2748,13 +2693,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2764,6 +2707,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2787,6 +2731,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2809,13 +2754,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2837,8 +2780,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -2865,7 +2807,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2886,7 +2827,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2923,6 +2863,7 @@ "ctxt": 0 }, "value": "someGenerics4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2945,13 +2886,11 @@ "ctxt": 0 }, "value": "someGenerics4", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2980,7 +2919,6 @@ "ctxt": 0 }, "value": "someGenerics4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3046,7 +2984,6 @@ "ctxt": 0 }, "value": "someGenerics4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3145,7 +3082,6 @@ "ctxt": 0 }, "value": "someGenerics4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3184,6 +3120,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3200,8 +3137,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -3277,7 +3213,6 @@ "ctxt": 0 }, "value": "someGenerics4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3349,7 +3284,6 @@ "ctxt": 0 }, "value": "someGenerics5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3379,6 +3313,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3401,13 +3336,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -3417,6 +3350,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3440,6 +3374,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3462,13 +3397,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3490,8 +3423,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -3518,7 +3450,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3539,7 +3470,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3576,6 +3506,7 @@ "ctxt": 0 }, "value": "someGenerics5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3598,13 +3529,11 @@ "ctxt": 0 }, "value": "someGenerics5", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3633,7 +3562,6 @@ "ctxt": 0 }, "value": "someGenerics5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3699,7 +3627,6 @@ "ctxt": 0 }, "value": "someGenerics5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3798,7 +3725,6 @@ "ctxt": 0 }, "value": "someGenerics5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3837,6 +3763,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3853,8 +3780,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -3930,7 +3856,6 @@ "ctxt": 0 }, "value": "someGenerics5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4002,7 +3927,6 @@ "ctxt": 0 }, "value": "someGenerics6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4032,6 +3956,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4055,6 +3980,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4077,13 +4003,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4109,15 +4033,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -4127,6 +4049,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4150,6 +4073,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4172,13 +4096,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4204,15 +4126,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -4222,6 +4142,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4245,6 +4166,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4267,13 +4189,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4299,15 +4219,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -4334,7 +4252,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4371,6 +4288,7 @@ "ctxt": 0 }, "value": "someGenerics6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4393,13 +4311,11 @@ "ctxt": 0 }, "value": "someGenerics6", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -4428,7 +4344,6 @@ "ctxt": 0 }, "value": "someGenerics6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4450,8 +4365,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4462,7 +4377,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4489,8 +4403,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4501,7 +4415,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4528,8 +4441,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4540,7 +4453,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4575,7 +4487,6 @@ "ctxt": 0 }, "value": "someGenerics6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4597,8 +4508,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4609,7 +4520,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4636,8 +4546,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4648,7 +4558,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4675,8 +4584,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4687,7 +4596,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4740,7 +4648,6 @@ "ctxt": 0 }, "value": "someGenerics6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4762,6 +4669,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4778,8 +4686,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -4790,7 +4697,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4817,6 +4723,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4833,8 +4740,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -4845,7 +4751,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4872,6 +4777,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4888,8 +4794,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -4900,7 +4805,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4953,7 +4857,6 @@ "ctxt": 0 }, "value": "someGenerics6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4975,6 +4878,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4991,8 +4895,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -5003,7 +4906,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5030,6 +4932,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5046,8 +4949,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -5058,7 +4960,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5085,6 +4986,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5101,8 +5003,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -5113,7 +5014,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5159,7 +5059,6 @@ "ctxt": 0 }, "value": "someGenerics7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5189,6 +5088,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5212,6 +5112,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5234,13 +5135,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5266,15 +5165,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -5284,6 +5181,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5307,6 +5205,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5329,13 +5228,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5361,15 +5258,13 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -5379,6 +5274,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5402,6 +5298,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5424,13 +5321,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5456,15 +5351,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -5491,7 +5384,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5512,7 +5404,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5533,7 +5424,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5570,6 +5460,7 @@ "ctxt": 0 }, "value": "someGenerics7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5592,13 +5483,11 @@ "ctxt": 0 }, "value": "someGenerics7", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -5627,7 +5516,6 @@ "ctxt": 0 }, "value": "someGenerics7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5649,8 +5537,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5661,7 +5549,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5688,8 +5575,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5700,7 +5587,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5727,8 +5613,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5739,7 +5625,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5774,7 +5659,6 @@ "ctxt": 0 }, "value": "someGenerics7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5796,8 +5680,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5808,7 +5692,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5835,8 +5718,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5847,7 +5730,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5874,8 +5756,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5886,7 +5768,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5957,7 +5838,6 @@ "ctxt": 0 }, "value": "someGenerics7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5979,6 +5859,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5995,8 +5876,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -6007,7 +5887,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -6034,6 +5913,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6050,8 +5930,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -6062,7 +5941,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -6089,6 +5967,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6105,8 +5984,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -6117,7 +5995,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -6181,7 +6058,6 @@ "ctxt": 0 }, "value": "someGenerics8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6211,6 +6087,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6233,13 +6110,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -6264,7 +6139,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6293,7 +6167,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6330,6 +6203,7 @@ "ctxt": 0 }, "value": "someGenerics8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6352,13 +6226,11 @@ "ctxt": 0 }, "value": "someGenerics8", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -6390,8 +6262,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -6408,7 +6280,6 @@ "ctxt": 0 }, "value": "someGenerics8", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6422,7 +6293,6 @@ "ctxt": 0 }, "value": "someGenerics7", - "typeAnnotation": null, "optional": false } } @@ -6455,7 +6325,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6547,7 +6416,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6577,6 +6445,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6599,13 +6468,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -6615,6 +6482,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6637,13 +6505,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -6653,6 +6519,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6675,13 +6542,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -6706,7 +6571,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6735,7 +6599,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6772,6 +6635,7 @@ "ctxt": 0 }, "value": "someGenerics9", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6794,13 +6658,11 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -6832,8 +6694,8 @@ "ctxt": 0 }, "value": "a9a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -6850,7 +6712,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6927,6 +6788,7 @@ "ctxt": 0 }, "value": "a9a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6943,8 +6805,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -6976,8 +6837,8 @@ "ctxt": 0 }, "value": "a9b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -6994,7 +6855,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7018,7 +6878,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -7054,7 +6913,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -7119,7 +6977,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7161,7 +7018,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7221,6 +7077,7 @@ "ctxt": 0 }, "value": "a9b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7252,7 +7109,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7294,7 +7150,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7322,8 +7177,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -7345,7 +7199,6 @@ "ctxt": 0 }, "value": "A91", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7375,7 +7228,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7417,7 +7269,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7461,7 +7312,6 @@ "ctxt": 0 }, "value": "A92", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7491,7 +7341,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7533,7 +7382,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7562,7 +7410,6 @@ "ctxt": 0 }, "value": "Window", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7598,8 +7445,8 @@ "ctxt": 0 }, "value": "a9e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -7616,7 +7463,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7630,7 +7476,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -7654,7 +7499,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -7677,7 +7521,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -7688,7 +7531,6 @@ "ctxt": 0 }, "value": "window", - "typeAnnotation": null, "optional": false } } @@ -7715,7 +7557,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -7738,7 +7579,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -7791,6 +7631,7 @@ "ctxt": 0 }, "value": "a9e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7807,8 +7648,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -7840,8 +7680,8 @@ "ctxt": 0 }, "value": "a9f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -7858,7 +7698,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7872,7 +7711,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -7896,7 +7734,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -7919,7 +7756,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -7930,7 +7766,6 @@ "ctxt": 0 }, "value": "window", - "typeAnnotation": null, "optional": false } } @@ -7957,7 +7792,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -7980,7 +7814,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -8025,7 +7858,6 @@ "ctxt": 0 }, "value": "A92", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8062,6 +7894,7 @@ "ctxt": 0 }, "value": "a9f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8084,13 +7917,11 @@ "ctxt": 0 }, "value": "A92", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -8122,8 +7953,8 @@ "ctxt": 0 }, "value": "a9d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -8140,7 +7971,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8164,7 +7994,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -8200,7 +8029,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -8236,7 +8064,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -8284,6 +8111,7 @@ "ctxt": 0 }, "value": "a9d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8315,7 +8143,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8343,8 +8170,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -8376,6 +8202,7 @@ "ctxt": 0 }, "value": "anyVar", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8392,8 +8219,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -8425,8 +8251,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -8443,7 +8269,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8469,7 +8294,6 @@ "ctxt": 0 }, "value": "anyVar", - "typeAnnotation": null, "optional": false } }, @@ -8517,6 +8341,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8533,8 +8358,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -8566,8 +8390,8 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -8584,7 +8408,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8621,7 +8444,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -8657,6 +8479,7 @@ "ctxt": 0 }, "value": "arr", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8681,8 +8504,7 @@ "kind": "any" } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/typeArgumentInferenceErrors/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/typeArgumentInferenceErrors/input.ts.json index 7914dddab66c..3aede18300ca 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/typeArgumentInferenceErrors/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/typeArgumentInferenceErrors/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "someGenerics1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -100,8 +99,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -145,7 +143,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -166,7 +163,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -198,7 +194,6 @@ "ctxt": 0 }, "value": "someGenerics1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -267,7 +262,6 @@ "ctxt": 0 }, "value": "someGenerics4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -288,6 +282,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -310,13 +305,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -335,6 +328,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -358,6 +352,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -380,13 +375,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -408,8 +401,7 @@ } } } - }, - "optional": false + } } } ], @@ -453,7 +445,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -474,7 +465,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -506,7 +496,6 @@ "ctxt": 0 }, "value": "someGenerics4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -545,6 +534,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -561,8 +551,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -626,7 +615,6 @@ "ctxt": 0 }, "value": "someGenerics5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -647,6 +635,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -669,13 +658,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -694,6 +681,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -717,6 +705,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -739,13 +728,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -767,8 +754,7 @@ } } } - }, - "optional": false + } } } ], @@ -812,7 +798,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -833,7 +818,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -865,7 +849,6 @@ "ctxt": 0 }, "value": "someGenerics5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -904,6 +887,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -920,8 +904,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -985,7 +968,6 @@ "ctxt": 0 }, "value": "someGenerics6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1006,6 +988,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1029,6 +1012,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1051,13 +1035,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1083,15 +1065,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -1110,6 +1090,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1133,6 +1114,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1155,13 +1137,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1187,15 +1167,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -1214,6 +1192,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1237,6 +1216,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1259,13 +1239,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1291,15 +1269,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -1343,7 +1319,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1375,7 +1350,6 @@ "ctxt": 0 }, "value": "someGenerics6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1397,6 +1371,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1413,8 +1388,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1425,7 +1399,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1452,6 +1425,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1468,8 +1442,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -1480,7 +1453,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1507,6 +1479,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1523,8 +1496,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1535,7 +1507,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/typeArgumentInferenceTransitiveConstraints/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/typeArgumentInferenceTransitiveConstraints/input.ts.json index 75b9413f1b35..893daf7c40cb 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/typeArgumentInferenceTransitiveConstraints/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/typeArgumentInferenceTransitiveConstraints/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -106,13 +105,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -131,6 +128,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -153,13 +151,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -202,7 +198,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -216,7 +211,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -230,7 +224,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -264,7 +257,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -282,7 +274,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -304,7 +295,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -322,7 +312,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -344,7 +333,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -362,7 +350,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -398,8 +385,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -416,7 +403,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -437,7 +423,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -461,7 +446,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -485,7 +469,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -524,6 +507,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -553,14 +537,12 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/typeArgumentInferenceWithConstraints/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/typeArgumentInferenceWithConstraints/input.ts.json index 284a4348a1a8..6726a9bfe893 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/typeArgumentInferenceWithConstraints/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/typeArgumentInferenceWithConstraints/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "noParams", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -61,7 +60,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -101,7 +99,6 @@ "ctxt": 0 }, "value": "noParams", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -130,7 +127,6 @@ "ctxt": 0 }, "value": "noParams", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -177,7 +173,6 @@ "ctxt": 0 }, "value": "noParams", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -212,7 +207,6 @@ "ctxt": 0 }, "value": "noGenericParams", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -233,6 +227,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -249,8 +244,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -294,7 +288,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -334,7 +327,6 @@ "ctxt": 0 }, "value": "noGenericParams", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -381,7 +373,6 @@ "ctxt": 0 }, "value": "noGenericParams", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -446,7 +437,6 @@ "ctxt": 0 }, "value": "noGenericParams", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -499,7 +489,6 @@ "ctxt": 0 }, "value": "someGenerics1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -520,6 +509,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -542,13 +532,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -567,6 +555,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +572,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -628,7 +616,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -649,7 +636,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -667,7 +653,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -700,7 +685,6 @@ "ctxt": 0 }, "value": "someGenerics1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -754,7 +738,6 @@ "ctxt": 0 }, "value": "someGenerics1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -835,7 +818,6 @@ "ctxt": 0 }, "value": "someGenerics1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -916,7 +898,6 @@ "ctxt": 0 }, "value": "someGenerics1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -985,7 +966,6 @@ "ctxt": 0 }, "value": "someGenerics2a", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1006,6 +986,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1029,6 +1010,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1051,13 +1033,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1079,8 +1059,7 @@ } } } - }, - "optional": false + } } } ], @@ -1124,7 +1103,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1164,7 +1142,6 @@ "ctxt": 0 }, "value": "someGenerics2a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1186,6 +1163,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1202,8 +1180,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -1214,7 +1191,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1249,7 +1225,6 @@ "ctxt": 0 }, "value": "someGenerics2a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1271,6 +1246,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1287,8 +1263,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -1299,7 +1274,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1352,7 +1326,6 @@ "ctxt": 0 }, "value": "someGenerics2a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1374,8 +1347,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1400,7 +1373,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -1411,7 +1383,6 @@ "ctxt": 0 }, "value": "substr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1470,7 +1441,6 @@ "ctxt": 0 }, "value": "someGenerics2b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1491,6 +1461,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1514,6 +1485,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1536,13 +1508,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1552,6 +1522,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1574,13 +1545,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1602,8 +1571,7 @@ } } } - }, - "optional": false + } } } ], @@ -1647,7 +1615,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1676,7 +1643,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1716,7 +1682,6 @@ "ctxt": 0 }, "value": "someGenerics2b", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1738,6 +1703,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1754,8 +1720,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1765,6 +1730,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1781,8 +1747,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1793,7 +1758,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1828,7 +1792,6 @@ "ctxt": 0 }, "value": "someGenerics2b", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1850,6 +1813,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1866,8 +1830,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1877,6 +1840,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1893,8 +1857,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1905,7 +1868,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1967,7 +1929,6 @@ "ctxt": 0 }, "value": "someGenerics2b", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1989,8 +1950,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2000,8 +1961,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2026,7 +1987,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -2037,7 +1997,6 @@ "ctxt": 0 }, "value": "substr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2061,7 +2020,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -2072,7 +2030,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -2127,7 +2084,6 @@ "ctxt": 0 }, "value": "someGenerics3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2148,6 +2104,7 @@ "ctxt": 0 }, "value": "producer", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2186,15 +2143,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -2238,7 +2193,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2256,7 +2210,6 @@ "ctxt": 0 }, "value": "Window", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2289,7 +2242,6 @@ "ctxt": 0 }, "value": "someGenerics3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2349,7 +2301,6 @@ "ctxt": 0 }, "value": "someGenerics3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2371,7 +2322,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2404,7 +2354,6 @@ "ctxt": 0 }, "value": "Window", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2435,7 +2384,6 @@ "ctxt": 0 }, "value": "someGenerics3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2496,7 +2444,6 @@ "ctxt": 0 }, "value": "someGenerics4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2517,6 +2464,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2539,13 +2487,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2564,6 +2510,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2587,6 +2534,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2609,13 +2557,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2637,8 +2583,7 @@ } } } - }, - "optional": false + } } } ], @@ -2682,7 +2627,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2703,7 +2647,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2743,7 +2686,6 @@ "ctxt": 0 }, "value": "someGenerics4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2809,7 +2751,6 @@ "ctxt": 0 }, "value": "someGenerics4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2908,7 +2849,6 @@ "ctxt": 0 }, "value": "someGenerics4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2947,6 +2887,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2963,8 +2904,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -3040,7 +2980,6 @@ "ctxt": 0 }, "value": "someGenerics4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3107,7 +3046,6 @@ "ctxt": 0 }, "value": "someGenerics5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3128,6 +3066,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3150,13 +3089,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3175,6 +3112,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3198,6 +3136,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3220,13 +3159,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3248,8 +3185,7 @@ } } } - }, - "optional": false + } } } ], @@ -3293,7 +3229,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3322,7 +3257,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3354,7 +3288,6 @@ "ctxt": 0 }, "value": "someGenerics5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3420,7 +3353,6 @@ "ctxt": 0 }, "value": "someGenerics5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3519,7 +3451,6 @@ "ctxt": 0 }, "value": "someGenerics5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3558,6 +3489,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3574,8 +3506,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -3651,7 +3582,6 @@ "ctxt": 0 }, "value": "someGenerics5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3718,7 +3648,6 @@ "ctxt": 0 }, "value": "someGenerics6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3739,6 +3668,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3762,6 +3692,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3784,13 +3715,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3816,15 +3745,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -3843,6 +3770,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3866,6 +3794,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3888,13 +3817,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3920,15 +3847,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -3947,6 +3872,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3970,6 +3896,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3992,13 +3919,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4024,15 +3949,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -4076,7 +3999,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4116,7 +4038,6 @@ "ctxt": 0 }, "value": "someGenerics6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4138,8 +4059,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4150,7 +4071,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4177,8 +4097,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4189,7 +4109,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4216,8 +4135,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4228,7 +4147,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4263,7 +4181,6 @@ "ctxt": 0 }, "value": "someGenerics6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4285,8 +4202,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4297,7 +4214,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4324,8 +4240,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4336,7 +4252,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4363,8 +4278,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4375,7 +4290,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4428,7 +4342,6 @@ "ctxt": 0 }, "value": "someGenerics6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4450,6 +4363,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4466,8 +4380,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -4478,7 +4391,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4505,6 +4417,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4521,8 +4434,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -4533,7 +4445,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4560,6 +4471,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4576,8 +4488,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -4588,7 +4499,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4641,7 +4551,6 @@ "ctxt": 0 }, "value": "someGenerics6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4663,6 +4572,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4679,8 +4589,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -4691,7 +4600,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4718,6 +4626,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4734,8 +4643,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -4746,7 +4654,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4773,6 +4680,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4789,8 +4697,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -4801,7 +4708,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4842,7 +4748,6 @@ "ctxt": 0 }, "value": "someGenerics7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4863,6 +4768,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4886,6 +4792,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4908,13 +4815,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4940,15 +4845,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -4967,6 +4870,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4990,6 +4894,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5012,13 +4917,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5044,15 +4947,13 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -5071,6 +4972,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5094,6 +4996,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5116,13 +5019,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5148,15 +5049,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -5200,7 +5099,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5221,7 +5119,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5250,7 +5147,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5282,7 +5178,6 @@ "ctxt": 0 }, "value": "someGenerics7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5304,8 +5199,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5316,7 +5211,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5343,8 +5237,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5355,7 +5249,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5382,8 +5275,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5394,7 +5287,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5429,7 +5321,6 @@ "ctxt": 0 }, "value": "someGenerics7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5451,8 +5342,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5463,7 +5354,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5490,8 +5380,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5502,7 +5392,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5529,8 +5418,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5541,7 +5430,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5612,7 +5500,6 @@ "ctxt": 0 }, "value": "someGenerics7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5634,6 +5521,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5650,8 +5538,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -5662,7 +5549,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5689,6 +5575,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5705,8 +5592,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -5717,7 +5603,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5744,6 +5629,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5760,8 +5646,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -5772,7 +5657,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5831,7 +5715,6 @@ "ctxt": 0 }, "value": "someGenerics8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5852,6 +5735,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5874,13 +5758,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5913,7 +5795,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -5944,7 +5825,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5982,7 +5862,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6014,8 +5893,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6032,7 +5911,6 @@ "ctxt": 0 }, "value": "someGenerics8", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6046,7 +5924,6 @@ "ctxt": 0 }, "value": "someGenerics7", - "typeAnnotation": null, "optional": false } } @@ -6097,7 +5974,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6184,7 +6060,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6205,6 +6080,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6227,13 +6103,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -6252,6 +6126,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6274,13 +6149,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -6299,6 +6172,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6321,13 +6195,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6388,7 +6260,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6426,7 +6297,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6458,8 +6328,8 @@ "ctxt": 0 }, "value": "a9a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6476,7 +6346,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6553,6 +6422,7 @@ "ctxt": 0 }, "value": "a9a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6569,8 +6439,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -6602,8 +6471,8 @@ "ctxt": 0 }, "value": "a9b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6620,7 +6489,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6644,7 +6512,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -6680,7 +6547,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -6745,7 +6611,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6787,7 +6652,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6847,6 +6711,7 @@ "ctxt": 0 }, "value": "a9b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6878,7 +6743,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6920,7 +6784,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6948,8 +6811,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -6971,7 +6833,6 @@ "ctxt": 0 }, "value": "A91", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7001,7 +6862,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7043,7 +6903,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7087,7 +6946,6 @@ "ctxt": 0 }, "value": "A92", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7117,7 +6975,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7159,7 +7016,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7188,7 +7044,6 @@ "ctxt": 0 }, "value": "Window", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7224,8 +7079,8 @@ "ctxt": 0 }, "value": "a9e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7242,7 +7097,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7256,7 +7110,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -7280,7 +7133,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -7303,7 +7155,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -7314,7 +7165,6 @@ "ctxt": 0 }, "value": "window", - "typeAnnotation": null, "optional": false } } @@ -7341,7 +7191,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -7364,7 +7213,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -7417,6 +7265,7 @@ "ctxt": 0 }, "value": "a9e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7433,8 +7282,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -7466,8 +7314,8 @@ "ctxt": 0 }, "value": "a9f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7484,7 +7332,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7498,7 +7345,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -7522,7 +7368,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -7545,7 +7390,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -7556,7 +7400,6 @@ "ctxt": 0 }, "value": "window", - "typeAnnotation": null, "optional": false } } @@ -7583,7 +7426,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -7606,7 +7448,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -7651,7 +7492,6 @@ "ctxt": 0 }, "value": "A92", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7688,6 +7528,7 @@ "ctxt": 0 }, "value": "a9f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7710,13 +7551,11 @@ "ctxt": 0 }, "value": "A92", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -7748,8 +7587,8 @@ "ctxt": 0 }, "value": "a9d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7766,7 +7605,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7790,7 +7628,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -7826,7 +7663,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -7862,7 +7698,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -7910,6 +7745,7 @@ "ctxt": 0 }, "value": "a9d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7941,7 +7777,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7969,8 +7804,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -8002,6 +7836,7 @@ "ctxt": 0 }, "value": "anyVar", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8018,8 +7853,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -8051,8 +7885,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -8069,7 +7903,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8095,7 +7928,6 @@ "ctxt": 0 }, "value": "anyVar", - "typeAnnotation": null, "optional": false } }, @@ -8143,6 +7975,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8159,8 +7992,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -8192,8 +8024,8 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -8210,7 +8042,6 @@ "ctxt": 0 }, "value": "someGenerics9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8247,7 +8078,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -8283,6 +8113,7 @@ "ctxt": 0 }, "value": "arr", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8307,8 +8138,7 @@ "kind": "any" } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/typeArgumentInferenceWithObjectLiteral/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/typeArgumentInferenceWithObjectLiteral/input.ts.json index 4d3b2e483aaf..872bf2416b18 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/typeArgumentInferenceWithObjectLiteral/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functionCalls/typeArgumentInferenceWithObjectLiteral/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Computed", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "read", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -133,7 +129,6 @@ "ctxt": 0 }, "value": "write", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -147,6 +142,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -169,13 +165,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": null, @@ -194,7 +188,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -215,6 +208,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -237,7 +231,6 @@ "ctxt": 0 }, "value": "Computed", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -263,7 +256,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -271,8 +263,7 @@ ] } } - }, - "optional": false + } } } ], @@ -316,7 +307,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -351,6 +341,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -367,8 +358,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -397,7 +387,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -421,7 +410,6 @@ "ctxt": 0 }, "value": "read", - "typeAnnotation": null, "optional": false }, "value": { @@ -440,7 +428,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "async": false, @@ -459,7 +446,6 @@ "ctxt": 0 }, "value": "write", - "typeAnnotation": null, "optional": false }, "value": { @@ -478,8 +464,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -498,8 +484,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -509,7 +495,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } }, @@ -548,7 +533,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -572,7 +556,6 @@ "ctxt": 0 }, "value": "write", - "typeAnnotation": null, "optional": false }, "value": { @@ -591,8 +574,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -611,8 +594,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -622,7 +605,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } }, @@ -642,7 +624,6 @@ "ctxt": 0 }, "value": "read", - "typeAnnotation": null, "optional": false }, "value": { @@ -661,7 +642,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "async": false, @@ -694,7 +674,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "members": [ @@ -713,7 +692,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "init": null @@ -737,7 +715,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "members": [ @@ -756,7 +733,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "init": null @@ -773,7 +749,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -794,6 +769,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -825,7 +801,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -855,6 +830,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -877,13 +853,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -909,7 +883,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -935,7 +908,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -980,7 +952,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -992,8 +963,7 @@ } ] } - }, - "optional": false + } } }, { @@ -1012,6 +982,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1034,13 +1005,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1076,7 +1045,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1097,7 +1065,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1127,7 +1094,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1159,6 +1125,7 @@ "ctxt": 0 }, "value": "v1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1175,8 +1142,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1208,8 +1174,8 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1226,7 +1192,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1250,7 +1215,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false }, "value": { @@ -1269,8 +1233,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1281,7 +1245,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1300,7 +1263,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "value": { @@ -1373,8 +1335,8 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1391,7 +1353,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1415,7 +1376,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false }, "value": { @@ -1434,8 +1394,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1446,7 +1406,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1465,7 +1424,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "value": { @@ -1511,7 +1469,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1522,7 +1479,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1560,8 +1516,8 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1578,7 +1534,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1602,7 +1557,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false }, "value": { @@ -1621,8 +1575,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1633,7 +1587,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1652,7 +1605,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "value": { @@ -1678,7 +1630,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1689,7 +1640,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1747,6 +1697,7 @@ "ctxt": 0 }, "value": "v2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1769,13 +1720,11 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1807,8 +1756,8 @@ "ctxt": 0 }, "value": "v2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1825,7 +1774,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1849,7 +1797,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false }, "value": { @@ -1868,8 +1815,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1880,7 +1827,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1899,7 +1845,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "value": { @@ -1925,7 +1870,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1936,7 +1880,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1967,7 +1910,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1978,7 +1920,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2016,8 +1957,8 @@ "ctxt": 0 }, "value": "v3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2034,7 +1975,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2058,7 +1998,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false }, "value": { @@ -2077,8 +2016,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2089,7 +2028,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2108,7 +2046,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "value": { @@ -2134,7 +2071,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2145,7 +2081,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2176,7 +2111,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2187,7 +2121,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functions/arrowFunctionExpressions/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functions/arrowFunctionExpressions/input.ts.json index 81abae853ccd..f05357e912ac 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functions/arrowFunctionExpressions/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functions/arrowFunctionExpressions/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,6 +50,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -85,7 +85,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -96,7 +95,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -135,8 +133,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -154,6 +152,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -170,8 +169,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -204,7 +202,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -215,7 +212,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -257,8 +253,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -276,8 +272,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -341,8 +337,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -360,8 +356,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -425,6 +421,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -441,8 +438,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -474,8 +470,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -493,8 +489,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -513,8 +509,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -524,7 +520,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } }, @@ -562,8 +557,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -581,8 +576,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -601,8 +596,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -612,7 +607,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } }, @@ -650,6 +644,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -673,6 +668,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -689,8 +685,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "typeParams": null, @@ -712,8 +707,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -745,8 +739,8 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -772,8 +766,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -823,8 +817,8 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -862,8 +856,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -915,8 +909,8 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -943,8 +937,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -994,8 +988,8 @@ "ctxt": 0 }, "value": "p4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1034,8 +1028,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1087,8 +1081,8 @@ "ctxt": 0 }, "value": "p5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1121,8 +1115,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1183,8 +1177,8 @@ "ctxt": 0 }, "value": "p6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1217,7 +1211,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -1270,8 +1263,8 @@ "ctxt": 0 }, "value": "p7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1299,7 +1292,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1325,7 +1317,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -1383,8 +1374,8 @@ "ctxt": 0 }, "value": "p8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1417,7 +1408,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1478,8 +1468,8 @@ "ctxt": 0 }, "value": "p9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1507,7 +1497,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1540,7 +1529,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1575,7 +1563,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1641,8 +1628,8 @@ "ctxt": 0 }, "value": "p10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1683,7 +1670,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": null @@ -1703,7 +1689,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": null @@ -1745,7 +1730,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1771,7 +1755,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": { @@ -1790,8 +1773,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1810,7 +1793,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -1854,7 +1836,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -1873,8 +1854,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1893,7 +1874,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -1936,7 +1916,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -1980,8 +1959,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1999,8 +1978,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2019,7 +1998,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -2066,8 +2044,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -2085,8 +2063,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2105,7 +2083,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -2171,8 +2148,8 @@ "ctxt": 0 }, "value": "arrrr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -2198,6 +2175,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2214,8 +2192,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -2242,6 +2219,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2258,8 +2236,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -2278,7 +2255,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "right": { @@ -2289,7 +2265,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } }, @@ -2342,8 +2317,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2381,7 +2356,6 @@ "ctxt": 0 }, "value": "arrrr", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2451,6 +2425,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2467,8 +2442,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2485,7 +2459,6 @@ "ctxt": 0 }, "value": "someFn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2529,8 +2502,8 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -2548,6 +2521,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2564,8 +2538,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -2584,6 +2557,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2600,8 +2574,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -2620,7 +2593,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "right": { @@ -2631,7 +2603,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } }, @@ -2692,7 +2663,6 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2735,7 +2705,6 @@ "ctxt": 0 }, "value": "toExponential", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2761,7 +2730,6 @@ "ctxt": 0 }, "value": "someOtherFn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2805,8 +2773,8 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -2824,6 +2792,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2840,8 +2809,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -2874,7 +2842,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } }, @@ -2923,7 +2890,6 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2950,7 +2916,6 @@ "ctxt": 0 }, "value": "charAt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2989,7 +2954,6 @@ "ctxt": 0 }, "value": "outerFn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3018,7 +2982,6 @@ "ctxt": 0 }, "value": "innerFn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3062,8 +3025,8 @@ "ctxt": 0 }, "value": "arrowFn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -3116,8 +3079,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3134,7 +3097,6 @@ "ctxt": 0 }, "value": "arrowFn", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3169,6 +3131,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3185,8 +3148,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -3232,8 +3194,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -3251,6 +3213,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3267,8 +3230,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -3289,7 +3251,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3310,6 +3271,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3326,8 +3288,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -3376,7 +3337,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -3387,7 +3347,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3426,7 +3385,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3482,8 +3440,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3507,7 +3465,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3563,6 +3520,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3579,8 +3537,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -3597,7 +3554,6 @@ "ctxt": 0 }, "value": "someOuterFn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3641,8 +3597,8 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -3660,6 +3616,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3676,8 +3633,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -3698,7 +3654,6 @@ "ctxt": 0 }, "value": "innerFn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3747,7 +3702,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -3758,7 +3712,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3791,7 +3744,6 @@ "ctxt": 0 }, "value": "innerFn", - "typeAnnotation": null, "optional": false } } @@ -3821,7 +3773,6 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, "optional": false } } @@ -3857,8 +3808,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3896,7 +3847,6 @@ "ctxt": 0 }, "value": "someOuterFn", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3962,7 +3912,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "property": { @@ -3973,7 +3922,6 @@ "ctxt": 0 }, "value": "toExponential", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3992,7 +3940,6 @@ "ctxt": 0 }, "value": "tryCatchFn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4051,8 +3998,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -4096,8 +4043,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -4132,8 +4079,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -4159,7 +4106,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -4216,8 +4162,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functions/contextuallyTypedFunctionExpressionsAndReturnAnnotations/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functions/contextuallyTypedFunctionExpressionsAndReturnAnnotations/input.ts.json index e1fdb5ddc2de..184b877efbb9 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functions/contextuallyTypedFunctionExpressionsAndReturnAnnotations/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functions/contextuallyTypedFunctionExpressionsAndReturnAnnotations/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,6 +60,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -76,8 +77,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -104,6 +104,7 @@ "ctxt": 0 }, "value": "y2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -120,8 +121,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -145,8 +145,7 @@ } } } - }, - "optional": false + } } } ], @@ -184,7 +183,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -206,8 +204,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -243,8 +241,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -268,7 +266,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -279,7 +276,6 @@ "ctxt": 0 }, "value": "charAt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -348,6 +344,7 @@ "ctxt": 0 }, "value": "y2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -364,8 +361,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -416,7 +412,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -438,6 +433,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -454,8 +450,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -489,8 +484,8 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -526,8 +521,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -551,7 +546,6 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, "optional": false }, "property": { @@ -562,7 +556,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functions/contextuallyTypedIife/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functions/contextuallyTypedIife/input.ts.json index 09aaf7523b0b..f8f0de95464f 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functions/contextuallyTypedIife/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functions/contextuallyTypedIife/input.ts.json @@ -43,8 +43,8 @@ "ctxt": 0 }, "value": "jake", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -125,8 +125,8 @@ "ctxt": 0 }, "value": "cats", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -214,8 +214,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -324,8 +324,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -412,8 +412,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -423,8 +423,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -434,8 +434,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -543,8 +543,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -574,7 +574,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "right": { @@ -654,8 +653,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -685,7 +684,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -745,8 +743,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": true + "optional": true, + "typeAnnotation": null } ], "body": { @@ -765,7 +763,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "right": { @@ -838,8 +835,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": true + "optional": true, + "typeAnnotation": null } ], "body": { @@ -858,7 +855,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "right": { @@ -918,8 +914,8 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -929,8 +925,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": true + "optional": true, + "typeAnnotation": null } ], "body": { @@ -949,7 +945,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "right": { @@ -960,7 +955,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } }, @@ -1036,8 +1030,8 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1064,7 +1058,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "property": { @@ -1075,7 +1068,6 @@ "ctxt": 0 }, "value": "every", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1099,8 +1091,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1119,7 +1111,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -1237,8 +1228,8 @@ "ctxt": 0 }, "value": "mixed", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1265,7 +1256,6 @@ "ctxt": 0 }, "value": "mixed", - "typeAnnotation": null, "optional": false }, "property": { @@ -1276,7 +1266,6 @@ "ctxt": 0 }, "value": "every", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1300,8 +1289,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1328,7 +1317,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -1448,8 +1436,8 @@ "ctxt": 0 }, "value": "noNumbers", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1476,7 +1464,6 @@ "ctxt": 0 }, "value": "noNumbers", - "typeAnnotation": null, "optional": false }, "property": { @@ -1487,7 +1474,6 @@ "ctxt": 0 }, "value": "some", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1511,8 +1497,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1531,7 +1517,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -1600,8 +1585,8 @@ "ctxt": 0 }, "value": "first", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -1623,8 +1608,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1644,7 +1629,6 @@ "ctxt": 0 }, "value": "first", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1678,7 +1662,6 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, "optional": false }, "property": { @@ -1689,7 +1672,6 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1713,8 +1695,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1733,7 +1715,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -1855,7 +1836,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "value": null @@ -1873,7 +1853,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1903,7 +1882,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "value": { @@ -1975,7 +1953,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -2001,7 +1978,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2031,7 +2007,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -2110,7 +2085,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "value": { @@ -2145,7 +2119,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "value": { @@ -2171,7 +2144,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2201,7 +2173,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "value": { @@ -2280,7 +2251,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "value": { @@ -2315,7 +2285,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "value": { @@ -2341,7 +2310,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2379,8 +2347,8 @@ "ctxt": 0 }, "value": "twelve", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2412,8 +2380,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2431,7 +2399,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2475,8 +2442,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2487,7 +2454,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2528,8 +2494,8 @@ "ctxt": 0 }, "value": "eleven", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2561,8 +2527,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2587,7 +2553,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -2598,7 +2563,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2646,7 +2610,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2669,8 +2632,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -2703,7 +2666,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -2766,8 +2728,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -2786,8 +2748,8 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -2820,7 +2782,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2886,8 +2847,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2897,8 +2858,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2908,8 +2869,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functions/contextuallyTypedIifeStrict/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functions/contextuallyTypedIifeStrict/input.ts.json index e50ae805f9ff..29718dcfb2e5 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functions/contextuallyTypedIifeStrict/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functions/contextuallyTypedIifeStrict/input.ts.json @@ -43,8 +43,8 @@ "ctxt": 0 }, "value": "jake", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -125,8 +125,8 @@ "ctxt": 0 }, "value": "cats", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -214,8 +214,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -324,8 +324,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -412,8 +412,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -423,8 +423,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -434,8 +434,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -543,8 +543,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -574,7 +574,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "right": { @@ -654,8 +653,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -685,7 +684,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -745,8 +743,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": true + "optional": true, + "typeAnnotation": null } ], "body": { @@ -765,7 +763,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "right": { @@ -838,8 +835,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": true + "optional": true, + "typeAnnotation": null } ], "body": { @@ -858,7 +855,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "right": { @@ -918,8 +914,8 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -929,8 +925,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": true + "optional": true, + "typeAnnotation": null } ], "body": { @@ -949,7 +945,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "right": { @@ -960,7 +955,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } }, @@ -1036,8 +1030,8 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1064,7 +1058,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "property": { @@ -1075,7 +1068,6 @@ "ctxt": 0 }, "value": "every", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1099,8 +1091,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1119,7 +1111,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -1237,8 +1228,8 @@ "ctxt": 0 }, "value": "mixed", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1265,7 +1256,6 @@ "ctxt": 0 }, "value": "mixed", - "typeAnnotation": null, "optional": false }, "property": { @@ -1276,7 +1266,6 @@ "ctxt": 0 }, "value": "every", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1300,8 +1289,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1328,7 +1317,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -1448,8 +1436,8 @@ "ctxt": 0 }, "value": "noNumbers", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1476,7 +1464,6 @@ "ctxt": 0 }, "value": "noNumbers", - "typeAnnotation": null, "optional": false }, "property": { @@ -1487,7 +1474,6 @@ "ctxt": 0 }, "value": "some", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1511,8 +1497,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1531,7 +1517,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -1600,8 +1585,8 @@ "ctxt": 0 }, "value": "first", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -1623,8 +1608,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1644,7 +1629,6 @@ "ctxt": 0 }, "value": "first", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1678,7 +1662,6 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, "optional": false }, "property": { @@ -1689,7 +1672,6 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1713,8 +1695,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1733,7 +1715,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -1855,7 +1836,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "value": null @@ -1873,7 +1853,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1903,7 +1882,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "value": { @@ -1975,7 +1953,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -2001,7 +1978,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2031,7 +2007,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -2110,7 +2085,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "value": { @@ -2145,7 +2119,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "value": { @@ -2171,7 +2144,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2201,7 +2173,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "value": { @@ -2280,7 +2251,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "value": { @@ -2315,7 +2285,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "value": { @@ -2341,7 +2310,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2379,8 +2347,8 @@ "ctxt": 0 }, "value": "twelve", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2412,8 +2380,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2431,7 +2399,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2475,8 +2442,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2487,7 +2454,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2528,8 +2494,8 @@ "ctxt": 0 }, "value": "eleven", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2561,8 +2527,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2587,7 +2553,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -2598,7 +2563,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2646,7 +2610,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2669,8 +2632,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -2703,7 +2666,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -2766,8 +2728,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -2786,8 +2748,8 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -2820,7 +2782,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2886,8 +2847,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2897,8 +2858,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2908,8 +2869,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functions/typeOfThisInFunctionExpression/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functions/typeOfThisInFunctionExpression/input.ts.json index 3d03d0f5fa97..fc1025a0f325 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functions/typeOfThisInFunctionExpression/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functions/typeOfThisInFunctionExpression/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -100,6 +99,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -116,8 +116,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -156,8 +155,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -202,8 +201,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -242,6 +241,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -258,8 +258,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -302,8 +301,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -315,7 +314,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -358,8 +356,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -398,6 +396,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -414,8 +413,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -443,7 +441,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -469,7 +466,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -515,6 +511,7 @@ "ctxt": 0 }, "value": "q", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -531,8 +528,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -564,8 +560,8 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -612,7 +608,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -625,7 +620,6 @@ "ctxt": 0 }, "value": "ff", - "typeAnnotation": null, "optional": false }, "params": [], @@ -668,6 +662,7 @@ "ctxt": 0 }, "value": "q", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -684,8 +679,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -717,8 +711,8 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -774,7 +768,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -795,7 +788,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -839,8 +831,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -879,6 +871,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -895,8 +888,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -935,8 +927,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -981,8 +973,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -1021,6 +1013,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1037,8 +1030,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1081,8 +1073,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -1094,7 +1086,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1137,8 +1128,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -1177,6 +1168,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1193,8 +1185,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/functions/voidParamAssignmentCompatibility/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/functions/voidParamAssignmentCompatibility/input.ts.json index 40b929441bc7..6e035688d484 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/functions/voidParamAssignmentCompatibility/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/functions/voidParamAssignmentCompatibility/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "void" } - }, - "optional": false + } } } ], @@ -111,6 +110,7 @@ "ctxt": 0 }, "value": "gg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +145,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -156,7 +155,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "definite": false @@ -178,7 +176,6 @@ "ctxt": 0 }, "value": "Obj", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -205,7 +202,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -238,7 +234,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -252,6 +247,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -274,13 +270,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -330,6 +324,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -352,7 +347,6 @@ "ctxt": 0 }, "value": "Obj", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -375,8 +369,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -406,8 +399,8 @@ "ctxt": 0 }, "value": "gg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -424,7 +417,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -435,7 +427,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/identifiers/scopeResolutionIdentifiers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/identifiers/scopeResolutionIdentifiers/input.ts.json index c06e86ee6bb2..4dfd9cc7d1c0 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/identifiers/scopeResolutionIdentifiers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/identifiers/scopeResolutionIdentifiers/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -72,7 +72,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false }, "body": { @@ -115,6 +114,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -131,8 +131,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -165,8 +164,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -176,7 +175,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "definite": false @@ -208,6 +206,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -224,8 +223,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -252,7 +250,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -288,6 +285,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -304,8 +302,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -337,8 +334,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -348,7 +345,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "definite": false @@ -380,6 +376,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -396,8 +393,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -417,7 +413,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -461,6 +456,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -477,8 +473,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -510,8 +505,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -521,7 +516,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "definite": false @@ -553,6 +547,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -569,8 +564,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -594,7 +588,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -620,7 +613,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": null, @@ -646,7 +638,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -677,7 +668,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -703,7 +693,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -734,7 +723,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -778,8 +766,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -804,7 +792,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -838,6 +825,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -860,13 +848,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -910,7 +896,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "body": { @@ -946,6 +931,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -962,8 +948,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -987,7 +972,6 @@ "ctxt": 0 }, "value": "M4", - "typeAnnotation": null, "optional": false }, "body": { @@ -1023,8 +1007,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1034,7 +1018,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1066,6 +1049,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1082,8 +1066,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/newOperator/newOperatorConformance/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/newOperator/newOperatorConformance/input.ts.json index 8d0e1edeacdf..8c7d91f8a8f0 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/newOperator/newOperatorConformance/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/newOperator/newOperatorConformance/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -89,6 +86,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -105,8 +103,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -125,6 +122,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -141,8 +139,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -175,7 +172,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -201,7 +197,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -221,6 +216,7 @@ "ctxt": 0 }, "value": "n", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -243,13 +239,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } } ], @@ -291,7 +285,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -327,6 +320,7 @@ "ctxt": 0 }, "value": "anyCtor", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +365,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -404,6 +397,7 @@ "ctxt": 0 }, "value": "anyCtor1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -435,8 +429,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": { @@ -460,8 +454,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,7 +476,6 @@ "ctxt": 0 }, "value": "nestedCtor", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -527,7 +519,6 @@ "ctxt": 0 }, "value": "nestedCtor", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -563,6 +554,7 @@ "ctxt": 0 }, "value": "nestedCtor", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -585,13 +577,11 @@ "ctxt": 0 }, "value": "nestedCtor", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -623,8 +613,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -641,7 +631,6 @@ "ctxt": 0 }, "value": "C0", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -676,6 +665,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -698,13 +688,11 @@ "ctxt": 0 }, "value": "C0", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -736,8 +724,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -754,7 +742,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -789,6 +776,7 @@ "ctxt": 0 }, "value": "c1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -811,7 +799,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -834,8 +821,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -867,8 +853,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -885,7 +871,6 @@ "ctxt": 0 }, "value": "anyCtor", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -920,6 +905,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -936,8 +922,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -969,8 +954,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -987,7 +972,6 @@ "ctxt": 0 }, "value": "anyCtor1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1001,7 +985,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1022,7 +1005,6 @@ "ctxt": 0 }, "value": "newFn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1043,6 +1025,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1065,13 +1048,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1114,8 +1095,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1132,7 +1113,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -1167,6 +1147,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1183,8 +1164,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1218,7 +1198,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1274,7 +1253,6 @@ "ctxt": 0 }, "value": "newFn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1295,6 +1273,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1317,13 +1296,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1366,8 +1343,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1384,7 +1361,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1432,6 +1408,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1448,8 +1425,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1483,7 +1459,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1510,6 +1485,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1526,8 +1502,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1567,7 +1542,6 @@ "ctxt": 0 }, "value": "fnVoid", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1633,8 +1607,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1651,7 +1625,6 @@ "ctxt": 0 }, "value": "fnVoid", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1686,6 +1659,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1702,8 +1676,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1735,8 +1708,8 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1781,7 +1754,6 @@ "ctxt": 0 }, "value": "nestedCtor", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1824,8 +1796,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1842,7 +1814,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1877,8 +1848,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1895,7 +1866,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/newOperator/newOperatorErrorCases_noImplicitAny/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/newOperator/newOperatorErrorCases_noImplicitAny/input.ts.json index e2a45163d112..a7fb27129152 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/newOperator/newOperatorErrorCases_noImplicitAny/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/newOperator/newOperatorErrorCases_noImplicitAny/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "fnNumber", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "void" } - }, - "optional": false + } } } ], @@ -134,7 +133,6 @@ "ctxt": 0 }, "value": "fnNumber", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -151,7 +149,6 @@ "ctxt": 0 }, "value": "fnVoid", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -172,6 +169,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -188,8 +186,7 @@ }, "kind": "void" } - }, - "optional": false + } } } ], @@ -251,7 +248,6 @@ "ctxt": 0 }, "value": "fnVoid", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -268,7 +264,6 @@ "ctxt": 0 }, "value": "functionVoidNoThis", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -331,7 +326,6 @@ "ctxt": 0 }, "value": "functionVoidNoThis", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator1/input.ts.json index bb579464271b..fb6b9ef4f308 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator1/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -75,8 +76,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -108,6 +108,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -152,8 +153,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -185,6 +185,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -229,8 +230,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -262,6 +262,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -306,8 +307,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -339,6 +339,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -383,8 +384,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -416,6 +416,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -460,8 +461,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -493,6 +493,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -537,8 +538,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -570,6 +570,7 @@ "ctxt": 0 }, "value": "b4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -614,8 +615,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -647,6 +647,7 @@ "ctxt": 0 }, "value": "c1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -691,8 +692,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -724,6 +724,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -768,8 +769,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -801,6 +801,7 @@ "ctxt": 0 }, "value": "c3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -845,8 +846,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -878,6 +878,7 @@ "ctxt": 0 }, "value": "c4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -922,8 +923,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -945,7 +945,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -975,7 +974,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1029,6 +1027,7 @@ "ctxt": 0 }, "value": "d1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1059,7 +1058,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1084,8 +1082,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1117,6 +1114,7 @@ "ctxt": 0 }, "value": "d2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1147,7 +1145,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1172,8 +1169,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1205,6 +1201,7 @@ "ctxt": 0 }, "value": "d3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1235,7 +1232,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1260,8 +1256,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1293,6 +1288,7 @@ "ctxt": 0 }, "value": "d4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1323,7 +1319,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1348,8 +1343,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1381,8 +1375,8 @@ "ctxt": 0 }, "value": "aa1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1400,7 +1394,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1447,8 +1440,8 @@ "ctxt": 0 }, "value": "aa2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1466,7 +1459,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1513,8 +1505,8 @@ "ctxt": 0 }, "value": "aa3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1532,7 +1524,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -1579,8 +1570,8 @@ "ctxt": 0 }, "value": "aa4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1598,7 +1589,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -1645,8 +1635,8 @@ "ctxt": 0 }, "value": "bb1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1664,7 +1654,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1706,8 +1695,8 @@ "ctxt": 0 }, "value": "bb2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1725,7 +1714,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1767,8 +1755,8 @@ "ctxt": 0 }, "value": "bb3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1786,7 +1774,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false }, "right": { @@ -1828,8 +1815,8 @@ "ctxt": 0 }, "value": "bb4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1847,7 +1834,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false }, "right": { @@ -1889,8 +1875,8 @@ "ctxt": 0 }, "value": "cc1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1908,7 +1894,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1950,8 +1935,8 @@ "ctxt": 0 }, "value": "cc2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1969,7 +1954,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2011,8 +1995,8 @@ "ctxt": 0 }, "value": "cc3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2030,7 +2014,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2072,8 +2055,8 @@ "ctxt": 0 }, "value": "cc4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2091,7 +2074,6 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, "optional": false }, "right": { @@ -2133,8 +2115,8 @@ "ctxt": 0 }, "value": "dd1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2152,7 +2134,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2173,7 +2154,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2218,8 +2198,8 @@ "ctxt": 0 }, "value": "dd2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2237,7 +2217,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "right": { @@ -2258,7 +2237,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2303,8 +2281,8 @@ "ctxt": 0 }, "value": "dd3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2322,7 +2300,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2343,7 +2320,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2388,8 +2364,8 @@ "ctxt": 0 }, "value": "dd4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2407,7 +2383,6 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, "optional": false }, "right": { @@ -2428,7 +2403,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2458,7 +2432,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2516,8 +2489,8 @@ "ctxt": 0 }, "value": "maybeBool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -2570,7 +2543,6 @@ "ctxt": 0 }, "value": "maybeBool", - "typeAnnotation": null, "optional": false }, "right": { @@ -2615,7 +2587,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2649,7 +2620,6 @@ "ctxt": 0 }, "value": "maybeBool", - "typeAnnotation": null, "optional": false }, "right": { @@ -2692,7 +2662,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2731,7 +2700,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2805,7 +2773,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2844,7 +2811,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator10/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator10/input.ts.json index e2c734a66574..0cbbf6f4f9d3 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator10/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator10/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -93,8 +92,8 @@ "ctxt": 0 }, "value": "gg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -119,7 +118,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator11/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator11/input.ts.json index 57ddc84bd2c9..13418e5be618 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator11/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator11/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "f11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -122,8 +123,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -155,8 +155,8 @@ "ctxt": 0 }, "value": "g11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -174,7 +174,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "right": { @@ -199,7 +198,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "property": { @@ -210,7 +208,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator12/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator12/input.ts.json index 933ca7bc47a4..5c126ff237d4 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator12/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator12/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -98,8 +98,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -119,7 +118,6 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, "optional": false }, "value": { @@ -171,8 +169,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -214,7 +212,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -225,7 +222,6 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator2/input.ts.json index 878f3220b7b6..2404d5fb698c 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator2/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -88,8 +89,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -121,6 +121,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -178,8 +179,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -211,6 +211,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -263,8 +264,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -296,6 +296,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -348,8 +349,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -381,6 +381,7 @@ "ctxt": 0 }, "value": "a5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -433,8 +434,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -466,6 +466,7 @@ "ctxt": 0 }, "value": "a6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -518,8 +519,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -551,6 +551,7 @@ "ctxt": 0 }, "value": "a7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -586,8 +587,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -619,6 +619,7 @@ "ctxt": 0 }, "value": "a8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -654,8 +655,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -687,6 +687,7 @@ "ctxt": 0 }, "value": "a9", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -722,8 +723,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -755,8 +755,8 @@ "ctxt": 0 }, "value": "aa1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -774,7 +774,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -821,8 +820,8 @@ "ctxt": 0 }, "value": "aa2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -840,7 +839,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -887,8 +885,8 @@ "ctxt": 0 }, "value": "aa3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -906,7 +904,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -953,8 +950,8 @@ "ctxt": 0 }, "value": "aa4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -972,7 +969,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -1019,8 +1015,8 @@ "ctxt": 0 }, "value": "aa5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1038,7 +1034,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -1085,8 +1080,8 @@ "ctxt": 0 }, "value": "aa6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1104,7 +1099,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -1151,8 +1145,8 @@ "ctxt": 0 }, "value": "aa7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1170,7 +1164,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -1217,8 +1210,8 @@ "ctxt": 0 }, "value": "aa8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1236,7 +1229,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "right": { @@ -1283,8 +1275,8 @@ "ctxt": 0 }, "value": "aa9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1302,7 +1294,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "right": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator3/input.ts.json index 0d6008fc2831..b68e71a7e556 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator3/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -88,8 +89,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -121,6 +121,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -178,8 +179,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -211,6 +211,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -263,8 +264,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -296,6 +296,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -348,8 +349,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -381,6 +381,7 @@ "ctxt": 0 }, "value": "a5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -433,8 +434,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -466,6 +466,7 @@ "ctxt": 0 }, "value": "a6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -518,8 +519,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -551,8 +551,8 @@ "ctxt": 0 }, "value": "aa1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -610,7 +610,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -621,7 +620,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -633,7 +631,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -645,7 +642,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -657,7 +653,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -669,7 +664,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator4/input.ts.json index 2a415e1dcadc..98a6ad4b9589 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator4/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -88,8 +89,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -121,8 +121,8 @@ "ctxt": 0 }, "value": "aa1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -140,7 +140,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -165,7 +164,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "property": { @@ -176,7 +174,6 @@ "ctxt": 0 }, "value": "toLowerCase", - "typeAnnotation": null, "optional": false }, "computed": false @@ -214,8 +211,8 @@ "ctxt": 0 }, "value": "aa2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -233,7 +230,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -258,7 +254,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "property": { @@ -269,7 +264,6 @@ "ctxt": 0 }, "value": "toLocaleUpperCase", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator5/input.ts.json index 269f212bcdbc..c5568ae86b17 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -99,6 +99,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -134,8 +135,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -167,6 +167,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -202,8 +203,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -241,7 +241,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -252,7 +251,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -264,7 +262,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -300,7 +297,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -311,7 +307,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -323,7 +318,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -351,7 +345,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -370,7 +363,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -381,7 +373,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -418,7 +409,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -429,7 +419,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -441,7 +430,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -469,7 +457,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -495,7 +482,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -506,7 +492,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -551,7 +536,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -562,7 +546,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -575,7 +558,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -618,7 +600,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -629,7 +610,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -642,7 +622,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -670,7 +649,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -696,7 +674,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -707,7 +684,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -737,7 +713,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -763,7 +738,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -774,7 +748,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -819,7 +792,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -830,7 +802,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -843,7 +814,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -886,7 +856,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -897,7 +866,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -910,7 +878,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -938,7 +905,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -964,7 +930,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -975,7 +940,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator6/input.ts.json index 31d71a0e76dd..1b28e11022f2 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -80,8 +79,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -99,7 +98,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "right": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator7/input.ts.json index caa529233bc6..7cdf94e01738 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator7/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -99,6 +99,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -134,8 +135,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -167,6 +167,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -202,8 +203,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -235,8 +235,8 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -253,7 +253,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -304,8 +303,8 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -330,7 +329,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -396,8 +394,8 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -422,7 +420,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -463,7 +460,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -505,7 +501,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -539,7 +534,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -583,8 +577,8 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -609,7 +603,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -643,7 +636,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -677,7 +669,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator8/input.ts.json index 05353b16ad78..56d61033bed3 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator8/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -123,7 +123,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -169,8 +168,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -202,6 +200,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -233,7 +232,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -294,7 +292,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -340,8 +337,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -373,8 +369,8 @@ "ctxt": 0 }, "value": "n1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -399,7 +395,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -410,7 +405,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -459,8 +453,8 @@ "ctxt": 0 }, "value": "n2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -492,7 +486,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -503,7 +496,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -555,8 +547,8 @@ "ctxt": 0 }, "value": "n3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -604,7 +596,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -615,7 +606,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -638,7 +628,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -649,7 +638,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -677,7 +665,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -688,7 +675,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator9/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator9/input.ts.json index 724cb1d0c0fd..e52a3f25a5ed 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator9/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator9/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -78,6 +79,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -94,8 +96,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -120,8 +121,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -153,8 +153,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -172,7 +172,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -198,8 +197,8 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -247,7 +246,6 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, "optional": false }, "property": { @@ -258,7 +256,6 @@ "ctxt": 0 }, "value": "toLowerCase", - "typeAnnotation": null, "optional": false }, "computed": false @@ -306,8 +303,8 @@ "ctxt": 0 }, "value": "gg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -325,7 +322,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -351,8 +347,8 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -400,7 +396,6 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, "optional": false }, "property": { @@ -411,7 +406,6 @@ "ctxt": 0 }, "value": "toLowerCase", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInAsyncGenerator/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInAsyncGenerator/input.ts.json index a15024506324..8bc9f75db442 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInAsyncGenerator/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInAsyncGenerator/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -68,7 +68,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -96,8 +95,7 @@ } ] } - }, - "optional": false + } } } ], @@ -140,8 +138,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -166,7 +164,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -177,7 +174,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -211,7 +207,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "body": { @@ -253,7 +248,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterBindingPattern.2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterBindingPattern.2/input.ts.json index 0c0b85a94482..6ce151844bd1 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterBindingPattern.2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterBindingPattern.2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,7 +50,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "async": false, @@ -166,7 +165,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -203,8 +201,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -261,8 +259,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -306,8 +304,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -396,7 +394,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -433,8 +430,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -468,7 +465,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -479,7 +475,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -521,8 +516,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterBindingPattern/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterBindingPattern/input.ts.json index 67acdda85459..b62da9a779e4 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterBindingPattern/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterBindingPattern/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,7 +50,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "async": false, @@ -166,7 +165,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -203,8 +201,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterInitializer.2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterInitializer.2/input.ts.json index 53539671b637..c44735dd313a 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterInitializer.2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterInitializer.2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,7 +50,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "async": false, @@ -141,8 +140,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -167,7 +166,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -224,8 +222,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -269,8 +267,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -334,8 +332,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -360,7 +358,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -398,8 +395,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -409,7 +406,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -448,8 +444,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterInitializer/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterInitializer/input.ts.json index 1e9155302fd8..cbf71748697b 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterInitializer/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperatorInParameterInitializer/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,7 +50,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "async": false, @@ -141,8 +140,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -167,7 +166,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator_es2020/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator_es2020/input.ts.json index b291445d213c..bd70e39afb40 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator_es2020/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator_es2020/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -88,8 +89,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -121,6 +121,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -178,8 +179,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -211,6 +211,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -263,8 +264,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -296,6 +296,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -348,8 +349,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -381,6 +381,7 @@ "ctxt": 0 }, "value": "a5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -433,8 +434,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -466,6 +466,7 @@ "ctxt": 0 }, "value": "a6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -518,8 +519,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -551,6 +551,7 @@ "ctxt": 0 }, "value": "a7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -586,8 +587,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -619,6 +619,7 @@ "ctxt": 0 }, "value": "a8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -654,8 +655,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -687,6 +687,7 @@ "ctxt": 0 }, "value": "a9", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -722,8 +723,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -755,8 +755,8 @@ "ctxt": 0 }, "value": "aa1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -774,7 +774,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -821,8 +820,8 @@ "ctxt": 0 }, "value": "aa2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -840,7 +839,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -887,8 +885,8 @@ "ctxt": 0 }, "value": "aa3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -906,7 +904,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -953,8 +950,8 @@ "ctxt": 0 }, "value": "aa4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -972,7 +969,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -1019,8 +1015,8 @@ "ctxt": 0 }, "value": "aa5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1038,7 +1034,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -1085,8 +1080,8 @@ "ctxt": 0 }, "value": "aa6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1104,7 +1099,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -1151,8 +1145,8 @@ "ctxt": 0 }, "value": "aa7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1170,7 +1164,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -1217,8 +1210,8 @@ "ctxt": 0 }, "value": "aa8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1236,7 +1229,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "right": { @@ -1283,8 +1275,8 @@ "ctxt": 0 }, "value": "aa9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1302,7 +1294,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "right": { @@ -1349,6 +1340,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1365,8 +1357,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1386,6 +1377,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1402,8 +1394,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1423,6 +1414,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1439,8 +1431,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1472,8 +1463,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1506,7 +1497,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1524,7 +1514,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1547,7 +1536,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1580,8 +1568,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1599,7 +1587,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1625,7 +1612,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1643,7 +1629,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1688,8 +1673,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1736,7 +1721,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1747,7 +1731,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1771,7 +1754,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1804,8 +1786,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1823,7 +1805,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1863,7 +1844,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1874,7 +1854,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1920,8 +1899,8 @@ "ctxt": 0 }, "value": "x5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1961,7 +1940,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1972,7 +1950,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1995,7 +1972,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -2028,8 +2004,8 @@ "ctxt": 0 }, "value": "x6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2047,7 +2023,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -2080,7 +2055,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2091,7 +2065,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2136,8 +2109,8 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2170,7 +2143,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2188,7 +2160,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -2211,7 +2182,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -2244,8 +2214,8 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2263,7 +2233,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -2289,7 +2258,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2307,7 +2275,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -2352,8 +2319,8 @@ "ctxt": 0 }, "value": "y3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2400,7 +2367,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2411,7 +2377,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2435,7 +2400,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -2468,8 +2432,8 @@ "ctxt": 0 }, "value": "y4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2487,7 +2451,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -2527,7 +2490,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2538,7 +2500,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2584,8 +2545,8 @@ "ctxt": 0 }, "value": "y5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2625,7 +2586,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2636,7 +2596,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2659,7 +2618,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -2692,8 +2650,8 @@ "ctxt": 0 }, "value": "y6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2711,7 +2669,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -2744,7 +2701,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2755,7 +2711,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator_not_strict/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator_not_strict/input.ts.json index 5f2fb8118ba4..114336f578f7 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator_not_strict/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/nullishCoalescingOperator/nullishCoalescingOperator_not_strict/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -88,8 +89,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -121,6 +121,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -178,8 +179,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -211,6 +211,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -263,8 +264,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -296,6 +296,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -348,8 +349,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -381,6 +381,7 @@ "ctxt": 0 }, "value": "a5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -433,8 +434,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -466,6 +466,7 @@ "ctxt": 0 }, "value": "a6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -518,8 +519,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -551,6 +551,7 @@ "ctxt": 0 }, "value": "a7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -586,8 +587,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -619,6 +619,7 @@ "ctxt": 0 }, "value": "a8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -654,8 +655,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -687,6 +687,7 @@ "ctxt": 0 }, "value": "a9", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -722,8 +723,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -755,8 +755,8 @@ "ctxt": 0 }, "value": "aa1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -774,7 +774,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -821,8 +820,8 @@ "ctxt": 0 }, "value": "aa2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -840,7 +839,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -887,8 +885,8 @@ "ctxt": 0 }, "value": "aa3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -906,7 +904,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -953,8 +950,8 @@ "ctxt": 0 }, "value": "aa4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -972,7 +969,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -1019,8 +1015,8 @@ "ctxt": 0 }, "value": "aa5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1038,7 +1034,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -1085,8 +1080,8 @@ "ctxt": 0 }, "value": "aa6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1104,7 +1099,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -1151,8 +1145,8 @@ "ctxt": 0 }, "value": "aa7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1170,7 +1164,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -1217,8 +1210,8 @@ "ctxt": 0 }, "value": "aa8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1236,7 +1229,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "right": { @@ -1283,8 +1275,8 @@ "ctxt": 0 }, "value": "aa9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1302,7 +1294,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "right": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/objectLiterals/objectLiteralErrorsES3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/objectLiterals/objectLiteralErrorsES3/input.ts.json index 83d296d3c571..245dc21011ab 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/objectLiterals/objectLiteralErrorsES3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/objectLiterals/objectLiteralErrorsES3/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -57,7 +57,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -120,8 +119,8 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -146,7 +145,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "param": { @@ -157,8 +155,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -201,8 +199,8 @@ "ctxt": 0 }, "value": "e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -227,7 +225,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -279,7 +276,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "param": { @@ -290,8 +286,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/objectLiterals/objectLiteralNormalization/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/objectLiterals/objectLiteralNormalization/input.ts.json index db3eee067d49..86c143b8b688 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/objectLiterals/objectLiteralNormalization/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/objectLiterals/objectLiteralNormalization/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -69,7 +69,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -105,7 +104,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -128,7 +126,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -169,7 +166,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -192,7 +188,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -220,7 +215,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -275,7 +269,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "property": { @@ -286,7 +279,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -314,7 +306,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "property": { @@ -325,7 +316,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -353,7 +343,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "property": { @@ -364,7 +353,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -393,8 +381,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -414,7 +402,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -454,8 +441,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -475,7 +462,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -498,7 +484,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -538,8 +523,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -559,7 +544,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -604,8 +588,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -625,7 +609,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -667,8 +650,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -705,7 +688,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -728,7 +710,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -764,7 +745,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -836,7 +816,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "property": { @@ -847,7 +826,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -875,7 +853,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "property": { @@ -886,7 +863,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -915,8 +891,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -936,7 +912,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -959,7 +934,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -999,8 +973,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1020,7 +994,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1065,8 +1038,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1102,8 +1075,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1123,7 +1096,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1151,7 +1123,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1191,8 +1162,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1212,7 +1183,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1254,6 +1224,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1293,7 +1264,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1335,7 +1305,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1387,7 +1356,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1429,7 +1397,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1459,8 +1426,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1492,8 +1458,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1518,7 +1484,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -1532,7 +1497,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -1576,8 +1540,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1602,7 +1566,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -1637,6 +1600,7 @@ "ctxt": 0 }, "value": "opts", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1668,7 +1632,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1710,7 +1673,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1752,7 +1714,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1780,8 +1741,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1813,8 +1773,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1858,7 +1818,6 @@ "ctxt": 0 }, "value": "opts", - "typeAnnotation": null, "optional": false } }, @@ -1891,8 +1850,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1927,7 +1886,6 @@ "ctxt": 0 }, "value": "opts", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1969,8 +1927,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2015,7 +1973,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2038,7 +1995,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2092,8 +2048,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2147,7 +2103,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2170,7 +2125,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2215,8 +2169,8 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2253,7 +2207,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "value": { @@ -2281,7 +2234,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false }, "value": { @@ -2302,7 +2254,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -2325,7 +2276,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2364,7 +2314,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "value": { @@ -2392,7 +2341,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false }, "value": { @@ -2438,7 +2386,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2476,7 +2423,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2535,7 +2481,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2546,7 +2491,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2574,7 +2518,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2585,7 +2528,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2620,7 +2562,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2631,7 +2572,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2644,7 +2584,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2679,7 +2618,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2690,7 +2628,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2703,7 +2640,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2738,7 +2674,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2749,7 +2684,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2762,7 +2696,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2797,7 +2730,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2808,7 +2740,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2821,7 +2752,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2837,7 +2767,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2870,8 +2799,8 @@ "ctxt": 0 }, "value": "items", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2902,7 +2831,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2944,7 +2872,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2974,7 +2901,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3006,6 +2932,7 @@ "ctxt": 0 }, "value": "data", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3037,7 +2964,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3087,7 +3013,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3142,7 +3067,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3178,8 +3102,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3211,8 +3134,8 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3229,7 +3152,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3253,7 +3175,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -3276,7 +3197,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -3312,7 +3232,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -3377,8 +3296,8 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3395,7 +3314,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3431,7 +3349,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -3472,7 +3389,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -3495,7 +3411,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -3543,8 +3458,8 @@ "ctxt": 0 }, "value": "e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3561,7 +3476,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3575,7 +3489,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false } }, @@ -3599,7 +3512,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -3647,8 +3559,8 @@ "ctxt": 0 }, "value": "e4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3665,7 +3577,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3689,7 +3600,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -3715,7 +3625,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/callChain/callChain.2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/callChain/callChain.2/input.ts.json index 715050b39dc9..c03d93f9e08f 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/callChain/callChain.2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/callChain/callChain.2/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "o1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -92,8 +93,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -134,7 +134,6 @@ "ctxt": 0 }, "value": "o1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -167,6 +166,7 @@ "ctxt": 0 }, "value": "o2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -215,7 +215,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -263,8 +262,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -312,7 +310,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { @@ -323,7 +320,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -358,6 +354,7 @@ "ctxt": 0 }, "value": "o3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -389,7 +386,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -458,7 +454,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -505,8 +500,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -561,7 +555,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false }, "property": { @@ -572,7 +565,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -589,7 +581,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/callChain/callChain.3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/callChain/callChain.3/input.ts.json index f657a4a52e1b..3a187efe8b78 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/callChain/callChain.3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/callChain/callChain.3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "absorb", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -53,7 +52,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -83,7 +81,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -115,6 +112,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -154,7 +152,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -168,6 +165,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -199,7 +197,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -228,7 +225,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -238,8 +234,7 @@ } ] } - }, - "optional": false + } } ], "typeAnn": { @@ -264,7 +259,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -293,7 +287,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -315,8 +308,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -348,6 +340,7 @@ "ctxt": 0 }, "value": "n1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -364,8 +357,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "OptionalChainingExpression", @@ -413,7 +405,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -424,7 +415,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -451,7 +441,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -500,6 +489,7 @@ "ctxt": 0 }, "value": "n2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -516,8 +506,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "OptionalChainingExpression", @@ -565,7 +554,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -576,7 +564,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -603,7 +590,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -621,7 +607,6 @@ "ctxt": 0 }, "value": "absorb", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -664,6 +649,7 @@ "ctxt": 0 }, "value": "n3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -699,8 +685,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "OptionalChainingExpression", @@ -748,7 +733,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -759,7 +743,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -786,7 +769,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -835,6 +817,7 @@ "ctxt": 0 }, "value": "n4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -870,8 +853,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "OptionalChainingExpression", @@ -919,7 +901,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -930,7 +911,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -957,7 +937,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -975,7 +954,6 @@ "ctxt": 0 }, "value": "absorb", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1018,8 +996,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "OptionalChainingExpression", @@ -1067,7 +1045,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1078,7 +1055,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1105,7 +1081,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1152,8 +1127,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -1191,7 +1166,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1203,7 +1177,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1230,7 +1203,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/callChain/callChain/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/callChain/callChain/input.ts.json index e64a51c6b51a..4578e3040ac9 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/callChain/callChain/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/callChain/callChain/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "o1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -90,8 +91,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -142,8 +143,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -184,7 +184,6 @@ "ctxt": 0 }, "value": "o1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -226,7 +225,6 @@ "ctxt": 0 }, "value": "o1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -281,7 +279,6 @@ "ctxt": 0 }, "value": "o1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -365,7 +362,6 @@ "ctxt": 0 }, "value": "o1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -464,6 +460,7 @@ "ctxt": 0 }, "value": "o2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -512,7 +509,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -554,8 +550,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -610,8 +606,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -659,7 +654,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { @@ -670,7 +664,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -721,7 +714,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { @@ -732,7 +724,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -796,7 +787,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { @@ -807,7 +797,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -900,7 +889,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { @@ -911,7 +899,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1028,7 +1015,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1093,7 +1079,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1171,7 +1156,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1278,7 +1262,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1393,6 +1376,7 @@ "ctxt": 0 }, "value": "o3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1424,7 +1408,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1481,8 +1464,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1543,7 +1526,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1590,8 +1572,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1646,7 +1627,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1657,7 +1637,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1674,7 +1653,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1728,7 +1706,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1739,7 +1716,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1769,7 +1745,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1823,7 +1798,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1834,7 +1808,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1893,7 +1866,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1947,7 +1919,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1958,7 +1929,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2041,7 +2011,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2095,7 +2064,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false }, "property": { @@ -2106,7 +2074,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2180,7 +2147,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false }, "property": { @@ -2191,7 +2157,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2278,7 +2243,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false }, "property": { @@ -2289,7 +2253,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2405,7 +2368,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false }, "property": { @@ -2416,7 +2378,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2556,7 +2517,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false }, "property": { @@ -2587,7 +2547,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2641,7 +2600,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false }, "property": { @@ -2685,7 +2643,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2739,7 +2696,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false }, "property": { @@ -2812,7 +2768,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2866,7 +2821,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false }, "property": { @@ -2963,7 +2917,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2994,6 +2947,7 @@ "ctxt": 0 }, "value": "o4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3041,6 +2995,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3064,6 +3019,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3086,13 +3042,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3118,15 +3072,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -3152,7 +3104,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3182,7 +3133,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3192,8 +3142,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3210,7 +3159,6 @@ "ctxt": 0 }, "value": "incr", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3231,6 +3179,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3247,8 +3196,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -3305,6 +3253,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3340,8 +3289,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "OptionalChainingExpression", @@ -3370,7 +3318,6 @@ "ctxt": 0 }, "value": "o4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3384,7 +3331,6 @@ "ctxt": 0 }, "value": "incr", - "typeAnnotation": null, "optional": false } } @@ -3421,6 +3367,7 @@ "ctxt": 0 }, "value": "o5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3459,7 +3406,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3530,8 +3476,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3579,7 +3524,6 @@ "ctxt": 0 }, "value": "o5", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3663,7 +3607,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { @@ -3674,7 +3617,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3692,7 +3634,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3760,7 +3701,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { @@ -3771,7 +3711,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3789,7 +3728,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/callChain/callChainWithSuper/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/callChain/callChainWithSuper/input.ts.json index 091ed0976f7d..886719b9c294 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/callChain/callChainWithSuper/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/callChain/callChainWithSuper/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": true }, "function": { @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "function": { @@ -184,7 +180,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false @@ -222,7 +217,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "function": { @@ -325,7 +319,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/callChain/superMethodCall/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/callChain/superMethodCall/input.ts.json index 0d9256fbd953..57ed50f8df54 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/callChain/superMethodCall/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/callChain/superMethodCall/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": true }, "function": { @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -184,7 +180,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false @@ -222,7 +217,6 @@ "ctxt": 0 }, "value": "asyncMethod", - "typeAnnotation": null, "optional": false }, "function": { @@ -290,7 +284,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false @@ -322,7 +315,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/callChain/thisMethodCall/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/callChain/thisMethodCall/input.ts.json index 620dd5628c75..e48127214156 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/callChain/thisMethodCall/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/callChain/thisMethodCall/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": true }, "function": { @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "function": { @@ -156,7 +153,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/delete/deleteChain/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/delete/deleteChain/input.ts.json index 3e834ecad418..1d3966b4b622 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/delete/deleteChain/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/delete/deleteChain/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "o1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -79,7 +80,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -109,8 +109,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -159,7 +158,6 @@ "ctxt": 0 }, "value": "o1", - "typeAnnotation": null, "optional": false }, "property": { @@ -170,7 +168,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -227,7 +224,6 @@ "ctxt": 0 }, "value": "o1", - "typeAnnotation": null, "optional": false }, "property": { @@ -238,7 +234,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -272,6 +267,7 @@ "ctxt": 0 }, "value": "o2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -320,7 +316,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -358,7 +353,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -393,8 +387,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -450,7 +443,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { @@ -461,7 +453,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -475,7 +466,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -538,7 +528,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { @@ -549,7 +538,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -563,7 +551,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -596,6 +583,7 @@ "ctxt": 0 }, "value": "o3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -627,7 +615,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -682,7 +669,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -717,8 +703,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -774,7 +759,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false }, "property": { @@ -785,7 +769,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -798,7 +781,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -862,7 +844,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false }, "property": { @@ -873,7 +854,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -886,7 +866,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -920,6 +899,7 @@ "ctxt": 0 }, "value": "o4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -951,7 +931,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -989,7 +968,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1027,7 +1005,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1065,7 +1042,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1108,8 +1084,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1191,7 +1166,6 @@ "ctxt": 0 }, "value": "o4", - "typeAnnotation": null, "optional": false }, "property": { @@ -1202,7 +1176,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1215,7 +1188,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1229,7 +1201,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1242,7 +1213,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1332,7 +1302,6 @@ "ctxt": 0 }, "value": "o4", - "typeAnnotation": null, "optional": false }, "property": { @@ -1343,7 +1312,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1356,7 +1324,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1370,7 +1337,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1384,7 +1350,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1474,7 +1439,6 @@ "ctxt": 0 }, "value": "o4", - "typeAnnotation": null, "optional": false }, "property": { @@ -1485,7 +1449,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1498,7 +1461,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1512,7 +1474,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1525,7 +1486,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1559,6 +1519,7 @@ "ctxt": 0 }, "value": "o5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1590,7 +1551,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1627,7 +1587,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1665,7 +1624,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1703,7 +1661,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1746,8 +1703,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1836,7 +1792,6 @@ "ctxt": 0 }, "value": "o5", - "typeAnnotation": null, "optional": false }, "property": { @@ -1847,7 +1802,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1864,7 +1818,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1877,7 +1830,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1890,7 +1842,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1987,7 +1938,6 @@ "ctxt": 0 }, "value": "o5", - "typeAnnotation": null, "optional": false }, "property": { @@ -1998,7 +1948,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2015,7 +1964,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2028,7 +1976,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2041,7 +1988,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2075,6 +2021,7 @@ "ctxt": 0 }, "value": "o6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2106,7 +2053,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2144,7 +2090,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2182,7 +2127,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2220,7 +2164,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2263,8 +2206,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2346,7 +2288,6 @@ "ctxt": 0 }, "value": "o6", - "typeAnnotation": null, "optional": false }, "property": { @@ -2357,7 +2298,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2387,7 +2327,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2493,7 +2432,6 @@ "ctxt": 0 }, "value": "o6", - "typeAnnotation": null, "optional": false }, "property": { @@ -2504,7 +2442,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2534,7 +2471,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/elementAccessChain/elementAccessChain.2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/elementAccessChain/elementAccessChain.2/input.ts.json index 16cdbfd934c1..3b27d18348fb 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/elementAccessChain/elementAccessChain.2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/elementAccessChain/elementAccessChain.2/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "o1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -79,7 +80,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -109,8 +109,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -151,7 +150,6 @@ "ctxt": 0 }, "value": "o1", - "typeAnnotation": null, "optional": false }, "property": { @@ -197,6 +195,7 @@ "ctxt": 0 }, "value": "o2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -245,7 +244,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -283,7 +281,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -318,8 +315,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -367,7 +363,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { @@ -395,7 +390,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -442,7 +436,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { @@ -453,7 +446,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -501,6 +493,7 @@ "ctxt": 0 }, "value": "o3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -532,7 +525,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -587,7 +579,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -622,8 +613,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,7 +661,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false }, "property": { @@ -698,7 +687,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -746,7 +734,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false }, "property": { @@ -757,7 +744,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/elementAccessChain/elementAccessChain.3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/elementAccessChain/elementAccessChain.3/input.ts.json index 90ef57206ab8..0c8660552a93 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/elementAccessChain/elementAccessChain.3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/elementAccessChain/elementAccessChain.3/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -98,7 +98,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -170,7 +169,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -181,7 +179,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -248,7 +245,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -320,7 +316,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -331,7 +326,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -398,7 +392,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -470,7 +463,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -481,7 +473,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -548,7 +539,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -620,7 +610,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -631,7 +620,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -697,7 +685,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -777,7 +764,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -788,7 +774,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -863,7 +848,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -943,7 +927,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -954,7 +937,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1021,7 +1003,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1100,7 +1081,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1111,7 +1091,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1186,7 +1165,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1266,7 +1244,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1277,7 +1254,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1357,7 +1333,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1391,7 +1366,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1449,7 +1423,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1486,7 +1459,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1497,7 +1469,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1542,7 +1513,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1634,7 +1604,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1728,7 +1697,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1739,7 +1707,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1785,7 +1752,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1932,7 +1898,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1943,7 +1908,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/elementAccessChain/elementAccessChain/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/elementAccessChain/elementAccessChain/input.ts.json index 8366dc6fb395..212dc1d26f55 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/elementAccessChain/elementAccessChain/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/elementAccessChain/elementAccessChain/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "o1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -79,7 +80,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -109,8 +109,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -151,7 +150,6 @@ "ctxt": 0 }, "value": "o1", - "typeAnnotation": null, "optional": false }, "property": { @@ -197,6 +195,7 @@ "ctxt": 0 }, "value": "o2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -245,7 +244,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -283,7 +281,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -318,8 +315,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -367,7 +363,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { @@ -395,7 +390,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -442,7 +436,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { @@ -453,7 +446,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -501,6 +493,7 @@ "ctxt": 0 }, "value": "o3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -532,7 +525,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -587,7 +579,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -622,8 +613,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,7 +661,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false }, "property": { @@ -698,7 +687,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -746,7 +734,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false }, "property": { @@ -757,7 +744,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -805,6 +791,7 @@ "ctxt": 0 }, "value": "o4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -836,7 +823,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -874,7 +860,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -912,7 +897,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -950,7 +934,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -993,8 +976,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1068,7 +1050,6 @@ "ctxt": 0 }, "value": "o4", - "typeAnnotation": null, "optional": false }, "property": { @@ -1079,7 +1060,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1109,7 +1089,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1122,7 +1101,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1196,7 +1174,6 @@ "ctxt": 0 }, "value": "o4", - "typeAnnotation": null, "optional": false }, "property": { @@ -1207,7 +1184,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1237,7 +1213,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1285,6 +1260,7 @@ "ctxt": 0 }, "value": "o5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1316,7 +1292,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1353,7 +1328,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1391,7 +1365,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1429,7 +1402,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1472,8 +1444,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1554,7 +1525,6 @@ "ctxt": 0 }, "value": "o5", - "typeAnnotation": null, "optional": false }, "property": { @@ -1565,7 +1535,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1598,7 +1567,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1611,7 +1579,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1692,7 +1659,6 @@ "ctxt": 0 }, "value": "o5", - "typeAnnotation": null, "optional": false }, "property": { @@ -1703,7 +1669,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1736,7 +1701,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1833,7 +1797,6 @@ "ctxt": 0 }, "value": "o5", - "typeAnnotation": null, "optional": false }, "property": { @@ -1880,7 +1843,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1893,7 +1855,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1974,7 +1935,6 @@ "ctxt": 0 }, "value": "o5", - "typeAnnotation": null, "optional": false }, "property": { @@ -2021,7 +1981,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2069,6 +2028,7 @@ "ctxt": 0 }, "value": "o6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2107,7 +2067,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2170,7 +2129,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2203,8 +2161,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2252,7 +2209,6 @@ "ctxt": 0 }, "value": "o6", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2342,7 +2298,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2371,7 +2326,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2425,7 +2379,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2518,7 +2471,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2547,7 +2499,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2609,7 +2560,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInArrow/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInArrow/input.ts.json index 43021cd17ea2..f2394f37a4e5 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInArrow/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInArrow/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,6 +50,7 @@ "ctxt": 0 }, "value": "names", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -74,8 +75,7 @@ "kind": "string" } } - }, - "optional": false + } } ], "body": { @@ -112,7 +112,6 @@ "ctxt": 0 }, "value": "names", - "typeAnnotation": null, "optional": false }, "property": { @@ -123,7 +122,6 @@ "ctxt": 0 }, "value": "filter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -148,8 +146,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -160,7 +158,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInLoop/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInLoop/input.ts.json index d64b6fbb136a..8d138596f40f 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInLoop/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInLoop/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "list", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -55,8 +56,7 @@ "kind": "any" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -104,8 +104,8 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -120,7 +120,6 @@ "ctxt": 0 }, "value": "list", - "typeAnnotation": null, "optional": false }, "body": { @@ -168,7 +167,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false }, "property": { @@ -179,7 +177,6 @@ "ctxt": 0 }, "value": "sp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -192,7 +189,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -233,7 +229,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false }, "property": { @@ -244,7 +239,6 @@ "ctxt": 0 }, "value": "sp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -257,7 +251,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "computed": false @@ -270,7 +263,6 @@ "ctxt": 0 }, "value": "find", - "typeAnnotation": null, "optional": false }, "computed": false @@ -294,6 +286,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -310,8 +303,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "body": { @@ -337,7 +329,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "property": { @@ -348,7 +339,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -382,7 +372,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false }, "property": { @@ -393,7 +382,6 @@ "ctxt": 0 }, "value": "xp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -473,8 +461,8 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -496,7 +484,6 @@ "ctxt": 0 }, "value": "comp", - "typeAnnotation": null, "optional": false }, "property": { @@ -507,7 +494,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -550,7 +536,6 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, "optional": false }, "property": { @@ -561,7 +546,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "computed": false @@ -616,7 +600,6 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, "optional": false }, "property": { @@ -627,7 +610,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -640,7 +622,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInParameterBindingPattern.2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInParameterBindingPattern.2/input.ts.json index 4dfb7a60a033..ce09d990dde6 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInParameterBindingPattern.2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInParameterBindingPattern.2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,7 +50,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "async": false, @@ -95,7 +94,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -220,7 +218,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -234,7 +231,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -256,8 +252,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -314,8 +310,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -359,8 +355,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -460,7 +456,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -474,7 +469,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -489,8 +483,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -512,8 +506,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -523,7 +517,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -562,8 +555,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInParameterBindingPattern/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInParameterBindingPattern/input.ts.json index 0106f84c9ef5..dfe5a1ee122c 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInParameterBindingPattern/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInParameterBindingPattern/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,7 +50,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "async": false, @@ -95,7 +94,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -220,7 +218,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -234,7 +231,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -256,8 +252,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInParameterInitializer.2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInParameterInitializer.2/input.ts.json index 4558b693a7bf..4aa161e72fa8 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInParameterInitializer.2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInParameterInitializer.2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,7 +50,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "async": false, @@ -95,7 +94,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -184,8 +182,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "OptionalChainingExpression", @@ -221,7 +219,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -235,7 +232,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -277,8 +273,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -322,8 +318,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -387,8 +383,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "OptionalChainingExpression", @@ -424,7 +420,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -438,7 +433,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -461,8 +455,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -472,7 +466,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -511,8 +504,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInParameterInitializer/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInParameterInitializer/input.ts.json index dde6ec2696fb..20278ead769a 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInParameterInitializer/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInParameterInitializer/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,7 +50,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "async": false, @@ -95,7 +94,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -184,8 +182,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "OptionalChainingExpression", @@ -221,7 +219,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -235,7 +232,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInference/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInference/input.ts.json index 4f742363441f..739c0f57a619 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInference/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/optionalChainingInference/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "unbox", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "box", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -68,7 +68,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -105,7 +104,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -126,8 +124,7 @@ } ] } - }, - "optional": false + } } } ], @@ -163,7 +160,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -193,7 +189,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -225,6 +220,7 @@ "ctxt": 0 }, "value": "su", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -260,8 +256,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -293,6 +288,7 @@ "ctxt": 0 }, "value": "fnu", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -354,8 +350,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -387,6 +382,7 @@ "ctxt": 0 }, "value": "osu", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -426,7 +422,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -465,8 +460,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -498,6 +492,7 @@ "ctxt": 0 }, "value": "ofnu", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -537,7 +532,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -594,8 +588,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -627,8 +620,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -648,7 +641,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -678,7 +670,6 @@ "ctxt": 0 }, "value": "su", - "typeAnnotation": null, "optional": false }, "property": { @@ -689,7 +680,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -727,6 +717,7 @@ "ctxt": 0 }, "value": "v1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -743,8 +734,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -761,7 +751,6 @@ "ctxt": 0 }, "value": "unbox", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -775,7 +764,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } } @@ -811,8 +799,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -832,7 +820,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -869,7 +856,6 @@ "ctxt": 0 }, "value": "su", - "typeAnnotation": null, "optional": false }, "property": { @@ -880,7 +866,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -947,6 +932,7 @@ "ctxt": 0 }, "value": "v2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -963,8 +949,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -981,7 +966,6 @@ "ctxt": 0 }, "value": "unbox", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -995,7 +979,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -1031,6 +1014,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1062,7 +1046,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1109,8 +1092,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1130,7 +1112,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -1160,7 +1141,6 @@ "ctxt": 0 }, "value": "su", - "typeAnnotation": null, "optional": false }, "property": { @@ -1171,7 +1151,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1209,6 +1188,7 @@ "ctxt": 0 }, "value": "v3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1225,8 +1205,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1243,7 +1222,6 @@ "ctxt": 0 }, "value": "unbox", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1257,7 +1235,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } } @@ -1293,8 +1270,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1314,7 +1291,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -1344,7 +1320,6 @@ "ctxt": 0 }, "value": "fnu", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1383,6 +1358,7 @@ "ctxt": 0 }, "value": "v4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1399,8 +1375,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1417,7 +1392,6 @@ "ctxt": 0 }, "value": "unbox", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1431,7 +1405,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } } @@ -1467,8 +1440,8 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1488,7 +1461,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -1518,7 +1490,6 @@ "ctxt": 0 }, "value": "su", - "typeAnnotation": null, "optional": false }, "property": { @@ -1570,6 +1541,7 @@ "ctxt": 0 }, "value": "v5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1586,8 +1558,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1604,7 +1575,6 @@ "ctxt": 0 }, "value": "unbox", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1618,7 +1588,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } } @@ -1654,8 +1623,8 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1675,7 +1644,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -1712,7 +1680,6 @@ "ctxt": 0 }, "value": "osu", - "typeAnnotation": null, "optional": false }, "property": { @@ -1723,7 +1690,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1737,7 +1703,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1774,6 +1739,7 @@ "ctxt": 0 }, "value": "v6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1790,8 +1756,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1808,7 +1773,6 @@ "ctxt": 0 }, "value": "unbox", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1822,7 +1786,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } } @@ -1858,8 +1821,8 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1879,7 +1842,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -1916,7 +1878,6 @@ "ctxt": 0 }, "value": "osu", - "typeAnnotation": null, "optional": false }, "property": { @@ -1927,7 +1888,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1981,6 +1941,7 @@ "ctxt": 0 }, "value": "v7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1997,8 +1958,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -2015,7 +1975,6 @@ "ctxt": 0 }, "value": "unbox", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2029,7 +1988,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } } @@ -2065,8 +2023,8 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -2086,7 +2044,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -2123,7 +2080,6 @@ "ctxt": 0 }, "value": "ofnu", - "typeAnnotation": null, "optional": false }, "property": { @@ -2134,7 +2090,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2175,6 +2130,7 @@ "ctxt": 0 }, "value": "v8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2191,8 +2147,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -2209,7 +2164,6 @@ "ctxt": 0 }, "value": "unbox", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2223,7 +2177,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/propertyAccessChain/propertyAccessChain.2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/propertyAccessChain/propertyAccessChain.2/input.ts.json index 96e881082402..823d5d193126 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/propertyAccessChain/propertyAccessChain.2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/propertyAccessChain/propertyAccessChain.2/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "o1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -79,7 +80,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -109,8 +109,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -151,7 +150,6 @@ "ctxt": 0 }, "value": "o1", - "typeAnnotation": null, "optional": false }, "property": { @@ -162,7 +160,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -194,6 +191,7 @@ "ctxt": 0 }, "value": "o2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -242,7 +240,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -280,7 +277,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -315,8 +311,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -364,7 +359,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { @@ -375,7 +369,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -389,7 +382,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -420,6 +412,7 @@ "ctxt": 0 }, "value": "o3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -451,7 +444,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -506,7 +498,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -541,8 +532,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -590,7 +580,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false }, "property": { @@ -601,7 +590,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -614,7 +602,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/propertyAccessChain/propertyAccessChain.3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/propertyAccessChain/propertyAccessChain.3/input.ts.json index 1a7d01fa9283..6c856c95def8 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/propertyAccessChain/propertyAccessChain.3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/propertyAccessChain/propertyAccessChain.3/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -98,7 +98,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -109,7 +108,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -167,7 +165,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -178,7 +175,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -192,7 +188,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -242,7 +237,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -253,7 +247,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -311,7 +304,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -322,7 +314,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -336,7 +327,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -386,7 +376,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -397,7 +386,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -455,7 +443,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -466,7 +453,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -480,7 +466,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -530,7 +515,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -541,7 +525,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -599,7 +582,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -610,7 +592,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -624,7 +605,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -673,7 +653,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -684,7 +663,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -750,7 +728,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -761,7 +738,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -775,7 +751,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -833,7 +808,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -844,7 +818,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -910,7 +883,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -921,7 +893,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -935,7 +906,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -985,7 +955,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -996,7 +965,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1061,7 +1029,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1072,7 +1039,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1086,7 +1052,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1144,7 +1109,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1155,7 +1119,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1221,7 +1184,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1232,7 +1194,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1246,7 +1207,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1309,7 +1269,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1343,7 +1302,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1401,7 +1359,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1438,7 +1395,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1449,7 +1405,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1463,7 +1418,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1491,7 +1445,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1583,7 +1536,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1677,7 +1629,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1688,7 +1639,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1702,7 +1652,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1731,7 +1680,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1878,7 +1826,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1889,7 +1836,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1903,7 +1849,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/propertyAccessChain/propertyAccessChain/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/propertyAccessChain/propertyAccessChain/input.ts.json index e16e756964b4..524b0093afb1 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/propertyAccessChain/propertyAccessChain/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/optionalChaining/propertyAccessChain/propertyAccessChain/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "o1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -79,7 +80,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -109,8 +109,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -151,7 +150,6 @@ "ctxt": 0 }, "value": "o1", - "typeAnnotation": null, "optional": false }, "property": { @@ -162,7 +160,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -194,6 +191,7 @@ "ctxt": 0 }, "value": "o2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -242,7 +240,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -280,7 +277,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -315,8 +311,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -364,7 +359,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { @@ -375,7 +369,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -389,7 +382,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -420,6 +412,7 @@ "ctxt": 0 }, "value": "o3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -451,7 +444,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -506,7 +498,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -541,8 +532,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -590,7 +580,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false }, "property": { @@ -601,7 +590,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -614,7 +602,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -646,6 +633,7 @@ "ctxt": 0 }, "value": "o4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -677,7 +665,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -715,7 +702,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -753,7 +739,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -791,7 +776,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -834,8 +818,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -909,7 +892,6 @@ "ctxt": 0 }, "value": "o4", - "typeAnnotation": null, "optional": false }, "property": { @@ -920,7 +902,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -933,7 +914,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -947,7 +927,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -960,7 +939,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false @@ -992,6 +970,7 @@ "ctxt": 0 }, "value": "o5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1023,7 +1002,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1060,7 +1038,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1098,7 +1075,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1136,7 +1112,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1179,8 +1154,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1261,7 +1235,6 @@ "ctxt": 0 }, "value": "o5", - "typeAnnotation": null, "optional": false }, "property": { @@ -1272,7 +1245,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1289,7 +1261,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1302,7 +1273,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1315,7 +1285,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1347,6 +1316,7 @@ "ctxt": 0 }, "value": "o6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1385,7 +1355,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1448,7 +1417,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1481,8 +1449,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1530,7 +1497,6 @@ "ctxt": 0 }, "value": "o6", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1562,7 +1528,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1610,7 +1575,6 @@ "ctxt": 0 }, "value": "o1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1621,7 +1585,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1695,7 +1658,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1706,7 +1668,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1721,7 +1682,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1782,7 +1742,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1793,7 +1752,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1808,7 +1766,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/propertyAccess/propertyAccess/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/propertyAccess/propertyAccess/input.ts.json index 20505171b37d..549125eded98 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/propertyAccess/propertyAccess/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/propertyAccess/propertyAccess/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -181,7 +176,6 @@ "ctxt": 0 }, "value": "Compass", - "typeAnnotation": null, "optional": false }, "members": [ @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "North", - "typeAnnotation": null, "optional": false }, "init": null @@ -220,7 +213,6 @@ "ctxt": 0 }, "value": "South", - "typeAnnotation": null, "optional": false }, "init": null @@ -240,7 +232,6 @@ "ctxt": 0 }, "value": "East", - "typeAnnotation": null, "optional": false }, "init": null @@ -260,7 +251,6 @@ "ctxt": 0 }, "value": "West", - "typeAnnotation": null, "optional": false }, "init": null @@ -292,6 +282,7 @@ "ctxt": 0 }, "value": "numIndex", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -318,6 +309,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -334,8 +326,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -364,8 +355,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -463,6 +453,7 @@ "ctxt": 0 }, "value": "strIndex", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -489,6 +480,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,8 +497,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -531,7 +522,6 @@ "ctxt": 0 }, "value": "Compass", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -546,8 +536,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -588,7 +577,6 @@ "ctxt": 0 }, "value": "Compass", - "typeAnnotation": null, "optional": false }, "property": { @@ -599,7 +587,6 @@ "ctxt": 0 }, "value": "North", - "typeAnnotation": null, "optional": false }, "computed": false @@ -636,7 +623,6 @@ "ctxt": 0 }, "value": "Compass", - "typeAnnotation": null, "optional": false }, "property": { @@ -647,7 +633,6 @@ "ctxt": 0 }, "value": "East", - "typeAnnotation": null, "optional": false }, "computed": false @@ -684,6 +669,7 @@ "ctxt": 0 }, "value": "bothIndex", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -710,6 +696,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -726,8 +713,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -752,7 +738,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -776,6 +761,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -792,8 +778,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -818,7 +803,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -833,8 +817,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -851,7 +834,6 @@ "ctxt": 0 }, "value": "noIndex", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -901,8 +883,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -948,7 +930,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -976,7 +957,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -999,7 +979,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -1020,7 +999,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -1048,7 +1026,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": { @@ -1071,7 +1048,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "value": { @@ -1157,6 +1133,7 @@ "ctxt": 0 }, "value": "anyVar", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1173,8 +1150,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1214,6 +1190,7 @@ "ctxt": 0 }, "value": "stringOrNumber", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1249,8 +1226,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1282,6 +1258,7 @@ "ctxt": 0 }, "value": "someObject", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1313,7 +1290,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1341,8 +1317,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1379,7 +1354,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1390,7 +1364,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1436,7 +1409,6 @@ "ctxt": 0 }, "value": "anyVar", - "typeAnnotation": null, "optional": false }, "property": { @@ -1447,7 +1419,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1475,7 +1446,6 @@ "ctxt": 0 }, "value": "anyVar", - "typeAnnotation": null, "optional": false }, "property": { @@ -1486,7 +1456,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1514,7 +1483,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1525,7 +1493,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1545,7 +1512,6 @@ "ctxt": 0 }, "value": "anyVar", - "typeAnnotation": null, "optional": false }, "property": { @@ -1556,7 +1522,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1590,8 +1555,8 @@ "ctxt": 0 }, "value": "aa", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1608,7 +1573,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1619,7 +1583,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1653,8 +1616,8 @@ "ctxt": 0 }, "value": "bb", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1671,7 +1634,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1682,7 +1644,6 @@ "ctxt": 0 }, "value": "hasOwnProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1716,8 +1677,8 @@ "ctxt": 0 }, "value": "cc", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1734,7 +1695,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1745,7 +1705,6 @@ "ctxt": 0 }, "value": "qqq", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1779,8 +1738,8 @@ "ctxt": 0 }, "value": "dd", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1797,7 +1756,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1845,6 +1803,7 @@ "ctxt": 0 }, "value": "dd", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1861,8 +1820,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1894,8 +1852,8 @@ "ctxt": 0 }, "value": "ee", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1912,7 +1870,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1960,6 +1917,7 @@ "ctxt": 0 }, "value": "ee", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1976,8 +1934,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2009,8 +1966,8 @@ "ctxt": 0 }, "value": "ff", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2027,7 +1984,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -2075,6 +2031,7 @@ "ctxt": 0 }, "value": "ff", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2091,8 +2048,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2124,8 +2080,8 @@ "ctxt": 0 }, "value": "gg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2142,7 +2098,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -2190,6 +2145,7 @@ "ctxt": 0 }, "value": "gg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2206,8 +2162,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2239,8 +2194,8 @@ "ctxt": 0 }, "value": "hh", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2257,7 +2212,6 @@ "ctxt": 0 }, "value": "numIndex", - "typeAnnotation": null, "optional": false }, "property": { @@ -2300,6 +2254,7 @@ "ctxt": 0 }, "value": "hh", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2316,8 +2271,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2349,8 +2303,8 @@ "ctxt": 0 }, "value": "ii", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2367,7 +2321,6 @@ "ctxt": 0 }, "value": "numIndex", - "typeAnnotation": null, "optional": false }, "property": { @@ -2385,7 +2338,6 @@ "ctxt": 0 }, "value": "Compass", - "typeAnnotation": null, "optional": false }, "property": { @@ -2396,7 +2348,6 @@ "ctxt": 0 }, "value": "South", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2432,6 +2383,7 @@ "ctxt": 0 }, "value": "ii", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2448,8 +2400,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2481,8 +2432,8 @@ "ctxt": 0 }, "value": "jj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2499,7 +2450,6 @@ "ctxt": 0 }, "value": "numIndex", - "typeAnnotation": null, "optional": false }, "property": { @@ -2510,7 +2460,6 @@ "ctxt": 0 }, "value": "anyVar", - "typeAnnotation": null, "optional": false }, "computed": true @@ -2544,6 +2493,7 @@ "ctxt": 0 }, "value": "jj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2560,8 +2510,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2593,8 +2542,8 @@ "ctxt": 0 }, "value": "kk", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2611,7 +2560,6 @@ "ctxt": 0 }, "value": "numIndex", - "typeAnnotation": null, "optional": false }, "property": { @@ -2659,6 +2607,7 @@ "ctxt": 0 }, "value": "kk", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2675,8 +2624,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2708,8 +2656,8 @@ "ctxt": 0 }, "value": "ll", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2726,7 +2674,6 @@ "ctxt": 0 }, "value": "numIndex", - "typeAnnotation": null, "optional": false }, "property": { @@ -2737,7 +2684,6 @@ "ctxt": 0 }, "value": "someObject", - "typeAnnotation": null, "optional": false }, "computed": true @@ -2771,8 +2717,8 @@ "ctxt": 0 }, "value": "mm", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2789,7 +2735,6 @@ "ctxt": 0 }, "value": "strIndex", - "typeAnnotation": null, "optional": false }, "property": { @@ -2837,6 +2782,7 @@ "ctxt": 0 }, "value": "mm", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2859,13 +2805,11 @@ "ctxt": 0 }, "value": "Compass", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2897,8 +2841,8 @@ "ctxt": 0 }, "value": "mm2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2915,7 +2859,6 @@ "ctxt": 0 }, "value": "strIndex", - "typeAnnotation": null, "optional": false }, "property": { @@ -2963,6 +2906,7 @@ "ctxt": 0 }, "value": "mm2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2985,13 +2929,11 @@ "ctxt": 0 }, "value": "Compass", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3023,8 +2965,8 @@ "ctxt": 0 }, "value": "nn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3041,7 +2983,6 @@ "ctxt": 0 }, "value": "strIndex", - "typeAnnotation": null, "optional": false }, "property": { @@ -3084,6 +3025,7 @@ "ctxt": 0 }, "value": "nn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3106,13 +3048,11 @@ "ctxt": 0 }, "value": "Compass", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3144,8 +3084,8 @@ "ctxt": 0 }, "value": "oo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3162,7 +3102,6 @@ "ctxt": 0 }, "value": "strIndex", - "typeAnnotation": null, "optional": false }, "property": { @@ -3180,7 +3119,6 @@ "ctxt": 0 }, "value": "Compass", - "typeAnnotation": null, "optional": false }, "property": { @@ -3191,7 +3129,6 @@ "ctxt": 0 }, "value": "East", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3227,6 +3164,7 @@ "ctxt": 0 }, "value": "oo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3249,13 +3187,11 @@ "ctxt": 0 }, "value": "Compass", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3287,8 +3223,8 @@ "ctxt": 0 }, "value": "pp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3305,7 +3241,6 @@ "ctxt": 0 }, "value": "strIndex", - "typeAnnotation": null, "optional": false }, "property": { @@ -3364,6 +3299,7 @@ "ctxt": 0 }, "value": "pp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3386,13 +3322,11 @@ "ctxt": 0 }, "value": "Compass", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3424,8 +3358,8 @@ "ctxt": 0 }, "value": "qq", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3442,7 +3376,6 @@ "ctxt": 0 }, "value": "noIndex", - "typeAnnotation": null, "optional": false }, "property": { @@ -3485,6 +3418,7 @@ "ctxt": 0 }, "value": "qq", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3501,8 +3435,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -3534,8 +3467,8 @@ "ctxt": 0 }, "value": "rr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3552,7 +3485,6 @@ "ctxt": 0 }, "value": "noIndex", - "typeAnnotation": null, "optional": false }, "property": { @@ -3600,6 +3532,7 @@ "ctxt": 0 }, "value": "rr", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3616,8 +3549,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -3649,8 +3581,8 @@ "ctxt": 0 }, "value": "ss", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3667,7 +3599,6 @@ "ctxt": 0 }, "value": "noIndex", - "typeAnnotation": null, "optional": false }, "property": { @@ -3685,7 +3616,6 @@ "ctxt": 0 }, "value": "Compass", - "typeAnnotation": null, "optional": false }, "property": { @@ -3696,7 +3626,6 @@ "ctxt": 0 }, "value": "South", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3732,6 +3661,7 @@ "ctxt": 0 }, "value": "ss", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3748,8 +3678,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -3781,8 +3710,8 @@ "ctxt": 0 }, "value": "tt", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3799,7 +3728,6 @@ "ctxt": 0 }, "value": "noIndex", - "typeAnnotation": null, "optional": false }, "property": { @@ -3858,6 +3786,7 @@ "ctxt": 0 }, "value": "tt", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3874,8 +3803,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -3907,8 +3835,8 @@ "ctxt": 0 }, "value": "uu", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3925,7 +3853,6 @@ "ctxt": 0 }, "value": "noIndex", - "typeAnnotation": null, "optional": false }, "property": { @@ -3936,7 +3863,6 @@ "ctxt": 0 }, "value": "someObject", - "typeAnnotation": null, "optional": false }, "computed": true @@ -3970,8 +3896,8 @@ "ctxt": 0 }, "value": "vv", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3988,7 +3914,6 @@ "ctxt": 0 }, "value": "noIndex", - "typeAnnotation": null, "optional": false }, "property": { @@ -4031,6 +3956,7 @@ "ctxt": 0 }, "value": "vv", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4047,8 +3973,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -4080,8 +4005,8 @@ "ctxt": 0 }, "value": "ww", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -4098,7 +4023,6 @@ "ctxt": 0 }, "value": "bothIndex", - "typeAnnotation": null, "optional": false }, "property": { @@ -4116,7 +4040,6 @@ "ctxt": 0 }, "value": "Compass", - "typeAnnotation": null, "optional": false }, "property": { @@ -4127,7 +4050,6 @@ "ctxt": 0 }, "value": "East", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4163,6 +4085,7 @@ "ctxt": 0 }, "value": "ww", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4185,13 +4108,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -4223,8 +4144,8 @@ "ctxt": 0 }, "value": "xx", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -4241,7 +4162,6 @@ "ctxt": 0 }, "value": "bothIndex", - "typeAnnotation": null, "optional": false }, "property": { @@ -4300,6 +4220,7 @@ "ctxt": 0 }, "value": "xx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4322,13 +4243,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -4360,8 +4279,8 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -4378,7 +4297,6 @@ "ctxt": 0 }, "value": "bothIndex", - "typeAnnotation": null, "optional": false }, "property": { @@ -4426,6 +4344,7 @@ "ctxt": 0 }, "value": "yy", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4448,13 +4367,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -4486,8 +4403,8 @@ "ctxt": 0 }, "value": "zz", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -4504,7 +4421,6 @@ "ctxt": 0 }, "value": "bothIndex", - "typeAnnotation": null, "optional": false }, "property": { @@ -4552,6 +4468,7 @@ "ctxt": 0 }, "value": "zz", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4574,13 +4491,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -4612,8 +4527,8 @@ "ctxt": 0 }, "value": "zzzz", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -4630,7 +4545,6 @@ "ctxt": 0 }, "value": "bothIndex", - "typeAnnotation": null, "optional": false }, "property": { @@ -4641,7 +4555,6 @@ "ctxt": 0 }, "value": "someObject", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4675,8 +4588,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -4693,7 +4606,6 @@ "ctxt": 0 }, "value": "numIndex", - "typeAnnotation": null, "optional": false }, "property": { @@ -4704,7 +4616,6 @@ "ctxt": 0 }, "value": "stringOrNumber", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4738,6 +4649,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4754,8 +4666,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -4787,8 +4698,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -4805,7 +4716,6 @@ "ctxt": 0 }, "value": "strIndex", - "typeAnnotation": null, "optional": false }, "property": { @@ -4816,7 +4726,6 @@ "ctxt": 0 }, "value": "stringOrNumber", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4850,6 +4759,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4872,13 +4782,11 @@ "ctxt": 0 }, "value": "Compass", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -4910,8 +4818,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -4928,7 +4836,6 @@ "ctxt": 0 }, "value": "bothIndex", - "typeAnnotation": null, "optional": false }, "property": { @@ -4939,7 +4846,6 @@ "ctxt": 0 }, "value": "stringOrNumber", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4973,6 +4879,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4995,13 +4902,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/propertyAccess/propertyAccessStringIndexSignature/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/propertyAccess/propertyAccessStringIndexSignature/input.ts.json index eff7b0cca213..1c1895ac9586 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/propertyAccess/propertyAccessStringIndexSignature/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/propertyAccess/propertyAccessStringIndexSignature/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Flags", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -126,6 +125,7 @@ "ctxt": 0 }, "value": "flags", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -148,13 +148,11 @@ "ctxt": 0 }, "value": "Flags", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -183,7 +181,6 @@ "ctxt": 0 }, "value": "flags", - "typeAnnotation": null, "optional": false }, "property": { @@ -194,7 +191,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -222,7 +218,6 @@ "ctxt": 0 }, "value": "flags", - "typeAnnotation": null, "optional": false }, "property": { @@ -233,7 +228,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -261,7 +255,6 @@ "ctxt": 0 }, "value": "flags", - "typeAnnotation": null, "optional": false }, "property": { @@ -272,7 +265,6 @@ "ctxt": 0 }, "value": "isNotNecessarilyNeverFalse", - "typeAnnotation": null, "optional": false }, "computed": false @@ -300,7 +292,6 @@ "ctxt": 0 }, "value": "flags", - "typeAnnotation": null, "optional": false }, "property": { @@ -335,7 +326,6 @@ "ctxt": 0 }, "value": "Empty", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -376,6 +366,7 @@ "ctxt": 0 }, "value": "empty", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,13 +389,11 @@ "ctxt": 0 }, "value": "Empty", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -433,7 +422,6 @@ "ctxt": 0 }, "value": "empty", - "typeAnnotation": null, "optional": false }, "property": { @@ -444,7 +432,6 @@ "ctxt": 0 }, "value": "nope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -472,7 +459,6 @@ "ctxt": 0 }, "value": "empty", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/propertyAccess/propertyAccessStringIndexSignatureNoImplicitAny/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/propertyAccess/propertyAccessStringIndexSignatureNoImplicitAny/input.ts.json index bce9d38eb570..bcb505fd9886 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/propertyAccess/propertyAccessStringIndexSignatureNoImplicitAny/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/propertyAccess/propertyAccessStringIndexSignatureNoImplicitAny/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Flags", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -118,6 +117,7 @@ "ctxt": 0 }, "value": "flags", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -140,13 +140,11 @@ "ctxt": 0 }, "value": "Flags", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -175,7 +173,6 @@ "ctxt": 0 }, "value": "flags", - "typeAnnotation": null, "optional": false }, "property": { @@ -186,7 +183,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -214,7 +210,6 @@ "ctxt": 0 }, "value": "flags", - "typeAnnotation": null, "optional": false }, "property": { @@ -225,7 +220,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -253,7 +247,6 @@ "ctxt": 0 }, "value": "flags", - "typeAnnotation": null, "optional": false }, "property": { @@ -264,7 +257,6 @@ "ctxt": 0 }, "value": "isNotNecessarilyNeverFalse", - "typeAnnotation": null, "optional": false }, "computed": false @@ -292,7 +284,6 @@ "ctxt": 0 }, "value": "flags", - "typeAnnotation": null, "optional": false }, "property": { @@ -327,7 +318,6 @@ "ctxt": 0 }, "value": "Empty", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -368,6 +358,7 @@ "ctxt": 0 }, "value": "empty", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -390,13 +381,11 @@ "ctxt": 0 }, "value": "Empty", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -425,7 +414,6 @@ "ctxt": 0 }, "value": "empty", - "typeAnnotation": null, "optional": false }, "property": { @@ -436,7 +424,6 @@ "ctxt": 0 }, "value": "nope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -464,7 +451,6 @@ "ctxt": 0 }, "value": "empty", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/propertyAccess/propertyAccessWidening/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/propertyAccess/propertyAccessWidening/input.ts.json index fd6d3154ca4b..02b33514ea57 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/propertyAccess/propertyAccessWidening/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/propertyAccess/propertyAccessWidening/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "headerNames", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -97,8 +96,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -128,7 +127,6 @@ "ctxt": 0 }, "value": "hasLineBreak", - "typeAnnotation": null, "optional": false }, "value": { @@ -151,7 +149,6 @@ "ctxt": 0 }, "value": "cells", - "typeAnnotation": null, "optional": false }, "value": { @@ -198,8 +195,8 @@ "ctxt": 0 }, "value": "table", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -243,7 +240,6 @@ "ctxt": 0 }, "value": "cells", - "typeAnnotation": null, "optional": false }, "value": { @@ -254,7 +250,6 @@ "ctxt": 0 }, "value": "headerNames", - "typeAnnotation": null, "optional": false } } @@ -271,7 +266,6 @@ "ctxt": 0 }, "value": "concat", - "typeAnnotation": null, "optional": false }, "computed": false @@ -287,7 +281,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -315,7 +308,6 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -336,6 +328,7 @@ "ctxt": 0 }, "value": "headerNames", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -352,8 +345,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -396,8 +388,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -427,7 +419,6 @@ "ctxt": 0 }, "value": "hasLineBreak", - "typeAnnotation": null, "optional": false }, "value": { @@ -450,7 +441,6 @@ "ctxt": 0 }, "value": "cells", - "typeAnnotation": null, "optional": false }, "value": { @@ -497,8 +487,8 @@ "ctxt": 0 }, "value": "table", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -542,7 +532,6 @@ "ctxt": 0 }, "value": "cells", - "typeAnnotation": null, "optional": false }, "value": { @@ -553,7 +542,6 @@ "ctxt": 0 }, "value": "headerNames", - "typeAnnotation": null, "optional": false } } @@ -589,7 +577,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -617,7 +604,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -638,6 +624,7 @@ "ctxt": 0 }, "value": "options", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -669,7 +656,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -711,7 +697,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -739,8 +724,7 @@ } ] } - }, - "optional": true + } } } ], @@ -783,8 +767,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -816,7 +800,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "right": { @@ -838,7 +821,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -872,8 +854,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -905,7 +887,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "right": { @@ -984,7 +965,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "right": { @@ -1006,7 +986,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1067,7 +1046,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "right": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/superCalls/superCalls/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/superCalls/superCalls/input.ts.json index 2ab234777c96..7b6da925a81b 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/superCalls/superCalls/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/superCalls/superCalls/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -100,6 +97,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -116,8 +114,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -150,7 +147,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -201,7 +197,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -227,7 +222,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -249,6 +243,7 @@ "ctxt": 0 }, "value": "q", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -265,8 +260,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -347,8 +341,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -415,8 +409,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -433,7 +427,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -457,7 +450,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -475,7 +467,6 @@ "ctxt": 0 }, "value": "OtherBase", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -502,7 +493,6 @@ "ctxt": 0 }, "value": "OtherDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -528,7 +518,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -565,8 +554,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -626,7 +615,6 @@ "ctxt": 0 }, "value": "OtherBase", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/errorSuperPropertyAccess/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/errorSuperPropertyAccess/input.ts.json index ebe22351064e..9bd4a22dd716 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/errorSuperPropertyAccess/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/errorSuperPropertyAccess/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "NoBase", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -79,8 +77,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -105,7 +103,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -139,8 +136,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -172,7 +169,6 @@ "ctxt": 0 }, "value": "hasOwnProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -222,7 +218,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -266,8 +261,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -292,7 +287,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -326,8 +320,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -359,7 +353,6 @@ "ctxt": 0 }, "value": "hasOwnProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -417,7 +410,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": { @@ -443,7 +435,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -474,7 +465,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -507,7 +497,6 @@ "ctxt": 0 }, "value": "hasOwnProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -559,7 +548,6 @@ "ctxt": 0 }, "value": "static1", - "typeAnnotation": null, "optional": false }, "function": { @@ -615,7 +603,6 @@ "ctxt": 0 }, "value": "hasOwnProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -670,7 +657,6 @@ "ctxt": 0 }, "value": "static2", - "typeAnnotation": null, "optional": false }, "function": { @@ -726,7 +712,6 @@ "ctxt": 0 }, "value": "hasOwnProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -803,7 +788,6 @@ "ctxt": 0 }, "value": "static2", - "typeAnnotation": null, "optional": false }, "function": { @@ -824,8 +808,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -880,7 +864,6 @@ "ctxt": 0 }, "value": "hasOwnProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -937,7 +920,6 @@ "ctxt": 0 }, "value": "SomeBase", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -963,7 +945,6 @@ "ctxt": 0 }, "value": "privateFunc", - "typeAnnotation": null, "optional": false }, "function": { @@ -1009,7 +990,6 @@ "ctxt": 0 }, "value": "privateMember", - "typeAnnotation": null, "optional": false }, "value": { @@ -1047,7 +1027,6 @@ "ctxt": 0 }, "value": "publicFunc", - "typeAnnotation": null, "optional": false }, "function": { @@ -1093,7 +1072,6 @@ "ctxt": 0 }, "value": "publicMember", - "typeAnnotation": null, "optional": false }, "value": { @@ -1131,7 +1109,6 @@ "ctxt": 0 }, "value": "privateStaticFunc", - "typeAnnotation": null, "optional": false }, "function": { @@ -1177,7 +1154,6 @@ "ctxt": 0 }, "value": "privateStaticMember", - "typeAnnotation": null, "optional": false }, "value": { @@ -1215,7 +1191,6 @@ "ctxt": 0 }, "value": "publicStaticFunc", - "typeAnnotation": null, "optional": false }, "function": { @@ -1261,7 +1236,6 @@ "ctxt": 0 }, "value": "publicStaticMember", - "typeAnnotation": null, "optional": false }, "value": { @@ -1301,7 +1275,6 @@ "ctxt": 0 }, "value": "SomeDerived1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1327,7 +1300,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1403,7 +1375,6 @@ "ctxt": 0 }, "value": "publicMember", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1439,7 +1410,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -1483,8 +1453,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1509,7 +1479,6 @@ "ctxt": 0 }, "value": "publicMember", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1546,7 +1515,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -1590,8 +1558,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1616,7 +1584,6 @@ "ctxt": 0 }, "value": "publicMember", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1640,7 +1607,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1672,7 +1638,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -1693,8 +1658,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1735,8 +1700,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1761,7 +1726,6 @@ "ctxt": 0 }, "value": "publicMember", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1796,7 +1760,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "function": { @@ -1825,7 +1788,6 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1881,7 +1843,6 @@ "ctxt": 0 }, "value": "publicFunc", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1922,8 +1883,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1943,7 +1904,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "value": { @@ -2001,7 +1961,6 @@ "ctxt": 0 }, "value": "publicFunc", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2046,7 +2005,6 @@ "ctxt": 0 }, "value": "SomeBase", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2064,7 +2022,6 @@ "ctxt": 0 }, "value": "SomeDerived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2090,7 +2047,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -2166,7 +2122,6 @@ "ctxt": 0 }, "value": "privateMember", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2202,7 +2157,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -2246,8 +2200,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2272,7 +2226,6 @@ "ctxt": 0 }, "value": "privateMember", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2309,7 +2262,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -2353,8 +2305,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2379,7 +2331,6 @@ "ctxt": 0 }, "value": "privateMember", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2403,7 +2354,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2435,7 +2385,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -2456,8 +2405,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -2498,8 +2447,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2524,7 +2473,6 @@ "ctxt": 0 }, "value": "privateMember", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2553,7 +2501,6 @@ "ctxt": 0 }, "value": "SomeBase", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2571,7 +2518,6 @@ "ctxt": 0 }, "value": "SomeDerived3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2597,7 +2543,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -2654,7 +2599,6 @@ "ctxt": 0 }, "value": "publicStaticMember", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2708,7 +2652,6 @@ "ctxt": 0 }, "value": "privateStaticMember", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2761,7 +2704,6 @@ "ctxt": 0 }, "value": "privateStaticFunc", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2798,7 +2740,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -2855,7 +2796,6 @@ "ctxt": 0 }, "value": "publicStaticMember", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2909,7 +2849,6 @@ "ctxt": 0 }, "value": "privateStaticMember", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2962,7 +2901,6 @@ "ctxt": 0 }, "value": "privateStaticFunc", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3021,7 +2959,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -3042,8 +2979,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -3099,7 +3036,6 @@ "ctxt": 0 }, "value": "publicStaticMember", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3153,7 +3089,6 @@ "ctxt": 0 }, "value": "privateStaticMember", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3206,7 +3141,6 @@ "ctxt": 0 }, "value": "privateStaticFunc", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3237,7 +3171,6 @@ "ctxt": 0 }, "value": "SomeBase", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -3270,8 +3203,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -3291,7 +3224,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -3317,7 +3249,6 @@ "ctxt": 0 }, "value": "wat", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3333,7 +3264,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -3366,7 +3296,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superPropertyAccessNoError/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superPropertyAccessNoError/input.ts.json index b8a5f533a0e8..b04d1311ff98 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superPropertyAccessNoError/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superPropertyAccessNoError/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "SomeBaseClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "function": { @@ -111,7 +109,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "function": { @@ -175,7 +172,6 @@ "ctxt": 0 }, "value": "returnThis", - "typeAnnotation": null, "optional": false }, "function": { @@ -240,7 +236,6 @@ "ctxt": 0 }, "value": "SomeDerivedClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -266,7 +261,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -329,8 +323,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -362,7 +356,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "computed": false @@ -399,6 +392,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -415,8 +409,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -443,7 +436,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -487,8 +479,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -520,7 +512,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "computed": false @@ -557,6 +548,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -573,8 +565,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -606,8 +597,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -647,7 +638,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "computed": false @@ -692,7 +682,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -736,8 +725,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -769,7 +758,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "computed": false @@ -806,6 +794,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -822,8 +811,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -874,7 +862,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -895,8 +882,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -939,8 +926,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -972,7 +959,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1009,6 +995,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1025,8 +1012,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1061,7 +1047,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -1105,8 +1090,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1138,7 +1123,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1175,6 +1159,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1191,8 +1176,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1227,7 +1211,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -1271,8 +1254,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1304,7 +1287,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1341,6 +1323,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1357,8 +1340,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1409,7 +1391,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -1430,8 +1411,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1474,8 +1455,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1507,7 +1488,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1544,6 +1524,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1560,8 +1541,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1596,7 +1576,6 @@ "ctxt": 0 }, "value": "returnThis", - "typeAnnotation": null, "optional": false }, "function": { @@ -1652,7 +1631,6 @@ "ctxt": 0 }, "value": "returnThis", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1683,7 +1661,6 @@ "ctxt": 0 }, "value": "SomeBaseClass", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1716,8 +1693,8 @@ "ctxt": 0 }, "value": "instance", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1734,7 +1711,6 @@ "ctxt": 0 }, "value": "SomeDerivedClass", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1787,7 +1763,6 @@ "ctxt": 0 }, "value": "instance", - "typeAnnotation": null, "optional": false }, "property": { @@ -1798,7 +1773,6 @@ "ctxt": 0 }, "value": "returnThis", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1814,7 +1788,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superSymbolIndexedAccess1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superSymbolIndexedAccess1/input.ts.json index 70fc30944091..c2e878efa91d 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superSymbolIndexedAccess1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superSymbolIndexedAccess1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -56,7 +56,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +66,6 @@ "ctxt": 0 }, "value": "for", - "typeAnnotation": null, "optional": false }, "computed": false @@ -107,7 +105,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -140,7 +137,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false } }, @@ -207,7 +203,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -240,7 +235,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false } }, @@ -297,7 +291,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": true @@ -328,7 +321,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superSymbolIndexedAccess2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superSymbolIndexedAccess2/input.ts.json index dd8bc3c7bb2f..0c54213a82e9 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superSymbolIndexedAccess2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superSymbolIndexedAccess2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "isConcatSpreadable", - "typeAnnotation": null, "optional": false }, "computed": false @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -176,7 +172,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -187,7 +182,6 @@ "ctxt": 0 }, "value": "isConcatSpreadable", - "typeAnnotation": null, "optional": false }, "computed": false @@ -253,7 +247,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -264,7 +257,6 @@ "ctxt": 0 }, "value": "isConcatSpreadable", - "typeAnnotation": null, "optional": false }, "computed": false @@ -297,7 +289,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superSymbolIndexedAccess3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superSymbolIndexedAccess3/input.ts.json index e2b0335069ea..7d74e9d16f62 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superSymbolIndexedAccess3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superSymbolIndexedAccess3/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -56,7 +56,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +66,6 @@ "ctxt": 0 }, "value": "for", - "typeAnnotation": null, "optional": false }, "computed": false @@ -107,7 +105,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -140,7 +137,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false } }, @@ -207,7 +203,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -240,7 +235,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false } }, @@ -297,7 +291,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "computed": true @@ -328,7 +321,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superSymbolIndexedAccess4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superSymbolIndexedAccess4/input.ts.json index eaca7b93712e..457d44238ea6 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superSymbolIndexedAccess4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superSymbolIndexedAccess4/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -56,7 +56,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +66,6 @@ "ctxt": 0 }, "value": "for", - "typeAnnotation": null, "optional": false }, "computed": false @@ -107,7 +105,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -140,7 +137,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false } }, @@ -197,7 +193,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": true diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superSymbolIndexedAccess5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superSymbolIndexedAccess5/input.ts.json index 4f15606d6087..d1da088e9b17 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superSymbolIndexedAccess5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superSymbolIndexedAccess5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "symbol", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -65,7 +65,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -98,7 +97,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false } }, @@ -165,7 +163,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -198,7 +195,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false } }, @@ -255,7 +251,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": true @@ -286,7 +281,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superSymbolIndexedAccess6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superSymbolIndexedAccess6/input.ts.json index 86ae113ec97c..4005659d6f21 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superSymbolIndexedAccess6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/superPropertyAccess/superSymbolIndexedAccess6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "symbol", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -65,7 +65,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -98,7 +97,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false } }, @@ -165,7 +163,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -198,7 +195,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false } }, @@ -255,7 +251,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": true @@ -286,7 +281,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/thisKeyword/thisInObjectLiterals/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/thisKeyword/thisInObjectLiterals/input.ts.json index 3b207eebdbe9..41dfc00ea0c3 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/thisKeyword/thisInObjectLiterals/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/thisKeyword/thisInObjectLiterals/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -123,7 +120,6 @@ "ctxt": 0 }, "value": "ContainingThis", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -161,8 +157,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -204,7 +199,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -230,7 +224,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -267,6 +260,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -298,7 +292,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -327,7 +320,6 @@ "ctxt": 0 }, "value": "ContainingThis", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -351,7 +343,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -379,8 +370,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -432,8 +422,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -453,7 +443,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -501,7 +490,6 @@ "ctxt": 0 }, "value": "spaaace", - "typeAnnotation": null, "optional": false }, "computed": false @@ -545,6 +533,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -576,7 +565,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -622,8 +610,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/thisKeyword/typeOfThis/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/thisKeyword/typeOfThis/input.ts.json index 962448ee345b..36362a294e89 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/thisKeyword/typeOfThis/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/thisKeyword/typeOfThis/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "MyTestClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "canary", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "staticCanary", - "typeAnnotation": null, "optional": false }, "value": null, @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -171,8 +167,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -197,7 +193,6 @@ "ctxt": 0 }, "value": "canary", - "typeAnnotation": null, "optional": false }, "computed": false @@ -231,6 +226,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -247,8 +243,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -293,7 +288,6 @@ "ctxt": 0 }, "value": "canary", - "typeAnnotation": null, "optional": false }, "computed": false @@ -329,7 +323,6 @@ "ctxt": 0 }, "value": "memberFunc", - "typeAnnotation": null, "optional": false }, "function": { @@ -357,8 +350,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ThisExpression", @@ -411,6 +404,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -433,13 +427,11 @@ "ctxt": 0 }, "value": "MyTestClass", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -471,8 +463,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -511,6 +503,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -533,13 +526,11 @@ "ctxt": 0 }, "value": "MyTestClass", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -574,7 +565,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "function": { @@ -618,8 +608,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -658,6 +648,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -680,13 +671,11 @@ "ctxt": 0 }, "value": "MyTestClass", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -737,7 +726,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "function": { @@ -758,8 +746,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -802,8 +790,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -842,6 +830,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -864,13 +853,11 @@ "ctxt": 0 }, "value": "MyTestClass", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -900,8 +887,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -911,7 +898,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -939,8 +925,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -950,7 +936,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -983,7 +968,6 @@ "ctxt": 0 }, "value": "someFunc", - "typeAnnotation": null, "optional": false }, "value": { @@ -1027,8 +1011,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -1067,6 +1051,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1089,13 +1074,11 @@ "ctxt": 0 }, "value": "MyTestClass", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1135,7 +1118,6 @@ "ctxt": 0 }, "value": "staticFn", - "typeAnnotation": null, "optional": false }, "function": { @@ -1163,8 +1145,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ThisExpression", @@ -1217,6 +1199,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1239,12 +1222,10 @@ "ctxt": 0 }, "value": "MyTestClass", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1276,8 +1257,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1287,7 +1268,6 @@ "ctxt": 0 }, "value": "MyTestClass", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1316,7 +1296,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -1327,7 +1306,6 @@ "ctxt": 0 }, "value": "staticCanary", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1358,8 +1336,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -1398,6 +1376,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1420,12 +1399,10 @@ "ctxt": 0 }, "value": "MyTestClass", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1457,8 +1434,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1468,7 +1445,6 @@ "ctxt": 0 }, "value": "MyTestClass", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1497,7 +1473,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -1508,7 +1483,6 @@ "ctxt": 0 }, "value": "staticCanary", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1542,7 +1516,6 @@ "ctxt": 0 }, "value": "staticProp", - "typeAnnotation": null, "optional": false }, "function": { @@ -1586,8 +1559,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -1626,6 +1599,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1648,12 +1622,10 @@ "ctxt": 0 }, "value": "MyTestClass", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1685,8 +1657,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1696,7 +1668,6 @@ "ctxt": 0 }, "value": "MyTestClass", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1725,7 +1696,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -1736,7 +1706,6 @@ "ctxt": 0 }, "value": "staticCanary", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1786,7 +1755,6 @@ "ctxt": 0 }, "value": "staticProp", - "typeAnnotation": null, "optional": false }, "function": { @@ -1807,6 +1775,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1829,12 +1798,10 @@ "ctxt": 0 }, "value": "MyTestClass", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1877,8 +1844,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -1917,6 +1884,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1939,12 +1907,10 @@ "ctxt": 0 }, "value": "MyTestClass", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1976,8 +1942,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1987,7 +1953,6 @@ "ctxt": 0 }, "value": "MyTestClass", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2016,7 +1981,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -2027,7 +1991,6 @@ "ctxt": 0 }, "value": "staticCanary", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2063,7 +2026,6 @@ "ctxt": 0 }, "value": "MyGenericTestClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2089,7 +2051,6 @@ "ctxt": 0 }, "value": "canary", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2135,7 +2096,6 @@ "ctxt": 0 }, "value": "staticCanary", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2181,7 +2141,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -2218,8 +2177,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2244,7 +2203,6 @@ "ctxt": 0 }, "value": "canary", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2278,6 +2236,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2294,8 +2253,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2340,7 +2298,6 @@ "ctxt": 0 }, "value": "canary", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2376,7 +2333,6 @@ "ctxt": 0 }, "value": "memberFunc", - "typeAnnotation": null, "optional": false }, "function": { @@ -2404,8 +2360,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ThisExpression", @@ -2458,6 +2414,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2480,7 +2437,6 @@ "ctxt": 0 }, "value": "MyGenericTestClass", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2506,7 +2462,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2526,7 +2481,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2534,8 +2488,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2567,8 +2520,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -2607,6 +2560,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2629,7 +2583,6 @@ "ctxt": 0 }, "value": "MyGenericTestClass", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2655,7 +2608,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2675,7 +2627,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2683,8 +2634,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2719,7 +2669,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "function": { @@ -2763,8 +2712,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -2803,6 +2752,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2825,7 +2775,6 @@ "ctxt": 0 }, "value": "MyGenericTestClass", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2851,7 +2800,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2871,7 +2819,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2879,8 +2826,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2931,7 +2877,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "function": { @@ -2952,8 +2897,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -2996,8 +2941,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -3036,6 +2981,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3058,7 +3004,6 @@ "ctxt": 0 }, "value": "MyGenericTestClass", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3084,7 +3029,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3104,7 +3048,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3112,8 +3055,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3143,8 +3085,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3154,7 +3096,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -3182,8 +3123,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3193,7 +3134,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -3226,7 +3166,6 @@ "ctxt": 0 }, "value": "someFunc", - "typeAnnotation": null, "optional": false }, "value": { @@ -3270,8 +3209,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -3310,6 +3249,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3332,7 +3272,6 @@ "ctxt": 0 }, "value": "MyGenericTestClass", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3358,7 +3297,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3378,7 +3316,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3386,8 +3323,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3427,7 +3363,6 @@ "ctxt": 0 }, "value": "staticFn", - "typeAnnotation": null, "optional": false }, "function": { @@ -3455,8 +3390,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ThisExpression", @@ -3509,6 +3444,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3531,12 +3467,10 @@ "ctxt": 0 }, "value": "MyGenericTestClass", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3568,8 +3502,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -3579,7 +3513,6 @@ "ctxt": 0 }, "value": "MyGenericTestClass", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3608,7 +3541,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -3619,7 +3551,6 @@ "ctxt": 0 }, "value": "staticCanary", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3650,8 +3581,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -3690,6 +3621,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3712,12 +3644,10 @@ "ctxt": 0 }, "value": "MyGenericTestClass", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3749,8 +3679,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -3760,7 +3690,6 @@ "ctxt": 0 }, "value": "MyGenericTestClass", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3789,7 +3718,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -3800,7 +3728,6 @@ "ctxt": 0 }, "value": "staticCanary", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3834,7 +3761,6 @@ "ctxt": 0 }, "value": "staticProp", - "typeAnnotation": null, "optional": false }, "function": { @@ -3878,8 +3804,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -3918,6 +3844,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3940,12 +3867,10 @@ "ctxt": 0 }, "value": "MyGenericTestClass", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3977,8 +3902,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -3988,7 +3913,6 @@ "ctxt": 0 }, "value": "MyGenericTestClass", - "typeAnnotation": null, "optional": false }, "definite": false @@ -4017,7 +3941,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -4028,7 +3951,6 @@ "ctxt": 0 }, "value": "staticCanary", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4078,7 +4000,6 @@ "ctxt": 0 }, "value": "staticProp", - "typeAnnotation": null, "optional": false }, "function": { @@ -4099,6 +4020,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4121,12 +4043,10 @@ "ctxt": 0 }, "value": "MyGenericTestClass", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4169,8 +4089,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -4209,6 +4129,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4231,12 +4152,10 @@ "ctxt": 0 }, "value": "MyGenericTestClass", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4268,8 +4187,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -4279,7 +4198,6 @@ "ctxt": 0 }, "value": "MyGenericTestClass", - "typeAnnotation": null, "optional": false }, "definite": false @@ -4308,7 +4226,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -4319,7 +4236,6 @@ "ctxt": 0 }, "value": "staticCanary", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4364,7 +4280,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4385,7 +4300,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4406,7 +4320,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4434,8 +4347,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ThisExpression", @@ -4488,6 +4401,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4504,8 +4418,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -4542,7 +4455,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -4553,7 +4465,6 @@ "ctxt": 0 }, "value": "spaaaaaaace", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4594,6 +4505,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4610,8 +4522,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -4643,8 +4554,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -4696,7 +4607,6 @@ "ctxt": 0 }, "value": "spaaaaace", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4744,8 +4654,8 @@ "ctxt": 0 }, "value": "q1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -4774,8 +4684,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ThisExpression", @@ -4828,6 +4738,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4844,8 +4755,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -4882,7 +4792,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -4893,7 +4802,6 @@ "ctxt": 0 }, "value": "spaaaaaaace", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4934,6 +4842,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4950,8 +4859,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -4983,8 +4891,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -5036,7 +4944,6 @@ "ctxt": 0 }, "value": "spaaaaace", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5088,8 +4995,8 @@ "ctxt": 0 }, "value": "q2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -5114,8 +5021,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ThisExpression", @@ -5161,6 +5068,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5183,12 +5091,10 @@ "ctxt": 0 }, "value": "globalThis", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5225,7 +5131,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -5236,7 +5141,6 @@ "ctxt": 0 }, "value": "spaaaaaaace", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5277,6 +5181,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5299,12 +5204,10 @@ "ctxt": 0 }, "value": "globalThis", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5336,8 +5239,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -5389,7 +5292,6 @@ "ctxt": 0 }, "value": "spaaaaace", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5441,6 +5343,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5463,12 +5366,10 @@ "ctxt": 0 }, "value": "globalThis", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5500,8 +5401,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -5553,7 +5454,6 @@ "ctxt": 0 }, "value": "spaaaaace", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/thisKeyword/typeOfThisInConstructorParamList/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/thisKeyword/typeOfThisInConstructorParamList/input.ts.json index a77131a09b8b..e16d47322655 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/thisKeyword/typeOfThisInConstructorParamList/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/thisKeyword/typeOfThisInConstructorParamList/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "ErrClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -69,8 +67,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ThisExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeAssertions/duplicatePropertiesInTypeAssertions01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeAssertions/duplicatePropertiesInTypeAssertions01/input.ts.json index a275c090cabd..8e4008f92458 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeAssertions/duplicatePropertiesInTypeAssertions01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeAssertions/duplicatePropertiesInTypeAssertions01/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -74,7 +74,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -116,7 +115,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeAssertions/duplicatePropertiesInTypeAssertions02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeAssertions/duplicatePropertiesInTypeAssertions02/input.ts.json index 0e3a87c886db..efef7f7b306a 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeAssertions/duplicatePropertiesInTypeAssertions02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeAssertions/duplicatePropertiesInTypeAssertions02/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -74,7 +74,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -116,7 +115,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/TypeGuardWithArrayUnion/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/TypeGuardWithArrayUnion/input.ts.json index 67dab4b97595..c31e07ebc409 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/TypeGuardWithArrayUnion/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/TypeGuardWithArrayUnion/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Message", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "saySize", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -111,6 +108,7 @@ "ctxt": 0 }, "value": "message", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -141,7 +139,6 @@ "ctxt": 0 }, "value": "Message", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -168,7 +165,6 @@ "ctxt": 0 }, "value": "Message", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -176,8 +172,7 @@ } ] } - }, - "optional": false + } } } ], @@ -218,7 +213,6 @@ "ctxt": 0 }, "value": "message", - "typeAnnotation": null, "optional": false }, "right": { @@ -229,7 +223,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false } }, @@ -263,7 +256,6 @@ "ctxt": 0 }, "value": "message", - "typeAnnotation": null, "optional": false }, "property": { @@ -274,7 +266,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/TypeGuardWithEnumUnion/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/TypeGuardWithEnumUnion/input.ts.json index 9a403ed20c31..1188a5740a4e 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/TypeGuardWithEnumUnion/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/TypeGuardWithEnumUnion/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Color", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "init": null @@ -82,7 +79,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -99,7 +95,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -120,6 +115,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -150,7 +146,6 @@ "ctxt": 0 }, "value": "Color", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -166,8 +161,7 @@ } ] } - }, - "optional": false + } } } ], @@ -216,7 +210,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -268,8 +261,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -279,7 +272,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -311,6 +303,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -333,13 +326,11 @@ "ctxt": 0 }, "value": "Color", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -381,8 +372,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -392,7 +383,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -424,6 +414,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -440,8 +431,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -468,7 +458,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -489,6 +478,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -519,7 +509,6 @@ "ctxt": 0 }, "value": "Color", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -552,8 +541,7 @@ } ] } - }, - "optional": false + } } } ], @@ -602,7 +590,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -654,8 +641,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -665,7 +652,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -697,6 +683,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -721,8 +708,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -764,7 +750,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -816,8 +801,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -827,7 +812,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -859,6 +843,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -881,13 +866,11 @@ "ctxt": 0 }, "value": "Color", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -929,8 +912,8 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -940,7 +923,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -972,6 +954,7 @@ "ctxt": 0 }, "value": "w", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1015,8 +998,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1057,7 +1039,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1109,8 +1090,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1120,7 +1101,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1152,6 +1132,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1168,8 +1149,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1211,8 +1191,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1222,7 +1202,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1254,6 +1233,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1284,7 +1264,6 @@ "ctxt": 0 }, "value": "Color", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1308,8 +1287,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/nullOrUndefinedTypeGuardIsOrderIndependent/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/nullOrUndefinedTypeGuardIsOrderIndependent/input.ts.json index 7e5a775db8e1..2089accc4634 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/nullOrUndefinedTypeGuardIsOrderIndependent/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/nullOrUndefinedTypeGuardIsOrderIndependent/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "strOrNull", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -72,8 +72,7 @@ } ] } - }, - "optional": false + } } }, { @@ -92,6 +91,7 @@ "ctxt": 0 }, "value": "strOrUndefined", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -127,8 +127,7 @@ } ] } - }, - "optional": false + } } } ], @@ -171,6 +170,7 @@ "ctxt": 0 }, "value": "str", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -187,8 +187,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -233,6 +232,7 @@ "ctxt": 0 }, "value": "nil", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -249,8 +249,7 @@ }, "kind": "null" } - }, - "optional": false + } }, "init": null, "definite": false @@ -288,7 +287,6 @@ "ctxt": 0 }, "value": "strOrNull", - "typeAnnotation": null, "optional": false } }, @@ -323,8 +321,8 @@ "ctxt": 0 }, "value": "nil", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -334,7 +332,6 @@ "ctxt": 0 }, "value": "strOrNull", - "typeAnnotation": null, "optional": false } } @@ -372,8 +369,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -383,7 +380,6 @@ "ctxt": 0 }, "value": "strOrNull", - "typeAnnotation": null, "optional": false } } @@ -414,7 +410,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -425,7 +420,6 @@ "ctxt": 0 }, "value": "strOrUndefined", - "typeAnnotation": null, "optional": false } }, @@ -460,8 +454,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -471,7 +465,6 @@ "ctxt": 0 }, "value": "strOrUndefined", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardEnums/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardEnums/input.ts.json index a0a912f042d4..d1aa3aec9d88 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardEnums/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardEnums/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [] @@ -45,7 +44,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "members": [] @@ -75,6 +73,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -123,7 +122,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -143,15 +141,13 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -189,7 +185,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -231,7 +226,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -260,7 +254,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -298,7 +291,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -340,7 +332,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -369,7 +360,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardFunction/input.ts.json index 80da03d0f75a..b33dd2ec9c33 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardFunction/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "propA", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "propB", - "typeAnnotation": null, "optional": false }, "value": null, @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "propC", - "typeAnnotation": null, "optional": false }, "value": null, @@ -230,7 +224,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -248,7 +241,6 @@ "ctxt": 0 }, "value": "isA", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -269,6 +261,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -285,8 +278,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -323,7 +315,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -348,7 +339,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -367,7 +357,6 @@ "ctxt": 0 }, "value": "isB", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -388,6 +377,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -404,8 +394,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -442,7 +431,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -467,7 +455,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -486,7 +473,6 @@ "ctxt": 0 }, "value": "isC", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -507,6 +493,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -523,8 +510,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -561,7 +547,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -586,7 +571,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -605,7 +589,6 @@ "ctxt": 0 }, "value": "retC", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -642,7 +625,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -674,6 +656,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -696,13 +679,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -734,6 +715,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -756,13 +738,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -791,7 +771,6 @@ "ctxt": 0 }, "value": "isC", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -805,7 +784,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -842,7 +820,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -853,7 +830,6 @@ "ctxt": 0 }, "value": "propC", - "typeAnnotation": null, "optional": false }, "computed": false @@ -888,6 +864,7 @@ "ctxt": 0 }, "value": "subType", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -910,13 +887,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -945,7 +920,6 @@ "ctxt": 0 }, "value": "isA", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -959,7 +933,6 @@ "ctxt": 0 }, "value": "subType", - "typeAnnotation": null, "optional": false } } @@ -996,7 +969,6 @@ "ctxt": 0 }, "value": "subType", - "typeAnnotation": null, "optional": false }, "property": { @@ -1007,7 +979,6 @@ "ctxt": 0 }, "value": "propC", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1042,6 +1013,7 @@ "ctxt": 0 }, "value": "union", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1072,7 +1044,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1092,15 +1063,13 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1129,7 +1098,6 @@ "ctxt": 0 }, "value": "isA", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1143,7 +1111,6 @@ "ctxt": 0 }, "value": "union", - "typeAnnotation": null, "optional": false } } @@ -1180,7 +1147,6 @@ "ctxt": 0 }, "value": "union", - "typeAnnotation": null, "optional": false }, "property": { @@ -1191,7 +1157,6 @@ "ctxt": 0 }, "value": "propA", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1216,7 +1181,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1246,6 +1210,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1268,13 +1233,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1300,7 +1263,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1325,7 +1287,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1348,7 +1309,6 @@ "ctxt": 0 }, "value": "isC_multipleParams", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1369,8 +1329,8 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1389,8 +1349,8 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1427,7 +1387,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1452,7 +1411,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1483,7 +1441,6 @@ "ctxt": 0 }, "value": "isC_multipleParams", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1497,7 +1454,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1546,7 +1502,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1557,7 +1512,6 @@ "ctxt": 0 }, "value": "propC", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1592,6 +1546,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1623,7 +1578,6 @@ "ctxt": 0 }, "value": "func1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1637,6 +1591,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1659,13 +1614,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1691,7 +1644,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1716,7 +1668,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1728,8 +1679,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1746,7 +1696,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1772,7 +1721,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "function": { @@ -1793,6 +1741,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1815,13 +1764,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1884,7 +1831,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1909,7 +1855,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1956,8 +1901,8 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1975,6 +1920,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1997,13 +1943,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2041,7 +1985,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -2066,7 +2009,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2089,7 +2031,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2110,6 +2051,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2133,6 +2075,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2155,13 +2098,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2188,7 +2129,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -2213,7 +2153,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2222,8 +2161,7 @@ } } } - }, - "optional": false + } } } ], @@ -2261,7 +2199,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2287,6 +2224,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2309,13 +2247,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2378,7 +2314,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -2403,7 +2338,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2427,7 +2361,6 @@ "ctxt": 0 }, "value": "acceptingBoolean", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2448,6 +2381,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2464,8 +2398,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -2503,7 +2436,6 @@ "ctxt": 0 }, "value": "acceptingBoolean", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2524,7 +2456,6 @@ "ctxt": 0 }, "value": "isA", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2538,7 +2469,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2560,7 +2490,6 @@ "ctxt": 0 }, "value": "acceptingTypeGuardFunction", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2581,6 +2510,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2604,8 +2534,8 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeParams": null, @@ -2632,7 +2562,6 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -2657,7 +2586,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2666,8 +2594,7 @@ } } } - }, - "optional": false + } } } ], @@ -2705,7 +2632,6 @@ "ctxt": 0 }, "value": "acceptingTypeGuardFunction", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2719,7 +2645,6 @@ "ctxt": 0 }, "value": "isA", - "typeAnnotation": null, "optional": false } } @@ -2752,6 +2677,7 @@ "ctxt": 0 }, "value": "union2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2782,7 +2708,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2802,15 +2727,13 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2842,6 +2765,7 @@ "ctxt": 0 }, "value": "union3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2881,15 +2805,13 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -2914,7 +2836,6 @@ "ctxt": 0 }, "value": "isA", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2928,7 +2849,6 @@ "ctxt": 0 }, "value": "union2", - "typeAnnotation": null, "optional": false } } @@ -2943,7 +2863,6 @@ "ctxt": 0 }, "value": "union2", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardFunctionGenerics/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardFunctionGenerics/input.ts.json index 2e03040919cb..e6167cfbe0f7 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardFunctionGenerics/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardFunctionGenerics/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "propA", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "propB", - "typeAnnotation": null, "optional": false }, "value": null, @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "propC", - "typeAnnotation": null, "optional": false }, "value": null, @@ -230,7 +224,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -248,7 +241,6 @@ "ctxt": 0 }, "value": "isB", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -269,8 +261,8 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -307,7 +299,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -332,7 +323,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -351,7 +341,6 @@ "ctxt": 0 }, "value": "isC", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -372,8 +361,8 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -410,7 +399,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -435,7 +423,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -454,7 +441,6 @@ "ctxt": 0 }, "value": "retC", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -475,8 +461,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -512,7 +498,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -529,7 +514,6 @@ "ctxt": 0 }, "value": "funA", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -550,6 +534,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -573,8 +558,8 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeParams": null, @@ -600,15 +585,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -644,7 +627,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -674,7 +656,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -691,7 +672,6 @@ "ctxt": 0 }, "value": "funB", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -712,6 +692,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -735,8 +716,8 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeParams": null, @@ -762,15 +743,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -789,6 +768,7 @@ "ctxt": 0 }, "value": "p2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -805,8 +785,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -842,7 +821,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -873,7 +851,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -898,7 +875,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -917,7 +893,6 @@ "ctxt": 0 }, "value": "funC", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -938,6 +913,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -961,8 +937,8 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeParams": null, @@ -989,7 +965,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1014,7 +989,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1023,8 +997,7 @@ } } } - }, - "optional": false + } } } ], @@ -1060,7 +1033,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1090,7 +1062,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1107,7 +1078,6 @@ "ctxt": 0 }, "value": "funD", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1128,6 +1098,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1151,8 +1122,8 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeParams": null, @@ -1179,7 +1150,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1204,7 +1174,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1213,8 +1182,7 @@ } } } - }, - "optional": false + } } }, { @@ -1233,6 +1201,7 @@ "ctxt": 0 }, "value": "p2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1249,8 +1218,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1286,7 +1254,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1317,7 +1284,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1342,7 +1308,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1361,7 +1326,6 @@ "ctxt": 0 }, "value": "funE", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1382,6 +1346,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1405,8 +1370,8 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeParams": null, @@ -1433,7 +1398,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1458,7 +1422,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1467,8 +1430,7 @@ } } } - }, - "optional": false + } } }, { @@ -1487,6 +1449,7 @@ "ctxt": 0 }, "value": "p2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1509,13 +1472,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1551,7 +1512,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1572,7 +1532,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1602,7 +1561,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1634,6 +1592,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1656,13 +1615,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1694,6 +1651,7 @@ "ctxt": 0 }, "value": "test1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1710,8 +1668,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1728,7 +1685,6 @@ "ctxt": 0 }, "value": "funA", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1742,7 +1698,6 @@ "ctxt": 0 }, "value": "isB", - "typeAnnotation": null, "optional": false } } @@ -1775,7 +1730,6 @@ "ctxt": 0 }, "value": "funB", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1789,7 +1743,6 @@ "ctxt": 0 }, "value": "retC", - "typeAnnotation": null, "optional": false } }, @@ -1803,7 +1756,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1840,7 +1792,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1851,7 +1802,6 @@ "ctxt": 0 }, "value": "propC", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1886,6 +1836,7 @@ "ctxt": 0 }, "value": "test2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1908,13 +1859,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1931,7 +1880,6 @@ "ctxt": 0 }, "value": "funC", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1945,7 +1893,6 @@ "ctxt": 0 }, "value": "isB", - "typeAnnotation": null, "optional": false } } @@ -1978,7 +1925,6 @@ "ctxt": 0 }, "value": "funD", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1992,7 +1938,6 @@ "ctxt": 0 }, "value": "isC", - "typeAnnotation": null, "optional": false } }, @@ -2006,7 +1951,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2043,7 +1987,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -2054,7 +1997,6 @@ "ctxt": 0 }, "value": "propC", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2089,6 +2031,7 @@ "ctxt": 0 }, "value": "test3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2111,13 +2054,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -2134,7 +2075,6 @@ "ctxt": 0 }, "value": "funE", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2148,7 +2088,6 @@ "ctxt": 0 }, "value": "isB", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardFunctionOfFormThis/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardFunctionOfFormThis/input.ts.json index c810925aa2ae..e0b048b3c4d0 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardFunctionOfFormThis/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardFunctionOfFormThis/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "RoyalGuard", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "isLeader", - "typeAnnotation": null, "optional": false }, "function": { @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "LeadGuard", - "typeAnnotation": null, "optional": false } } @@ -147,7 +144,6 @@ "ctxt": 0 }, "value": "LeadGuard", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -177,7 +173,6 @@ "ctxt": 0 }, "value": "isFollower", - "typeAnnotation": null, "optional": false }, "function": { @@ -227,7 +222,6 @@ "ctxt": 0 }, "value": "FollowerGuard", - "typeAnnotation": null, "optional": false } } @@ -282,7 +276,6 @@ "ctxt": 0 }, "value": "FollowerGuard", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -314,7 +307,6 @@ "ctxt": 0 }, "value": "LeadGuard", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -340,7 +332,6 @@ "ctxt": 0 }, "value": "lead", - "typeAnnotation": null, "optional": false }, "function": { @@ -404,7 +395,6 @@ "ctxt": 0 }, "value": "RoyalGuard", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -422,7 +412,6 @@ "ctxt": 0 }, "value": "FollowerGuard", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -448,7 +437,6 @@ "ctxt": 0 }, "value": "follow", - "typeAnnotation": null, "optional": false }, "function": { @@ -512,7 +500,6 @@ "ctxt": 0 }, "value": "RoyalGuard", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -545,6 +532,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -567,13 +555,11 @@ "ctxt": 0 }, "value": "RoyalGuard", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -590,7 +576,6 @@ "ctxt": 0 }, "value": "FollowerGuard", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -629,7 +614,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -640,7 +624,6 @@ "ctxt": 0 }, "value": "isLeader", - "typeAnnotation": null, "optional": false }, "computed": false @@ -685,7 +668,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -696,7 +678,6 @@ "ctxt": 0 }, "value": "lead", - "typeAnnotation": null, "optional": false }, "computed": false @@ -736,7 +717,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -747,7 +727,6 @@ "ctxt": 0 }, "value": "isFollower", - "typeAnnotation": null, "optional": false }, "computed": false @@ -792,7 +771,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -803,7 +781,6 @@ "ctxt": 0 }, "value": "follow", - "typeAnnotation": null, "optional": false }, "computed": false @@ -832,7 +809,6 @@ "ctxt": 0 }, "value": "GuardInterface", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -853,7 +829,6 @@ "ctxt": 0 }, "value": "RoyalGuard", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -894,6 +869,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -916,13 +892,11 @@ "ctxt": 0 }, "value": "GuardInterface", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -958,7 +932,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -969,7 +942,6 @@ "ctxt": 0 }, "value": "isLeader", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1014,7 +986,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1025,7 +996,6 @@ "ctxt": 0 }, "value": "lead", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1065,7 +1035,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1076,7 +1045,6 @@ "ctxt": 0 }, "value": "isFollower", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1121,7 +1089,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1132,7 +1099,6 @@ "ctxt": 0 }, "value": "follow", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1171,8 +1137,8 @@ "ctxt": 0 }, "value": "holder2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1190,7 +1156,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } ] @@ -1235,7 +1200,6 @@ "ctxt": 0 }, "value": "holder2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1246,7 +1210,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1259,7 +1222,6 @@ "ctxt": 0 }, "value": "isLeader", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1297,7 +1259,6 @@ "ctxt": 0 }, "value": "holder2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1308,7 +1269,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1346,7 +1306,6 @@ "ctxt": 0 }, "value": "holder2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1357,7 +1316,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1376,7 +1334,6 @@ "ctxt": 0 }, "value": "ArrowGuard", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1402,7 +1359,6 @@ "ctxt": 0 }, "value": "isElite", - "typeAnnotation": null, "optional": false }, "value": { @@ -1452,7 +1408,6 @@ "ctxt": 0 }, "value": "ArrowElite", - "typeAnnotation": null, "optional": false } } @@ -1507,7 +1462,6 @@ "ctxt": 0 }, "value": "ArrowElite", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1542,7 +1496,6 @@ "ctxt": 0 }, "value": "isMedic", - "typeAnnotation": null, "optional": false }, "value": { @@ -1592,7 +1545,6 @@ "ctxt": 0 }, "value": "ArrowMedic", - "typeAnnotation": null, "optional": false } } @@ -1647,7 +1599,6 @@ "ctxt": 0 }, "value": "ArrowMedic", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1684,7 +1635,6 @@ "ctxt": 0 }, "value": "ArrowElite", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1710,7 +1660,6 @@ "ctxt": 0 }, "value": "defend", - "typeAnnotation": null, "optional": false }, "function": { @@ -1766,7 +1715,6 @@ "ctxt": 0 }, "value": "ArrowGuard", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1784,7 +1732,6 @@ "ctxt": 0 }, "value": "ArrowMedic", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1810,7 +1757,6 @@ "ctxt": 0 }, "value": "heal", - "typeAnnotation": null, "optional": false }, "function": { @@ -1866,7 +1812,6 @@ "ctxt": 0 }, "value": "ArrowGuard", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1899,8 +1844,8 @@ "ctxt": 0 }, "value": "guard", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1917,7 +1862,6 @@ "ctxt": 0 }, "value": "ArrowGuard", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1956,7 +1900,6 @@ "ctxt": 0 }, "value": "guard", - "typeAnnotation": null, "optional": false }, "property": { @@ -1967,7 +1910,6 @@ "ctxt": 0 }, "value": "isElite", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2012,7 +1954,6 @@ "ctxt": 0 }, "value": "guard", - "typeAnnotation": null, "optional": false }, "property": { @@ -2023,7 +1964,6 @@ "ctxt": 0 }, "value": "defend", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2063,7 +2003,6 @@ "ctxt": 0 }, "value": "guard", - "typeAnnotation": null, "optional": false }, "property": { @@ -2074,7 +2013,6 @@ "ctxt": 0 }, "value": "isMedic", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2119,7 +2057,6 @@ "ctxt": 0 }, "value": "guard", - "typeAnnotation": null, "optional": false }, "property": { @@ -2130,7 +2067,6 @@ "ctxt": 0 }, "value": "heal", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2159,7 +2095,6 @@ "ctxt": 0 }, "value": "Supplies", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2189,7 +2124,6 @@ "ctxt": 0 }, "value": "spoiled", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2233,7 +2167,6 @@ "ctxt": 0 }, "value": "Sundries", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2263,7 +2196,6 @@ "ctxt": 0 }, "value": "broken", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2307,7 +2239,6 @@ "ctxt": 0 }, "value": "Crate", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2334,7 +2265,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2367,7 +2297,6 @@ "ctxt": 0 }, "value": "contents", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2396,7 +2325,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2420,7 +2348,6 @@ "ctxt": 0 }, "value": "volume", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2462,7 +2389,6 @@ "ctxt": 0 }, "value": "isSupplies", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2513,7 +2439,6 @@ "ctxt": 0 }, "value": "Crate", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2539,7 +2464,6 @@ "ctxt": 0 }, "value": "Supplies", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2568,7 +2492,6 @@ "ctxt": 0 }, "value": "isSundries", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2619,7 +2542,6 @@ "ctxt": 0 }, "value": "Crate", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2645,7 +2567,6 @@ "ctxt": 0 }, "value": "Sundries", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2686,6 +2607,7 @@ "ctxt": 0 }, "value": "crate", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2708,7 +2630,6 @@ "ctxt": 0 }, "value": "Crate", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2731,8 +2652,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2768,7 +2688,6 @@ "ctxt": 0 }, "value": "crate", - "typeAnnotation": null, "optional": false }, "property": { @@ -2779,7 +2698,6 @@ "ctxt": 0 }, "value": "isSundries", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2832,7 +2750,6 @@ "ctxt": 0 }, "value": "crate", - "typeAnnotation": null, "optional": false }, "property": { @@ -2843,7 +2760,6 @@ "ctxt": 0 }, "value": "contents", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2856,7 +2772,6 @@ "ctxt": 0 }, "value": "broken", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2903,7 +2818,6 @@ "ctxt": 0 }, "value": "crate", - "typeAnnotation": null, "optional": false }, "property": { @@ -2914,7 +2828,6 @@ "ctxt": 0 }, "value": "isSupplies", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2967,7 +2880,6 @@ "ctxt": 0 }, "value": "crate", - "typeAnnotation": null, "optional": false }, "property": { @@ -2978,7 +2890,6 @@ "ctxt": 0 }, "value": "contents", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2991,7 +2902,6 @@ "ctxt": 0 }, "value": "spoiled", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3042,7 +2952,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -3053,7 +2962,6 @@ "ctxt": 0 }, "value": "isFollower", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3073,7 +2981,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -3084,7 +2991,6 @@ "ctxt": 0 }, "value": "isFollower", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3121,7 +3027,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -3132,7 +3037,6 @@ "ctxt": 0 }, "value": "isLeader", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3152,7 +3056,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -3163,7 +3066,6 @@ "ctxt": 0 }, "value": "isLeader", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3180,7 +3082,6 @@ "ctxt": 0 }, "value": "MimicGuard", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3206,7 +3107,6 @@ "ctxt": 0 }, "value": "isLeader", - "typeAnnotation": null, "optional": false }, "function": { @@ -3256,7 +3156,6 @@ "ctxt": 0 }, "value": "MimicLeader", - "typeAnnotation": null, "optional": false } } @@ -3311,7 +3210,6 @@ "ctxt": 0 }, "value": "MimicLeader", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3349,7 +3247,6 @@ "ctxt": 0 }, "value": "isFollower", - "typeAnnotation": null, "optional": false }, "function": { @@ -3399,7 +3296,6 @@ "ctxt": 0 }, "value": "MimicFollower", - "typeAnnotation": null, "optional": false } } @@ -3454,7 +3350,6 @@ "ctxt": 0 }, "value": "MimicFollower", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3494,7 +3389,6 @@ "ctxt": 0 }, "value": "MimicLeader", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3520,7 +3414,6 @@ "ctxt": 0 }, "value": "lead", - "typeAnnotation": null, "optional": false }, "function": { @@ -3576,7 +3469,6 @@ "ctxt": 0 }, "value": "MimicGuard", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -3594,7 +3486,6 @@ "ctxt": 0 }, "value": "MimicFollower", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3620,7 +3511,6 @@ "ctxt": 0 }, "value": "follow", - "typeAnnotation": null, "optional": false }, "function": { @@ -3676,7 +3566,6 @@ "ctxt": 0 }, "value": "MimicGuard", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -3709,8 +3598,8 @@ "ctxt": 0 }, "value": "mimic", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -3727,7 +3616,6 @@ "ctxt": 0 }, "value": "MimicGuard", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3767,7 +3655,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -3778,7 +3665,6 @@ "ctxt": 0 }, "value": "isLeader", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3798,7 +3684,6 @@ "ctxt": 0 }, "value": "mimic", - "typeAnnotation": null, "optional": false }, "property": { @@ -3809,7 +3694,6 @@ "ctxt": 0 }, "value": "isLeader", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3846,7 +3730,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -3857,7 +3740,6 @@ "ctxt": 0 }, "value": "isFollower", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3877,7 +3759,6 @@ "ctxt": 0 }, "value": "mimic", - "typeAnnotation": null, "optional": false }, "property": { @@ -3888,7 +3769,6 @@ "ctxt": 0 }, "value": "isFollower", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3924,7 +3804,6 @@ "ctxt": 0 }, "value": "mimic", - "typeAnnotation": null, "optional": false }, "property": { @@ -3935,7 +3814,6 @@ "ctxt": 0 }, "value": "isFollower", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3980,7 +3858,6 @@ "ctxt": 0 }, "value": "mimic", - "typeAnnotation": null, "optional": false }, "property": { @@ -3991,7 +3868,6 @@ "ctxt": 0 }, "value": "follow", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4030,7 +3906,6 @@ "ctxt": 0 }, "value": "mimic", - "typeAnnotation": null, "optional": false }, "property": { @@ -4041,7 +3916,6 @@ "ctxt": 0 }, "value": "isFollower", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4061,7 +3935,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -4072,7 +3945,6 @@ "ctxt": 0 }, "value": "isFollower", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4098,7 +3970,6 @@ "ctxt": 0 }, "value": "MimicGuardInterface", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4128,7 +3999,6 @@ "ctxt": 0 }, "value": "isLeader", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4179,7 +4049,6 @@ "ctxt": 0 }, "value": "LeadGuard", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4205,7 +4074,6 @@ "ctxt": 0 }, "value": "isFollower", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4256,7 +4124,6 @@ "ctxt": 0 }, "value": "FollowerGuard", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardFunctionOfFormThisErrors/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardFunctionOfFormThisErrors/input.ts.json index fc19dee82b4d..329d9998792d 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardFunctionOfFormThisErrors/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardFunctionOfFormThisErrors/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "RoyalGuard", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "isLeader", - "typeAnnotation": null, "optional": false }, "function": { @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "LeadGuard", - "typeAnnotation": null, "optional": false } } @@ -147,7 +144,6 @@ "ctxt": 0 }, "value": "LeadGuard", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -177,7 +173,6 @@ "ctxt": 0 }, "value": "isFollower", - "typeAnnotation": null, "optional": false }, "function": { @@ -227,7 +222,6 @@ "ctxt": 0 }, "value": "FollowerGuard", - "typeAnnotation": null, "optional": false } } @@ -282,7 +276,6 @@ "ctxt": 0 }, "value": "FollowerGuard", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -314,7 +307,6 @@ "ctxt": 0 }, "value": "LeadGuard", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -340,7 +332,6 @@ "ctxt": 0 }, "value": "lead", - "typeAnnotation": null, "optional": false }, "function": { @@ -404,7 +395,6 @@ "ctxt": 0 }, "value": "RoyalGuard", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -422,7 +412,6 @@ "ctxt": 0 }, "value": "FollowerGuard", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -448,7 +437,6 @@ "ctxt": 0 }, "value": "follow", - "typeAnnotation": null, "optional": false }, "function": { @@ -512,7 +500,6 @@ "ctxt": 0 }, "value": "RoyalGuard", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -535,7 +522,6 @@ "ctxt": 0 }, "value": "GuardInterface", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -556,7 +542,6 @@ "ctxt": 0 }, "value": "RoyalGuard", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -597,6 +582,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -619,13 +605,11 @@ "ctxt": 0 }, "value": "RoyalGuard", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -642,7 +626,6 @@ "ctxt": 0 }, "value": "FollowerGuard", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -677,6 +660,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -699,13 +683,11 @@ "ctxt": 0 }, "value": "GuardInterface", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -722,7 +704,6 @@ "ctxt": 0 }, "value": "LeadGuard", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -762,7 +743,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -773,7 +753,6 @@ "ctxt": 0 }, "value": "isFollower", - "typeAnnotation": null, "optional": false }, "computed": false @@ -793,7 +772,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -804,7 +782,6 @@ "ctxt": 0 }, "value": "isLeader", - "typeAnnotation": null, "optional": false }, "computed": false @@ -841,7 +818,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -852,7 +828,6 @@ "ctxt": 0 }, "value": "isLeader", - "typeAnnotation": null, "optional": false }, "computed": false @@ -872,7 +847,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -883,7 +857,6 @@ "ctxt": 0 }, "value": "isFollower", - "typeAnnotation": null, "optional": false }, "computed": false @@ -920,7 +893,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -931,7 +903,6 @@ "ctxt": 0 }, "value": "isFollower", - "typeAnnotation": null, "optional": false }, "computed": false @@ -951,7 +922,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -962,7 +932,6 @@ "ctxt": 0 }, "value": "isLeader", - "typeAnnotation": null, "optional": false }, "computed": false @@ -999,7 +968,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1010,7 +978,6 @@ "ctxt": 0 }, "value": "isLeader", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1030,7 +997,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1041,7 +1007,6 @@ "ctxt": 0 }, "value": "isFollower", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1058,7 +1023,6 @@ "ctxt": 0 }, "value": "invalidGuard", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1079,6 +1043,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1095,8 +1060,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1204,6 +1168,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1247,8 +1212,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1277,7 +1241,6 @@ "ctxt": 0 }, "value": "invalidGuard", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1291,7 +1254,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1321,7 +1283,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1350,7 +1311,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1382,8 +1342,8 @@ "ctxt": 0 }, "value": "holder", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1401,7 +1361,6 @@ "ctxt": 0 }, "value": "invalidGuard", - "typeAnnotation": null, "optional": false } ] @@ -1439,7 +1398,6 @@ "ctxt": 0 }, "value": "holder", - "typeAnnotation": null, "optional": false }, "property": { @@ -1450,7 +1408,6 @@ "ctxt": 0 }, "value": "invalidGuard", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1466,7 +1423,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1496,7 +1452,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1515,7 +1470,6 @@ "ctxt": 0 }, "value": "holder", - "typeAnnotation": null, "optional": false } } @@ -1544,7 +1498,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1563,7 +1516,6 @@ "ctxt": 0 }, "value": "holder", - "typeAnnotation": null, "optional": false } } @@ -1595,8 +1547,8 @@ "ctxt": 0 }, "value": "detached", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1613,7 +1565,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1624,7 +1575,6 @@ "ctxt": 0 }, "value": "isFollower", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1655,7 +1605,6 @@ "ctxt": 0 }, "value": "detached", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1698,7 +1647,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1709,7 +1657,6 @@ "ctxt": 0 }, "value": "follow", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1757,7 +1704,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1768,7 +1714,6 @@ "ctxt": 0 }, "value": "lead", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardInClass/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardInClass/input.ts.json index 47cd03ffa13f..e1b9ed1369e2 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardInClass/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardInClass/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -105,7 +105,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -157,8 +156,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ClassExpression", @@ -185,7 +184,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -222,6 +220,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -238,8 +237,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -249,7 +247,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -307,8 +304,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ClassExpression", @@ -335,7 +332,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -372,6 +368,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -388,8 +385,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -399,7 +395,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardIntersectionTypes/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardIntersectionTypes/input.ts.json index 71b4c0d5dee7..f9bf80c80151 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardIntersectionTypes/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardIntersectionTypes/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -125,7 +122,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -199,7 +194,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -238,7 +232,6 @@ "ctxt": 0 }, "value": "isX", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -259,6 +252,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -275,8 +269,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -313,7 +306,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -338,7 +330,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -357,7 +348,6 @@ "ctxt": 0 }, "value": "isY", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -378,6 +368,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -394,8 +385,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -432,7 +422,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -457,7 +446,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -476,7 +464,6 @@ "ctxt": 0 }, "value": "isZ", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -497,6 +484,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -513,8 +501,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -551,7 +538,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -576,7 +562,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -595,7 +580,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -616,6 +600,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -638,13 +623,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -700,7 +683,6 @@ "ctxt": 0 }, "value": "isX", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -714,7 +696,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -736,7 +717,6 @@ "ctxt": 0 }, "value": "isY", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -750,7 +730,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -773,7 +752,6 @@ "ctxt": 0 }, "value": "isZ", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -787,7 +765,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -818,7 +795,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -864,7 +840,6 @@ "ctxt": 0 }, "value": "isX", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -878,7 +853,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -900,7 +874,6 @@ "ctxt": 0 }, "value": "isY", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -914,7 +887,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -937,7 +909,6 @@ "ctxt": 0 }, "value": "isZ", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -951,7 +922,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -982,7 +952,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -1012,7 +981,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1042,7 +1010,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1086,7 +1053,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1116,7 +1082,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1155,7 +1120,6 @@ "ctxt": 0 }, "value": "isB", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1176,6 +1140,7 @@ "ctxt": 0 }, "value": "toTest", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1192,8 +1157,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1234,7 +1198,6 @@ "ctxt": 0 }, "value": "toTest", - "typeAnnotation": null, "optional": false }, "right": { @@ -1252,7 +1215,6 @@ "ctxt": 0 }, "value": "toTest", - "typeAnnotation": null, "optional": false }, "property": { @@ -1263,7 +1225,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1298,7 +1259,6 @@ "ctxt": 0 }, "value": "toTest", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1323,7 +1283,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1342,7 +1301,6 @@ "ctxt": 0 }, "value": "union", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1363,6 +1321,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1385,13 +1344,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1431,7 +1388,6 @@ "ctxt": 0 }, "value": "isB", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1445,7 +1401,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1475,7 +1430,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1551,7 +1505,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1571,7 +1524,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1601,7 +1553,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1622,6 +1573,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1638,8 +1590,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1686,7 +1637,6 @@ "ctxt": 0 }, "value": "Beast", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1716,7 +1666,6 @@ "ctxt": 0 }, "value": "wings", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1758,7 +1707,6 @@ "ctxt": 0 }, "value": "legs", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1802,7 +1750,6 @@ "ctxt": 0 }, "value": "Legged", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1832,7 +1779,6 @@ "ctxt": 0 }, "value": "legs", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1876,7 +1822,6 @@ "ctxt": 0 }, "value": "Winged", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1906,7 +1851,6 @@ "ctxt": 0 }, "value": "wings", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1945,7 +1889,6 @@ "ctxt": 0 }, "value": "hasLegs", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1966,6 +1909,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1988,13 +1932,11 @@ "ctxt": 0 }, "value": "Beast", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2035,7 +1977,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2069,7 +2010,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2080,7 +2020,6 @@ "ctxt": 0 }, "value": "legs", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2131,7 +2070,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -2156,7 +2094,6 @@ "ctxt": 0 }, "value": "Legged", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2175,7 +2112,6 @@ "ctxt": 0 }, "value": "hasWings", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2196,6 +2132,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2218,13 +2155,11 @@ "ctxt": 0 }, "value": "Beast", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2265,7 +2200,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2299,7 +2233,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2310,7 +2243,6 @@ "ctxt": 0 }, "value": "wings", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2347,7 +2279,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -2372,7 +2303,6 @@ "ctxt": 0 }, "value": "Winged", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2391,7 +2321,6 @@ "ctxt": 0 }, "value": "identifyBeast", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2412,6 +2341,7 @@ "ctxt": 0 }, "value": "beast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2434,13 +2364,11 @@ "ctxt": 0 }, "value": "Beast", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2480,7 +2408,6 @@ "ctxt": 0 }, "value": "hasLegs", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2494,7 +2421,6 @@ "ctxt": 0 }, "value": "beast", - "typeAnnotation": null, "optional": false } } @@ -2531,7 +2457,6 @@ "ctxt": 0 }, "value": "hasWings", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2545,7 +2470,6 @@ "ctxt": 0 }, "value": "beast", - "typeAnnotation": null, "optional": false } } @@ -2590,7 +2514,6 @@ "ctxt": 0 }, "value": "beast", - "typeAnnotation": null, "optional": false }, "property": { @@ -2601,7 +2524,6 @@ "ctxt": 0 }, "value": "legs", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2646,7 +2568,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2737,7 +2658,6 @@ "ctxt": 0 }, "value": "beast", - "typeAnnotation": null, "optional": false }, "property": { @@ -2748,7 +2668,6 @@ "ctxt": 0 }, "value": "legs", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2793,7 +2712,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2884,7 +2802,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2913,7 +2830,6 @@ "ctxt": 0 }, "value": "beast", - "typeAnnotation": null, "optional": false }, "property": { @@ -2924,7 +2840,6 @@ "ctxt": 0 }, "value": "legs", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3048,7 +2963,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3077,7 +2991,6 @@ "ctxt": 0 }, "value": "beast", - "typeAnnotation": null, "optional": false }, "property": { @@ -3088,7 +3001,6 @@ "ctxt": 0 }, "value": "legs", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3211,7 +3123,6 @@ "ctxt": 0 }, "value": "hasWings", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3225,7 +3136,6 @@ "ctxt": 0 }, "value": "beast", - "typeAnnotation": null, "optional": false } } @@ -3262,7 +3172,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3353,7 +3262,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3435,7 +3343,6 @@ "ctxt": 0 }, "value": "beastFoo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3456,6 +3363,7 @@ "ctxt": 0 }, "value": "beast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3478,13 +3386,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3532,7 +3438,6 @@ "ctxt": 0 }, "value": "hasWings", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3546,7 +3451,6 @@ "ctxt": 0 }, "value": "beast", - "typeAnnotation": null, "optional": false } } @@ -3568,7 +3472,6 @@ "ctxt": 0 }, "value": "hasLegs", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3582,7 +3485,6 @@ "ctxt": 0 }, "value": "beast", - "typeAnnotation": null, "optional": false } } @@ -3613,7 +3515,6 @@ "ctxt": 0 }, "value": "beast", - "typeAnnotation": null, "optional": false } } @@ -3642,7 +3543,6 @@ "ctxt": 0 }, "value": "beast", - "typeAnnotation": null, "optional": false } } @@ -3679,7 +3579,6 @@ "ctxt": 0 }, "value": "hasLegs", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3693,7 +3592,6 @@ "ctxt": 0 }, "value": "beast", - "typeAnnotation": null, "optional": false } } @@ -3715,7 +3613,6 @@ "ctxt": 0 }, "value": "hasWings", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3729,7 +3626,6 @@ "ctxt": 0 }, "value": "beast", - "typeAnnotation": null, "optional": false } } @@ -3760,7 +3656,6 @@ "ctxt": 0 }, "value": "beast", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardNarrowsPrimitiveIntersection/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardNarrowsPrimitiveIntersection/input.ts.json index ea8c6addbcac..c5916ae17831 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardNarrowsPrimitiveIntersection/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardNarrowsPrimitiveIntersection/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "Tag", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "__tag", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -89,7 +87,6 @@ "ctxt": 0 }, "value": "isNonBlank", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -110,6 +107,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -126,8 +124,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -164,7 +161,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -213,7 +209,6 @@ "ctxt": 0 }, "value": "Tag", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -235,7 +230,6 @@ "ctxt": 0 }, "value": "doThis", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -256,6 +250,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -295,15 +290,13 @@ "ctxt": 0 }, "value": "Tag", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -345,7 +338,6 @@ "ctxt": 0 }, "value": "doThat", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -366,6 +358,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -382,8 +375,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -440,6 +432,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -456,8 +449,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -486,7 +478,6 @@ "ctxt": 0 }, "value": "isNonBlank", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -500,7 +491,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -537,7 +527,6 @@ "ctxt": 0 }, "value": "doThis", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -551,7 +540,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -591,7 +579,6 @@ "ctxt": 0 }, "value": "doThat", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -605,7 +592,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -633,7 +619,6 @@ "ctxt": 0 }, "value": "Tag2", - "typeAnnotation": null, "optional": false }, "members": [] @@ -648,7 +633,6 @@ "ctxt": 0 }, "value": "isNonBlank2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -669,6 +653,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -685,8 +670,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -723,7 +707,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -772,7 +755,6 @@ "ctxt": 0 }, "value": "Tag2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -794,7 +776,6 @@ "ctxt": 0 }, "value": "doThis2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -815,6 +796,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -854,15 +836,13 @@ "ctxt": 0 }, "value": "Tag2", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -904,7 +884,6 @@ "ctxt": 0 }, "value": "doThat2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -925,6 +904,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -941,8 +921,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -996,7 +975,6 @@ "ctxt": 0 }, "value": "isNonBlank2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1010,7 +988,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -1047,7 +1024,6 @@ "ctxt": 0 }, "value": "doThis2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1061,7 +1037,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -1101,7 +1076,6 @@ "ctxt": 0 }, "value": "doThat2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1115,7 +1089,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardNarrowsToLiteralType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardNarrowsToLiteralType/input.ts.json index c986edcbf467..f18b358ff1ab 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardNarrowsToLiteralType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardNarrowsToLiteralType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "isFoo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -91,7 +90,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -137,7 +135,6 @@ "ctxt": 0 }, "value": "doThis", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -158,6 +155,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -187,8 +185,7 @@ } } } - }, - "optional": false + } } } ], @@ -230,7 +227,6 @@ "ctxt": 0 }, "value": "doThat", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -251,6 +247,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -267,8 +264,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -325,6 +321,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,8 +338,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -371,7 +367,6 @@ "ctxt": 0 }, "value": "isFoo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -385,7 +380,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -422,7 +416,6 @@ "ctxt": 0 }, "value": "doThis", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -436,7 +429,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -476,7 +468,6 @@ "ctxt": 0 }, "value": "doThat", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -490,7 +481,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardNarrowsToLiteralTypeUnion/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardNarrowsToLiteralTypeUnion/input.ts.json index 312c9b330f9e..3f98566ebf17 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardNarrowsToLiteralTypeUnion/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardNarrowsToLiteralTypeUnion/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "isFoo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -91,7 +90,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -177,7 +175,6 @@ "ctxt": 0 }, "value": "doThis", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -198,6 +195,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -259,8 +257,7 @@ } ] } - }, - "optional": false + } } } ], @@ -302,7 +299,6 @@ "ctxt": 0 }, "value": "doThat", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -323,6 +319,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -339,8 +336,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -397,6 +393,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -413,8 +410,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -443,7 +439,6 @@ "ctxt": 0 }, "value": "isFoo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -457,7 +452,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -494,7 +488,6 @@ "ctxt": 0 }, "value": "doThis", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -508,7 +501,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -548,7 +540,6 @@ "ctxt": 0 }, "value": "doThat", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -562,7 +553,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardNesting/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardNesting/input.ts.json index 0fd925b2a86a..2e539b52fc46 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardNesting/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardNesting/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "strOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -128,7 +128,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } }, @@ -163,7 +162,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } } @@ -193,7 +191,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } }, @@ -246,6 +243,7 @@ "ctxt": 0 }, "value": "label", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -262,8 +260,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -303,7 +300,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } }, @@ -331,7 +327,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -378,6 +373,7 @@ "ctxt": 0 }, "value": "bool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -394,8 +390,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -435,7 +430,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } }, @@ -463,7 +457,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -505,6 +498,7 @@ "ctxt": 0 }, "value": "label2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -521,8 +515,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -562,7 +555,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } }, @@ -590,7 +582,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -637,6 +628,7 @@ "ctxt": 0 }, "value": "bool2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -653,8 +645,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -694,7 +685,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } }, @@ -722,7 +712,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -797,7 +786,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } }, @@ -832,7 +820,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } } @@ -862,7 +849,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } }, @@ -915,6 +901,7 @@ "ctxt": 0 }, "value": "label", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -931,8 +918,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -972,7 +958,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1000,7 +985,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1047,6 +1031,7 @@ "ctxt": 0 }, "value": "bool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1063,8 +1048,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -1104,7 +1088,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1132,7 +1115,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1174,6 +1156,7 @@ "ctxt": 0 }, "value": "label2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1190,8 +1173,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -1231,7 +1213,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1259,7 +1240,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1306,6 +1286,7 @@ "ctxt": 0 }, "value": "bool2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1322,8 +1303,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -1363,7 +1343,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1391,7 +1370,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false }, "alternate": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormExpr1AndExpr2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormExpr1AndExpr2/input.ts.json index a32817e3b429..52bb537e0cad 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormExpr1AndExpr2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormExpr1AndExpr2/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "str", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "bool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,6 +178,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -213,8 +214,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -246,6 +246,7 @@ "ctxt": 0 }, "value": "strOrNumOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -290,8 +291,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -323,6 +323,7 @@ "ctxt": 0 }, "value": "numOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -358,8 +359,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -376,7 +376,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -402,7 +401,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": null, @@ -449,6 +447,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -471,13 +470,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -509,6 +506,7 @@ "ctxt": 0 }, "value": "cOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -539,7 +537,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -555,8 +552,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -588,6 +584,7 @@ "ctxt": 0 }, "value": "strOrNumOrBoolOrC", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -645,15 +642,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -699,7 +694,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } }, @@ -742,7 +736,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } }, @@ -793,8 +786,8 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -804,7 +797,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -842,8 +834,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -853,7 +845,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -908,7 +899,6 @@ "ctxt": 0 }, "value": "strOrNumOrBoolOrC", - "typeAnnotation": null, "optional": false } }, @@ -951,7 +941,6 @@ "ctxt": 0 }, "value": "strOrNumOrBoolOrC", - "typeAnnotation": null, "optional": false } }, @@ -995,7 +984,6 @@ "ctxt": 0 }, "value": "strOrNumOrBoolOrC", - "typeAnnotation": null, "optional": false } }, @@ -1046,8 +1034,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1057,7 +1045,6 @@ "ctxt": 0 }, "value": "strOrNumOrBoolOrC", - "typeAnnotation": null, "optional": false } } @@ -1095,8 +1082,8 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1106,7 +1093,6 @@ "ctxt": 0 }, "value": "strOrNumOrBoolOrC", - "typeAnnotation": null, "optional": false } } @@ -1161,7 +1147,6 @@ "ctxt": 0 }, "value": "strOrNumOrBoolOrC", - "typeAnnotation": null, "optional": false } }, @@ -1204,7 +1189,6 @@ "ctxt": 0 }, "value": "strOrNumOrBoolOrC", - "typeAnnotation": null, "optional": false } }, @@ -1248,7 +1232,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1299,8 +1282,8 @@ "ctxt": 0 }, "value": "cOrBool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1310,7 +1293,6 @@ "ctxt": 0 }, "value": "strOrNumOrBoolOrC", - "typeAnnotation": null, "optional": false } } @@ -1338,8 +1320,8 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1349,7 +1331,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -1389,6 +1370,7 @@ "ctxt": 0 }, "value": "r1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1446,15 +1428,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1464,7 +1444,6 @@ "ctxt": 0 }, "value": "strOrNumOrBoolOrC", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1496,6 +1475,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1540,8 +1520,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1551,7 +1530,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1600,7 +1578,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1635,7 +1612,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false }, "right": { @@ -1646,7 +1622,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -1682,8 +1657,8 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1693,7 +1668,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -1733,6 +1707,7 @@ "ctxt": 0 }, "value": "r3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1777,8 +1752,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1788,7 +1762,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormExpr1OrExpr2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormExpr1OrExpr2/input.ts.json index b655106b636e..11750fd05c91 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormExpr1OrExpr2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormExpr1OrExpr2/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "str", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "bool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,6 +178,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -213,8 +214,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -246,6 +246,7 @@ "ctxt": 0 }, "value": "strOrNumOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -290,8 +291,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -323,6 +323,7 @@ "ctxt": 0 }, "value": "numOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -358,8 +359,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -376,7 +376,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -402,7 +401,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": null, @@ -449,6 +447,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -471,13 +470,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -509,6 +506,7 @@ "ctxt": 0 }, "value": "cOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -539,7 +537,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -555,8 +552,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -588,6 +584,7 @@ "ctxt": 0 }, "value": "strOrNumOrBoolOrC", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -645,15 +642,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -699,7 +694,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } }, @@ -742,7 +736,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } }, @@ -793,8 +786,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -804,7 +797,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -842,8 +834,8 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -853,7 +845,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -908,7 +899,6 @@ "ctxt": 0 }, "value": "strOrNumOrBoolOrC", - "typeAnnotation": null, "optional": false } }, @@ -951,7 +941,6 @@ "ctxt": 0 }, "value": "strOrNumOrBoolOrC", - "typeAnnotation": null, "optional": false } }, @@ -995,7 +984,6 @@ "ctxt": 0 }, "value": "strOrNumOrBoolOrC", - "typeAnnotation": null, "optional": false } }, @@ -1046,8 +1034,8 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1057,7 +1045,6 @@ "ctxt": 0 }, "value": "strOrNumOrBoolOrC", - "typeAnnotation": null, "optional": false } } @@ -1095,8 +1082,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1106,7 +1093,6 @@ "ctxt": 0 }, "value": "strOrNumOrBoolOrC", - "typeAnnotation": null, "optional": false } } @@ -1161,7 +1147,6 @@ "ctxt": 0 }, "value": "strOrNumOrBoolOrC", - "typeAnnotation": null, "optional": false } }, @@ -1204,7 +1189,6 @@ "ctxt": 0 }, "value": "strOrNumOrBoolOrC", - "typeAnnotation": null, "optional": false } }, @@ -1248,7 +1232,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1301,6 +1284,7 @@ "ctxt": 0 }, "value": "r1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1358,15 +1342,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1376,7 +1358,6 @@ "ctxt": 0 }, "value": "strOrNumOrBoolOrC", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1408,6 +1389,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1452,8 +1434,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1463,7 +1444,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1503,8 +1483,8 @@ "ctxt": 0 }, "value": "cOrBool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1514,7 +1494,6 @@ "ctxt": 0 }, "value": "strOrNumOrBoolOrC", - "typeAnnotation": null, "optional": false } } @@ -1542,8 +1521,8 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1553,7 +1532,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -1600,7 +1578,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1635,7 +1612,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false }, "right": { @@ -1646,7 +1622,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -1684,6 +1659,7 @@ "ctxt": 0 }, "value": "r3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1728,8 +1704,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1739,7 +1714,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1779,8 +1753,8 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1790,7 +1764,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormFunctionEquality/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormFunctionEquality/input.ts.json index e9b59f61c367..da55dfa33fcc 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormFunctionEquality/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormFunctionEquality/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "isString1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -73,6 +72,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -95,13 +95,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -138,7 +136,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -171,7 +168,6 @@ "ctxt": 0 }, "value": "isString2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -192,6 +188,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -214,13 +211,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -257,7 +252,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -302,7 +296,6 @@ "ctxt": 0 }, "value": "isString1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -361,7 +354,6 @@ "ctxt": 0 }, "value": "isString2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -424,8 +416,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -450,7 +442,6 @@ "ctxt": 0 }, "value": "isString1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -501,7 +492,6 @@ "ctxt": 0 }, "value": "isString2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -540,7 +530,6 @@ "ctxt": 0 }, "value": "isString3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -561,6 +550,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -577,8 +567,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -597,6 +586,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -613,8 +603,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -633,6 +622,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -655,13 +645,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -701,7 +689,6 @@ "ctxt": 0 }, "value": "isString1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -727,7 +714,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -763,7 +749,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormInstanceOf/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormInstanceOf/input.ts.json index c74de0864433..ba58a9aee3a0 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormInstanceOf/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormInstanceOf/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "value": null, @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false }, "value": null, @@ -230,7 +224,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -248,7 +241,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -274,7 +266,6 @@ "ctxt": 0 }, "value": "p4", - "typeAnnotation": null, "optional": false }, "value": null, @@ -337,6 +328,7 @@ "ctxt": 0 }, "value": "str", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -353,8 +345,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -386,6 +377,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -402,8 +394,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -435,6 +426,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -470,8 +462,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -503,6 +494,7 @@ "ctxt": 0 }, "value": "ctor1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -533,7 +525,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -553,15 +544,13 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -591,8 +580,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -618,7 +607,6 @@ "ctxt": 0 }, "value": "ctor1", - "typeAnnotation": null, "optional": false }, "right": { @@ -629,7 +617,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false } }, @@ -648,7 +635,6 @@ "ctxt": 0 }, "value": "ctor1", - "typeAnnotation": null, "optional": false }, "property": { @@ -659,7 +645,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -690,8 +675,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -717,7 +702,6 @@ "ctxt": 0 }, "value": "ctor1", - "typeAnnotation": null, "optional": false }, "right": { @@ -728,7 +712,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false } }, @@ -747,7 +730,6 @@ "ctxt": 0 }, "value": "ctor1", - "typeAnnotation": null, "optional": false }, "property": { @@ -758,7 +740,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -789,8 +770,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -816,7 +797,6 @@ "ctxt": 0 }, "value": "ctor1", - "typeAnnotation": null, "optional": false }, "right": { @@ -827,7 +807,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false } }, @@ -846,7 +825,6 @@ "ctxt": 0 }, "value": "ctor1", - "typeAnnotation": null, "optional": false }, "property": { @@ -857,7 +835,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -888,8 +865,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -915,7 +892,6 @@ "ctxt": 0 }, "value": "ctor1", - "typeAnnotation": null, "optional": false }, "right": { @@ -926,7 +902,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false } }, @@ -945,7 +920,6 @@ "ctxt": 0 }, "value": "ctor1", - "typeAnnotation": null, "optional": false }, "property": { @@ -956,7 +930,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -989,6 +962,7 @@ "ctxt": 0 }, "value": "ctor2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1019,7 +993,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1039,15 +1012,13 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1077,8 +1048,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1104,7 +1075,6 @@ "ctxt": 0 }, "value": "ctor2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1115,7 +1085,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false } }, @@ -1134,7 +1103,6 @@ "ctxt": 0 }, "value": "ctor2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1145,7 +1113,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1176,8 +1143,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1203,7 +1170,6 @@ "ctxt": 0 }, "value": "ctor2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1214,7 +1180,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false } }, @@ -1233,7 +1198,6 @@ "ctxt": 0 }, "value": "ctor2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1244,7 +1208,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1275,8 +1238,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1302,7 +1265,6 @@ "ctxt": 0 }, "value": "ctor2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1313,7 +1275,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false } }, @@ -1332,7 +1293,6 @@ "ctxt": 0 }, "value": "ctor2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1343,7 +1303,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1376,6 +1335,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1406,7 +1366,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1426,15 +1385,13 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -1460,7 +1417,6 @@ "ctxt": 0 }, "value": "ctor2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1471,7 +1427,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false } }, @@ -1483,7 +1438,6 @@ "ctxt": 0 }, "value": "ctor2", - "typeAnnotation": null, "optional": false } }, @@ -1516,6 +1470,7 @@ "ctxt": 0 }, "value": "ctor3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1546,7 +1501,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1566,15 +1520,13 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1604,7 +1556,6 @@ "ctxt": 0 }, "value": "ctor3", - "typeAnnotation": null, "optional": false }, "right": { @@ -1615,7 +1566,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false } }, @@ -1649,7 +1599,6 @@ "ctxt": 0 }, "value": "ctor3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1660,7 +1609,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1698,7 +1646,6 @@ "ctxt": 0 }, "value": "ctor3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1709,7 +1656,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1743,6 +1689,7 @@ "ctxt": 0 }, "value": "ctor4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1773,7 +1720,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1793,7 +1739,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1813,15 +1758,13 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1851,7 +1794,6 @@ "ctxt": 0 }, "value": "ctor4", - "typeAnnotation": null, "optional": false }, "right": { @@ -1862,7 +1804,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false } }, @@ -1896,7 +1837,6 @@ "ctxt": 0 }, "value": "ctor4", - "typeAnnotation": null, "optional": false }, "property": { @@ -1907,7 +1847,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1938,7 +1877,6 @@ "ctxt": 0 }, "value": "ctor4", - "typeAnnotation": null, "optional": false }, "right": { @@ -1949,7 +1887,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false } }, @@ -1983,7 +1920,6 @@ "ctxt": 0 }, "value": "ctor4", - "typeAnnotation": null, "optional": false }, "property": { @@ -1994,7 +1930,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2032,7 +1967,6 @@ "ctxt": 0 }, "value": "ctor4", - "typeAnnotation": null, "optional": false }, "property": { @@ -2043,7 +1977,6 @@ "ctxt": 0 }, "value": "p4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2078,6 +2011,7 @@ "ctxt": 0 }, "value": "ctor5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2108,7 +2042,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2128,7 +2061,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2148,15 +2080,13 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2186,7 +2116,6 @@ "ctxt": 0 }, "value": "ctor5", - "typeAnnotation": null, "optional": false }, "right": { @@ -2197,7 +2126,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false } }, @@ -2231,7 +2159,6 @@ "ctxt": 0 }, "value": "ctor5", - "typeAnnotation": null, "optional": false }, "property": { @@ -2242,7 +2169,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2280,7 +2206,6 @@ "ctxt": 0 }, "value": "ctor5", - "typeAnnotation": null, "optional": false }, "property": { @@ -2291,7 +2216,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2325,6 +2249,7 @@ "ctxt": 0 }, "value": "ctor6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2355,7 +2280,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2375,7 +2299,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2395,15 +2318,13 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2441,7 +2362,6 @@ "ctxt": 0 }, "value": "ctor6", - "typeAnnotation": null, "optional": false }, "right": { @@ -2452,7 +2372,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false } }, @@ -2472,7 +2391,6 @@ "ctxt": 0 }, "value": "ctor6", - "typeAnnotation": null, "optional": false }, "right": { @@ -2483,7 +2401,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false } } @@ -2527,7 +2444,6 @@ "ctxt": 0 }, "value": "ctor6", - "typeAnnotation": null, "optional": false }, "property": { @@ -2538,7 +2454,6 @@ "ctxt": 0 }, "value": "p4", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormInstanceOfOnInterface/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormInstanceOfOnInterface/input.ts.json index a0e5add1f3e6..5fbf33756b0e 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormInstanceOfOnInterface/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormInstanceOfOnInterface/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -65,7 +64,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -89,7 +87,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -118,7 +115,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -142,7 +138,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -186,7 +181,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -230,7 +224,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -254,7 +247,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -283,7 +275,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -307,7 +298,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -351,7 +341,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -372,7 +361,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -402,7 +390,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -431,7 +418,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -455,7 +441,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -509,6 +494,7 @@ "ctxt": 0 }, "value": "str", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -525,8 +511,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -558,6 +543,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -574,8 +560,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -607,6 +592,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -642,8 +628,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -675,6 +660,7 @@ "ctxt": 0 }, "value": "c1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -697,13 +683,11 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -735,6 +719,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -757,13 +742,11 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -795,6 +778,7 @@ "ctxt": 0 }, "value": "d1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -817,13 +801,11 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -855,6 +837,7 @@ "ctxt": 0 }, "value": "c1Orc2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -885,7 +868,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -905,15 +887,13 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -943,8 +923,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -970,7 +950,6 @@ "ctxt": 0 }, "value": "c1Orc2", - "typeAnnotation": null, "optional": false }, "right": { @@ -981,7 +960,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } }, @@ -1000,7 +978,6 @@ "ctxt": 0 }, "value": "c1Orc2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1011,7 +988,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1042,8 +1018,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1069,7 +1045,6 @@ "ctxt": 0 }, "value": "c1Orc2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1080,7 +1055,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false } }, @@ -1099,7 +1073,6 @@ "ctxt": 0 }, "value": "c1Orc2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1110,7 +1083,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1141,8 +1113,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1168,7 +1140,6 @@ "ctxt": 0 }, "value": "c1Orc2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1179,7 +1150,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -1198,7 +1168,6 @@ "ctxt": 0 }, "value": "c1Orc2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1209,7 +1178,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1240,8 +1208,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1267,7 +1235,6 @@ "ctxt": 0 }, "value": "c1Orc2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1278,7 +1245,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -1297,7 +1263,6 @@ "ctxt": 0 }, "value": "c1Orc2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1308,7 +1273,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1341,6 +1305,7 @@ "ctxt": 0 }, "value": "c2Ord1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1371,7 +1336,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1391,15 +1355,13 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1429,8 +1391,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1456,7 +1418,6 @@ "ctxt": 0 }, "value": "c2Ord1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1467,7 +1428,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false } }, @@ -1486,7 +1446,6 @@ "ctxt": 0 }, "value": "c2Ord1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1497,7 +1456,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1528,8 +1486,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1555,7 +1513,6 @@ "ctxt": 0 }, "value": "c2Ord1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1566,7 +1523,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -1585,7 +1541,6 @@ "ctxt": 0 }, "value": "c2Ord1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1596,7 +1551,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1627,8 +1581,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1654,7 +1608,6 @@ "ctxt": 0 }, "value": "c2Ord1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1665,7 +1618,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -1684,7 +1636,6 @@ "ctxt": 0 }, "value": "c2Ord1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1695,7 +1646,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1728,6 +1678,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1758,7 +1709,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1778,15 +1728,13 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -1812,7 +1760,6 @@ "ctxt": 0 }, "value": "c2Ord1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1823,7 +1770,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } }, @@ -1835,7 +1781,6 @@ "ctxt": 0 }, "value": "c2Ord1", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormIsType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormIsType/input.ts.json index 9b255410a80b..6d5f6bdce0e5 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormIsType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormIsType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "value": null, @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false }, "value": null, @@ -230,7 +224,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -263,6 +256,7 @@ "ctxt": 0 }, "value": "str", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -279,8 +273,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -312,6 +305,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -328,8 +322,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -361,6 +354,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -396,8 +390,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -414,7 +407,6 @@ "ctxt": 0 }, "value": "isC1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -435,6 +427,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -451,8 +444,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -515,7 +507,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -540,7 +531,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -559,7 +549,6 @@ "ctxt": 0 }, "value": "isC2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -580,6 +569,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -596,8 +586,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -660,7 +649,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -685,7 +673,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -704,7 +691,6 @@ "ctxt": 0 }, "value": "isD1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -725,6 +711,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -741,8 +728,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -805,7 +791,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -830,7 +815,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -864,6 +848,7 @@ "ctxt": 0 }, "value": "c1Orc2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -894,7 +879,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -914,15 +898,13 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -952,8 +934,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -978,7 +960,6 @@ "ctxt": 0 }, "value": "isC1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -992,7 +973,6 @@ "ctxt": 0 }, "value": "c1Orc2", - "typeAnnotation": null, "optional": false } } @@ -1014,7 +994,6 @@ "ctxt": 0 }, "value": "c1Orc2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1025,7 +1004,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1056,8 +1034,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1082,7 +1060,6 @@ "ctxt": 0 }, "value": "isC2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1096,7 +1073,6 @@ "ctxt": 0 }, "value": "c1Orc2", - "typeAnnotation": null, "optional": false } } @@ -1118,7 +1094,6 @@ "ctxt": 0 }, "value": "c1Orc2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1129,7 +1104,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1160,8 +1134,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1186,7 +1160,6 @@ "ctxt": 0 }, "value": "isD1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1200,7 +1173,6 @@ "ctxt": 0 }, "value": "c1Orc2", - "typeAnnotation": null, "optional": false } } @@ -1222,7 +1194,6 @@ "ctxt": 0 }, "value": "c1Orc2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1233,7 +1204,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1264,8 +1234,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1290,7 +1260,6 @@ "ctxt": 0 }, "value": "isD1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1304,7 +1273,6 @@ "ctxt": 0 }, "value": "c1Orc2", - "typeAnnotation": null, "optional": false } } @@ -1326,7 +1294,6 @@ "ctxt": 0 }, "value": "c1Orc2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1337,7 +1304,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1370,6 +1336,7 @@ "ctxt": 0 }, "value": "c2Ord1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1400,7 +1367,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1420,15 +1386,13 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1458,8 +1422,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1484,7 +1448,6 @@ "ctxt": 0 }, "value": "isC2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1498,7 +1461,6 @@ "ctxt": 0 }, "value": "c2Ord1", - "typeAnnotation": null, "optional": false } } @@ -1520,7 +1482,6 @@ "ctxt": 0 }, "value": "c2Ord1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1531,7 +1492,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1562,8 +1522,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1588,7 +1548,6 @@ "ctxt": 0 }, "value": "isD1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1602,7 +1561,6 @@ "ctxt": 0 }, "value": "c2Ord1", - "typeAnnotation": null, "optional": false } } @@ -1624,7 +1582,6 @@ "ctxt": 0 }, "value": "c2Ord1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1635,7 +1592,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1666,8 +1622,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1692,7 +1648,6 @@ "ctxt": 0 }, "value": "isD1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1706,7 +1661,6 @@ "ctxt": 0 }, "value": "c2Ord1", - "typeAnnotation": null, "optional": false } } @@ -1728,7 +1682,6 @@ "ctxt": 0 }, "value": "c2Ord1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1739,7 +1692,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1772,6 +1724,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1802,7 +1755,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1822,15 +1774,13 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -1855,7 +1805,6 @@ "ctxt": 0 }, "value": "isC1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1869,7 +1818,6 @@ "ctxt": 0 }, "value": "c2Ord1", - "typeAnnotation": null, "optional": false } } @@ -1884,7 +1832,6 @@ "ctxt": 0 }, "value": "c2Ord1", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormIsTypeOnInterfaces/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormIsTypeOnInterfaces/input.ts.json index 894ba4088a95..992d07b308e8 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormIsTypeOnInterfaces/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormIsTypeOnInterfaces/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -65,7 +64,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -89,7 +87,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -118,7 +115,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -142,7 +138,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -186,7 +181,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -230,7 +224,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -254,7 +247,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -283,7 +275,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -307,7 +298,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -351,7 +341,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -372,7 +361,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -402,7 +390,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -431,7 +418,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -455,7 +441,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -509,6 +494,7 @@ "ctxt": 0 }, "value": "str", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -525,8 +511,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -558,6 +543,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -574,8 +560,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -607,6 +592,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -642,8 +628,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -660,7 +645,6 @@ "ctxt": 0 }, "value": "isC1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -681,6 +665,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -697,8 +682,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -761,7 +745,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -786,7 +769,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -805,7 +787,6 @@ "ctxt": 0 }, "value": "isC2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -826,6 +807,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -842,8 +824,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -906,7 +887,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -931,7 +911,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -950,7 +929,6 @@ "ctxt": 0 }, "value": "isD1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -971,6 +949,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -987,8 +966,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1051,7 +1029,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1076,7 +1053,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1110,6 +1086,7 @@ "ctxt": 0 }, "value": "c1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1132,13 +1109,11 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1170,6 +1145,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1192,13 +1168,11 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1230,6 +1204,7 @@ "ctxt": 0 }, "value": "d1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1252,13 +1227,11 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1290,6 +1263,7 @@ "ctxt": 0 }, "value": "c1Orc2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1320,7 +1294,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1340,15 +1313,13 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1378,8 +1349,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1404,7 +1375,6 @@ "ctxt": 0 }, "value": "isC1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1418,7 +1388,6 @@ "ctxt": 0 }, "value": "c1Orc2", - "typeAnnotation": null, "optional": false } } @@ -1440,7 +1409,6 @@ "ctxt": 0 }, "value": "c1Orc2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1451,7 +1419,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1482,8 +1449,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1508,7 +1475,6 @@ "ctxt": 0 }, "value": "isC2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1522,7 +1488,6 @@ "ctxt": 0 }, "value": "c1Orc2", - "typeAnnotation": null, "optional": false } } @@ -1544,7 +1509,6 @@ "ctxt": 0 }, "value": "c1Orc2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1555,7 +1519,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1586,8 +1549,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1612,7 +1575,6 @@ "ctxt": 0 }, "value": "isD1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1626,7 +1588,6 @@ "ctxt": 0 }, "value": "c1Orc2", - "typeAnnotation": null, "optional": false } } @@ -1648,7 +1609,6 @@ "ctxt": 0 }, "value": "c1Orc2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1659,7 +1619,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1690,8 +1649,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1716,7 +1675,6 @@ "ctxt": 0 }, "value": "isD1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1730,7 +1688,6 @@ "ctxt": 0 }, "value": "c1Orc2", - "typeAnnotation": null, "optional": false } } @@ -1752,7 +1709,6 @@ "ctxt": 0 }, "value": "c1Orc2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1763,7 +1719,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1796,6 +1751,7 @@ "ctxt": 0 }, "value": "c2Ord1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1826,7 +1782,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1846,15 +1801,13 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1884,8 +1837,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1910,7 +1863,6 @@ "ctxt": 0 }, "value": "isC2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1924,7 +1876,6 @@ "ctxt": 0 }, "value": "c2Ord1", - "typeAnnotation": null, "optional": false } } @@ -1946,7 +1897,6 @@ "ctxt": 0 }, "value": "c2Ord1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1957,7 +1907,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1988,8 +1937,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -2014,7 +1963,6 @@ "ctxt": 0 }, "value": "isD1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2028,7 +1976,6 @@ "ctxt": 0 }, "value": "c2Ord1", - "typeAnnotation": null, "optional": false } } @@ -2050,7 +1997,6 @@ "ctxt": 0 }, "value": "c2Ord1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2061,7 +2007,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2092,8 +2037,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -2118,7 +2063,6 @@ "ctxt": 0 }, "value": "isD1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2132,7 +2076,6 @@ "ctxt": 0 }, "value": "c2Ord1", - "typeAnnotation": null, "optional": false } } @@ -2154,7 +2097,6 @@ "ctxt": 0 }, "value": "c2Ord1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2165,7 +2107,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2198,6 +2139,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2228,7 +2170,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2248,15 +2189,13 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -2281,7 +2220,6 @@ "ctxt": 0 }, "value": "isC1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2295,7 +2233,6 @@ "ctxt": 0 }, "value": "c2Ord1", - "typeAnnotation": null, "optional": false } } @@ -2310,7 +2247,6 @@ "ctxt": 0 }, "value": "c2Ord1", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormNotExpr/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormNotExpr/input.ts.json index 133640188e65..e92f27a2e436 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormNotExpr/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormNotExpr/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "str", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "bool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,6 +178,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -213,8 +214,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -246,6 +246,7 @@ "ctxt": 0 }, "value": "strOrNumOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -290,8 +291,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -323,6 +323,7 @@ "ctxt": 0 }, "value": "numOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -358,8 +359,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -412,7 +412,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } }, @@ -464,7 +463,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false }, "right": { @@ -475,7 +473,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } } @@ -513,8 +510,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -524,7 +521,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } } @@ -586,7 +582,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } }, @@ -629,7 +624,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } }, @@ -682,8 +676,8 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -693,7 +687,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -731,8 +724,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -742,7 +735,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -804,7 +796,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } }, @@ -864,7 +855,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } }, @@ -917,8 +907,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -928,7 +918,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -966,8 +955,8 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -977,7 +966,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -1039,7 +1027,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1082,7 +1069,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1135,8 +1121,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1146,7 +1132,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -1184,8 +1169,8 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1195,7 +1180,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -1257,7 +1241,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1317,7 +1300,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1370,8 +1352,8 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1381,7 +1363,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -1419,8 +1400,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1430,7 +1411,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -1492,7 +1472,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1529,7 +1508,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false }, "right": { @@ -1540,7 +1518,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -1576,8 +1553,8 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1587,7 +1564,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -1627,6 +1603,7 @@ "ctxt": 0 }, "value": "r1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1671,8 +1648,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1682,7 +1658,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfBoolean/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfBoolean/input.ts.json index 8afdd790a083..62466ef6a153 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfBoolean/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfBoolean/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": null, @@ -113,6 +111,7 @@ "ctxt": 0 }, "value": "str", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -129,8 +128,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -162,6 +160,7 @@ "ctxt": 0 }, "value": "bool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -178,8 +177,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -211,6 +209,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -227,8 +226,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -260,6 +258,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -295,8 +294,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -328,6 +326,7 @@ "ctxt": 0 }, "value": "strOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -363,8 +362,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -396,6 +394,7 @@ "ctxt": 0 }, "value": "numOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -431,8 +430,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -464,6 +462,7 @@ "ctxt": 0 }, "value": "strOrNumOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -508,8 +507,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -541,6 +539,7 @@ "ctxt": 0 }, "value": "strOrC", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -580,15 +579,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -620,6 +617,7 @@ "ctxt": 0 }, "value": "numOrC", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -659,15 +657,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -699,6 +695,7 @@ "ctxt": 0 }, "value": "boolOrC", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -738,15 +735,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -778,6 +773,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -800,13 +796,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -844,7 +838,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } }, @@ -894,8 +887,8 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -905,7 +898,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } } @@ -943,8 +935,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -954,7 +946,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } } @@ -993,7 +984,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1043,8 +1033,8 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1054,7 +1044,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false } } @@ -1092,8 +1081,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1103,7 +1092,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false } } @@ -1142,7 +1130,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1192,8 +1179,8 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1203,7 +1190,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -1241,8 +1227,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1252,7 +1238,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -1291,7 +1276,6 @@ "ctxt": 0 }, "value": "boolOrC", - "typeAnnotation": null, "optional": false } }, @@ -1341,8 +1325,8 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1352,7 +1336,6 @@ "ctxt": 0 }, "value": "boolOrC", - "typeAnnotation": null, "optional": false } } @@ -1390,8 +1373,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1401,7 +1384,6 @@ "ctxt": 0 }, "value": "boolOrC", - "typeAnnotation": null, "optional": false } } @@ -1440,7 +1422,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } }, @@ -1492,6 +1473,7 @@ "ctxt": 0 }, "value": "z1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1508,8 +1490,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1519,7 +1500,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1561,6 +1541,7 @@ "ctxt": 0 }, "value": "z2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1596,8 +1577,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1607,7 +1587,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1648,7 +1627,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1698,8 +1676,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1709,7 +1687,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } } @@ -1747,8 +1724,8 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1758,7 +1735,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } } @@ -1797,7 +1773,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1847,8 +1822,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1858,7 +1833,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false } } @@ -1896,8 +1870,8 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1907,7 +1881,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false } } @@ -1946,7 +1919,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1996,8 +1968,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2007,7 +1979,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -2045,8 +2016,8 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2056,7 +2027,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -2095,7 +2065,6 @@ "ctxt": 0 }, "value": "boolOrC", - "typeAnnotation": null, "optional": false } }, @@ -2145,8 +2114,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2156,7 +2125,6 @@ "ctxt": 0 }, "value": "boolOrC", - "typeAnnotation": null, "optional": false } } @@ -2194,8 +2162,8 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2205,7 +2173,6 @@ "ctxt": 0 }, "value": "boolOrC", - "typeAnnotation": null, "optional": false } } @@ -2244,7 +2211,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } }, @@ -2296,6 +2262,7 @@ "ctxt": 0 }, "value": "z1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2331,8 +2298,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2342,7 +2308,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2384,6 +2349,7 @@ "ctxt": 0 }, "value": "z2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2400,8 +2366,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2411,7 +2376,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect/input.ts.json index fa27530ed4b5..13ba62bee3d1 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": null, @@ -113,6 +111,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -148,8 +147,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -181,6 +179,7 @@ "ctxt": 0 }, "value": "strOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +215,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -249,6 +247,7 @@ "ctxt": 0 }, "value": "numOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -284,8 +283,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -317,6 +315,7 @@ "ctxt": 0 }, "value": "strOrC", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -356,15 +355,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -402,7 +399,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } }, @@ -454,8 +450,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -465,7 +461,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false }, "definite": false @@ -507,8 +502,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -518,7 +513,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false }, "definite": false @@ -559,7 +553,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } }, @@ -611,8 +604,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -622,7 +615,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false }, "definite": false @@ -664,8 +656,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -675,7 +667,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false }, "definite": false @@ -716,7 +707,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false } }, @@ -768,8 +758,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -779,7 +769,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false }, "definite": false @@ -821,8 +810,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -832,7 +821,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false }, "definite": false @@ -873,7 +861,6 @@ "ctxt": 0 }, "value": "strOrC", - "typeAnnotation": null, "optional": false } }, @@ -925,8 +912,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -936,7 +923,6 @@ "ctxt": 0 }, "value": "strOrC", - "typeAnnotation": null, "optional": false }, "definite": false @@ -978,8 +964,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -989,7 +975,6 @@ "ctxt": 0 }, "value": "strOrC", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfFunction/input.ts.json index 979665ce9dc5..d35a200f7da8 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfFunction/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -103,7 +102,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -145,7 +143,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -170,7 +167,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -191,6 +187,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -207,8 +204,7 @@ }, "kind": "unknown" } - }, - "optional": false + } } } ], @@ -257,7 +253,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -299,7 +294,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -324,7 +318,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -345,6 +338,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -361,8 +355,7 @@ }, "members": [] } - }, - "optional": false + } } } ], @@ -411,7 +404,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -453,7 +445,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -478,7 +469,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -499,6 +489,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -521,13 +512,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -576,7 +565,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -618,7 +606,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -653,7 +640,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -673,7 +659,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -694,6 +679,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -725,7 +711,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -753,8 +738,7 @@ } ] } - }, - "optional": false + } } } ], @@ -803,7 +787,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -845,7 +828,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -870,7 +852,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -891,6 +872,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -925,8 +907,7 @@ } } } - }, - "optional": false + } } } ], @@ -975,7 +956,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1017,7 +997,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1042,7 +1021,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1063,6 +1041,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1124,8 +1103,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1174,7 +1152,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1216,7 +1193,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1245,7 +1221,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1269,7 +1244,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1290,6 +1264,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1329,7 +1304,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1394,8 +1368,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1444,7 +1417,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1486,7 +1458,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1515,7 +1486,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1539,7 +1509,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1560,6 +1529,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1599,7 +1569,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1651,7 +1620,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1681,8 +1649,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1731,7 +1698,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1773,7 +1739,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1802,7 +1767,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1826,7 +1790,6 @@ "ctxt": 0 }, "value": "f100", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1847,6 +1810,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1869,13 +1833,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1894,6 +1856,7 @@ "ctxt": 0 }, "value": "keys", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1923,14 +1886,12 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -1981,8 +1942,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1997,7 +1958,6 @@ "ctxt": 0 }, "value": "keys", - "typeAnnotation": null, "optional": false }, "body": { @@ -2033,8 +1993,8 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2051,7 +2011,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -2062,7 +2021,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -2102,7 +2060,6 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, "optional": false } }, @@ -2150,7 +2107,6 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, "optional": false }, "property": { @@ -2161,7 +2117,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2177,7 +2132,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -2217,7 +2171,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2238,7 +2191,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2264,7 +2216,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfIsOrderIndependent/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfIsOrderIndependent/input.ts.json index bccf64d76459..1423267766ad 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfIsOrderIndependent/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfIsOrderIndependent/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -99,6 +99,7 @@ "ctxt": 0 }, "value": "strOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -134,8 +135,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -167,6 +167,7 @@ "ctxt": 0 }, "value": "strOrFunc", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -228,8 +229,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -261,6 +261,7 @@ "ctxt": 0 }, "value": "numOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -296,8 +297,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -329,6 +329,7 @@ "ctxt": 0 }, "value": "str", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -345,8 +346,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -378,6 +378,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -394,8 +395,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -427,6 +427,7 @@ "ctxt": 0 }, "value": "bool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -443,8 +444,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -476,6 +476,7 @@ "ctxt": 0 }, "value": "func", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -510,8 +511,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -563,7 +563,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } } @@ -599,8 +598,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -610,7 +609,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } } @@ -648,8 +646,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -659,7 +657,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } } @@ -712,7 +709,6 @@ "ctxt": 0 }, "value": "strOrFunc", - "typeAnnotation": null, "optional": false } } @@ -748,8 +744,8 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -759,7 +755,6 @@ "ctxt": 0 }, "value": "strOrFunc", - "typeAnnotation": null, "optional": false } } @@ -797,8 +792,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -808,7 +803,6 @@ "ctxt": 0 }, "value": "strOrFunc", - "typeAnnotation": null, "optional": false } } @@ -861,7 +855,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false } } @@ -897,8 +890,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -908,7 +901,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false } } @@ -946,8 +938,8 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -957,7 +949,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false } } @@ -1010,7 +1001,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } } @@ -1046,8 +1036,8 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1057,7 +1047,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } } @@ -1095,8 +1084,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1106,7 +1095,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect/input.ts.json index d9ae355057c0..b95a49ae716b 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": null, @@ -113,6 +111,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -148,8 +147,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -181,6 +179,7 @@ "ctxt": 0 }, "value": "strOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +215,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -249,6 +247,7 @@ "ctxt": 0 }, "value": "numOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -284,8 +283,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -317,6 +315,7 @@ "ctxt": 0 }, "value": "strOrC", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -356,15 +355,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -402,7 +399,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } }, @@ -454,8 +450,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -465,7 +461,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false }, "definite": false @@ -507,8 +502,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -518,7 +513,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false }, "definite": false @@ -559,7 +553,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } }, @@ -611,8 +604,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -622,7 +615,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false }, "definite": false @@ -664,8 +656,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -675,7 +667,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false }, "definite": false @@ -716,7 +707,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false } }, @@ -768,8 +758,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -779,7 +769,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false }, "definite": false @@ -821,8 +810,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -832,7 +821,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false }, "definite": false @@ -873,7 +861,6 @@ "ctxt": 0 }, "value": "strOrC", - "typeAnnotation": null, "optional": false } }, @@ -925,8 +912,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -936,7 +923,6 @@ "ctxt": 0 }, "value": "strOrC", - "typeAnnotation": null, "optional": false }, "definite": false @@ -978,8 +964,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -989,7 +975,6 @@ "ctxt": 0 }, "value": "strOrC", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfNumber/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfNumber/input.ts.json index aa147f5c2b39..634d461cf1ad 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfNumber/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfNumber/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": null, @@ -113,6 +111,7 @@ "ctxt": 0 }, "value": "str", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -129,8 +128,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -162,6 +160,7 @@ "ctxt": 0 }, "value": "bool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -178,8 +177,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -211,6 +209,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -227,8 +226,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -260,6 +258,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -295,8 +294,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -328,6 +326,7 @@ "ctxt": 0 }, "value": "strOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -363,8 +362,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -396,6 +394,7 @@ "ctxt": 0 }, "value": "numOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -431,8 +430,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -464,6 +462,7 @@ "ctxt": 0 }, "value": "strOrNumOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -508,8 +507,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -541,6 +539,7 @@ "ctxt": 0 }, "value": "strOrC", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -580,15 +579,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -620,6 +617,7 @@ "ctxt": 0 }, "value": "numOrC", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -659,15 +657,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -699,6 +695,7 @@ "ctxt": 0 }, "value": "boolOrC", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -738,15 +735,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -778,6 +773,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -800,13 +796,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -844,7 +838,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } }, @@ -894,8 +887,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -905,7 +898,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } } @@ -943,7 +935,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false }, "right": { @@ -954,7 +945,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } } @@ -993,7 +983,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1043,8 +1032,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1054,7 +1043,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false } } @@ -1094,6 +1082,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1129,8 +1118,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1140,7 +1128,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1181,7 +1168,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1231,8 +1217,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1242,7 +1228,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -1280,8 +1265,8 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1291,7 +1276,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -1330,7 +1314,6 @@ "ctxt": 0 }, "value": "numOrC", - "typeAnnotation": null, "optional": false } }, @@ -1380,8 +1363,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1391,7 +1374,6 @@ "ctxt": 0 }, "value": "numOrC", - "typeAnnotation": null, "optional": false } } @@ -1429,8 +1411,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1440,7 +1422,6 @@ "ctxt": 0 }, "value": "numOrC", - "typeAnnotation": null, "optional": false } } @@ -1479,7 +1460,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1531,6 +1511,7 @@ "ctxt": 0 }, "value": "y1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1547,8 +1528,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1558,7 +1538,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1600,6 +1579,7 @@ "ctxt": 0 }, "value": "y2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1635,8 +1615,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1646,7 +1625,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1687,7 +1665,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } }, @@ -1737,7 +1714,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false }, "right": { @@ -1748,7 +1724,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } } @@ -1786,8 +1761,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1797,7 +1772,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } } @@ -1836,7 +1810,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1888,6 +1861,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1923,8 +1897,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1934,7 +1907,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1974,8 +1946,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1985,7 +1957,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false } } @@ -2024,7 +1995,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } }, @@ -2074,8 +2044,8 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2085,7 +2055,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -2123,8 +2092,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2134,7 +2103,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -2173,7 +2141,6 @@ "ctxt": 0 }, "value": "numOrC", - "typeAnnotation": null, "optional": false } }, @@ -2223,8 +2190,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2234,7 +2201,6 @@ "ctxt": 0 }, "value": "numOrC", - "typeAnnotation": null, "optional": false } } @@ -2272,8 +2238,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2283,7 +2249,6 @@ "ctxt": 0 }, "value": "numOrC", - "typeAnnotation": null, "optional": false } } @@ -2322,7 +2287,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } }, @@ -2374,6 +2338,7 @@ "ctxt": 0 }, "value": "y1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2409,8 +2374,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2420,7 +2384,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2462,6 +2425,7 @@ "ctxt": 0 }, "value": "y2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2478,8 +2442,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2489,7 +2452,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfOther/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfOther/input.ts.json index f6459c21046d..39a20c07e4e5 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfOther/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfOther/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": null, @@ -113,6 +111,7 @@ "ctxt": 0 }, "value": "str", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -129,8 +128,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -162,6 +160,7 @@ "ctxt": 0 }, "value": "bool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -178,8 +177,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -211,6 +209,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -227,8 +226,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -260,6 +258,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -295,8 +294,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -328,6 +326,7 @@ "ctxt": 0 }, "value": "strOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -363,8 +362,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -396,6 +394,7 @@ "ctxt": 0 }, "value": "numOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -431,8 +430,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -464,6 +462,7 @@ "ctxt": 0 }, "value": "strOrNumOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -508,8 +507,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -541,6 +539,7 @@ "ctxt": 0 }, "value": "strOrC", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -580,15 +579,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -620,6 +617,7 @@ "ctxt": 0 }, "value": "numOrC", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -659,15 +657,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -699,6 +695,7 @@ "ctxt": 0 }, "value": "boolOrC", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -738,15 +735,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -778,6 +773,7 @@ "ctxt": 0 }, "value": "emptyObj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -794,8 +790,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -827,6 +822,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -849,13 +845,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -893,7 +887,6 @@ "ctxt": 0 }, "value": "strOrC", - "typeAnnotation": null, "optional": false } }, @@ -943,8 +936,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -954,7 +947,6 @@ "ctxt": 0 }, "value": "strOrC", - "typeAnnotation": null, "optional": false } } @@ -994,6 +986,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1010,8 +1003,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1021,7 +1013,6 @@ "ctxt": 0 }, "value": "strOrC", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1062,7 +1053,6 @@ "ctxt": 0 }, "value": "numOrC", - "typeAnnotation": null, "optional": false } }, @@ -1112,8 +1102,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1123,7 +1113,6 @@ "ctxt": 0 }, "value": "numOrC", - "typeAnnotation": null, "optional": false } } @@ -1163,6 +1152,7 @@ "ctxt": 0 }, "value": "r3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1179,8 +1169,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1190,7 +1179,6 @@ "ctxt": 0 }, "value": "numOrC", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1231,7 +1219,6 @@ "ctxt": 0 }, "value": "boolOrC", - "typeAnnotation": null, "optional": false } }, @@ -1281,8 +1268,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1292,7 +1279,6 @@ "ctxt": 0 }, "value": "boolOrC", - "typeAnnotation": null, "optional": false } } @@ -1332,6 +1318,7 @@ "ctxt": 0 }, "value": "r4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1348,8 +1335,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1359,7 +1345,6 @@ "ctxt": 0 }, "value": "boolOrC", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1400,7 +1385,6 @@ "ctxt": 0 }, "value": "strOrC", - "typeAnnotation": null, "optional": false } }, @@ -1467,8 +1451,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1478,7 +1462,6 @@ "ctxt": 0 }, "value": "strOrC", - "typeAnnotation": null, "optional": false } } @@ -1518,6 +1501,7 @@ "ctxt": 0 }, "value": "r5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1534,8 +1518,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1545,7 +1528,6 @@ "ctxt": 0 }, "value": "strOrC", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1586,7 +1568,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1638,6 +1619,7 @@ "ctxt": 0 }, "value": "q1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1654,8 +1636,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1665,7 +1646,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1707,6 +1687,7 @@ "ctxt": 0 }, "value": "q2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1751,8 +1732,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1762,7 +1742,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1803,7 +1782,6 @@ "ctxt": 0 }, "value": "strOrC", - "typeAnnotation": null, "optional": false } }, @@ -1855,6 +1833,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1871,8 +1850,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1882,7 +1860,6 @@ "ctxt": 0 }, "value": "strOrC", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1922,8 +1899,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1933,7 +1910,6 @@ "ctxt": 0 }, "value": "strOrC", - "typeAnnotation": null, "optional": false } } @@ -1972,7 +1948,6 @@ "ctxt": 0 }, "value": "numOrC", - "typeAnnotation": null, "optional": false } }, @@ -2024,6 +1999,7 @@ "ctxt": 0 }, "value": "r3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2040,8 +2016,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2051,7 +2026,6 @@ "ctxt": 0 }, "value": "numOrC", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2091,8 +2065,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2102,7 +2076,6 @@ "ctxt": 0 }, "value": "numOrC", - "typeAnnotation": null, "optional": false } } @@ -2141,7 +2114,6 @@ "ctxt": 0 }, "value": "boolOrC", - "typeAnnotation": null, "optional": false } }, @@ -2193,6 +2165,7 @@ "ctxt": 0 }, "value": "r4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2209,8 +2182,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2220,7 +2192,6 @@ "ctxt": 0 }, "value": "boolOrC", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2260,8 +2231,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2271,7 +2242,6 @@ "ctxt": 0 }, "value": "boolOrC", - "typeAnnotation": null, "optional": false } } @@ -2310,7 +2280,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } }, @@ -2362,6 +2331,7 @@ "ctxt": 0 }, "value": "q1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2406,8 +2376,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2417,7 +2386,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2459,6 +2427,7 @@ "ctxt": 0 }, "value": "q2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2475,8 +2444,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2486,7 +2454,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfPrimitiveSubtype/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfPrimitiveSubtype/input.ts.json index 84b76437fcf3..d95806bfca0e 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfPrimitiveSubtype/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfPrimitiveSubtype/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -111,7 +112,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -138,8 +138,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -177,7 +176,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -229,6 +227,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -245,8 +244,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -256,7 +254,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -298,7 +295,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -350,6 +346,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -366,8 +363,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -377,7 +373,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -419,7 +414,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -471,6 +465,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -487,8 +482,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -498,7 +492,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -540,7 +533,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -592,6 +584,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -608,8 +601,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -619,7 +611,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "definite": false @@ -661,7 +652,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -713,6 +703,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -729,8 +720,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -740,7 +730,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "definite": false @@ -782,7 +771,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -834,6 +822,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -850,8 +839,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -861,7 +849,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfString/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfString/input.ts.json index 591933a91dac..b511c7130f8a 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfString/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFormTypeOfString/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": null, @@ -113,6 +111,7 @@ "ctxt": 0 }, "value": "str", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -129,8 +128,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -162,6 +160,7 @@ "ctxt": 0 }, "value": "bool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -178,8 +177,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -211,6 +209,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -227,8 +226,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -260,6 +258,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -295,8 +294,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -328,6 +326,7 @@ "ctxt": 0 }, "value": "strOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -363,8 +362,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -396,6 +394,7 @@ "ctxt": 0 }, "value": "numOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -431,8 +430,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -464,6 +462,7 @@ "ctxt": 0 }, "value": "strOrNumOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -508,8 +507,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -541,6 +539,7 @@ "ctxt": 0 }, "value": "strOrC", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -580,15 +579,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -620,6 +617,7 @@ "ctxt": 0 }, "value": "numOrC", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -659,15 +657,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -699,6 +695,7 @@ "ctxt": 0 }, "value": "boolOrC", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -738,15 +735,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -778,6 +773,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -800,13 +796,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -844,7 +838,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } }, @@ -894,8 +887,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -905,7 +898,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } } @@ -943,7 +935,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false }, "right": { @@ -954,7 +945,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } } @@ -993,7 +983,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1043,8 +1032,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1054,7 +1043,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } } @@ -1092,8 +1080,8 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1103,7 +1091,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } } @@ -1142,7 +1129,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1192,8 +1178,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1203,7 +1189,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -1241,8 +1226,8 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1252,7 +1237,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -1291,7 +1275,6 @@ "ctxt": 0 }, "value": "strOrC", - "typeAnnotation": null, "optional": false } }, @@ -1341,8 +1324,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1352,7 +1335,6 @@ "ctxt": 0 }, "value": "strOrC", - "typeAnnotation": null, "optional": false } } @@ -1390,8 +1372,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1401,7 +1383,6 @@ "ctxt": 0 }, "value": "strOrC", - "typeAnnotation": null, "optional": false } } @@ -1440,7 +1421,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1492,6 +1472,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1508,8 +1489,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1519,7 +1499,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1561,6 +1540,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1596,8 +1576,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1607,7 +1586,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1648,7 +1626,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } }, @@ -1698,7 +1675,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false }, "right": { @@ -1709,7 +1685,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } } @@ -1747,8 +1722,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1758,7 +1733,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } } @@ -1797,7 +1771,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1847,8 +1820,8 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1858,7 +1831,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } } @@ -1896,8 +1868,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1907,7 +1879,6 @@ "ctxt": 0 }, "value": "strOrBool", - "typeAnnotation": null, "optional": false } } @@ -1946,7 +1917,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } }, @@ -1996,8 +1966,8 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2007,7 +1977,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -2045,8 +2014,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2056,7 +2025,6 @@ "ctxt": 0 }, "value": "strOrNumOrBool", - "typeAnnotation": null, "optional": false } } @@ -2095,7 +2063,6 @@ "ctxt": 0 }, "value": "strOrC", - "typeAnnotation": null, "optional": false } }, @@ -2145,8 +2112,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2156,7 +2123,6 @@ "ctxt": 0 }, "value": "strOrC", - "typeAnnotation": null, "optional": false } } @@ -2194,8 +2160,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2205,7 +2171,6 @@ "ctxt": 0 }, "value": "strOrC", - "typeAnnotation": null, "optional": false } } @@ -2244,7 +2209,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false } }, @@ -2296,6 +2260,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2331,8 +2296,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2342,7 +2306,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2384,6 +2347,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2400,8 +2364,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2411,7 +2374,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFromPropNameInUnionType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFromPropNameInUnionType/input.ts.json index 5abf7604be6e..be2011409160 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFromPropNameInUnionType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardOfFromPropNameInUnionType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -216,7 +210,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -249,7 +242,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -275,7 +267,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -301,7 +292,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -334,7 +324,6 @@ "ctxt": 0 }, "value": "namedClasses", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -355,6 +344,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -385,7 +375,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -405,15 +394,13 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -468,7 +455,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -510,7 +496,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -521,7 +506,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -582,7 +566,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -593,7 +576,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -629,7 +611,6 @@ "ctxt": 0 }, "value": "multipleClasses", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -650,6 +631,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -680,7 +662,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -700,7 +681,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -720,7 +700,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -740,15 +719,13 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -803,7 +780,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -840,6 +816,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -879,15 +856,13 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -904,7 +879,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -915,7 +889,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -959,6 +932,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -998,15 +972,13 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -1023,7 +995,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1034,7 +1005,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1063,7 +1033,6 @@ "ctxt": 0 }, "value": "anonymousClasses", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1084,6 +1053,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1123,7 +1093,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1175,7 +1144,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1205,8 +1173,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1261,7 +1228,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1298,6 +1264,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1314,8 +1281,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -1332,7 +1298,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1343,7 +1308,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1387,6 +1351,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1403,8 +1368,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -1421,7 +1385,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1432,7 +1395,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1461,7 +1423,6 @@ "ctxt": 0 }, "value": "AWithOptionalProp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1487,7 +1448,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": true }, "value": null, @@ -1535,7 +1495,6 @@ "ctxt": 0 }, "value": "BWithOptionalProp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1561,7 +1520,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": true }, "value": null, @@ -1609,7 +1567,6 @@ "ctxt": 0 }, "value": "positiveTestClassesWithOptionalProperties", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1630,6 +1587,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1660,7 +1618,6 @@ "ctxt": 0 }, "value": "AWithOptionalProp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1680,15 +1637,13 @@ "ctxt": 0 }, "value": "BWithOptionalProp", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -1743,7 +1698,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1785,7 +1739,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1796,7 +1749,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1852,6 +1804,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1868,8 +1821,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -1894,7 +1846,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1905,7 +1856,6 @@ "ctxt": 0 }, "value": "AWithOptionalProp", - "typeAnnotation": null, "optional": false } }, @@ -1924,7 +1874,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1935,7 +1884,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1955,7 +1903,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1966,7 +1913,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1996,7 +1942,6 @@ "ctxt": 0 }, "value": "inParenthesizedExpression", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2017,6 +1962,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2047,7 +1993,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2067,15 +2012,13 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -2137,7 +2080,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2175,6 +2117,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2191,8 +2134,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -2209,7 +2151,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2220,7 +2161,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2264,6 +2204,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2280,8 +2221,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -2298,7 +2238,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2309,7 +2248,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2338,7 +2276,6 @@ "ctxt": 0 }, "value": "ClassWithUnionProp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2364,7 +2301,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2398,7 +2334,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2418,7 +2353,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2453,7 +2387,6 @@ "ctxt": 0 }, "value": "inProperty", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2474,6 +2407,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2496,13 +2430,11 @@ "ctxt": 0 }, "value": "ClassWithUnionProp", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2564,7 +2496,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2575,7 +2506,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2614,6 +2544,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2630,8 +2561,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -2655,7 +2585,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2666,7 +2595,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2679,7 +2607,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2723,6 +2650,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2739,8 +2667,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -2764,7 +2691,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2775,7 +2701,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2788,7 +2713,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2817,7 +2741,6 @@ "ctxt": 0 }, "value": "NestedClassWithProp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2843,7 +2766,6 @@ "ctxt": 0 }, "value": "outer", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2869,7 +2791,6 @@ "ctxt": 0 }, "value": "ClassWithUnionProp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2902,7 +2823,6 @@ "ctxt": 0 }, "value": "innestedProperty", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2923,6 +2843,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2945,13 +2866,11 @@ "ctxt": 0 }, "value": "NestedClassWithProp", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3020,7 +2939,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3031,7 +2949,6 @@ "ctxt": 0 }, "value": "outer", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3044,7 +2961,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3083,6 +2999,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3099,8 +3016,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -3131,7 +3047,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3142,7 +3057,6 @@ "ctxt": 0 }, "value": "outer", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3155,7 +3069,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3168,7 +3081,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3212,6 +3124,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3228,8 +3141,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -3260,7 +3172,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3271,7 +3182,6 @@ "ctxt": 0 }, "value": "outer", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3284,7 +3194,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3297,7 +3206,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3326,7 +3234,6 @@ "ctxt": 0 }, "value": "InMemberOfClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3352,7 +3259,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3386,7 +3292,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3406,7 +3311,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3439,7 +3343,6 @@ "ctxt": 0 }, "value": "inThis", - "typeAnnotation": null, "optional": false }, "function": { @@ -3510,7 +3413,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3549,6 +3451,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3565,8 +3468,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -3598,7 +3500,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3611,7 +3512,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3655,6 +3555,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3671,8 +3572,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -3704,7 +3604,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3717,7 +3616,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3759,7 +3657,6 @@ "ctxt": 0 }, "value": "SelfAssert", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3785,7 +3682,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3831,7 +3727,6 @@ "ctxt": 0 }, "value": "inThis", - "typeAnnotation": null, "optional": false }, "function": { @@ -3921,6 +3816,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3937,8 +3833,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -3963,7 +3858,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4019,7 +3913,6 @@ "ctxt": 0 }, "value": "Indexed", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4044,6 +3937,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4060,8 +3954,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4101,7 +3994,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4122,6 +4014,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4144,13 +4037,11 @@ "ctxt": 0 }, "value": "Indexed", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4205,7 +4096,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -4239,7 +4129,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -4250,7 +4139,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4295,7 +4183,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -4329,7 +4216,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -4340,7 +4226,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4396,7 +4281,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -4415,7 +4299,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -4426,7 +4309,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardRedundancy/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardRedundancy/input.ts.json index a24373ad8246..8a262c65609b 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardRedundancy/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardRedundancy/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -99,8 +99,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -141,7 +141,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -184,7 +183,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -219,7 +217,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -230,7 +227,6 @@ "ctxt": 0 }, "value": "substr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -250,7 +246,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -261,7 +256,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -296,8 +290,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -353,7 +347,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -396,7 +389,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -433,7 +425,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -444,7 +435,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -464,7 +454,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -475,7 +464,6 @@ "ctxt": 0 }, "value": "substr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -510,8 +498,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -552,7 +540,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -595,7 +582,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -630,7 +616,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -641,7 +626,6 @@ "ctxt": 0 }, "value": "substr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -661,7 +645,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -672,7 +655,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -707,8 +689,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -764,7 +746,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -807,7 +788,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -844,7 +824,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -855,7 +834,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -875,7 +853,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -886,7 +863,6 @@ "ctxt": 0 }, "value": "substr", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardTautologicalConsistiency/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardTautologicalConsistiency/input.ts.json index c444d354b82a..361d13e00f7f 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardTautologicalConsistiency/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardTautologicalConsistiency/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "stringOrNumber", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -105,7 +105,6 @@ "ctxt": 0 }, "value": "stringOrNumber", - "typeAnnotation": null, "optional": false } }, @@ -163,7 +162,6 @@ "ctxt": 0 }, "value": "stringOrNumber", - "typeAnnotation": null, "optional": false } }, @@ -205,7 +203,6 @@ "ctxt": 0 }, "value": "stringOrNumber", - "typeAnnotation": null, "optional": false } } @@ -256,7 +253,6 @@ "ctxt": 0 }, "value": "stringOrNumber", - "typeAnnotation": null, "optional": false } }, @@ -299,7 +295,6 @@ "ctxt": 0 }, "value": "stringOrNumber", - "typeAnnotation": null, "optional": false } }, @@ -342,7 +337,6 @@ "ctxt": 0 }, "value": "stringOrNumber", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardTypeOfUndefined/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardTypeOfUndefined/input.ts.json index 493890933154..728e96b5dbdf 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardTypeOfUndefined/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardTypeOfUndefined/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -103,7 +102,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -161,7 +159,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -203,7 +200,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -232,7 +228,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -264,7 +259,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -288,7 +282,6 @@ "ctxt": 0 }, "value": "test2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -309,6 +302,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -325,8 +319,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -375,7 +368,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -433,7 +425,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -475,7 +466,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -504,7 +494,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -536,7 +525,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -560,7 +548,6 @@ "ctxt": 0 }, "value": "test3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -581,6 +568,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -597,8 +585,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -655,7 +642,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -698,7 +684,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -741,7 +726,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -770,7 +754,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -794,7 +777,6 @@ "ctxt": 0 }, "value": "test4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -815,6 +797,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -831,8 +814,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -889,7 +871,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -932,7 +913,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -975,7 +955,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1004,7 +983,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1028,7 +1006,6 @@ "ctxt": 0 }, "value": "test5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1049,6 +1026,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1084,8 +1062,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1134,7 +1111,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1192,7 +1168,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1234,7 +1209,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1263,7 +1237,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1295,7 +1268,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1319,7 +1291,6 @@ "ctxt": 0 }, "value": "test6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1340,6 +1311,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1375,8 +1347,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1425,7 +1396,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1483,7 +1453,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1525,7 +1494,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1554,7 +1522,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1586,7 +1553,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1610,7 +1576,6 @@ "ctxt": 0 }, "value": "test7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1631,6 +1596,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1666,8 +1632,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1724,7 +1689,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1767,7 +1731,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1810,7 +1773,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1839,7 +1801,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1863,7 +1824,6 @@ "ctxt": 0 }, "value": "test8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1884,6 +1844,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1919,8 +1880,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1977,7 +1937,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2020,7 +1979,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2063,7 +2021,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2092,7 +2049,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2116,7 +2072,6 @@ "ctxt": 0 }, "value": "test9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2137,6 +2092,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2172,8 +2128,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2222,7 +2177,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2280,7 +2234,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2322,7 +2275,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2351,7 +2303,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2383,7 +2334,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2407,7 +2357,6 @@ "ctxt": 0 }, "value": "test10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2428,6 +2377,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2463,8 +2413,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2513,7 +2462,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2571,7 +2519,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2613,7 +2560,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2642,7 +2588,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2674,7 +2619,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2698,7 +2642,6 @@ "ctxt": 0 }, "value": "test11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2719,6 +2662,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2754,8 +2698,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2812,7 +2755,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2855,7 +2797,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2898,7 +2839,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2927,7 +2867,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2951,7 +2890,6 @@ "ctxt": 0 }, "value": "test12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2972,6 +2910,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3007,8 +2946,7 @@ } ] } - }, - "optional": false + } } } ], @@ -3065,7 +3003,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3108,7 +3045,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3151,7 +3087,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3180,7 +3115,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3204,7 +3138,6 @@ "ctxt": 0 }, "value": "test13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3225,6 +3158,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3269,8 +3203,7 @@ } ] } - }, - "optional": false + } } } ], @@ -3319,7 +3252,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3377,7 +3309,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3419,7 +3350,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3448,7 +3378,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3480,7 +3409,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3504,7 +3432,6 @@ "ctxt": 0 }, "value": "test14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3525,6 +3452,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3569,8 +3497,7 @@ } ] } - }, - "optional": false + } } } ], @@ -3619,7 +3546,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3677,7 +3603,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3719,7 +3644,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3748,7 +3672,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3780,7 +3703,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3804,7 +3726,6 @@ "ctxt": 0 }, "value": "test15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3825,6 +3746,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3869,8 +3791,7 @@ } ] } - }, - "optional": false + } } } ], @@ -3927,7 +3848,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -3970,7 +3890,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4013,7 +3932,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4042,7 +3960,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4066,7 +3983,6 @@ "ctxt": 0 }, "value": "test16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4087,6 +4003,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4131,8 +4048,7 @@ } ] } - }, - "optional": false + } } } ], @@ -4189,7 +4105,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4232,7 +4147,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4275,7 +4189,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4304,7 +4217,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsDefeat/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsDefeat/input.ts.json index ed7132a7fa25..b6bf97913ec2 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsDefeat/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsDefeat/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -72,8 +72,7 @@ } ] } - }, - "optional": false + } } } ], @@ -101,7 +100,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -143,8 +141,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -195,7 +193,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -244,7 +241,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -273,7 +269,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -284,7 +279,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -324,7 +318,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -349,7 +342,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -370,6 +362,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -405,8 +398,7 @@ } ] } - }, - "optional": false + } } } ], @@ -455,7 +447,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -504,7 +495,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -515,7 +505,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -556,8 +545,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -600,7 +589,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -611,7 +599,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -653,8 +640,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -694,7 +681,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -718,7 +704,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -739,6 +724,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -774,8 +760,7 @@ } ] } - }, - "optional": false + } } } ], @@ -824,7 +809,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -873,7 +857,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -884,7 +867,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -925,8 +907,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -952,7 +934,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -963,7 +944,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1002,8 +982,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -1043,7 +1023,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInClassAccessors/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInClassAccessors/input.ts.json index de4fb8dbf343..b6d97af15eff 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInClassAccessors/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInClassAccessors/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -115,8 +116,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -148,6 +148,7 @@ "ctxt": 0 }, "value": "var1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -183,8 +184,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -201,7 +201,6 @@ "ctxt": 0 }, "value": "ClassWithAccessors", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -227,7 +226,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "function": { @@ -269,8 +267,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -304,7 +302,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false } }, @@ -338,7 +335,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false }, "property": { @@ -349,7 +345,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -382,6 +377,7 @@ "ctxt": 0 }, "value": "var2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -417,8 +413,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -448,8 +443,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -483,7 +478,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } }, @@ -517,7 +511,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false }, "property": { @@ -528,7 +521,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -551,7 +543,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } } @@ -583,7 +574,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "function": { @@ -604,6 +594,7 @@ "ctxt": 0 }, "value": "param", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -639,8 +630,7 @@ } ] } - }, - "optional": false + } } } ], @@ -681,8 +671,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -716,7 +706,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false } }, @@ -750,7 +739,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false }, "property": { @@ -761,7 +749,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -792,8 +779,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -827,7 +814,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false } }, @@ -861,7 +847,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "property": { @@ -872,7 +857,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -905,6 +889,7 @@ "ctxt": 0 }, "value": "var2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -940,8 +925,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -971,8 +955,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1006,7 +990,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } }, @@ -1040,7 +1023,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1051,7 +1033,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1087,7 +1068,6 @@ "ctxt": 0 }, "value": "pp1", - "typeAnnotation": null, "optional": false }, "function": { @@ -1129,8 +1109,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1164,7 +1144,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false } }, @@ -1198,7 +1177,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1209,7 +1187,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1242,6 +1219,7 @@ "ctxt": 0 }, "value": "var2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1277,8 +1255,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1308,8 +1285,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1343,7 +1320,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } }, @@ -1377,7 +1353,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1388,7 +1363,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1411,7 +1385,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } } @@ -1443,7 +1416,6 @@ "ctxt": 0 }, "value": "pp1", - "typeAnnotation": null, "optional": false }, "function": { @@ -1464,6 +1436,7 @@ "ctxt": 0 }, "value": "param", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1499,8 +1472,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1541,8 +1513,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1576,7 +1548,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false } }, @@ -1610,7 +1581,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1621,7 +1591,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1652,8 +1621,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1687,7 +1656,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false } }, @@ -1721,7 +1689,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "property": { @@ -1732,7 +1699,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1765,6 +1731,7 @@ "ctxt": 0 }, "value": "var2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1800,8 +1767,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1831,8 +1797,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1866,7 +1832,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } }, @@ -1900,7 +1865,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1911,7 +1875,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1947,7 +1910,6 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, "optional": false }, "function": { @@ -1989,8 +1951,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -2024,7 +1986,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false } }, @@ -2058,7 +2019,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2069,7 +2029,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2102,6 +2061,7 @@ "ctxt": 0 }, "value": "var2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2137,8 +2097,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2168,8 +2127,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -2203,7 +2162,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } }, @@ -2237,7 +2195,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2248,7 +2205,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2271,7 +2227,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } } @@ -2303,7 +2258,6 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, "optional": false }, "function": { @@ -2324,6 +2278,7 @@ "ctxt": 0 }, "value": "param", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2359,8 +2314,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2401,8 +2355,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -2436,7 +2390,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false } }, @@ -2470,7 +2423,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2481,7 +2433,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2512,8 +2463,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -2547,7 +2498,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false } }, @@ -2581,7 +2531,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "property": { @@ -2592,7 +2541,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2625,6 +2573,7 @@ "ctxt": 0 }, "value": "var2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2660,8 +2609,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2691,8 +2639,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -2726,7 +2674,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } }, @@ -2760,7 +2707,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2771,7 +2717,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2807,7 +2752,6 @@ "ctxt": 0 }, "value": "ss1", - "typeAnnotation": null, "optional": false }, "function": { @@ -2849,8 +2793,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -2884,7 +2828,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false } }, @@ -2918,7 +2861,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2929,7 +2871,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2962,6 +2903,7 @@ "ctxt": 0 }, "value": "var2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2997,8 +2939,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3028,8 +2969,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -3063,7 +3004,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } }, @@ -3097,7 +3037,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false }, "property": { @@ -3108,7 +3047,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3131,7 +3069,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } } @@ -3163,7 +3100,6 @@ "ctxt": 0 }, "value": "ss1", - "typeAnnotation": null, "optional": false }, "function": { @@ -3184,6 +3120,7 @@ "ctxt": 0 }, "value": "param", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3219,8 +3156,7 @@ } ] } - }, - "optional": false + } } } ], @@ -3261,8 +3197,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -3296,7 +3232,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false } }, @@ -3330,7 +3265,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false }, "property": { @@ -3341,7 +3275,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3372,8 +3305,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -3407,7 +3340,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false } }, @@ -3441,7 +3373,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "property": { @@ -3452,7 +3383,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3485,6 +3415,7 @@ "ctxt": 0 }, "value": "var2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3520,8 +3451,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3551,8 +3481,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -3586,7 +3516,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } }, @@ -3620,7 +3549,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false }, "property": { @@ -3631,7 +3559,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInClassMethods/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInClassMethods/input.ts.json index c014efddfb45..949a5e7cb1e1 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInClassMethods/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInClassMethods/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "var1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -115,8 +116,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -133,7 +133,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -159,7 +158,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -179,6 +177,7 @@ "ctxt": 0 }, "value": "param", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -214,8 +213,7 @@ } ] } - }, - "optional": false + } } } ], @@ -250,8 +248,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -285,7 +283,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false } }, @@ -319,7 +316,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false }, "property": { @@ -330,7 +326,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -363,6 +358,7 @@ "ctxt": 0 }, "value": "var2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,8 +394,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -429,8 +424,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -464,7 +459,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } }, @@ -498,7 +492,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false }, "property": { @@ -509,7 +502,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -540,8 +532,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -575,7 +567,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false } }, @@ -609,7 +600,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "property": { @@ -620,7 +610,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -648,7 +637,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "function": { @@ -669,6 +657,7 @@ "ctxt": 0 }, "value": "param", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -704,8 +693,7 @@ } ] } - }, - "optional": false + } } } ], @@ -746,8 +734,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -781,7 +769,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false } }, @@ -815,7 +802,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false }, "property": { @@ -826,7 +812,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -859,6 +844,7 @@ "ctxt": 0 }, "value": "var2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -894,8 +880,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -925,8 +910,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -960,7 +945,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } }, @@ -994,7 +978,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1005,7 +988,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1036,8 +1018,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1071,7 +1053,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false } }, @@ -1105,7 +1086,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "property": { @@ -1116,7 +1096,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1152,7 +1131,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "function": { @@ -1173,6 +1151,7 @@ "ctxt": 0 }, "value": "param", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1208,8 +1187,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1250,8 +1228,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1285,7 +1263,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false } }, @@ -1319,7 +1296,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1330,7 +1306,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1363,6 +1338,7 @@ "ctxt": 0 }, "value": "var2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1398,8 +1374,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1429,8 +1404,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1464,7 +1439,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } }, @@ -1498,7 +1472,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1509,7 +1482,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1540,8 +1512,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1575,7 +1547,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false } }, @@ -1609,7 +1580,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "property": { @@ -1620,7 +1590,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1656,7 +1625,6 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, "optional": false }, "function": { @@ -1677,6 +1645,7 @@ "ctxt": 0 }, "value": "param", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1712,8 +1681,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1754,8 +1722,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1789,7 +1757,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false } }, @@ -1823,7 +1790,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1834,7 +1800,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1867,6 +1832,7 @@ "ctxt": 0 }, "value": "var2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1902,8 +1868,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1933,8 +1898,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1968,7 +1933,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } }, @@ -2002,7 +1966,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2013,7 +1976,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2044,8 +2006,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -2079,7 +2041,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false } }, @@ -2113,7 +2074,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "property": { @@ -2124,7 +2084,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2160,7 +2119,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false }, "function": { @@ -2181,6 +2139,7 @@ "ctxt": 0 }, "value": "param", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2216,8 +2175,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2258,8 +2216,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -2293,7 +2251,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false } }, @@ -2327,7 +2284,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2338,7 +2294,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2371,6 +2326,7 @@ "ctxt": 0 }, "value": "var2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2406,8 +2362,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2437,8 +2392,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -2472,7 +2427,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } }, @@ -2506,7 +2460,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2517,7 +2470,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2548,8 +2500,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -2583,7 +2535,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false } }, @@ -2617,7 +2568,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "property": { @@ -2628,7 +2578,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInConditionalExpression/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInConditionalExpression/input.ts.json index 93563b1ac6ca..72e9a82530d2 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInConditionalExpression/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInConditionalExpression/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -72,8 +72,7 @@ } ] } - }, - "optional": false + } } } ], @@ -129,7 +128,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -163,7 +161,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -174,7 +171,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -196,7 +192,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -219,7 +214,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -240,6 +234,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -275,8 +270,7 @@ } ] } - }, - "optional": false + } } } ], @@ -332,7 +326,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -389,8 +382,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -416,7 +409,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -429,7 +421,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -451,7 +442,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -472,6 +462,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -507,8 +498,7 @@ } ] } - }, - "optional": false + } } } ], @@ -564,7 +554,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -621,8 +610,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -643,7 +632,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -656,7 +644,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -678,7 +665,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -699,6 +685,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -734,8 +721,7 @@ } ] } - }, - "optional": false + } } } ], @@ -791,7 +777,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -818,7 +803,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -859,8 +843,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -881,7 +865,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -905,7 +888,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -926,6 +908,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -961,8 +944,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1018,7 +1000,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1045,7 +1026,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1086,8 +1066,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -1113,7 +1093,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1137,7 +1116,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1158,6 +1136,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1193,8 +1172,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1250,7 +1228,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1307,8 +1284,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1329,7 +1306,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1372,8 +1348,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -1399,7 +1375,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1423,7 +1398,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1444,6 +1418,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1488,8 +1463,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1545,7 +1519,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1580,7 +1553,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1629,7 +1601,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1656,7 +1627,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1675,7 +1645,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1708,7 +1677,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1729,6 +1697,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1773,8 +1742,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1817,6 +1785,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1852,8 +1821,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1898,7 +1866,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1933,7 +1900,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1989,8 +1955,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2000,7 +1966,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2043,7 +2008,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2070,7 +2034,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2089,7 +2052,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2125,7 +2087,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2146,6 +2107,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2181,8 +2143,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2225,8 +2186,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2279,7 +2240,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2336,8 +2296,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2354,7 +2314,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2365,7 +2324,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2388,7 +2346,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2424,7 +2381,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2456,7 +2412,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2477,6 +2432,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2521,8 +2477,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2565,6 +2520,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2600,8 +2556,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2646,7 +2601,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2673,7 +2627,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2722,8 +2675,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2733,7 +2686,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2762,7 +2714,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2804,7 +2755,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2815,7 +2765,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2844,7 +2793,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2865,6 +2813,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2909,8 +2858,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2953,6 +2901,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2997,8 +2946,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3043,7 +2991,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3070,7 +3017,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3127,8 +3073,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3138,7 +3084,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3167,7 +3112,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3210,8 +3154,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -3233,7 +3177,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3257,7 +3200,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3278,6 +3220,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3322,8 +3265,7 @@ } ] } - }, - "optional": false + } } } ], @@ -3366,6 +3308,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3410,8 +3353,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3456,7 +3398,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3513,8 +3454,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -3556,7 +3497,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3567,7 +3507,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3583,7 +3522,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3636,8 +3574,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3647,7 +3585,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3676,7 +3613,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3704,7 +3640,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInDoStatement/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInDoStatement/input.ts.json index 9549c1076387..de12dface86d 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInDoStatement/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInDoStatement/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "cond", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -65,7 +65,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,6 +85,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -130,8 +130,7 @@ } ] } - }, - "optional": false + } } } ], @@ -172,8 +171,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -217,7 +216,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -259,7 +257,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -286,8 +283,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -297,7 +294,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -320,7 +316,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -341,7 +336,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -362,6 +356,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -406,8 +401,7 @@ } ] } - }, - "optional": false + } } } ], @@ -448,8 +442,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -493,7 +487,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -535,7 +528,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -554,7 +546,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -591,8 +582,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -602,7 +593,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -625,7 +615,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -646,7 +635,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -667,6 +655,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -702,8 +691,7 @@ } ] } - }, - "optional": false + } } } ], @@ -744,8 +732,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -794,7 +782,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -836,7 +823,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -855,7 +841,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -892,8 +877,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -903,7 +888,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -926,7 +910,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInExternalModule/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInExternalModule/input.ts.json index 1489b0f95fe0..e0319449ab52 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInExternalModule/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInExternalModule/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "var1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -115,8 +116,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -154,7 +154,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false } }, @@ -204,8 +203,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -222,7 +221,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false }, "property": { @@ -233,7 +231,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -273,8 +270,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -284,7 +281,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false } } @@ -317,6 +313,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -352,8 +349,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -392,6 +388,7 @@ "ctxt": 0 }, "value": "var2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -427,8 +424,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -467,7 +463,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } }, @@ -517,8 +512,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -528,7 +523,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } } @@ -566,8 +560,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -577,7 +571,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInForStatement/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInForStatement/input.ts.json index 7752f3b9d20b..83bf864a2dde 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInForStatement/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInForStatement/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "cond", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -65,7 +65,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,6 +85,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,8 +121,7 @@ } ] } - }, - "optional": false + } } } ], @@ -163,8 +162,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -174,7 +173,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -202,7 +200,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -237,8 +234,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -248,7 +245,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -275,7 +271,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -297,7 +292,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -318,7 +312,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -339,6 +332,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -374,8 +368,7 @@ } ] } - }, - "optional": false + } } } ], @@ -416,8 +409,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -427,7 +420,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -455,7 +447,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -490,8 +481,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -501,7 +492,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -528,7 +518,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -547,7 +536,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -579,7 +567,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -600,7 +587,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -621,6 +607,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -656,8 +643,7 @@ } ] } - }, - "optional": false + } } } ], @@ -698,8 +684,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -709,7 +695,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -737,7 +722,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -772,8 +756,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -783,7 +767,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -810,7 +793,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -829,7 +811,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -861,7 +842,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInFunction/input.ts.json index f25d32135995..48733c62a4c6 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInFunction/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "var1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -115,8 +116,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -133,7 +133,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -154,6 +153,7 @@ "ctxt": 0 }, "value": "param", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -189,8 +189,7 @@ } ] } - }, - "optional": false + } } } ], @@ -231,8 +230,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -266,7 +265,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false } }, @@ -300,7 +298,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false }, "property": { @@ -311,7 +308,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -344,6 +340,7 @@ "ctxt": 0 }, "value": "var2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -379,8 +376,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -410,8 +406,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -445,7 +441,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } }, @@ -479,7 +474,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false }, "property": { @@ -490,7 +484,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -521,8 +514,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -556,7 +549,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false } }, @@ -590,7 +582,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "property": { @@ -601,7 +592,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -626,7 +616,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -647,6 +636,7 @@ "ctxt": 0 }, "value": "param", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -682,8 +672,7 @@ } ] } - }, - "optional": false + } } } ], @@ -726,6 +715,7 @@ "ctxt": 0 }, "value": "var2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -761,8 +751,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -779,7 +768,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -800,6 +788,7 @@ "ctxt": 0 }, "value": "param1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -835,8 +824,7 @@ } ] } - }, - "optional": false + } } } ], @@ -877,8 +865,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -912,7 +900,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false } }, @@ -946,7 +933,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false }, "property": { @@ -957,7 +943,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -988,8 +973,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1023,7 +1008,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } }, @@ -1057,7 +1041,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1068,7 +1051,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1099,8 +1081,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1134,7 +1116,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false } }, @@ -1168,7 +1149,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "property": { @@ -1179,7 +1159,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1212,6 +1191,7 @@ "ctxt": 0 }, "value": "var3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1247,8 +1227,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1278,8 +1257,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1313,7 +1292,6 @@ "ctxt": 0 }, "value": "var3", - "typeAnnotation": null, "optional": false } }, @@ -1347,7 +1325,6 @@ "ctxt": 0 }, "value": "var3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1358,7 +1335,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1389,8 +1365,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1424,7 +1400,6 @@ "ctxt": 0 }, "value": "param1", - "typeAnnotation": null, "optional": false } }, @@ -1458,7 +1433,6 @@ "ctxt": 0 }, "value": "param1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1469,7 +1443,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1501,7 +1474,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1522,6 +1494,7 @@ "ctxt": 0 }, "value": "param", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1557,8 +1530,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1601,6 +1573,7 @@ "ctxt": 0 }, "value": "var2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1636,8 +1609,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1669,8 +1641,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1699,6 +1671,7 @@ "ctxt": 0 }, "value": "param1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1734,8 +1707,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1776,8 +1748,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1811,7 +1783,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false } }, @@ -1845,7 +1816,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1856,7 +1826,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1887,8 +1856,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1922,7 +1891,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } }, @@ -1956,7 +1924,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1967,7 +1934,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1998,8 +1964,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -2033,7 +1999,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false } }, @@ -2067,7 +2032,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "property": { @@ -2078,7 +2042,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2111,6 +2074,7 @@ "ctxt": 0 }, "value": "var3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2146,8 +2110,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2177,8 +2140,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -2212,7 +2175,6 @@ "ctxt": 0 }, "value": "var3", - "typeAnnotation": null, "optional": false } }, @@ -2246,7 +2208,6 @@ "ctxt": 0 }, "value": "var3", - "typeAnnotation": null, "optional": false }, "property": { @@ -2257,7 +2218,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2288,8 +2248,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -2323,7 +2283,6 @@ "ctxt": 0 }, "value": "param1", - "typeAnnotation": null, "optional": false } }, @@ -2357,7 +2316,6 @@ "ctxt": 0 }, "value": "param1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2368,7 +2326,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2394,7 +2351,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false } } @@ -2422,7 +2378,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2443,6 +2398,7 @@ "ctxt": 0 }, "value": "param", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2478,8 +2434,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2522,6 +2477,7 @@ "ctxt": 0 }, "value": "var2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2557,8 +2513,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2590,8 +2545,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2623,6 +2578,7 @@ "ctxt": 0 }, "value": "param1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2658,8 +2614,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -2693,8 +2648,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -2728,7 +2683,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false } }, @@ -2762,7 +2716,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2773,7 +2726,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2804,8 +2756,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -2839,7 +2791,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } }, @@ -2873,7 +2824,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2884,7 +2834,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2915,8 +2864,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -2950,7 +2899,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false } }, @@ -2984,7 +2932,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "property": { @@ -2995,7 +2942,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3028,6 +2974,7 @@ "ctxt": 0 }, "value": "var3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3063,8 +3010,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3094,8 +3040,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -3129,7 +3075,6 @@ "ctxt": 0 }, "value": "var3", - "typeAnnotation": null, "optional": false } }, @@ -3163,7 +3108,6 @@ "ctxt": 0 }, "value": "var3", - "typeAnnotation": null, "optional": false }, "property": { @@ -3174,7 +3118,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3205,8 +3148,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -3240,7 +3183,6 @@ "ctxt": 0 }, "value": "param1", - "typeAnnotation": null, "optional": false } }, @@ -3274,7 +3216,6 @@ "ctxt": 0 }, "value": "param1", - "typeAnnotation": null, "optional": false }, "property": { @@ -3285,7 +3226,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3312,7 +3252,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false } } @@ -3355,6 +3294,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3390,8 +3330,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3408,7 +3347,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3452,6 +3390,7 @@ "ctxt": 0 }, "value": "var2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3487,8 +3426,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -3498,7 +3436,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3520,7 +3457,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } } @@ -3554,8 +3490,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -3596,7 +3532,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3633,7 +3568,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInFunctionAndModuleBlock/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInFunctionAndModuleBlock/input.ts.json index 2bf34672b343..032daa87f5e5 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInFunctionAndModuleBlock/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInFunctionAndModuleBlock/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -81,8 +81,7 @@ } ] } - }, - "optional": false + } } } ], @@ -138,7 +137,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -165,7 +163,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -185,7 +182,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -228,8 +224,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -239,7 +235,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -284,7 +279,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -325,7 +319,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -336,7 +329,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -366,7 +358,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -377,7 +368,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -416,7 +406,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -437,6 +426,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -481,8 +471,7 @@ } ] } - }, - "optional": false + } } } ], @@ -538,7 +527,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -565,7 +553,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -585,7 +572,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [ @@ -605,6 +591,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -640,8 +627,7 @@ } ] } - }, - "optional": false + } } } ], @@ -684,8 +670,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -695,7 +681,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -740,7 +725,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -781,7 +765,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -792,7 +775,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -822,7 +804,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -833,7 +814,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -861,7 +841,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -887,7 +866,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -908,6 +886,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -952,8 +931,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1009,7 +987,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1036,7 +1013,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1094,8 +1070,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1105,7 +1081,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1150,7 +1125,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1191,7 +1165,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1202,7 +1175,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1232,7 +1204,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1243,7 +1214,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1283,7 +1253,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1304,6 +1273,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1348,8 +1318,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1405,7 +1374,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1432,7 +1400,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1465,6 +1432,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1500,8 +1468,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -1537,8 +1504,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1548,7 +1515,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1593,7 +1559,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1634,7 +1599,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1645,7 +1609,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1675,7 +1638,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1686,7 +1648,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1715,7 +1676,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1741,7 +1701,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1762,6 +1721,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1806,8 +1766,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1856,7 +1815,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1908,8 +1866,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1919,7 +1877,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1936,7 +1893,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1980,8 +1936,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1991,7 +1947,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2033,7 +1988,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "body": { @@ -2069,6 +2023,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2113,8 +2068,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2138,7 +2092,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "body": { @@ -2174,8 +2127,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -2185,7 +2138,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2217,6 +2169,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2233,8 +2186,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2272,7 +2224,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2322,8 +2273,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2333,7 +2284,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2371,8 +2321,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ConditionalExpression", @@ -2405,7 +2355,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2446,7 +2395,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2457,7 +2405,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2487,7 +2434,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2498,7 +2444,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2535,7 +2480,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "body": { @@ -2571,6 +2515,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2615,8 +2560,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2640,7 +2584,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "body": { @@ -2660,7 +2603,6 @@ "ctxt": 0 }, "value": "m3", - "typeAnnotation": null, "optional": false }, "body": { @@ -2696,8 +2638,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -2707,7 +2649,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2739,6 +2680,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2755,8 +2697,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2794,7 +2735,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2844,8 +2784,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2855,7 +2795,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2893,8 +2832,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ConditionalExpression", @@ -2927,7 +2866,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2968,7 +2906,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2979,7 +2916,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3009,7 +2945,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3020,7 +2955,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInGlobal/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInGlobal/input.ts.json index 05491148cee6..81448c8e39ad 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInGlobal/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInGlobal/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "var1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -115,8 +116,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -154,7 +154,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false } }, @@ -204,8 +203,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -222,7 +221,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false }, "property": { @@ -233,7 +231,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -273,8 +270,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -284,7 +281,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInIfStatement/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInIfStatement/input.ts.json index c9511da18845..973105fdd8c9 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInIfStatement/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInIfStatement/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -72,8 +72,7 @@ } ] } - }, - "optional": false + } } } ], @@ -122,7 +121,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -171,7 +169,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -182,7 +179,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -222,7 +218,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -247,7 +242,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -268,6 +262,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -303,8 +298,7 @@ } ] } - }, - "optional": false + } } } ], @@ -353,7 +347,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -403,8 +396,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -432,7 +425,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -461,7 +453,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -485,7 +476,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -506,6 +496,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -541,8 +532,7 @@ } ] } - }, - "optional": false + } } } ], @@ -591,7 +581,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -641,8 +630,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -675,7 +664,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -704,7 +692,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -728,7 +715,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -749,6 +735,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -784,8 +771,7 @@ } ] } - }, - "optional": false + } } } ], @@ -834,7 +820,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -876,7 +861,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -913,8 +897,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -942,7 +926,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -966,7 +949,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -987,6 +969,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1022,8 +1005,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1072,7 +1054,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1114,7 +1095,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1151,8 +1131,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -1185,7 +1165,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1209,7 +1188,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1230,6 +1208,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1265,8 +1244,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1315,7 +1293,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1365,8 +1342,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1394,7 +1371,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1431,8 +1407,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -1465,7 +1441,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1489,7 +1464,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1510,6 +1484,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1554,8 +1529,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1604,7 +1578,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1654,7 +1627,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1706,7 +1678,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1748,7 +1719,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1785,7 +1755,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1820,7 +1789,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1841,6 +1809,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1885,8 +1854,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1935,7 +1903,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1985,7 +1952,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2039,6 +2005,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2074,8 +2041,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2085,7 +2051,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2123,7 +2088,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2165,7 +2129,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2202,7 +2165,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2239,7 +2201,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2260,6 +2221,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2295,8 +2257,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2339,8 +2300,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2386,7 +2347,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2436,8 +2396,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2454,7 +2414,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2465,7 +2424,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2495,7 +2453,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2547,7 +2504,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2581,7 +2537,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2602,6 +2557,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2646,8 +2602,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2696,7 +2651,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2746,7 +2700,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2800,6 +2753,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2835,8 +2789,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2868,8 +2821,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -2879,7 +2832,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2924,7 +2876,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2959,7 +2910,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2980,7 +2930,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3005,7 +2954,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3026,6 +2974,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3070,8 +3019,7 @@ } ] } - }, - "optional": false + } } } ], @@ -3120,7 +3068,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3162,7 +3109,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3201,6 +3147,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3245,8 +3192,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3278,8 +3224,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -3289,7 +3235,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3334,7 +3279,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3376,8 +3320,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -3418,7 +3362,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3429,7 +3372,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3463,8 +3405,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -3482,7 +3424,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -3507,7 +3448,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3518,7 +3458,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3551,7 +3490,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3572,6 +3510,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3616,8 +3555,7 @@ } ] } - }, - "optional": false + } } } ], @@ -3666,7 +3604,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3722,7 +3659,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3733,7 +3669,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3775,8 +3710,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -3814,8 +3749,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -3825,7 +3760,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3870,7 +3804,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3911,7 +3844,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3922,7 +3854,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3952,7 +3883,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3963,7 +3893,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInModule/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInModule/input.ts.json index 28e76aa2a747..e84a3d281ab3 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInModule/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInModule/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -115,8 +116,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -148,6 +148,7 @@ "ctxt": 0 }, "value": "var1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -183,8 +184,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -208,7 +208,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "body": { @@ -242,8 +241,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -277,7 +276,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false } }, @@ -311,7 +309,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false }, "property": { @@ -322,7 +319,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -355,6 +351,7 @@ "ctxt": 0 }, "value": "var2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -390,8 +387,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -429,7 +425,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } }, @@ -479,8 +474,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -497,7 +492,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false }, "property": { @@ -508,7 +502,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -548,8 +541,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -559,7 +552,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } } @@ -599,6 +591,7 @@ "ctxt": 0 }, "value": "var3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -634,8 +627,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -674,7 +666,6 @@ "ctxt": 0 }, "value": "var3", - "typeAnnotation": null, "optional": false } }, @@ -724,8 +715,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -735,7 +726,6 @@ "ctxt": 0 }, "value": "var3", - "typeAnnotation": null, "optional": false } } @@ -773,8 +763,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -784,7 +774,6 @@ "ctxt": 0 }, "value": "var3", - "typeAnnotation": null, "optional": false } } @@ -812,7 +801,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "body": { @@ -848,6 +836,7 @@ "ctxt": 0 }, "value": "var2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -883,8 +872,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -923,6 +911,7 @@ "ctxt": 0 }, "value": "var3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -958,8 +947,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -984,7 +972,6 @@ "ctxt": 0 }, "value": "m3", - "typeAnnotation": null, "optional": false }, "body": { @@ -1018,8 +1005,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1053,7 +1040,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false } }, @@ -1087,7 +1073,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1098,7 +1083,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1129,8 +1113,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1164,7 +1148,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } }, @@ -1198,7 +1181,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1209,7 +1191,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1240,8 +1221,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1275,7 +1256,6 @@ "ctxt": 0 }, "value": "var3", - "typeAnnotation": null, "optional": false } }, @@ -1302,7 +1282,6 @@ "ctxt": 0 }, "value": "var3", - "typeAnnotation": null, "optional": false } } @@ -1333,6 +1312,7 @@ "ctxt": 0 }, "value": "var4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1368,8 +1348,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1407,7 +1386,6 @@ "ctxt": 0 }, "value": "var4", - "typeAnnotation": null, "optional": false } }, @@ -1457,8 +1435,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1475,7 +1453,6 @@ "ctxt": 0 }, "value": "var4", - "typeAnnotation": null, "optional": false }, "property": { @@ -1486,7 +1463,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1526,8 +1502,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1537,7 +1513,6 @@ "ctxt": 0 }, "value": "var4", - "typeAnnotation": null, "optional": false } } @@ -1577,6 +1552,7 @@ "ctxt": 0 }, "value": "var5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1612,8 +1588,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1652,7 +1627,6 @@ "ctxt": 0 }, "value": "var5", - "typeAnnotation": null, "optional": false } }, @@ -1702,8 +1676,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1713,7 +1687,6 @@ "ctxt": 0 }, "value": "var5", - "typeAnnotation": null, "optional": false } } @@ -1751,8 +1724,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1762,7 +1735,6 @@ "ctxt": 0 }, "value": "var5", - "typeAnnotation": null, "optional": false } } @@ -1793,7 +1765,6 @@ "ctxt": 0 }, "value": "m3", - "typeAnnotation": null, "optional": false }, "body": { @@ -1813,7 +1784,6 @@ "ctxt": 0 }, "value": "m4", - "typeAnnotation": null, "optional": false }, "body": { @@ -1847,8 +1817,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1882,7 +1852,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false } }, @@ -1916,7 +1885,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1927,7 +1895,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1960,6 +1927,7 @@ "ctxt": 0 }, "value": "var2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1995,8 +1963,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2034,7 +2001,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } }, @@ -2084,8 +2050,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2102,7 +2068,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2113,7 +2078,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2153,8 +2117,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2164,7 +2128,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } } @@ -2204,6 +2167,7 @@ "ctxt": 0 }, "value": "var3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2239,8 +2203,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2279,7 +2242,6 @@ "ctxt": 0 }, "value": "var3", - "typeAnnotation": null, "optional": false } }, @@ -2329,8 +2291,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2340,7 +2302,6 @@ "ctxt": 0 }, "value": "var3", - "typeAnnotation": null, "optional": false } } @@ -2378,8 +2339,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2389,7 +2350,6 @@ "ctxt": 0 }, "value": "var3", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInProperties/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInProperties/input.ts.json index 88c628bdc0ef..28ab68a46b59 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInProperties/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInProperties/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -115,8 +116,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -133,7 +133,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -159,7 +158,6 @@ "ctxt": 0 }, "value": "pp1", - "typeAnnotation": null, "optional": false }, "value": null, @@ -224,7 +222,6 @@ "ctxt": 0 }, "value": "pp2", - "typeAnnotation": null, "optional": false }, "value": null, @@ -289,7 +286,6 @@ "ctxt": 0 }, "value": "pp3", - "typeAnnotation": null, "optional": false }, "function": { @@ -323,7 +319,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } } @@ -355,7 +350,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -397,8 +391,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -447,7 +441,6 @@ "ctxt": 0 }, "value": "pp1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -491,7 +484,6 @@ "ctxt": 0 }, "value": "pp1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -522,8 +514,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -572,7 +564,6 @@ "ctxt": 0 }, "value": "pp2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -616,7 +607,6 @@ "ctxt": 0 }, "value": "pp2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -647,8 +637,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -697,7 +687,6 @@ "ctxt": 0 }, "value": "pp3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -741,7 +730,6 @@ "ctxt": 0 }, "value": "pp3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -794,6 +782,7 @@ "ctxt": 0 }, "value": "c1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -816,13 +805,11 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -852,8 +839,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -894,7 +881,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "property": { @@ -905,7 +891,6 @@ "ctxt": 0 }, "value": "pp2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -941,7 +926,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "property": { @@ -952,7 +936,6 @@ "ctxt": 0 }, "value": "pp2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -983,8 +966,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1025,7 +1008,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1036,7 +1018,6 @@ "ctxt": 0 }, "value": "pp3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1072,7 +1053,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1083,7 +1063,6 @@ "ctxt": 0 }, "value": "pp3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1116,6 +1095,7 @@ "ctxt": 0 }, "value": "obj1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1147,7 +1127,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1194,8 +1173,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1225,8 +1203,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1267,7 +1245,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1278,7 +1255,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1314,7 +1290,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1325,7 +1300,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInRightOperandOfAndAndOperator/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInRightOperandOfAndAndOperator/input.ts.json index 4a49db69081e..343443aaa9a1 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInRightOperandOfAndAndOperator/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInRightOperandOfAndAndOperator/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -72,8 +72,7 @@ } ] } - }, - "optional": false + } } } ], @@ -130,7 +129,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -172,7 +170,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -183,7 +180,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -217,7 +213,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -238,6 +233,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -273,8 +269,7 @@ } ] } - }, - "optional": false + } } } ], @@ -331,7 +326,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -388,8 +382,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -410,7 +404,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -434,7 +427,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -455,6 +447,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -490,8 +483,7 @@ } ] } - }, - "optional": false + } } } ], @@ -548,7 +540,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -605,8 +596,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -632,7 +623,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -656,7 +646,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -677,6 +666,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -721,8 +711,7 @@ } ] } - }, - "optional": false + } } } ], @@ -787,7 +776,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -830,7 +818,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -858,7 +845,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -880,7 +866,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -901,6 +886,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -945,8 +931,7 @@ } ] } - }, - "optional": false + } } } ], @@ -989,6 +974,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1024,8 +1010,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1071,7 +1056,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1128,8 +1112,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1139,7 +1123,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1183,7 +1166,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1210,7 +1192,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1236,7 +1217,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1257,6 +1237,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1301,8 +1282,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1359,7 +1339,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1416,7 +1395,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1443,7 +1421,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1462,7 +1439,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1496,7 +1472,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1517,6 +1492,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1561,8 +1537,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1605,6 +1580,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1649,8 +1625,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1682,6 +1657,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1726,8 +1702,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1773,7 +1748,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1830,8 +1804,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1841,7 +1815,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1884,7 +1857,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1941,8 +1913,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1977,7 +1949,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1988,7 +1959,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2036,8 +2006,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2047,7 +2017,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2074,7 +2043,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2085,7 +2053,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInRightOperandOfOrOrOperator/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInRightOperandOfOrOrOperator/input.ts.json index ba947f8569ff..9dd8f4e9f9d8 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInRightOperandOfOrOrOperator/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInRightOperandOfOrOrOperator/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -72,8 +72,7 @@ } ] } - }, - "optional": false + } } } ], @@ -130,7 +129,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -172,7 +170,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -183,7 +180,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -217,7 +213,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -238,6 +233,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -273,8 +269,7 @@ } ] } - }, - "optional": false + } } } ], @@ -331,7 +326,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -388,8 +382,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -410,7 +404,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -434,7 +427,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -455,6 +447,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -490,8 +483,7 @@ } ] } - }, - "optional": false + } } } ], @@ -548,7 +540,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -605,8 +596,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -632,7 +623,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -656,7 +646,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -677,6 +666,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -721,8 +711,7 @@ } ] } - }, - "optional": false + } } } ], @@ -787,7 +776,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -830,7 +818,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -858,7 +845,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -880,7 +866,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -901,6 +886,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -945,8 +931,7 @@ } ] } - }, - "optional": false + } } } ], @@ -989,6 +974,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1024,8 +1010,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1071,7 +1056,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1128,8 +1112,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1139,7 +1123,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1183,7 +1166,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1210,7 +1192,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1236,7 +1217,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1257,6 +1237,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1301,8 +1282,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1359,7 +1339,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1416,7 +1395,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1443,7 +1421,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1462,7 +1439,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1496,7 +1472,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1517,6 +1492,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1561,8 +1537,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1605,6 +1580,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1649,8 +1625,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1682,6 +1657,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1726,8 +1702,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1773,7 +1748,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1830,8 +1804,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1841,7 +1815,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1884,7 +1857,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1941,8 +1913,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1977,7 +1949,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1988,7 +1959,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2036,8 +2006,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2047,7 +2017,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2074,7 +2043,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2085,7 +2053,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInWhileStatement/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInWhileStatement/input.ts.json index ec0c73a71f3c..00cca0b7d5f8 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInWhileStatement/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsInWhileStatement/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "cond", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -65,7 +65,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,6 +85,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,8 +121,7 @@ } ] } - }, - "optional": false + } } } ], @@ -171,7 +170,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -213,7 +211,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -240,8 +237,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -251,7 +248,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -274,7 +270,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -295,7 +290,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -316,6 +310,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -351,8 +346,7 @@ } ] } - }, - "optional": false + } } } ], @@ -401,7 +395,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -443,7 +436,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -472,7 +464,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -499,8 +490,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -510,7 +501,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -533,7 +523,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -554,7 +543,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -575,6 +563,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,8 +599,7 @@ } ] } - }, - "optional": false + } } } ], @@ -660,7 +648,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -702,7 +689,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -731,7 +717,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -758,8 +743,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -769,7 +754,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -792,7 +776,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsObjectMethods/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsObjectMethods/input.ts.json index 152ffac27ae7..4c0b4dbd420e 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsObjectMethods/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsObjectMethods/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -115,8 +116,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -148,6 +148,7 @@ "ctxt": 0 }, "value": "var1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -183,8 +184,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -216,8 +216,8 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -237,7 +237,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "params": [ @@ -257,6 +256,7 @@ "ctxt": 0 }, "value": "param", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -292,8 +292,7 @@ } ] } - }, - "optional": false + } } } ], @@ -334,8 +333,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -369,7 +368,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false } }, @@ -403,7 +401,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false }, "property": { @@ -414,7 +411,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -447,6 +443,7 @@ "ctxt": 0 }, "value": "var2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -482,8 +479,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -513,8 +509,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -548,7 +544,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } }, @@ -582,7 +577,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false }, "property": { @@ -593,7 +587,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -624,8 +617,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -659,7 +652,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false } }, @@ -693,7 +685,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "property": { @@ -704,7 +695,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -727,7 +717,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } } @@ -753,7 +742,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -788,8 +776,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -823,7 +811,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false } }, @@ -857,7 +844,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false }, "property": { @@ -868,7 +854,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -901,6 +886,7 @@ "ctxt": 0 }, "value": "var2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -936,8 +922,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -967,8 +952,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1002,7 +987,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } }, @@ -1036,7 +1020,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1047,7 +1030,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1070,7 +1052,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } } @@ -1092,7 +1073,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "param": { @@ -1103,6 +1083,7 @@ "ctxt": 0 }, "value": "param", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1138,8 +1119,7 @@ } ] } - }, - "optional": false + } }, "body": { "type": "BlockStatement", @@ -1172,8 +1152,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1207,7 +1187,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false } }, @@ -1241,7 +1220,6 @@ "ctxt": 0 }, "value": "var1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1252,7 +1230,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1285,6 +1262,7 @@ "ctxt": 0 }, "value": "var2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1320,8 +1298,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1351,8 +1328,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1386,7 +1363,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false } }, @@ -1420,7 +1396,6 @@ "ctxt": 0 }, "value": "var2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1431,7 +1406,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1462,8 +1436,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1497,7 +1471,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false } }, @@ -1531,7 +1504,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "property": { @@ -1542,7 +1514,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1582,8 +1553,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1631,7 +1602,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1642,7 +1612,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1658,7 +1627,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } } @@ -1703,7 +1671,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1714,7 +1681,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1730,7 +1696,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } } @@ -1763,8 +1728,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1805,7 +1770,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1816,7 +1780,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1852,7 +1815,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1863,7 +1825,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsOnClassProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsOnClassProperty/input.ts.json index fd31a6efede2..c9fb124b8577 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsOnClassProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsOnClassProperty/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "value": null, @@ -115,7 +113,6 @@ "ctxt": 0 }, "value": "getData", - "typeAnnotation": null, "optional": false }, "function": { @@ -159,8 +156,8 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -185,7 +182,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false @@ -232,7 +228,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false } }, @@ -259,7 +254,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -284,7 +278,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "property": { @@ -295,7 +288,6 @@ "ctxt": 0 }, "value": "join", - "typeAnnotation": null, "optional": false }, "computed": false @@ -351,7 +343,6 @@ "ctxt": 0 }, "value": "getData1", - "typeAnnotation": null, "optional": false }, "function": { @@ -423,7 +414,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false @@ -467,7 +457,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false @@ -509,7 +498,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false @@ -522,7 +510,6 @@ "ctxt": 0 }, "value": "join", - "typeAnnotation": null, "optional": false }, "computed": false @@ -595,6 +582,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -626,7 +614,6 @@ "ctxt": 0 }, "value": "prop1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -687,7 +674,6 @@ "ctxt": 0 }, "value": "prop2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -734,8 +720,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -755,7 +740,6 @@ "ctxt": 0 }, "value": "prop1", - "typeAnnotation": null, "optional": false }, "value": { @@ -783,7 +767,6 @@ "ctxt": 0 }, "value": "prop2", - "typeAnnotation": null, "optional": false }, "value": { @@ -848,7 +831,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -859,7 +841,6 @@ "ctxt": 0 }, "value": "prop1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -909,7 +890,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -920,7 +900,6 @@ "ctxt": 0 }, "value": "prop1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -933,7 +912,6 @@ "ctxt": 0 }, "value": "toLowerCase", - "typeAnnotation": null, "optional": false }, "computed": false @@ -978,8 +956,8 @@ "ctxt": 0 }, "value": "prop1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -996,7 +974,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -1007,7 +984,6 @@ "ctxt": 0 }, "value": "prop1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1055,7 +1031,6 @@ "ctxt": 0 }, "value": "prop1", - "typeAnnotation": null, "optional": false } }, @@ -1096,7 +1071,6 @@ "ctxt": 0 }, "value": "prop1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1107,7 +1081,6 @@ "ctxt": 0 }, "value": "toLocaleLowerCase", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsWithAny/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsWithAny/input.ts.json index 7f7d76788684..922a0c59c2bf 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsWithAny/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsWithAny/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -68,7 +68,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -110,7 +109,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -121,7 +119,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false } }, @@ -155,7 +152,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -166,7 +162,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -204,7 +199,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -215,7 +209,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -255,7 +248,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -304,7 +296,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -315,7 +306,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -353,7 +343,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -364,7 +353,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -404,7 +392,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -453,7 +440,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -464,7 +450,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -502,7 +487,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -513,7 +497,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -553,7 +536,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -602,7 +584,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -613,7 +594,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -651,7 +631,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -662,7 +641,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -702,7 +680,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -751,7 +728,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -762,7 +738,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -800,7 +775,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -811,7 +785,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsWithInstanceOf/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsWithInstanceOf/input.ts.json index 41dc89c68898..2d2049021934 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsWithInstanceOf/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsWithInstanceOf/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "global", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -105,6 +103,7 @@ "ctxt": 0 }, "value": "result", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -127,13 +126,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": true @@ -165,6 +162,7 @@ "ctxt": 0 }, "value": "result2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -187,13 +185,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": true @@ -238,7 +234,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "right": { @@ -249,7 +244,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false } } @@ -286,8 +280,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -297,7 +291,6 @@ "ctxt": 0 }, "value": "result2", - "typeAnnotation": null, "optional": false } } @@ -334,7 +327,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "property": { @@ -345,7 +337,6 @@ "ctxt": 0 }, "value": "global", - "typeAnnotation": null, "optional": false }, "computed": false @@ -378,7 +369,6 @@ "ctxt": 0 }, "value": "OnChanges", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -408,7 +398,6 @@ "ctxt": 0 }, "value": "onChanges", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -422,6 +411,7 @@ "ctxt": 0 }, "value": "changes", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -444,7 +434,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -476,8 +465,7 @@ ] } } - }, - "optional": false + } } ], "typeAnn": { @@ -517,7 +505,6 @@ "ctxt": 0 }, "value": "Validator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -547,7 +534,6 @@ "ctxt": 0 }, "value": "validate", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -592,7 +578,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -642,7 +627,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -668,7 +652,6 @@ "ctxt": 0 }, "value": "validate", - "typeAnnotation": null, "optional": false }, "function": { @@ -734,7 +717,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -778,6 +760,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -808,7 +791,6 @@ "ctxt": 0 }, "value": "Validator", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -828,7 +810,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -854,7 +835,6 @@ "ctxt": 0 }, "value": "OnChanges", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -864,8 +844,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "TsAsExpression", @@ -919,7 +898,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -930,7 +908,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -957,7 +934,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -980,7 +956,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -1006,7 +981,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -1017,7 +991,6 @@ "ctxt": 0 }, "value": "onChanges", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1059,7 +1032,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -1070,7 +1042,6 @@ "ctxt": 0 }, "value": "onChanges", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsWithInstanceOfByConstructorSignature/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsWithInstanceOfByConstructorSignature/input.ts.json index 0cace75e5384..3ac79d8b2d46 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsWithInstanceOfByConstructorSignature/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typeGuardsWithInstanceOfByConstructorSignature/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "AConstructor", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -65,7 +64,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -91,7 +89,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -121,7 +118,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -175,6 +171,7 @@ "ctxt": 0 }, "value": "A", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -197,13 +194,11 @@ "ctxt": 0 }, "value": "AConstructor", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -235,6 +230,7 @@ "ctxt": 0 }, "value": "obj1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -265,7 +261,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -281,8 +276,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -312,7 +306,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "right": { @@ -323,7 +316,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -357,7 +349,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -368,7 +359,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -396,7 +386,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -407,7 +396,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -442,6 +430,7 @@ "ctxt": 0 }, "value": "obj2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -458,8 +447,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -489,7 +477,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "right": { @@ -500,7 +487,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -534,7 +520,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -545,7 +530,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -573,7 +557,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false }, "property": { @@ -584,7 +567,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -609,7 +591,6 @@ "ctxt": 0 }, "value": "BConstructor", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -653,7 +634,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -679,7 +659,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -711,7 +690,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -738,7 +716,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -765,7 +742,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -798,7 +774,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -827,7 +802,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -863,6 +837,7 @@ "ctxt": 0 }, "value": "B", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -885,13 +860,11 @@ "ctxt": 0 }, "value": "BConstructor", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -923,6 +896,7 @@ "ctxt": 0 }, "value": "obj3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -953,7 +927,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -987,8 +960,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1018,7 +990,6 @@ "ctxt": 0 }, "value": "obj3", - "typeAnnotation": null, "optional": false }, "right": { @@ -1029,7 +1000,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -1071,7 +1041,6 @@ "ctxt": 0 }, "value": "obj3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1082,7 +1051,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1128,7 +1096,6 @@ "ctxt": 0 }, "value": "obj3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1139,7 +1106,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1190,7 +1156,6 @@ "ctxt": 0 }, "value": "obj3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1201,7 +1166,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1251,6 +1215,7 @@ "ctxt": 0 }, "value": "obj4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1267,8 +1232,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1298,7 +1262,6 @@ "ctxt": 0 }, "value": "obj4", - "typeAnnotation": null, "optional": false }, "right": { @@ -1309,7 +1272,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -1351,7 +1313,6 @@ "ctxt": 0 }, "value": "obj4", - "typeAnnotation": null, "optional": false }, "property": { @@ -1362,7 +1323,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1413,7 +1373,6 @@ "ctxt": 0 }, "value": "obj4", - "typeAnnotation": null, "optional": false }, "property": { @@ -1424,7 +1383,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1470,7 +1428,6 @@ "ctxt": 0 }, "value": "obj4", - "typeAnnotation": null, "optional": false }, "property": { @@ -1481,7 +1438,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1521,7 +1477,6 @@ "ctxt": 0 }, "value": "CConstructor", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1551,6 +1506,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1567,8 +1523,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1593,7 +1548,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1617,6 +1571,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1633,8 +1588,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1659,7 +1613,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1685,7 +1638,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1715,7 +1667,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1757,7 +1708,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1799,7 +1749,6 @@ "ctxt": 0 }, "value": "bar1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1843,7 +1792,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1873,7 +1821,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1915,7 +1862,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1957,7 +1903,6 @@ "ctxt": 0 }, "value": "bar2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2011,6 +1956,7 @@ "ctxt": 0 }, "value": "C", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2033,13 +1979,11 @@ "ctxt": 0 }, "value": "CConstructor", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2071,6 +2015,7 @@ "ctxt": 0 }, "value": "obj5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2101,7 +2046,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2121,15 +2065,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2159,7 +2101,6 @@ "ctxt": 0 }, "value": "obj5", - "typeAnnotation": null, "optional": false }, "right": { @@ -2170,7 +2111,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -2204,7 +2144,6 @@ "ctxt": 0 }, "value": "obj5", - "typeAnnotation": null, "optional": false }, "property": { @@ -2215,7 +2154,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2243,7 +2181,6 @@ "ctxt": 0 }, "value": "obj5", - "typeAnnotation": null, "optional": false }, "property": { @@ -2254,7 +2191,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2282,7 +2218,6 @@ "ctxt": 0 }, "value": "obj5", - "typeAnnotation": null, "optional": false }, "property": { @@ -2293,7 +2228,6 @@ "ctxt": 0 }, "value": "bar1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2321,7 +2255,6 @@ "ctxt": 0 }, "value": "obj5", - "typeAnnotation": null, "optional": false }, "property": { @@ -2332,7 +2265,6 @@ "ctxt": 0 }, "value": "bar2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2367,6 +2299,7 @@ "ctxt": 0 }, "value": "obj6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2383,8 +2316,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2414,7 +2346,6 @@ "ctxt": 0 }, "value": "obj6", - "typeAnnotation": null, "optional": false }, "right": { @@ -2425,7 +2356,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -2459,7 +2389,6 @@ "ctxt": 0 }, "value": "obj6", - "typeAnnotation": null, "optional": false }, "property": { @@ -2470,7 +2399,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2498,7 +2426,6 @@ "ctxt": 0 }, "value": "obj6", - "typeAnnotation": null, "optional": false }, "property": { @@ -2509,7 +2436,6 @@ "ctxt": 0 }, "value": "bar1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2537,7 +2463,6 @@ "ctxt": 0 }, "value": "obj6", - "typeAnnotation": null, "optional": false }, "property": { @@ -2548,7 +2473,6 @@ "ctxt": 0 }, "value": "bar2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2573,7 +2497,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2603,7 +2526,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2657,6 +2579,7 @@ "ctxt": 0 }, "value": "D", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2702,7 +2625,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2712,8 +2634,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2745,6 +2666,7 @@ "ctxt": 0 }, "value": "obj7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2775,7 +2697,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2791,8 +2712,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2822,7 +2742,6 @@ "ctxt": 0 }, "value": "obj7", - "typeAnnotation": null, "optional": false }, "right": { @@ -2833,7 +2752,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false } }, @@ -2867,7 +2785,6 @@ "ctxt": 0 }, "value": "obj7", - "typeAnnotation": null, "optional": false }, "property": { @@ -2878,7 +2795,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2906,7 +2822,6 @@ "ctxt": 0 }, "value": "obj7", - "typeAnnotation": null, "optional": false }, "property": { @@ -2917,7 +2832,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2952,6 +2866,7 @@ "ctxt": 0 }, "value": "obj8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2968,8 +2883,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2999,7 +2913,6 @@ "ctxt": 0 }, "value": "obj8", - "typeAnnotation": null, "optional": false }, "right": { @@ -3010,7 +2923,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false } }, @@ -3044,7 +2956,6 @@ "ctxt": 0 }, "value": "obj8", - "typeAnnotation": null, "optional": false }, "property": { @@ -3055,7 +2966,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3083,7 +2993,6 @@ "ctxt": 0 }, "value": "obj8", - "typeAnnotation": null, "optional": false }, "property": { @@ -3094,7 +3003,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3119,7 +3027,6 @@ "ctxt": 0 }, "value": "EConstructor", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3171,7 +3078,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3191,7 +3097,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3219,7 +3124,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3249,7 +3153,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3291,7 +3194,6 @@ "ctxt": 0 }, "value": "bar1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3335,7 +3237,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3365,7 +3266,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3407,7 +3307,6 @@ "ctxt": 0 }, "value": "bar2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3461,6 +3360,7 @@ "ctxt": 0 }, "value": "E", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3483,13 +3383,11 @@ "ctxt": 0 }, "value": "EConstructor", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3521,6 +3419,7 @@ "ctxt": 0 }, "value": "obj9", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3551,7 +3450,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3571,15 +3469,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3609,7 +3505,6 @@ "ctxt": 0 }, "value": "obj9", - "typeAnnotation": null, "optional": false }, "right": { @@ -3620,7 +3515,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false } }, @@ -3654,7 +3548,6 @@ "ctxt": 0 }, "value": "obj9", - "typeAnnotation": null, "optional": false }, "property": { @@ -3665,7 +3558,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3693,7 +3585,6 @@ "ctxt": 0 }, "value": "obj9", - "typeAnnotation": null, "optional": false }, "property": { @@ -3704,7 +3595,6 @@ "ctxt": 0 }, "value": "bar1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3732,7 +3622,6 @@ "ctxt": 0 }, "value": "obj9", - "typeAnnotation": null, "optional": false }, "property": { @@ -3743,7 +3632,6 @@ "ctxt": 0 }, "value": "bar2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3778,6 +3666,7 @@ "ctxt": 0 }, "value": "obj10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3794,8 +3683,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -3825,7 +3713,6 @@ "ctxt": 0 }, "value": "obj10", - "typeAnnotation": null, "optional": false }, "right": { @@ -3836,7 +3723,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false } }, @@ -3870,7 +3756,6 @@ "ctxt": 0 }, "value": "obj10", - "typeAnnotation": null, "optional": false }, "property": { @@ -3881,7 +3766,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3909,7 +3793,6 @@ "ctxt": 0 }, "value": "obj10", - "typeAnnotation": null, "optional": false }, "property": { @@ -3920,7 +3803,6 @@ "ctxt": 0 }, "value": "bar1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3948,7 +3830,6 @@ "ctxt": 0 }, "value": "obj10", - "typeAnnotation": null, "optional": false }, "property": { @@ -3959,7 +3840,6 @@ "ctxt": 0 }, "value": "bar2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3984,7 +3864,6 @@ "ctxt": 0 }, "value": "FConstructor", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4043,7 +3922,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4073,7 +3951,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4115,7 +3992,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4169,6 +4045,7 @@ "ctxt": 0 }, "value": "F", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4191,13 +4068,11 @@ "ctxt": 0 }, "value": "FConstructor", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -4229,6 +4104,7 @@ "ctxt": 0 }, "value": "obj11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4259,7 +4135,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4275,8 +4150,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -4306,7 +4180,6 @@ "ctxt": 0 }, "value": "obj11", - "typeAnnotation": null, "optional": false }, "right": { @@ -4317,7 +4190,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false } }, @@ -4351,7 +4223,6 @@ "ctxt": 0 }, "value": "obj11", - "typeAnnotation": null, "optional": false }, "property": { @@ -4362,7 +4233,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4390,7 +4260,6 @@ "ctxt": 0 }, "value": "obj11", - "typeAnnotation": null, "optional": false }, "property": { @@ -4401,7 +4270,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4436,6 +4304,7 @@ "ctxt": 0 }, "value": "obj12", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4452,8 +4321,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -4483,7 +4351,6 @@ "ctxt": 0 }, "value": "obj12", - "typeAnnotation": null, "optional": false }, "right": { @@ -4494,7 +4361,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false } }, @@ -4528,7 +4394,6 @@ "ctxt": 0 }, "value": "obj12", - "typeAnnotation": null, "optional": false }, "property": { @@ -4539,7 +4404,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4567,7 +4431,6 @@ "ctxt": 0 }, "value": "obj12", - "typeAnnotation": null, "optional": false }, "property": { @@ -4578,7 +4441,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4603,7 +4465,6 @@ "ctxt": 0 }, "value": "GConstructor", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4633,7 +4494,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4662,7 +4522,6 @@ "ctxt": 0 }, "value": "G1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4700,7 +4559,6 @@ "ctxt": 0 }, "value": "G2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4726,7 +4584,6 @@ "ctxt": 0 }, "value": "G1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4756,7 +4613,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4800,7 +4656,6 @@ "ctxt": 0 }, "value": "G2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4830,7 +4685,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4884,6 +4738,7 @@ "ctxt": 0 }, "value": "G", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4906,13 +4761,11 @@ "ctxt": 0 }, "value": "GConstructor", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -4944,6 +4797,7 @@ "ctxt": 0 }, "value": "obj13", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4974,7 +4828,6 @@ "ctxt": 0 }, "value": "G1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4994,15 +4847,13 @@ "ctxt": 0 }, "value": "G2", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -5032,7 +4883,6 @@ "ctxt": 0 }, "value": "obj13", - "typeAnnotation": null, "optional": false }, "right": { @@ -5043,7 +4893,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false } }, @@ -5077,7 +4926,6 @@ "ctxt": 0 }, "value": "obj13", - "typeAnnotation": null, "optional": false }, "property": { @@ -5088,7 +4936,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5116,7 +4963,6 @@ "ctxt": 0 }, "value": "obj13", - "typeAnnotation": null, "optional": false }, "property": { @@ -5127,7 +4973,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5162,6 +5007,7 @@ "ctxt": 0 }, "value": "obj14", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5178,8 +5024,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -5209,7 +5054,6 @@ "ctxt": 0 }, "value": "obj14", - "typeAnnotation": null, "optional": false }, "right": { @@ -5220,7 +5064,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false } }, @@ -5254,7 +5097,6 @@ "ctxt": 0 }, "value": "obj14", - "typeAnnotation": null, "optional": false }, "property": { @@ -5265,7 +5107,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5293,7 +5134,6 @@ "ctxt": 0 }, "value": "obj14", - "typeAnnotation": null, "optional": false }, "property": { @@ -5304,7 +5144,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5329,7 +5168,6 @@ "ctxt": 0 }, "value": "HConstructor", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5359,7 +5197,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5415,7 +5252,6 @@ "ctxt": 0 }, "value": "H", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5441,7 +5277,6 @@ "ctxt": 0 }, "value": "H", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5471,7 +5306,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5525,6 +5359,7 @@ "ctxt": 0 }, "value": "H", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5547,13 +5382,11 @@ "ctxt": 0 }, "value": "HConstructor", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -5585,6 +5418,7 @@ "ctxt": 0 }, "value": "obj15", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5615,7 +5449,6 @@ "ctxt": 0 }, "value": "H", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5631,8 +5464,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -5662,7 +5494,6 @@ "ctxt": 0 }, "value": "obj15", - "typeAnnotation": null, "optional": false }, "right": { @@ -5673,7 +5504,6 @@ "ctxt": 0 }, "value": "H", - "typeAnnotation": null, "optional": false } }, @@ -5707,7 +5537,6 @@ "ctxt": 0 }, "value": "obj15", - "typeAnnotation": null, "optional": false }, "property": { @@ -5718,7 +5547,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5746,7 +5574,6 @@ "ctxt": 0 }, "value": "obj15", - "typeAnnotation": null, "optional": false }, "property": { @@ -5757,7 +5584,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5792,6 +5618,7 @@ "ctxt": 0 }, "value": "obj16", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5808,8 +5635,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -5839,7 +5665,6 @@ "ctxt": 0 }, "value": "obj16", - "typeAnnotation": null, "optional": false }, "right": { @@ -5850,7 +5675,6 @@ "ctxt": 0 }, "value": "H", - "typeAnnotation": null, "optional": false } }, @@ -5884,7 +5708,6 @@ "ctxt": 0 }, "value": "obj16", - "typeAnnotation": null, "optional": false }, "property": { @@ -5895,7 +5718,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5923,7 +5745,6 @@ "ctxt": 0 }, "value": "obj16", - "typeAnnotation": null, "optional": false }, "property": { @@ -5934,7 +5755,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5969,6 +5789,7 @@ "ctxt": 0 }, "value": "obj17", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5985,8 +5806,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -6016,7 +5836,6 @@ "ctxt": 0 }, "value": "obj17", - "typeAnnotation": null, "optional": false }, "right": { @@ -6027,7 +5846,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false } }, @@ -6061,7 +5879,6 @@ "ctxt": 0 }, "value": "obj17", - "typeAnnotation": null, "optional": false }, "property": { @@ -6072,7 +5889,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6100,7 +5916,6 @@ "ctxt": 0 }, "value": "obj17", - "typeAnnotation": null, "optional": false }, "property": { @@ -6111,7 +5926,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6146,6 +5960,7 @@ "ctxt": 0 }, "value": "obj18", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6162,8 +5977,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -6193,7 +6007,6 @@ "ctxt": 0 }, "value": "obj18", - "typeAnnotation": null, "optional": false }, "right": { @@ -6204,7 +6017,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false } }, @@ -6238,7 +6050,6 @@ "ctxt": 0 }, "value": "obj18", - "typeAnnotation": null, "optional": false }, "property": { @@ -6249,7 +6060,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6277,7 +6087,6 @@ "ctxt": 0 }, "value": "obj18", - "typeAnnotation": null, "optional": false }, "property": { @@ -6288,7 +6097,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typePredicateASI/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typePredicateASI/input.ts.json index a05d8959af0a..a6ebc2be91cf 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typePredicateASI/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/typeGuards/typePredicateASI/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -65,6 +63,7 @@ "ctxt": 0 }, "value": "callback", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -88,6 +87,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +104,7 @@ }, "kind": "any" } - }, - "optional": false + } }, { "type": "Identifier", @@ -115,6 +114,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -131,8 +131,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "typeParams": null, @@ -154,8 +153,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": { @@ -180,7 +178,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -204,7 +201,6 @@ "ctxt": 0 }, "value": "is", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithAnyOtherType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithAnyOtherType/input.ts.json index 59d44915bc52..625d8a187e60 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithAnyOtherType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithAnyOtherType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "ANY", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,8 +80,8 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -113,6 +113,7 @@ "ctxt": 0 }, "value": "ANY2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -137,8 +138,7 @@ "kind": "any" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -213,6 +213,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -247,8 +248,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -280,8 +280,8 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -301,7 +301,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -329,7 +328,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -371,7 +369,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -415,8 +412,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -438,7 +435,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -475,7 +471,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -501,7 +496,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -547,7 +541,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -591,8 +584,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -614,7 +607,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -655,7 +647,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -698,6 +689,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -714,8 +706,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -751,8 +742,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -769,7 +760,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -804,8 +794,8 @@ "ctxt": 0 }, "value": "ResultIsNumber", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -823,7 +813,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } }, @@ -856,8 +845,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -875,7 +864,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false } }, @@ -908,8 +896,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -927,7 +915,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -960,8 +947,8 @@ "ctxt": 0 }, "value": "ResultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -979,7 +966,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } }, @@ -1012,8 +998,8 @@ "ctxt": 0 }, "value": "ResultIsNumber4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1031,7 +1017,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } }, @@ -1064,8 +1049,8 @@ "ctxt": 0 }, "value": "ResultIsNumber5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1083,7 +1068,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } }, @@ -1116,8 +1100,8 @@ "ctxt": 0 }, "value": "ResultIsNumber6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1135,7 +1119,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1168,8 +1151,8 @@ "ctxt": 0 }, "value": "ResultIsNumber7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1217,8 +1200,8 @@ "ctxt": 0 }, "value": "ResultIsNumber8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1243,7 +1226,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1287,8 +1269,8 @@ "ctxt": 0 }, "value": "ResultIsNumber9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1313,7 +1295,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1324,7 +1305,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1359,8 +1339,8 @@ "ctxt": 0 }, "value": "ResultIsNumber10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1385,7 +1365,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1396,7 +1375,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1431,8 +1409,8 @@ "ctxt": 0 }, "value": "ResultIsNumber11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1457,7 +1435,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1468,7 +1445,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1503,8 +1479,8 @@ "ctxt": 0 }, "value": "ResultIsNumber12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1529,7 +1505,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1540,7 +1515,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1575,8 +1549,8 @@ "ctxt": 0 }, "value": "ResultIsNumber13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1601,7 +1575,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1637,8 +1610,8 @@ "ctxt": 0 }, "value": "ResultIsNumber14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1670,7 +1643,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1681,7 +1653,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1719,8 +1690,8 @@ "ctxt": 0 }, "value": "ResultIsNumber15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1753,7 +1724,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false }, "right": { @@ -1764,7 +1734,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } } @@ -1799,8 +1768,8 @@ "ctxt": 0 }, "value": "ResultIsNumber16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1841,7 +1810,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1876,8 +1844,8 @@ "ctxt": 0 }, "value": "ResultIsNumber17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1950,8 +1918,8 @@ "ctxt": 0 }, "value": "ResultIsNumber18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1984,7 +1952,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1995,7 +1962,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2030,8 +1996,8 @@ "ctxt": 0 }, "value": "ResultIsNumber19", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -2057,7 +2023,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } } @@ -2091,8 +2056,8 @@ "ctxt": 0 }, "value": "ResultIsNumber20", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -2141,7 +2106,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false }, "right": { @@ -2152,7 +2116,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } } @@ -2187,7 +2150,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } } @@ -2215,7 +2177,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } } @@ -2250,7 +2211,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2297,7 +2257,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } }, @@ -2309,7 +2268,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } ] @@ -2345,7 +2303,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2356,7 +2313,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2393,7 +2349,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -2404,7 +2359,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2441,7 +2395,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2452,7 +2405,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2497,7 +2449,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2508,7 +2459,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithBooleanType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithBooleanType/input.ts.json index 719bf739357c..1e893017a18c 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithBooleanType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithBooleanType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "BOOLEAN", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -65,7 +65,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -134,7 +133,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -160,7 +158,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -206,7 +203,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -279,7 +275,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -322,6 +317,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -338,8 +334,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -375,8 +370,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -393,7 +388,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -428,8 +422,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -447,7 +441,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } }, @@ -480,8 +473,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -530,8 +523,8 @@ "ctxt": 0 }, "value": "ResultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -559,7 +552,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -582,7 +574,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -627,8 +618,8 @@ "ctxt": 0 }, "value": "ResultIsNumber4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -653,7 +644,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -664,7 +654,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -699,8 +688,8 @@ "ctxt": 0 }, "value": "ResultIsNumber5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -725,7 +714,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -736,7 +724,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -771,8 +758,8 @@ "ctxt": 0 }, "value": "ResultIsNumber6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -797,7 +784,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -833,8 +819,8 @@ "ctxt": 0 }, "value": "ResultIsNumber7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -866,7 +852,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -877,7 +862,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -915,8 +899,8 @@ "ctxt": 0 }, "value": "ResultIsNumber8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -942,7 +926,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } } @@ -1000,7 +983,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } } @@ -1035,7 +1017,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1118,7 +1099,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1129,7 +1109,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1166,7 +1145,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1177,7 +1155,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithEnumType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithEnumType/input.ts.json index e05ea634a9c0..26ca6b2e2c8c 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithEnumType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithEnumType/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -125,8 +122,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false } }, @@ -177,8 +173,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -203,7 +199,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -252,8 +247,8 @@ "ctxt": 0 }, "value": "ResultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -293,7 +288,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -304,7 +298,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -324,7 +317,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -375,8 +367,8 @@ "ctxt": 0 }, "value": "ResultIsNumber4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -432,7 +424,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -466,7 +457,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -477,7 +467,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -514,7 +503,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false } } @@ -549,7 +537,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -608,7 +595,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -619,7 +605,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -648,7 +633,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithNumberType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithNumberType/input.ts.json index 575aa0510c98..8e2737fd6b62 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithNumberType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithNumberType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "NUMBER", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "NUMBER1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +105,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -155,7 +155,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -224,7 +223,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -250,7 +248,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -296,7 +293,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -369,7 +365,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -412,6 +407,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -428,8 +424,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -465,8 +460,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -483,7 +478,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -518,8 +512,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -537,7 +531,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } }, @@ -570,8 +563,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -589,7 +582,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false } }, @@ -622,8 +614,8 @@ "ctxt": 0 }, "value": "ResultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -672,8 +664,8 @@ "ctxt": 0 }, "value": "ResultIsNumber4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -701,7 +693,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -724,7 +715,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -769,8 +759,8 @@ "ctxt": 0 }, "value": "ResultIsNumber5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -798,7 +788,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -821,7 +810,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -840,6 +828,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -856,8 +845,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -883,7 +871,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -927,8 +914,8 @@ "ctxt": 0 }, "value": "ResultIsNumber6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -953,7 +940,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -964,7 +950,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -999,8 +984,8 @@ "ctxt": 0 }, "value": "ResultIsNumber7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1025,7 +1010,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1036,7 +1020,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1071,8 +1054,8 @@ "ctxt": 0 }, "value": "ResultIsNumber8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1097,7 +1080,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1141,8 +1123,8 @@ "ctxt": 0 }, "value": "ResultIsNumber9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1167,7 +1149,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1203,8 +1184,8 @@ "ctxt": 0 }, "value": "ResultIsNumber10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1236,7 +1217,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1247,7 +1227,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1285,8 +1264,8 @@ "ctxt": 0 }, "value": "ResultIsNumber11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1319,7 +1298,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, "right": { @@ -1330,7 +1308,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1365,8 +1342,8 @@ "ctxt": 0 }, "value": "ResultIsNumber12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1392,7 +1369,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1426,8 +1402,8 @@ "ctxt": 0 }, "value": "ResultIsNumber13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1476,7 +1452,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, "right": { @@ -1487,7 +1462,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1522,7 +1496,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1550,7 +1523,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false } } @@ -1585,7 +1557,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1623,7 +1594,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1634,7 +1604,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1671,7 +1640,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1682,7 +1650,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1727,7 +1694,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1738,7 +1704,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1759,7 +1724,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1770,7 +1734,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithStringType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithStringType/input.ts.json index 45b62ddccf19..3e40fdc1cc32 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithStringType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithStringType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "STRING", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "STRING1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +105,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -165,7 +165,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -239,7 +238,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -265,7 +263,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -311,7 +308,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -389,7 +385,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -432,6 +427,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -448,8 +444,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -485,8 +480,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -503,7 +498,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -538,8 +532,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -557,7 +551,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } }, @@ -590,8 +583,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -609,7 +602,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false } }, @@ -642,8 +634,8 @@ "ctxt": 0 }, "value": "ResultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -697,8 +689,8 @@ "ctxt": 0 }, "value": "ResultIsNumber4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -726,7 +718,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -754,7 +745,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -804,8 +794,8 @@ "ctxt": 0 }, "value": "ResultIsNumber5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -833,7 +823,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -861,7 +850,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -880,6 +868,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -896,8 +885,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -923,7 +911,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -967,8 +954,8 @@ "ctxt": 0 }, "value": "ResultIsNumber6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -993,7 +980,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1004,7 +990,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1039,8 +1024,8 @@ "ctxt": 0 }, "value": "ResultIsNumber7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1065,7 +1050,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1076,7 +1060,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1111,8 +1094,8 @@ "ctxt": 0 }, "value": "ResultIsNumber8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1137,7 +1120,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1181,8 +1163,8 @@ "ctxt": 0 }, "value": "ResultIsNumber9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1207,7 +1189,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1243,8 +1224,8 @@ "ctxt": 0 }, "value": "ResultIsNumber10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1276,7 +1257,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1287,7 +1267,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1325,8 +1304,8 @@ "ctxt": 0 }, "value": "ResultIsNumber11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1359,7 +1338,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "right": { @@ -1370,7 +1348,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -1405,8 +1382,8 @@ "ctxt": 0 }, "value": "ResultIsNumber12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1438,7 +1415,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "property": { @@ -1449,7 +1425,6 @@ "ctxt": 0 }, "value": "charAt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1500,8 +1475,8 @@ "ctxt": 0 }, "value": "ResultIsNumber13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1527,7 +1502,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -1561,8 +1535,8 @@ "ctxt": 0 }, "value": "ResultIsNumber14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1611,7 +1585,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "right": { @@ -1622,7 +1595,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -1657,7 +1629,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -1685,7 +1656,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false } } @@ -1720,7 +1690,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1766,7 +1735,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1777,7 +1745,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1798,7 +1765,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1809,7 +1775,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithAnyOtherType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithAnyOtherType/input.ts.json index 53312cbf6887..9575a055ab9c 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithAnyOtherType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithAnyOtherType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "ANY", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "ANY1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "ANY2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -153,8 +154,7 @@ "kind": "any" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -229,8 +229,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -250,7 +250,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -273,7 +272,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -301,7 +299,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -327,7 +324,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -382,7 +378,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -425,6 +420,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -441,8 +437,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -478,8 +473,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -496,7 +491,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -531,8 +525,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -551,7 +545,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } }, @@ -584,8 +577,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -604,7 +597,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } }, @@ -637,8 +629,8 @@ "ctxt": 0 }, "value": "ResultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -657,7 +649,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } }, @@ -690,8 +681,8 @@ "ctxt": 0 }, "value": "ResultIsNumber4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -710,7 +701,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } }, @@ -743,8 +733,8 @@ "ctxt": 0 }, "value": "ResultIsNumber5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -770,7 +760,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false }, "property": { @@ -814,8 +803,8 @@ "ctxt": 0 }, "value": "ResultIsNumber6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -841,7 +830,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -852,7 +840,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -887,8 +874,8 @@ "ctxt": 0 }, "value": "ResultIsNumber7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -914,7 +901,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -925,7 +911,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -960,8 +945,8 @@ "ctxt": 0 }, "value": "ResultIsNumber8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -987,7 +972,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -998,7 +982,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1033,8 +1016,8 @@ "ctxt": 0 }, "value": "ResultIsNumber", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1060,7 +1043,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1071,7 +1053,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1106,8 +1087,8 @@ "ctxt": 0 }, "value": "ResultIsNumber9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1133,7 +1114,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1177,8 +1157,8 @@ "ctxt": 0 }, "value": "ResultIsNumber10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1204,7 +1184,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1215,7 +1194,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1250,8 +1228,8 @@ "ctxt": 0 }, "value": "ResultIsNumber11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1277,7 +1255,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1288,7 +1265,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1323,8 +1299,8 @@ "ctxt": 0 }, "value": "ResultIsNumber12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1350,7 +1326,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1361,7 +1336,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1396,8 +1370,8 @@ "ctxt": 0 }, "value": "ResultIsNumber13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1423,7 +1397,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1434,7 +1407,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1468,7 +1440,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } } @@ -1497,7 +1468,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } } @@ -1533,7 +1503,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1581,7 +1550,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } }, @@ -1602,7 +1570,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } } @@ -1640,7 +1607,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1651,7 +1617,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1689,7 +1654,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1700,7 +1664,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1731,7 +1694,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } } @@ -1760,7 +1722,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } } @@ -1796,7 +1757,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1844,7 +1804,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } }, @@ -1865,7 +1824,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } } @@ -1903,7 +1861,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1914,7 +1871,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1952,7 +1908,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1963,7 +1918,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumType/input.ts.json index 62db0274e681..028eac3218a8 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumType/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -125,8 +122,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -152,7 +149,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -201,8 +197,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -228,7 +224,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -239,7 +234,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -280,7 +274,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -332,7 +325,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -343,7 +335,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": true diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumTypeInvalidOperations/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumTypeInvalidOperations/input.ts.json index c176179ba921..056e75a6dcad 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumTypeInvalidOperations/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumTypeInvalidOperations/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "members": [] @@ -53,7 +52,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "members": [ @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -92,7 +89,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -155,8 +151,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -175,7 +171,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } }, @@ -208,8 +203,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -228,7 +223,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false } }, @@ -261,8 +255,8 @@ "ctxt": 0 }, "value": "ResultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -281,7 +275,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } }, @@ -314,8 +307,8 @@ "ctxt": 0 }, "value": "ResultIsNumber4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -334,7 +327,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false } }, @@ -367,8 +359,8 @@ "ctxt": 0 }, "value": "ResultIsNumber5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -409,7 +401,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "property": { @@ -443,7 +434,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "property": { @@ -454,7 +444,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -491,8 +480,8 @@ "ctxt": 0 }, "value": "ResultIsNumber6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -533,7 +522,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "property": { @@ -544,7 +532,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -564,7 +551,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "property": { @@ -614,7 +600,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } } @@ -643,7 +628,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false } } @@ -672,7 +656,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } } @@ -701,7 +684,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithNumberType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithNumberType/input.ts.json index fbebc20a208e..05e09bc82ac4 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithNumberType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithNumberType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "NUMBER", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "NUMBER1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +105,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -155,7 +155,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -181,7 +180,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -236,7 +234,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -279,6 +276,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -295,8 +293,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -332,8 +329,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -350,7 +347,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -385,8 +381,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -405,7 +401,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } }, @@ -438,8 +433,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -458,7 +453,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } }, @@ -491,8 +485,8 @@ "ctxt": 0 }, "value": "ResultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -518,7 +512,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -529,7 +522,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -564,8 +556,8 @@ "ctxt": 0 }, "value": "ResultIsNumber4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -591,7 +583,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -602,7 +593,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -637,8 +627,8 @@ "ctxt": 0 }, "value": "ResultIsNumber5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -664,7 +654,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -675,7 +664,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -710,8 +698,8 @@ "ctxt": 0 }, "value": "ResultIsNumber6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -737,7 +725,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -748,7 +735,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -783,8 +769,8 @@ "ctxt": 0 }, "value": "ResultIsNumber7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -810,7 +796,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false }, "property": { @@ -853,7 +838,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -889,7 +873,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false }, "property": { @@ -936,7 +919,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -947,7 +929,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -985,7 +966,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -996,7 +976,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1042,7 +1021,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1053,7 +1031,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1074,7 +1051,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1085,7 +1061,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1117,7 +1092,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1153,7 +1127,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1200,7 +1173,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1211,7 +1183,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1249,7 +1220,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1260,7 +1230,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1306,7 +1275,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1317,7 +1285,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1347,7 +1314,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1358,7 +1324,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithNumberTypeInvalidOperations/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithNumberTypeInvalidOperations/input.ts.json index 65db83992778..e09b82fe67f0 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithNumberTypeInvalidOperations/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithNumberTypeInvalidOperations/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "NUMBER", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "NUMBER1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +105,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -155,7 +155,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -224,7 +223,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -250,7 +248,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -296,7 +293,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -369,7 +365,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -412,6 +407,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -428,8 +424,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -465,8 +460,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -483,7 +478,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -518,8 +512,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -538,7 +532,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false } }, @@ -571,8 +564,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -591,7 +584,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false } }, @@ -624,8 +616,8 @@ "ctxt": 0 }, "value": "ResultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -675,8 +667,8 @@ "ctxt": 0 }, "value": "ResultIsNumber4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -705,7 +697,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -728,7 +719,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -773,8 +763,8 @@ "ctxt": 0 }, "value": "ResultIsNumber5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -803,7 +793,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -826,7 +815,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -845,6 +833,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -861,8 +850,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -888,7 +876,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -932,8 +919,8 @@ "ctxt": 0 }, "value": "ResultIsNumber6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -983,8 +970,8 @@ "ctxt": 0 }, "value": "ResultIsNumber7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1013,7 +1000,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1036,7 +1022,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1081,8 +1066,8 @@ "ctxt": 0 }, "value": "ResultIsNumber8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1111,7 +1096,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1134,7 +1118,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1153,6 +1136,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1169,8 +1153,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1196,7 +1179,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -1240,8 +1222,8 @@ "ctxt": 0 }, "value": "ResultIsNumber9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1267,7 +1249,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1303,8 +1284,8 @@ "ctxt": 0 }, "value": "ResultIsNumber10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1337,7 +1318,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1348,7 +1328,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1386,8 +1365,8 @@ "ctxt": 0 }, "value": "ResultIsNumber11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1421,7 +1400,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, "right": { @@ -1432,7 +1410,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1467,8 +1444,8 @@ "ctxt": 0 }, "value": "ResultIsNumber12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1494,7 +1471,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1530,8 +1506,8 @@ "ctxt": 0 }, "value": "ResultIsNumber13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1564,7 +1540,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1575,7 +1550,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1613,8 +1587,8 @@ "ctxt": 0 }, "value": "ResultIsNumber14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1648,7 +1622,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, "right": { @@ -1659,7 +1632,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1720,7 +1692,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false } } @@ -1756,7 +1727,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1815,7 +1785,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false } } @@ -1851,7 +1820,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithUnsupportedBooleanType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithUnsupportedBooleanType/input.ts.json index 3e9069bc37b0..f3291f3db188 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithUnsupportedBooleanType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithUnsupportedBooleanType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "BOOLEAN", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -65,7 +65,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -134,7 +133,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -160,7 +158,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -206,7 +203,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -279,7 +275,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -322,6 +317,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -338,8 +334,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -375,8 +370,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -393,7 +388,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -428,8 +422,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -448,7 +442,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } }, @@ -481,8 +474,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -501,7 +494,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } }, @@ -534,8 +526,8 @@ "ctxt": 0 }, "value": "ResultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -585,8 +577,8 @@ "ctxt": 0 }, "value": "ResultIsNumber4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -615,7 +607,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -638,7 +629,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -683,8 +673,8 @@ "ctxt": 0 }, "value": "ResultIsNumber5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -713,7 +703,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -736,7 +725,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -755,6 +743,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -771,8 +760,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "body": { @@ -798,7 +786,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -842,8 +829,8 @@ "ctxt": 0 }, "value": "ResultIsNumber6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -893,8 +880,8 @@ "ctxt": 0 }, "value": "ResultIsNumber7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -923,7 +910,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -946,7 +932,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -991,8 +976,8 @@ "ctxt": 0 }, "value": "ResultIsNumber8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1021,7 +1006,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1044,7 +1028,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1063,6 +1046,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1079,8 +1063,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "body": { @@ -1106,7 +1089,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -1150,8 +1132,8 @@ "ctxt": 0 }, "value": "ResultIsNumber9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1177,7 +1159,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1188,7 +1169,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1223,8 +1203,8 @@ "ctxt": 0 }, "value": "ResultIsNumber10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1250,7 +1230,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1261,7 +1240,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1296,8 +1274,8 @@ "ctxt": 0 }, "value": "ResultIsNumber11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1323,7 +1301,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1359,8 +1336,8 @@ "ctxt": 0 }, "value": "ResultIsNumber12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1393,7 +1370,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1404,7 +1380,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1442,8 +1417,8 @@ "ctxt": 0 }, "value": "ResultIsNumber13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1469,7 +1444,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1505,8 +1479,8 @@ "ctxt": 0 }, "value": "ResultIsNumber14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1539,7 +1513,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1550,7 +1523,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1588,8 +1560,8 @@ "ctxt": 0 }, "value": "ResultIsNumber15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1615,7 +1587,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1626,7 +1597,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1661,8 +1631,8 @@ "ctxt": 0 }, "value": "ResultIsNumber16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1688,7 +1658,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1699,7 +1668,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1760,7 +1728,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } } @@ -1796,7 +1763,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1835,7 +1801,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1846,7 +1811,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1884,7 +1848,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1895,7 +1858,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1941,7 +1903,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1952,7 +1913,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1973,7 +1933,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1984,7 +1943,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2043,7 +2001,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } } @@ -2079,7 +2036,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2118,7 +2074,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -2129,7 +2084,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2167,7 +2121,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2178,7 +2131,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2224,7 +2176,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -2235,7 +2186,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2265,7 +2215,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2276,7 +2225,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithUnsupportedStringType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithUnsupportedStringType/input.ts.json index eeed550731a4..00f3cf712a25 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithUnsupportedStringType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/decrementOperator/decrementOperatorWithUnsupportedStringType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "STRING", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "STRING1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +105,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -165,7 +165,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -239,7 +238,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -265,7 +263,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -311,7 +308,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -389,7 +385,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -432,6 +427,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -448,8 +444,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -485,8 +480,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -503,7 +498,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -538,8 +532,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -558,7 +552,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } }, @@ -591,8 +584,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -611,7 +604,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false } }, @@ -644,8 +636,8 @@ "ctxt": 0 }, "value": "ResultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -664,7 +656,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } }, @@ -697,8 +688,8 @@ "ctxt": 0 }, "value": "ResultIsNumber4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -717,7 +708,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false } }, @@ -750,8 +740,8 @@ "ctxt": 0 }, "value": "ResultIsNumber5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -806,8 +796,8 @@ "ctxt": 0 }, "value": "ResultIsNumber6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -836,7 +826,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -864,7 +853,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -914,8 +902,8 @@ "ctxt": 0 }, "value": "ResultIsNumber7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -944,7 +932,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -972,7 +959,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -991,6 +977,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1007,8 +994,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -1034,7 +1020,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -1078,8 +1063,8 @@ "ctxt": 0 }, "value": "ResultIsNumber8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1134,8 +1119,8 @@ "ctxt": 0 }, "value": "ResultIsNumber9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1164,7 +1149,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1192,7 +1176,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1242,8 +1225,8 @@ "ctxt": 0 }, "value": "ResultIsNumber10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1272,7 +1255,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1300,7 +1282,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1319,6 +1300,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1335,8 +1317,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -1362,7 +1343,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -1406,8 +1386,8 @@ "ctxt": 0 }, "value": "ResultIsNumber11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1433,7 +1413,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1444,7 +1423,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1479,8 +1457,8 @@ "ctxt": 0 }, "value": "ResultIsNumber12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1506,7 +1484,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1517,7 +1494,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1552,8 +1528,8 @@ "ctxt": 0 }, "value": "ResultIsNumber13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1579,7 +1555,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1623,8 +1598,8 @@ "ctxt": 0 }, "value": "ResultIsNumber14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1650,7 +1625,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1686,8 +1660,8 @@ "ctxt": 0 }, "value": "ResultIsNumber15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1720,7 +1694,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1731,7 +1704,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1769,8 +1741,8 @@ "ctxt": 0 }, "value": "ResultIsNumber16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1804,7 +1776,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "right": { @@ -1815,7 +1786,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -1850,8 +1820,8 @@ "ctxt": 0 }, "value": "ResultIsNumber17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1877,7 +1847,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1888,7 +1857,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1923,8 +1891,8 @@ "ctxt": 0 }, "value": "ResultIsNumber18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1950,7 +1918,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1961,7 +1928,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1996,8 +1962,8 @@ "ctxt": 0 }, "value": "ResultIsNumber19", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -2023,7 +1989,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2067,8 +2032,8 @@ "ctxt": 0 }, "value": "ResultIsNumber20", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -2094,7 +2059,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2130,8 +2094,8 @@ "ctxt": 0 }, "value": "ResultIsNumber21", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -2164,7 +2128,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -2175,7 +2138,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2213,8 +2175,8 @@ "ctxt": 0 }, "value": "ResultIsNumber22", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -2248,7 +2210,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "right": { @@ -2259,7 +2220,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -2325,7 +2285,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -2354,7 +2313,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false } } @@ -2390,7 +2348,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2437,7 +2394,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2476,7 +2432,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -2487,7 +2442,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2525,7 +2479,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2536,7 +2489,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2582,7 +2534,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -2593,7 +2544,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2614,7 +2564,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2625,7 +2574,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2689,7 +2637,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -2718,7 +2665,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false } } @@ -2754,7 +2700,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2801,7 +2746,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2840,7 +2784,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -2851,7 +2794,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2889,7 +2831,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2900,7 +2841,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2946,7 +2886,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -2957,7 +2896,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2987,7 +2925,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2998,7 +2935,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/deleteOperator/deleteOperatorWithAnyOtherType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/deleteOperator/deleteOperatorWithAnyOtherType/input.ts.json index 5ccd9aac4bfd..1de924885820 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/deleteOperator/deleteOperatorWithAnyOtherType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/deleteOperator/deleteOperatorWithAnyOtherType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "ANY", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,8 +80,8 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -113,6 +113,7 @@ "ctxt": 0 }, "value": "ANY2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -137,8 +138,7 @@ "kind": "any" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -213,6 +213,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -247,8 +248,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -280,8 +280,8 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -301,7 +301,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -329,7 +328,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -371,7 +369,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -415,8 +412,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -438,7 +435,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -475,7 +471,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -501,7 +496,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -547,7 +541,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -591,8 +584,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -614,7 +607,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -655,7 +647,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -698,6 +689,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -714,8 +706,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -751,8 +742,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -769,7 +760,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -804,8 +794,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -823,7 +813,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } }, @@ -856,8 +845,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -875,7 +864,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false } }, @@ -908,8 +896,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -927,7 +915,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -960,8 +947,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -979,7 +966,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } }, @@ -1012,8 +998,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1031,7 +1017,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } }, @@ -1064,8 +1049,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1083,7 +1068,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } }, @@ -1116,8 +1100,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1135,7 +1119,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1168,8 +1151,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1217,8 +1200,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1243,7 +1226,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1287,8 +1269,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1313,7 +1295,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1324,7 +1305,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1359,8 +1339,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1385,7 +1365,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1396,7 +1375,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1431,8 +1409,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1457,7 +1435,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1468,7 +1445,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1503,8 +1479,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1529,7 +1505,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1540,7 +1515,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1575,8 +1549,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1601,7 +1575,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1637,8 +1610,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1670,7 +1643,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1681,7 +1653,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1719,8 +1690,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1753,7 +1724,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false }, "right": { @@ -1764,7 +1734,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } } @@ -1799,8 +1768,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1841,7 +1810,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1876,8 +1844,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1950,8 +1918,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean19", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1984,7 +1952,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1995,7 +1962,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2030,8 +1996,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean20", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -2057,7 +2023,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } } @@ -2091,8 +2056,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean21", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -2141,7 +2106,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false }, "right": { @@ -2152,7 +2116,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } } @@ -2187,7 +2150,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } } @@ -2215,7 +2177,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } } @@ -2250,7 +2211,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2297,7 +2257,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } }, @@ -2309,7 +2268,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } ] @@ -2345,7 +2303,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2356,7 +2313,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2393,7 +2349,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2404,7 +2359,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2441,7 +2395,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -2452,7 +2405,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2489,7 +2441,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2500,7 +2451,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/deleteOperator/deleteOperatorWithBooleanType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/deleteOperator/deleteOperatorWithBooleanType/input.ts.json index f10b92a9f47c..665a3b46bea9 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/deleteOperator/deleteOperatorWithBooleanType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/deleteOperator/deleteOperatorWithBooleanType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "BOOLEAN", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -65,7 +65,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -134,7 +133,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -160,7 +158,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -206,7 +203,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -279,7 +275,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -322,6 +317,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -338,8 +334,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -375,8 +370,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -393,7 +388,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -428,8 +422,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -447,7 +441,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } }, @@ -480,8 +473,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -530,8 +523,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -559,7 +552,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -582,7 +574,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -627,8 +618,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -653,7 +644,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -664,7 +654,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -699,8 +688,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -725,7 +714,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -736,7 +724,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -771,8 +758,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -797,7 +784,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -833,8 +819,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -866,7 +852,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -877,7 +862,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -915,8 +899,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -942,7 +926,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } } @@ -1000,7 +983,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } } @@ -1035,7 +1017,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1118,7 +1099,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1129,7 +1109,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1166,7 +1145,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1177,7 +1155,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/deleteOperator/deleteOperatorWithEnumType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/deleteOperator/deleteOperatorWithEnumType/input.ts.json index e4a63ab0713a..81b3cfb4326c 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/deleteOperator/deleteOperatorWithEnumType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/deleteOperator/deleteOperatorWithEnumType/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "members": [] @@ -53,7 +52,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "members": [ @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -92,7 +89,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -155,8 +151,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -174,7 +170,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } }, @@ -207,8 +202,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -226,7 +221,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false } }, @@ -259,8 +253,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -285,7 +279,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -334,8 +327,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -375,7 +368,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "property": { @@ -404,7 +396,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -455,8 +446,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -482,7 +473,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } } @@ -516,8 +506,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -573,7 +563,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "property": { @@ -602,7 +591,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -653,7 +641,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } } @@ -681,7 +668,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false } } @@ -716,7 +702,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -727,7 +712,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -765,7 +749,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } }, @@ -777,7 +760,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/deleteOperator/deleteOperatorWithNumberType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/deleteOperator/deleteOperatorWithNumberType/input.ts.json index 7ddc38cc4475..e2571fb4e598 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/deleteOperator/deleteOperatorWithNumberType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/deleteOperator/deleteOperatorWithNumberType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "NUMBER", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "NUMBER1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +105,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -155,7 +155,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -224,7 +223,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -250,7 +248,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -296,7 +293,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -369,7 +365,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -412,6 +407,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -428,8 +424,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -465,8 +460,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -483,7 +478,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -518,8 +512,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -537,7 +531,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } }, @@ -570,8 +563,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -589,7 +582,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false } }, @@ -622,8 +614,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -672,8 +664,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -701,7 +693,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -724,7 +715,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -769,8 +759,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -798,7 +788,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -821,7 +810,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -840,6 +828,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -856,8 +845,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -883,7 +871,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -927,8 +914,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -953,7 +940,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -964,7 +950,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -999,8 +984,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1025,7 +1010,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1036,7 +1020,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1071,8 +1054,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1097,7 +1080,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1141,8 +1123,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1167,7 +1149,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1203,8 +1184,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1236,7 +1217,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1247,7 +1227,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1285,8 +1264,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1319,7 +1298,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, "right": { @@ -1330,7 +1308,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1365,8 +1342,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1392,7 +1369,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1426,8 +1402,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1476,7 +1452,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, "right": { @@ -1487,7 +1462,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1548,7 +1522,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1576,7 +1549,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false } } @@ -1611,7 +1583,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1649,7 +1620,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1660,7 +1630,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1697,7 +1666,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1708,7 +1676,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1753,7 +1720,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1764,7 +1730,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1785,7 +1750,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1796,7 +1760,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/deleteOperator/deleteOperatorWithStringType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/deleteOperator/deleteOperatorWithStringType/input.ts.json index 92c7f94db8d4..b63f53b76e2c 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/deleteOperator/deleteOperatorWithStringType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/deleteOperator/deleteOperatorWithStringType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "STRING", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "STRING1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +105,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -165,7 +165,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -239,7 +238,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -265,7 +263,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -311,7 +308,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -389,7 +385,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -432,6 +427,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -448,8 +444,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -485,8 +480,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -503,7 +498,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -538,8 +532,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -557,7 +551,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } }, @@ -590,8 +583,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -609,7 +602,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false } }, @@ -642,8 +634,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -697,8 +689,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -726,7 +718,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -754,7 +745,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -804,8 +794,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -833,7 +823,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -861,7 +850,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -880,6 +868,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -896,8 +885,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -923,7 +911,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -967,8 +954,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -993,7 +980,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1004,7 +990,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1039,8 +1024,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1065,7 +1050,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1076,7 +1060,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1111,8 +1094,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1137,7 +1120,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1181,8 +1163,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1207,7 +1189,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1243,8 +1224,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1276,7 +1257,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1287,7 +1267,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1325,8 +1304,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1359,7 +1338,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "right": { @@ -1370,7 +1348,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -1405,8 +1382,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1438,7 +1415,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "property": { @@ -1449,7 +1425,6 @@ "ctxt": 0 }, "value": "charAt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1500,8 +1475,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1527,7 +1502,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -1561,8 +1535,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1611,7 +1585,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "right": { @@ -1622,7 +1595,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -1688,7 +1660,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -1716,7 +1687,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false } } @@ -1751,7 +1721,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1797,7 +1766,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1808,7 +1776,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1829,7 +1796,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1840,7 +1806,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithAnyOtherType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithAnyOtherType/input.ts.json index 9cf88a57a477..fe1edd057519 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithAnyOtherType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithAnyOtherType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "ANY", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "ANY1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "ANY2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -153,8 +154,7 @@ "kind": "any" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -229,8 +229,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -250,7 +250,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -273,7 +272,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -301,7 +299,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -327,7 +324,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -382,7 +378,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -425,6 +420,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -441,8 +437,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -478,8 +473,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -496,7 +491,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -531,8 +525,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -551,7 +545,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } }, @@ -584,8 +577,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -604,7 +597,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } }, @@ -637,8 +629,8 @@ "ctxt": 0 }, "value": "ResultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -657,7 +649,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } }, @@ -690,8 +681,8 @@ "ctxt": 0 }, "value": "ResultIsNumber4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -710,7 +701,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } }, @@ -743,8 +733,8 @@ "ctxt": 0 }, "value": "ResultIsNumber5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -770,7 +760,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false }, "property": { @@ -814,8 +803,8 @@ "ctxt": 0 }, "value": "ResultIsNumber6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -841,7 +830,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -852,7 +840,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -887,8 +874,8 @@ "ctxt": 0 }, "value": "ResultIsNumber7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -914,7 +901,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -925,7 +911,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -960,8 +945,8 @@ "ctxt": 0 }, "value": "ResultIsNumber8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -987,7 +972,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -998,7 +982,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1033,8 +1016,8 @@ "ctxt": 0 }, "value": "ResultIsNumber", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1060,7 +1043,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1071,7 +1053,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1106,8 +1087,8 @@ "ctxt": 0 }, "value": "ResultIsNumber9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1133,7 +1114,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1177,8 +1157,8 @@ "ctxt": 0 }, "value": "ResultIsNumber10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1204,7 +1184,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1215,7 +1194,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1250,8 +1228,8 @@ "ctxt": 0 }, "value": "ResultIsNumber11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1277,7 +1255,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1288,7 +1265,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1323,8 +1299,8 @@ "ctxt": 0 }, "value": "ResultIsNumber12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1350,7 +1326,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1361,7 +1336,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1396,8 +1370,8 @@ "ctxt": 0 }, "value": "ResultIsNumber13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1423,7 +1397,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1434,7 +1407,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1468,7 +1440,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } } @@ -1497,7 +1468,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } } @@ -1533,7 +1503,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1581,7 +1550,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } }, @@ -1602,7 +1570,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } } @@ -1640,7 +1607,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1651,7 +1617,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1689,7 +1654,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1700,7 +1664,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1731,7 +1694,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } } @@ -1760,7 +1722,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } } @@ -1796,7 +1757,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1844,7 +1804,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } }, @@ -1865,7 +1824,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } } @@ -1903,7 +1861,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1914,7 +1871,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1952,7 +1908,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1963,7 +1918,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithEnumType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithEnumType/input.ts.json index a8ac40f53b82..3e5acd05fb2b 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithEnumType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithEnumType/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -125,8 +122,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -152,7 +149,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -201,8 +197,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -228,7 +224,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -239,7 +234,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -280,7 +274,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -332,7 +325,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -343,7 +335,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithEnumTypeInvalidOperations/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithEnumTypeInvalidOperations/input.ts.json index 20b442de9c8c..227a9d130de2 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithEnumTypeInvalidOperations/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithEnumTypeInvalidOperations/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "members": [] @@ -53,7 +52,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "members": [ @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -92,7 +89,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -155,8 +151,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -175,7 +171,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } }, @@ -208,8 +203,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -228,7 +223,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false } }, @@ -261,8 +255,8 @@ "ctxt": 0 }, "value": "ResultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -281,7 +275,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } }, @@ -314,8 +307,8 @@ "ctxt": 0 }, "value": "ResultIsNumber4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -334,7 +327,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false } }, @@ -367,8 +359,8 @@ "ctxt": 0 }, "value": "ResultIsNumber5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -409,7 +401,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "property": { @@ -438,7 +429,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "property": { @@ -484,8 +474,8 @@ "ctxt": 0 }, "value": "ResultIsNumber6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -526,7 +516,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "property": { @@ -555,7 +544,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "property": { @@ -600,7 +588,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } } @@ -629,7 +616,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false } } @@ -658,7 +644,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } } @@ -687,7 +672,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithNumberType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithNumberType/input.ts.json index 9fd0ed0ee978..744f08fc75b0 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithNumberType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithNumberType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "NUMBER", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "NUMBER1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +105,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -155,7 +155,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -181,7 +180,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -236,7 +234,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -279,6 +276,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -295,8 +293,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -332,8 +329,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -350,7 +347,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -385,8 +381,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -405,7 +401,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } }, @@ -438,8 +433,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -458,7 +453,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } }, @@ -491,8 +485,8 @@ "ctxt": 0 }, "value": "ResultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -518,7 +512,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -529,7 +522,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -564,8 +556,8 @@ "ctxt": 0 }, "value": "ResultIsNumber4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -591,7 +583,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -602,7 +593,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -637,8 +627,8 @@ "ctxt": 0 }, "value": "ResultIsNumber5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -664,7 +654,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -675,7 +664,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -710,8 +698,8 @@ "ctxt": 0 }, "value": "ResultIsNumber6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -737,7 +725,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -748,7 +735,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -783,8 +769,8 @@ "ctxt": 0 }, "value": "ResultIsNumber7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -810,7 +796,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false }, "property": { @@ -853,7 +838,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -889,7 +873,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false }, "property": { @@ -936,7 +919,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -947,7 +929,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -985,7 +966,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -996,7 +976,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1042,7 +1021,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1053,7 +1031,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1074,7 +1051,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1085,7 +1061,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1117,7 +1092,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1153,7 +1127,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1200,7 +1173,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1211,7 +1183,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1249,7 +1220,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1260,7 +1230,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1306,7 +1275,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1317,7 +1285,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1347,7 +1314,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1358,7 +1324,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithNumberTypeInvalidOperations/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithNumberTypeInvalidOperations/input.ts.json index 6c0c7cc46f25..c31b2dc2ea01 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithNumberTypeInvalidOperations/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithNumberTypeInvalidOperations/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "NUMBER", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "NUMBER1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +105,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -155,7 +155,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -224,7 +223,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -250,7 +248,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -296,7 +293,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -369,7 +365,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -412,6 +407,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -428,8 +424,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -465,8 +460,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -483,7 +478,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -518,8 +512,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -538,7 +532,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false } }, @@ -571,8 +564,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -591,7 +584,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false } }, @@ -624,8 +616,8 @@ "ctxt": 0 }, "value": "ResultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -675,8 +667,8 @@ "ctxt": 0 }, "value": "ResultIsNumber4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -705,7 +697,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -728,7 +719,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -773,8 +763,8 @@ "ctxt": 0 }, "value": "ResultIsNumber5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -803,7 +793,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -826,7 +815,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -845,6 +833,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -861,8 +850,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -888,7 +876,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -932,8 +919,8 @@ "ctxt": 0 }, "value": "ResultIsNumber6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -983,8 +970,8 @@ "ctxt": 0 }, "value": "ResultIsNumber7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1013,7 +1000,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1036,7 +1022,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1081,8 +1066,8 @@ "ctxt": 0 }, "value": "ResultIsNumber8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1111,7 +1096,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1134,7 +1118,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1153,6 +1136,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1169,8 +1153,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1196,7 +1179,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -1240,8 +1222,8 @@ "ctxt": 0 }, "value": "ResultIsNumber9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1267,7 +1249,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1303,8 +1284,8 @@ "ctxt": 0 }, "value": "ResultIsNumber10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1337,7 +1318,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1348,7 +1328,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1386,8 +1365,8 @@ "ctxt": 0 }, "value": "ResultIsNumber11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1421,7 +1400,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, "right": { @@ -1432,7 +1410,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1467,8 +1444,8 @@ "ctxt": 0 }, "value": "ResultIsNumber12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1494,7 +1471,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1530,8 +1506,8 @@ "ctxt": 0 }, "value": "ResultIsNumber13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1564,7 +1540,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1575,7 +1550,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1613,8 +1587,8 @@ "ctxt": 0 }, "value": "ResultIsNumber14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1648,7 +1622,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, "right": { @@ -1659,7 +1632,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1720,7 +1692,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false } } @@ -1756,7 +1727,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1815,7 +1785,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false } } @@ -1851,7 +1820,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithUnsupportedBooleanType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithUnsupportedBooleanType/input.ts.json index 2828fcb68719..8f50b2f97ba7 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithUnsupportedBooleanType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithUnsupportedBooleanType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "BOOLEAN", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -65,7 +65,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -134,7 +133,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -160,7 +158,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -206,7 +203,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -279,7 +275,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -322,6 +317,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -338,8 +334,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -375,8 +370,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -393,7 +388,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -428,8 +422,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -448,7 +442,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } }, @@ -481,8 +474,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -501,7 +494,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } }, @@ -534,8 +526,8 @@ "ctxt": 0 }, "value": "ResultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -585,8 +577,8 @@ "ctxt": 0 }, "value": "ResultIsNumber4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -615,7 +607,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -638,7 +629,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -683,8 +673,8 @@ "ctxt": 0 }, "value": "ResultIsNumber5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -713,7 +703,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -736,7 +725,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -755,6 +743,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -771,8 +760,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "body": { @@ -798,7 +786,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -842,8 +829,8 @@ "ctxt": 0 }, "value": "ResultIsNumber6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -893,8 +880,8 @@ "ctxt": 0 }, "value": "ResultIsNumber7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -923,7 +910,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -946,7 +932,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -991,8 +976,8 @@ "ctxt": 0 }, "value": "ResultIsNumber8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1021,7 +1006,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1044,7 +1028,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1063,6 +1046,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1079,8 +1063,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "body": { @@ -1106,7 +1089,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -1150,8 +1132,8 @@ "ctxt": 0 }, "value": "ResultIsNumber9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1177,7 +1159,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1188,7 +1169,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1223,8 +1203,8 @@ "ctxt": 0 }, "value": "ResultIsNumber10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1250,7 +1230,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1261,7 +1240,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1296,8 +1274,8 @@ "ctxt": 0 }, "value": "ResultIsNumber11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1323,7 +1301,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1359,8 +1336,8 @@ "ctxt": 0 }, "value": "ResultIsNumber12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1393,7 +1370,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1404,7 +1380,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1442,8 +1417,8 @@ "ctxt": 0 }, "value": "ResultIsNumber13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1469,7 +1444,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1505,8 +1479,8 @@ "ctxt": 0 }, "value": "ResultIsNumber14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1539,7 +1513,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1550,7 +1523,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1588,8 +1560,8 @@ "ctxt": 0 }, "value": "ResultIsNumber15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1615,7 +1587,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1626,7 +1597,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1661,8 +1631,8 @@ "ctxt": 0 }, "value": "ResultIsNumber16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1688,7 +1658,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1699,7 +1668,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1760,7 +1728,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } } @@ -1796,7 +1763,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1835,7 +1801,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1846,7 +1811,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1884,7 +1848,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1895,7 +1858,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1941,7 +1903,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1952,7 +1913,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1973,7 +1933,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1984,7 +1943,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2043,7 +2001,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } } @@ -2079,7 +2036,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2118,7 +2074,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -2129,7 +2084,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2167,7 +2121,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2178,7 +2131,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2224,7 +2176,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -2235,7 +2186,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2265,7 +2215,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2276,7 +2225,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithUnsupportedStringType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithUnsupportedStringType/input.ts.json index 0b71db0f3188..3c7676d7624e 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithUnsupportedStringType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/incrementOperator/incrementOperatorWithUnsupportedStringType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "STRING", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "STRING1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +105,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -165,7 +165,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -239,7 +238,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -265,7 +263,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -311,7 +308,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -389,7 +385,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -432,6 +427,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -448,8 +444,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -485,8 +480,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -503,7 +498,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -538,8 +532,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -558,7 +552,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } }, @@ -591,8 +584,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -611,7 +604,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false } }, @@ -644,8 +636,8 @@ "ctxt": 0 }, "value": "ResultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -664,7 +656,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } }, @@ -697,8 +688,8 @@ "ctxt": 0 }, "value": "ResultIsNumber4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -717,7 +708,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false } }, @@ -750,8 +740,8 @@ "ctxt": 0 }, "value": "ResultIsNumber5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -806,8 +796,8 @@ "ctxt": 0 }, "value": "ResultIsNumber6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -836,7 +826,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -864,7 +853,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -914,8 +902,8 @@ "ctxt": 0 }, "value": "ResultIsNumber7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -944,7 +932,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -972,7 +959,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -991,6 +977,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1007,8 +994,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -1034,7 +1020,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -1078,8 +1063,8 @@ "ctxt": 0 }, "value": "ResultIsNumber8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1134,8 +1119,8 @@ "ctxt": 0 }, "value": "ResultIsNumber9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1164,7 +1149,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1192,7 +1176,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1242,8 +1225,8 @@ "ctxt": 0 }, "value": "ResultIsNumber10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1272,7 +1255,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1300,7 +1282,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1319,6 +1300,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1335,8 +1317,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -1362,7 +1343,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -1406,8 +1386,8 @@ "ctxt": 0 }, "value": "ResultIsNumber11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1433,7 +1413,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1444,7 +1423,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1479,8 +1457,8 @@ "ctxt": 0 }, "value": "ResultIsNumber12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1506,7 +1484,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1517,7 +1494,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1552,8 +1528,8 @@ "ctxt": 0 }, "value": "ResultIsNumber13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1579,7 +1555,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1623,8 +1598,8 @@ "ctxt": 0 }, "value": "ResultIsNumber14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1650,7 +1625,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1686,8 +1660,8 @@ "ctxt": 0 }, "value": "ResultIsNumber15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1720,7 +1694,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1731,7 +1704,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1769,8 +1741,8 @@ "ctxt": 0 }, "value": "ResultIsNumber16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1804,7 +1776,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "right": { @@ -1815,7 +1786,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -1850,8 +1820,8 @@ "ctxt": 0 }, "value": "ResultIsNumber17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1877,7 +1847,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1888,7 +1857,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1923,8 +1891,8 @@ "ctxt": 0 }, "value": "ResultIsNumber18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -1950,7 +1918,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1961,7 +1928,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1996,8 +1962,8 @@ "ctxt": 0 }, "value": "ResultIsNumber19", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -2023,7 +1989,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2067,8 +2032,8 @@ "ctxt": 0 }, "value": "ResultIsNumber20", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -2094,7 +2059,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2130,8 +2094,8 @@ "ctxt": 0 }, "value": "ResultIsNumber21", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -2164,7 +2128,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -2175,7 +2138,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2213,8 +2175,8 @@ "ctxt": 0 }, "value": "ResultIsNumber22", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -2248,7 +2210,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "right": { @@ -2259,7 +2220,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -2325,7 +2285,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -2354,7 +2313,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false } } @@ -2390,7 +2348,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2437,7 +2394,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2476,7 +2432,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -2487,7 +2442,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2525,7 +2479,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2536,7 +2489,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2582,7 +2534,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -2593,7 +2544,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2614,7 +2564,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2625,7 +2574,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2689,7 +2637,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -2718,7 +2665,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false } } @@ -2754,7 +2700,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2801,7 +2746,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2840,7 +2784,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -2851,7 +2794,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2889,7 +2831,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2900,7 +2841,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2946,7 +2886,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -2957,7 +2896,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2987,7 +2925,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2998,7 +2935,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithAnyOtherType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithAnyOtherType/input.ts.json index 46a4f4ce2f86..d8e5c5150b9f 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithAnyOtherType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithAnyOtherType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "ANY", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,8 +80,8 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -113,6 +113,7 @@ "ctxt": 0 }, "value": "ANY2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -137,8 +138,7 @@ "kind": "any" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -213,6 +213,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -247,8 +248,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -280,8 +280,8 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -301,7 +301,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -329,7 +328,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -371,7 +369,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -415,8 +412,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -438,7 +435,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -475,7 +471,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -501,7 +496,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -547,7 +541,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -591,8 +584,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -614,7 +607,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -655,7 +647,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -698,6 +689,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -714,8 +706,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -751,8 +742,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -769,7 +760,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -804,8 +794,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -823,7 +813,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } }, @@ -856,8 +845,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -875,7 +864,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false } }, @@ -908,8 +896,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -927,7 +915,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -960,8 +947,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -979,7 +966,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } }, @@ -1012,8 +998,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1031,7 +1017,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } }, @@ -1064,8 +1049,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1083,7 +1068,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } }, @@ -1116,8 +1100,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1135,7 +1119,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1168,8 +1151,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1217,8 +1200,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1243,7 +1226,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1287,8 +1269,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1313,7 +1295,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1324,7 +1305,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1359,8 +1339,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1385,7 +1365,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1396,7 +1375,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1431,8 +1409,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1457,7 +1435,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1468,7 +1445,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1503,8 +1479,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1529,7 +1505,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1540,7 +1515,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1575,8 +1549,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1601,7 +1575,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1637,8 +1610,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1670,7 +1643,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1681,7 +1653,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1719,8 +1690,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1753,7 +1724,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false }, "right": { @@ -1764,7 +1734,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } } @@ -1799,8 +1768,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1841,7 +1810,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1876,8 +1844,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1950,8 +1918,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean19", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1984,7 +1952,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1995,7 +1962,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2030,8 +1996,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean20", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -2057,7 +2023,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } } @@ -2091,8 +2056,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean21", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -2141,7 +2106,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false }, "right": { @@ -2152,7 +2116,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } } @@ -2187,7 +2150,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } } @@ -2215,7 +2177,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } } @@ -2250,7 +2211,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2297,7 +2257,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } }, @@ -2309,7 +2268,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } ] @@ -2345,7 +2303,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -2356,7 +2313,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2393,7 +2349,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2404,7 +2359,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithBooleanType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithBooleanType/input.ts.json index 83068323aab7..7322a9ffd3fd 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithBooleanType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithBooleanType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "BOOLEAN", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -65,7 +65,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -134,7 +133,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -160,7 +158,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -206,7 +203,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -279,7 +275,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -322,6 +317,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -338,8 +334,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -375,8 +370,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -393,7 +388,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -428,8 +422,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -447,7 +441,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } }, @@ -480,8 +473,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -530,8 +523,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -559,7 +552,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -582,7 +574,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -627,8 +618,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -653,7 +644,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -664,7 +654,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -699,8 +688,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -725,7 +714,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -736,7 +724,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -771,8 +758,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -797,7 +784,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -833,8 +819,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -866,7 +852,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -877,7 +862,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -915,8 +899,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -942,7 +926,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } } @@ -1000,7 +983,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } } @@ -1035,7 +1017,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1118,7 +1099,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1129,7 +1109,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1166,7 +1145,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1177,7 +1155,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithEnumType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithEnumType/input.ts.json index 99f66447ecfe..9976a88269fc 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithEnumType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithEnumType/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -82,7 +79,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -114,7 +110,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "members": [] @@ -152,8 +147,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -171,7 +166,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } }, @@ -204,8 +198,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -230,7 +224,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "property": { @@ -279,8 +272,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -320,7 +313,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "property": { @@ -331,7 +323,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -351,7 +342,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "property": { @@ -402,8 +392,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -429,7 +419,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } } @@ -463,8 +452,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -520,7 +509,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "property": { @@ -554,7 +542,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "property": { @@ -565,7 +552,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "computed": false @@ -602,7 +588,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } } @@ -630,7 +615,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false } } @@ -665,7 +649,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "property": { @@ -676,7 +659,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -714,7 +696,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } }, @@ -726,7 +707,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithNumberType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithNumberType/input.ts.json index 8e3771507a6c..fb087187d3d6 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithNumberType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithNumberType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "NUMBER", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "NUMBER1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +105,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -155,7 +155,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -224,7 +223,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -250,7 +248,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -296,7 +293,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -369,7 +365,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -412,6 +407,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -428,8 +424,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -465,8 +460,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -483,7 +478,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -518,8 +512,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -537,7 +531,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } }, @@ -570,8 +563,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -589,7 +582,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false } }, @@ -622,8 +614,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -672,8 +664,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -701,7 +693,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -724,7 +715,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -769,8 +759,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -798,7 +788,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -821,7 +810,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -840,6 +828,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -856,8 +845,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -883,7 +871,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -927,8 +914,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -953,7 +940,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -964,7 +950,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -999,8 +984,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1025,7 +1010,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1036,7 +1020,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1071,8 +1054,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1097,7 +1080,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1141,8 +1123,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1167,7 +1149,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1203,8 +1184,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1236,7 +1217,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1247,7 +1227,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1285,8 +1264,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1319,7 +1298,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, "right": { @@ -1330,7 +1308,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1365,8 +1342,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1392,7 +1369,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1426,8 +1402,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1476,7 +1452,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, "right": { @@ -1487,7 +1462,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1548,7 +1522,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1576,7 +1549,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false } } @@ -1611,7 +1583,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1649,7 +1620,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1660,7 +1630,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1697,7 +1666,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1708,7 +1676,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1753,7 +1720,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1764,7 +1730,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1785,7 +1750,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1796,7 +1760,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithStringType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithStringType/input.ts.json index 7cf2a4b62fbb..35deeaa1c0fc 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithStringType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithStringType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "STRING", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "STRING1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +105,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -165,7 +165,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -239,7 +238,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -265,7 +263,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -311,7 +308,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -389,7 +385,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -432,6 +427,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -448,8 +444,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -485,8 +480,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -503,7 +498,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -538,8 +532,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -557,7 +551,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } }, @@ -590,8 +583,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -609,7 +602,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false } }, @@ -642,8 +634,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -697,8 +689,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -726,7 +718,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -754,7 +745,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -804,8 +794,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -833,7 +823,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -861,7 +850,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -880,6 +868,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -896,8 +885,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -923,7 +911,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -967,8 +954,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -993,7 +980,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1004,7 +990,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1039,8 +1024,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1065,7 +1050,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1076,7 +1060,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1111,8 +1094,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1137,7 +1120,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1181,8 +1163,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1207,7 +1189,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1243,8 +1224,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1276,7 +1257,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1287,7 +1267,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1325,8 +1304,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1359,7 +1338,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "right": { @@ -1370,7 +1348,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -1405,8 +1382,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1438,7 +1415,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "property": { @@ -1449,7 +1425,6 @@ "ctxt": 0 }, "value": "charAt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1500,8 +1475,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1527,7 +1502,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -1561,8 +1535,8 @@ "ctxt": 0 }, "value": "ResultIsBoolean14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1611,7 +1585,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "right": { @@ -1622,7 +1595,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -1688,7 +1660,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -1716,7 +1687,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false } } @@ -1751,7 +1721,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1797,7 +1766,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1808,7 +1776,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1829,7 +1796,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1840,7 +1806,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/negateOperator/negateOperatorWithAnyOtherType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/negateOperator/negateOperatorWithAnyOtherType/input.ts.json index 784f6a96f146..806b282f000f 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/negateOperator/negateOperatorWithAnyOtherType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/negateOperator/negateOperatorWithAnyOtherType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "ANY", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "ANY1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "ANY2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -153,8 +154,7 @@ "kind": "any" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -229,6 +229,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -263,8 +264,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -296,8 +296,8 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -317,7 +317,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -345,7 +344,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -387,7 +385,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -431,8 +428,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -454,7 +451,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -491,7 +487,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -517,7 +512,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -563,7 +557,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -607,8 +600,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -630,7 +623,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -687,7 +679,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -730,6 +721,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -746,8 +738,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -783,8 +774,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -801,7 +792,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -836,8 +826,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -855,7 +845,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } }, @@ -888,8 +877,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -907,7 +896,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false } }, @@ -940,8 +928,8 @@ "ctxt": 0 }, "value": "ResultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -959,7 +947,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -992,8 +979,8 @@ "ctxt": 0 }, "value": "ResultIsNumber4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1011,7 +998,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } }, @@ -1044,8 +1030,8 @@ "ctxt": 0 }, "value": "ResultIsNumber5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1063,7 +1049,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } }, @@ -1096,8 +1081,8 @@ "ctxt": 0 }, "value": "ResultIsNumber6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1115,7 +1100,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } }, @@ -1148,8 +1132,8 @@ "ctxt": 0 }, "value": "ResultIsNumber7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1167,7 +1151,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1200,8 +1183,8 @@ "ctxt": 0 }, "value": "ResultIsNumber", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1249,8 +1232,8 @@ "ctxt": 0 }, "value": "ResultIsNumber8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1275,7 +1258,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1319,8 +1301,8 @@ "ctxt": 0 }, "value": "ResultIsNumber9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1345,7 +1327,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1356,7 +1337,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1391,8 +1371,8 @@ "ctxt": 0 }, "value": "ResultIsNumber10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1417,7 +1397,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1428,7 +1407,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1463,8 +1441,8 @@ "ctxt": 0 }, "value": "ResultIsNumber11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1489,7 +1467,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1500,7 +1477,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1535,8 +1511,8 @@ "ctxt": 0 }, "value": "ResultIsNumber12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1561,7 +1537,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1572,7 +1547,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1607,8 +1581,8 @@ "ctxt": 0 }, "value": "ResultIsNumber13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1633,7 +1607,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1669,8 +1642,8 @@ "ctxt": 0 }, "value": "ResultIsNumber14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1702,7 +1675,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1713,7 +1685,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1751,8 +1722,8 @@ "ctxt": 0 }, "value": "ResultIsNumber15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1785,7 +1756,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false }, "right": { @@ -1796,7 +1766,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } } @@ -1829,7 +1798,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } } @@ -1857,7 +1825,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } } @@ -1892,7 +1859,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1939,7 +1905,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } }, @@ -1951,7 +1916,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } ] @@ -1987,7 +1951,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1998,7 +1961,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2035,7 +1997,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2046,7 +2007,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/negateOperator/negateOperatorWithBooleanType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/negateOperator/negateOperatorWithBooleanType/input.ts.json index 707f477e2fcd..e27cce2f00a1 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/negateOperator/negateOperatorWithBooleanType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/negateOperator/negateOperatorWithBooleanType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "BOOLEAN", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -65,7 +65,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -134,7 +133,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -160,7 +158,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -206,7 +203,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -279,7 +275,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -322,6 +317,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -338,8 +334,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -375,8 +370,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -393,7 +388,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -428,8 +422,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -447,7 +441,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } }, @@ -480,8 +473,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -530,8 +523,8 @@ "ctxt": 0 }, "value": "ResultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -559,7 +552,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -582,7 +574,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -627,8 +618,8 @@ "ctxt": 0 }, "value": "ResultIsNumber4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -653,7 +644,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -664,7 +654,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -699,8 +688,8 @@ "ctxt": 0 }, "value": "ResultIsNumber5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -725,7 +714,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -736,7 +724,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -771,8 +758,8 @@ "ctxt": 0 }, "value": "ResultIsNumber6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -797,7 +784,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -833,8 +819,8 @@ "ctxt": 0 }, "value": "ResultIsNumber7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -866,7 +852,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -877,7 +862,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -939,7 +923,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } } @@ -974,7 +957,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1057,7 +1039,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1068,7 +1049,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1105,7 +1085,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1116,7 +1095,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/negateOperator/negateOperatorWithEnumType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/negateOperator/negateOperatorWithEnumType/input.ts.json index 10694b67397b..359896c5f7e2 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/negateOperator/negateOperatorWithEnumType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/negateOperator/negateOperatorWithEnumType/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "members": [] @@ -53,7 +52,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "members": [ @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -92,7 +89,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -155,8 +151,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -174,7 +170,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } }, @@ -207,8 +202,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -233,7 +228,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -282,8 +276,8 @@ "ctxt": 0 }, "value": "ResultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -323,7 +317,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -334,7 +327,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -354,7 +346,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -403,7 +394,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } } @@ -431,7 +421,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false } } @@ -466,7 +455,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -518,7 +506,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } }, @@ -530,7 +517,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/negateOperator/negateOperatorWithNumberType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/negateOperator/negateOperatorWithNumberType/input.ts.json index f5b9e6b47dc3..4e5c08de14ae 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/negateOperator/negateOperatorWithNumberType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/negateOperator/negateOperatorWithNumberType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "NUMBER", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "NUMBER1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +105,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -155,7 +155,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -224,7 +223,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -250,7 +248,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -296,7 +293,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -369,7 +365,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -412,6 +407,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -428,8 +424,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -465,8 +460,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -483,7 +478,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -518,8 +512,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -537,7 +531,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } }, @@ -570,8 +563,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -589,7 +582,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false } }, @@ -622,8 +614,8 @@ "ctxt": 0 }, "value": "ResultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -672,8 +664,8 @@ "ctxt": 0 }, "value": "ResultIsNumber4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -701,7 +693,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -724,7 +715,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -769,8 +759,8 @@ "ctxt": 0 }, "value": "ResultIsNumber5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -798,7 +788,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -821,7 +810,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -840,6 +828,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -856,8 +845,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -883,7 +871,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -927,8 +914,8 @@ "ctxt": 0 }, "value": "ResultIsNumber6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -953,7 +940,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -964,7 +950,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -999,8 +984,8 @@ "ctxt": 0 }, "value": "ResultIsNumber7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1025,7 +1010,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1036,7 +1020,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1071,8 +1054,8 @@ "ctxt": 0 }, "value": "ResultIsNumber8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1097,7 +1080,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1141,8 +1123,8 @@ "ctxt": 0 }, "value": "ResultIsNumber9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1167,7 +1149,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1203,8 +1184,8 @@ "ctxt": 0 }, "value": "ResultIsNumber10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1236,7 +1217,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1247,7 +1227,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1285,8 +1264,8 @@ "ctxt": 0 }, "value": "ResultIsNumber11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1319,7 +1298,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, "right": { @@ -1330,7 +1308,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1389,7 +1366,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1417,7 +1393,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false } } @@ -1452,7 +1427,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1490,7 +1464,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1501,7 +1474,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1538,7 +1510,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1549,7 +1520,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1594,7 +1564,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1605,7 +1574,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1626,7 +1594,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1637,7 +1604,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/negateOperator/negateOperatorWithStringType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/negateOperator/negateOperatorWithStringType/input.ts.json index d07df0e21184..183712961073 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/negateOperator/negateOperatorWithStringType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/negateOperator/negateOperatorWithStringType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "STRING", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "STRING1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +105,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -165,7 +165,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -239,7 +238,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -265,7 +263,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -311,7 +308,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -389,7 +385,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -432,6 +427,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -448,8 +444,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -485,8 +480,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -503,7 +498,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -538,8 +532,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -557,7 +551,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } }, @@ -590,8 +583,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -609,7 +602,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false } }, @@ -642,8 +634,8 @@ "ctxt": 0 }, "value": "ResultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -697,8 +689,8 @@ "ctxt": 0 }, "value": "ResultIsNumber4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -726,7 +718,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -754,7 +745,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -804,8 +794,8 @@ "ctxt": 0 }, "value": "ResultIsNumber5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -833,7 +823,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -861,7 +850,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -880,6 +868,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -896,8 +885,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -923,7 +911,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -967,8 +954,8 @@ "ctxt": 0 }, "value": "ResultIsNumber6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -993,7 +980,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1004,7 +990,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1039,8 +1024,8 @@ "ctxt": 0 }, "value": "ResultIsNumber7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1065,7 +1050,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1076,7 +1060,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1111,8 +1094,8 @@ "ctxt": 0 }, "value": "ResultIsNumber8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1137,7 +1120,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1181,8 +1163,8 @@ "ctxt": 0 }, "value": "ResultIsNumber9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1207,7 +1189,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1243,8 +1224,8 @@ "ctxt": 0 }, "value": "ResultIsNumber10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1276,7 +1257,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1287,7 +1267,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1325,8 +1304,8 @@ "ctxt": 0 }, "value": "ResultIsNumber11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1359,7 +1338,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "right": { @@ -1370,7 +1348,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -1405,8 +1382,8 @@ "ctxt": 0 }, "value": "ResultIsNumber12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1438,7 +1415,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "property": { @@ -1449,7 +1425,6 @@ "ctxt": 0 }, "value": "charAt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1529,7 +1504,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -1557,7 +1531,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false } } @@ -1592,7 +1565,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1638,7 +1610,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1649,7 +1620,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1670,7 +1640,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1681,7 +1650,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/plusOperator/plusOperatorWithAnyOtherType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/plusOperator/plusOperatorWithAnyOtherType/input.ts.json index ab2d5bcdeffa..79d01425c9c1 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/plusOperator/plusOperatorWithAnyOtherType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/plusOperator/plusOperatorWithAnyOtherType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "ANY", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,8 +80,8 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -113,6 +113,7 @@ "ctxt": 0 }, "value": "ANY2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -137,8 +138,7 @@ "kind": "any" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -213,6 +213,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -247,8 +248,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -280,8 +280,8 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -301,7 +301,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -320,6 +319,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -336,8 +336,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -365,7 +364,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -384,8 +382,8 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -419,7 +417,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -463,8 +460,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -486,7 +483,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -523,7 +519,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -549,7 +544,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -595,7 +589,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -639,8 +632,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -662,7 +655,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -703,7 +695,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -746,6 +737,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -762,8 +754,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -799,8 +790,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -817,7 +808,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -852,8 +842,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -871,7 +861,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } }, @@ -904,8 +893,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -923,7 +912,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false } }, @@ -956,8 +944,8 @@ "ctxt": 0 }, "value": "ResultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -975,7 +963,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -1008,8 +995,8 @@ "ctxt": 0 }, "value": "ResultIsNumber4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1027,7 +1014,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } }, @@ -1060,8 +1046,8 @@ "ctxt": 0 }, "value": "ResultIsNumber5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1079,7 +1065,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } }, @@ -1112,8 +1097,8 @@ "ctxt": 0 }, "value": "ResultIsNumber6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1131,7 +1116,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } }, @@ -1164,8 +1148,8 @@ "ctxt": 0 }, "value": "ResultIsNumber7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1183,7 +1167,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1216,8 +1199,8 @@ "ctxt": 0 }, "value": "ResultIsNumber8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1265,8 +1248,8 @@ "ctxt": 0 }, "value": "ResultIsNumber9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1291,7 +1274,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1335,8 +1317,8 @@ "ctxt": 0 }, "value": "ResultIsNumber10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1361,7 +1343,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1372,7 +1353,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1407,8 +1387,8 @@ "ctxt": 0 }, "value": "ResultIsNumber11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1433,7 +1413,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1444,7 +1423,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1479,8 +1457,8 @@ "ctxt": 0 }, "value": "ResultIsNumber12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1505,7 +1483,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1516,7 +1493,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1551,8 +1527,8 @@ "ctxt": 0 }, "value": "ResultIsNumber13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1577,7 +1553,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1588,7 +1563,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1623,8 +1597,8 @@ "ctxt": 0 }, "value": "ResultIsNumber14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1649,7 +1623,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1685,8 +1658,8 @@ "ctxt": 0 }, "value": "ResultIsNumber15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1718,7 +1691,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1729,7 +1701,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1767,8 +1738,8 @@ "ctxt": 0 }, "value": "ResultIsNumber16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1801,7 +1772,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false }, "right": { @@ -1812,7 +1782,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } } @@ -1847,8 +1816,8 @@ "ctxt": 0 }, "value": "ResultIsNumber17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1889,7 +1858,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1924,8 +1892,8 @@ "ctxt": 0 }, "value": "ResultIsNumber18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1998,8 +1966,8 @@ "ctxt": 0 }, "value": "ResultIsNumber19", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -2032,7 +2000,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -2043,7 +2010,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2076,7 +2042,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } } @@ -2104,7 +2069,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } } @@ -2139,7 +2103,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2186,7 +2149,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } }, @@ -2198,7 +2160,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } ] @@ -2234,7 +2195,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -2245,7 +2205,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2282,7 +2241,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2293,7 +2251,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/plusOperator/plusOperatorWithBooleanType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/plusOperator/plusOperatorWithBooleanType/input.ts.json index 7051c25a562b..1ffb71bb13aa 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/plusOperator/plusOperatorWithBooleanType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/plusOperator/plusOperatorWithBooleanType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "BOOLEAN", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -65,7 +65,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -134,7 +133,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -160,7 +158,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -206,7 +203,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -279,7 +275,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -322,6 +317,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -338,8 +334,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -375,8 +370,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -393,7 +388,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -428,8 +422,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -447,7 +441,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } }, @@ -480,8 +473,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -530,8 +523,8 @@ "ctxt": 0 }, "value": "ResultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -559,7 +552,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -582,7 +574,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -627,8 +618,8 @@ "ctxt": 0 }, "value": "ResultIsNumber4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -653,7 +644,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -664,7 +654,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -699,8 +688,8 @@ "ctxt": 0 }, "value": "ResultIsNumber5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -725,7 +714,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -736,7 +724,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -771,8 +758,8 @@ "ctxt": 0 }, "value": "ResultIsNumber6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -797,7 +784,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -833,8 +819,8 @@ "ctxt": 0 }, "value": "ResultIsNumber7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -866,7 +852,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -877,7 +862,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -939,7 +923,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } } @@ -974,7 +957,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1057,7 +1039,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1068,7 +1049,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1105,7 +1085,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1116,7 +1095,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/plusOperator/plusOperatorWithEnumType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/plusOperator/plusOperatorWithEnumType/input.ts.json index 6567960a9584..c4e5197bf3f7 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/plusOperator/plusOperatorWithEnumType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/plusOperator/plusOperatorWithEnumType/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "members": [] @@ -53,7 +52,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "members": [ @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -92,7 +89,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -155,8 +151,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -174,7 +170,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } }, @@ -207,8 +202,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -226,7 +221,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false } }, @@ -259,8 +253,8 @@ "ctxt": 0 }, "value": "ResultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -285,7 +279,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -334,8 +327,8 @@ "ctxt": 0 }, "value": "ResultIsNumber4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -375,7 +368,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "property": { @@ -404,7 +396,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -453,7 +444,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } } @@ -481,7 +471,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false } } @@ -516,7 +505,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -527,7 +515,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -565,7 +552,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } }, @@ -577,7 +563,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/plusOperator/plusOperatorWithNumberType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/plusOperator/plusOperatorWithNumberType/input.ts.json index 3fa357c07e93..e473e553af70 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/plusOperator/plusOperatorWithNumberType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/plusOperator/plusOperatorWithNumberType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "NUMBER", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "NUMBER1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +105,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -155,7 +155,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -224,7 +223,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -250,7 +248,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -296,7 +293,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -369,7 +365,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -412,6 +407,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -428,8 +424,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -465,8 +460,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -483,7 +478,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -518,8 +512,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -537,7 +531,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } }, @@ -570,8 +563,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -589,7 +582,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false } }, @@ -622,8 +614,8 @@ "ctxt": 0 }, "value": "ResultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -672,8 +664,8 @@ "ctxt": 0 }, "value": "ResultIsNumber4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -701,7 +693,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -724,7 +715,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -769,8 +759,8 @@ "ctxt": 0 }, "value": "ResultIsNumber5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -798,7 +788,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -821,7 +810,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -840,6 +828,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -856,8 +845,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -883,7 +871,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -927,8 +914,8 @@ "ctxt": 0 }, "value": "ResultIsNumber6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -953,7 +940,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -964,7 +950,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -999,8 +984,8 @@ "ctxt": 0 }, "value": "ResultIsNumber7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1025,7 +1010,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1036,7 +1020,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1071,8 +1054,8 @@ "ctxt": 0 }, "value": "ResultIsNumber8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1097,7 +1080,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1141,8 +1123,8 @@ "ctxt": 0 }, "value": "ResultIsNumber9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1167,7 +1149,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1203,8 +1184,8 @@ "ctxt": 0 }, "value": "ResultIsNumber10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1236,7 +1217,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1247,7 +1227,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1285,8 +1264,8 @@ "ctxt": 0 }, "value": "ResultIsNumber11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1319,7 +1298,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, "right": { @@ -1330,7 +1308,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1389,7 +1366,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1417,7 +1393,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false } } @@ -1452,7 +1427,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1490,7 +1464,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1501,7 +1474,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1538,7 +1510,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1549,7 +1520,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1594,7 +1564,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1605,7 +1574,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1626,7 +1594,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1637,7 +1604,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/plusOperator/plusOperatorWithStringType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/plusOperator/plusOperatorWithStringType/input.ts.json index 26024a14de3b..110bbbc002bd 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/plusOperator/plusOperatorWithStringType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/plusOperator/plusOperatorWithStringType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "STRING", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "STRING1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +105,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -165,7 +165,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -239,7 +238,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -265,7 +263,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -311,7 +308,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -389,7 +385,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -432,6 +427,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -448,8 +444,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -485,8 +480,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -503,7 +498,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -538,8 +532,8 @@ "ctxt": 0 }, "value": "ResultIsNumber1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -557,7 +551,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } }, @@ -590,8 +583,8 @@ "ctxt": 0 }, "value": "ResultIsNumber2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -609,7 +602,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false } }, @@ -642,8 +634,8 @@ "ctxt": 0 }, "value": "ResultIsNumber3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -697,8 +689,8 @@ "ctxt": 0 }, "value": "ResultIsNumber4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -726,7 +718,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -754,7 +745,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -804,8 +794,8 @@ "ctxt": 0 }, "value": "ResultIsNumber5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -833,7 +823,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -861,7 +850,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -880,6 +868,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -896,8 +885,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -923,7 +911,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -967,8 +954,8 @@ "ctxt": 0 }, "value": "ResultIsNumber6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -993,7 +980,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1004,7 +990,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1039,8 +1024,8 @@ "ctxt": 0 }, "value": "ResultIsNumber7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1065,7 +1050,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1076,7 +1060,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1111,8 +1094,8 @@ "ctxt": 0 }, "value": "ResultIsNumber8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1137,7 +1120,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1181,8 +1163,8 @@ "ctxt": 0 }, "value": "ResultIsNumber9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1207,7 +1189,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1243,8 +1224,8 @@ "ctxt": 0 }, "value": "ResultIsNumber10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1276,7 +1257,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1287,7 +1267,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1325,8 +1304,8 @@ "ctxt": 0 }, "value": "ResultIsNumber11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1359,7 +1338,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "right": { @@ -1370,7 +1348,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -1405,8 +1382,8 @@ "ctxt": 0 }, "value": "ResultIsNumber12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1438,7 +1415,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "property": { @@ -1449,7 +1425,6 @@ "ctxt": 0 }, "value": "charAt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1529,7 +1504,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -1557,7 +1531,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false } } @@ -1592,7 +1565,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1638,7 +1610,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1649,7 +1620,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1670,7 +1640,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1681,7 +1650,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/typeofOperator/typeofOperatorWithAnyOtherType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/typeofOperator/typeofOperatorWithAnyOtherType/input.ts.json index a30ad0468d5c..2208fe10593f 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/typeofOperator/typeofOperatorWithAnyOtherType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/typeofOperator/typeofOperatorWithAnyOtherType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "ANY", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,8 +80,8 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -113,6 +113,7 @@ "ctxt": 0 }, "value": "ANY2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -137,8 +138,7 @@ "kind": "any" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -213,6 +213,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -247,8 +248,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -280,8 +280,8 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -301,7 +301,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -329,7 +328,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -371,7 +369,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -415,8 +412,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -438,7 +435,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -475,7 +471,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -501,7 +496,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -547,7 +541,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -591,8 +584,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -614,7 +607,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -655,7 +647,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -698,6 +689,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -714,8 +706,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -751,8 +742,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -769,7 +760,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -804,8 +794,8 @@ "ctxt": 0 }, "value": "ResultIsString1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -823,7 +813,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } }, @@ -856,8 +845,8 @@ "ctxt": 0 }, "value": "ResultIsString2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -875,7 +864,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false } }, @@ -908,8 +896,8 @@ "ctxt": 0 }, "value": "ResultIsString3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -927,7 +915,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -960,8 +947,8 @@ "ctxt": 0 }, "value": "ResultIsString4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -979,7 +966,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } }, @@ -1012,8 +998,8 @@ "ctxt": 0 }, "value": "ResultIsString5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1031,7 +1017,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } }, @@ -1064,8 +1049,8 @@ "ctxt": 0 }, "value": "ResultIsString6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1083,7 +1068,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } }, @@ -1116,8 +1100,8 @@ "ctxt": 0 }, "value": "ResultIsString7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1135,7 +1119,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1168,8 +1151,8 @@ "ctxt": 0 }, "value": "ResultIsString8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1217,8 +1200,8 @@ "ctxt": 0 }, "value": "ResultIsString9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1267,8 +1250,8 @@ "ctxt": 0 }, "value": "ResultIsString10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1293,7 +1276,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1337,8 +1319,8 @@ "ctxt": 0 }, "value": "ResultIsString11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1363,7 +1345,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1374,7 +1355,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1409,8 +1389,8 @@ "ctxt": 0 }, "value": "ResultIsString12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1435,7 +1415,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1446,7 +1425,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1481,8 +1459,8 @@ "ctxt": 0 }, "value": "ResultIsString13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1507,7 +1485,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1518,7 +1495,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1553,8 +1529,8 @@ "ctxt": 0 }, "value": "ResultIsString14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1579,7 +1555,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1615,8 +1590,8 @@ "ctxt": 0 }, "value": "ResultIsString15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1648,7 +1623,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1659,7 +1633,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1697,8 +1670,8 @@ "ctxt": 0 }, "value": "ResultIsString16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1731,7 +1704,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false }, "right": { @@ -1742,7 +1714,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } } @@ -1777,8 +1748,8 @@ "ctxt": 0 }, "value": "ResultIsString17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1819,7 +1790,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1854,8 +1824,8 @@ "ctxt": 0 }, "value": "ResultIsString18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1928,8 +1898,8 @@ "ctxt": 0 }, "value": "ResultIsString19", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1962,7 +1932,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1973,7 +1942,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2008,8 +1976,8 @@ "ctxt": 0 }, "value": "ResultIsString20", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -2035,7 +2003,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } } @@ -2069,8 +2036,8 @@ "ctxt": 0 }, "value": "ResultIsString21", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -2119,7 +2086,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false }, "right": { @@ -2130,7 +2096,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } } @@ -2165,7 +2130,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } } @@ -2193,7 +2157,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } } @@ -2228,7 +2191,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2275,7 +2237,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } }, @@ -2287,7 +2248,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } ] @@ -2316,7 +2276,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } } @@ -2351,7 +2310,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2362,7 +2320,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2399,7 +2356,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -2410,7 +2366,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2447,7 +2402,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2458,7 +2412,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2490,6 +2443,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2506,8 +2460,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2539,6 +2492,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2563,8 +2517,7 @@ "kind": "any" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2596,6 +2549,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2630,8 +2584,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2653,7 +2606,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "body": { @@ -2679,7 +2631,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } } @@ -2700,7 +2651,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "body": { @@ -2726,7 +2676,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false } } @@ -2747,7 +2696,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "body": { @@ -2773,7 +2721,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -2794,7 +2741,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "body": { @@ -2827,7 +2773,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -2838,7 +2783,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2861,7 +2805,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "body": { @@ -2894,7 +2837,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -2905,7 +2847,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2928,7 +2869,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "body": { @@ -2961,7 +2901,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2972,7 +2911,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2995,7 +2933,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "body": { @@ -3028,7 +2965,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -3039,7 +2975,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/typeofOperator/typeofOperatorWithBooleanType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/typeofOperator/typeofOperatorWithBooleanType/input.ts.json index 1d70d8f45b09..62df3e86f711 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/typeofOperator/typeofOperatorWithBooleanType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/typeofOperator/typeofOperatorWithBooleanType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "BOOLEAN", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -65,7 +65,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -134,7 +133,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -160,7 +158,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -206,7 +203,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -279,7 +275,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -322,6 +317,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -338,8 +334,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -375,8 +370,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -393,7 +388,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -428,8 +422,8 @@ "ctxt": 0 }, "value": "ResultIsString1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -447,7 +441,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } }, @@ -480,8 +473,8 @@ "ctxt": 0 }, "value": "ResultIsString2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -530,8 +523,8 @@ "ctxt": 0 }, "value": "ResultIsString3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -559,7 +552,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -582,7 +574,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -627,8 +618,8 @@ "ctxt": 0 }, "value": "ResultIsString4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -653,7 +644,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -664,7 +654,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -699,8 +688,8 @@ "ctxt": 0 }, "value": "ResultIsString5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -725,7 +714,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -736,7 +724,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -771,8 +758,8 @@ "ctxt": 0 }, "value": "ResultIsString6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -797,7 +784,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -833,8 +819,8 @@ "ctxt": 0 }, "value": "ResultIsString7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -866,7 +852,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -877,7 +862,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -915,8 +899,8 @@ "ctxt": 0 }, "value": "ResultIsString8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -942,7 +926,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } } @@ -1000,7 +983,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } } @@ -1035,7 +1017,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1118,7 +1099,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1129,7 +1109,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1166,7 +1145,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1177,7 +1155,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1209,6 +1186,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1225,8 +1203,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1258,6 +1235,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1282,8 +1260,7 @@ "kind": "boolean" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1315,6 +1292,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1349,8 +1327,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1372,7 +1349,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "body": { @@ -1398,7 +1374,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } } @@ -1419,7 +1394,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "body": { @@ -1445,7 +1419,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -1476,8 +1449,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1497,7 +1470,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1520,7 +1492,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1554,7 +1525,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "body": { @@ -1587,7 +1557,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -1598,7 +1567,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1621,7 +1589,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "body": { @@ -1654,7 +1621,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1665,7 +1631,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1688,7 +1653,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "body": { @@ -1721,7 +1685,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1732,7 +1695,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1755,7 +1717,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "body": { @@ -1788,7 +1749,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1799,7 +1759,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/typeofOperator/typeofOperatorWithEnumType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/typeofOperator/typeofOperatorWithEnumType/input.ts.json index 224a7ff4eab2..d09d127163df 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/typeofOperator/typeofOperatorWithEnumType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/typeofOperator/typeofOperatorWithEnumType/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "members": [] @@ -53,7 +52,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "members": [ @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -92,7 +89,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -155,8 +151,8 @@ "ctxt": 0 }, "value": "ResultIsString1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -174,7 +170,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } }, @@ -207,8 +202,8 @@ "ctxt": 0 }, "value": "ResultIsString2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -226,7 +221,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false } }, @@ -259,8 +253,8 @@ "ctxt": 0 }, "value": "ResultIsString3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -285,7 +279,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -334,8 +327,8 @@ "ctxt": 0 }, "value": "ResultIsString4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -375,7 +368,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "property": { @@ -404,7 +396,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -455,8 +446,8 @@ "ctxt": 0 }, "value": "ResultIsString5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -482,7 +473,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } } @@ -516,8 +506,8 @@ "ctxt": 0 }, "value": "ResultIsString6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -573,7 +563,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "property": { @@ -602,7 +591,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -613,7 +601,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -650,7 +637,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } } @@ -678,7 +664,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false } } @@ -713,7 +698,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -765,7 +749,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } }, @@ -777,7 +760,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false } ] @@ -800,7 +782,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "members": [] @@ -828,7 +809,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "body": { @@ -854,7 +834,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } } @@ -875,7 +854,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "body": { @@ -901,7 +879,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/typeofOperator/typeofOperatorWithNumberType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/typeofOperator/typeofOperatorWithNumberType/input.ts.json index 6510b03ea4dd..d5edda767b72 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/typeofOperator/typeofOperatorWithNumberType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/typeofOperator/typeofOperatorWithNumberType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "NUMBER", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "NUMBER1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +105,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -155,7 +155,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -224,7 +223,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -250,7 +248,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -296,7 +293,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -369,7 +365,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -412,6 +407,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -428,8 +424,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -465,8 +460,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -483,7 +478,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -518,8 +512,8 @@ "ctxt": 0 }, "value": "ResultIsString1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -537,7 +531,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } }, @@ -570,8 +563,8 @@ "ctxt": 0 }, "value": "ResultIsString2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -589,7 +582,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false } }, @@ -622,8 +614,8 @@ "ctxt": 0 }, "value": "ResultIsString3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -672,8 +664,8 @@ "ctxt": 0 }, "value": "ResultIsString4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -701,7 +693,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -724,7 +715,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -769,8 +759,8 @@ "ctxt": 0 }, "value": "ResultIsString5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -798,7 +788,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -821,7 +810,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -840,6 +828,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -856,8 +845,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -883,7 +871,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -927,8 +914,8 @@ "ctxt": 0 }, "value": "ResultIsString6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -953,7 +940,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -964,7 +950,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -999,8 +984,8 @@ "ctxt": 0 }, "value": "ResultIsString7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1025,7 +1010,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1036,7 +1020,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1071,8 +1054,8 @@ "ctxt": 0 }, "value": "ResultIsString8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1097,7 +1080,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1141,8 +1123,8 @@ "ctxt": 0 }, "value": "ResultIsString9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1167,7 +1149,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1203,8 +1184,8 @@ "ctxt": 0 }, "value": "ResultIsString10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1236,7 +1217,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1247,7 +1227,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1285,8 +1264,8 @@ "ctxt": 0 }, "value": "ResultIsString11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1319,7 +1298,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, "right": { @@ -1330,7 +1308,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1365,8 +1342,8 @@ "ctxt": 0 }, "value": "ResultIsString12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1392,7 +1369,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1426,8 +1402,8 @@ "ctxt": 0 }, "value": "ResultIsString13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1476,7 +1452,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, "right": { @@ -1487,7 +1462,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1548,7 +1522,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1576,7 +1549,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false } } @@ -1611,7 +1583,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1649,7 +1620,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1660,7 +1630,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1697,7 +1666,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1708,7 +1676,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1753,7 +1720,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1764,7 +1730,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1785,7 +1750,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1796,7 +1760,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1829,6 +1792,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1845,8 +1809,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1878,6 +1841,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1902,8 +1866,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1925,7 +1888,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "body": { @@ -1951,7 +1913,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1972,7 +1933,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "body": { @@ -1998,7 +1958,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false } } @@ -2019,7 +1978,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "body": { @@ -2045,7 +2003,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -2076,8 +2033,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -2097,7 +2054,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2120,7 +2076,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2154,7 +2109,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "body": { @@ -2187,7 +2141,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -2198,7 +2151,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2221,7 +2173,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "body": { @@ -2254,7 +2205,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -2265,7 +2215,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2288,7 +2237,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "body": { @@ -2321,7 +2269,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -2332,7 +2279,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2355,7 +2301,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "body": { @@ -2388,7 +2333,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2399,7 +2343,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/typeofOperator/typeofOperatorWithStringType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/typeofOperator/typeofOperatorWithStringType/input.ts.json index 12a7c086d667..c92e8ed963d5 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/typeofOperator/typeofOperatorWithStringType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/typeofOperator/typeofOperatorWithStringType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "STRING", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "STRING1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +105,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -165,7 +165,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -239,7 +238,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -265,7 +263,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -311,7 +308,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -389,7 +385,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -432,6 +427,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -448,8 +444,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -485,8 +480,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -503,7 +498,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -538,8 +532,8 @@ "ctxt": 0 }, "value": "ResultIsString1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -557,7 +551,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } }, @@ -590,8 +583,8 @@ "ctxt": 0 }, "value": "ResultIsString2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -609,7 +602,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false } }, @@ -642,8 +634,8 @@ "ctxt": 0 }, "value": "ResultIsString3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -697,8 +689,8 @@ "ctxt": 0 }, "value": "ResultIsString4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -726,7 +718,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -754,7 +745,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -804,8 +794,8 @@ "ctxt": 0 }, "value": "ResultIsString5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -833,7 +823,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -861,7 +850,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -880,6 +868,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -896,8 +885,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -923,7 +911,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -967,8 +954,8 @@ "ctxt": 0 }, "value": "ResultIsString6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -993,7 +980,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1004,7 +990,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1039,8 +1024,8 @@ "ctxt": 0 }, "value": "ResultIsString7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1065,7 +1050,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1076,7 +1060,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1111,8 +1094,8 @@ "ctxt": 0 }, "value": "ResultIsString8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1137,7 +1120,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1181,8 +1163,8 @@ "ctxt": 0 }, "value": "ResultIsString9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1207,7 +1189,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1243,8 +1224,8 @@ "ctxt": 0 }, "value": "ResultIsString10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1276,7 +1257,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1287,7 +1267,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1325,8 +1304,8 @@ "ctxt": 0 }, "value": "ResultIsString11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1359,7 +1338,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "right": { @@ -1370,7 +1348,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -1405,8 +1382,8 @@ "ctxt": 0 }, "value": "ResultIsString12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1438,7 +1415,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "property": { @@ -1449,7 +1425,6 @@ "ctxt": 0 }, "value": "charAt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1500,8 +1475,8 @@ "ctxt": 0 }, "value": "ResultIsString13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1527,7 +1502,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -1561,8 +1535,8 @@ "ctxt": 0 }, "value": "ResultIsString14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1611,7 +1585,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "right": { @@ -1622,7 +1595,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -1688,7 +1660,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -1716,7 +1687,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false } } @@ -1751,7 +1721,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1797,7 +1766,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1808,7 +1776,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1829,7 +1796,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1840,7 +1806,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1873,6 +1838,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1889,8 +1855,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1922,6 +1887,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1946,8 +1912,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1979,6 +1944,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2013,8 +1979,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2036,7 +2001,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "body": { @@ -2062,7 +2026,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -2083,7 +2046,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "body": { @@ -2109,7 +2071,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false } } @@ -2130,7 +2091,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "body": { @@ -2156,7 +2116,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -2187,8 +2146,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -2208,7 +2167,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2236,7 +2194,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2275,7 +2232,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "body": { @@ -2308,7 +2264,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -2319,7 +2274,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2342,7 +2296,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "body": { @@ -2375,7 +2328,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -2386,7 +2338,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2409,7 +2360,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "body": { @@ -2442,7 +2392,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -2453,7 +2402,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2476,7 +2424,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "body": { @@ -2509,7 +2456,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2520,7 +2466,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/voidOperator/voidOperatorWithAnyOtherType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/voidOperator/voidOperatorWithAnyOtherType/input.ts.json index 4926cc9b8ad2..a26249f36304 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/voidOperator/voidOperatorWithAnyOtherType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/voidOperator/voidOperatorWithAnyOtherType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "ANY", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,8 +80,8 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -113,6 +113,7 @@ "ctxt": 0 }, "value": "ANY2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -137,8 +138,7 @@ "kind": "any" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -213,6 +213,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -247,8 +248,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -280,8 +280,8 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -301,7 +301,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -329,7 +328,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -358,7 +356,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -402,8 +399,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -425,7 +422,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -462,7 +458,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -488,7 +483,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -534,7 +528,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -578,8 +571,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -601,7 +594,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -642,7 +634,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -685,6 +676,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -701,8 +693,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -738,8 +729,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -756,7 +747,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -791,8 +781,8 @@ "ctxt": 0 }, "value": "ResultIsAny1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -810,7 +800,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } }, @@ -843,8 +832,8 @@ "ctxt": 0 }, "value": "ResultIsAny2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -862,7 +851,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false } }, @@ -895,8 +883,8 @@ "ctxt": 0 }, "value": "ResultIsAny3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -914,7 +902,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -947,8 +934,8 @@ "ctxt": 0 }, "value": "ResultIsAny4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -966,7 +953,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } }, @@ -999,8 +985,8 @@ "ctxt": 0 }, "value": "ResultIsAny5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1018,7 +1004,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } }, @@ -1051,8 +1036,8 @@ "ctxt": 0 }, "value": "ResultIsAny6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1070,7 +1055,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } }, @@ -1103,8 +1087,8 @@ "ctxt": 0 }, "value": "ResultIsAny7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1122,7 +1106,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1155,8 +1138,8 @@ "ctxt": 0 }, "value": "ResultIsAny8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1204,8 +1187,8 @@ "ctxt": 0 }, "value": "ResultIsAny9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1230,7 +1213,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1274,8 +1256,8 @@ "ctxt": 0 }, "value": "ResultIsAny10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1300,7 +1282,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1311,7 +1292,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1346,8 +1326,8 @@ "ctxt": 0 }, "value": "ResultIsAny11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1372,7 +1352,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1383,7 +1362,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1418,8 +1396,8 @@ "ctxt": 0 }, "value": "ResultIsAny12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1444,7 +1422,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1455,7 +1432,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1490,8 +1466,8 @@ "ctxt": 0 }, "value": "ResultIsAny13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1516,7 +1492,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1527,7 +1502,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1562,8 +1536,8 @@ "ctxt": 0 }, "value": "ResultIsAny14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1588,7 +1562,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1624,8 +1597,8 @@ "ctxt": 0 }, "value": "ResultIsAny15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1657,7 +1630,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1668,7 +1640,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1706,8 +1677,8 @@ "ctxt": 0 }, "value": "ResultIsAny16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1740,7 +1711,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false }, "right": { @@ -1751,7 +1721,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } } @@ -1786,8 +1755,8 @@ "ctxt": 0 }, "value": "ResultIsAny17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1828,7 +1797,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1863,8 +1831,8 @@ "ctxt": 0 }, "value": "ResultIsAny18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1937,8 +1905,8 @@ "ctxt": 0 }, "value": "ResultIsAny19", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1971,7 +1939,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -1982,7 +1949,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2017,8 +1983,8 @@ "ctxt": 0 }, "value": "ResultIsAny20", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -2044,7 +2010,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } } @@ -2078,8 +2043,8 @@ "ctxt": 0 }, "value": "ResultIsAny21", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -2128,7 +2093,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false }, "right": { @@ -2139,7 +2103,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } } @@ -2174,7 +2137,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } } @@ -2202,7 +2164,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } } @@ -2237,7 +2198,6 @@ "ctxt": 0 }, "value": "ANY2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2284,7 +2244,6 @@ "ctxt": 0 }, "value": "ANY", - "typeAnnotation": null, "optional": false } }, @@ -2296,7 +2255,6 @@ "ctxt": 0 }, "value": "ANY1", - "typeAnnotation": null, "optional": false } ] @@ -2332,7 +2290,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -2343,7 +2300,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2380,7 +2336,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2391,7 +2346,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/voidOperator/voidOperatorWithBooleanType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/voidOperator/voidOperatorWithBooleanType/input.ts.json index 40930bb1730c..3b96d9e7ce9c 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/voidOperator/voidOperatorWithBooleanType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/voidOperator/voidOperatorWithBooleanType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "BOOLEAN", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -65,7 +65,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -134,7 +133,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -160,7 +158,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -206,7 +203,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -279,7 +275,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -322,6 +317,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -338,8 +334,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -375,8 +370,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -393,7 +388,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -428,8 +422,8 @@ "ctxt": 0 }, "value": "ResultIsAny1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -447,7 +441,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } }, @@ -480,8 +473,8 @@ "ctxt": 0 }, "value": "ResultIsAny2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -530,8 +523,8 @@ "ctxt": 0 }, "value": "ResultIsAny3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -559,7 +552,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -582,7 +574,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -627,8 +618,8 @@ "ctxt": 0 }, "value": "ResultIsAny4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -653,7 +644,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -664,7 +654,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -699,8 +688,8 @@ "ctxt": 0 }, "value": "ResultIsAny5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -725,7 +714,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -736,7 +724,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -771,8 +758,8 @@ "ctxt": 0 }, "value": "ResultIsAny6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -797,7 +784,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -833,8 +819,8 @@ "ctxt": 0 }, "value": "ResultIsAny7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -866,7 +852,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -877,7 +862,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -915,8 +899,8 @@ "ctxt": 0 }, "value": "ResultIsAny8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -942,7 +926,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } } @@ -1000,7 +983,6 @@ "ctxt": 0 }, "value": "BOOLEAN", - "typeAnnotation": null, "optional": false } } @@ -1035,7 +1017,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1118,7 +1099,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1129,7 +1109,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1166,7 +1145,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1177,7 +1155,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/voidOperator/voidOperatorWithEnumType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/voidOperator/voidOperatorWithEnumType/input.ts.json index a934b56088be..833414342ea9 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/voidOperator/voidOperatorWithEnumType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/voidOperator/voidOperatorWithEnumType/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "members": [] @@ -53,7 +52,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "members": [ @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -92,7 +89,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -155,8 +151,8 @@ "ctxt": 0 }, "value": "ResultIsAny1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -174,7 +170,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } }, @@ -207,8 +202,8 @@ "ctxt": 0 }, "value": "ResultIsAny2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -226,7 +221,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false } }, @@ -259,8 +253,8 @@ "ctxt": 0 }, "value": "ResultIsAny3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -285,7 +279,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -334,8 +327,8 @@ "ctxt": 0 }, "value": "ResultIsAny4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -375,7 +368,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "property": { @@ -404,7 +396,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -455,8 +446,8 @@ "ctxt": 0 }, "value": "ResultIsAny5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -482,7 +473,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } } @@ -516,8 +506,8 @@ "ctxt": 0 }, "value": "ResultIsAny6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -573,7 +563,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false }, "property": { @@ -602,7 +591,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -613,7 +601,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -650,7 +637,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } } @@ -678,7 +664,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false } } @@ -713,7 +698,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false }, "property": { @@ -765,7 +749,6 @@ "ctxt": 0 }, "value": "ENUM", - "typeAnnotation": null, "optional": false } }, @@ -777,7 +760,6 @@ "ctxt": 0 }, "value": "ENUM1", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/voidOperator/voidOperatorWithNumberType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/voidOperator/voidOperatorWithNumberType/input.ts.json index 6324ed3f14cf..d2e5e3610d94 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/voidOperator/voidOperatorWithNumberType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/voidOperator/voidOperatorWithNumberType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "NUMBER", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "NUMBER1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +105,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -155,7 +155,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -224,7 +223,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -250,7 +248,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -296,7 +293,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -369,7 +365,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -412,6 +407,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -428,8 +424,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -465,8 +460,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -483,7 +478,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -518,8 +512,8 @@ "ctxt": 0 }, "value": "ResultIsAny1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -537,7 +531,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } }, @@ -570,8 +563,8 @@ "ctxt": 0 }, "value": "ResultIsAny2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -589,7 +582,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false } }, @@ -622,8 +614,8 @@ "ctxt": 0 }, "value": "ResultIsAny3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -672,8 +664,8 @@ "ctxt": 0 }, "value": "ResultIsAny4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -701,7 +693,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -724,7 +715,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -769,8 +759,8 @@ "ctxt": 0 }, "value": "ResultIsAny5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -798,7 +788,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -821,7 +810,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -840,6 +828,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -856,8 +845,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -883,7 +871,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -927,8 +914,8 @@ "ctxt": 0 }, "value": "ResultIsAny6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -953,7 +940,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -964,7 +950,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -999,8 +984,8 @@ "ctxt": 0 }, "value": "ResultIsAny7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1025,7 +1010,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1036,7 +1020,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1071,8 +1054,8 @@ "ctxt": 0 }, "value": "ResultIsAny8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1097,7 +1080,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1141,8 +1123,8 @@ "ctxt": 0 }, "value": "ResultIsAny9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1167,7 +1149,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1203,8 +1184,8 @@ "ctxt": 0 }, "value": "ResultIsAny10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1236,7 +1217,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1247,7 +1227,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1285,8 +1264,8 @@ "ctxt": 0 }, "value": "ResultIsAny11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1319,7 +1298,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, "right": { @@ -1330,7 +1308,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1365,8 +1342,8 @@ "ctxt": 0 }, "value": "ResultIsAny12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1392,7 +1369,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1426,8 +1402,8 @@ "ctxt": 0 }, "value": "ResultIsAny13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1476,7 +1452,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false }, "right": { @@ -1487,7 +1462,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1548,7 +1522,6 @@ "ctxt": 0 }, "value": "NUMBER", - "typeAnnotation": null, "optional": false } } @@ -1576,7 +1549,6 @@ "ctxt": 0 }, "value": "NUMBER1", - "typeAnnotation": null, "optional": false } } @@ -1611,7 +1583,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1649,7 +1620,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1660,7 +1630,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1697,7 +1666,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1708,7 +1676,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1753,7 +1720,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1764,7 +1730,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1785,7 +1750,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1796,7 +1760,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/voidOperator/voidOperatorWithStringType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/voidOperator/voidOperatorWithStringType/input.ts.json index c13b46d5e882..cc11c5dbf016 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/voidOperator/voidOperatorWithStringType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/unaryOperators/voidOperator/voidOperatorWithStringType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "STRING", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "STRING1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +105,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -165,7 +165,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -239,7 +238,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -265,7 +263,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -311,7 +308,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -389,7 +385,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -432,6 +427,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -448,8 +444,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -485,8 +480,8 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -503,7 +498,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -538,8 +532,8 @@ "ctxt": 0 }, "value": "ResultIsAny1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -557,7 +551,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } }, @@ -590,8 +583,8 @@ "ctxt": 0 }, "value": "ResultIsAny2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -609,7 +602,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false } }, @@ -642,8 +634,8 @@ "ctxt": 0 }, "value": "ResultIsAny3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -697,8 +689,8 @@ "ctxt": 0 }, "value": "ResultIsAny4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -726,7 +718,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -754,7 +745,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -804,8 +794,8 @@ "ctxt": 0 }, "value": "ResultIsAny5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -833,7 +823,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -861,7 +850,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -880,6 +868,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -896,8 +885,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -923,7 +911,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -967,8 +954,8 @@ "ctxt": 0 }, "value": "ResultIsAny6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -993,7 +980,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1004,7 +990,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1039,8 +1024,8 @@ "ctxt": 0 }, "value": "ResultIsAny7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1065,7 +1050,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1076,7 +1060,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1111,8 +1094,8 @@ "ctxt": 0 }, "value": "ResultIsAny8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1137,7 +1120,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1181,8 +1163,8 @@ "ctxt": 0 }, "value": "ResultIsAny9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1207,7 +1189,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1243,8 +1224,8 @@ "ctxt": 0 }, "value": "ResultIsAny10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1276,7 +1257,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1287,7 +1267,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1325,8 +1304,8 @@ "ctxt": 0 }, "value": "ResultIsAny11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1359,7 +1338,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "right": { @@ -1370,7 +1348,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -1405,8 +1382,8 @@ "ctxt": 0 }, "value": "ResultIsAny12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1438,7 +1415,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "property": { @@ -1449,7 +1425,6 @@ "ctxt": 0 }, "value": "charAt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1500,8 +1475,8 @@ "ctxt": 0 }, "value": "ResultIsAny13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1527,7 +1502,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -1561,8 +1535,8 @@ "ctxt": 0 }, "value": "ResultIsAny14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1611,7 +1585,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false }, "right": { @@ -1622,7 +1595,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -1688,7 +1660,6 @@ "ctxt": 0 }, "value": "STRING", - "typeAnnotation": null, "optional": false } } @@ -1716,7 +1687,6 @@ "ctxt": 0 }, "value": "STRING1", - "typeAnnotation": null, "optional": false } } @@ -1751,7 +1721,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1797,7 +1766,6 @@ "ctxt": 0 }, "value": "objA", - "typeAnnotation": null, "optional": false }, "property": { @@ -1808,7 +1776,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1829,7 +1796,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1840,7 +1806,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers/input.ts.json index 3687910b9469..73316daf3846 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -78,8 +78,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -122,7 +122,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -160,8 +159,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -209,7 +208,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -246,7 +244,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -289,6 +286,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -305,8 +303,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -347,7 +344,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -358,7 +354,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -411,7 +406,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } }, @@ -423,7 +417,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -476,7 +469,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -487,7 +479,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -534,7 +525,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -545,7 +535,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -603,7 +592,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } }, @@ -615,7 +603,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -673,7 +660,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -684,7 +670,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -729,8 +714,8 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -750,7 +735,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -797,7 +781,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } }, @@ -819,7 +802,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -853,7 +835,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -888,7 +869,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "body": { @@ -931,6 +911,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -947,8 +928,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -983,8 +963,8 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1004,7 +984,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1054,7 +1033,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1065,7 +1043,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1088,7 +1065,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1142,7 +1118,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false } }, @@ -1154,7 +1129,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1177,7 +1151,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1231,7 +1204,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1242,7 +1214,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1266,7 +1237,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1313,7 +1283,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1324,7 +1293,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1347,7 +1315,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1406,7 +1373,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false } }, @@ -1418,7 +1384,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1441,7 +1406,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1500,7 +1464,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1511,7 +1474,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1535,7 +1497,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1567,7 +1528,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1615,8 +1575,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1672,7 +1632,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false } }, @@ -1710,7 +1669,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1731,6 +1689,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1747,8 +1706,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -1767,6 +1725,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1798,7 +1757,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1826,8 +1784,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1868,8 +1825,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1912,7 +1869,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1950,8 +1906,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -1999,7 +1955,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2056,7 +2011,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -2068,7 +2022,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2121,7 +2074,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -2132,7 +2084,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2186,7 +2137,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -2198,7 +2148,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2256,7 +2205,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -2267,7 +2215,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2319,7 +2266,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -2386,7 +2332,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -2454,7 +2399,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -2515,7 +2459,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -2587,7 +2530,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -2660,7 +2602,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -2720,7 +2661,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -2739,7 +2679,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -2769,8 +2708,8 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2780,7 +2719,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2815,7 +2753,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false } }, @@ -2827,7 +2764,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2842,7 +2778,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2882,8 +2817,8 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2893,7 +2828,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2928,7 +2862,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -2940,7 +2873,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/expressions/valuesAndReferences/assignments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/expressions/valuesAndReferences/assignments/input.ts.json index 28b882dd6fa3..d383d422af03 100644 --- a/ecmascript/parser/tests/typescript/tsc/expressions/valuesAndReferences/assignments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/expressions/valuesAndReferences/assignments/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -59,8 +58,8 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -82,7 +81,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -122,8 +120,8 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -152,7 +150,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -171,7 +168,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -201,8 +197,8 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -244,7 +240,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -255,7 +250,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -280,7 +274,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -328,8 +321,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -366,8 +359,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -397,8 +390,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -420,7 +413,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -441,8 +433,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -483,8 +475,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -518,7 +510,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -557,8 +548,8 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/amdImportAsPrimaryExpression/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/amdImportAsPrimaryExpression/input.ts.json index 823e7ef86289..6c85636a2931 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/amdImportAsPrimaryExpression/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/amdImportAsPrimaryExpression/input.ts.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "members": [ @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -89,7 +86,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -114,7 +110,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -177,7 +172,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -188,7 +182,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -201,7 +194,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/amdImportNotAsPrimaryExpression/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/amdImportNotAsPrimaryExpression/input.ts.json index d8abf2516b32..28f1cba5553d 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/amdImportNotAsPrimaryExpression/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/amdImportNotAsPrimaryExpression/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "value": { @@ -87,7 +85,6 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, "optional": false }, "value": { @@ -140,7 +137,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -170,7 +166,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -212,7 +207,6 @@ "ctxt": 0 }, "value": "age", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -266,7 +260,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false }, "body": { @@ -299,7 +292,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -329,7 +321,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -387,7 +378,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "members": [ @@ -406,7 +396,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -426,7 +415,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -446,7 +434,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -471,7 +458,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -514,7 +500,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -527,7 +512,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "right": { @@ -538,7 +522,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false } } @@ -568,6 +551,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -592,7 +576,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -603,14 +586,12 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -642,6 +623,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -666,7 +648,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "right": { @@ -677,14 +658,12 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "TsTypeAssertion", @@ -726,7 +705,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -784,6 +762,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -810,7 +789,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "right": { @@ -821,7 +799,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false } }, @@ -833,13 +810,11 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": { "type": "BooleanLiteral", @@ -879,6 +854,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -905,7 +881,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "right": { @@ -916,7 +891,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false } }, @@ -928,14 +902,12 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -967,6 +939,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -983,8 +956,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "TsTypeAssertion", @@ -1019,7 +991,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "right": { @@ -1030,7 +1001,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/asiPreventsParsingAsAmbientExternalModule01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/asiPreventsParsingAsAmbientExternalModule01/input.ts.json index 90595677f0e4..10628dd7d057 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/asiPreventsParsingAsAmbientExternalModule01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/asiPreventsParsingAsAmbientExternalModule01/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "declare", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "module", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/asiPreventsParsingAsAmbientExternalModule02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/asiPreventsParsingAsAmbientExternalModule02/input.ts.json index 214a29ae6574..ad62658b015a 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/asiPreventsParsingAsAmbientExternalModule02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/asiPreventsParsingAsAmbientExternalModule02/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "declare", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "module", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -121,7 +121,6 @@ "ctxt": 0 }, "value": "container", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/circularReference/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/circularReference/input.ts.json index edcc3aeda492..0f115193b5e5 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/circularReference/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/circularReference/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false }, "body": { @@ -101,7 +99,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -127,7 +124,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "value": null, @@ -157,7 +153,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "right": { @@ -168,7 +163,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false } }, @@ -180,7 +174,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false } }, @@ -212,7 +205,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -308,7 +299,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -342,7 +332,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "property": { @@ -353,7 +342,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -366,7 +354,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -421,7 +408,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -434,7 +420,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -495,7 +480,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -508,7 +492,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -558,7 +541,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -608,7 +590,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false }, "body": { @@ -636,7 +617,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -662,7 +642,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "value": null, @@ -692,7 +671,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "right": { @@ -703,7 +681,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false } }, @@ -715,7 +692,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false } }, @@ -747,7 +723,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -793,7 +768,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -843,7 +817,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -877,7 +850,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "property": { @@ -888,7 +860,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -901,7 +872,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -956,7 +926,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -969,7 +938,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1030,7 +998,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1043,7 +1010,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1084,8 +1050,8 @@ "ctxt": 0 }, "value": "tmp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1109,7 +1075,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1120,7 +1085,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1162,7 +1126,6 @@ "ctxt": 0 }, "value": "tmp", - "typeAnnotation": null, "optional": false }, "property": { @@ -1173,7 +1136,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1219,7 +1181,6 @@ "ctxt": 0 }, "value": "tmp", - "typeAnnotation": null, "optional": false }, "property": { @@ -1230,7 +1191,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/commonJSImportAsPrimaryExpression/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/commonJSImportAsPrimaryExpression/input.ts.json index 0f6500f0c70c..7bffc20c97eb 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/commonJSImportAsPrimaryExpression/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/commonJSImportAsPrimaryExpression/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "value": { @@ -87,7 +85,6 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, "optional": false }, "value": { @@ -135,7 +132,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -190,7 +186,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -201,7 +196,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -214,7 +208,6 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/commonJSImportNotAsPrimaryExpression/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/commonJSImportNotAsPrimaryExpression/input.ts.json index 34ae9bef7e78..cc118abee892 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/commonJSImportNotAsPrimaryExpression/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/commonJSImportNotAsPrimaryExpression/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "value": { @@ -87,7 +85,6 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, "optional": false }, "value": { @@ -140,7 +137,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -170,7 +166,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -212,7 +207,6 @@ "ctxt": 0 }, "value": "age", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -266,7 +260,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false }, "body": { @@ -299,7 +292,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -329,7 +321,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -387,7 +378,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "members": [ @@ -406,7 +396,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -426,7 +415,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -446,7 +434,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -471,7 +458,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -514,7 +500,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -527,7 +512,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "right": { @@ -538,7 +522,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false } } @@ -568,6 +551,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -592,7 +576,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -603,14 +586,12 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -642,6 +623,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -666,7 +648,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "right": { @@ -677,14 +658,12 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "TsTypeAssertion", @@ -726,7 +705,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -784,6 +762,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -810,7 +789,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "right": { @@ -821,7 +799,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false } }, @@ -833,13 +810,11 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": { "type": "BooleanLiteral", @@ -879,6 +854,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -905,7 +881,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "right": { @@ -916,7 +891,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false } }, @@ -928,14 +902,12 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -967,6 +939,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -983,8 +956,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "TsTypeAssertion", @@ -1019,7 +991,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "right": { @@ -1030,7 +1001,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/duplicateExportAssignments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/duplicateExportAssignments/input.ts.json index 6dd6bbb616ea..28229945b4ae 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/duplicateExportAssignments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/duplicateExportAssignments/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -103,7 +103,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -122,7 +121,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -151,8 +149,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -177,7 +175,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -217,7 +214,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -236,7 +232,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -257,7 +252,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "body": { @@ -300,8 +294,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -330,7 +324,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -356,7 +349,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -409,7 +401,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -428,7 +419,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -447,7 +437,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -461,7 +450,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -514,7 +502,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -572,7 +559,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -601,8 +587,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -642,8 +628,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -688,8 +674,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -719,7 +705,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -738,7 +723,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -757,7 +741,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekind/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekind/input.ts.json index 954a2ffc8cd0..070adcb32b8a 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekind/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekind/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "span": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindExportClassNameWithObject/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindExportClassNameWithObject/input.ts.json index 731b0a874060..7213f1ef9fea 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindExportClassNameWithObject/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindExportClassNameWithObject/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES2015Target/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES2015Target/input.ts.json index a788fad93774..4bba50cd1e33 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES2015Target/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES2015Target/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "span": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target10/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target10/input.ts.json index 47a5cb2213a7..00714942824e 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target10/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target10/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -66,7 +65,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target12/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target12/input.ts.json index d1349d6d121b..326662365828 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target12/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target12/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -65,7 +64,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "body": { @@ -108,8 +106,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -153,7 +151,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -172,7 +169,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false }, "init": { @@ -212,7 +208,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -231,7 +226,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "init": { @@ -271,7 +265,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "body": { @@ -314,8 +307,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -359,7 +352,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "body": { @@ -402,8 +394,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -447,7 +439,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { @@ -485,7 +476,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { @@ -528,8 +518,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -566,7 +556,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -616,7 +605,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "body": { @@ -659,8 +647,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target2/input.ts.json index 2fb834935b7e..547aec073b02 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target2/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "span": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": { @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -124,7 +121,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target4/input.ts.json index 12a331fac0a3..968c4c7a0436 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target5/input.ts.json index eade812a9450..5060ba8a6226 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target5/input.ts.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "members": [ @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "value1", - "typeAnnotation": null, "optional": false }, "init": null @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "members": [ @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "value1", - "typeAnnotation": null, "optional": false }, "init": null diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target6/input.ts.json index 681c209fbd25..605bb4b4d99d 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target6/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,8 +50,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -105,7 +104,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -138,8 +136,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -183,7 +181,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "params": [ @@ -210,8 +207,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target7/input.ts.json index 09e24597dd47..d72d51ef520e 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target7/input.ts.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { @@ -66,8 +65,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -110,7 +109,6 @@ "ctxt": 0 }, "value": "N2", - "typeAnnotation": null, "optional": false }, "body": { @@ -143,7 +141,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target8/input.ts.json index 2da296620816..bf2cc6889383 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target8/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -87,8 +87,8 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target9/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target9/input.ts.json index 797602636c81..563bce0812d6 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target9/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/es6/es6modulekindWithES5Target9/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -74,7 +73,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "imported": null @@ -120,7 +118,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } } @@ -165,7 +162,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "exported": null @@ -198,7 +194,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "exported": null @@ -231,7 +226,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "exported": null @@ -287,7 +281,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "exported": null @@ -325,7 +318,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekind/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekind/input.ts.json index a788fad93774..4bba50cd1e33 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekind/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekind/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "span": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES2015Target/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES2015Target/input.ts.json index a788fad93774..4bba50cd1e33 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES2015Target/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES2015Target/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "span": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target10/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target10/input.ts.json index 47a5cb2213a7..00714942824e 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target10/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target10/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -66,7 +65,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target12/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target12/input.ts.json index d1349d6d121b..326662365828 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target12/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target12/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -65,7 +64,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "body": { @@ -108,8 +106,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -153,7 +151,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -172,7 +169,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false }, "init": { @@ -212,7 +208,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -231,7 +226,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "init": { @@ -271,7 +265,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "body": { @@ -314,8 +307,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -359,7 +352,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "body": { @@ -402,8 +394,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -447,7 +439,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { @@ -485,7 +476,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { @@ -528,8 +518,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -566,7 +556,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -616,7 +605,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "body": { @@ -659,8 +647,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target2/input.ts.json index 2fb834935b7e..547aec073b02 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target2/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "span": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": { @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -124,7 +121,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target4/input.ts.json index 12a331fac0a3..968c4c7a0436 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target5/input.ts.json index eade812a9450..5060ba8a6226 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target5/input.ts.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "members": [ @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "value1", - "typeAnnotation": null, "optional": false }, "init": null @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "members": [ @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "value1", - "typeAnnotation": null, "optional": false }, "init": null diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target6/input.ts.json index 681c209fbd25..605bb4b4d99d 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target6/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,8 +50,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -105,7 +104,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -138,8 +136,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -183,7 +181,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "params": [ @@ -210,8 +207,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target7/input.ts.json index 09e24597dd47..d72d51ef520e 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target7/input.ts.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { @@ -66,8 +65,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -110,7 +109,6 @@ "ctxt": 0 }, "value": "N2", - "typeAnnotation": null, "optional": false }, "body": { @@ -143,7 +141,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target8/input.ts.json index 2da296620816..bf2cc6889383 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target8/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -87,8 +87,8 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target9/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target9/input.ts.json index 797602636c81..563bce0812d6 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target9/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/esnextmodulekindWithES5Target9/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -74,7 +73,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "imported": null @@ -120,7 +118,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } } @@ -165,7 +162,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "exported": null @@ -198,7 +194,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "exported": null @@ -231,7 +226,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "exported": null @@ -287,7 +281,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "exported": null @@ -325,7 +318,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/exnextmodulekindExportClassNameWithObject/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/exnextmodulekindExportClassNameWithObject/input.ts.json index 731b0a874060..7213f1ef9fea 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/exnextmodulekindExportClassNameWithObject/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/esnext/exnextmodulekindExportClassNameWithObject/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAmbientClassNameWithObject/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAmbientClassNameWithObject/input.ts.json index 5aac46018ebc..6e629677c038 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAmbientClassNameWithObject/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAmbientClassNameWithObject/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "declare": true, diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignDottedName/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignDottedName/input.ts.json index b3b41814c608..9e10c2a0a20a 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignDottedName/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignDottedName/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -84,7 +83,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -132,7 +130,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "property": { @@ -143,7 +140,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignImportedIdentifier/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignImportedIdentifier/input.ts.json index 57ba835763e2..3db86c305c08 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignImportedIdentifier/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignImportedIdentifier/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -84,7 +83,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -135,8 +133,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -153,7 +151,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "property": { @@ -164,7 +161,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -188,7 +184,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -209,7 +204,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -260,8 +254,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -278,7 +272,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignTypes/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignTypes/input.ts.json index 60454de8ea00..7a3ee241950f 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignTypes/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignTypes/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -67,7 +67,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -96,8 +95,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -127,7 +126,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -156,8 +154,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -187,7 +185,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -216,8 +213,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -272,7 +269,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -301,8 +297,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -322,7 +318,6 @@ "ctxt": 0 }, "value": "answer", - "typeAnnotation": null, "optional": false }, "value": { @@ -345,7 +340,6 @@ "ctxt": 0 }, "value": "when", - "typeAnnotation": null, "optional": false }, "value": { @@ -379,7 +373,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -408,8 +401,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -431,7 +424,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -445,7 +437,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -466,6 +457,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -488,13 +480,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -527,7 +517,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -558,7 +547,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -583,7 +571,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -604,7 +591,6 @@ "ctxt": 0 }, "value": "iString", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -655,6 +641,7 @@ "ctxt": 0 }, "value": "v1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -671,8 +658,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -682,7 +668,6 @@ "ctxt": 0 }, "value": "iString", - "typeAnnotation": null, "optional": false }, "definite": false @@ -706,7 +691,6 @@ "ctxt": 0 }, "value": "iNumber", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -757,6 +741,7 @@ "ctxt": 0 }, "value": "v2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -773,8 +758,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -784,7 +768,6 @@ "ctxt": 0 }, "value": "iNumber", - "typeAnnotation": null, "optional": false }, "definite": false @@ -808,7 +791,6 @@ "ctxt": 0 }, "value": "iBoolean", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -859,6 +841,7 @@ "ctxt": 0 }, "value": "v3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -875,8 +858,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -886,7 +868,6 @@ "ctxt": 0 }, "value": "iBoolean", - "typeAnnotation": null, "optional": false }, "definite": false @@ -910,7 +891,6 @@ "ctxt": 0 }, "value": "iArray", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -961,6 +941,7 @@ "ctxt": 0 }, "value": "v4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -983,7 +964,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1006,8 +986,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1017,7 +996,6 @@ "ctxt": 0 }, "value": "iArray", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1041,7 +1019,6 @@ "ctxt": 0 }, "value": "iObject", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -1092,6 +1069,7 @@ "ctxt": 0 }, "value": "v5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1114,13 +1092,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1130,7 +1106,6 @@ "ctxt": 0 }, "value": "iObject", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1154,7 +1129,6 @@ "ctxt": 0 }, "value": "iAny", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -1205,8 +1179,8 @@ "ctxt": 0 }, "value": "v6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1216,7 +1190,6 @@ "ctxt": 0 }, "value": "iAny", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1240,7 +1213,6 @@ "ctxt": 0 }, "value": "iGeneric", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -1291,6 +1263,7 @@ "ctxt": 0 }, "value": "v7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1322,6 +1295,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1344,13 +1318,11 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1375,7 +1347,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1404,7 +1375,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1415,8 +1385,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1426,7 +1395,6 @@ "ctxt": 0 }, "value": "iGeneric", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentAndDeclaration/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentAndDeclaration/input.ts.json index fdec820c710f..e5cb3b2116dc 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentAndDeclaration/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentAndDeclaration/input.ts.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "members": [ @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -89,7 +86,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -107,7 +103,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -139,7 +134,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentCircularModules/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentCircularModules/input.ts.json index 680170a3acdd..b1c76f456c73 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentCircularModules/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentCircularModules/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -66,7 +65,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "body": { @@ -109,8 +107,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -127,7 +125,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "property": { @@ -138,7 +135,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -166,7 +162,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } }, @@ -187,7 +182,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -230,7 +224,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "body": { @@ -273,8 +266,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -291,7 +284,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "property": { @@ -302,7 +294,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -330,7 +321,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } }, @@ -351,7 +341,6 @@ "ctxt": 0 }, "value": "foo0", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -394,7 +383,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "body": { @@ -437,8 +425,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -455,7 +443,6 @@ "ctxt": 0 }, "value": "foo0", - "typeAnnotation": null, "optional": false }, "property": { @@ -466,7 +453,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -494,7 +480,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentConstrainedGenericType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentConstrainedGenericType/input.ts.json index f040ac1924b2..ad558f9ac5e8 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentConstrainedGenericType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentConstrainedGenericType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -99,7 +96,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -119,6 +115,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -141,13 +138,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -189,7 +184,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -216,7 +210,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -258,7 +251,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -308,7 +300,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } }, @@ -329,7 +320,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -380,8 +370,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -398,7 +388,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -446,8 +435,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -464,7 +453,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -488,7 +476,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -516,7 +503,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -564,6 +550,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -580,8 +567,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -605,7 +591,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -616,7 +601,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "computed": false @@ -629,7 +613,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentGenericType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentGenericType/input.ts.json index 7410a0a4d244..de92b6599f67 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentGenericType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentGenericType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -136,7 +132,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } }, @@ -157,7 +152,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -208,8 +202,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -226,7 +220,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -279,6 +272,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -295,8 +289,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -313,7 +306,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -324,7 +316,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentMergedInterface/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentMergedInterface/input.ts.json index 4e8e28eb67fa..fec5e27dab9f 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentMergedInterface/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentMergedInterface/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,6 +50,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -67,8 +67,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -106,7 +105,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -150,7 +148,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -180,6 +177,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -196,8 +194,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -235,7 +232,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -277,7 +273,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -315,7 +310,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -357,7 +351,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -406,7 +399,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } }, @@ -427,7 +419,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -478,6 +469,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -500,13 +492,11 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -535,7 +525,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -582,7 +571,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -627,6 +615,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -643,8 +632,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -661,7 +649,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -672,7 +659,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -719,7 +705,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -730,7 +715,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -773,8 +757,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -794,7 +778,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -817,7 +800,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -859,8 +841,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -877,7 +859,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -888,7 +869,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentMergedModule/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentMergedModule/input.ts.json index 76a52ec8c458..512e09795c30 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentMergedModule/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentMergedModule/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -127,8 +125,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -164,7 +162,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "body": { @@ -192,7 +189,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -213,6 +209,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -229,8 +226,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -263,7 +259,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -299,7 +294,6 @@ "ctxt": 0 }, "value": "Test", - "typeAnnotation": null, "optional": false }, "body": { @@ -342,8 +336,8 @@ "ctxt": 0 }, "value": "answer", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -381,7 +375,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } }, @@ -402,7 +395,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -453,6 +445,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -469,8 +462,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -494,7 +486,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -505,7 +496,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -555,7 +545,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -566,7 +555,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -618,7 +606,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -629,7 +616,6 @@ "ctxt": 0 }, "value": "Test", - "typeAnnotation": null, "optional": false }, "computed": false @@ -642,7 +628,6 @@ "ctxt": 0 }, "value": "answer", - "typeAnnotation": null, "optional": false }, "computed": false @@ -669,7 +654,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -680,7 +664,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentOfExportNamespaceWithDefault/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentOfExportNamespaceWithDefault/input.ts.json index 451c70a72b4e..9195ece6ec70 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentOfExportNamespaceWithDefault/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentOfExportNamespaceWithDefault/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -128,7 +126,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -186,7 +183,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "body": { @@ -222,6 +218,7 @@ "ctxt": 0 }, "value": "_a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -244,12 +241,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -279,7 +274,6 @@ "ctxt": 0 }, "value": "_a", - "typeAnnotation": null, "optional": false }, "exported": { @@ -290,7 +284,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false } } @@ -318,7 +311,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -379,7 +371,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "imported": null @@ -417,7 +408,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentTopLevelClodule/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentTopLevelClodule/input.ts.json index 48539850bc6e..39b39f4f4133 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentTopLevelClodule/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentTopLevelClodule/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "value": { @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "body": { @@ -137,8 +134,8 @@ "ctxt": 0 }, "value": "answer", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -172,7 +169,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } }, @@ -193,7 +189,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -249,7 +244,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -260,7 +254,6 @@ "ctxt": 0 }, "value": "answer", - "typeAnnotation": null, "optional": false }, "computed": false @@ -308,8 +301,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -326,7 +319,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentTopLevelEnumdule/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentTopLevelEnumdule/input.ts.json index 885eb3c12987..92e4a0abd13d 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentTopLevelEnumdule/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentTopLevelEnumdule/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "red", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "green", - "typeAnnotation": null, "optional": false }, "init": null @@ -82,7 +79,6 @@ "ctxt": 0 }, "value": "blue", - "typeAnnotation": null, "optional": false }, "init": null @@ -106,7 +102,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "body": { @@ -149,8 +144,8 @@ "ctxt": 0 }, "value": "answer", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -205,7 +199,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -256,6 +249,7 @@ "ctxt": 0 }, "value": "color", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -278,13 +272,11 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -314,7 +306,6 @@ "ctxt": 0 }, "value": "color", - "typeAnnotation": null, "optional": false }, "right": { @@ -332,7 +323,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -343,7 +333,6 @@ "ctxt": 0 }, "value": "green", - "typeAnnotation": null, "optional": false }, "computed": false @@ -380,8 +369,8 @@ "ctxt": 0 }, "value": "color", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -398,7 +387,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -409,7 +397,6 @@ "ctxt": 0 }, "value": "answer", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentTopLevelFundule/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentTopLevelFundule/input.ts.json index c125d371eac2..66b06c21d03d 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentTopLevelFundule/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentTopLevelFundule/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -81,7 +80,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "body": { @@ -124,8 +122,8 @@ "ctxt": 0 }, "value": "answer", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -159,7 +157,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -180,7 +177,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -236,7 +232,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -247,7 +242,6 @@ "ctxt": 0 }, "value": "answer", - "typeAnnotation": null, "optional": false }, "computed": false @@ -295,8 +289,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -313,7 +307,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentTopLevelIdentifier/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentTopLevelIdentifier/input.ts.json index 7827f0260c61..7a48628db23e 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentTopLevelIdentifier/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/exportAssignmentTopLevelIdentifier/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "body": { @@ -66,8 +65,8 @@ "ctxt": 0 }, "value": "answer", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -101,7 +100,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } }, @@ -122,7 +120,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -178,7 +175,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -189,7 +185,6 @@ "ctxt": 0 }, "value": "answer", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/exportClassNameWithObjectAMD/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/exportClassNameWithObjectAMD/input.ts.json index ac3ae9e38276..b8d7ca532683 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/exportClassNameWithObjectAMD/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/exportClassNameWithObjectAMD/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/exportClassNameWithObjectCommonJS/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/exportClassNameWithObjectCommonJS/input.ts.json index 6e71fdf90ece..44299127e688 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/exportClassNameWithObjectCommonJS/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/exportClassNameWithObjectCommonJS/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/exportClassNameWithObjectSystem/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/exportClassNameWithObjectSystem/input.ts.json index 731b0a874060..7213f1ef9fea 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/exportClassNameWithObjectSystem/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/exportClassNameWithObjectSystem/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/exportClassNameWithObjectUMD/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/exportClassNameWithObjectUMD/input.ts.json index ac3ae9e38276..b8d7ca532683 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/exportClassNameWithObjectUMD/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/exportClassNameWithObjectUMD/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/exportDeclaredModule/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/exportDeclaredModule/input.ts.json index 5593c2cc271d..8cf6fab947b6 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/exportDeclaredModule/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/exportDeclaredModule/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false }, "body": { @@ -66,6 +65,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -82,8 +82,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -108,7 +107,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -160,7 +158,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false } }, @@ -181,7 +178,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -232,6 +228,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -248,8 +245,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -273,7 +269,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "property": { @@ -284,7 +279,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/exportDefaultClassNameWithObject/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/exportDefaultClassNameWithObject/input.ts.json index 7ce3eb8d90b2..e5996cb02f85 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/exportDefaultClassNameWithObject/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/exportDefaultClassNameWithObject/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/exportNonLocalDeclarations/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/exportNonLocalDeclarations/input.ts.json index cc05f85fda64..78f3d342222d 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/exportNonLocalDeclarations/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/exportNonLocalDeclarations/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "string", - "typeAnnotation": null, "optional": false }, "exported": null @@ -62,7 +61,6 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, "optional": false }, "exported": null diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/exportNonVisibleType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/exportNonVisibleType/input.ts.json index 7d15bff54440..03b4c3fe6e94 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/exportNonVisibleType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/exportNonVisibleType/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -147,6 +144,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -169,13 +167,11 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -195,7 +191,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -223,7 +218,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -257,7 +251,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -276,7 +269,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -306,7 +298,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -348,7 +339,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -387,7 +377,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -413,7 +402,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "value": null, @@ -439,7 +427,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -477,7 +464,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false } }, @@ -496,7 +482,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -526,7 +511,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -568,7 +552,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -607,7 +590,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -633,7 +615,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "value": null, @@ -659,7 +640,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -697,7 +677,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/globalAugmentationModuleResolution/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/globalAugmentationModuleResolution/input.ts.json index 6b084fd3e53a..24b2326252d5 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/globalAugmentationModuleResolution/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/globalAugmentationModuleResolution/input.ts.json @@ -35,7 +35,6 @@ "ctxt": 0 }, "value": "global", - "typeAnnotation": null, "optional": false }, "body": { @@ -71,6 +70,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -87,8 +87,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/importImportOnlyModule/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/importImportOnlyModule/input.ts.json index 821dfbc8a64d..c12682ccc332 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/importImportOnlyModule/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/importImportOnlyModule/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "value": { @@ -87,7 +85,6 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, "optional": false }, "value": { @@ -135,7 +132,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -186,8 +182,8 @@ "ctxt": 0 }, "value": "answer", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -219,7 +215,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -270,8 +265,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -281,7 +276,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/importNonExternalModule/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/importNonExternalModule/input.ts.json index 3f3d660cec6a..c56b9606989c 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/importNonExternalModule/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/importNonExternalModule/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "body": { @@ -66,8 +65,8 @@ "ctxt": 0 }, "value": "answer", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -103,7 +102,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -159,7 +157,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -170,7 +167,6 @@ "ctxt": 0 }, "value": "answer", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/importTsBeforeDTs/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/importTsBeforeDTs/input.ts.json index aa839a32320d..1a08f5f9b024 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/importTsBeforeDTs/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/importTsBeforeDTs/input.ts.json @@ -38,6 +38,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,8 +55,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -103,6 +103,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -119,8 +120,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -153,7 +153,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -204,8 +203,8 @@ "ctxt": 0 }, "value": "z1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -230,7 +229,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -241,7 +239,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -285,8 +282,8 @@ "ctxt": 0 }, "value": "z2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -311,7 +308,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -322,7 +318,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/importsImplicitlyReadonly/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/importsImplicitlyReadonly/input.ts.json index ad96d5747f12..05b4a57d595a 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/importsImplicitlyReadonly/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/importsImplicitlyReadonly/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -80,8 +80,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -119,7 +119,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "exported": null @@ -152,7 +151,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "imported": null @@ -172,7 +170,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "imported": null @@ -218,7 +215,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } } @@ -257,7 +253,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -308,8 +303,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -319,7 +314,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -349,8 +343,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -386,8 +380,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -430,7 +424,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "property": { @@ -441,7 +434,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -487,7 +479,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "property": { @@ -498,7 +489,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -544,7 +534,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "property": { @@ -555,7 +544,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -601,7 +589,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "property": { @@ -612,7 +599,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -658,7 +644,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "property": { @@ -669,7 +654,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -715,7 +699,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "property": { @@ -726,7 +709,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/moduleResolutionWithExtensions/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/moduleResolutionWithExtensions/input.ts.json index 59188f8a32c4..abae5688a748 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/moduleResolutionWithExtensions/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/moduleResolutionWithExtensions/input.ts.json @@ -46,7 +46,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -91,7 +90,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -138,6 +136,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -154,8 +153,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -177,7 +175,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -204,7 +201,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false } } @@ -249,7 +245,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/moduleScoping/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/moduleScoping/input.ts.json index 6e939894a816..61f34de4aed0 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/moduleScoping/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/moduleScoping/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -77,8 +77,8 @@ "ctxt": 0 }, "value": "v2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -118,8 +118,8 @@ "ctxt": 0 }, "value": "v4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -179,8 +179,8 @@ "ctxt": 0 }, "value": "v3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -221,8 +221,8 @@ "ctxt": 0 }, "value": "v2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -291,7 +291,6 @@ "ctxt": 0 }, "value": "file3", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -342,8 +341,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -353,7 +352,6 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -385,8 +383,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -396,7 +394,6 @@ "ctxt": 0 }, "value": "v2", - "typeAnnotation": null, "optional": false }, "definite": false @@ -428,8 +425,8 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -446,7 +443,6 @@ "ctxt": 0 }, "value": "file3", - "typeAnnotation": null, "optional": false }, "property": { @@ -457,7 +453,6 @@ "ctxt": 0 }, "value": "v3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -491,8 +486,8 @@ "ctxt": 0 }, "value": "v4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -512,7 +507,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -535,7 +529,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -546,7 +539,6 @@ "ctxt": 0 }, "value": "NaN", - "typeAnnotation": null, "optional": false } } @@ -581,8 +573,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -592,7 +584,6 @@ "ctxt": 0 }, "value": "v2", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/multipleExportDefault1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/multipleExportDefault1/input.ts.json index 14189600da93..2efcd845e239 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/multipleExportDefault1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/multipleExportDefault1/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "params": [], @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "uhoh", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/multipleExportDefault2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/multipleExportDefault2/input.ts.json index 83f602d9cfef..8b6508bc17c4 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/multipleExportDefault2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/multipleExportDefault2/input.ts.json @@ -31,7 +31,6 @@ "ctxt": 0 }, "value": "uhoh", - "typeAnnotation": null, "optional": false }, "value": { @@ -69,7 +68,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/multipleExportDefault3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/multipleExportDefault3/input.ts.json index 51d79f9c9b5a..8f87cc159c50 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/multipleExportDefault3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/multipleExportDefault3/input.ts.json @@ -31,7 +31,6 @@ "ctxt": 0 }, "value": "uhoh", - "typeAnnotation": null, "optional": false }, "value": { @@ -69,7 +68,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/multipleExportDefault4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/multipleExportDefault4/input.ts.json index b6c4ae088647..7a677c7d28a4 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/multipleExportDefault4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/multipleExportDefault4/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "span": { @@ -65,7 +64,6 @@ "ctxt": 0 }, "value": "uhoh", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/multipleExportDefault5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/multipleExportDefault5/input.ts.json index d70d5f9aebf9..e231fc443cea 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/multipleExportDefault5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/multipleExportDefault5/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "params": [], @@ -65,7 +64,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/multipleExportDefault6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/multipleExportDefault6/input.ts.json index bcd6c851fb12..45c5a8a0ecc8 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/multipleExportDefault6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/multipleExportDefault6/input.ts.json @@ -31,7 +31,6 @@ "ctxt": 0 }, "value": "lol", - "typeAnnotation": null, "optional": false }, "value": { @@ -72,7 +71,6 @@ "ctxt": 0 }, "value": "lol", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/nameDelimitedBySlashes/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/nameDelimitedBySlashes/input.ts.json index ea11f98424ab..b3b39c238719 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/nameDelimitedBySlashes/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/nameDelimitedBySlashes/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,7 +72,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -123,8 +122,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -149,7 +148,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -160,7 +158,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/nameWithFileExtension/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/nameWithFileExtension/input.ts.json index e3ae6c8f924d..2c1b2e1747b9 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/nameWithFileExtension/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/nameWithFileExtension/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,7 +72,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -123,8 +122,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -149,7 +148,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -160,7 +158,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/nameWithRelativePaths/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/nameWithRelativePaths/input.ts.json index b4891c20a03b..ca926cc2dc2c 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/nameWithRelativePaths/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/nameWithRelativePaths/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,7 +72,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -140,7 +139,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -183,8 +181,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -221,7 +219,6 @@ "ctxt": 0 }, "value": "foo0", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -264,7 +261,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -307,7 +303,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -362,7 +357,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "property": { @@ -373,7 +367,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -386,7 +379,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -424,8 +416,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -450,7 +442,6 @@ "ctxt": 0 }, "value": "foo0", - "typeAnnotation": null, "optional": false }, "property": { @@ -461,7 +452,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -488,7 +478,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "property": { @@ -499,7 +488,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/reexportClassDefinition/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/reexportClassDefinition/input.ts.json index 258a8b2c0a23..7d90754a9c51 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/reexportClassDefinition/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/reexportClassDefinition/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -120,7 +117,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false } } @@ -155,7 +150,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -191,7 +185,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -217,7 +210,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "property": { @@ -228,7 +220,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/relativePathMustResolve/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/relativePathMustResolve/input.ts.json index e74f3830a1b6..5779a61e02af 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/relativePathMustResolve/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/relativePathMustResolve/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,7 +72,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -123,8 +122,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -149,7 +148,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -160,7 +158,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/relativePathToDeclarationFile/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/relativePathToDeclarationFile/input.ts.json index 825e090f98ef..5a57ee8b4a6a 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/relativePathToDeclarationFile/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/relativePathToDeclarationFile/input.ts.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -73,6 +72,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -89,8 +89,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -126,7 +125,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -169,6 +167,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -185,8 +184,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -208,7 +206,6 @@ "ctxt": 0 }, "value": "Test", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -234,7 +231,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -254,6 +250,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -270,8 +267,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -301,7 +297,6 @@ "ctxt": 0 }, "value": "Test", - "typeAnnotation": null, "optional": false } }, @@ -322,7 +317,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -365,7 +359,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -408,7 +401,6 @@ "ctxt": 0 }, "value": "relMod", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -463,7 +455,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -474,7 +465,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -487,7 +477,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -525,8 +514,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -543,7 +532,6 @@ "ctxt": 0 }, "value": "relMod", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -585,7 +573,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "property": { @@ -596,7 +583,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -609,7 +595,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -622,7 +607,6 @@ "ctxt": 0 }, "value": "charCodeAt", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/topLevelAmbientModule/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/topLevelAmbientModule/input.ts.json index 62311209ccf2..03a274de2655 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/topLevelAmbientModule/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/topLevelAmbientModule/input.ts.json @@ -69,6 +69,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -85,8 +86,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -114,7 +114,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -165,8 +164,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -191,7 +190,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -202,7 +200,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/topLevelAwait.3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/topLevelAwait.3/input.ts.json index 99fe8d27df59..7500cad19ad5 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/topLevelAwait.3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/topLevelAwait.3/input.ts.json @@ -43,6 +43,7 @@ "ctxt": 0 }, "value": "await", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,8 +60,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -96,7 +95,6 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/topLevelFileModule/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/topLevelFileModule/input.ts.json index c2f1a3c42dcf..6c20e2e0e635 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/topLevelFileModule/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/topLevelFileModule/input.ts.json @@ -38,6 +38,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,8 +55,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -95,6 +95,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -111,8 +112,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -137,7 +137,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -180,7 +179,6 @@ "ctxt": 0 }, "value": "fum", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -231,8 +229,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -257,7 +255,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -268,7 +265,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -288,7 +284,6 @@ "ctxt": 0 }, "value": "fum", - "typeAnnotation": null, "optional": false }, "property": { @@ -299,7 +294,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/topLevelFileModuleMissing/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/topLevelFileModuleMissing/input.ts.json index 48e9d462f566..9711ed03bad6 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/topLevelFileModuleMissing/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/topLevelFileModuleMissing/input.ts.json @@ -38,6 +38,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,8 +55,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,7 +80,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -131,8 +130,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -157,7 +156,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -168,7 +166,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/topLevelModuleDeclarationAndFile/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/topLevelModuleDeclarationAndFile/input.ts.json index 7764410f8e83..8c951bf1d2a5 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/topLevelModuleDeclarationAndFile/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/topLevelModuleDeclarationAndFile/input.ts.json @@ -38,6 +38,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,8 +55,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -134,6 +134,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -168,8 +169,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -197,7 +197,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -248,8 +247,8 @@ "ctxt": 0 }, "value": "z1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -274,7 +273,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -285,7 +283,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -329,8 +326,8 @@ "ctxt": 0 }, "value": "z2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -362,7 +359,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -373,7 +369,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/ambient/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/ambient/input.ts.json index 7860011c0cd3..9e664f822805 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/ambient/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/ambient/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -111,7 +109,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "imported": null @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -163,7 +159,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -188,7 +183,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "body": { @@ -209,7 +203,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -228,7 +221,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/chained/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/chained/input.ts.json index 2ce2c4c76213..26d3e32960f7 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/chained/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/chained/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -103,7 +101,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "exported": { @@ -114,7 +111,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } } @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -165,7 +160,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -195,7 +189,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "imported": { @@ -206,7 +199,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false } } @@ -251,7 +243,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "exported": { @@ -262,7 +253,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } @@ -307,7 +297,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "imported": null @@ -353,7 +342,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "exported": { @@ -364,7 +352,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false } } @@ -396,7 +383,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "imported": null @@ -441,7 +427,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -473,6 +458,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -495,13 +481,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/chained2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/chained2/input.ts.json index e1ed9d1c1b75..104fecd7e158 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/chained2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/chained2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -103,7 +101,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "exported": { @@ -114,7 +111,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false } } @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } @@ -191,7 +186,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "imported": { @@ -202,7 +196,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false } } @@ -247,7 +240,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "exported": null @@ -267,7 +259,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "exported": null @@ -300,7 +291,6 @@ "ctxt": 0 }, "value": "types", - "typeAnnotation": null, "optional": false } } @@ -345,7 +335,6 @@ "ctxt": 0 }, "value": "types", - "typeAnnotation": null, "optional": false }, "exported": { @@ -356,7 +345,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false } } @@ -388,7 +376,6 @@ "ctxt": 0 }, "value": "types", - "typeAnnotation": null, "optional": false } } @@ -439,7 +426,6 @@ "ctxt": 0 }, "value": "types", - "typeAnnotation": null, "optional": false }, "property": { @@ -450,7 +436,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -488,7 +473,6 @@ "ctxt": 0 }, "value": "types", - "typeAnnotation": null, "optional": false }, "property": { @@ -499,7 +483,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -533,6 +516,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -557,7 +541,6 @@ "ctxt": 0 }, "value": "types", - "typeAnnotation": null, "optional": false }, "right": { @@ -568,14 +551,12 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -615,6 +596,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -639,7 +621,6 @@ "ctxt": 0 }, "value": "types", - "typeAnnotation": null, "optional": false }, "right": { @@ -650,14 +631,12 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/circular1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/circular1/input.ts.json index 3c75727b1377..c98b55c3e80d 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/circular1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/circular1/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "exported": null @@ -75,7 +74,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "exported": null diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/circular2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/circular2/input.ts.json index 8f8cedd4be18..c4d301e7a410 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/circular2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/circular2/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "imported": null @@ -75,7 +74,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -124,7 +121,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "imported": null @@ -170,7 +166,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -189,7 +184,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/circular3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/circular3/input.ts.json index 3abba978c550..4e77ef66a04d 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/circular3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/circular3/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "imported": null @@ -75,7 +74,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "exported": { @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } } @@ -118,7 +115,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "imported": null @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "exported": { @@ -175,7 +170,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/circular4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/circular4/input.ts.json index f4a51ddbc1cd..9785ed975da1 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/circular4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/circular4/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "ns2", - "typeAnnotation": null, "optional": false }, "imported": null @@ -76,7 +75,6 @@ "ctxt": 0 }, "value": "ns1", - "typeAnnotation": null, "optional": false }, "body": { @@ -111,7 +109,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "body": { @@ -145,7 +142,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -168,7 +164,6 @@ "ctxt": 0 }, "value": "ns2", - "typeAnnotation": null, "optional": false }, "right": { @@ -179,7 +174,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false } }, @@ -191,7 +185,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false } }, @@ -230,7 +223,6 @@ "ctxt": 0 }, "value": "ns1", - "typeAnnotation": null, "optional": false }, "imported": null @@ -277,7 +269,6 @@ "ctxt": 0 }, "value": "ns2", - "typeAnnotation": null, "optional": false }, "body": { @@ -312,7 +303,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "body": { @@ -346,7 +336,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -369,7 +358,6 @@ "ctxt": 0 }, "value": "ns1", - "typeAnnotation": null, "optional": false }, "right": { @@ -380,7 +368,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false } }, @@ -392,7 +379,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/exportDeclaration/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/exportDeclaration/input.ts.json index fd0b160e9cc0..bc0d7a810795 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/exportDeclaration/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/exportDeclaration/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "exported": null @@ -89,7 +87,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "imported": null @@ -137,6 +134,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -159,13 +157,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -194,7 +190,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/exportDeclaration_moduleSpecifier-isolatedModules/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/exportDeclaration_moduleSpecifier-isolatedModules/input.ts.json index e7c81443c785..6dee1d102e73 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/exportDeclaration_moduleSpecifier-isolatedModules/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/exportDeclaration_moduleSpecifier-isolatedModules/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -67,7 +66,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "exported": null diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/exportDeclaration_moduleSpecifier/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/exportDeclaration_moduleSpecifier/input.ts.json index 347e04aa4d5f..eb9fa17b655e 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/exportDeclaration_moduleSpecifier/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/exportDeclaration_moduleSpecifier/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "exported": null @@ -110,7 +108,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "imported": null @@ -158,6 +155,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,13 +178,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -215,7 +211,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/exportDeclaration_value/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/exportDeclaration_value/input.ts.json index 0d3f3696cdd1..3f296cf71866 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/exportDeclaration_value/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/exportDeclaration_value/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -70,7 +70,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "exported": null @@ -112,8 +111,8 @@ "ctxt": 0 }, "value": "AA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -152,7 +151,6 @@ "ctxt": 0 }, "value": "AA", - "typeAnnotation": null, "optional": false }, "exported": null diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/exportNamespace1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/exportNamespace1/input.ts.json index 1288f3aa9de5..86dc0efe6849 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/exportNamespace1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/exportNamespace1/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "exported": null @@ -133,7 +131,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "imported": null @@ -178,7 +175,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/exportNamespace3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/exportNamespace3/input.ts.json index 23a48b2e7a97..a6acbd9426fa 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/exportNamespace3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/exportNamespace3/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "exported": null @@ -110,7 +108,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -155,7 +152,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "imported": null @@ -207,7 +203,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -218,7 +213,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/filterNamespace_import/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/filterNamespace_import/input.ts.json index cf9e87aa790c..d13da4c2874f 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/filterNamespace_import/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/filterNamespace_import/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "body": { @@ -57,7 +56,6 @@ "ctxt": 0 }, "value": "Type", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -89,7 +87,6 @@ "ctxt": 0 }, "value": "Class", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -139,8 +136,8 @@ "ctxt": 0 }, "value": "Value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -185,7 +182,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "body": { @@ -213,7 +209,6 @@ "ctxt": 0 }, "value": "NestedClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -239,7 +234,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -300,7 +294,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } }, @@ -327,7 +320,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } } @@ -371,7 +363,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -382,7 +373,6 @@ "ctxt": 0 }, "value": "Class", - "typeAnnotation": null, "optional": false }, "computed": false @@ -410,7 +400,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -421,7 +410,6 @@ "ctxt": 0 }, "value": "Value", - "typeAnnotation": null, "optional": false }, "computed": false @@ -452,6 +440,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -476,7 +465,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "right": { @@ -487,14 +475,12 @@ "ctxt": 0 }, "value": "Class", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -526,6 +512,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -550,7 +537,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "right": { @@ -561,14 +547,12 @@ "ctxt": 0 }, "value": "Type", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -613,6 +597,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -639,7 +624,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "right": { @@ -650,7 +634,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false } }, @@ -662,14 +645,12 @@ "ctxt": 0 }, "value": "NestedClass", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -689,7 +670,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/generic/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/generic/input.ts.json index c4b8faa02449..9d0c5f37f103 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/generic/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/generic/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -75,7 +73,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -117,7 +114,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -152,7 +148,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "exported": { @@ -163,7 +158,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } } @@ -195,7 +189,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "imported": null @@ -241,7 +234,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "imported": null @@ -289,6 +281,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -311,7 +304,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -334,8 +326,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -355,7 +346,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -404,6 +394,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -426,7 +417,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -449,8 +439,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -470,7 +459,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -514,6 +502,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -536,7 +525,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -559,8 +547,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -600,6 +587,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -622,13 +610,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -648,7 +634,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/implementsClause/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/implementsClause/input.ts.json index c82e3021501c..ca7918ce1b3d 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/implementsClause/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/implementsClause/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -68,7 +67,6 @@ "ctxt": 0 }, "value": "types", - "typeAnnotation": null, "optional": false } } @@ -113,7 +111,6 @@ "ctxt": 0 }, "value": "types", - "typeAnnotation": null, "optional": false }, "exported": null @@ -146,7 +143,6 @@ "ctxt": 0 }, "value": "types", - "typeAnnotation": null, "optional": false } } @@ -191,7 +187,6 @@ "ctxt": 0 }, "value": "nestedNamespace", - "typeAnnotation": null, "optional": false } } @@ -223,7 +218,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -256,7 +250,6 @@ "ctxt": 0 }, "value": "types", - "typeAnnotation": null, "optional": false }, "right": { @@ -267,7 +260,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false } }, @@ -285,7 +277,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -320,7 +311,6 @@ "ctxt": 0 }, "value": "nestedNamespace", - "typeAnnotation": null, "optional": false }, "right": { @@ -331,7 +321,6 @@ "ctxt": 0 }, "value": "types", - "typeAnnotation": null, "optional": false } }, @@ -343,7 +332,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/importClause_default/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/importClause_default/input.ts.json index 7af722e635fc..2c68842e3fea 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/importClause_default/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/importClause_default/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "span": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -110,7 +108,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } @@ -154,7 +151,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -186,6 +182,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -208,13 +205,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -234,7 +229,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/importClause_namedImports/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/importClause_namedImports/input.ts.json index fa288303066c..abac57af2b0e 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/importClause_namedImports/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/importClause_namedImports/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -154,8 +151,8 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -199,7 +196,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "imported": null @@ -219,7 +215,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "imported": null @@ -239,7 +234,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "imported": null @@ -284,7 +278,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -316,6 +309,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -338,13 +332,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -376,6 +368,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,13 +391,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -433,7 +424,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -444,7 +434,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/importEquals2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/importEquals2/input.ts.json index 1be0eadf07ba..18efccc92ec2 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/importEquals2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/importEquals2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "exported": null @@ -89,7 +87,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -126,7 +123,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -147,7 +143,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -202,7 +197,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -213,7 +207,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/importsNotUsedAsValues_error/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/importsNotUsedAsValues_error/input.ts.json index bb16c81cbfaf..647abafb2a95 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/importsNotUsedAsValues_error/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/importsNotUsedAsValues_error/input.ts.json @@ -47,7 +47,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -127,7 +125,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "members": [ @@ -146,7 +143,6 @@ "ctxt": 0 }, "value": "One", - "typeAnnotation": null, "optional": false }, "init": null @@ -166,7 +162,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "init": null @@ -197,7 +192,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "imported": null @@ -217,7 +211,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "imported": null @@ -265,6 +258,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -287,13 +281,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -325,6 +317,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -347,13 +340,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -389,7 +380,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -400,7 +390,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -416,7 +405,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -430,7 +418,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -461,7 +448,6 @@ "ctxt": 0 }, "value": "Default", - "typeAnnotation": null, "optional": false } }, @@ -480,7 +466,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false } } @@ -527,6 +512,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -549,13 +535,11 @@ "ctxt": 0 }, "value": "Default", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -587,6 +571,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -611,7 +596,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "right": { @@ -622,14 +606,12 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -665,7 +647,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -676,7 +657,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -692,7 +672,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -706,7 +685,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -737,7 +715,6 @@ "ctxt": 0 }, "value": "Default", - "typeAnnotation": null, "optional": false } }, @@ -756,7 +733,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "imported": null @@ -804,8 +780,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -815,7 +791,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "definite": false @@ -847,6 +822,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -869,13 +845,11 @@ "ctxt": 0 }, "value": "Default", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -911,7 +885,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -922,7 +895,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -938,7 +910,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -952,7 +923,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -983,7 +953,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1003,7 +972,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1049,7 +1017,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1095,7 +1062,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "imported": { @@ -1106,7 +1072,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } @@ -1150,7 +1115,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -1161,7 +1125,6 @@ "ctxt": 0 }, "value": "One", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1192,6 +1155,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1214,13 +1178,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -1237,7 +1199,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -1248,7 +1209,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1282,6 +1242,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1306,7 +1267,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "right": { @@ -1317,14 +1277,12 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -1341,7 +1299,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -1352,7 +1309,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1390,7 +1346,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -1401,7 +1356,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1417,7 +1371,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1431,7 +1384,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -1462,7 +1414,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1510,6 +1461,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1532,13 +1484,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1570,6 +1520,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1594,7 +1545,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "right": { @@ -1605,14 +1555,12 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1648,7 +1596,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -1659,7 +1606,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1675,7 +1621,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1689,7 +1634,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -1707,7 +1651,6 @@ "ctxt": 0 }, "value": "H", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1739,7 +1682,6 @@ "ctxt": 0 }, "value": "H", - "typeAnnotation": null, "optional": false } }, @@ -1760,7 +1702,6 @@ "ctxt": 0 }, "value": "H", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -1811,6 +1752,7 @@ "ctxt": 0 }, "value": "h", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1833,13 +1775,11 @@ "ctxt": 0 }, "value": "H", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1883,7 +1823,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -1894,7 +1833,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1910,7 +1848,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false } } @@ -1935,7 +1872,6 @@ "ctxt": 0 }, "value": "H", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -1978,7 +1914,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "members": [ @@ -1997,7 +1932,6 @@ "ctxt": 0 }, "value": "One", - "typeAnnotation": null, "optional": false }, "init": null @@ -2017,7 +1951,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "init": null @@ -2039,7 +1972,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false } }, @@ -2060,7 +1992,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -2108,7 +2039,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "property": { @@ -2119,7 +2049,6 @@ "ctxt": 0 }, "value": "One", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/namespaceImportTypeQuery/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/namespaceImportTypeQuery/input.ts.json index ea6fdac27121..a29a52593060 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/namespaceImportTypeQuery/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/namespaceImportTypeQuery/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "exported": null @@ -83,7 +81,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -132,7 +129,6 @@ "ctxt": 0 }, "value": "types", - "typeAnnotation": null, "optional": false } } @@ -179,6 +175,7 @@ "ctxt": 0 }, "value": "A", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -203,7 +200,6 @@ "ctxt": 0 }, "value": "types", - "typeAnnotation": null, "optional": false }, "right": { @@ -214,13 +210,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -252,6 +246,7 @@ "ctxt": 0 }, "value": "B", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -276,7 +271,6 @@ "ctxt": 0 }, "value": "types", - "typeAnnotation": null, "optional": false }, "right": { @@ -287,13 +281,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/namespaceMemberAccess/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/namespaceMemberAccess/input.ts.json index 7653b2aa6e68..6eb3309581bc 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/namespaceMemberAccess/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/namespaceMemberAccess/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -103,7 +101,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "exported": null @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "types", - "typeAnnotation": null, "optional": false } } @@ -180,7 +176,6 @@ "ctxt": 0 }, "value": "types", - "typeAnnotation": null, "optional": false }, "property": { @@ -191,7 +186,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -237,7 +231,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "value": null @@ -254,7 +247,6 @@ "ctxt": 0 }, "value": "types", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/nestedNamespace/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/nestedNamespace/input.ts.json index 9f7af1b367c5..955fea776b91 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/nestedNamespace/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/nestedNamespace/input.ts.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "types", - "typeAnnotation": null, "optional": false }, "body": { @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -103,7 +101,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -140,7 +137,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -165,7 +161,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -176,7 +171,6 @@ "ctxt": 0 }, "value": "types", - "typeAnnotation": null, "optional": false } }, @@ -188,7 +182,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/renamed/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/renamed/input.ts.json index 6644bb5e77b8..92091d696ea6 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/renamed/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/renamed/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -103,7 +101,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "exported": { @@ -114,7 +111,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } } @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "exported": { @@ -157,7 +152,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } @@ -202,7 +196,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "imported": { @@ -213,7 +206,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } @@ -260,6 +252,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -282,13 +275,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/typeQuery/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/typeQuery/input.ts.json index 7fd171b1284b..093b5123c716 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/typeQuery/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/typeOnly/typeQuery/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "imported": null @@ -112,6 +110,7 @@ "ctxt": 0 }, "value": "AConstructor", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -134,12 +133,10 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/externalModules/typesOnlyExternalModuleStillHasInstance/input.ts.json b/ecmascript/parser/tests/typescript/tsc/externalModules/typesOnlyExternalModuleStillHasInstance/input.ts.json index 75bf635b05b2..759c739f2e37 100644 --- a/ecmascript/parser/tests/typescript/tsc/externalModules/typesOnlyExternalModuleStillHasInstance/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/externalModules/typesOnlyExternalModuleStillHasInstance/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "Person", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -100,7 +98,6 @@ "ctxt": 0 }, "value": "age", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -154,7 +151,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -187,7 +183,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -217,7 +212,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -246,7 +240,6 @@ "ctxt": 0 }, "value": "Person", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -279,7 +272,6 @@ "ctxt": 0 }, "value": "foo0", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -330,6 +322,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -352,12 +345,10 @@ "ctxt": 0 }, "value": "foo0", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -397,6 +388,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -428,7 +420,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -457,7 +448,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -467,8 +457,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -478,7 +467,6 @@ "ctxt": 0 }, "value": "foo0", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/functions/functionImplementationErrors/input.ts.json b/ecmascript/parser/tests/typescript/tsc/functions/functionImplementationErrors/input.ts.json index 73fb85b9f104..35ba73b6a0a2 100644 --- a/ecmascript/parser/tests/typescript/tsc/functions/functionImplementationErrors/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/functions/functionImplementationErrors/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -127,8 +127,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -140,7 +140,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "params": [], @@ -233,8 +232,8 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -327,8 +326,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -471,7 +470,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -537,8 +535,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -555,7 +553,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -583,8 +580,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -594,7 +591,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -640,8 +636,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -673,7 +669,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -701,8 +696,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -712,7 +707,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -734,8 +728,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": true + "optional": true, + "typeAnnotation": null } } ], @@ -782,7 +776,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -818,7 +811,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -847,8 +839,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -898,7 +890,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -924,7 +915,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -956,7 +946,6 @@ "ctxt": 0 }, "value": "AnotherClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -982,7 +971,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1014,7 +1002,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1040,7 +1027,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1064,7 +1050,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1082,7 +1067,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1108,7 +1092,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1132,7 +1115,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1150,7 +1132,6 @@ "ctxt": 0 }, "value": "f8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1191,7 +1172,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1220,7 +1200,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1259,8 +1238,8 @@ "ctxt": 0 }, "value": "f9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -1302,7 +1281,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1331,7 +1309,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1374,8 +1351,8 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1415,7 +1392,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1444,7 +1420,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1472,7 +1447,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1513,7 +1487,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1542,7 +1515,6 @@ "ctxt": 0 }, "value": "AnotherClass", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1581,8 +1553,8 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -1624,7 +1596,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1653,7 +1624,6 @@ "ctxt": 0 }, "value": "AnotherClass", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1696,8 +1666,8 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1737,7 +1707,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1766,7 +1735,6 @@ "ctxt": 0 }, "value": "AnotherClass", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/functions/functionImplementations/input.ts.json b/ecmascript/parser/tests/typescript/tsc/functions/functionImplementations/input.ts.json index 41455efa3fbf..aa1d7b82f048 100644 --- a/ecmascript/parser/tests/typescript/tsc/functions/functionImplementations/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/functions/functionImplementations/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -113,6 +113,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -129,8 +130,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -142,7 +142,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -175,7 +174,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -215,6 +213,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -231,8 +230,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -244,7 +242,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -284,7 +281,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -327,6 +323,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -343,8 +340,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -356,7 +352,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -399,8 +394,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -410,7 +405,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "definite": false @@ -432,7 +426,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -457,7 +450,6 @@ "ctxt": 0 }, "value": "rec1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -498,7 +490,6 @@ "ctxt": 0 }, "value": "rec2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -522,7 +513,6 @@ "ctxt": 0 }, "value": "rec2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -563,7 +553,6 @@ "ctxt": 0 }, "value": "rec1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -602,8 +591,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -620,7 +609,6 @@ "ctxt": 0 }, "value": "rec1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -655,8 +643,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -673,7 +661,6 @@ "ctxt": 0 }, "value": "rec2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -693,7 +680,6 @@ "ctxt": 0 }, "value": "rec3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -734,7 +720,6 @@ "ctxt": 0 }, "value": "rec4", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -774,7 +759,6 @@ "ctxt": 0 }, "value": "rec4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -815,7 +799,6 @@ "ctxt": 0 }, "value": "rec3", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -854,6 +837,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -870,8 +854,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -903,8 +886,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -921,7 +904,6 @@ "ctxt": 0 }, "value": "rec3", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -956,8 +938,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -974,7 +956,6 @@ "ctxt": 0 }, "value": "rec4", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1009,8 +990,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1093,8 +1074,8 @@ "ctxt": 0 }, "value": "nu", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NullLiteral", @@ -1133,8 +1114,8 @@ "ctxt": 0 }, "value": "nu", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1216,8 +1197,8 @@ "ctxt": 0 }, "value": "un", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1227,7 +1208,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1259,8 +1239,8 @@ "ctxt": 0 }, "value": "un", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1302,7 +1282,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1345,8 +1324,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1375,6 +1354,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1397,13 +1377,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1436,7 +1414,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1467,7 +1444,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1522,8 +1498,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1552,6 +1528,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1574,13 +1551,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1613,7 +1588,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1644,7 +1618,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1707,8 +1680,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1793,7 +1766,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1819,7 +1791,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1851,7 +1822,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1877,7 +1847,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1901,7 +1870,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1934,6 +1902,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1956,13 +1925,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1994,8 +1961,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2044,7 +2011,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2073,7 +2039,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2119,8 +2084,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2139,7 +2104,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -2179,7 +2143,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2208,7 +2171,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2237,7 +2199,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2281,7 +2242,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -2317,7 +2277,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2356,7 +2315,6 @@ "ctxt": 0 }, "value": "thisFunc", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2400,8 +2358,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -2440,6 +2398,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2456,8 +2415,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2481,7 +2439,6 @@ "ctxt": 0 }, "value": "opt1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2509,8 +2466,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -2564,8 +2521,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -2575,7 +2532,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2607,6 +2563,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2623,8 +2580,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2648,7 +2604,6 @@ "ctxt": 0 }, "value": "opt2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2676,8 +2631,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -2697,7 +2652,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -2719,7 +2673,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2730,7 +2683,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2779,8 +2731,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -2790,7 +2742,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2822,6 +2773,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2853,7 +2805,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2895,7 +2846,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2923,8 +2873,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2948,7 +2897,6 @@ "ctxt": 0 }, "value": "opt3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2969,6 +2917,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2985,8 +2934,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -3012,8 +2960,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3023,7 +2971,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -3069,8 +3016,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -3080,7 +3027,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3112,6 +3058,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3128,8 +3075,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -3153,7 +3099,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3214,7 +3159,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3240,7 +3184,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3280,7 +3223,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -3298,7 +3240,6 @@ "ctxt": 0 }, "value": "AnotherClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3324,7 +3265,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3371,6 +3311,7 @@ "ctxt": 0 }, "value": "f7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3394,6 +3335,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3410,8 +3352,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -3452,8 +3393,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -3471,8 +3411,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3506,7 +3446,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -3542,7 +3481,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3579,7 +3517,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3590,7 +3527,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3635,6 +3571,7 @@ "ctxt": 0 }, "value": "f8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3658,6 +3595,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3674,8 +3612,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -3697,8 +3634,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -3716,8 +3652,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3750,7 +3686,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3779,7 +3714,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3822,6 +3756,7 @@ "ctxt": 0 }, "value": "f9", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3845,6 +3780,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3861,8 +3797,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -3884,8 +3819,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -3903,8 +3837,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3937,7 +3871,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3966,7 +3899,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3995,7 +3927,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4038,6 +3969,7 @@ "ctxt": 0 }, "value": "f10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4061,6 +3993,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4077,8 +4010,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -4100,8 +4032,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -4119,8 +4050,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4153,7 +4084,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4182,7 +4112,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4225,6 +4154,7 @@ "ctxt": 0 }, "value": "f11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4248,6 +4178,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4264,8 +4195,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -4287,8 +4217,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -4306,8 +4235,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4340,7 +4269,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4369,7 +4297,6 @@ "ctxt": 0 }, "value": "AnotherClass", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4412,6 +4339,7 @@ "ctxt": 0 }, "value": "f12", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4435,6 +4363,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4451,8 +4380,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -4474,8 +4402,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -4493,8 +4420,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4527,7 +4454,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4565,7 +4491,6 @@ "ctxt": 0 }, "value": "AnotherClass", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/functions/functionNameConflicts/input.ts.json b/ecmascript/parser/tests/typescript/tsc/functions/functionNameConflicts/input.ts.json index 05615fc28b73..bfc7d18a224f 100644 --- a/ecmascript/parser/tests/typescript/tsc/functions/functionNameConflicts/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/functions/functionNameConflicts/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,8 +92,8 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -127,8 +125,8 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -145,7 +143,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -183,7 +180,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -233,8 +229,8 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -251,7 +247,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -295,8 +290,8 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -313,7 +308,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -348,7 +342,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -398,8 +391,8 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -423,7 +416,6 @@ "ctxt": 0 }, "value": "over", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -450,7 +442,6 @@ "ctxt": 0 }, "value": "overrr", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/functions/functionOverloadCompatibilityWithVoid01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/functions/functionOverloadCompatibilityWithVoid01/input.ts.json index 17faea3e258a..8a4f96eb82dd 100644 --- a/ecmascript/parser/tests/typescript/tsc/functions/functionOverloadCompatibilityWithVoid01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/functions/functionOverloadCompatibilityWithVoid01/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -96,7 +95,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -117,6 +115,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -133,8 +132,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/functions/functionOverloadCompatibilityWithVoid02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/functions/functionOverloadCompatibilityWithVoid02/input.ts.json index 0e62c444d7da..0dff3237aed6 100644 --- a/ecmascript/parser/tests/typescript/tsc/functions/functionOverloadCompatibilityWithVoid02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/functions/functionOverloadCompatibilityWithVoid02/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -96,7 +95,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -117,6 +115,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -133,8 +132,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/functions/functionOverloadCompatibilityWithVoid03/input.ts.json b/ecmascript/parser/tests/typescript/tsc/functions/functionOverloadCompatibilityWithVoid03/input.ts.json index 927d1eeb73a0..e114dda42716 100644 --- a/ecmascript/parser/tests/typescript/tsc/functions/functionOverloadCompatibilityWithVoid03/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/functions/functionOverloadCompatibilityWithVoid03/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -96,7 +95,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -117,6 +115,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -133,8 +132,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/functions/functionOverloadErrors/input.ts.json b/ecmascript/parser/tests/typescript/tsc/functions/functionOverloadErrors/input.ts.json index 98882df99ee8..eefc7d10c885 100644 --- a/ecmascript/parser/tests/typescript/tsc/functions/functionOverloadErrors/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/functions/functionOverloadErrors/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -44,8 +43,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -82,7 +81,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -117,7 +115,6 @@ "ctxt": 0 }, "value": "fn2a", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "fn2a", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -171,7 +167,6 @@ "ctxt": 0 }, "value": "fn2a", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -206,7 +201,6 @@ "ctxt": 0 }, "value": "fn2b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -227,6 +221,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -251,8 +246,7 @@ "kind": "number" } } - }, - "optional": false + } } } ], @@ -278,7 +272,6 @@ "ctxt": 0 }, "value": "fn2b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -299,6 +292,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -321,7 +315,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -344,8 +337,7 @@ ] } } - }, - "optional": false + } } } ], @@ -371,7 +363,6 @@ "ctxt": 0 }, "value": "fn2b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -406,7 +397,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -427,6 +417,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -443,8 +434,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -486,7 +476,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -507,6 +496,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -523,8 +513,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -566,7 +555,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -634,7 +622,6 @@ "ctxt": 0 }, "value": "fn6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -667,8 +654,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -720,7 +707,6 @@ "ctxt": 0 }, "value": "fn6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -741,6 +727,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -757,8 +744,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -784,7 +770,6 @@ "ctxt": 0 }, "value": "fn6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -819,7 +804,6 @@ "ctxt": 0 }, "value": "fn7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -852,8 +836,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -905,7 +889,6 @@ "ctxt": 0 }, "value": "fn7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -926,6 +909,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -942,8 +926,7 @@ }, "kind": "any" } - }, - "optional": true + } } }, { @@ -962,6 +945,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -978,8 +962,7 @@ }, "kind": "any" } - }, - "optional": true + } } }, { @@ -998,6 +981,7 @@ "ctxt": 0 }, "value": "z", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1014,8 +998,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -1041,7 +1024,6 @@ "ctxt": 0 }, "value": "fn7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1076,7 +1058,6 @@ "ctxt": 0 }, "value": "fn8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1097,6 +1078,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1113,8 +1095,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1150,7 +1131,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1170,7 +1150,6 @@ "ctxt": 0 }, "value": "fn8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1191,6 +1170,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1207,8 +1187,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1244,7 +1223,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1264,7 +1242,6 @@ "ctxt": 0 }, "value": "fn8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1299,7 +1276,6 @@ "ctxt": 0 }, "value": "fn9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1320,6 +1296,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1342,13 +1319,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1384,7 +1359,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1404,7 +1378,6 @@ "ctxt": 0 }, "value": "fn9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1425,6 +1398,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1447,13 +1421,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1489,7 +1461,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1509,7 +1480,6 @@ "ctxt": 0 }, "value": "fn9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1544,7 +1514,6 @@ "ctxt": 0 }, "value": "fn10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1581,7 +1550,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1599,7 +1567,6 @@ "ctxt": 0 }, "value": "Window", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1620,7 +1587,6 @@ "ctxt": 0 }, "value": "fn10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1657,7 +1623,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1675,7 +1640,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1696,7 +1660,6 @@ "ctxt": 0 }, "value": "fn10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1731,7 +1694,6 @@ "ctxt": 0 }, "value": "fn11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1768,7 +1730,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1786,7 +1747,6 @@ "ctxt": 0 }, "value": "Window", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1807,7 +1767,6 @@ "ctxt": 0 }, "value": "fn11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1844,7 +1803,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1862,7 +1820,6 @@ "ctxt": 0 }, "value": "window", - "typeAnnotation": null, "optional": false } }, @@ -1882,7 +1839,6 @@ "ctxt": 0 }, "value": "fn11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1922,7 +1878,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1949,7 +1904,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1982,7 +1936,6 @@ "ctxt": 0 }, "value": "parents", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2011,7 +1964,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2037,7 +1989,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2063,7 +2014,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2090,7 +2040,6 @@ "ctxt": 0 }, "value": "fn12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2127,7 +2076,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2145,7 +2093,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2171,7 +2118,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2213,7 +2159,6 @@ "ctxt": 0 }, "value": "fn12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2250,7 +2195,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2268,7 +2212,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2307,7 +2250,6 @@ "ctxt": 0 }, "value": "fn12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2342,7 +2284,6 @@ "ctxt": 0 }, "value": "cls", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2368,7 +2309,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -2406,7 +2346,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -2427,6 +2366,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2443,8 +2383,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -2481,7 +2420,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -2527,7 +2465,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "function": { @@ -2548,6 +2485,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2564,8 +2502,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -2602,7 +2539,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "function": { @@ -2640,7 +2576,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "function": { @@ -2695,7 +2630,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -2723,7 +2657,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2751,7 +2684,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2772,6 +2704,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2788,8 +2721,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -2815,7 +2747,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2850,7 +2781,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2871,6 +2801,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2887,8 +2818,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -2921,7 +2851,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2956,7 +2885,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2995,7 +2923,6 @@ "ctxt": 0 }, "value": "dfn1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3022,7 +2949,6 @@ "ctxt": 0 }, "value": "dfn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3043,6 +2969,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3059,8 +2986,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -3086,7 +3012,6 @@ "ctxt": 0 }, "value": "dfn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3121,7 +3046,6 @@ "ctxt": 0 }, "value": "dfn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3148,7 +3072,6 @@ "ctxt": 0 }, "value": "dfn2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3169,6 +3092,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3185,8 +3109,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -3212,7 +3135,6 @@ "ctxt": 0 }, "value": "dfn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3247,7 +3169,6 @@ "ctxt": 0 }, "value": "fewerParams", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3274,7 +3195,6 @@ "ctxt": 0 }, "value": "fewerParams", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3295,6 +3215,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3311,8 +3232,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -3346,7 +3266,6 @@ "ctxt": 0 }, "value": "fn13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3367,6 +3286,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3383,8 +3303,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -3410,7 +3329,6 @@ "ctxt": 0 }, "value": "fn13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3431,6 +3349,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3447,8 +3366,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -3482,7 +3400,6 @@ "ctxt": 0 }, "value": "fn14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3503,6 +3420,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3519,8 +3437,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -3562,7 +3479,6 @@ "ctxt": 0 }, "value": "fn14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3615,7 +3531,6 @@ "ctxt": 0 }, "value": "fn15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3652,7 +3567,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3670,7 +3584,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3696,7 +3609,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3748,7 +3660,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3765,7 +3676,6 @@ "ctxt": 0 }, "value": "fn15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3802,7 +3712,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3820,7 +3729,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3869,7 +3777,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3886,7 +3793,6 @@ "ctxt": 0 }, "value": "fn15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3920,7 +3826,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -3941,7 +3846,6 @@ "ctxt": 0 }, "value": "initExpr", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3969,8 +3873,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -4007,7 +3911,6 @@ "ctxt": 0 }, "value": "initExpr", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/functions/parameterInitializersBackwardReferencing/input.ts.json b/ecmascript/parser/tests/typescript/tsc/functions/parameterInitializersBackwardReferencing/input.ts.json index 6a348b2a035c..10d3ba3d3118 100644 --- a/ecmascript/parser/tests/typescript/tsc/functions/parameterInitializersBackwardReferencing/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/functions/parameterInitializersBackwardReferencing/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "test0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -87,7 +85,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -98,7 +95,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, { @@ -167,7 +162,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } ] @@ -190,7 +184,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -228,7 +221,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -261,7 +253,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -289,7 +280,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -300,7 +290,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -374,7 +363,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, { @@ -385,7 +373,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/functions/parameterInitializersForwardReferencing.2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/functions/parameterInitializersForwardReferencing.2/input.ts.json index 50bfe1a072ed..8a4396a16739 100644 --- a/ecmascript/parser/tests/typescript/tsc/functions/parameterInitializersForwardReferencing.2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/functions/parameterInitializersForwardReferencing.2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -67,7 +66,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +108,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -155,8 +151,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -179,7 +175,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -228,8 +223,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -268,8 +263,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -299,7 +294,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -342,7 +336,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -367,8 +360,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -391,7 +384,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -423,8 +415,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -434,7 +426,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -480,8 +471,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/functions/parameterInitializersForwardReferencing/input.ts.json b/ecmascript/parser/tests/typescript/tsc/functions/parameterInitializersForwardReferencing/input.ts.json index 8be98e0c70ba..10411957a4da 100644 --- a/ecmascript/parser/tests/typescript/tsc/functions/parameterInitializersForwardReferencing/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/functions/parameterInitializersForwardReferencing/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "left", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -64,8 +63,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -75,7 +74,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -104,8 +102,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -115,7 +113,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -151,7 +148,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -170,7 +166,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -191,7 +186,6 @@ "ctxt": 0 }, "value": "right", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -219,8 +213,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -230,7 +224,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -259,8 +252,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -270,7 +263,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -306,7 +298,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -325,7 +316,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -346,7 +336,6 @@ "ctxt": 0 }, "value": "right2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -374,8 +363,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -385,7 +374,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -414,8 +402,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -425,7 +413,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -454,8 +441,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -465,7 +452,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -501,7 +487,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -520,7 +505,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -539,7 +523,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -560,7 +543,6 @@ "ctxt": 0 }, "value": "inside", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -588,8 +570,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -599,7 +581,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -645,8 +626,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -670,7 +651,6 @@ "ctxt": 0 }, "value": "outside", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -714,8 +694,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -732,7 +712,6 @@ "ctxt": 0 }, "value": "inside", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -760,8 +739,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -771,7 +750,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -817,8 +795,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -849,7 +827,6 @@ "ctxt": 0 }, "value": "defaultArgFunction", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -877,8 +854,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "FunctionExpression", @@ -913,7 +890,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -950,8 +926,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -996,7 +972,6 @@ "ctxt": 0 }, "value": "defaultArgArrow", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1024,8 +999,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1051,7 +1026,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1090,8 +1064,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1136,7 +1110,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1162,7 +1135,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1189,8 +1161,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1200,7 +1172,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1229,8 +1200,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1272,7 +1243,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -1300,8 +1270,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1311,7 +1281,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1340,8 +1309,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1414,8 +1383,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1440,8 +1409,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1451,7 +1420,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1471,8 +1439,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1482,7 +1450,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1502,8 +1469,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1513,7 +1480,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1552,8 +1518,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1581,7 +1547,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1602,8 +1567,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1629,8 +1594,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "FunctionExpression", @@ -1665,7 +1630,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1702,8 +1666,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -1720,7 +1684,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/functions/parameterInitializersForwardReferencing1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/functions/parameterInitializersForwardReferencing1/input.ts.json index 81deacb6f21b..da051cf5e9ed 100644 --- a/ecmascript/parser/tests/typescript/tsc/functions/parameterInitializersForwardReferencing1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/functions/parameterInitializersForwardReferencing1/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -78,7 +78,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -106,8 +105,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -117,7 +116,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -163,6 +161,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -179,8 +178,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -210,7 +208,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false } } @@ -231,7 +228,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -259,8 +255,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -285,8 +281,8 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -296,7 +292,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -310,7 +305,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "async": false, @@ -361,6 +355,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -377,8 +372,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -415,7 +409,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -439,7 +432,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -467,8 +459,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -478,7 +470,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -507,8 +498,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -552,7 +543,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false } } @@ -573,7 +563,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -594,8 +583,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -621,8 +610,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -632,7 +621,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -668,7 +656,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false } } @@ -689,7 +676,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -717,8 +703,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -728,7 +714,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -764,7 +749,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -785,7 +769,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -813,8 +796,8 @@ "ctxt": 0 }, "value": "async", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -824,7 +807,6 @@ "ctxt": 0 }, "value": "async", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -860,7 +842,6 @@ "ctxt": 0 }, "value": "async", - "typeAnnotation": null, "optional": false } } @@ -881,7 +862,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -919,7 +899,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -931,8 +910,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1004,6 +983,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1020,8 +1000,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -1053,7 +1032,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1079,7 +1057,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1108,8 +1085,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1148,8 +1125,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1159,7 +1136,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1195,7 +1171,6 @@ "ctxt": 0 }, "value": "f8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1216,6 +1191,7 @@ "ctxt": 0 }, "value": "foo1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1232,8 +1208,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -1259,8 +1234,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1270,7 +1245,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null diff --git a/ecmascript/parser/tests/typescript/tsc/functions/parameterInitializersForwardReferencing1_es6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/functions/parameterInitializersForwardReferencing1_es6/input.ts.json index bb7cbdd5e9d6..74521d13d0ae 100644 --- a/ecmascript/parser/tests/typescript/tsc/functions/parameterInitializersForwardReferencing1_es6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/functions/parameterInitializersForwardReferencing1_es6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -78,7 +78,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -106,8 +105,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -117,7 +116,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -163,6 +161,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -179,8 +178,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -210,7 +208,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false } } @@ -231,7 +228,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -259,8 +255,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -285,8 +281,8 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -296,7 +292,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -310,7 +305,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "async": false, @@ -361,6 +355,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -377,8 +372,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -415,7 +409,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -439,7 +432,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -467,8 +459,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -478,7 +470,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -507,8 +498,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -552,7 +543,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false } } @@ -573,7 +563,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -594,8 +583,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -621,8 +610,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -632,7 +621,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -668,7 +656,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false } } @@ -689,7 +676,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -717,8 +703,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -728,7 +714,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -764,7 +749,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -785,7 +769,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -813,8 +796,8 @@ "ctxt": 0 }, "value": "async", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -824,7 +807,6 @@ "ctxt": 0 }, "value": "async", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -860,7 +842,6 @@ "ctxt": 0 }, "value": "async", - "typeAnnotation": null, "optional": false } } @@ -881,7 +862,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -919,7 +899,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -931,8 +910,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1004,6 +983,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1020,8 +1000,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -1053,7 +1032,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1079,7 +1057,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1108,8 +1085,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1148,8 +1125,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1159,7 +1136,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1195,7 +1171,6 @@ "ctxt": 0 }, "value": "f8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1216,6 +1191,7 @@ "ctxt": 0 }, "value": "foo1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1232,8 +1208,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -1259,8 +1234,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1270,7 +1245,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null diff --git a/ecmascript/parser/tests/typescript/tsc/functions/strictBindCallApply1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/functions/strictBindCallApply1/input.ts.json index 22cf45c8182e..6cfa477a1791 100644 --- a/ecmascript/parser/tests/typescript/tsc/functions/strictBindCallApply1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/functions/strictBindCallApply1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -73,6 +72,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -89,8 +89,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -132,7 +131,6 @@ "ctxt": 0 }, "value": "overloaded", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -153,6 +151,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -169,8 +168,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -212,7 +210,6 @@ "ctxt": 0 }, "value": "overloaded", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -233,6 +230,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -249,8 +247,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -292,7 +289,6 @@ "ctxt": 0 }, "value": "generic", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -313,6 +309,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -335,13 +332,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -377,7 +372,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -407,7 +401,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -439,8 +432,8 @@ "ctxt": 0 }, "value": "f00", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -464,7 +457,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -475,7 +467,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -491,7 +482,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -527,8 +517,8 @@ "ctxt": 0 }, "value": "f01", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -552,7 +542,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -563,7 +552,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -579,7 +567,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -627,8 +614,8 @@ "ctxt": 0 }, "value": "f02", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -652,7 +639,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -663,7 +649,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -679,7 +664,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -744,8 +728,8 @@ "ctxt": 0 }, "value": "f03", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -769,7 +753,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -780,7 +763,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -796,7 +778,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -856,8 +837,8 @@ "ctxt": 0 }, "value": "f04", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -881,7 +862,6 @@ "ctxt": 0 }, "value": "overloaded", - "typeAnnotation": null, "optional": false }, "property": { @@ -892,7 +872,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -908,7 +887,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -944,8 +922,8 @@ "ctxt": 0 }, "value": "f05", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -969,7 +947,6 @@ "ctxt": 0 }, "value": "generic", - "typeAnnotation": null, "optional": false }, "property": { @@ -980,7 +957,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -996,7 +972,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1032,8 +1007,8 @@ "ctxt": 0 }, "value": "c00", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1057,7 +1032,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1068,7 +1042,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1084,7 +1057,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1149,8 +1121,8 @@ "ctxt": 0 }, "value": "c01", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1174,7 +1146,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1185,7 +1156,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1201,7 +1171,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1249,8 +1218,8 @@ "ctxt": 0 }, "value": "c02", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1274,7 +1243,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1285,7 +1253,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1301,7 +1268,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1361,8 +1327,8 @@ "ctxt": 0 }, "value": "c03", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1386,7 +1352,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1397,7 +1362,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1413,7 +1377,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1490,8 +1453,8 @@ "ctxt": 0 }, "value": "a00", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1515,7 +1478,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1526,7 +1488,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1542,7 +1503,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1620,8 +1580,8 @@ "ctxt": 0 }, "value": "a01", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1645,7 +1605,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1656,7 +1615,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1672,7 +1630,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1733,8 +1690,8 @@ "ctxt": 0 }, "value": "a02", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1758,7 +1715,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1769,7 +1725,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1785,7 +1740,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1858,8 +1812,8 @@ "ctxt": 0 }, "value": "a03", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1883,7 +1837,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1894,7 +1847,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1910,7 +1862,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1985,7 +1936,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2011,7 +1961,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2031,6 +1980,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2047,8 +1997,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -2067,6 +2016,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2083,8 +2033,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -2115,7 +2064,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -2136,6 +2084,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2151,8 +2100,7 @@ "ctxt": 0 } } - }, - "optional": false + } } }, { @@ -2171,6 +2119,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2187,8 +2136,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -2207,6 +2155,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2223,8 +2172,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -2308,7 +2256,6 @@ "ctxt": 0 }, "value": "overloaded", - "typeAnnotation": null, "optional": false }, "function": { @@ -2329,6 +2276,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2345,8 +2293,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -2399,7 +2346,6 @@ "ctxt": 0 }, "value": "overloaded", - "typeAnnotation": null, "optional": false }, "function": { @@ -2420,6 +2366,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2436,8 +2383,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -2490,7 +2436,6 @@ "ctxt": 0 }, "value": "overloaded", - "typeAnnotation": null, "optional": false }, "function": { @@ -2511,6 +2456,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2527,8 +2473,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2568,7 +2513,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -2626,7 +2570,6 @@ "ctxt": 0 }, "value": "generic", - "typeAnnotation": null, "optional": false }, "function": { @@ -2647,6 +2590,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2669,13 +2613,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2708,7 +2650,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2739,7 +2680,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2769,7 +2709,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2814,6 +2753,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2836,13 +2776,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2874,6 +2812,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2890,8 +2829,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2923,8 +2861,8 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2955,7 +2893,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -2966,7 +2903,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2979,7 +2915,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2995,7 +2930,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -3031,8 +2965,8 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3063,7 +2997,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3074,7 +3007,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3087,7 +3019,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3103,7 +3034,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3151,8 +3081,8 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3183,7 +3113,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3194,7 +3123,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3207,7 +3135,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3223,7 +3150,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3288,8 +3214,8 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3320,7 +3246,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3331,7 +3256,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3344,7 +3268,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3360,7 +3283,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3420,8 +3342,8 @@ "ctxt": 0 }, "value": "f14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3452,7 +3374,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3463,7 +3384,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3476,7 +3396,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3492,7 +3411,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -3528,8 +3446,8 @@ "ctxt": 0 }, "value": "f15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3560,7 +3478,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3571,7 +3488,6 @@ "ctxt": 0 }, "value": "overloaded", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3584,7 +3500,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3600,7 +3515,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -3636,8 +3550,8 @@ "ctxt": 0 }, "value": "f16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3668,7 +3582,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3679,7 +3592,6 @@ "ctxt": 0 }, "value": "generic", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3692,7 +3604,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3708,7 +3619,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -3744,8 +3654,8 @@ "ctxt": 0 }, "value": "c10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3776,7 +3686,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3787,7 +3696,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3800,7 +3708,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3816,7 +3723,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -3881,8 +3787,8 @@ "ctxt": 0 }, "value": "c11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3913,7 +3819,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3924,7 +3829,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3937,7 +3841,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3953,7 +3856,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -4001,8 +3903,8 @@ "ctxt": 0 }, "value": "c12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4033,7 +3935,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4044,7 +3945,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4057,7 +3957,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4073,7 +3972,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -4133,8 +4031,8 @@ "ctxt": 0 }, "value": "c13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4165,7 +4063,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4176,7 +4073,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4189,7 +4085,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4205,7 +4100,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -4282,8 +4176,8 @@ "ctxt": 0 }, "value": "c14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4314,7 +4208,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4325,7 +4218,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4338,7 +4230,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4354,7 +4245,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -4419,8 +4309,8 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4451,7 +4341,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4462,7 +4351,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4475,7 +4363,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4491,7 +4378,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -4569,8 +4455,8 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4601,7 +4487,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4612,7 +4497,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4625,7 +4509,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4641,7 +4524,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -4702,8 +4584,8 @@ "ctxt": 0 }, "value": "a12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4734,7 +4616,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4745,7 +4626,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4758,7 +4638,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4774,7 +4653,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -4847,8 +4725,8 @@ "ctxt": 0 }, "value": "a13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4879,7 +4757,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4890,7 +4767,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4903,7 +4779,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4919,7 +4794,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5009,8 +4883,8 @@ "ctxt": 0 }, "value": "a14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5041,7 +4915,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -5052,7 +4925,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5065,7 +4937,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5081,7 +4952,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -5159,8 +5029,8 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5184,7 +5054,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -5195,7 +5064,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5211,7 +5079,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -5247,8 +5114,8 @@ "ctxt": 0 }, "value": "f21", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5272,7 +5139,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -5283,7 +5149,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5299,7 +5164,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -5347,8 +5211,8 @@ "ctxt": 0 }, "value": "f22", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5372,7 +5236,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -5383,7 +5246,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5399,7 +5261,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -5464,8 +5325,8 @@ "ctxt": 0 }, "value": "f23", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5489,7 +5350,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -5500,7 +5360,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5516,7 +5375,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -5580,7 +5438,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -5591,7 +5448,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5607,7 +5463,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5673,7 +5528,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -5684,7 +5538,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5700,7 +5553,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5749,7 +5601,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -5760,7 +5611,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5776,7 +5626,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5837,7 +5686,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -5848,7 +5696,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5864,7 +5711,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5942,7 +5788,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -5953,7 +5798,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5969,7 +5813,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -6048,7 +5891,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -6059,7 +5901,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6075,7 +5916,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -6137,7 +5977,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -6148,7 +5987,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6164,7 +6002,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -6238,7 +6075,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -6249,7 +6085,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6265,7 +6100,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/functions/strictBindCallApply2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/functions/strictBindCallApply2/input.ts.json index b5733c506cd9..1558d981f0a2 100644 --- a/ecmascript/parser/tests/typescript/tsc/functions/strictBindCallApply2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/functions/strictBindCallApply2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "blub", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -98,7 +96,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -119,6 +116,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -141,13 +139,11 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -187,7 +183,6 @@ "ctxt": 0 }, "value": "Test", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -206,7 +201,6 @@ "ctxt": 0 }, "value": "ThisParameterType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -232,7 +226,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false } } @@ -265,8 +258,8 @@ "ctxt": 0 }, "value": "fb", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -290,7 +283,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "property": { @@ -301,7 +293,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -327,7 +318,6 @@ "ctxt": 0 }, "value": "blub", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/generators/generatorAssignability/input.ts.json b/ecmascript/parser/tests/typescript/tsc/generators/generatorAssignability/input.ts.json index d3ee6f58d680..8d29e60d4abb 100644 --- a/ecmascript/parser/tests/typescript/tsc/generators/generatorAssignability/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/generators/generatorAssignability/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "_", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "g1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,7 +103,6 @@ "ctxt": 0 }, "value": "Generator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -143,8 +143,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -176,6 +175,7 @@ "ctxt": 0 }, "value": "g2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -198,7 +198,6 @@ "ctxt": 0 }, "value": "Generator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -239,8 +238,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -272,6 +270,7 @@ "ctxt": 0 }, "value": "g3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -294,7 +293,6 @@ "ctxt": 0 }, "value": "Generator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -335,8 +333,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -368,6 +365,7 @@ "ctxt": 0 }, "value": "g4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -390,7 +388,6 @@ "ctxt": 0 }, "value": "AsyncGenerator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -431,8 +428,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -464,6 +460,7 @@ "ctxt": 0 }, "value": "g5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -486,7 +483,6 @@ "ctxt": 0 }, "value": "AsyncGenerator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -527,8 +523,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -560,6 +555,7 @@ "ctxt": 0 }, "value": "g6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -582,7 +578,6 @@ "ctxt": 0 }, "value": "AsyncGenerator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -623,8 +618,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -660,7 +654,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false } } @@ -696,7 +689,6 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, "optional": false } } @@ -736,8 +728,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -751,7 +743,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -791,8 +782,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -806,7 +797,6 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, "optional": false }, "definite": false @@ -858,8 +848,8 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -875,7 +865,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -927,8 +916,8 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -944,7 +933,6 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, "optional": false }, "definite": false @@ -982,8 +970,8 @@ "ctxt": 0 }, "value": "_", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -997,7 +985,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false } } @@ -1033,8 +1020,8 @@ "ctxt": 0 }, "value": "_", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1048,7 +1035,6 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, "optional": false } } @@ -1096,8 +1082,8 @@ "ctxt": 0 }, "value": "_", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1113,7 +1099,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false } } @@ -1161,8 +1146,8 @@ "ctxt": 0 }, "value": "_", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1178,7 +1163,6 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, "optional": false } } @@ -1199,8 +1183,8 @@ "ctxt": 0 }, "value": "_", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1210,7 +1194,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "body": { @@ -1238,8 +1221,8 @@ "ctxt": 0 }, "value": "_", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1249,7 +1232,6 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, "optional": false }, "body": { @@ -1271,7 +1253,6 @@ "ctxt": 0 }, "value": "asyncfn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1310,8 +1291,8 @@ "ctxt": 0 }, "value": "_", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1321,7 +1302,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "body": { @@ -1353,8 +1333,8 @@ "ctxt": 0 }, "value": "_", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1364,7 +1344,6 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, "optional": false }, "body": { @@ -1396,8 +1375,8 @@ "ctxt": 0 }, "value": "_", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1407,7 +1386,6 @@ "ctxt": 0 }, "value": "g4", - "typeAnnotation": null, "optional": false }, "body": { @@ -1439,8 +1417,8 @@ "ctxt": 0 }, "value": "_", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1450,7 +1428,6 @@ "ctxt": 0 }, "value": "g5", - "typeAnnotation": null, "optional": false }, "body": { @@ -1479,7 +1456,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1520,7 +1496,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "delegate": true @@ -1548,7 +1523,6 @@ "ctxt": 0 }, "value": "g3", - "typeAnnotation": null, "optional": false }, "delegate": true @@ -1581,7 +1555,6 @@ "ctxt": 0 }, "value": "Generator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1634,7 +1607,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1675,7 +1647,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "delegate": true @@ -1703,7 +1674,6 @@ "ctxt": 0 }, "value": "g3", - "typeAnnotation": null, "optional": false }, "delegate": true @@ -1731,7 +1701,6 @@ "ctxt": 0 }, "value": "g4", - "typeAnnotation": null, "optional": false }, "delegate": true @@ -1759,7 +1728,6 @@ "ctxt": 0 }, "value": "g6", - "typeAnnotation": null, "optional": false }, "delegate": true @@ -1792,7 +1760,6 @@ "ctxt": 0 }, "value": "AsyncGenerator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1845,7 +1812,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1889,8 +1855,8 @@ "ctxt": 0 }, "value": "syncGenerator", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -1998,8 +1964,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -2033,7 +1999,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -2044,7 +2009,6 @@ "ctxt": 0 }, "value": "asyncIterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2058,7 +2022,6 @@ "ctxt": 0 }, "value": "syncGenerator", - "typeAnnotation": null, "optional": false } } @@ -2105,8 +2068,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -2121,7 +2084,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/generators/generatorExplicitReturnType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/generators/generatorExplicitReturnType/input.ts.json index 0670a02214f3..1c57107cf0e2 100644 --- a/ecmascript/parser/tests/typescript/tsc/generators/generatorExplicitReturnType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/generators/generatorExplicitReturnType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -109,6 +108,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -125,8 +125,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "YieldExpression", @@ -194,7 +193,6 @@ "ctxt": 0 }, "value": "Generator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -247,7 +245,6 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -291,8 +288,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -360,7 +357,6 @@ "ctxt": 0 }, "value": "Generator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -428,6 +424,7 @@ "ctxt": 0 }, "value": "generator", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -450,7 +447,6 @@ "ctxt": 0 }, "value": "Generator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -491,8 +487,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -509,7 +504,6 @@ "ctxt": 0 }, "value": "g3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -553,6 +547,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -569,8 +564,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "YieldExpression", @@ -587,7 +581,6 @@ "ctxt": 0 }, "value": "generator", - "typeAnnotation": null, "optional": false }, "delegate": true @@ -640,7 +633,6 @@ "ctxt": 0 }, "value": "Generator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -693,7 +685,6 @@ "ctxt": 0 }, "value": "g4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -737,8 +728,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -755,7 +746,6 @@ "ctxt": 0 }, "value": "generator", - "typeAnnotation": null, "optional": false }, "delegate": true @@ -808,7 +798,6 @@ "ctxt": 0 }, "value": "Generator", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/generators/generatorImplicitAny/input.ts.json b/ecmascript/parser/tests/typescript/tsc/generators/generatorImplicitAny/input.ts.json index 855ae7bfb394..faae17f91b3d 100644 --- a/ecmascript/parser/tests/typescript/tsc/generators/generatorImplicitAny/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/generators/generatorImplicitAny/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "noop", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -115,6 +112,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -137,13 +135,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -179,7 +175,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -215,7 +210,6 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -259,8 +253,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -293,7 +287,6 @@ "ctxt": 0 }, "value": "g3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -337,6 +330,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -353,8 +347,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "YieldExpression", @@ -387,7 +380,6 @@ "ctxt": 0 }, "value": "g4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -464,7 +456,6 @@ "ctxt": 0 }, "value": "noop", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -503,7 +494,6 @@ "ctxt": 0 }, "value": "noop", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -534,7 +524,6 @@ "ctxt": 0 }, "value": "noop", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -624,7 +613,6 @@ "ctxt": 0 }, "value": "noop", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -648,7 +636,6 @@ "ctxt": 0 }, "value": "noop", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -754,7 +741,6 @@ "ctxt": 0 }, "value": "g5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -795,7 +781,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -833,7 +818,6 @@ "ctxt": 0 }, "value": "g6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -874,7 +858,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnContextualType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnContextualType/input.ts.json index 155f6e5a6777..abf777834196 100644 --- a/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnContextualType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnContextualType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,7 +59,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "Generator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -152,7 +149,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -217,7 +213,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -261,7 +256,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -309,7 +303,6 @@ "ctxt": 0 }, "value": "AsyncGenerator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -353,7 +346,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -418,7 +410,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -466,7 +457,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "property": { @@ -477,7 +467,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "computed": false @@ -503,7 +492,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -555,7 +543,6 @@ "ctxt": 0 }, "value": "AsyncGenerator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -599,7 +586,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -664,7 +650,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -708,8 +693,8 @@ "ctxt": 0 }, "value": "ret", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -729,7 +714,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -782,7 +766,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "property": { @@ -793,7 +776,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "computed": false @@ -809,7 +791,6 @@ "ctxt": 0 }, "value": "ret", - "typeAnnotation": null, "optional": false } } @@ -844,7 +825,6 @@ "ctxt": 0 }, "value": "AsyncGenerator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -888,7 +868,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeFallback.1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeFallback.1/input.ts.json index 9a372b26893a..b541f3f07746 100644 --- a/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeFallback.1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeFallback.1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeFallback.2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeFallback.2/input.ts.json index af9d6924ad61..d51d9f41cd1e 100644 --- a/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeFallback.2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeFallback.2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeFallback.3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeFallback.3/input.ts.json index 8233d40d894c..b3cb09d5fa50 100644 --- a/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeFallback.3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeFallback.3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,6 +59,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -76,8 +76,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "YieldExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeFallback.4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeFallback.4/input.ts.json index 02b5e61058d4..6b9e7e04f317 100644 --- a/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeFallback.4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeFallback.4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,6 +59,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -76,8 +76,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "YieldExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeFallback.5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeFallback.5/input.ts.json index 51a3f4604584..3a0a1c2cd18f 100644 --- a/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeFallback.5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeFallback.5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeIndirectReferenceToGlobalType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeIndirectReferenceToGlobalType/input.ts.json index a4f234d2377c..bde07c8000cc 100644 --- a/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeIndirectReferenceToGlobalType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeIndirectReferenceToGlobalType/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "Iterator", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -128,7 +126,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -172,8 +169,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -241,7 +238,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeInference/input.ts.json b/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeInference/input.ts.json index 6381b091ed42..290dc65184e2 100644 --- a/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeInference/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeInference/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "iterableIterator", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,7 +54,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -76,8 +76,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -109,6 +108,7 @@ "ctxt": 0 }, "value": "generator", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -131,7 +131,6 @@ "ctxt": 0 }, "value": "Generator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -172,8 +171,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -205,6 +203,7 @@ "ctxt": 0 }, "value": "never", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -221,8 +220,7 @@ }, "kind": "never" } - }, - "optional": false + } }, "init": null, "definite": false @@ -239,7 +237,6 @@ "ctxt": 0 }, "value": "g000", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -274,7 +271,6 @@ "ctxt": 0 }, "value": "g001", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -328,7 +324,6 @@ "ctxt": 0 }, "value": "g002", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -390,7 +385,6 @@ "ctxt": 0 }, "value": "g003", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -452,7 +446,6 @@ "ctxt": 0 }, "value": "g004", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -493,7 +486,6 @@ "ctxt": 0 }, "value": "iterableIterator", - "typeAnnotation": null, "optional": false }, "delegate": true @@ -516,7 +508,6 @@ "ctxt": 0 }, "value": "g005", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -560,8 +551,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -578,7 +569,6 @@ "ctxt": 0 }, "value": "generator", - "typeAnnotation": null, "optional": false }, "delegate": true @@ -604,7 +594,6 @@ "ctxt": 0 }, "value": "g006", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -692,7 +681,6 @@ "ctxt": 0 }, "value": "g007", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -733,7 +721,6 @@ "ctxt": 0 }, "value": "never", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -756,7 +743,6 @@ "ctxt": 0 }, "value": "g102", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -809,7 +795,6 @@ "ctxt": 0 }, "value": "g103", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -857,7 +842,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -868,7 +852,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -929,7 +912,6 @@ "ctxt": 0 }, "value": "g104", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -963,7 +945,6 @@ "ctxt": 0 }, "value": "never", - "typeAnnotation": null, "optional": false } } @@ -984,7 +965,6 @@ "ctxt": 0 }, "value": "g201", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1028,6 +1008,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1044,8 +1025,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "YieldExpression", @@ -1086,7 +1066,6 @@ "ctxt": 0 }, "value": "g202", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1130,6 +1109,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1146,8 +1126,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "YieldExpression", @@ -1196,6 +1175,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1212,8 +1192,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "YieldExpression", @@ -1254,7 +1233,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1275,6 +1253,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1291,8 +1270,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1334,7 +1312,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1355,6 +1332,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1371,8 +1349,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1414,7 +1391,6 @@ "ctxt": 0 }, "value": "g203", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1458,8 +1434,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1476,7 +1452,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1525,7 +1500,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1546,6 +1520,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1568,13 +1543,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1610,7 +1583,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1640,7 +1612,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1657,7 +1628,6 @@ "ctxt": 0 }, "value": "g204", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1701,8 +1671,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1719,7 +1689,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1768,7 +1737,6 @@ "ctxt": 0 }, "value": "g301", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1831,7 +1799,6 @@ "ctxt": 0 }, "value": "g302", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1902,7 +1869,6 @@ "ctxt": 0 }, "value": "g303", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1978,7 +1944,6 @@ "ctxt": 0 }, "value": "g304", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2062,7 +2027,6 @@ "ctxt": 0 }, "value": "g305", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2110,7 +2074,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -2121,7 +2084,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2212,7 +2174,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -2223,7 +2184,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2294,7 +2254,6 @@ "ctxt": 0 }, "value": "g306", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2338,6 +2297,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2367,8 +2327,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "YieldExpression", @@ -2426,7 +2385,6 @@ "ctxt": 0 }, "value": "g307", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2470,6 +2428,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2492,13 +2451,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "YieldExpression", @@ -2537,7 +2494,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2568,7 +2524,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2588,7 +2543,6 @@ "ctxt": 0 }, "value": "g308", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2609,6 +2563,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2631,13 +2586,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2680,6 +2633,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2702,13 +2656,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "YieldExpression", @@ -2725,7 +2677,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -2749,7 +2700,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2780,7 +2730,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2800,7 +2749,6 @@ "ctxt": 0 }, "value": "g309", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2821,6 +2769,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2843,13 +2792,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2868,6 +2815,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2890,13 +2838,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2939,6 +2885,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2961,13 +2908,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "YieldExpression", @@ -2984,7 +2929,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -3008,7 +2952,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -3039,7 +2982,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3060,7 +3002,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3081,7 +3022,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3101,7 +3041,6 @@ "ctxt": 0 }, "value": "g310", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3160,8 +3099,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -3189,8 +3128,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -3238,7 +3177,6 @@ "ctxt": 0 }, "value": "g311", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3328,6 +3266,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3344,8 +3283,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "YieldExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeInferenceNonStrict/input.ts.json b/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeInferenceNonStrict/input.ts.json index 459387d62274..2964256ca824 100644 --- a/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeInferenceNonStrict/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/generators/generatorReturnTypeInferenceNonStrict/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "iterableIterator", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,7 +54,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -76,8 +76,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -109,6 +108,7 @@ "ctxt": 0 }, "value": "generator", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -131,7 +131,6 @@ "ctxt": 0 }, "value": "Generator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -172,8 +171,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -205,6 +203,7 @@ "ctxt": 0 }, "value": "never", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -221,8 +220,7 @@ }, "kind": "never" } - }, - "optional": false + } }, "init": null, "definite": false @@ -239,7 +237,6 @@ "ctxt": 0 }, "value": "g000", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -274,7 +271,6 @@ "ctxt": 0 }, "value": "g001", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -328,7 +324,6 @@ "ctxt": 0 }, "value": "g002", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -390,7 +385,6 @@ "ctxt": 0 }, "value": "g003", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -452,7 +446,6 @@ "ctxt": 0 }, "value": "g004", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -493,7 +486,6 @@ "ctxt": 0 }, "value": "iterableIterator", - "typeAnnotation": null, "optional": false }, "delegate": true @@ -516,7 +508,6 @@ "ctxt": 0 }, "value": "g005", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -560,8 +551,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -578,7 +569,6 @@ "ctxt": 0 }, "value": "generator", - "typeAnnotation": null, "optional": false }, "delegate": true @@ -604,7 +594,6 @@ "ctxt": 0 }, "value": "g006", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -692,7 +681,6 @@ "ctxt": 0 }, "value": "g007", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -733,7 +721,6 @@ "ctxt": 0 }, "value": "never", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -756,7 +743,6 @@ "ctxt": 0 }, "value": "g102", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -809,7 +795,6 @@ "ctxt": 0 }, "value": "g103", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -857,7 +842,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -868,7 +852,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -929,7 +912,6 @@ "ctxt": 0 }, "value": "g104", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -963,7 +945,6 @@ "ctxt": 0 }, "value": "never", - "typeAnnotation": null, "optional": false } } @@ -984,7 +965,6 @@ "ctxt": 0 }, "value": "g201", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1028,6 +1008,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1044,8 +1025,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "YieldExpression", @@ -1086,7 +1066,6 @@ "ctxt": 0 }, "value": "g202", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1130,6 +1109,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1146,8 +1126,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "YieldExpression", @@ -1196,6 +1175,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1212,8 +1192,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "YieldExpression", @@ -1254,7 +1233,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1275,6 +1253,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1291,8 +1270,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1334,7 +1312,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1355,6 +1332,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1371,8 +1349,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1414,7 +1391,6 @@ "ctxt": 0 }, "value": "g203", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1458,8 +1434,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1476,7 +1452,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1525,7 +1500,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1546,6 +1520,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1568,13 +1543,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1610,7 +1583,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1640,7 +1612,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1657,7 +1628,6 @@ "ctxt": 0 }, "value": "g204", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1701,8 +1671,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1719,7 +1689,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1768,7 +1737,6 @@ "ctxt": 0 }, "value": "g301", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1831,7 +1799,6 @@ "ctxt": 0 }, "value": "g302", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1902,7 +1869,6 @@ "ctxt": 0 }, "value": "g303", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1978,7 +1944,6 @@ "ctxt": 0 }, "value": "g304", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2062,7 +2027,6 @@ "ctxt": 0 }, "value": "g305", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2110,7 +2074,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -2121,7 +2084,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2212,7 +2174,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -2223,7 +2184,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2294,7 +2254,6 @@ "ctxt": 0 }, "value": "g306", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2338,6 +2297,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2367,8 +2327,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "YieldExpression", @@ -2426,7 +2385,6 @@ "ctxt": 0 }, "value": "g307", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2470,6 +2428,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2492,13 +2451,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "YieldExpression", @@ -2537,7 +2494,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2568,7 +2524,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2588,7 +2543,6 @@ "ctxt": 0 }, "value": "g308", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2609,6 +2563,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2631,13 +2586,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2680,6 +2633,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2702,13 +2656,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "YieldExpression", @@ -2725,7 +2677,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -2749,7 +2700,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2780,7 +2730,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2800,7 +2749,6 @@ "ctxt": 0 }, "value": "g309", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2821,6 +2769,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2843,13 +2792,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2868,6 +2815,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2890,13 +2838,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2939,6 +2885,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2961,13 +2908,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "YieldExpression", @@ -2984,7 +2929,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -3008,7 +2952,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -3039,7 +2982,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3060,7 +3002,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3081,7 +3022,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3101,7 +3041,6 @@ "ctxt": 0 }, "value": "g310", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3160,8 +3099,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -3189,8 +3128,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -3238,7 +3177,6 @@ "ctxt": 0 }, "value": "g311", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3328,6 +3266,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3344,8 +3283,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "YieldExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/generators/generatorYieldContextualType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/generators/generatorYieldContextualType/input.ts.json index e46946226cb3..985d9b34cee6 100644 --- a/ecmascript/parser/tests/typescript/tsc/generators/generatorYieldContextualType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/generators/generatorYieldContextualType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "gen", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -75,7 +75,6 @@ "ctxt": 0 }, "value": "Generator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -101,7 +100,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -121,7 +119,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -141,7 +138,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -151,8 +147,7 @@ } } } - }, - "optional": false + } } } ], @@ -188,7 +183,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -209,7 +203,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -230,7 +223,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -278,7 +270,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -327,8 +318,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -451,7 +442,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -472,6 +462,7 @@ "ctxt": 0 }, "value": "gen", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -518,7 +509,6 @@ "ctxt": 0 }, "value": "Generator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -544,7 +534,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -564,7 +553,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -584,7 +572,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -607,7 +594,6 @@ "ctxt": 0 }, "value": "AsyncGenerator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -633,7 +619,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -653,7 +638,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -673,7 +657,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -685,8 +668,7 @@ } } } - }, - "optional": false + } } } ], @@ -722,7 +704,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -743,7 +724,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -764,7 +744,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -812,7 +791,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -861,8 +839,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/generators/restParameterInDownlevelGenerator/input.ts.json b/ecmascript/parser/tests/typescript/tsc/generators/restParameterInDownlevelGenerator/input.ts.json index a8a51fc71b2b..df36f0529c78 100644 --- a/ecmascript/parser/tests/typescript/tsc/generators/restParameterInDownlevelGenerator/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/generators/restParameterInDownlevelGenerator/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "mergeStringLists", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,8 +48,8 @@ "ctxt": 0 }, "value": "strings", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -127,8 +126,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -143,7 +142,6 @@ "ctxt": 0 }, "value": "strings", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/genericAndNonGenericInterfaceWithTheSameName/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/genericAndNonGenericInterfaceWithTheSameName/input.ts.json index 3b4a0b768cf6..41b3fd53ece4 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/genericAndNonGenericInterfaceWithTheSameName/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/genericAndNonGenericInterfaceWithTheSameName/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -122,7 +119,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -155,7 +151,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -212,7 +206,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -238,7 +231,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -265,7 +257,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -298,7 +289,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -327,7 +317,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -353,7 +342,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -383,7 +371,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -432,7 +419,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -458,7 +444,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -488,7 +473,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -537,7 +521,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -563,7 +546,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -590,7 +572,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -623,7 +604,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -652,7 +632,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -683,7 +662,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "body": { @@ -716,7 +694,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -746,7 +723,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -796,7 +772,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "body": { @@ -829,7 +804,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -856,7 +830,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -889,7 +862,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -918,7 +890,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/genericAndNonGenericInterfaceWithTheSameName2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/genericAndNonGenericInterfaceWithTheSameName2/input.ts.json index 4a20fc72c5e8..f1622d62f2c1 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/genericAndNonGenericInterfaceWithTheSameName2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/genericAndNonGenericInterfaceWithTheSameName2/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -76,7 +74,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -138,7 +134,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -169,7 +164,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -195,7 +189,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -225,7 +218,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -274,7 +266,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { @@ -302,7 +293,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -328,7 +318,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -355,7 +344,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -388,7 +376,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -417,7 +404,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -448,7 +434,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -474,7 +459,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -504,7 +488,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergeThreeInterfaces/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergeThreeInterfaces/input.ts.json index 9d4983418239..7634a46f8b9c 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergeThreeInterfaces/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergeThreeInterfaces/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -125,7 +122,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -199,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -253,6 +247,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -275,13 +270,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -313,8 +306,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -331,7 +324,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -342,7 +334,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -376,8 +367,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -394,7 +385,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -405,7 +395,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -439,8 +428,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -457,7 +446,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -468,7 +456,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -492,7 +479,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -519,7 +505,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -552,7 +537,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -581,7 +565,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -607,7 +590,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -634,7 +616,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -667,7 +648,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -696,7 +676,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -722,7 +701,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -749,7 +727,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -782,7 +759,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -811,7 +787,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -847,6 +822,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -869,7 +845,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -892,8 +867,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -925,8 +899,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -943,7 +917,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -954,7 +927,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -988,8 +960,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1006,7 +978,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1017,7 +988,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1051,8 +1021,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1069,7 +1039,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1080,7 +1049,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1106,7 +1074,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -1132,7 +1099,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1162,7 +1128,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1206,7 +1171,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1236,7 +1200,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1280,7 +1243,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1310,7 +1272,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1364,6 +1325,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1386,13 +1348,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1424,8 +1384,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1442,7 +1402,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1453,7 +1412,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1487,8 +1445,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1505,7 +1463,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1516,7 +1473,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1550,8 +1506,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1568,7 +1524,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1579,7 +1534,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1603,7 +1557,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1630,7 +1583,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1663,7 +1615,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1692,7 +1643,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1718,7 +1668,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1745,7 +1694,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1778,7 +1726,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1807,7 +1754,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1833,7 +1779,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1860,7 +1805,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1893,7 +1837,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1922,7 +1865,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1958,6 +1900,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1980,7 +1923,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2003,8 +1945,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2036,8 +1977,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2054,7 +1995,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2065,7 +2005,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2099,8 +2038,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2117,7 +2056,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2128,7 +2066,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2162,8 +2099,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2180,7 +2117,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2191,7 +2127,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergeThreeInterfaces2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergeThreeInterfaces2/input.ts.json index a380c6d3f420..ada914a8acbb 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergeThreeInterfaces2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergeThreeInterfaces2/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -141,6 +138,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -163,13 +161,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -201,8 +197,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -219,7 +215,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -230,7 +225,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -264,8 +258,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -282,7 +276,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -293,7 +286,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -322,7 +314,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -355,7 +346,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -385,7 +375,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -437,7 +426,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -467,7 +455,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -522,6 +509,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -544,13 +532,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -582,8 +568,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -600,7 +586,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -611,7 +596,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -645,8 +629,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -663,7 +647,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -674,7 +657,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -708,8 +690,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -726,7 +708,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -737,7 +718,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -766,7 +746,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -801,7 +780,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "body": { @@ -834,7 +812,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -864,7 +841,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -919,6 +895,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -941,13 +918,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -979,8 +954,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -997,7 +972,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1008,7 +982,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1042,8 +1015,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1060,7 +1033,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1071,7 +1043,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1104,7 +1075,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -1139,7 +1109,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "body": { @@ -1172,7 +1141,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1202,7 +1170,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1257,6 +1224,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1279,13 +1247,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1317,8 +1283,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1335,7 +1301,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1346,7 +1311,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1380,8 +1344,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1398,7 +1362,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1409,7 +1372,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1443,8 +1405,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1461,7 +1423,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1472,7 +1433,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1505,7 +1465,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -1540,7 +1499,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "body": { @@ -1573,7 +1531,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1603,7 +1560,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1658,6 +1614,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1680,13 +1637,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1718,8 +1673,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1736,7 +1691,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1747,7 +1701,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1781,8 +1734,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1799,7 +1752,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1810,7 +1762,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1844,8 +1795,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1862,7 +1813,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1873,7 +1823,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergeTwoInterfaces/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergeTwoInterfaces/input.ts.json index 63147de99428..a3ea629f8ce8 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergeTwoInterfaces/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergeTwoInterfaces/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -125,7 +122,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -179,6 +175,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -201,13 +198,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -239,8 +234,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -257,7 +252,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -268,7 +262,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -302,8 +295,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -320,7 +313,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -331,7 +323,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -355,7 +346,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -382,7 +372,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -415,7 +404,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -457,7 +445,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -486,7 +473,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -512,7 +498,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -539,7 +524,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -572,7 +556,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -601,7 +584,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -637,6 +619,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -659,7 +642,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -682,8 +664,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -715,8 +696,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -733,7 +714,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -744,7 +724,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -778,8 +757,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -796,7 +775,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -807,7 +785,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -833,7 +810,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -859,7 +835,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -889,7 +864,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -933,7 +907,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -963,7 +936,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1017,6 +989,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1039,13 +1012,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1077,8 +1048,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1095,7 +1066,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1106,7 +1076,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1140,8 +1109,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1158,7 +1127,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1169,7 +1137,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1193,7 +1160,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1220,7 +1186,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1253,7 +1218,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1282,7 +1246,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1308,7 +1271,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1335,7 +1297,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1368,7 +1329,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1397,7 +1357,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1433,6 +1392,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1455,7 +1415,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1478,8 +1437,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1511,8 +1469,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1529,7 +1487,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1540,7 +1497,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1574,8 +1530,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1592,7 +1548,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1603,7 +1558,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergeTwoInterfaces2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergeTwoInterfaces2/input.ts.json index 4cc621afc804..6a5fc347b689 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergeTwoInterfaces2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergeTwoInterfaces2/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -141,6 +138,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -163,13 +161,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -201,8 +197,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -219,7 +215,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -230,7 +225,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -264,8 +258,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -282,7 +276,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -293,7 +286,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -322,7 +314,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -355,7 +346,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -385,7 +375,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -440,6 +429,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -462,13 +452,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -500,8 +488,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -518,7 +506,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -529,7 +516,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -563,8 +549,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -581,7 +567,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -592,7 +577,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -621,7 +605,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -656,7 +639,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "body": { @@ -689,7 +671,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -719,7 +700,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -774,6 +754,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -796,13 +777,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -834,8 +813,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -852,7 +831,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -863,7 +841,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -897,8 +874,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -915,7 +892,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -926,7 +902,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -959,7 +934,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -994,7 +968,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "body": { @@ -1027,7 +1000,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1057,7 +1029,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1112,6 +1083,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1134,13 +1106,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1172,8 +1142,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1190,7 +1160,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1201,7 +1170,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1235,8 +1203,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1253,7 +1221,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1264,7 +1231,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInheritedMembersSatisfyAbstractBase/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInheritedMembersSatisfyAbstractBase/input.ts.json index 426dbae68b6e..fb1fa26f3b0e 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInheritedMembersSatisfyAbstractBase/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInheritedMembersSatisfyAbstractBase/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "BaseClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Broken", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "BaseClass", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -132,7 +128,6 @@ "ctxt": 0 }, "value": "IGetters", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -162,7 +157,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -206,7 +200,6 @@ "ctxt": 0 }, "value": "Broken", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -227,7 +220,6 @@ "ctxt": 0 }, "value": "IGetters", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -272,7 +264,6 @@ "ctxt": 0 }, "value": "Broken", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -286,7 +277,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -302,7 +292,6 @@ "ctxt": 0 }, "value": "IncorrectlyExtends", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -321,7 +310,6 @@ "ctxt": 0 }, "value": "BaseClass", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -344,7 +332,6 @@ "ctxt": 0 }, "value": "IncorrectGetters", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -374,7 +361,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -418,7 +404,6 @@ "ctxt": 0 }, "value": "IncorrectlyExtends", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -439,7 +424,6 @@ "ctxt": 0 }, "value": "IncorrectGetters", - "typeAnnotation": null, "optional": false }, "typeArguments": null diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithConflictingPropertyNames/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithConflictingPropertyNames/input.ts.json index f16be35803ec..0f3b6c867d7f 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithConflictingPropertyNames/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithConflictingPropertyNames/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -125,7 +122,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -171,7 +167,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -197,7 +192,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -224,7 +218,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -257,7 +250,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -286,7 +278,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -312,7 +303,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -339,7 +329,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -372,7 +361,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -421,7 +409,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -447,7 +434,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -474,7 +460,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -507,7 +492,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -536,7 +520,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -567,7 +550,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -593,7 +575,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -620,7 +601,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -653,7 +633,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -702,7 +681,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "body": { @@ -735,7 +713,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -762,7 +739,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -795,7 +771,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -824,7 +799,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -856,7 +830,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "body": { @@ -889,7 +862,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -916,7 +888,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -949,7 +920,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithConflictingPropertyNames2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithConflictingPropertyNames2/input.ts.json index 6aed09d04b8c..4df2ba1daa40 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithConflictingPropertyNames2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithConflictingPropertyNames2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -125,7 +122,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -171,7 +167,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -197,7 +192,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -224,7 +218,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -257,7 +250,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -286,7 +278,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -312,7 +303,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -339,7 +329,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -372,7 +361,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -401,7 +389,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -432,7 +419,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -458,7 +444,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -485,7 +470,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -518,7 +502,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -547,7 +530,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -578,7 +560,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -604,7 +585,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -631,7 +611,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -664,7 +643,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -693,7 +671,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -724,7 +701,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "body": { @@ -757,7 +733,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -784,7 +759,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -817,7 +791,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -846,7 +819,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -878,7 +850,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "body": { @@ -911,7 +882,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -938,7 +908,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -971,7 +940,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1000,7 +968,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithIndexers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithIndexers/input.ts.json index e81fae6bdf8c..819c44841021 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithIndexers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithIndexers/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -108,7 +107,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -133,6 +131,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -149,8 +148,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -184,7 +182,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -248,6 +245,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -270,13 +268,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -308,8 +304,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -326,7 +322,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -369,8 +364,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -387,7 +382,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -435,8 +429,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -453,7 +447,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithIndexers2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithIndexers2/input.ts.json index a6fb45633736..3a21f82a3032 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithIndexers2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithIndexers2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -108,7 +107,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -133,6 +131,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -149,8 +148,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -184,7 +182,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -238,7 +235,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -263,6 +259,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -279,8 +276,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -370,7 +366,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -395,6 +390,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -411,8 +407,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -446,7 +441,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -534,7 +528,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates/input.ts.json index 42395275c724..39eb6bf15df0 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -220,7 +214,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -259,7 +252,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -285,7 +277,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -331,7 +322,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -377,7 +367,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -429,7 +418,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -446,7 +434,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -472,7 +459,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -518,7 +504,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -564,7 +549,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -616,7 +600,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -648,6 +631,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -670,13 +654,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -708,8 +690,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -726,7 +708,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -737,7 +718,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates2/input.ts.json index 89d5b670740e..ad73a35f6de1 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false }, "value": null, @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -220,7 +214,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -264,7 +257,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -285,7 +277,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -315,7 +306,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -354,7 +344,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -380,7 +369,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false }, "value": null, @@ -426,7 +414,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -472,7 +459,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -512,7 +498,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -534,7 +519,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -551,7 +535,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -577,7 +560,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false }, "value": null, @@ -623,7 +605,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -669,7 +650,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -709,7 +689,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -731,7 +710,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -763,6 +741,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,13 +764,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -823,8 +800,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -841,7 +818,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -852,7 +828,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -886,8 +861,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -904,7 +879,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -915,7 +889,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates3/input.ts.json index 26f0c600ee15..280dd062f3e5 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -220,7 +214,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -264,7 +257,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -285,7 +277,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -315,7 +306,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -354,7 +344,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -380,7 +369,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -426,7 +414,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -466,7 +453,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -488,7 +474,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -512,7 +497,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -533,7 +517,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -559,7 +542,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -607,7 +589,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -633,7 +614,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -686,7 +666,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -707,7 +686,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -737,7 +715,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -781,7 +758,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -802,7 +778,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -832,7 +807,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithMultipleBases/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithMultipleBases/input.ts.json index 8255cb6d432a..4e27005ed3b2 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithMultipleBases/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithMultipleBases/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -220,7 +214,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -264,7 +257,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -285,7 +277,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -315,7 +306,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -354,7 +344,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -380,7 +369,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -426,7 +414,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -472,7 +459,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -518,7 +504,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -570,7 +555,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -602,6 +586,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -624,13 +609,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -662,8 +645,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -680,7 +663,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -691,7 +673,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -717,7 +698,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -738,7 +718,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -764,7 +743,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -790,7 +768,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -832,7 +809,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -853,7 +829,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -879,7 +854,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -905,7 +879,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -947,7 +920,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -973,7 +945,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1000,7 +971,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1024,7 +994,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1050,7 +1019,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1083,7 +1051,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1112,7 +1079,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1138,7 +1104,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1165,7 +1130,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1189,7 +1153,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1237,7 +1200,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1266,7 +1228,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1287,7 +1248,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1313,7 +1273,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1359,7 +1318,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1405,7 +1363,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1451,7 +1408,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1503,7 +1459,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": { diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithMultipleBases2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithMultipleBases2/input.ts.json index a8a18cc7fc9a..6cf608bfcb6e 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithMultipleBases2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithMultipleBases2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -238,7 +232,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -264,7 +257,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -317,7 +309,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -338,7 +329,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -358,7 +348,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -388,7 +377,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -432,7 +420,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -453,7 +440,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -473,7 +459,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -503,7 +488,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -542,7 +526,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -568,7 +551,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -614,7 +596,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -660,7 +641,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -706,7 +686,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -752,7 +731,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -798,7 +776,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -850,7 +827,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -882,6 +858,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -904,13 +881,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -942,8 +917,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -960,7 +935,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -971,7 +945,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -997,7 +970,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -1018,7 +990,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1044,7 +1015,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1070,7 +1040,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1112,7 +1081,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1133,7 +1101,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1159,7 +1126,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1185,7 +1151,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1227,7 +1192,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1248,7 +1212,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1274,7 +1237,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1300,7 +1262,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1342,7 +1303,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1363,7 +1323,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1389,7 +1348,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1415,7 +1373,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1457,7 +1414,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1483,7 +1439,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1510,7 +1465,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1534,7 +1488,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1560,7 +1513,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1583,7 +1535,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1609,7 +1560,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1642,7 +1592,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1671,7 +1620,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1697,7 +1645,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1724,7 +1671,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1748,7 +1694,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1786,7 +1731,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1834,7 +1778,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1863,7 +1806,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1884,7 +1826,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1910,7 +1851,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1956,7 +1896,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2002,7 +1941,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2048,7 +1986,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2094,7 +2031,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2140,7 +2076,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2192,7 +2127,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": { diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithMultipleBases3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithMultipleBases3/input.ts.json index 19e7e2e7d687..4a9d7d939f72 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithMultipleBases3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithMultipleBases3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -157,7 +152,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -183,7 +177,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -225,7 +218,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -246,7 +238,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -272,7 +263,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -298,7 +288,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -340,7 +329,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -361,7 +349,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -387,7 +374,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -413,7 +399,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -455,7 +440,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -481,7 +465,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -508,7 +491,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -532,7 +514,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -570,7 +551,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -618,7 +598,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -647,7 +626,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -673,7 +651,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -700,7 +677,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -724,7 +700,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -762,7 +737,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -810,7 +784,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -839,7 +812,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -860,7 +832,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -886,7 +857,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -932,7 +902,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -958,7 +927,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -989,7 +957,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1035,7 +1002,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1081,7 +1047,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1127,7 +1092,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1179,7 +1143,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": { diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithMultipleBases4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithMultipleBases4/input.ts.json index 2b7ee5a2fdb8..3350fc7755d4 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithMultipleBases4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/mergedInterfacesWithMultipleBases4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -157,7 +152,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -183,7 +177,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -225,7 +218,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -246,7 +238,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -272,7 +263,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -298,7 +288,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -340,7 +329,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -361,7 +349,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -387,7 +374,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -413,7 +399,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -455,7 +440,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -481,7 +465,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -508,7 +491,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -532,7 +514,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -570,7 +551,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -618,7 +598,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -647,7 +626,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -673,7 +651,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -700,7 +677,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -724,7 +700,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -762,7 +737,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -810,7 +784,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -839,7 +812,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -860,7 +832,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -886,7 +857,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -932,7 +902,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -978,7 +947,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1024,7 +992,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1070,7 +1037,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1116,7 +1082,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1168,7 +1133,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": { diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName/input.ts.json index c330dc4ddf20..971f64b3e058 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -136,7 +132,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -163,7 +158,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -196,7 +190,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -225,7 +218,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -251,7 +243,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -278,7 +269,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -299,7 +289,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -332,7 +321,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -361,7 +349,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -387,7 +374,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -414,7 +400,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -435,7 +420,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -468,7 +452,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -497,7 +480,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -525,7 +507,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -551,7 +532,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -578,7 +558,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -611,7 +590,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -640,7 +618,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -666,7 +643,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -693,7 +669,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -726,7 +701,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -755,7 +729,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -781,7 +754,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -808,7 +780,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -829,7 +800,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -862,7 +832,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -891,7 +860,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -917,7 +885,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -944,7 +911,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -965,7 +931,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -998,7 +963,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1027,7 +991,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1058,7 +1021,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -1084,7 +1046,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1111,7 +1072,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1132,7 +1092,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1165,7 +1124,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1194,7 +1152,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1225,7 +1182,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -1251,7 +1207,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1278,7 +1233,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1299,7 +1253,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1332,7 +1285,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1361,7 +1313,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1392,7 +1343,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "body": { @@ -1425,7 +1375,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1452,7 +1401,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1473,7 +1421,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1506,7 +1453,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1535,7 +1481,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1567,7 +1512,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "body": { @@ -1600,7 +1544,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1627,7 +1570,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1648,7 +1590,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1681,7 +1622,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1710,7 +1650,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName2/input.ts.json index 777daced285b..8bb7ee95d715 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -102,7 +99,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -157,7 +152,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,7 +178,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -205,7 +198,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -238,7 +230,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -267,7 +258,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -295,7 +285,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -321,7 +310,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -348,7 +336,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -369,7 +356,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -402,7 +388,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -431,7 +416,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -457,7 +441,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -484,7 +467,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -505,7 +487,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -538,7 +519,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -567,7 +547,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -598,7 +577,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -624,7 +602,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -651,7 +628,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -672,7 +648,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -705,7 +680,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -734,7 +708,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -765,7 +738,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -791,7 +763,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -818,7 +789,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -839,7 +809,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -872,7 +841,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -901,7 +869,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -932,7 +899,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "body": { @@ -965,7 +931,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -992,7 +957,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1013,7 +977,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1046,7 +1009,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1075,7 +1037,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1107,7 +1068,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "body": { @@ -1140,7 +1100,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1167,7 +1126,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1188,7 +1146,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1221,7 +1178,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1250,7 +1206,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints/input.ts.json index 4be1ac18555d..eadf6b01fffb 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -66,7 +64,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -129,7 +125,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -155,7 +150,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -182,7 +176,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -200,7 +193,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -234,7 +226,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -263,7 +254,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -291,7 +281,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -317,7 +306,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -344,7 +332,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -362,7 +349,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -388,7 +374,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -425,7 +410,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -454,7 +438,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -480,7 +463,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -507,7 +489,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -525,7 +506,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -577,7 +557,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -606,7 +585,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -637,7 +615,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -663,7 +640,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -690,7 +666,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -708,7 +683,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -742,7 +716,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -771,7 +744,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -802,7 +774,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -828,7 +799,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -855,7 +825,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -873,7 +842,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -907,7 +875,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -936,7 +903,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -967,7 +933,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "body": { @@ -1000,7 +965,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1027,7 +991,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1045,7 +1008,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1079,7 +1041,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1108,7 +1069,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1140,7 +1100,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "body": { @@ -1173,7 +1132,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1200,7 +1158,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1218,7 +1175,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1252,7 +1208,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1281,7 +1236,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1311,7 +1265,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1338,7 +1291,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1379,7 +1331,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1408,7 +1359,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1432,7 +1382,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1461,7 +1410,6 @@ "ctxt": 0 }, "value": "Constraint", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1487,7 +1435,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1516,7 +1463,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1543,7 +1489,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1576,7 +1521,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1605,7 +1549,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1629,7 +1572,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1658,7 +1600,6 @@ "ctxt": 0 }, "value": "Constraint", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1684,7 +1625,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1713,7 +1653,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1740,7 +1679,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1773,7 +1711,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1802,7 +1739,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1828,7 +1764,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1855,7 +1790,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1896,7 +1830,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1925,7 +1858,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1951,7 +1883,6 @@ "ctxt": 0 }, "value": "Constraint", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1978,7 +1909,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoGenericInterfacesWithTheSameNameButDifferentArity/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoGenericInterfacesWithTheSameNameButDifferentArity/input.ts.json index ecedb8f9050a..842a11e2abaf 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoGenericInterfacesWithTheSameNameButDifferentArity/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoGenericInterfacesWithTheSameNameButDifferentArity/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -136,7 +132,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -163,7 +158,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -184,7 +178,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -217,7 +210,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -246,7 +238,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -274,7 +265,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -300,7 +290,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -327,7 +316,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -360,7 +348,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -389,7 +376,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -415,7 +401,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -442,7 +427,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -463,7 +447,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -496,7 +479,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -525,7 +507,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -556,7 +537,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -582,7 +562,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -609,7 +588,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -642,7 +620,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -671,7 +648,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -702,7 +678,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -728,7 +703,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -755,7 +729,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -776,7 +749,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -809,7 +781,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -838,7 +809,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -869,7 +839,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "body": { @@ -902,7 +871,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -929,7 +897,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -962,7 +929,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -991,7 +957,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1023,7 +988,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "body": { @@ -1056,7 +1020,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1083,7 +1046,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1104,7 +1066,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1137,7 +1098,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1166,7 +1126,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoInterfacesDifferentRootModule/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoInterfacesDifferentRootModule/input.ts.json index e25daa0ada3f..02b09960935e 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoInterfacesDifferentRootModule/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoInterfacesDifferentRootModule/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -138,7 +135,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -165,7 +161,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -198,7 +193,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -227,7 +221,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -259,7 +252,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -292,7 +284,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -322,7 +313,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -377,6 +367,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -399,13 +390,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -437,8 +426,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -455,7 +444,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -466,7 +454,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -500,8 +487,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -518,7 +505,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -529,7 +515,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -560,7 +545,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -587,7 +571,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -620,7 +603,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -649,7 +631,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -686,6 +667,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -708,7 +690,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -731,8 +712,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -764,8 +744,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -782,7 +762,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -793,7 +772,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -827,8 +805,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -845,7 +823,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -856,7 +833,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoInterfacesDifferentRootModule2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoInterfacesDifferentRootModule2/input.ts.json index 410d548d1486..b661bfe8c11d 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoInterfacesDifferentRootModule2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoInterfacesDifferentRootModule2/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -138,7 +135,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -165,7 +161,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -198,7 +193,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -227,7 +221,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -256,7 +249,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -289,7 +281,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -319,7 +310,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -374,6 +364,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -396,13 +387,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -434,8 +423,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -452,7 +441,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -463,7 +451,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -497,8 +484,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -515,7 +502,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -526,7 +512,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -557,7 +542,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -584,7 +568,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -617,7 +600,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -646,7 +628,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -683,6 +664,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -705,7 +687,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -728,8 +709,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -761,8 +741,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -779,7 +759,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -790,7 +769,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -824,8 +802,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -842,7 +820,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -853,7 +830,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -890,6 +866,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -912,13 +889,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -950,8 +925,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -968,7 +943,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -979,7 +953,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1013,8 +986,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1031,7 +1004,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1042,7 +1014,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1076,6 +1047,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1098,7 +1070,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1121,8 +1092,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1154,8 +1124,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1172,7 +1142,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1183,7 +1152,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1217,8 +1185,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1235,7 +1203,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1246,7 +1213,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoMergedInterfacesWithDifferingOverloads/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoMergedInterfacesWithDifferingOverloads/input.ts.json index 69ed756b8aeb..a98188dec6bc 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoMergedInterfacesWithDifferingOverloads/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoMergedInterfacesWithDifferingOverloads/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -65,6 +63,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -81,8 +80,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -120,7 +118,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -134,6 +131,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -150,8 +148,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -191,7 +188,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -221,7 +217,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -235,6 +230,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -257,13 +253,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -288,7 +282,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -314,7 +307,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -341,7 +333,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -374,7 +365,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -388,6 +378,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -410,13 +401,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -454,7 +443,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -468,6 +456,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -484,8 +473,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -525,7 +513,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -552,7 +539,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -585,7 +571,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -599,6 +584,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -621,13 +607,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -652,7 +636,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -676,7 +659,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -690,6 +672,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -712,13 +695,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -768,6 +749,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -790,7 +772,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -813,8 +794,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -846,8 +826,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -871,7 +851,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -882,7 +861,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -922,7 +900,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -949,7 +926,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -970,7 +946,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1003,7 +978,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1017,6 +991,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1039,13 +1014,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1055,6 +1028,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1077,13 +1051,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1121,7 +1093,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1135,6 +1106,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1151,8 +1123,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1162,6 +1133,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1178,8 +1150,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -1219,7 +1190,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1246,7 +1216,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1267,7 +1236,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1300,7 +1268,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1314,6 +1281,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1336,13 +1304,11 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1352,6 +1318,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1374,13 +1341,11 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1405,7 +1370,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1434,7 +1398,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1471,6 +1434,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1493,7 +1457,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1528,7 +1491,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1536,8 +1498,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1569,8 +1530,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1594,7 +1555,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1605,7 +1565,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1657,7 +1616,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1684,7 +1642,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1705,7 +1662,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1738,7 +1694,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1767,7 +1722,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1791,7 +1745,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1820,7 +1773,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1844,7 +1796,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1858,6 +1809,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1880,13 +1832,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1896,6 +1846,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1918,13 +1869,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1949,7 +1898,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1978,7 +1926,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2005,7 +1952,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2032,7 +1978,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2053,7 +1998,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2086,7 +2030,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2100,6 +2043,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2122,13 +2066,11 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2138,6 +2080,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2160,13 +2103,11 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -2191,7 +2132,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2220,7 +2160,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2257,6 +2196,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2279,7 +2219,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2314,7 +2253,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2322,8 +2260,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2355,8 +2292,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2380,7 +2317,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -2391,7 +2327,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoMergedInterfacesWithDifferingOverloads2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoMergedInterfacesWithDifferingOverloads2/input.ts.json index 7e524ce85376..a82fe25734b3 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoMergedInterfacesWithDifferingOverloads2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/declarationMerging/twoMergedInterfacesWithDifferingOverloads2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -78,6 +77,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -94,8 +94,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -135,7 +134,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -165,6 +163,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -181,8 +180,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -192,6 +190,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -208,8 +207,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -259,6 +257,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -281,13 +280,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -319,8 +316,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -337,7 +334,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -372,8 +368,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -390,7 +386,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -438,8 +433,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -456,7 +451,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -508,7 +502,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "body": { @@ -534,7 +527,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -561,7 +553,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -621,6 +612,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -643,13 +635,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -674,7 +664,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -700,7 +689,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -727,7 +715,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -760,6 +747,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -782,13 +770,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -798,6 +784,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -814,8 +801,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -840,7 +826,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -864,6 +849,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -886,13 +872,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -902,6 +886,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -924,13 +909,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -955,7 +938,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -984,7 +966,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1021,6 +1002,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1043,7 +1025,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1066,8 +1047,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1099,8 +1079,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1117,7 +1097,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1152,8 +1131,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1170,7 +1149,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1218,8 +1196,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1236,7 +1214,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1296,8 +1273,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1314,7 +1291,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/asiPreventsParsingAsInterface01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/asiPreventsParsingAsInterface01/input.ts.json index 629bd79a0f5f..64e0cbf650f7 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/asiPreventsParsingAsInterface01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/asiPreventsParsingAsInterface01/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "interface", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -68,6 +68,7 @@ "ctxt": 0 }, "value": "I", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,8 +85,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -107,7 +107,6 @@ "ctxt": 0 }, "value": "interface", - "typeAnnotation": null, "optional": false } }, @@ -126,7 +125,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/asiPreventsParsingAsInterface02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/asiPreventsParsingAsInterface02/input.ts.json index 67283c60b849..67f1b37ecbce 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/asiPreventsParsingAsInterface02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/asiPreventsParsingAsInterface02/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "interface", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -73,6 +72,7 @@ "ctxt": 0 }, "value": "I", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -89,8 +89,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -123,7 +122,6 @@ "ctxt": 0 }, "value": "interface", - "typeAnnotation": null, "optional": false } }, @@ -142,7 +140,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/asiPreventsParsingAsInterface03/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/asiPreventsParsingAsInterface03/input.ts.json index 05d29af68939..b435d9fb7016 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/asiPreventsParsingAsInterface03/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/asiPreventsParsingAsInterface03/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "interface", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -68,6 +68,7 @@ "ctxt": 0 }, "value": "I", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,8 +85,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -109,7 +109,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "body": { @@ -135,7 +134,6 @@ "ctxt": 0 }, "value": "interface", - "typeAnnotation": null, "optional": false } }, @@ -154,7 +152,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/asiPreventsParsingAsInterface04/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/asiPreventsParsingAsInterface04/input.ts.json index 982f1344f333..c5b66391f6f0 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/asiPreventsParsingAsInterface04/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/asiPreventsParsingAsInterface04/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "declare", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -68,6 +68,7 @@ "ctxt": 0 }, "value": "interface", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,8 +85,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -105,6 +105,7 @@ "ctxt": 0 }, "value": "I", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,8 +122,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -144,7 +144,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": true, diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/derivedInterfaceDoesNotHideBaseSignatures/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/derivedInterfaceDoesNotHideBaseSignatures/input.ts.json index f6f609aca956..e13cfe16a31a 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/derivedInterfaceDoesNotHideBaseSignatures/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/derivedInterfaceDoesNotHideBaseSignatures/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -78,6 +77,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -94,8 +94,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -135,7 +134,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -156,7 +154,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -213,6 +210,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -229,8 +227,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/derivedInterfaceIncompatibleWithBaseIndexer/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/derivedInterfaceIncompatibleWithBaseIndexer/input.ts.json index dc319a867f0c..f2adb9fc5c06 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/derivedInterfaceIncompatibleWithBaseIndexer/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/derivedInterfaceIncompatibleWithBaseIndexer/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -97,7 +96,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -139,7 +137,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -186,6 +183,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -202,8 +200,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -237,7 +234,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -291,7 +287,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -312,7 +307,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -378,7 +372,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -427,7 +420,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -448,7 +440,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -519,7 +510,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -568,7 +558,6 @@ "ctxt": 0 }, "value": "Derived3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -589,7 +578,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -619,7 +607,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -657,7 +644,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -706,7 +692,6 @@ "ctxt": 0 }, "value": "Derived4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -727,7 +712,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -757,7 +741,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -794,7 +777,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -843,7 +825,6 @@ "ctxt": 0 }, "value": "Derived5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -864,7 +845,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -930,7 +910,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -979,7 +958,6 @@ "ctxt": 0 }, "value": "Derived5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1000,7 +978,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1071,7 +1048,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceExtendsObjectIntersection/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceExtendsObjectIntersection/input.ts.json index d8feff025a40..048ab612e3e7 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceExtendsObjectIntersection/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceExtendsObjectIntersection/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -122,7 +119,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -151,7 +147,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -198,7 +193,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -246,7 +240,6 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -290,7 +283,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -338,7 +330,6 @@ "ctxt": 0 }, "value": "T5", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -376,7 +367,6 @@ "ctxt": 0 }, "value": "T6", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -443,7 +433,6 @@ "ctxt": 0 }, "value": "T7", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -470,7 +459,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -579,7 +567,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -600,7 +587,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -630,7 +616,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -674,7 +659,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -695,7 +679,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -725,7 +708,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -769,7 +751,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -790,7 +771,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -820,7 +800,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -864,7 +843,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -885,7 +863,6 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -915,7 +892,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -959,7 +935,6 @@ "ctxt": 0 }, "value": "I5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -980,7 +955,6 @@ "ctxt": 0 }, "value": "T5", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1010,7 +984,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1054,7 +1027,6 @@ "ctxt": 0 }, "value": "I6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1075,7 +1047,6 @@ "ctxt": 0 }, "value": "T6", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1105,7 +1076,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1149,7 +1119,6 @@ "ctxt": 0 }, "value": "I7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1170,7 +1139,6 @@ "ctxt": 0 }, "value": "T7", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1200,7 +1168,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1245,7 +1212,6 @@ "ctxt": 0 }, "value": "Constructor", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1271,7 +1237,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1310,7 +1275,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1329,7 +1293,6 @@ "ctxt": 0 }, "value": "Constructor", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1366,7 +1329,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1396,7 +1358,6 @@ "ctxt": 0 }, "value": "Constructor", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1422,7 +1383,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1442,7 +1402,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1468,7 +1427,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1515,7 +1473,6 @@ "ctxt": 0 }, "value": "Constructor", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1542,7 +1499,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1565,7 +1521,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1591,7 +1546,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1638,7 +1592,6 @@ "ctxt": 0 }, "value": "Constructor", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1665,7 +1618,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1688,7 +1640,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1714,7 +1665,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1761,7 +1711,6 @@ "ctxt": 0 }, "value": "Constructor", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1788,7 +1737,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1811,7 +1759,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1837,7 +1784,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1884,7 +1830,6 @@ "ctxt": 0 }, "value": "Constructor", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1911,7 +1856,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1934,7 +1878,6 @@ "ctxt": 0 }, "value": "C5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1960,7 +1903,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2007,7 +1949,6 @@ "ctxt": 0 }, "value": "Constructor", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2034,7 +1975,6 @@ "ctxt": 0 }, "value": "I5", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2057,7 +1997,6 @@ "ctxt": 0 }, "value": "C6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2083,7 +2022,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2130,7 +2068,6 @@ "ctxt": 0 }, "value": "Constructor", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2157,7 +2094,6 @@ "ctxt": 0 }, "value": "I6", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2180,7 +2116,6 @@ "ctxt": 0 }, "value": "C7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2206,7 +2141,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2253,7 +2187,6 @@ "ctxt": 0 }, "value": "Constructor", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2280,7 +2213,6 @@ "ctxt": 0 }, "value": "I7", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2303,7 +2235,6 @@ "ctxt": 0 }, "value": "fx", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2324,6 +2255,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2340,8 +2272,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -2383,7 +2314,6 @@ "ctxt": 0 }, "value": "CX", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2409,7 +2339,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2464,7 +2393,6 @@ "ctxt": 0 }, "value": "EX", - "typeAnnotation": null, "optional": false }, "members": [ @@ -2483,7 +2411,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -2503,7 +2430,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -2523,7 +2449,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -2547,7 +2472,6 @@ "ctxt": 0 }, "value": "NX", - "typeAnnotation": null, "optional": false }, "body": { @@ -2590,8 +2514,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2626,7 +2550,6 @@ "ctxt": 0 }, "value": "T10", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2645,7 +2568,6 @@ "ctxt": 0 }, "value": "fx", - "typeAnnotation": null, "optional": false } } @@ -2666,7 +2588,6 @@ "ctxt": 0 }, "value": "T11", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2685,7 +2606,6 @@ "ctxt": 0 }, "value": "CX", - "typeAnnotation": null, "optional": false } } @@ -2706,7 +2626,6 @@ "ctxt": 0 }, "value": "T12", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2725,7 +2644,6 @@ "ctxt": 0 }, "value": "EX", - "typeAnnotation": null, "optional": false } } @@ -2746,7 +2664,6 @@ "ctxt": 0 }, "value": "T13", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2765,7 +2682,6 @@ "ctxt": 0 }, "value": "NX", - "typeAnnotation": null, "optional": false } } @@ -2785,7 +2701,6 @@ "ctxt": 0 }, "value": "I10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2806,7 +2721,6 @@ "ctxt": 0 }, "value": "T10", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2836,7 +2750,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2880,7 +2793,6 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2901,7 +2813,6 @@ "ctxt": 0 }, "value": "T11", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2931,7 +2842,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2975,7 +2885,6 @@ "ctxt": 0 }, "value": "I12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2996,7 +2905,6 @@ "ctxt": 0 }, "value": "T12", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3026,7 +2934,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3070,7 +2977,6 @@ "ctxt": 0 }, "value": "I13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3091,7 +2997,6 @@ "ctxt": 0 }, "value": "T13", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3121,7 +3026,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3166,7 +3070,6 @@ "ctxt": 0 }, "value": "Identifiable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3192,7 +3095,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3232,7 +3134,6 @@ "ctxt": 0 }, "value": "_id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3275,7 +3176,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3298,7 +3198,6 @@ "ctxt": 0 }, "value": "I20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3319,7 +3218,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -3345,7 +3243,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3378,7 +3275,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3422,7 +3318,6 @@ "ctxt": 0 }, "value": "I21", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3443,7 +3338,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -3469,7 +3363,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3502,7 +3395,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3546,7 +3438,6 @@ "ctxt": 0 }, "value": "I22", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3567,7 +3458,6 @@ "ctxt": 0 }, "value": "Identifiable", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -3593,7 +3483,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3626,7 +3515,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3670,7 +3558,6 @@ "ctxt": 0 }, "value": "I23", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3691,7 +3578,6 @@ "ctxt": 0 }, "value": "Identifiable", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -3725,7 +3611,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3754,7 +3639,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3812,7 +3696,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3851,7 +3734,6 @@ "ctxt": 0 }, "value": "C20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3877,7 +3759,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3924,7 +3805,6 @@ "ctxt": 0 }, "value": "Constructor", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3951,7 +3831,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3977,7 +3856,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4003,7 +3881,6 @@ "ctxt": 0 }, "value": "C21", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4029,7 +3906,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -4076,7 +3952,6 @@ "ctxt": 0 }, "value": "Constructor", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4103,7 +3978,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4129,7 +4003,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4155,7 +4028,6 @@ "ctxt": 0 }, "value": "C22", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4181,7 +4053,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -4228,7 +4099,6 @@ "ctxt": 0 }, "value": "Constructor", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4255,7 +4125,6 @@ "ctxt": 0 }, "value": "Identifiable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4281,7 +4150,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4307,7 +4175,6 @@ "ctxt": 0 }, "value": "C23", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4333,7 +4200,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -4380,7 +4246,6 @@ "ctxt": 0 }, "value": "Constructor", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4407,7 +4272,6 @@ "ctxt": 0 }, "value": "Identifiable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4441,7 +4305,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4470,7 +4333,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceExtendsObjectIntersectionErrors/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceExtendsObjectIntersectionErrors/input.ts.json index 4d1e183745b5..e199d0a43c7d 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceExtendsObjectIntersectionErrors/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceExtendsObjectIntersectionErrors/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -122,7 +119,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -151,7 +147,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -198,7 +193,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -236,7 +230,6 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -303,7 +296,6 @@ "ctxt": 0 }, "value": "T5", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -330,7 +322,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -439,7 +430,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -460,7 +450,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -490,7 +479,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -534,7 +522,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -555,7 +542,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -585,7 +571,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -629,7 +614,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -650,7 +634,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -680,7 +663,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -724,7 +706,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -745,7 +726,6 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -817,7 +797,6 @@ "ctxt": 0 }, "value": "I5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -838,7 +817,6 @@ "ctxt": 0 }, "value": "T5", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -868,7 +846,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -913,7 +890,6 @@ "ctxt": 0 }, "value": "Constructor", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -939,7 +915,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -978,7 +953,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -997,7 +971,6 @@ "ctxt": 0 }, "value": "Constructor", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1034,7 +1007,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1064,7 +1036,6 @@ "ctxt": 0 }, "value": "Constructor", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1090,7 +1061,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1110,7 +1080,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1136,7 +1105,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1183,7 +1151,6 @@ "ctxt": 0 }, "value": "Constructor", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1210,7 +1177,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1233,7 +1199,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1259,7 +1224,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1306,7 +1270,6 @@ "ctxt": 0 }, "value": "Constructor", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1333,7 +1296,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1356,7 +1318,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1382,7 +1343,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1429,7 +1389,6 @@ "ctxt": 0 }, "value": "Constructor", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1456,7 +1415,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1479,7 +1437,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1550,7 +1507,6 @@ "ctxt": 0 }, "value": "Constructor", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1577,7 +1533,6 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1600,7 +1555,6 @@ "ctxt": 0 }, "value": "C5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1626,7 +1580,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1673,7 +1626,6 @@ "ctxt": 0 }, "value": "Constructor", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1700,7 +1652,6 @@ "ctxt": 0 }, "value": "T5", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1723,7 +1674,6 @@ "ctxt": 0 }, "value": "CX", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1749,7 +1699,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1804,7 +1753,6 @@ "ctxt": 0 }, "value": "EX", - "typeAnnotation": null, "optional": false }, "members": [ @@ -1823,7 +1771,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -1843,7 +1790,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -1863,7 +1809,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -1887,7 +1832,6 @@ "ctxt": 0 }, "value": "NX", - "typeAnnotation": null, "optional": false }, "body": { @@ -1930,8 +1874,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -1971,7 +1915,6 @@ "ctxt": 0 }, "value": "TCX", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1990,7 +1933,6 @@ "ctxt": 0 }, "value": "CX", - "typeAnnotation": null, "optional": false } } @@ -2011,7 +1953,6 @@ "ctxt": 0 }, "value": "TEX", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2030,7 +1971,6 @@ "ctxt": 0 }, "value": "EX", - "typeAnnotation": null, "optional": false } } @@ -2051,7 +1991,6 @@ "ctxt": 0 }, "value": "TNX", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2070,7 +2009,6 @@ "ctxt": 0 }, "value": "NX", - "typeAnnotation": null, "optional": false } } @@ -2090,7 +2028,6 @@ "ctxt": 0 }, "value": "I10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2111,7 +2048,6 @@ "ctxt": 0 }, "value": "TCX", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2141,7 +2077,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2185,7 +2120,6 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2206,7 +2140,6 @@ "ctxt": 0 }, "value": "TEX", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2236,7 +2169,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2280,7 +2212,6 @@ "ctxt": 0 }, "value": "I12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2301,7 +2232,6 @@ "ctxt": 0 }, "value": "TNX", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2331,7 +2261,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2375,7 +2304,6 @@ "ctxt": 0 }, "value": "I14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2396,7 +2324,6 @@ "ctxt": 0 }, "value": "TCX", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2421,6 +2348,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2437,8 +2365,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2483,7 +2410,6 @@ "ctxt": 0 }, "value": "I15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2504,7 +2430,6 @@ "ctxt": 0 }, "value": "TEX", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2529,6 +2454,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2545,8 +2471,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2591,7 +2516,6 @@ "ctxt": 0 }, "value": "I16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2612,7 +2536,6 @@ "ctxt": 0 }, "value": "TNX", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2637,6 +2560,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2653,8 +2577,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2700,7 +2623,6 @@ "ctxt": 0 }, "value": "Identifiable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2726,7 +2648,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2766,7 +2687,6 @@ "ctxt": 0 }, "value": "_id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2809,7 +2729,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2832,7 +2751,6 @@ "ctxt": 0 }, "value": "I20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2853,7 +2771,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -2879,7 +2796,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2912,7 +2828,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2956,7 +2871,6 @@ "ctxt": 0 }, "value": "I21", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2977,7 +2891,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -3003,7 +2916,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3036,7 +2948,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3080,7 +2991,6 @@ "ctxt": 0 }, "value": "I22", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3101,7 +3011,6 @@ "ctxt": 0 }, "value": "Identifiable", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -3127,7 +3036,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3160,7 +3068,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3204,7 +3111,6 @@ "ctxt": 0 }, "value": "I23", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3225,7 +3131,6 @@ "ctxt": 0 }, "value": "Identifiable", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -3259,7 +3164,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3288,7 +3192,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3346,7 +3249,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3391,7 +3293,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3427,7 +3328,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3479,7 +3379,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3525,7 +3424,6 @@ "ctxt": 0 }, "value": "I30", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3546,7 +3444,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3576,7 +3473,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3620,7 +3516,6 @@ "ctxt": 0 }, "value": "I31", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3647,7 +3542,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3671,7 +3565,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3701,7 +3594,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceThatHidesBaseProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceThatHidesBaseProperty/input.ts.json index 862e9f06483e..c2415cdecabb 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceThatHidesBaseProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceThatHidesBaseProperty/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -89,7 +87,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -138,7 +135,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -159,7 +155,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -189,7 +184,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -227,7 +221,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -269,7 +262,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceThatHidesBaseProperty2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceThatHidesBaseProperty2/input.ts.json index 56f397fc9b63..300d206a8361 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceThatHidesBaseProperty2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceThatHidesBaseProperty2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -89,7 +87,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -138,7 +135,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -159,7 +155,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -189,7 +184,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -227,7 +221,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceThatIndirectlyInheritsFromItself/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceThatIndirectlyInheritsFromItself/input.ts.json index d9e9d28407e8..a520e35849f8 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceThatIndirectlyInheritsFromItself/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceThatIndirectlyInheritsFromItself/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -137,7 +133,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -167,7 +162,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -232,7 +225,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -262,7 +254,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -308,7 +299,6 @@ "ctxt": 0 }, "value": "Generic", - "typeAnnotation": null, "optional": false }, "body": { @@ -334,7 +324,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -361,7 +350,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -385,7 +373,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -411,7 +398,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -444,7 +430,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -488,7 +473,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -515,7 +499,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -539,7 +522,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -565,7 +547,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -598,7 +579,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -642,7 +622,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -669,7 +648,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -693,7 +671,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -719,7 +696,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -752,7 +728,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithCallAndConstructSignature/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithCallAndConstructSignature/input.ts.json index 883fa82793c9..8aac825929cf 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithCallAndConstructSignature/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithCallAndConstructSignature/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -117,6 +116,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -139,13 +139,11 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -177,8 +175,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -195,7 +193,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -230,8 +227,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -248,7 +245,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithCallSignaturesThatHidesBaseSignature/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithCallSignaturesThatHidesBaseSignature/input.ts.json index 26647932f412..b264ca1639e2 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithCallSignaturesThatHidesBaseSignature/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithCallSignaturesThatHidesBaseSignature/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -74,7 +73,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -123,7 +121,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -197,7 +193,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -239,7 +234,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -298,6 +292,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -320,13 +315,11 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -358,8 +351,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -376,7 +369,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithCallSignaturesThatHidesBaseSignature2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithCallSignaturesThatHidesBaseSignature2/input.ts.json index 66054f2783cb..361e74c31855 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithCallSignaturesThatHidesBaseSignature2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithCallSignaturesThatHidesBaseSignature2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -74,7 +73,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -116,7 +114,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -165,7 +162,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -186,7 +182,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -239,7 +234,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -298,6 +292,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -320,13 +315,11 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -358,8 +351,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -376,7 +369,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithConstructSignaturesThatHidesBaseSignature/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithConstructSignaturesThatHidesBaseSignature/input.ts.json index 1b60a48b715f..2db2fa2cf084 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithConstructSignaturesThatHidesBaseSignature/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithConstructSignaturesThatHidesBaseSignature/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -74,7 +73,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -123,7 +121,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -197,7 +193,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -239,7 +234,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -298,6 +292,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -320,13 +315,11 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -358,8 +351,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -376,7 +369,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithConstructSignaturesThatHidesBaseSignature2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithConstructSignaturesThatHidesBaseSignature2/input.ts.json index 01154b054b72..2d906d743125 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithConstructSignaturesThatHidesBaseSignature2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithConstructSignaturesThatHidesBaseSignature2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -74,7 +73,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -116,7 +114,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -165,7 +162,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -186,7 +182,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -239,7 +234,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -298,6 +292,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -320,13 +315,11 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -358,8 +351,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -376,7 +369,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithMultipleBaseTypes/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithMultipleBaseTypes/input.ts.json index 485a593e117a..5387c4b969c1 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithMultipleBaseTypes/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithMultipleBaseTypes/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -89,7 +87,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -138,7 +135,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -168,7 +164,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -206,7 +201,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -255,7 +249,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -276,7 +269,6 @@ "ctxt": 0 }, "value": "Base1", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -296,7 +288,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -326,7 +317,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -364,7 +354,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -406,7 +395,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -455,7 +443,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -476,7 +463,6 @@ "ctxt": 0 }, "value": "Base1", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -496,7 +482,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -526,7 +511,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -564,7 +548,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -606,7 +589,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -657,7 +639,6 @@ "ctxt": 0 }, "value": "Generic", - "typeAnnotation": null, "optional": false }, "body": { @@ -683,7 +664,6 @@ "ctxt": 0 }, "value": "Base1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -710,7 +690,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -743,7 +722,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -781,7 +759,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -810,7 +787,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -841,7 +817,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -868,7 +843,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -901,7 +875,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -939,7 +912,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -968,7 +940,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -999,7 +970,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1026,7 +996,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1050,7 +1019,6 @@ "ctxt": 0 }, "value": "Base1", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1088,7 +1056,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1136,7 +1103,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1174,7 +1140,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1216,7 +1181,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1265,7 +1229,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1292,7 +1255,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1313,7 +1275,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1337,7 +1298,6 @@ "ctxt": 0 }, "value": "Base1", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1363,7 +1323,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1386,7 +1345,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1412,7 +1370,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1445,7 +1402,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1483,7 +1439,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1512,7 +1467,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1536,7 +1490,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1565,7 +1518,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1596,7 +1548,6 @@ "ctxt": 0 }, "value": "Derived3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1623,7 +1574,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1647,7 +1597,6 @@ "ctxt": 0 }, "value": "Base1", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1685,7 +1634,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1734,7 +1682,6 @@ "ctxt": 0 }, "value": "Derived4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1761,7 +1708,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1785,7 +1731,6 @@ "ctxt": 0 }, "value": "Base1", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1823,7 +1768,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1871,7 +1815,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1909,7 +1852,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1938,7 +1880,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1962,7 +1903,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1991,7 +1931,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2022,7 +1961,6 @@ "ctxt": 0 }, "value": "Derived5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2049,7 +1987,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2073,7 +2010,6 @@ "ctxt": 0 }, "value": "Base1", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -2099,7 +2035,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2122,7 +2057,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -2148,7 +2082,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2181,7 +2114,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2210,7 +2142,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithMultipleBaseTypes2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithMultipleBaseTypes2/input.ts.json index c0e8e091198f..1c64ec574779 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithMultipleBaseTypes2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithMultipleBaseTypes2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -89,7 +87,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -131,7 +128,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -180,7 +176,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -210,7 +205,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -248,7 +242,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -290,7 +283,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -339,7 +331,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -360,7 +351,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -380,7 +370,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -410,7 +399,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -448,7 +436,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -497,7 +484,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -518,7 +504,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -538,7 +523,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -568,7 +552,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -606,7 +589,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -648,7 +630,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -697,7 +678,6 @@ "ctxt": 0 }, "value": "Derived3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -718,7 +698,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -738,7 +717,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -768,7 +746,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -806,7 +783,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -848,7 +824,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithOverloadedCallAndConstructSignatures/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithOverloadedCallAndConstructSignatures/input.ts.json index f3d3266cb616..9b5ba6b1e146 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithOverloadedCallAndConstructSignatures/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithOverloadedCallAndConstructSignatures/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -78,6 +77,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -94,8 +94,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -160,6 +159,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -176,8 +176,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -202,7 +201,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -238,6 +236,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -260,13 +259,11 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -298,8 +295,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -316,7 +313,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -351,8 +347,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -369,7 +365,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -422,8 +417,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -440,7 +435,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -475,8 +469,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -493,7 +487,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithPropertyOfEveryType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithPropertyOfEveryType/input.ts.json index 8a9004c8f924..f48038a479c9 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithPropertyOfEveryType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithPropertyOfEveryType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -132,7 +129,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -175,8 +171,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -212,7 +208,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -231,7 +226,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -253,7 +247,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -283,7 +276,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -325,7 +317,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -367,7 +358,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -409,7 +399,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -451,7 +440,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -493,7 +481,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -543,7 +530,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -572,7 +558,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -596,7 +581,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -626,6 +610,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -642,8 +627,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -684,7 +668,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -714,6 +697,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -736,13 +720,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -768,7 +750,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -798,7 +779,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -824,7 +804,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -853,7 +832,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -877,7 +855,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -906,7 +883,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -930,7 +906,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -959,7 +934,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } } @@ -982,7 +956,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1011,7 +984,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } } @@ -1034,7 +1006,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1076,7 +1047,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1105,7 +1075,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1141,6 +1110,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1163,13 +1133,11 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1189,7 +1157,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1212,7 +1179,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1240,7 +1206,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -1263,7 +1228,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -1286,7 +1250,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": { @@ -1308,7 +1271,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -1344,7 +1306,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "value": { @@ -1367,7 +1328,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "value": { @@ -1386,6 +1346,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1402,8 +1363,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1431,7 +1391,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "value": { @@ -1450,6 +1409,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1472,13 +1432,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1489,7 +1447,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1517,7 +1474,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1538,7 +1494,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "value": { @@ -1571,7 +1526,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1588,7 +1542,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "value": { @@ -1606,7 +1559,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1623,7 +1575,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "value": { @@ -1634,7 +1585,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } }, @@ -1648,7 +1598,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": { @@ -1659,7 +1608,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } }, @@ -1673,7 +1621,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -1696,7 +1643,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "value": { @@ -1714,7 +1660,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1725,7 +1670,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithPropertyThatIsPrivateInBaseType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithPropertyThatIsPrivateInBaseType/input.ts.json index a5e32096885e..424acbab9472 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithPropertyThatIsPrivateInBaseType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithPropertyThatIsPrivateInBaseType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -185,7 +180,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -237,7 +230,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -279,7 +271,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -305,7 +296,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -332,7 +322,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -356,7 +345,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -382,7 +370,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -415,7 +402,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithPropertyThatIsPrivateInBaseType2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithPropertyThatIsPrivateInBaseType2/input.ts.json index c378f7a9c12b..5bad68648e90 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithPropertyThatIsPrivateInBaseType2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithPropertyThatIsPrivateInBaseType2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -210,7 +204,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -267,7 +260,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -293,7 +285,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -320,7 +311,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -344,7 +334,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -370,7 +359,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -403,7 +391,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithSpecializedCallAndConstructSignatures/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithSpecializedCallAndConstructSignatures/input.ts.json index 2a1e01da853c..999b66e6a085 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithSpecializedCallAndConstructSignatures/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithSpecializedCallAndConstructSignatures/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,6 +50,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,8 +80,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -119,6 +118,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -135,8 +135,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -174,6 +173,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -203,8 +203,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -242,6 +241,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -258,8 +258,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -284,7 +283,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -320,6 +318,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -342,13 +341,11 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -380,8 +377,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -398,7 +395,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -451,8 +447,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -469,7 +465,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -522,8 +517,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -540,7 +535,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -593,8 +587,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -611,7 +605,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithStringIndexerHidingBaseTypeIndexer/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithStringIndexerHidingBaseTypeIndexer/input.ts.json index 2e4faca7a775..17bb625fd7a5 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithStringIndexerHidingBaseTypeIndexer/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithStringIndexerHidingBaseTypeIndexer/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -97,7 +96,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -149,7 +147,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -187,7 +184,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -229,7 +225,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -278,7 +273,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -299,7 +293,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -324,6 +317,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -340,8 +334,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -375,7 +368,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -417,7 +409,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -469,7 +460,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -507,7 +497,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithStringIndexerHidingBaseTypeIndexer2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithStringIndexerHidingBaseTypeIndexer2/input.ts.json index 5eeccdfcf695..34faefd3ec98 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithStringIndexerHidingBaseTypeIndexer2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithStringIndexerHidingBaseTypeIndexer2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -97,7 +96,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -139,7 +137,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -191,7 +188,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -229,7 +225,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -271,7 +266,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -320,7 +314,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -341,7 +334,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -366,6 +358,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -382,8 +375,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -417,7 +409,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -469,7 +460,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -507,7 +497,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -590,7 +579,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithStringIndexerHidingBaseTypeIndexer3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithStringIndexerHidingBaseTypeIndexer3/input.ts.json index 93048ae9075f..ab9fd3a12f80 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithStringIndexerHidingBaseTypeIndexer3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfaceDeclarations/interfaceWithStringIndexerHidingBaseTypeIndexer3/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -97,7 +96,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -185,7 +183,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -227,7 +224,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -276,7 +272,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -297,7 +292,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -322,6 +316,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -338,8 +333,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -373,7 +367,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -415,7 +408,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -503,7 +495,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates/input.ts.json index a82a830c419b..274ec50c9906 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -185,7 +180,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -216,7 +210,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -233,7 +226,6 @@ "ctxt": 0 }, "value": "Bar2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -259,7 +251,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -311,7 +302,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -328,7 +318,6 @@ "ctxt": 0 }, "value": "Bar3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -354,7 +343,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -400,7 +388,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -452,7 +439,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -469,7 +455,6 @@ "ctxt": 0 }, "value": "Bar4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -495,7 +480,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -541,7 +525,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -593,7 +576,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2/input.ts.json index f9a8312360e9..079ca1c3a05a 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -185,7 +180,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -251,7 +244,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -273,7 +265,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -290,7 +281,6 @@ "ctxt": 0 }, "value": "Bar2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -316,7 +306,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -362,7 +351,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -402,7 +390,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -424,7 +411,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -441,7 +427,6 @@ "ctxt": 0 }, "value": "Bar3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -467,7 +452,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -513,7 +497,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -553,7 +536,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -575,7 +557,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -599,7 +580,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -620,7 +600,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -646,7 +625,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -694,7 +672,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -720,7 +697,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -760,7 +736,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -783,7 +758,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -804,7 +778,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -834,7 +807,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -873,7 +845,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -899,7 +870,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -945,7 +915,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -985,7 +954,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1007,7 +975,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1024,7 +991,6 @@ "ctxt": 0 }, "value": "Bar2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1050,7 +1016,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1096,7 +1061,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1136,7 +1100,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1158,7 +1121,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1175,7 +1137,6 @@ "ctxt": 0 }, "value": "Bar3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1201,7 +1162,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1247,7 +1207,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1287,7 +1246,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1309,7 +1267,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1336,7 +1293,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -1357,7 +1313,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1383,7 +1338,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1431,7 +1385,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1457,7 +1410,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1497,7 +1449,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1520,7 +1471,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1541,7 +1491,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1571,7 +1520,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1610,7 +1558,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1636,7 +1583,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1676,7 +1622,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1698,7 +1643,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1730,6 +1674,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1752,13 +1697,11 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1790,8 +1733,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1808,7 +1751,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1819,7 +1761,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1853,8 +1794,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1871,7 +1812,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1882,7 +1822,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1916,8 +1855,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1934,7 +1873,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1945,7 +1883,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1964,7 +1901,6 @@ "ctxt": 0 }, "value": "Bar2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1990,7 +1926,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2036,7 +1971,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2076,7 +2010,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2098,7 +2031,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2115,7 +2047,6 @@ "ctxt": 0 }, "value": "Bar3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2141,7 +2072,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2187,7 +2117,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2227,7 +2156,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2249,7 +2177,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithProtecteds/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithProtecteds/input.ts.json index de17566ed930..ccb76d1d70e0 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithProtecteds/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithProtecteds/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -185,7 +180,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -216,7 +210,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -233,7 +226,6 @@ "ctxt": 0 }, "value": "Bar2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -259,7 +251,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -311,7 +302,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -328,7 +318,6 @@ "ctxt": 0 }, "value": "Bar3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -354,7 +343,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -400,7 +388,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -452,7 +439,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -469,7 +455,6 @@ "ctxt": 0 }, "value": "Bar4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -495,7 +480,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -541,7 +525,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -593,7 +576,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -610,7 +592,6 @@ "ctxt": 0 }, "value": "Bar5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -629,7 +610,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -651,7 +631,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -668,7 +647,6 @@ "ctxt": 0 }, "value": "Bar6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -694,7 +672,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -734,7 +711,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -756,7 +732,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -773,7 +748,6 @@ "ctxt": 0 }, "value": "Bar7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -799,7 +773,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -839,7 +812,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -861,7 +833,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -878,7 +849,6 @@ "ctxt": 0 }, "value": "Bar8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -904,7 +874,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -950,7 +919,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -990,7 +958,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1012,7 +979,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/interfaceExtendingClass/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/interfaceExtendingClass/input.ts.json index 6ed80575be7d..84da7dbec4a4 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/interfaceExtendingClass/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/interfaceExtendingClass/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "function": { @@ -194,6 +190,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -210,8 +207,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -236,7 +232,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -271,7 +266,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -292,7 +286,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -333,6 +326,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -355,13 +349,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -393,8 +385,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -411,7 +403,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -422,7 +413,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -456,8 +446,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -481,7 +471,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -492,7 +481,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -529,8 +517,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -547,7 +535,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -558,7 +545,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -592,6 +578,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -614,13 +601,11 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -630,7 +615,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "definite": false @@ -660,8 +644,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -671,7 +655,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithPrivates/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithPrivates/input.ts.json index 1feeb027cbf1..8978f7175176 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithPrivates/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithPrivates/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -241,7 +234,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -295,6 +287,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -317,13 +310,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -355,8 +346,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -373,7 +364,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -384,7 +374,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -418,8 +407,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -436,7 +425,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -447,7 +435,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithPrivates2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithPrivates2/input.ts.json index 925c86891ba3..370809198cf4 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithPrivates2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithPrivates2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -210,7 +204,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -241,7 +234,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -262,7 +254,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -282,7 +273,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -312,7 +302,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -351,7 +340,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -377,7 +365,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -430,7 +417,6 @@ "ctxt": 0 }, "value": "I5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -451,7 +437,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -471,7 +456,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -501,7 +485,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -555,6 +538,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -577,13 +561,11 @@ "ctxt": 0 }, "value": "I5", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -615,6 +597,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -631,8 +614,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -649,7 +631,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -660,7 +641,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -694,8 +674,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -712,7 +692,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -723,7 +702,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -757,8 +735,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -775,7 +753,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -786,7 +763,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithProtecteds/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithProtecteds/input.ts.json index 9b8ea5ae4516..df1fd66127c2 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithProtecteds/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithProtecteds/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -241,7 +234,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -295,6 +287,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -317,13 +310,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -355,8 +346,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -373,7 +364,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -384,7 +374,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -418,8 +407,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -436,7 +425,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -447,7 +435,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithProtecteds2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithProtecteds2/input.ts.json index 2a86fc9f764f..59498d127339 100644 --- a/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithProtecteds2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithProtecteds2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -210,7 +204,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -241,7 +234,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -262,7 +254,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -282,7 +273,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -312,7 +302,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -351,7 +340,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -377,7 +365,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -430,7 +417,6 @@ "ctxt": 0 }, "value": "I5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -451,7 +437,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -471,7 +456,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -501,7 +485,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -555,6 +538,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -577,13 +561,11 @@ "ctxt": 0 }, "value": "I5", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -615,6 +597,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -631,8 +614,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -649,7 +631,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -660,7 +641,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -694,8 +674,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -712,7 +692,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -723,7 +702,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -757,8 +735,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -775,7 +753,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -786,7 +763,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot/input.ts.json index de3d4d9bc82c..736bd6b253a9 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "body": { @@ -66,6 +65,7 @@ "ctxt": 0 }, "value": "Origin", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -97,7 +97,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -139,7 +138,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -167,8 +165,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -189,7 +186,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -235,7 +231,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -277,7 +272,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -332,6 +326,7 @@ "ctxt": 0 }, "value": "cl", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -363,7 +358,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -405,7 +399,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -433,8 +426,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -466,8 +458,8 @@ "ctxt": 0 }, "value": "cl", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -484,7 +476,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -519,8 +510,8 @@ "ctxt": 0 }, "value": "cl", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -537,7 +528,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "property": { @@ -548,7 +538,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/AmbientModuleAndAmbientWithSameNameAndCommonRoot/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/AmbientModuleAndAmbientWithSameNameAndCommonRoot/input.ts.json index 65af258e6745..3e672070239c 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/AmbientModuleAndAmbientWithSameNameAndCommonRoot/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/AmbientModuleAndAmbientWithSameNameAndCommonRoot/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "body": { @@ -101,6 +99,7 @@ "ctxt": 0 }, "value": "Origin", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -132,7 +131,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -174,7 +172,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -202,8 +199,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -235,7 +231,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -263,7 +258,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -289,7 +283,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -309,6 +302,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -325,8 +319,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -345,6 +338,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -361,8 +355,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -385,7 +378,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -431,7 +423,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -498,6 +489,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -529,7 +521,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -571,7 +562,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -599,8 +589,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -632,8 +621,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -657,7 +646,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -668,7 +656,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false @@ -681,7 +668,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "computed": false @@ -715,8 +701,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -740,7 +726,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -751,7 +736,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot/input.ts.json index 069c8b4839cb..5add8932c77b 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "body": { @@ -101,6 +99,7 @@ "ctxt": 0 }, "value": "Origin", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -132,7 +131,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -174,7 +172,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -202,8 +199,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -235,7 +231,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -263,7 +258,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -289,7 +283,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -311,6 +304,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -327,8 +321,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -349,6 +342,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -365,8 +359,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -418,6 +411,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -449,7 +443,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -491,7 +484,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -519,8 +511,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -552,8 +543,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -577,7 +568,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -588,7 +578,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false @@ -601,7 +590,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "computed": false @@ -635,8 +623,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -660,7 +648,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -671,7 +658,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot/input.ts.json index 820ca50e3baa..21f1e856bf78 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "body": { @@ -66,6 +65,7 @@ "ctxt": 0 }, "value": "Origin", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -97,7 +97,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -139,7 +138,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -167,8 +165,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -189,7 +186,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -233,7 +229,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -256,7 +251,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -304,6 +298,7 @@ "ctxt": 0 }, "value": "cl", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -335,7 +330,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -377,7 +371,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -405,8 +398,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -438,8 +430,8 @@ "ctxt": 0 }, "value": "cl", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -456,7 +448,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -491,8 +482,8 @@ "ctxt": 0 }, "value": "cl", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -509,7 +500,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "property": { @@ -520,7 +510,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter/input.ts.json index c49edad60a1b..97d3d22f59af 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "clodule1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": null, @@ -114,7 +111,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "clodule1", - "typeAnnotation": null, "optional": false }, "body": { @@ -205,7 +199,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -226,6 +219,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -248,13 +242,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -291,7 +283,6 @@ "ctxt": 0 }, "value": "clodule2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -317,7 +308,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -363,7 +353,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": null, @@ -389,7 +378,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -431,7 +419,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -459,7 +446,6 @@ "ctxt": 0 }, "value": "clodule2", - "typeAnnotation": null, "optional": false }, "body": { @@ -495,6 +481,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -517,13 +504,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -540,7 +525,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -566,7 +550,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -612,7 +595,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": null, @@ -638,7 +620,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -680,7 +661,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -698,7 +678,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -723,7 +702,6 @@ "ctxt": 0 }, "value": "clodule3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -749,7 +727,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -795,7 +772,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": null, @@ -821,7 +797,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -863,7 +838,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -891,7 +865,6 @@ "ctxt": 0 }, "value": "clodule3", - "typeAnnotation": null, "optional": false }, "body": { @@ -934,8 +907,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -955,7 +928,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": { @@ -966,7 +938,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false } } @@ -990,7 +961,6 @@ "ctxt": 0 }, "value": "clodule4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1016,7 +986,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1062,7 +1031,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1088,7 +1056,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1130,7 +1097,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1158,7 +1124,6 @@ "ctxt": 0 }, "value": "clodule4", - "typeAnnotation": null, "optional": false }, "body": { @@ -1179,7 +1144,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1205,7 +1169,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1231,7 +1194,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName/input.ts.json index 8a490f5a705d..190fff3258f0 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "clodule", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": null, @@ -114,7 +111,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -145,7 +141,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -166,6 +161,7 @@ "ctxt": 0 }, "value": "id", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -188,13 +184,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -238,7 +232,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -280,7 +273,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -308,7 +300,6 @@ "ctxt": 0 }, "value": "clodule", - "typeAnnotation": null, "optional": false }, "body": { @@ -336,7 +327,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -357,6 +347,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -379,13 +370,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -404,6 +393,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -426,13 +416,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -465,7 +453,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -496,7 +483,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -526,7 +512,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName/input.ts.json index 8f1ac1b36c9d..672ee3952a16 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "clodule", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": null, @@ -114,7 +111,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -145,7 +141,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -166,6 +161,7 @@ "ctxt": 0 }, "value": "id", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -182,8 +178,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -239,7 +234,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -267,7 +261,6 @@ "ctxt": 0 }, "value": "clodule", - "typeAnnotation": null, "optional": false }, "body": { @@ -295,7 +288,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -316,6 +308,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -338,13 +331,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -363,6 +354,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -385,13 +377,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -424,7 +414,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -455,7 +444,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -485,7 +473,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics/input.ts.json index e6bab6c6da1f..9ea31b3ff5a6 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "clodule", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": null, @@ -114,7 +111,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -145,7 +141,6 @@ "ctxt": 0 }, "value": "sfn", - "typeAnnotation": null, "optional": false }, "function": { @@ -166,6 +161,7 @@ "ctxt": 0 }, "value": "id", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -182,8 +178,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -257,7 +252,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -285,7 +279,6 @@ "ctxt": 0 }, "value": "clodule", - "typeAnnotation": null, "optional": false }, "body": { @@ -313,7 +306,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -334,6 +326,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -356,13 +349,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -381,6 +372,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -403,13 +395,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -456,7 +446,6 @@ "ctxt": 0 }, "value": "clodule", - "typeAnnotation": null, "optional": false }, "property": { @@ -467,7 +456,6 @@ "ctxt": 0 }, "value": "sfn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -521,7 +509,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName/input.ts.json index d5082dc8c7f3..0cb204396228 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -64,6 +62,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,8 +79,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -102,6 +100,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -118,8 +117,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -150,7 +148,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "function": { @@ -194,7 +191,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -217,7 +213,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -260,7 +255,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -297,7 +291,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "body": { @@ -325,7 +318,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -388,7 +380,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -416,7 +407,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -442,7 +432,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -464,6 +453,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -480,8 +470,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -502,6 +491,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -518,8 +508,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -550,7 +539,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "function": { @@ -594,7 +582,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -617,7 +604,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -660,7 +646,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -705,7 +690,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "body": { @@ -733,7 +717,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName/input.ts.json index 33ad622408f9..18b913483268 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -64,6 +62,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,8 +79,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -102,6 +100,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -118,8 +117,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -150,7 +148,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "function": { @@ -194,7 +191,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -217,7 +213,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -260,7 +255,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -297,7 +291,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "body": { @@ -318,7 +311,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -386,7 +378,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -414,7 +405,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -440,7 +430,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -462,6 +451,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -478,8 +468,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -500,6 +489,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -516,8 +506,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -548,7 +537,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "function": { @@ -592,7 +580,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -615,7 +602,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -658,7 +644,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -703,7 +688,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "body": { @@ -724,7 +708,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName/input.ts.json index 3b2567b8c62b..bd7cf47a76c2 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -64,6 +62,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,8 +79,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -102,6 +100,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -118,8 +117,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -150,7 +148,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "value": { @@ -171,7 +168,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -194,7 +190,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -231,7 +226,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -271,7 +265,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "body": { @@ -314,8 +307,8 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -356,7 +349,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -384,7 +376,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -410,7 +401,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -432,6 +422,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -448,8 +439,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -470,6 +460,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -486,8 +477,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -518,7 +508,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "value": { @@ -539,7 +528,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -562,7 +550,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -599,7 +586,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -647,7 +633,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "body": { @@ -690,8 +675,8 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName/input.ts.json index 344fa885f6d3..ee448bfabacf 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -64,6 +62,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,8 +79,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -102,6 +100,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -118,8 +117,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -150,7 +148,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "value": { @@ -171,7 +168,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -194,7 +190,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -231,7 +226,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -271,7 +265,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "body": { @@ -307,8 +300,8 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -348,7 +341,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -376,7 +368,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -402,7 +393,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -424,6 +414,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -440,8 +431,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -462,6 +452,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -478,8 +469,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -510,7 +500,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "value": { @@ -531,7 +520,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -554,7 +542,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -591,7 +578,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -639,7 +625,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "body": { @@ -675,8 +660,8 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRoot/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRoot/input.ts.json index 81337f813329..6e861a05c01c 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRoot/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRoot/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "body": { @@ -71,7 +69,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -97,7 +94,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -117,6 +113,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -133,8 +130,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -153,6 +149,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -169,8 +166,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -220,7 +216,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -233,7 +228,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -276,7 +270,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -289,7 +282,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -314,7 +306,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -360,7 +351,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -420,7 +410,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { @@ -440,7 +429,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "body": { @@ -475,7 +463,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "body": { @@ -518,8 +505,8 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -536,7 +523,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -605,8 +591,8 @@ "ctxt": 0 }, "value": "cl", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -637,7 +623,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "property": { @@ -648,7 +633,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -661,7 +645,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false @@ -723,8 +706,8 @@ "ctxt": 0 }, "value": "cl", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -755,7 +738,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "property": { @@ -766,7 +748,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -779,7 +760,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false @@ -792,7 +772,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "computed": false @@ -811,7 +790,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -837,7 +815,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -892,7 +869,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -935,8 +911,8 @@ "ctxt": 0 }, "value": "Instance", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -953,7 +929,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -992,8 +967,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1010,7 +985,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1021,7 +995,6 @@ "ctxt": 0 }, "value": "Instance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1055,8 +1028,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1073,7 +1046,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1108,6 +1080,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1139,7 +1112,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1167,8 +1139,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRootES6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRootES6/input.ts.json index f3a57104fdd8..090c35486473 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRootES6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRootES6/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "body": { @@ -71,7 +69,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -97,7 +94,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -117,6 +113,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -133,8 +130,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -153,6 +149,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -169,8 +166,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -220,7 +216,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -233,7 +228,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -276,7 +270,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -289,7 +282,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -314,7 +306,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -360,7 +351,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -420,7 +410,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { @@ -440,7 +429,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "body": { @@ -475,7 +463,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "body": { @@ -518,8 +505,8 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -536,7 +523,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -605,8 +591,8 @@ "ctxt": 0 }, "value": "cl", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -637,7 +623,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "property": { @@ -648,7 +633,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -661,7 +645,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false @@ -723,8 +706,8 @@ "ctxt": 0 }, "value": "cl", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -755,7 +738,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "property": { @@ -766,7 +748,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -779,7 +760,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false @@ -792,7 +772,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "computed": false @@ -811,7 +790,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -837,7 +815,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -892,7 +869,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -935,8 +911,8 @@ "ctxt": 0 }, "value": "Instance", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -953,7 +929,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -992,8 +967,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1010,7 +985,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1021,7 +995,6 @@ "ctxt": 0 }, "value": "Instance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1055,8 +1028,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1073,7 +1046,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1108,6 +1080,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1139,7 +1112,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1167,8 +1139,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/EnumAndModuleWithSameNameAndCommonRoot/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/EnumAndModuleWithSameNameAndCommonRoot/input.ts.json index a3ee4cd78f13..a5eee92a50a0 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/EnumAndModuleWithSameNameAndCommonRoot/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/EnumAndModuleWithSameNameAndCommonRoot/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "enumdule", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "Red", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "Blue", - "typeAnnotation": null, "optional": false }, "init": null @@ -86,7 +83,6 @@ "ctxt": 0 }, "value": "enumdule", - "typeAnnotation": null, "optional": false }, "body": { @@ -114,7 +110,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -140,7 +135,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -162,6 +156,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -178,8 +173,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -200,6 +194,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +211,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -269,6 +263,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -291,13 +286,11 @@ "ctxt": 0 }, "value": "enumdule", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -329,8 +322,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -347,7 +340,6 @@ "ctxt": 0 }, "value": "enumdule", - "typeAnnotation": null, "optional": false }, "property": { @@ -358,7 +350,6 @@ "ctxt": 0 }, "value": "Red", - "typeAnnotation": null, "optional": false }, "computed": false @@ -392,6 +383,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -423,7 +415,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -465,7 +456,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -493,8 +483,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -526,8 +515,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -551,7 +540,6 @@ "ctxt": 0 }, "value": "enumdule", - "typeAnnotation": null, "optional": false }, "property": { @@ -562,7 +550,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndCommonRoot/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndCommonRoot/input.ts.json index 3eb60b60cc76..2437f1fc2a6b 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndCommonRoot/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndCommonRoot/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -118,7 +115,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -162,7 +158,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -197,7 +192,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "body": { @@ -240,8 +234,8 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -261,7 +255,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -284,7 +277,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -336,6 +328,7 @@ "ctxt": 0 }, "value": "fn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -383,7 +376,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -425,7 +417,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -455,8 +446,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -488,8 +478,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -506,7 +496,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -517,7 +506,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false @@ -551,6 +539,7 @@ "ctxt": 0 }, "value": "cl", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -582,7 +571,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -624,7 +612,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -652,8 +639,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -685,8 +671,8 @@ "ctxt": 0 }, "value": "cl", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -710,7 +696,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -721,7 +706,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false @@ -758,8 +742,8 @@ "ctxt": 0 }, "value": "cl", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -783,7 +767,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -794,7 +777,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false @@ -807,7 +789,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "computed": false @@ -833,7 +814,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "body": { @@ -861,7 +841,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -905,7 +884,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -928,7 +906,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -976,7 +953,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "body": { @@ -1019,8 +995,8 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1040,7 +1016,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1063,7 +1038,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1115,6 +1089,7 @@ "ctxt": 0 }, "value": "fn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1162,7 +1137,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1204,7 +1178,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1234,8 +1207,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1267,8 +1239,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1285,7 +1257,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "property": { @@ -1296,7 +1267,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1330,6 +1300,7 @@ "ctxt": 0 }, "value": "cl", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1361,7 +1332,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1403,7 +1373,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1431,8 +1400,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1464,8 +1432,8 @@ "ctxt": 0 }, "value": "cl", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1489,7 +1457,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "property": { @@ -1500,7 +1467,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1537,8 +1503,8 @@ "ctxt": 0 }, "value": "cl", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1562,7 +1528,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "property": { @@ -1573,7 +1538,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1586,7 +1550,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndDifferentCommonRoot/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndDifferentCommonRoot/input.ts.json index de42a02d80f2..3a5633b1bd39 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndDifferentCommonRoot/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndDifferentCommonRoot/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -118,7 +115,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -162,7 +158,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "body": { @@ -197,7 +192,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "body": { @@ -240,8 +234,8 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -261,7 +255,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -284,7 +277,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -336,6 +328,7 @@ "ctxt": 0 }, "value": "fn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -383,7 +376,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -425,7 +417,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -455,8 +446,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -488,8 +478,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -506,7 +496,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -517,7 +506,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false @@ -551,6 +539,7 @@ "ctxt": 0 }, "value": "cl", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -582,7 +571,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -624,7 +612,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -652,8 +639,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -685,8 +671,8 @@ "ctxt": 0 }, "value": "cl", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -710,7 +696,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "property": { @@ -721,7 +706,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false @@ -734,7 +718,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ModuleAndClassWithSameNameAndCommonRoot/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ModuleAndClassWithSameNameAndCommonRoot/input.ts.json index 2e6a0b7e9f76..181be29a5927 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ModuleAndClassWithSameNameAndCommonRoot/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ModuleAndClassWithSameNameAndCommonRoot/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "body": { @@ -78,7 +76,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "body": { @@ -121,8 +118,8 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -139,7 +136,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -200,7 +196,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { @@ -220,7 +215,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "body": { @@ -248,7 +242,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -274,7 +267,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -294,6 +286,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -310,8 +303,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -330,6 +322,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -346,8 +339,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -397,7 +389,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -410,7 +401,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -453,7 +443,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -466,7 +455,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -491,7 +479,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -537,7 +524,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -597,7 +583,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -640,8 +625,8 @@ "ctxt": 0 }, "value": "Instance", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -658,7 +643,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -682,7 +666,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -708,7 +691,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ModuleAndEnumWithSameNameAndCommonRoot/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ModuleAndEnumWithSameNameAndCommonRoot/input.ts.json index 2cea94eba9c0..f3211988db5f 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ModuleAndEnumWithSameNameAndCommonRoot/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ModuleAndEnumWithSameNameAndCommonRoot/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "enumdule", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -99,6 +96,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -115,8 +113,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -137,6 +134,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -153,8 +151,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -198,7 +195,6 @@ "ctxt": 0 }, "value": "enumdule", - "typeAnnotation": null, "optional": false }, "members": [ @@ -217,7 +213,6 @@ "ctxt": 0 }, "value": "Red", - "typeAnnotation": null, "optional": false }, "init": null @@ -237,7 +232,6 @@ "ctxt": 0 }, "value": "Blue", - "typeAnnotation": null, "optional": false }, "init": null @@ -269,6 +263,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -291,13 +286,11 @@ "ctxt": 0 }, "value": "enumdule", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -329,8 +322,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -347,7 +340,6 @@ "ctxt": 0 }, "value": "enumdule", - "typeAnnotation": null, "optional": false }, "property": { @@ -358,7 +350,6 @@ "ctxt": 0 }, "value": "Red", - "typeAnnotation": null, "optional": false }, "computed": false @@ -392,6 +383,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -423,7 +415,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -465,7 +456,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -493,8 +483,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -526,8 +515,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -551,7 +540,6 @@ "ctxt": 0 }, "value": "enumdule", - "typeAnnotation": null, "optional": false }, "property": { @@ -562,7 +550,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ModuleAndFunctionWithSameNameAndCommonRoot/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ModuleAndFunctionWithSameNameAndCommonRoot/input.ts.json index 9c33d0225d84..4f28df9aa58a 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ModuleAndFunctionWithSameNameAndCommonRoot/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/ModuleAndFunctionWithSameNameAndCommonRoot/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "body": { @@ -101,8 +99,8 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -122,7 +120,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -145,7 +142,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -189,7 +185,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -217,7 +212,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -261,7 +255,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -284,7 +277,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -328,7 +320,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "body": { @@ -363,7 +354,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "body": { @@ -406,8 +396,8 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -427,7 +417,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -450,7 +439,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -491,7 +479,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -535,7 +522,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -558,7 +544,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName/input.ts.json index 9f75b5d28a97..91a7b2bbd538 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -123,7 +120,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -203,7 +198,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -229,7 +223,6 @@ "ctxt": 0 }, "value": "fromCarthesian", - "typeAnnotation": null, "optional": false }, "function": { @@ -250,6 +243,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -274,7 +268,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -285,14 +278,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } } ], @@ -335,7 +326,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -353,7 +343,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -364,7 +353,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -380,7 +368,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -398,7 +385,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -409,7 +395,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -466,6 +451,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -497,7 +483,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -539,7 +524,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -567,8 +551,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -600,6 +583,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -624,7 +608,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -635,14 +618,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -666,7 +647,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { @@ -686,7 +666,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "body": { @@ -706,7 +685,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "body": { @@ -734,7 +712,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -760,7 +737,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "value": null, @@ -821,7 +797,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { @@ -856,7 +831,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "body": { @@ -891,7 +865,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "body": { @@ -912,7 +885,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -938,7 +910,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1012,6 +983,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1043,7 +1015,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1071,8 +1042,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1104,6 +1074,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1132,7 +1103,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "right": { @@ -1143,7 +1113,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false } }, @@ -1155,7 +1124,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false } }, @@ -1167,14 +1135,12 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName/input.ts.json index cbdbd5fe69d7..df81ab2ab917 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -170,7 +166,6 @@ "ctxt": 0 }, "value": "toCarth", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -198,7 +193,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -230,7 +224,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -256,7 +249,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -286,7 +278,6 @@ "ctxt": 0 }, "value": "fromCarth", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -314,7 +305,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -353,6 +343,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -384,7 +375,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -426,7 +416,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -468,7 +457,6 @@ "ctxt": 0 }, "value": "toCarth", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -498,7 +486,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -509,7 +496,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, @@ -520,8 +506,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -553,6 +538,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -577,7 +563,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -588,14 +573,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -619,7 +602,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { @@ -639,7 +621,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "body": { @@ -659,7 +640,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "body": { @@ -692,7 +672,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -722,6 +701,7 @@ "ctxt": 0 }, "value": "start", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -746,7 +726,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -757,14 +736,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -774,6 +751,7 @@ "ctxt": 0 }, "value": "end", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -798,7 +776,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -809,14 +786,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -848,7 +823,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { @@ -883,7 +857,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "body": { @@ -903,7 +876,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "body": { @@ -929,7 +901,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -959,7 +930,6 @@ "ctxt": 0 }, "value": "start", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -990,7 +960,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -1001,7 +970,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, @@ -1026,7 +994,6 @@ "ctxt": 0 }, "value": "end", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1057,7 +1024,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -1068,7 +1034,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, @@ -1113,6 +1078,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1144,6 +1110,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1168,7 +1135,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -1179,14 +1145,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1196,6 +1160,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1220,7 +1185,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -1231,14 +1195,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -1246,8 +1208,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1279,6 +1240,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1307,7 +1269,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "right": { @@ -1318,7 +1279,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false } }, @@ -1330,7 +1290,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false } }, @@ -1342,14 +1301,12 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName/input.ts.json index 6bbe628f0bf8..078609e3aea4 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "Utils", - "typeAnnotation": null, "optional": false }, "body": { @@ -210,7 +205,6 @@ "ctxt": 0 }, "value": "mirror", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -231,6 +225,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -253,13 +248,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -302,7 +295,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -320,7 +312,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -331,7 +322,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -347,7 +337,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -365,7 +354,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -376,7 +364,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -412,7 +399,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -430,7 +416,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -478,6 +463,7 @@ "ctxt": 0 }, "value": "Origin", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -500,13 +486,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -526,7 +510,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -549,7 +532,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -589,7 +571,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -625,6 +606,7 @@ "ctxt": 0 }, "value": "Origin", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -641,8 +623,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -686,7 +667,6 @@ "ctxt": 0 }, "value": "Utils", - "typeAnnotation": null, "optional": false }, "body": { @@ -714,7 +694,6 @@ "ctxt": 0 }, "value": "Plane", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -740,7 +719,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -762,6 +740,7 @@ "ctxt": 0 }, "value": "tl", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -784,13 +763,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -811,6 +788,7 @@ "ctxt": 0 }, "value": "br", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -833,13 +811,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -895,6 +871,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -926,7 +903,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -968,7 +944,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -996,8 +971,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1029,6 +1003,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1053,7 +1028,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -1064,14 +1038,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1103,8 +1075,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1121,7 +1093,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1132,7 +1103,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1166,8 +1136,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1198,7 +1168,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1209,7 +1178,6 @@ "ctxt": 0 }, "value": "Utils", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1222,7 +1190,6 @@ "ctxt": 0 }, "value": "mirror", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1238,7 +1205,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } @@ -1274,6 +1240,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1305,7 +1272,6 @@ "ctxt": 0 }, "value": "tl", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1336,7 +1302,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -1347,7 +1312,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, @@ -1372,7 +1336,6 @@ "ctxt": 0 }, "value": "br", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1403,7 +1366,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -1414,7 +1376,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, @@ -1425,8 +1386,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1458,6 +1418,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1484,7 +1445,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -1495,7 +1455,6 @@ "ctxt": 0 }, "value": "Utils", - "typeAnnotation": null, "optional": false } }, @@ -1507,14 +1466,12 @@ "ctxt": 0 }, "value": "Plane", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1546,8 +1503,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1578,7 +1535,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1589,7 +1545,6 @@ "ctxt": 0 }, "value": "Utils", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1602,7 +1557,6 @@ "ctxt": 0 }, "value": "Plane", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1618,7 +1572,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } }, @@ -1642,7 +1595,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1665,7 +1617,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName/input.ts.json index f438bd9db9f9..b99eb00915db 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -123,7 +120,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -210,7 +205,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -236,7 +230,6 @@ "ctxt": 0 }, "value": "origin", - "typeAnnotation": null, "optional": false }, "value": null, @@ -282,7 +275,6 @@ "ctxt": 0 }, "value": "angle", - "typeAnnotation": null, "optional": false }, "value": null, @@ -341,7 +333,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { @@ -361,7 +352,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "body": { @@ -381,7 +371,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "body": { @@ -409,7 +398,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -435,7 +423,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "value": null, @@ -496,7 +483,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { @@ -531,7 +517,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "body": { @@ -566,7 +551,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "body": { @@ -594,7 +578,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -620,7 +603,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName/input.ts.json index 9fadd4b5e1e6..0b8a97696af8 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -170,7 +166,6 @@ "ctxt": 0 }, "value": "toCarth", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -198,7 +193,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -230,7 +224,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -263,7 +256,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -293,7 +285,6 @@ "ctxt": 0 }, "value": "fromCarth", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -321,7 +312,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -361,6 +351,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -392,7 +383,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -434,7 +424,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -476,7 +465,6 @@ "ctxt": 0 }, "value": "toCarth", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -506,7 +494,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -517,7 +504,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, @@ -542,7 +528,6 @@ "ctxt": 0 }, "value": "fromCarth", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -572,7 +557,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -583,7 +567,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, @@ -594,8 +577,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -627,6 +609,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -651,7 +634,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -662,14 +644,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -693,7 +673,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { @@ -713,7 +692,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "body": { @@ -733,7 +711,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "body": { @@ -766,7 +743,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -796,6 +772,7 @@ "ctxt": 0 }, "value": "start", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -820,7 +797,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -831,14 +807,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -848,6 +822,7 @@ "ctxt": 0 }, "value": "end", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -872,7 +847,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -883,14 +857,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -922,7 +894,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { @@ -957,7 +928,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "body": { @@ -977,7 +947,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "body": { @@ -1010,7 +979,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1040,7 +1008,6 @@ "ctxt": 0 }, "value": "start", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1071,7 +1038,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -1082,7 +1048,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, @@ -1107,7 +1072,6 @@ "ctxt": 0 }, "value": "end", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1138,7 +1102,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -1149,7 +1112,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, @@ -1195,6 +1157,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1226,7 +1189,6 @@ "ctxt": 0 }, "value": "start", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1257,7 +1219,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -1268,7 +1229,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, @@ -1293,7 +1253,6 @@ "ctxt": 0 }, "value": "end", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1324,7 +1283,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -1335,7 +1293,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, @@ -1360,6 +1317,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1384,7 +1342,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -1395,14 +1352,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1412,6 +1367,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1436,7 +1392,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -1447,14 +1402,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -1462,8 +1415,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1495,6 +1447,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1523,7 +1476,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "right": { @@ -1534,7 +1486,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false } }, @@ -1546,7 +1497,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false } }, @@ -1558,14 +1508,12 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName/input.ts.json index c0b92d749769..c958fe8d3e06 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName/input.ts.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -63,7 +62,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -135,7 +132,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -189,7 +185,6 @@ "ctxt": 0 }, "value": "Utils", - "typeAnnotation": null, "optional": false }, "body": { @@ -217,7 +212,6 @@ "ctxt": 0 }, "value": "mirror", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -238,6 +232,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -260,13 +255,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -309,7 +302,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -327,7 +319,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -338,7 +329,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -354,7 +344,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -372,7 +361,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -383,7 +371,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -419,7 +406,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -437,7 +423,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -485,6 +470,7 @@ "ctxt": 0 }, "value": "Origin", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -507,13 +493,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -533,7 +517,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -556,7 +539,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -604,7 +586,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -647,6 +628,7 @@ "ctxt": 0 }, "value": "Origin", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -669,13 +651,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -695,7 +675,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -718,7 +697,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -762,7 +740,6 @@ "ctxt": 0 }, "value": "Utils", - "typeAnnotation": null, "optional": false }, "body": { @@ -790,7 +767,6 @@ "ctxt": 0 }, "value": "Plane", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -816,7 +792,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -838,6 +813,7 @@ "ctxt": 0 }, "value": "tl", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -860,13 +836,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -887,6 +861,7 @@ "ctxt": 0 }, "value": "br", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -909,13 +884,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName/input.ts.json index dfa977e1d339..e41ec575d6a8 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "body": { @@ -86,6 +84,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,8 +101,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -132,7 +130,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -160,7 +157,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "body": { @@ -203,6 +199,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -219,8 +216,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -259,6 +255,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -275,8 +272,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -308,8 +304,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -333,7 +329,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -344,7 +339,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -357,7 +351,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -383,7 +376,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { @@ -403,7 +395,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "body": { @@ -423,7 +414,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "body": { @@ -451,7 +441,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -477,7 +466,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "value": null, @@ -538,7 +526,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { @@ -573,7 +560,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "body": { @@ -601,7 +587,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "body": { @@ -629,7 +614,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -655,7 +639,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -729,6 +712,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -760,7 +744,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -788,8 +771,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -821,6 +803,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -849,7 +832,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "right": { @@ -860,7 +842,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false } }, @@ -872,7 +853,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false } }, @@ -884,14 +864,12 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot/input.ts.json index 40064f27273e..c3287ac4357e 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Root", - "typeAnnotation": null, "optional": false }, "body": { @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -91,7 +89,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -121,7 +118,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -163,7 +159,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -217,7 +212,6 @@ "ctxt": 0 }, "value": "Utils", - "typeAnnotation": null, "optional": false }, "body": { @@ -245,7 +239,6 @@ "ctxt": 0 }, "value": "mirror", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -266,6 +259,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -288,13 +282,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -337,7 +329,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -355,7 +346,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -366,7 +356,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -382,7 +371,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -400,7 +388,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -411,7 +398,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -447,7 +433,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -465,7 +450,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -505,7 +489,6 @@ "ctxt": 0 }, "value": "otherRoot", - "typeAnnotation": null, "optional": false }, "body": { @@ -540,7 +523,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -583,6 +565,7 @@ "ctxt": 0 }, "value": "Origin", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -609,7 +592,6 @@ "ctxt": 0 }, "value": "Root", - "typeAnnotation": null, "optional": false }, "right": { @@ -620,7 +602,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -632,14 +613,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -659,7 +638,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -682,7 +660,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -726,7 +703,6 @@ "ctxt": 0 }, "value": "Utils", - "typeAnnotation": null, "optional": false }, "body": { @@ -754,7 +730,6 @@ "ctxt": 0 }, "value": "Plane", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -780,7 +755,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -802,6 +776,7 @@ "ctxt": 0 }, "value": "tl", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -828,7 +803,6 @@ "ctxt": 0 }, "value": "Root", - "typeAnnotation": null, "optional": false }, "right": { @@ -839,7 +813,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -851,14 +824,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } }, { @@ -879,6 +850,7 @@ "ctxt": 0 }, "value": "br", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -905,7 +877,6 @@ "ctxt": 0 }, "value": "Root", - "typeAnnotation": null, "optional": false }, "right": { @@ -916,7 +887,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -928,14 +898,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndSameCommonRoot/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndSameCommonRoot/input.ts.json index 66adcc76efe6..ea166b91a894 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndSameCommonRoot/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndSameCommonRoot/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "Utils", - "typeAnnotation": null, "optional": false }, "body": { @@ -210,7 +205,6 @@ "ctxt": 0 }, "value": "mirror", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -231,6 +225,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -253,13 +248,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -302,7 +295,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -320,7 +312,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -331,7 +322,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -347,7 +337,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -365,7 +354,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -376,7 +364,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -412,7 +399,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -430,7 +416,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -466,7 +451,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -509,6 +493,7 @@ "ctxt": 0 }, "value": "Origin", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -531,13 +516,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -557,7 +540,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -580,7 +562,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -624,7 +605,6 @@ "ctxt": 0 }, "value": "Utils", - "typeAnnotation": null, "optional": false }, "body": { @@ -652,7 +632,6 @@ "ctxt": 0 }, "value": "Plane", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -678,7 +657,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -700,6 +678,7 @@ "ctxt": 0 }, "value": "tl", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -722,13 +701,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -749,6 +726,7 @@ "ctxt": 0 }, "value": "br", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -771,13 +749,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -833,6 +809,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -864,7 +841,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -906,7 +882,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -934,8 +909,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -967,6 +941,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -991,7 +966,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -1002,14 +976,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1041,8 +1013,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1059,7 +1031,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1070,7 +1041,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1104,8 +1074,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1136,7 +1106,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1147,7 +1116,6 @@ "ctxt": 0 }, "value": "Utils", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1160,7 +1128,6 @@ "ctxt": 0 }, "value": "mirror", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1176,7 +1143,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } @@ -1212,6 +1178,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1243,7 +1210,6 @@ "ctxt": 0 }, "value": "tl", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1274,7 +1240,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -1285,7 +1250,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, @@ -1310,7 +1274,6 @@ "ctxt": 0 }, "value": "br", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1341,7 +1304,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -1352,7 +1314,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, @@ -1363,8 +1324,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1396,6 +1356,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1422,7 +1383,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -1433,7 +1393,6 @@ "ctxt": 0 }, "value": "Utils", - "typeAnnotation": null, "optional": false } }, @@ -1445,14 +1404,12 @@ "ctxt": 0 }, "value": "Plane", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1484,8 +1441,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1516,7 +1473,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1527,7 +1483,6 @@ "ctxt": 0 }, "value": "Utils", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1540,7 +1495,6 @@ "ctxt": 0 }, "value": "Plane", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1556,7 +1510,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } }, @@ -1580,7 +1533,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1603,7 +1555,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/codeGeneration/exportCodeGen/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/codeGeneration/exportCodeGen/input.ts.json index 46f9b286ea83..b445f1a4ea64 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/codeGeneration/exportCodeGen/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/codeGeneration/exportCodeGen/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -66,8 +65,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -93,7 +92,6 @@ "ctxt": 0 }, "value": "lt12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -135,7 +133,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -176,7 +173,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "body": { @@ -212,8 +208,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -238,7 +234,6 @@ "ctxt": 0 }, "value": "lt12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -280,7 +275,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -321,7 +315,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "body": { @@ -342,7 +335,6 @@ "ctxt": 0 }, "value": "no", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -405,7 +397,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "body": { @@ -433,7 +424,6 @@ "ctxt": 0 }, "value": "yes", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -497,7 +487,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "body": { @@ -532,7 +521,6 @@ "ctxt": 0 }, "value": "Color", - "typeAnnotation": null, "optional": false }, "members": [ @@ -551,7 +539,6 @@ "ctxt": 0 }, "value": "Red", - "typeAnnotation": null, "optional": false }, "init": null @@ -576,7 +563,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -624,7 +610,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -654,7 +639,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -701,7 +685,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -727,7 +710,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -790,7 +772,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -833,8 +814,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -874,7 +855,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "body": { @@ -902,7 +882,6 @@ "ctxt": 0 }, "value": "Color", - "typeAnnotation": null, "optional": false }, "members": [ @@ -921,7 +900,6 @@ "ctxt": 0 }, "value": "Red", - "typeAnnotation": null, "optional": false }, "init": null @@ -938,7 +916,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -978,7 +955,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1008,7 +984,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1047,7 +1022,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1073,7 +1047,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1128,7 +1101,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -1164,8 +1136,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/codeGeneration/importStatements/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/codeGeneration/importStatements/input.ts.json index faf93ca2c57f..6ea4d2e0a3f4 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/codeGeneration/importStatements/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/codeGeneration/importStatements/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -99,6 +96,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -115,8 +113,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -137,6 +134,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -153,8 +151,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -210,8 +207,8 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -228,7 +225,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -284,7 +280,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "body": { @@ -312,7 +307,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -323,7 +317,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } @@ -347,7 +340,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "body": { @@ -375,7 +367,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -386,7 +377,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -415,6 +405,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -437,12 +428,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -474,6 +463,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -498,7 +488,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -509,14 +498,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -548,8 +535,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -569,7 +556,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -592,7 +578,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -631,7 +616,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "body": { @@ -659,7 +643,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -670,7 +653,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -699,8 +681,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -724,7 +706,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -735,7 +716,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false @@ -792,7 +772,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "body": { @@ -820,7 +799,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -831,7 +809,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -852,7 +829,6 @@ "ctxt": 0 }, "value": "xDist", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -873,6 +849,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -897,7 +874,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -908,14 +884,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } } ], @@ -977,7 +951,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -988,7 +961,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1001,7 +973,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1021,7 +992,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1032,7 +1002,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/codeGeneration/importStatementsInterfaces/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/codeGeneration/importStatementsInterfaces/input.ts.json index 8788fc4dd576..ee695bbb1e19 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/codeGeneration/importStatementsInterfaces/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/codeGeneration/importStatementsInterfaces/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "inA", - "typeAnnotation": null, "optional": false }, "body": { @@ -215,7 +210,6 @@ "ctxt": 0 }, "value": "Point3D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -236,7 +230,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -266,7 +259,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -320,7 +312,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "body": { @@ -348,7 +339,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -359,7 +349,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } @@ -383,7 +372,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "body": { @@ -411,7 +399,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -422,7 +409,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -443,7 +429,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -456,7 +441,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -467,7 +451,6 @@ "ctxt": 0 }, "value": "inA", - "typeAnnotation": null, "optional": false } } @@ -497,6 +480,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -519,12 +503,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -556,6 +538,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -580,7 +563,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -591,14 +573,12 @@ "ctxt": 0 }, "value": "Point3D", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -630,8 +610,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -651,7 +631,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -674,7 +653,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -697,7 +675,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -736,7 +713,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "body": { @@ -764,7 +740,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -775,7 +750,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -804,6 +778,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -828,7 +803,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -839,14 +813,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -873,7 +845,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "body": { @@ -901,7 +872,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -914,7 +884,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -925,7 +894,6 @@ "ctxt": 0 }, "value": "inA", - "typeAnnotation": null, "optional": false } } @@ -947,7 +915,6 @@ "ctxt": 0 }, "value": "xDist", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -968,6 +935,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -992,7 +960,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1003,14 +970,12 @@ "ctxt": 0 }, "value": "Point3D", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1067,7 +1032,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1078,7 +1042,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/codeGeneration/nameCollision/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/codeGeneration/nameCollision/input.ts.json index 00e84c3b098c..38f476a0fbd0 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/codeGeneration/nameCollision/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/codeGeneration/nameCollision/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -59,8 +58,8 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -100,8 +99,8 @@ "ctxt": 0 }, "value": "_A", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -141,7 +140,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "body": { @@ -177,8 +175,8 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -213,7 +211,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "body": { @@ -234,7 +231,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -260,7 +256,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -318,7 +313,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { @@ -354,8 +348,8 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -394,7 +388,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "body": { @@ -430,8 +423,8 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -470,7 +463,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "body": { @@ -506,8 +498,8 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -547,8 +539,8 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -588,8 +580,8 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -632,7 +624,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "body": { @@ -652,7 +643,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "body": { @@ -687,7 +677,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "members": [ @@ -706,7 +695,6 @@ "ctxt": 0 }, "value": "Red", - "typeAnnotation": null, "optional": false }, "init": null @@ -726,7 +714,6 @@ "ctxt": 0 }, "value": "Blue", - "typeAnnotation": null, "optional": false }, "init": null @@ -755,7 +742,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "body": { @@ -788,7 +774,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -818,7 +803,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -880,8 +864,8 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportClassWhichExtendsInterfaceWithInaccessibleType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportClassWhichExtendsInterfaceWithInaccessibleType/input.ts.json index 28f01219d88b..13cfc4405f08 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportClassWhichExtendsInterfaceWithInaccessibleType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportClassWhichExtendsInterfaceWithInaccessibleType/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -121,7 +118,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -163,7 +159,6 @@ "ctxt": 0 }, "value": "fromOrigin", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -177,6 +172,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -199,13 +195,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -247,7 +241,6 @@ "ctxt": 0 }, "value": "Point2d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -273,7 +266,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -295,6 +287,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -311,8 +304,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -333,6 +325,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -349,8 +342,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -381,7 +373,6 @@ "ctxt": 0 }, "value": "fromOrigin", - "typeAnnotation": null, "optional": false }, "function": { @@ -402,6 +393,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -424,13 +416,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -499,7 +489,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeArguments": null diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations/input.ts.json index e6e637dac833..b6288613f718 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -123,7 +120,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -194,6 +190,7 @@ "ctxt": 0 }, "value": "Origin", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,13 +213,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -242,7 +237,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -265,7 +259,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -302,7 +295,6 @@ "ctxt": 0 }, "value": "Point3d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -328,7 +320,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -368,7 +359,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -409,6 +399,7 @@ "ctxt": 0 }, "value": "Origin3d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -431,13 +422,11 @@ "ctxt": 0 }, "value": "Point3d", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -457,7 +446,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -480,7 +468,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -503,7 +490,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -540,7 +526,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -566,7 +551,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -588,6 +572,7 @@ "ctxt": 0 }, "value": "start", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,13 +595,11 @@ "ctxt": 0 }, "value": "TPoint", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -637,6 +620,7 @@ "ctxt": 0 }, "value": "end", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -659,13 +643,11 @@ "ctxt": 0 }, "value": "TPoint", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -707,7 +689,6 @@ "ctxt": 0 }, "value": "TPoint", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -725,7 +706,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations/input.ts.json index 3acbe437ef8f..1d88d5e3b381 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -171,7 +167,6 @@ "ctxt": 0 }, "value": "points", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -193,6 +188,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -209,8 +205,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -235,7 +230,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -259,6 +253,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -275,8 +270,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -301,7 +295,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInTypeParameterConstraint/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInTypeParameterConstraint/input.ts.json index fbb4cade85a1..a4b8c96469e0 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInTypeParameterConstraint/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInTypeParameterConstraint/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -186,6 +182,7 @@ "ctxt": 0 }, "value": "Origin", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -208,13 +205,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -234,7 +229,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -257,7 +251,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -294,7 +287,6 @@ "ctxt": 0 }, "value": "Point3d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -320,7 +312,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -360,7 +351,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -401,6 +391,7 @@ "ctxt": 0 }, "value": "Origin3d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -423,13 +414,11 @@ "ctxt": 0 }, "value": "Point3d", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -449,7 +438,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -472,7 +460,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -495,7 +482,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -532,7 +518,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -558,7 +543,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -580,6 +564,7 @@ "ctxt": 0 }, "value": "start", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -602,13 +587,11 @@ "ctxt": 0 }, "value": "TPoint", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -629,6 +612,7 @@ "ctxt": 0 }, "value": "end", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -651,13 +635,11 @@ "ctxt": 0 }, "value": "TPoint", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -688,7 +670,6 @@ "ctxt": 0 }, "value": "fromorigin2d", - "typeAnnotation": null, "optional": false }, "function": { @@ -709,6 +690,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -731,13 +713,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -798,7 +778,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -824,7 +803,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -866,7 +844,6 @@ "ctxt": 0 }, "value": "TPoint", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -884,7 +861,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation/input.ts.json index 713afe65eeb2..c506071ae436 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -123,7 +120,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -179,7 +175,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -205,7 +200,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -227,6 +221,7 @@ "ctxt": 0 }, "value": "start", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -249,13 +244,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -276,6 +269,7 @@ "ctxt": 0 }, "value": "end", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -298,13 +292,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -345,7 +337,6 @@ "ctxt": 0 }, "value": "fromOrigin", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -366,6 +357,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -388,13 +380,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -434,7 +424,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -458,7 +447,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -481,7 +469,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -507,7 +494,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -542,7 +528,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation/input.ts.json index b9a7ad2b2b76..cd7c7d999f20 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -171,7 +167,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -197,7 +192,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -219,6 +213,7 @@ "ctxt": 0 }, "value": "start", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -241,13 +236,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -268,6 +261,7 @@ "ctxt": 0 }, "value": "end", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -290,13 +284,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -337,7 +329,6 @@ "ctxt": 0 }, "value": "fromOrigin", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -358,6 +349,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -380,13 +372,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -426,7 +416,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -450,7 +439,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -473,7 +461,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -499,7 +486,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -534,7 +520,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation/input.ts.json index 139cf4d42624..9e57d1f3e327 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -123,7 +120,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -172,7 +168,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -198,7 +193,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -220,6 +214,7 @@ "ctxt": 0 }, "value": "start", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -242,13 +237,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -269,6 +262,7 @@ "ctxt": 0 }, "value": "end", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -291,13 +285,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -337,7 +329,6 @@ "ctxt": 0 }, "value": "fromOrigin", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -358,6 +349,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -380,13 +372,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -426,7 +416,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -450,7 +439,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -473,7 +461,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -499,7 +486,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -534,7 +520,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations/input.ts.json index 665ddeeec3c9..d687585878c6 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,6 +186,7 @@ "ctxt": 0 }, "value": "Origin", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -212,13 +209,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -238,7 +233,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -261,7 +255,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -303,7 +296,6 @@ "ctxt": 0 }, "value": "Point3d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -324,7 +316,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -354,7 +345,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -416,6 +406,7 @@ "ctxt": 0 }, "value": "Origin3d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -438,13 +429,11 @@ "ctxt": 0 }, "value": "Point3d", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -464,7 +453,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -487,7 +475,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -510,7 +497,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -552,7 +538,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -579,7 +564,6 @@ "ctxt": 0 }, "value": "TPoint", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -597,7 +581,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -631,6 +614,7 @@ "ctxt": 0 }, "value": "start", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -653,13 +637,11 @@ "ctxt": 0 }, "value": "TPoint", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -669,6 +651,7 @@ "ctxt": 0 }, "value": "end", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -691,13 +674,11 @@ "ctxt": 0 }, "value": "TPoint", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -719,7 +700,6 @@ "ctxt": 0 }, "value": "start", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -748,7 +728,6 @@ "ctxt": 0 }, "value": "TPoint", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -772,7 +751,6 @@ "ctxt": 0 }, "value": "end", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -801,7 +779,6 @@ "ctxt": 0 }, "value": "TPoint", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations/input.ts.json index b2e007c04deb..ff021efa665f 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -121,7 +118,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -172,7 +168,6 @@ "ctxt": 0 }, "value": "points", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -197,6 +192,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -213,8 +209,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -239,7 +234,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -263,6 +257,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -279,8 +274,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -305,7 +299,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint/input.ts.json index 5f8281da69bf..f4ed5b3301fa 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -121,7 +118,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -182,6 +178,7 @@ "ctxt": 0 }, "value": "Origin", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -204,13 +201,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -230,7 +225,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -253,7 +247,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -295,7 +288,6 @@ "ctxt": 0 }, "value": "Point3d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -316,7 +308,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -346,7 +337,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -408,6 +398,7 @@ "ctxt": 0 }, "value": "Origin3d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -430,13 +421,11 @@ "ctxt": 0 }, "value": "Point3d", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -456,7 +445,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -479,7 +467,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -502,7 +489,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -544,7 +530,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -571,7 +556,6 @@ "ctxt": 0 }, "value": "TPoint", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -589,7 +573,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -623,6 +606,7 @@ "ctxt": 0 }, "value": "start", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -645,13 +629,11 @@ "ctxt": 0 }, "value": "TPoint", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -661,6 +643,7 @@ "ctxt": 0 }, "value": "end", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -683,13 +666,11 @@ "ctxt": 0 }, "value": "TPoint", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -711,7 +692,6 @@ "ctxt": 0 }, "value": "start", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -740,7 +720,6 @@ "ctxt": 0 }, "value": "TPoint", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -764,7 +743,6 @@ "ctxt": 0 }, "value": "end", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -793,7 +771,6 @@ "ctxt": 0 }, "value": "TPoint", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportModuleWithAccessibleTypesOnItsExportedMembers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportModuleWithAccessibleTypesOnItsExportedMembers/input.ts.json index b3bb4c32146a..dd9226aaeb6c 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportModuleWithAccessibleTypesOnItsExportedMembers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportModuleWithAccessibleTypesOnItsExportedMembers/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -99,6 +96,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -115,8 +113,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -137,6 +134,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -153,8 +151,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -202,7 +199,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "body": { @@ -245,6 +241,7 @@ "ctxt": 0 }, "value": "Origin", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -267,13 +264,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -290,7 +285,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -343,7 +337,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -369,7 +362,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -389,6 +381,7 @@ "ctxt": 0 }, "value": "start", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -411,13 +404,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -436,6 +427,7 @@ "ctxt": 0 }, "value": "end", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -458,13 +450,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -495,7 +485,6 @@ "ctxt": 0 }, "value": "fromOrigin", - "typeAnnotation": null, "optional": false }, "function": { @@ -516,6 +505,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -538,13 +528,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -584,7 +572,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -608,7 +595,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -631,7 +617,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -657,7 +642,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations/input.ts.json index e036dc6838af..25ebaab66440 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -92,6 +89,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -108,8 +106,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -130,6 +127,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -146,8 +144,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -202,6 +199,7 @@ "ctxt": 0 }, "value": "Origin", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -224,13 +222,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -250,7 +246,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -273,7 +268,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -325,8 +319,8 @@ "ctxt": 0 }, "value": "Unity", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -346,7 +340,6 @@ "ctxt": 0 }, "value": "start", - "typeAnnotation": null, "optional": false }, "value": { @@ -364,7 +357,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -406,7 +398,6 @@ "ctxt": 0 }, "value": "end", - "typeAnnotation": null, "optional": false }, "value": { @@ -424,7 +415,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations/input.ts.json index 3912e91aa32b..78bfefe22877 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -92,6 +89,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -108,8 +106,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -130,6 +127,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -146,8 +144,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -202,6 +199,7 @@ "ctxt": 0 }, "value": "UnitSquare", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -233,7 +231,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -271,7 +268,6 @@ "ctxt": 0 }, "value": "left", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -300,7 +296,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -324,7 +319,6 @@ "ctxt": 0 }, "value": "right", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -353,7 +347,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -382,7 +375,6 @@ "ctxt": 0 }, "value": "bottom", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -420,7 +412,6 @@ "ctxt": 0 }, "value": "left", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -449,7 +440,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -473,7 +463,6 @@ "ctxt": 0 }, "value": "right", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -502,7 +491,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -517,8 +505,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "NullLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument/input.ts.json index 4fc24ed11d5d..b6e682744502 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -140,6 +137,7 @@ "ctxt": 0 }, "value": "beez", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -162,7 +160,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -188,7 +185,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -196,8 +192,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -237,8 +232,8 @@ "ctxt": 0 }, "value": "beez2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -255,7 +250,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -282,7 +276,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportVariableWithAccessibleTypeInTypeAnnotation/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportVariableWithAccessibleTypeInTypeAnnotation/input.ts.json index 7ed749c4b77a..c888325d5e66 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportVariableWithAccessibleTypeInTypeAnnotation/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportVariableWithAccessibleTypeInTypeAnnotation/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,6 +186,7 @@ "ctxt": 0 }, "value": "Origin", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -212,13 +209,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -238,7 +233,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -261,7 +255,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportVariableWithInaccessibleTypeInTypeAnnotation/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportVariableWithInaccessibleTypeInTypeAnnotation/input.ts.json index b9bac7441f6c..d9d317369589 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportVariableWithInaccessibleTypeInTypeAnnotation/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ExportVariableWithInaccessibleTypeInTypeAnnotation/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,6 +186,7 @@ "ctxt": 0 }, "value": "Origin", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -212,13 +209,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -238,7 +233,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -261,7 +255,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -296,7 +289,6 @@ "ctxt": 0 }, "value": "Point3d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -317,7 +309,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -347,7 +338,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -408,6 +398,7 @@ "ctxt": 0 }, "value": "Origin3d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -430,13 +421,11 @@ "ctxt": 0 }, "value": "Point3d", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -456,7 +445,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -479,7 +467,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -502,7 +489,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedClasses/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedClasses/input.ts.json index eab7821f8481..58ca1707370f 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedClasses/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedClasses/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -123,7 +120,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -179,7 +175,6 @@ "ctxt": 0 }, "value": "AG", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -205,7 +200,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -231,7 +225,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -262,7 +255,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -288,7 +280,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -330,7 +321,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -351,7 +341,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -373,7 +362,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -399,7 +387,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -445,7 +432,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -493,7 +479,6 @@ "ctxt": 0 }, "value": "AG2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -519,7 +504,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -545,7 +529,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -576,7 +559,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -602,7 +584,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -644,7 +625,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -665,7 +645,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -704,6 +683,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -735,7 +715,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -777,7 +756,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -805,8 +783,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -838,8 +815,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -863,7 +840,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -874,7 +850,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -911,8 +886,8 @@ "ctxt": 0 }, "value": "AG", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -936,7 +911,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -947,7 +921,6 @@ "ctxt": 0 }, "value": "AG", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1011,8 +984,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1036,7 +1009,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1047,7 +1019,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1084,8 +1055,8 @@ "ctxt": 0 }, "value": "ag2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1109,7 +1080,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1120,7 +1090,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedEnums/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedEnums/input.ts.json index 27cb6fc17a30..9298018bb64d 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedEnums/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedEnums/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "Color", - "typeAnnotation": null, "optional": false }, "members": [ @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "Red", - "typeAnnotation": null, "optional": false }, "init": null @@ -97,7 +94,6 @@ "ctxt": 0 }, "value": "Blue", - "typeAnnotation": null, "optional": false }, "init": null @@ -122,7 +118,6 @@ "ctxt": 0 }, "value": "Day", - "typeAnnotation": null, "optional": false }, "members": [ @@ -141,7 +136,6 @@ "ctxt": 0 }, "value": "Monday", - "typeAnnotation": null, "optional": false }, "init": null @@ -161,7 +155,6 @@ "ctxt": 0 }, "value": "Tuesday", - "typeAnnotation": null, "optional": false }, "init": null @@ -196,6 +189,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -220,7 +214,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -231,14 +224,12 @@ "ctxt": 0 }, "value": "Color", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -262,7 +253,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -273,7 +263,6 @@ "ctxt": 0 }, "value": "Color", - "typeAnnotation": null, "optional": false }, "computed": false @@ -286,7 +275,6 @@ "ctxt": 0 }, "value": "Red", - "typeAnnotation": null, "optional": false }, "computed": false @@ -320,8 +308,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -345,7 +333,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -356,7 +343,6 @@ "ctxt": 0 }, "value": "Day", - "typeAnnotation": null, "optional": false }, "computed": false @@ -369,7 +355,6 @@ "ctxt": 0 }, "value": "Monday", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedFunctions/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedFunctions/input.ts.json index 08e7453376df..620bf6b8e279 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedFunctions/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedFunctions/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -72,6 +70,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -88,8 +87,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -149,7 +147,6 @@ "ctxt": 0 }, "value": "fng", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -170,6 +167,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -192,13 +190,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -259,7 +255,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -280,7 +275,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -310,7 +304,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -328,7 +321,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -349,6 +341,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -365,8 +358,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -418,7 +410,6 @@ "ctxt": 0 }, "value": "fng2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -439,6 +430,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -461,13 +453,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -528,7 +518,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -549,7 +538,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -579,7 +567,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -614,6 +601,7 @@ "ctxt": 0 }, "value": "fn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -637,6 +625,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -653,8 +642,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -676,8 +664,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -709,8 +696,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -727,7 +714,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -738,7 +724,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -772,6 +757,7 @@ "ctxt": 0 }, "value": "fng", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -795,6 +781,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -817,13 +804,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -849,7 +834,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -870,7 +854,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -900,15 +883,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -940,8 +921,8 @@ "ctxt": 0 }, "value": "fng", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -958,7 +939,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -969,7 +949,6 @@ "ctxt": 0 }, "value": "fng", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1003,8 +982,8 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1021,7 +1000,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1032,7 +1010,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1066,8 +1043,8 @@ "ctxt": 0 }, "value": "fng2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1084,7 +1061,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1095,7 +1071,6 @@ "ctxt": 0 }, "value": "fng2", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedImportAlias/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedImportAlias/input.ts.json index 21b7afd0e179..47023ab12d27 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedImportAlias/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedImportAlias/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -173,7 +169,6 @@ "ctxt": 0 }, "value": "Point3d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -194,7 +189,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -224,7 +218,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -273,7 +266,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "body": { @@ -301,7 +293,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -327,7 +318,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -349,6 +339,7 @@ "ctxt": 0 }, "value": "start", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -373,7 +364,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -384,14 +374,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } }, { @@ -412,6 +400,7 @@ "ctxt": 0 }, "value": "end", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -436,7 +425,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -447,14 +435,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } } ], @@ -498,7 +484,6 @@ "ctxt": 0 }, "value": "Geometry", - "typeAnnotation": null, "optional": false }, "body": { @@ -526,7 +511,6 @@ "ctxt": 0 }, "value": "Points", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -537,7 +521,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -558,7 +541,6 @@ "ctxt": 0 }, "value": "Lines", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -569,7 +551,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -605,6 +586,7 @@ "ctxt": 0 }, "value": "Origin", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -629,7 +611,6 @@ "ctxt": 0 }, "value": "Points", - "typeAnnotation": null, "optional": false }, "right": { @@ -640,14 +621,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -667,7 +646,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -690,7 +668,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -742,6 +719,7 @@ "ctxt": 0 }, "value": "Unit", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -766,7 +744,6 @@ "ctxt": 0 }, "value": "Lines", - "typeAnnotation": null, "optional": false }, "right": { @@ -777,14 +754,12 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -808,7 +783,6 @@ "ctxt": 0 }, "value": "Lines", - "typeAnnotation": null, "optional": false }, "property": { @@ -819,7 +793,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "computed": false @@ -835,7 +808,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false } }, @@ -859,7 +831,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -882,7 +853,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -934,6 +904,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -965,7 +936,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1007,7 +977,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1035,8 +1004,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1068,6 +1036,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1094,7 +1063,6 @@ "ctxt": 0 }, "value": "Geometry", - "typeAnnotation": null, "optional": false }, "right": { @@ -1105,7 +1073,6 @@ "ctxt": 0 }, "value": "Points", - "typeAnnotation": null, "optional": false } }, @@ -1117,14 +1084,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1156,8 +1121,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1174,7 +1139,6 @@ "ctxt": 0 }, "value": "Geometry", - "typeAnnotation": null, "optional": false }, "property": { @@ -1185,7 +1149,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1219,6 +1182,7 @@ "ctxt": 0 }, "value": "line", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1250,7 +1214,6 @@ "ctxt": 0 }, "value": "start", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1288,7 +1251,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1330,7 +1292,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1377,7 +1338,6 @@ "ctxt": 0 }, "value": "end", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1415,7 +1375,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1457,7 +1416,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1490,8 +1448,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1523,8 +1480,8 @@ "ctxt": 0 }, "value": "line", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1541,7 +1498,6 @@ "ctxt": 0 }, "value": "Geometry", - "typeAnnotation": null, "optional": false }, "property": { @@ -1552,7 +1508,6 @@ "ctxt": 0 }, "value": "Unit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1586,8 +1541,8 @@ "ctxt": 0 }, "value": "line", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1611,7 +1566,6 @@ "ctxt": 0 }, "value": "Geometry", - "typeAnnotation": null, "optional": false }, "property": { @@ -1622,7 +1576,6 @@ "ctxt": 0 }, "value": "Lines", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1635,7 +1588,6 @@ "ctxt": 0 }, "value": "Line", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedVariables/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedVariables/input.ts.json index 424a33f6cdf5..a5397026488c 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedVariables/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedVariables/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -66,8 +65,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -113,8 +112,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -157,6 +156,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -173,8 +173,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -206,8 +205,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -224,7 +223,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -235,7 +233,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -269,8 +266,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -287,7 +284,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -298,7 +294,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/importDeclarations/circularImportAlias/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/importDeclarations/circularImportAlias/input.ts.json index 60745e2461f7..77c9428fffa9 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/importDeclarations/circularImportAlias/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/importDeclarations/circularImportAlias/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -83,7 +80,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -109,7 +105,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +151,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -167,7 +161,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "computed": false @@ -198,7 +191,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -226,7 +218,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -252,7 +243,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -308,7 +298,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -319,7 +308,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } } @@ -351,6 +339,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -382,7 +371,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -410,8 +398,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -443,8 +430,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -475,7 +462,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "property": { @@ -486,7 +472,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -499,7 +484,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/importDeclarations/exportImportAlias/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/importDeclarations/exportImportAlias/input.ts.json index 54a05a55fc5d..ec2f9fe5a1c1 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/importDeclarations/exportImportAlias/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/importDeclarations/exportImportAlias/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -66,8 +65,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -105,7 +104,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -131,7 +129,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -153,6 +150,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -169,8 +167,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -191,6 +188,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -207,8 +205,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -256,7 +253,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "body": { @@ -289,7 +285,6 @@ "ctxt": 0 }, "value": "Id", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -319,7 +314,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -373,7 +367,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "body": { @@ -401,7 +394,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -412,7 +404,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } @@ -444,6 +435,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -460,8 +452,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -485,7 +476,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -496,7 +486,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -509,7 +498,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -543,6 +531,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -574,7 +563,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -616,7 +604,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -644,8 +631,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -676,7 +662,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -687,7 +672,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -700,7 +684,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false @@ -762,6 +745,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -793,7 +777,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -821,8 +804,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -854,6 +836,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -882,7 +865,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "right": { @@ -893,7 +875,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -905,7 +886,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -917,14 +897,12 @@ "ctxt": 0 }, "value": "Id", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -948,7 +926,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { @@ -976,7 +953,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1044,7 +1020,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "body": { @@ -1072,7 +1047,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1098,7 +1072,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1120,6 +1093,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1136,8 +1110,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -1158,6 +1131,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1174,8 +1148,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1223,7 +1196,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "body": { @@ -1251,7 +1223,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -1264,7 +1235,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "right": { @@ -1275,7 +1245,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false } } @@ -1308,6 +1277,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1324,8 +1294,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1349,7 +1318,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "property": { @@ -1360,7 +1328,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1397,6 +1364,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1428,7 +1396,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1470,7 +1437,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1498,8 +1464,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -1530,7 +1495,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "property": { @@ -1541,7 +1505,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1554,7 +1517,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1608,7 +1570,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "body": { @@ -1636,7 +1597,6 @@ "ctxt": 0 }, "value": "L", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1662,7 +1622,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1684,6 +1643,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1700,8 +1660,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1749,7 +1708,6 @@ "ctxt": 0 }, "value": "L", - "typeAnnotation": null, "optional": false }, "body": { @@ -1792,8 +1750,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1831,7 +1789,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1861,7 +1818,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1903,7 +1859,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1957,7 +1912,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -1985,7 +1939,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -1998,7 +1951,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "right": { @@ -2009,7 +1961,6 @@ "ctxt": 0 }, "value": "L", - "typeAnnotation": null, "optional": false } } @@ -2042,6 +1993,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2073,7 +2025,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2101,8 +2052,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2134,8 +2084,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2159,7 +2109,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2170,7 +2119,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2225,6 +2173,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2256,7 +2205,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2298,7 +2246,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2326,8 +2273,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2359,6 +2305,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2385,7 +2332,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "right": { @@ -2396,7 +2342,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false } }, @@ -2408,14 +2353,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/importDeclarations/importAliasIdentifiers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/importDeclarations/importAliasIdentifiers/input.ts.json index ccf466d8b954..1aaaa6257477 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/importDeclarations/importAliasIdentifiers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/importDeclarations/importAliasIdentifiers/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "moduleA", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -99,6 +96,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -115,8 +113,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -137,6 +134,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -153,8 +151,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -198,7 +195,6 @@ "ctxt": 0 }, "value": "alias", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -209,7 +205,6 @@ "ctxt": 0 }, "value": "moduleA", - "typeAnnotation": null, "optional": false } }, @@ -238,6 +233,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -262,7 +258,6 @@ "ctxt": 0 }, "value": "alias", - "typeAnnotation": null, "optional": false }, "right": { @@ -273,14 +268,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -312,6 +305,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -336,7 +330,6 @@ "ctxt": 0 }, "value": "moduleA", - "typeAnnotation": null, "optional": false }, "right": { @@ -347,14 +340,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -386,6 +377,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -417,7 +409,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -459,7 +450,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -487,8 +477,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -505,7 +494,6 @@ "ctxt": 0 }, "value": "clodule", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -531,7 +519,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -586,7 +573,6 @@ "ctxt": 0 }, "value": "clodule", - "typeAnnotation": null, "optional": false }, "body": { @@ -619,7 +605,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -649,7 +634,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -691,7 +675,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -746,6 +729,7 @@ "ctxt": 0 }, "value": "Point", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -768,13 +752,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -794,7 +776,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -817,7 +798,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -856,7 +836,6 @@ "ctxt": 0 }, "value": "clolias", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -867,7 +846,6 @@ "ctxt": 0 }, "value": "clodule", - "typeAnnotation": null, "optional": false } }, @@ -896,6 +874,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -920,7 +899,6 @@ "ctxt": 0 }, "value": "clolias", - "typeAnnotation": null, "optional": false }, "right": { @@ -931,14 +909,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -970,6 +946,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -994,7 +971,6 @@ "ctxt": 0 }, "value": "clodule", - "typeAnnotation": null, "optional": false }, "right": { @@ -1005,14 +981,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1044,6 +1018,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1075,7 +1050,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1117,7 +1091,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1145,8 +1118,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1163,7 +1135,6 @@ "ctxt": 0 }, "value": "fundule", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1207,7 +1178,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1230,7 +1200,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1270,7 +1239,6 @@ "ctxt": 0 }, "value": "fundule", - "typeAnnotation": null, "optional": false }, "body": { @@ -1303,7 +1271,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1333,7 +1300,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1375,7 +1341,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1430,6 +1395,7 @@ "ctxt": 0 }, "value": "Point", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1452,13 +1418,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1478,7 +1442,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1501,7 +1464,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1540,7 +1502,6 @@ "ctxt": 0 }, "value": "funlias", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -1551,7 +1512,6 @@ "ctxt": 0 }, "value": "fundule", - "typeAnnotation": null, "optional": false } }, @@ -1580,6 +1540,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1604,7 +1565,6 @@ "ctxt": 0 }, "value": "funlias", - "typeAnnotation": null, "optional": false }, "right": { @@ -1615,14 +1575,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1654,6 +1612,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1678,7 +1637,6 @@ "ctxt": 0 }, "value": "fundule", - "typeAnnotation": null, "optional": false }, "right": { @@ -1689,14 +1647,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1728,6 +1684,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1759,7 +1716,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1801,7 +1757,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1829,8 +1784,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/importDeclarations/invalidImportAliasIdentifiers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/importDeclarations/invalidImportAliasIdentifiers/input.ts.json index 5794d00cd78b..a21419ee1fe1 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/importDeclarations/invalidImportAliasIdentifiers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/importDeclarations/invalidImportAliasIdentifiers/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -64,7 +64,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -75,7 +74,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false } }, @@ -89,7 +87,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -115,7 +112,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -170,7 +166,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -181,7 +176,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -202,7 +196,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -221,7 +214,6 @@ "ctxt": 0 }, "value": "Red", - "typeAnnotation": null, "optional": false }, "init": null @@ -241,7 +233,6 @@ "ctxt": 0 }, "value": "Blue", - "typeAnnotation": null, "optional": false }, "init": null @@ -265,7 +256,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -276,7 +266,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false } }, @@ -295,7 +284,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -325,7 +313,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -371,7 +358,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -382,7 +368,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/importDeclarations/shadowedInternalModule/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/importDeclarations/shadowedInternalModule/input.ts.json index 3999102cd854..36749d3693ce 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/importDeclarations/shadowedInternalModule/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/importDeclarations/shadowedInternalModule/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -66,8 +65,8 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -87,7 +86,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -110,7 +108,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -152,7 +149,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -224,7 +219,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -274,7 +268,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "body": { @@ -310,8 +303,8 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -331,7 +324,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -354,7 +346,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -390,7 +381,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -401,7 +391,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } @@ -425,7 +414,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { @@ -460,7 +448,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "body": { @@ -493,7 +480,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -523,7 +509,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -565,7 +550,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -616,7 +600,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -642,7 +625,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -701,7 +683,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "body": { @@ -729,7 +710,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -742,7 +722,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "right": { @@ -753,7 +732,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false } } @@ -783,8 +761,8 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/moduleBody/moduleWithStatementsOfEveryKind/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/moduleBody/moduleWithStatementsOfEveryKind/input.ts.json index 5c6cbf9286ae..83d93e7d312d 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/moduleBody/moduleWithStatementsOfEveryKind/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/moduleBody/moduleWithStatementsOfEveryKind/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": null, @@ -118,7 +115,6 @@ "ctxt": 0 }, "value": "AA", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -144,7 +140,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": null, @@ -170,7 +165,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -212,7 +206,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -238,7 +231,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -268,7 +260,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -307,7 +298,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -333,7 +323,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -373,7 +362,6 @@ "ctxt": 0 }, "value": "AA", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -413,7 +401,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -430,7 +417,6 @@ "ctxt": 0 }, "value": "BB", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -456,7 +442,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -496,7 +481,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -523,7 +507,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -551,7 +534,6 @@ "ctxt": 0 }, "value": "Module", - "typeAnnotation": null, "optional": false }, "body": { @@ -572,7 +554,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -598,7 +579,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": null, @@ -656,7 +636,6 @@ "ctxt": 0 }, "value": "Color", - "typeAnnotation": null, "optional": false }, "members": [ @@ -675,7 +654,6 @@ "ctxt": 0 }, "value": "Blue", - "typeAnnotation": null, "optional": false }, "init": null @@ -695,7 +673,6 @@ "ctxt": 0 }, "value": "Red", - "typeAnnotation": null, "optional": false }, "init": null @@ -727,8 +704,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -753,7 +730,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -774,6 +750,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -790,8 +767,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -874,6 +850,7 @@ "ctxt": 0 }, "value": "array", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -903,14 +880,12 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -949,8 +924,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -968,6 +943,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -984,8 +960,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -1033,7 +1008,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -1074,8 +1048,8 @@ "ctxt": 0 }, "value": "ol", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1095,7 +1069,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": { @@ -1123,7 +1096,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": { @@ -1146,7 +1118,6 @@ "ctxt": 0 }, "value": "isvalid", - "typeAnnotation": null, "optional": false }, "value": { @@ -1175,7 +1146,6 @@ "ctxt": 0 }, "value": "DC", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1201,7 +1171,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1259,7 +1228,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "body": { @@ -1287,7 +1255,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1313,7 +1280,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1369,7 +1335,6 @@ "ctxt": 0 }, "value": "AA", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1395,7 +1360,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1421,7 +1385,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1463,7 +1426,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1497,7 +1459,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1527,7 +1488,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1574,7 +1534,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1600,7 +1559,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1640,7 +1598,6 @@ "ctxt": 0 }, "value": "AA", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1680,7 +1637,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1705,7 +1661,6 @@ "ctxt": 0 }, "value": "BB", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1731,7 +1686,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1771,7 +1725,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1798,7 +1751,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1834,7 +1786,6 @@ "ctxt": 0 }, "value": "Module", - "typeAnnotation": null, "optional": false }, "body": { @@ -1855,7 +1806,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1881,7 +1831,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1947,7 +1896,6 @@ "ctxt": 0 }, "value": "Color", - "typeAnnotation": null, "optional": false }, "members": [ @@ -1966,7 +1914,6 @@ "ctxt": 0 }, "value": "Blue", - "typeAnnotation": null, "optional": false }, "init": null @@ -1986,7 +1933,6 @@ "ctxt": 0 }, "value": "Red", - "typeAnnotation": null, "optional": false }, "init": null @@ -2026,8 +1972,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2060,7 +2006,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2081,6 +2026,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2097,8 +2043,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -2189,6 +2134,7 @@ "ctxt": 0 }, "value": "array", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2218,14 +2164,12 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -2272,8 +2216,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -2291,6 +2235,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2307,8 +2252,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -2356,7 +2300,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -2405,8 +2348,8 @@ "ctxt": 0 }, "value": "ol", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -2426,7 +2369,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": { @@ -2454,7 +2396,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": { @@ -2477,7 +2418,6 @@ "ctxt": 0 }, "value": "isvalid", - "typeAnnotation": null, "optional": false }, "value": { @@ -2514,7 +2454,6 @@ "ctxt": 0 }, "value": "DC", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2540,7 +2479,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/InvalidNonInstantiatedModule/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/InvalidNonInstantiatedModule/input.ts.json index ae5023732e81..6f5927e47aa0 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/InvalidNonInstantiatedModule/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/InvalidNonInstantiatedModule/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -186,8 +182,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -197,7 +193,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "definite": false @@ -229,6 +224,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -251,12 +247,10 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/asiPreventsParsingAsNamespace01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/asiPreventsParsingAsNamespace01/input.ts.json index 5f9b403dc04d..be03e43ddf3d 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/asiPreventsParsingAsNamespace01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/asiPreventsParsingAsNamespace01/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "namespace", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -121,7 +121,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/asiPreventsParsingAsNamespace02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/asiPreventsParsingAsNamespace02/input.ts.json index 7fb97bb35ef9..14976b8f6087 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/asiPreventsParsingAsNamespace02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/asiPreventsParsingAsNamespace02/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "module", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -121,7 +121,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/asiPreventsParsingAsNamespace03/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/asiPreventsParsingAsNamespace03/input.ts.json index 97ab1b6ca277..8132058becff 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/asiPreventsParsingAsNamespace03/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/asiPreventsParsingAsNamespace03/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "namespace", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -121,7 +121,6 @@ "ctxt": 0 }, "value": "container", - "typeAnnotation": null, "optional": false }, "body": { @@ -149,7 +148,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/asiPreventsParsingAsNamespace04/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/asiPreventsParsingAsNamespace04/input.ts.json index 1fabbfcd61ec..5f163a1a0b60 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/asiPreventsParsingAsNamespace04/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/asiPreventsParsingAsNamespace04/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -70,7 +70,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "right": { diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/asiPreventsParsingAsNamespace05/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/asiPreventsParsingAsNamespace05/input.ts.json index e9cb0171b5cf..d079df3a1e4d 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/asiPreventsParsingAsNamespace05/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/asiPreventsParsingAsNamespace05/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "namespace", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -64,7 +64,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "body": { @@ -84,7 +83,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "body": { @@ -127,8 +125,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -165,7 +163,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "body": { @@ -185,7 +182,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "body": { @@ -205,7 +201,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/instantiatedModule/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/instantiatedModule/input.ts.json index 2d7bf7424fcd..e7b3258fd3de 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/instantiatedModule/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/instantiatedModule/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,8 +186,8 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -235,6 +231,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -257,12 +254,10 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -294,8 +289,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -305,7 +300,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "definite": false @@ -337,6 +331,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -353,8 +348,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -386,8 +380,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -404,7 +398,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -415,7 +408,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false @@ -449,8 +441,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -467,7 +459,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -478,7 +469,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false @@ -512,6 +502,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -543,7 +534,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -585,7 +575,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -613,8 +602,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -646,6 +634,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -670,7 +659,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "right": { @@ -681,14 +669,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -712,7 +698,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -740,7 +725,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -766,7 +750,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -812,7 +795,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -858,7 +840,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "function": { @@ -902,7 +883,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -925,7 +905,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -968,7 +947,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1017,6 +995,7 @@ "ctxt": 0 }, "value": "m2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1039,12 +1018,10 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1076,8 +1053,8 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1087,7 +1064,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1119,6 +1095,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1143,7 +1120,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1154,13 +1130,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1192,8 +1166,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1210,7 +1184,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1221,7 +1194,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1255,8 +1227,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1273,7 +1245,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1284,7 +1255,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1318,6 +1288,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1342,7 +1313,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1353,14 +1323,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1384,7 +1352,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1395,7 +1362,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1432,6 +1398,7 @@ "ctxt": 0 }, "value": "p2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1463,7 +1430,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1505,7 +1471,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1533,8 +1498,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1566,6 +1530,7 @@ "ctxt": 0 }, "value": "p2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1590,7 +1555,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1601,14 +1565,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1640,8 +1602,8 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1665,7 +1627,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1676,7 +1637,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1713,8 +1673,8 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1738,7 +1698,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1749,7 +1708,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1778,7 +1736,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "body": { @@ -1813,7 +1770,6 @@ "ctxt": 0 }, "value": "Color", - "typeAnnotation": null, "optional": false }, "members": [ @@ -1832,7 +1788,6 @@ "ctxt": 0 }, "value": "Blue", - "typeAnnotation": null, "optional": false }, "init": null @@ -1852,7 +1807,6 @@ "ctxt": 0 }, "value": "Red", - "typeAnnotation": null, "optional": false }, "init": null @@ -1888,6 +1842,7 @@ "ctxt": 0 }, "value": "m3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1910,12 +1865,10 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1947,8 +1900,8 @@ "ctxt": 0 }, "value": "m3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1958,7 +1911,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1990,6 +1942,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2014,7 +1967,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2025,13 +1977,11 @@ "ctxt": 0 }, "value": "Color", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2063,8 +2013,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2081,7 +2031,6 @@ "ctxt": 0 }, "value": "m3", - "typeAnnotation": null, "optional": false }, "property": { @@ -2092,7 +2041,6 @@ "ctxt": 0 }, "value": "Color", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2126,8 +2074,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2144,7 +2092,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "property": { @@ -2155,7 +2102,6 @@ "ctxt": 0 }, "value": "Color", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2189,6 +2135,7 @@ "ctxt": 0 }, "value": "blue", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2213,7 +2160,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2224,14 +2170,12 @@ "ctxt": 0 }, "value": "Color", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -2248,7 +2192,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "property": { @@ -2259,7 +2202,6 @@ "ctxt": 0 }, "value": "Blue", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2293,6 +2235,7 @@ "ctxt": 0 }, "value": "p3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2317,7 +2260,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2328,14 +2270,12 @@ "ctxt": 0 }, "value": "Color", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2367,8 +2307,8 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2392,7 +2332,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "property": { @@ -2403,7 +2342,6 @@ "ctxt": 0 }, "value": "Color", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2416,7 +2354,6 @@ "ctxt": 0 }, "value": "Red", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2450,8 +2387,8 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2475,7 +2412,6 @@ "ctxt": 0 }, "value": "m3", - "typeAnnotation": null, "optional": false }, "property": { @@ -2486,7 +2422,6 @@ "ctxt": 0 }, "value": "Color", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2499,7 +2434,6 @@ "ctxt": 0 }, "value": "Blue", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/invalidInstantiatedModule/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/invalidInstantiatedModule/input.ts.json index 7acb1d29c848..756e3f5d273b 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/invalidInstantiatedModule/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/invalidInstantiatedModule/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -123,7 +120,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -194,8 +190,8 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -231,7 +227,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -264,7 +259,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -294,7 +288,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -336,7 +329,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -398,8 +390,8 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -443,8 +435,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -454,7 +446,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "definite": false @@ -486,6 +477,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -510,7 +502,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "right": { @@ -521,14 +512,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/invalidNestedModules/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/invalidNestedModules/input.ts.json index 6eb6a667a8c4..2437fb2fb675 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/invalidNestedModules/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/invalidNestedModules/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "body": { @@ -63,7 +61,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "body": { @@ -91,7 +88,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -117,7 +113,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -163,7 +158,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -224,7 +218,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -259,7 +252,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "body": { @@ -287,7 +279,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -313,7 +304,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -376,7 +366,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -396,7 +385,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { @@ -424,7 +412,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -450,7 +437,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -496,7 +482,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -556,7 +541,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -591,7 +575,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { @@ -634,6 +617,7 @@ "ctxt": 0 }, "value": "Point", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -650,8 +634,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/nestedModules/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/nestedModules/input.ts.json index 47b64e6ee7a9..56a6c341e88d 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/nestedModules/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/nestedModules/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "body": { @@ -63,7 +61,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "body": { @@ -96,7 +93,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -126,7 +122,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -168,7 +163,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -220,7 +214,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -255,7 +248,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "body": { @@ -291,6 +283,7 @@ "ctxt": 0 }, "value": "Point", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -315,7 +308,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "right": { @@ -326,14 +318,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -353,7 +343,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -376,7 +365,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -419,7 +407,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -439,7 +426,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { @@ -472,7 +458,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -502,7 +487,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -544,7 +528,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -595,7 +578,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -630,7 +612,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { @@ -673,6 +654,7 @@ "ctxt": 0 }, "value": "Point", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -689,8 +671,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -730,8 +711,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -748,7 +729,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "property": { @@ -759,7 +739,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "computed": false @@ -793,6 +772,7 @@ "ctxt": 0 }, "value": "point", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -809,8 +789,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -842,8 +821,8 @@ "ctxt": 0 }, "value": "point", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -860,7 +839,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -871,7 +849,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false @@ -905,6 +882,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -936,7 +914,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -978,7 +955,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1006,8 +982,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1039,6 +1014,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1065,7 +1041,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1076,7 +1051,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false } }, @@ -1088,14 +1062,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/nonInstantiatedModule/input.ts.json b/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/nonInstantiatedModule/input.ts.json index 79e72a03171b..08e571339d17 100644 --- a/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/nonInstantiatedModule/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/internalModules/moduleDeclarations/nonInstantiatedModule/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,8 +186,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -235,6 +231,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -257,12 +254,10 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -294,8 +289,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -305,7 +300,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "definite": false @@ -337,6 +331,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -353,8 +348,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -386,8 +380,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -404,7 +398,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -415,7 +408,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -449,6 +441,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -465,8 +458,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -498,8 +490,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -516,7 +508,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -527,7 +518,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -553,7 +543,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -588,7 +577,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "body": { @@ -616,7 +604,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -660,7 +647,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -683,7 +669,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -726,7 +711,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -760,7 +744,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -790,7 +773,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -832,7 +814,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -890,6 +871,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -921,7 +903,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -963,7 +944,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -991,8 +971,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1024,6 +1003,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1048,7 +1028,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1059,14 +1038,12 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1098,6 +1075,7 @@ "ctxt": 0 }, "value": "p2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1129,7 +1107,6 @@ "ctxt": 0 }, "value": "Origin", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1166,7 +1143,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1208,7 +1184,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1241,8 +1216,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1274,6 +1248,7 @@ "ctxt": 0 }, "value": "p2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1298,7 +1273,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1309,13 +1283,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1339,7 +1311,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "body": { @@ -1374,7 +1345,6 @@ "ctxt": 0 }, "value": "Utils", - "typeAnnotation": null, "optional": false }, "body": { @@ -1407,7 +1377,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1437,7 +1406,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1479,7 +1447,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1530,7 +1497,6 @@ "ctxt": 0 }, "value": "Utils", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1556,7 +1522,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/assertionsAndNonReturningFunctions/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/assertionsAndNonReturningFunctions/input.ts.json index f93ec5bedc97..8e028eb411e6 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/assertionsAndNonReturningFunctions/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/assertionsAndNonReturningFunctions/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "assert", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "check", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -85,7 +85,6 @@ "ctxt": 0 }, "value": "check", - "typeAnnotation": null, "optional": false } }, @@ -111,7 +110,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -141,7 +139,6 @@ "ctxt": 0 }, "value": "assertIsString", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -162,8 +159,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -227,7 +224,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -270,7 +266,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -296,7 +291,6 @@ "ctxt": 0 }, "value": "assert2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -317,8 +311,8 @@ "ctxt": 0 }, "value": "check", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -359,7 +353,6 @@ "ctxt": 0 }, "value": "check", - "typeAnnotation": null, "optional": false } }, @@ -385,7 +378,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -411,7 +403,6 @@ "ctxt": 0 }, "value": "fail", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -452,7 +443,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -476,7 +466,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -497,8 +486,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -580,7 +569,6 @@ "ctxt": 0 }, "value": "assert", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -610,7 +598,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -656,7 +643,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -667,7 +653,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -741,7 +726,6 @@ "ctxt": 0 }, "value": "assert2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -771,7 +755,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -817,7 +800,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -828,7 +810,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -902,7 +883,6 @@ "ctxt": 0 }, "value": "assertIsString", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -916,7 +896,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -946,7 +925,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -957,7 +935,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1031,7 +1008,6 @@ "ctxt": 0 }, "value": "fail", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1053,7 +1029,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1078,7 +1053,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1099,8 +1073,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1133,7 +1107,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -1226,7 +1199,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/callOfPropertylessConstructorFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/callOfPropertylessConstructorFunction/input.ts.json index c9d37b3c8bab..8d2c8a4821e8 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/callOfPropertylessConstructorFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/callOfPropertylessConstructorFunction/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Dependency", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false } } @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "Dependency", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/callbackCrossModule/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/callbackCrossModule/input.ts.json index 6ae90b909df3..806564a6c76a 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/callbackCrossModule/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/callbackCrossModule/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -60,7 +58,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } @@ -75,7 +72,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -132,7 +128,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -165,7 +160,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -186,8 +180,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -290,7 +284,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -314,7 +307,6 @@ "ctxt": 0 }, "value": "ok", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/callbackTag1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/callbackTag1/input.ts.json index 240938fe24dd..94c3d22986b9 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/callbackTag1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/callbackTag1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "sid", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -91,8 +91,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -111,7 +111,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -163,8 +162,8 @@ "ctxt": 0 }, "value": "noreturn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -182,8 +181,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -209,7 +208,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -220,7 +218,6 @@ "ctxt": 0 }, "value": "title", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/callbackTag2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/callbackTag2/input.ts.json index e557977718da..af19c0dcdc97 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/callbackTag2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/callbackTag2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "one_twenty", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -91,8 +91,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -128,7 +128,6 @@ "ctxt": 0 }, "value": "SharedClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -154,7 +153,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -196,7 +194,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false @@ -239,8 +236,8 @@ "ctxt": 0 }, "value": "outside", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -258,8 +255,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -278,7 +275,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -325,8 +321,8 @@ "ctxt": 0 }, "value": "noreturn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -344,8 +340,8 @@ "ctxt": 0 }, "value": "barts", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -355,8 +351,8 @@ "ctxt": 0 }, "value": "tidus", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -366,8 +362,8 @@ "ctxt": 0 }, "value": "noctis", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/callbackTag3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/callbackTag3/input.ts.json index a6f6b70659f2..4aae9f134175 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/callbackTag3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/callbackTag3/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "sid", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/callbackTagNamespace/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/callbackTagNamespace/input.ts.json index 96e095b07167..ef19cf07b78b 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/callbackTagNamespace/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/callbackTagNamespace/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -57,7 +57,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -78,8 +77,8 @@ "ctxt": 0 }, "value": "space", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -98,8 +97,8 @@ "ctxt": 0 }, "value": "peace", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkExportsObjectAssignProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkExportsObjectAssignProperty/input.ts.json index 1c0c0922dfaa..a5dd99e29f8a 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkExportsObjectAssignProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkExportsObjectAssignProperty/input.ts.json @@ -35,7 +35,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -46,7 +45,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false } }, @@ -103,7 +100,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -126,7 +122,6 @@ "ctxt": 0 }, "value": "writable", - "typeAnnotation": null, "optional": false }, "value": { @@ -175,7 +170,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -186,7 +180,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -202,7 +195,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false } }, @@ -243,7 +235,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -271,7 +262,6 @@ "ctxt": 0 }, "value": "writable", - "typeAnnotation": null, "optional": false }, "value": { @@ -320,7 +310,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -331,7 +320,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -347,7 +335,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false } }, @@ -388,7 +375,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "params": [], @@ -440,7 +426,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "params": [ @@ -460,8 +445,8 @@ "ctxt": 0 }, "value": "_", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -521,7 +506,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -532,7 +516,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -548,7 +531,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false } }, @@ -589,7 +571,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "params": [], @@ -667,7 +648,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -678,7 +658,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -694,7 +673,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false } }, @@ -735,7 +713,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "params": [ @@ -755,8 +732,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -812,7 +789,6 @@ "ctxt": 0 }, "value": "rwAccessors", - "typeAnnotation": null, "optional": false }, "computed": false @@ -832,7 +808,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -846,7 +821,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false } } @@ -898,7 +872,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -909,7 +882,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -932,7 +904,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -943,7 +914,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -986,7 +956,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -1014,7 +983,6 @@ "ctxt": 0 }, "value": "writable", - "typeAnnotation": null, "optional": false }, "value": { @@ -1063,7 +1031,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -1074,7 +1041,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1097,7 +1063,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1108,7 +1073,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1151,7 +1115,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -1179,7 +1142,6 @@ "ctxt": 0 }, "value": "writable", - "typeAnnotation": null, "optional": false }, "value": { @@ -1228,7 +1190,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -1239,7 +1200,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1262,7 +1222,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1273,7 +1232,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1316,7 +1274,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1368,7 +1325,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1388,8 +1344,8 @@ "ctxt": 0 }, "value": "_", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1449,7 +1405,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -1460,7 +1415,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1483,7 +1437,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1494,7 +1447,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1537,7 +1489,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1615,7 +1566,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -1626,7 +1576,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1649,7 +1598,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1660,7 +1608,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1703,7 +1650,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1723,8 +1669,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1780,7 +1726,6 @@ "ctxt": 0 }, "value": "rwAccessors", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1800,7 +1745,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1814,7 +1758,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false } } @@ -1862,8 +1805,8 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1887,7 +1830,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1919,7 +1861,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1953,8 +1894,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1978,7 +1919,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2010,7 +1950,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2061,7 +2000,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -2109,7 +2047,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2120,7 +2057,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2148,7 +2084,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2159,7 +2094,6 @@ "ctxt": 0 }, "value": "readonlyProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2187,7 +2121,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2198,7 +2131,6 @@ "ctxt": 0 }, "value": "rwAccessors", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2226,7 +2158,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2237,7 +2168,6 @@ "ctxt": 0 }, "value": "readonlyAccessor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2265,7 +2195,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2276,7 +2205,6 @@ "ctxt": 0 }, "value": "setonlyAccessor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2312,7 +2240,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2323,7 +2250,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2369,7 +2295,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2380,7 +2305,6 @@ "ctxt": 0 }, "value": "rwAccessors", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2426,7 +2350,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2437,7 +2360,6 @@ "ctxt": 0 }, "value": "setonlyAccessor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2488,7 +2410,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2499,7 +2420,6 @@ "ctxt": 0 }, "value": "readonlyProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2550,7 +2470,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2561,7 +2480,6 @@ "ctxt": 0 }, "value": "readonlyAccessor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2607,7 +2525,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2618,7 +2535,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2669,7 +2585,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2680,7 +2595,6 @@ "ctxt": 0 }, "value": "rwAccessors", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2731,7 +2645,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2742,7 +2655,6 @@ "ctxt": 0 }, "value": "setonlyAccessor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2775,7 +2687,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -2823,7 +2734,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2834,7 +2744,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2862,7 +2771,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2873,7 +2781,6 @@ "ctxt": 0 }, "value": "readonlyProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2901,7 +2808,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2912,7 +2818,6 @@ "ctxt": 0 }, "value": "rwAccessors", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2940,7 +2845,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2951,7 +2855,6 @@ "ctxt": 0 }, "value": "readonlyAccessor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2979,7 +2882,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2990,7 +2892,6 @@ "ctxt": 0 }, "value": "setonlyAccessor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3026,7 +2927,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "property": { @@ -3037,7 +2937,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3088,7 +2987,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "property": { @@ -3099,7 +2997,6 @@ "ctxt": 0 }, "value": "rwAccessors", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3145,7 +3042,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "property": { @@ -3156,7 +3052,6 @@ "ctxt": 0 }, "value": "setonlyAccessor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3207,7 +3102,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "property": { @@ -3218,7 +3112,6 @@ "ctxt": 0 }, "value": "readonlyProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3269,7 +3162,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "property": { @@ -3280,7 +3172,6 @@ "ctxt": 0 }, "value": "readonlyAccessor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3326,7 +3217,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "property": { @@ -3337,7 +3227,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3383,7 +3272,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "property": { @@ -3394,7 +3282,6 @@ "ctxt": 0 }, "value": "rwAccessors", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3445,7 +3332,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "property": { @@ -3456,7 +3342,6 @@ "ctxt": 0 }, "value": "setonlyAccessor", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkExportsObjectAssignPrototypeProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkExportsObjectAssignPrototypeProperty/input.ts.json index 23e6d0953330..2b55ed8ce151 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkExportsObjectAssignPrototypeProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkExportsObjectAssignPrototypeProperty/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Person", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -94,7 +93,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -107,7 +105,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false } } @@ -156,7 +153,6 @@ "ctxt": 0 }, "value": "Person", - "typeAnnotation": null, "optional": false }, "property": { @@ -167,7 +163,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -180,7 +175,6 @@ "ctxt": 0 }, "value": "describe", - "typeAnnotation": null, "optional": false }, "computed": false @@ -255,7 +249,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -300,7 +293,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -311,7 +303,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -334,7 +325,6 @@ "ctxt": 0 }, "value": "Person", - "typeAnnotation": null, "optional": false }, "property": { @@ -345,7 +335,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -388,7 +377,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -411,7 +399,6 @@ "ctxt": 0 }, "value": "writable", - "typeAnnotation": null, "optional": false }, "value": { @@ -460,7 +447,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -471,7 +457,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -494,7 +479,6 @@ "ctxt": 0 }, "value": "Person", - "typeAnnotation": null, "optional": false }, "property": { @@ -505,7 +489,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -548,7 +531,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -576,7 +558,6 @@ "ctxt": 0 }, "value": "writable", - "typeAnnotation": null, "optional": false }, "value": { @@ -625,7 +606,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -636,7 +616,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -659,7 +638,6 @@ "ctxt": 0 }, "value": "Person", - "typeAnnotation": null, "optional": false }, "property": { @@ -670,7 +648,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -713,7 +690,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "params": [], @@ -765,7 +741,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "params": [ @@ -785,8 +760,8 @@ "ctxt": 0 }, "value": "_", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -846,7 +821,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -857,7 +831,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -880,7 +853,6 @@ "ctxt": 0 }, "value": "Person", - "typeAnnotation": null, "optional": false }, "property": { @@ -891,7 +863,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -934,7 +905,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1012,7 +982,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -1023,7 +992,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1046,7 +1014,6 @@ "ctxt": 0 }, "value": "Person", - "typeAnnotation": null, "optional": false }, "property": { @@ -1057,7 +1024,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1100,7 +1066,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1120,8 +1085,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1177,7 +1142,6 @@ "ctxt": 0 }, "value": "rwAccessors", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1197,7 +1161,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1211,7 +1174,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false } } @@ -1264,7 +1226,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1275,7 +1236,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1288,7 +1248,6 @@ "ctxt": 0 }, "value": "Person", - "typeAnnotation": null, "optional": false } } @@ -1335,7 +1294,6 @@ "ctxt": 0 }, "value": "Person", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -1386,8 +1344,8 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1404,7 +1362,6 @@ "ctxt": 0 }, "value": "Person", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1454,7 +1411,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1465,7 +1421,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1493,7 +1448,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1504,7 +1458,6 @@ "ctxt": 0 }, "value": "readonlyProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1532,7 +1485,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1543,7 +1495,6 @@ "ctxt": 0 }, "value": "rwAccessors", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1571,7 +1522,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1582,7 +1532,6 @@ "ctxt": 0 }, "value": "readonlyAccessor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1610,7 +1559,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1621,7 +1569,6 @@ "ctxt": 0 }, "value": "setonlyAccessor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1657,7 +1604,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1668,7 +1614,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1714,7 +1659,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1725,7 +1669,6 @@ "ctxt": 0 }, "value": "rwAccessors", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1771,7 +1714,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1782,7 +1724,6 @@ "ctxt": 0 }, "value": "setonlyAccessor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1833,7 +1774,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1844,7 +1784,6 @@ "ctxt": 0 }, "value": "readonlyProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1895,7 +1834,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1906,7 +1844,6 @@ "ctxt": 0 }, "value": "readonlyAccessor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1952,7 +1889,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1963,7 +1899,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2014,7 +1949,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2025,7 +1959,6 @@ "ctxt": 0 }, "value": "rwAccessors", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2076,7 +2009,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2087,7 +2019,6 @@ "ctxt": 0 }, "value": "setonlyAccessor", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocOptionalParamOrder/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocOptionalParamOrder/input.ts.json index 83056feada46..26b501c7b8d9 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocOptionalParamOrder/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocOptionalParamOrder/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -57,8 +56,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -77,8 +76,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocParamOnVariableDeclaredFunctionExpression/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocParamOnVariableDeclaredFunctionExpression/input.ts.json index e19578aa9c8c..638b6e60f09a 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocParamOnVariableDeclaredFunctionExpression/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocParamOnVariableDeclaredFunctionExpression/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -44,7 +44,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -64,8 +63,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -84,8 +83,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -138,8 +137,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -169,8 +168,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "FunctionExpression", @@ -182,7 +181,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "params": [ @@ -202,8 +200,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -254,8 +252,8 @@ "ctxt": 0 }, "value": "one", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -277,8 +275,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -319,8 +317,8 @@ "ctxt": 0 }, "value": "two", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -342,8 +340,8 @@ "ctxt": 0 }, "value": "untyped", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocParamTag1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocParamTag1/input.ts.json index 642c230f6b7a..f3bcfa9dad56 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocParamTag1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocParamTag1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -57,8 +56,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -104,7 +103,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -133,7 +131,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -175,7 +172,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocReturnTag1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocReturnTag1/input.ts.json index b97ef478d04c..a01b7b9996a2 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocReturnTag1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocReturnTag1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -74,7 +73,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -132,7 +130,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocReturnTag2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocReturnTag2/input.ts.json index 22a6ac9b4e9b..e6fdccdd52df 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocReturnTag2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocReturnTag2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -69,7 +68,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTag1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTag1/input.ts.json index 5c2118c50544..592905fdae84 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTag1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTag1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -77,8 +77,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -118,8 +118,8 @@ "ctxt": 0 }, "value": "anyT", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -157,8 +157,8 @@ "ctxt": 0 }, "value": "anyT", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -201,8 +201,8 @@ "ctxt": 0 }, "value": "anyT1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -240,8 +240,8 @@ "ctxt": 0 }, "value": "anyT1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -284,8 +284,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -303,8 +303,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -323,7 +323,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -367,7 +366,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -412,8 +410,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -431,8 +429,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -451,7 +449,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -495,7 +492,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -540,8 +536,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -559,8 +555,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -579,7 +575,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -623,7 +618,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -668,8 +662,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -687,8 +681,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -707,7 +701,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -751,7 +744,6 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -796,8 +788,8 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -837,8 +829,8 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTag2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTag2/input.ts.json index 4a13fc9bfed6..4bf18f6ee1d6 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTag2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTag2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -118,8 +118,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -137,8 +137,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -157,7 +157,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -201,7 +200,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -251,8 +249,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -270,8 +268,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -290,7 +288,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -337,8 +334,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -368,8 +365,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -386,7 +383,6 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -432,8 +428,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -451,8 +447,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -477,7 +473,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -488,7 +483,6 @@ "ctxt": 0 }, "value": "concat", - "typeAnnotation": null, "optional": false }, "computed": false @@ -545,7 +539,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -590,8 +583,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -609,8 +602,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -629,7 +622,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -673,7 +665,6 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTag3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTag3/input.ts.json index 0e6e2763478f..2376d3c45b36 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTag3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTag3/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "nns", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTag4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTag4/input.ts.json index 16c7e37cb1b1..33ae190f288e 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTag4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTag4/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -117,7 +114,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -153,8 +149,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -186,8 +182,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTag5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTag5/input.ts.json index 83b13134c14d..be68bcc23286 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTag5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTag5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -107,8 +105,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -126,8 +124,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -138,7 +136,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -175,8 +172,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -198,8 +195,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -232,7 +229,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -257,7 +253,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -278,8 +273,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -312,7 +307,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -348,8 +342,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -367,8 +361,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -379,7 +373,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -416,8 +409,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -439,8 +432,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -473,7 +466,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -498,7 +490,6 @@ "ctxt": 0 }, "value": "blargle", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -519,8 +510,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -587,8 +578,8 @@ "ctxt": 0 }, "value": "zeroonetwo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -605,7 +596,6 @@ "ctxt": 0 }, "value": "blargle", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -643,7 +633,6 @@ "ctxt": 0 }, "value": "monaLisa", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -664,8 +653,8 @@ "ctxt": 0 }, "value": "sb", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -721,7 +710,6 @@ "ctxt": 0 }, "value": "sb", - "typeAnnotation": null, "optional": false } }, @@ -792,8 +780,8 @@ "ctxt": 0 }, "value": "twothree", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -810,7 +798,6 @@ "ctxt": 0 }, "value": "monaLisa", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTag6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTag6/input.ts.json index a4b4d5152c33..77edf0fa86b1 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTag6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTag6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -84,8 +83,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -107,8 +106,8 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -146,7 +145,6 @@ "ctxt": 0 }, "value": "add1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -167,8 +165,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -187,8 +185,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -229,7 +227,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -240,7 +237,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -262,7 +258,6 @@ "ctxt": 0 }, "value": "add2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -283,8 +278,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -303,8 +298,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -345,7 +340,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -356,7 +350,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -378,7 +371,6 @@ "ctxt": 0 }, "value": "add3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -399,8 +391,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -419,8 +411,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -461,7 +453,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -472,7 +463,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTagOnObjectProperty1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTagOnObjectProperty1/input.ts.json index cb2b60c0de03..486368222fca 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTagOnObjectProperty1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTagOnObjectProperty1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "lol", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -77,8 +77,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -98,7 +98,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -109,7 +108,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -123,7 +121,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -151,7 +148,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "params": [ @@ -171,8 +167,8 @@ "ctxt": 0 }, "value": "n1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -213,7 +209,6 @@ "ctxt": 0 }, "value": "n1", - "typeAnnotation": null, "optional": false }, "right": { @@ -242,7 +237,6 @@ "ctxt": 0 }, "value": "lol", - "typeAnnotation": null, "optional": false }, { @@ -312,7 +306,6 @@ "ctxt": 0 }, "value": "arrowFunc", - "typeAnnotation": null, "optional": false }, "value": { @@ -331,8 +324,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -351,7 +344,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false }, "right": { @@ -406,7 +398,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -417,7 +408,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -460,7 +450,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -471,7 +460,6 @@ "ctxt": 0 }, "value": "lol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -507,7 +495,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -518,7 +505,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -531,7 +517,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -561,8 +546,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -586,7 +571,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -597,7 +581,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -652,7 +635,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -663,7 +645,6 @@ "ctxt": 0 }, "value": "bar1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -713,7 +694,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -724,7 +704,6 @@ "ctxt": 0 }, "value": "arrowFunc", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTagOnObjectProperty2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTagOnObjectProperty2/input.ts.json index 434327b1711c..6ed81c8cfba2 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTagOnObjectProperty2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypeTagOnObjectProperty2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "lol", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -64,8 +64,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -85,7 +85,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -108,7 +107,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "params": [ @@ -128,8 +126,8 @@ "ctxt": 0 }, "value": "n1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -186,7 +184,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "value": { @@ -205,8 +202,8 @@ "ctxt": 0 }, "value": "n1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -239,7 +236,6 @@ "ctxt": 0 }, "value": "arrowFunc", - "typeAnnotation": null, "optional": false }, "value": { @@ -265,8 +261,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -301,7 +297,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false }, "right": { @@ -328,7 +323,6 @@ "ctxt": 0 }, "value": "lol", - "typeAnnotation": null, "optional": false } ] @@ -360,8 +354,8 @@ "ctxt": 0 }, "value": "lol", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -404,8 +398,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -429,7 +423,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -440,7 +433,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -490,8 +482,8 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -515,7 +507,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -526,7 +517,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypedefInParamTag1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypedefInParamTag1/input.ts.json index 602ff20f3f6c..a01be6cbc249 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypedefInParamTag1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypedefInParamTag1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "opts", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -78,7 +77,6 @@ "ctxt": 0 }, "value": "opts", - "typeAnnotation": null, "optional": false }, "property": { @@ -89,7 +87,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -124,7 +121,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -148,7 +144,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -183,7 +178,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -204,8 +198,8 @@ "ctxt": 0 }, "value": "opts", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -245,7 +239,6 @@ "ctxt": 0 }, "value": "opts", - "typeAnnotation": null, "optional": false }, "property": { @@ -256,7 +249,6 @@ "ctxt": 0 }, "value": "anotherX", - "typeAnnotation": null, "optional": false }, "computed": false @@ -291,7 +283,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -315,7 +306,6 @@ "ctxt": 0 }, "value": "anotherX", - "typeAnnotation": null, "optional": false }, "value": { @@ -350,7 +340,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -371,8 +360,8 @@ "ctxt": 0 }, "value": "opts", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -412,7 +401,6 @@ "ctxt": 0 }, "value": "opts", - "typeAnnotation": null, "optional": false }, "property": { @@ -423,7 +411,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -458,7 +445,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -482,7 +468,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypedefOnlySourceFile/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypedefOnlySourceFile/input.ts.json index af2137ad1d66..56ffcec77b2b 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypedefOnlySourceFile/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkJsdocTypedefOnlySourceFile/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -69,7 +69,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -80,7 +79,6 @@ "ctxt": 0 }, "value": "SomeName", - "typeAnnotation": null, "optional": false }, "computed": false @@ -111,8 +109,8 @@ "ctxt": 0 }, "value": "myString", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkObjectDefineProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkObjectDefineProperty/input.ts.json index 0d6e0b8fa147..dc2e6b2f119d 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkObjectDefineProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkObjectDefineProperty/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -76,7 +76,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -87,7 +86,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -103,7 +101,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -172,7 +168,6 @@ "ctxt": 0 }, "value": "writable", - "typeAnnotation": null, "optional": false }, "value": { @@ -221,7 +216,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -232,7 +226,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -248,7 +241,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -289,7 +281,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -343,7 +334,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -354,7 +344,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -370,7 +359,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -411,7 +399,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -439,7 +426,6 @@ "ctxt": 0 }, "value": "writable", - "typeAnnotation": null, "optional": false }, "value": { @@ -488,7 +474,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -499,7 +484,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -515,7 +499,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -556,7 +539,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "params": [], @@ -608,7 +590,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "params": [ @@ -628,8 +609,8 @@ "ctxt": 0 }, "value": "_", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -689,7 +670,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -700,7 +680,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -716,7 +695,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -757,7 +735,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "params": [], @@ -835,7 +812,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -846,7 +822,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -862,7 +837,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -903,7 +877,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "params": [ @@ -923,8 +896,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -980,7 +953,6 @@ "ctxt": 0 }, "value": "zip", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1000,7 +972,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1014,7 +985,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false } } @@ -1047,7 +1017,6 @@ "ctxt": 0 }, "value": "takeName", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1068,8 +1037,8 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1109,7 +1078,6 @@ "ctxt": 0 }, "value": "named", - "typeAnnotation": null, "optional": false }, "property": { @@ -1120,7 +1088,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1155,7 +1122,6 @@ "ctxt": 0 }, "value": "takeName", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1169,7 +1135,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1202,8 +1167,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1220,7 +1185,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1231,7 +1195,6 @@ "ctxt": 0 }, "value": "zip", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1265,8 +1228,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1283,7 +1246,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1294,7 +1256,6 @@ "ctxt": 0 }, "value": "houseNumber", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1328,8 +1289,8 @@ "ctxt": 0 }, "value": "returnExemplar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1347,7 +1308,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1384,8 +1344,8 @@ "ctxt": 0 }, "value": "needsExemplar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1410,8 +1370,8 @@ "ctxt": 0 }, "value": "_", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1421,7 +1381,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1479,8 +1438,8 @@ "ctxt": 0 }, "value": "expected", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1520,7 +1479,6 @@ "ctxt": 0 }, "value": "match", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1541,8 +1499,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1561,8 +1519,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1608,7 +1566,6 @@ "ctxt": 0 }, "value": "match", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1630,7 +1587,6 @@ "ctxt": 0 }, "value": "expected", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1664,8 +1620,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1675,7 +1631,6 @@ "ctxt": 0 }, "value": "expected", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1739,7 +1694,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1750,7 +1704,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1763,7 +1716,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1785,7 +1737,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -1833,7 +1784,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1844,7 +1794,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1872,7 +1821,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1883,7 +1831,6 @@ "ctxt": 0 }, "value": "middleInit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1911,7 +1858,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1922,7 +1868,6 @@ "ctxt": 0 }, "value": "lastName", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1950,7 +1895,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1961,7 +1905,6 @@ "ctxt": 0 }, "value": "zip", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1989,7 +1932,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2000,7 +1942,6 @@ "ctxt": 0 }, "value": "houseNumber", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2028,7 +1969,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2039,7 +1979,6 @@ "ctxt": 0 }, "value": "zipStr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2075,7 +2014,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2086,7 +2024,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2137,7 +2074,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2148,7 +2084,6 @@ "ctxt": 0 }, "value": "zip", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2194,7 +2129,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2205,7 +2139,6 @@ "ctxt": 0 }, "value": "zipStr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2256,7 +2189,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2267,7 +2199,6 @@ "ctxt": 0 }, "value": "lastName", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2318,7 +2249,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2329,7 +2259,6 @@ "ctxt": 0 }, "value": "houseNumber", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2375,7 +2304,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2386,7 +2314,6 @@ "ctxt": 0 }, "value": "zipStr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2432,7 +2359,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2443,7 +2369,6 @@ "ctxt": 0 }, "value": "middleInit", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkOtherObjectAssignProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkOtherObjectAssignProperty/input.ts.json index ee860c8a3099..7744b4e1a988 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/checkOtherObjectAssignProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/checkOtherObjectAssignProperty/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -75,7 +74,6 @@ "ctxt": 0 }, "value": "writable", - "typeAnnotation": null, "optional": false }, "value": { @@ -123,7 +121,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -150,7 +146,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false } }, @@ -181,7 +176,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -214,8 +208,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -272,7 +266,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -283,7 +276,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -299,7 +291,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false } }, @@ -313,7 +304,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false } }, @@ -337,7 +327,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -360,7 +349,6 @@ "ctxt": 0 }, "value": "writable", - "typeAnnotation": null, "optional": false }, "value": { @@ -405,8 +393,8 @@ "ctxt": 0 }, "value": "propName", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -455,7 +443,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -466,7 +453,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -482,7 +468,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false } }, @@ -496,7 +481,6 @@ "ctxt": 0 }, "value": "propName", - "typeAnnotation": null, "optional": false } }, @@ -520,7 +504,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -543,7 +526,6 @@ "ctxt": 0 }, "value": "writable", - "typeAnnotation": null, "optional": false }, "value": { @@ -592,7 +574,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -603,7 +584,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -619,7 +599,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false } }, @@ -685,7 +664,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -696,7 +674,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -712,7 +689,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false } }, @@ -753,7 +729,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "params": [], @@ -805,7 +780,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -859,7 +833,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -870,7 +843,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -886,7 +858,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false } }, @@ -927,7 +898,6 @@ "ctxt": 0 }, "value": "writable", - "typeAnnotation": null, "optional": false }, "value": { @@ -972,8 +942,8 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -990,7 +960,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1040,7 +1009,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -1051,7 +1019,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1079,7 +1046,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -1090,7 +1056,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1118,7 +1083,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -1129,7 +1093,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1157,7 +1120,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -1168,7 +1130,6 @@ "ctxt": 0 }, "value": "bad1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1196,7 +1157,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -1207,7 +1167,6 @@ "ctxt": 0 }, "value": "bad2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1235,7 +1194,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -1246,7 +1204,6 @@ "ctxt": 0 }, "value": "bad3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1282,7 +1239,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -1293,7 +1249,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1339,7 +1294,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -1350,7 +1304,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1396,7 +1349,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -1407,7 +1359,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1453,7 +1404,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -1464,7 +1414,6 @@ "ctxt": 0 }, "value": "bad1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1510,7 +1459,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -1521,7 +1469,6 @@ "ctxt": 0 }, "value": "bad2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1567,7 +1514,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -1578,7 +1524,6 @@ "ctxt": 0 }, "value": "bad3", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/constructorTagOnClassConstructor/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/constructorTagOnClassConstructor/input.ts.json index 284de2fbbc3b..b0d70bf32d0e 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/constructorTagOnClassConstructor/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/constructorTagOnClassConstructor/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Alpha", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "Beta", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -84,7 +82,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -133,8 +130,8 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -154,7 +151,6 @@ "ctxt": 0 }, "value": "Alpha", - "typeAnnotation": null, "optional": false } }, @@ -168,7 +164,6 @@ "ctxt": 0 }, "value": "Beta", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/constructorTagOnNestedBinaryExpression/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/constructorTagOnNestedBinaryExpression/input.ts.json index e16b43cee30e..b0c48f358507 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/constructorTagOnNestedBinaryExpression/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/constructorTagOnNestedBinaryExpression/input.ts.json @@ -29,8 +29,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -48,8 +48,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "FunctionExpression", @@ -61,7 +61,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "params": [], @@ -108,7 +107,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -119,7 +117,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/constructorTagOnObjectLiteralMethod/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/constructorTagOnObjectLiteralMethod/input.ts.json index 1f35c31890f2..05b61f016337 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/constructorTagOnObjectLiteralMethod/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/constructorTagOnObjectLiteralMethod/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "params": [], @@ -108,7 +107,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -185,7 +183,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -196,7 +193,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -213,7 +209,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/constructorTagWithThisTag/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/constructorTagWithThisTag/input.ts.json index 7c8fe862ed15..cd59c3a41c32 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/constructorTagWithThisTag/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/constructorTagWithThisTag/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false @@ -109,7 +107,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassAccessor/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassAccessor/input.ts.json index d83d05525a72..db26509cbf2e 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassAccessor/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassAccessor/input.ts.json @@ -64,7 +64,6 @@ "ctxt": 0 }, "value": "Argument", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +93,6 @@ "ctxt": 0 }, "value": "idlType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -136,7 +134,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -185,7 +182,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +207,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -242,7 +237,6 @@ "ctxt": 0 }, "value": "toJSON", - "typeAnnotation": null, "optional": false }, "function": { @@ -286,8 +280,8 @@ "ctxt": 0 }, "value": "json", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -307,7 +301,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "value": { @@ -318,7 +311,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -332,7 +324,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -343,7 +334,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -357,7 +347,6 @@ "ctxt": 0 }, "value": "inheritance", - "typeAnnotation": null, "optional": false }, "value": { @@ -368,7 +357,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -393,7 +381,6 @@ "ctxt": 0 }, "value": "json", - "typeAnnotation": null, "optional": false } } @@ -441,7 +428,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "imported": null @@ -481,7 +467,6 @@ "ctxt": 0 }, "value": "Argument", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -507,7 +492,6 @@ "ctxt": 0 }, "value": "parse", - "typeAnnotation": null, "optional": false }, "function": { @@ -528,8 +512,8 @@ "ctxt": 0 }, "value": "tokeniser", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -584,7 +568,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "function": { @@ -653,7 +636,6 @@ "ctxt": 0 }, "value": "validate", - "typeAnnotation": null, "optional": false }, "function": { @@ -674,8 +656,8 @@ "ctxt": 0 }, "value": "defs", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -714,7 +696,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassExtendsVisibility/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassExtendsVisibility/input.ts.json index 1b933ab5a4a3..5dcba7f4ffdf 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassExtendsVisibility/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassExtendsVisibility/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -63,7 +62,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -87,7 +84,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false } } @@ -117,8 +113,8 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -135,7 +131,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -188,8 +183,8 @@ "ctxt": 0 }, "value": "Strings", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -209,7 +204,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -237,7 +231,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -271,7 +264,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -290,7 +282,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -328,7 +319,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -339,7 +329,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -352,7 +341,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } } @@ -394,7 +382,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -405,7 +392,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -418,7 +404,6 @@ "ctxt": 0 }, "value": "Strings", - "typeAnnotation": null, "optional": false }, "computed": false @@ -431,7 +416,6 @@ "ctxt": 0 }, "value": "Strings", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassImplementsGenericsSerialization/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassImplementsGenericsSerialization/input.ts.json index a4c0db8ec227..47acf9923075 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassImplementsGenericsSerialization/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassImplementsGenericsSerialization/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "Encoder", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -55,7 +54,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "encode", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -102,6 +99,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -124,13 +122,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -155,7 +151,6 @@ "ctxt": 0 }, "value": "Uint8Array", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "Encoder", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -210,7 +204,6 @@ "ctxt": 0 }, "value": "encode", - "typeAnnotation": null, "optional": false }, "function": { @@ -231,8 +224,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -272,7 +265,6 @@ "ctxt": 0 }, "value": "Uint8Array", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassLeadingOptional/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassLeadingOptional/input.ts.json index 900a2922c6d6..d25f43cf8daa 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassLeadingOptional/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassLeadingOptional/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -77,8 +75,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -108,8 +106,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -152,7 +150,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -166,7 +163,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassLikeHeuristic/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassLikeHeuristic/input.ts.json index 25ef866c30ca..fcf80ad5e0d8 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassLikeHeuristic/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassLikeHeuristic/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -62,8 +62,8 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -113,7 +113,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -124,7 +123,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -137,7 +135,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassStatic/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassStatic/input.ts.json index b48d2fd62f3e..b067efd2bffa 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassStatic/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassStatic/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Handler", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "OPTIONS", - "typeAnnotation": null, "optional": false }, "function": { @@ -106,7 +104,6 @@ "ctxt": 0 }, "value": "process", - "typeAnnotation": null, "optional": false }, "function": { @@ -174,7 +171,6 @@ "ctxt": 0 }, "value": "Handler", - "typeAnnotation": null, "optional": false }, "property": { @@ -185,7 +181,6 @@ "ctxt": 0 }, "value": "statische", - "typeAnnotation": null, "optional": false }, "computed": false @@ -241,8 +236,8 @@ "ctxt": 0 }, "value": "Strings", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -262,7 +257,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -290,7 +284,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -344,7 +337,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -355,7 +347,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -368,7 +359,6 @@ "ctxt": 0 }, "value": "Handler", - "typeAnnotation": null, "optional": false } } @@ -410,7 +400,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -421,7 +410,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -434,7 +422,6 @@ "ctxt": 0 }, "value": "Strings", - "typeAnnotation": null, "optional": false }, "computed": false @@ -447,7 +434,6 @@ "ctxt": 0 }, "value": "Strings", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassStaticMethodAugmentation/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassStaticMethodAugmentation/input.ts.json index 135988e6db07..659b32a46f0e 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassStaticMethodAugmentation/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassStaticMethodAugmentation/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Clazz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -125,7 +123,6 @@ "ctxt": 0 }, "value": "Clazz", - "typeAnnotation": null, "optional": false }, "property": { @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false @@ -149,7 +145,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClasses/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClasses/input.ts.json index 7b46711fa19d..67c16766ef8d 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClasses/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClasses/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -84,7 +82,6 @@ "ctxt": 0 }, "value": "cat", - "typeAnnotation": null, "optional": false }, "value": { @@ -137,7 +134,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -163,7 +159,6 @@ "ctxt": 0 }, "value": "Cls", - "typeAnnotation": null, "optional": false }, "value": { @@ -218,7 +213,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -244,7 +238,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -264,8 +257,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -284,8 +277,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -326,7 +319,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -352,7 +344,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false }, "value": null, @@ -382,7 +373,6 @@ "ctxt": 0 }, "value": "readonlyField", - "typeAnnotation": null, "optional": false }, "value": null, @@ -412,7 +402,6 @@ "ctxt": 0 }, "value": "initializedField", - "typeAnnotation": null, "optional": false }, "value": { @@ -450,7 +439,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "function": { @@ -521,7 +509,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "function": { @@ -542,8 +529,8 @@ "ctxt": 0 }, "value": "_p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -588,7 +575,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "function": { @@ -659,7 +645,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "function": { @@ -680,8 +665,8 @@ "ctxt": 0 }, "value": "_p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -726,7 +711,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -746,8 +730,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -766,8 +750,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -798,7 +782,6 @@ "ctxt": 0 }, "value": "staticField", - "typeAnnotation": null, "optional": false }, "value": null, @@ -828,7 +811,6 @@ "ctxt": 0 }, "value": "staticReadonlyField", - "typeAnnotation": null, "optional": false }, "value": null, @@ -858,7 +840,6 @@ "ctxt": 0 }, "value": "staticInitializedField", - "typeAnnotation": null, "optional": false }, "value": { @@ -896,7 +877,6 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, "optional": false }, "function": { @@ -965,7 +945,6 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, "optional": false }, "function": { @@ -986,8 +965,8 @@ "ctxt": 0 }, "value": "_p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1032,7 +1011,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false }, "function": { @@ -1101,7 +1079,6 @@ "ctxt": 0 }, "value": "s3", - "typeAnnotation": null, "optional": false }, "function": { @@ -1122,8 +1099,8 @@ "ctxt": 0 }, "value": "_p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1178,7 +1155,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1204,7 +1180,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1234,7 +1209,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1254,8 +1228,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1274,8 +1248,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1306,7 +1280,6 @@ "ctxt": 0 }, "value": "create", - "typeAnnotation": null, "optional": false }, "function": { @@ -1327,8 +1300,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1347,8 +1320,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1388,7 +1361,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1402,7 +1374,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1416,7 +1387,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1455,7 +1425,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1495,7 +1464,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1515,7 +1483,6 @@ "ctxt": 0 }, "value": "HH", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1555,7 +1522,6 @@ "ctxt": 0 }, "value": "HH", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1566,7 +1532,6 @@ "ctxt": 0 }, "value": "H", - "typeAnnotation": null, "optional": false } } @@ -1592,7 +1557,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1633,7 +1597,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1644,7 +1607,6 @@ "ctxt": 0 }, "value": "II", - "typeAnnotation": null, "optional": false } } @@ -1676,7 +1638,6 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1687,7 +1648,6 @@ "ctxt": 0 }, "value": "JJ", - "typeAnnotation": null, "optional": false } } @@ -1713,7 +1673,6 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1748,7 +1707,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1774,7 +1732,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1824,7 +1781,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1878,7 +1834,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1919,7 +1874,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -1968,7 +1922,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2012,7 +1965,6 @@ "ctxt": 0 }, "value": "L", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2031,7 +1983,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2057,7 +2008,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2083,7 +2033,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -2133,7 +2082,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2186,7 +2134,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2212,7 +2159,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2232,8 +2178,8 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -2309,7 +2255,6 @@ "ctxt": 0 }, "value": "another", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2322,7 +2267,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false } } @@ -2341,7 +2285,6 @@ "ctxt": 0 }, "value": "L", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2367,7 +2310,6 @@ "ctxt": 0 }, "value": "O", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2393,7 +2335,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2413,8 +2354,8 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -2459,7 +2400,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false } } @@ -2505,7 +2445,6 @@ "ctxt": 0 }, "value": "another2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2518,7 +2457,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false } } @@ -2537,7 +2475,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2571,8 +2508,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -2611,7 +2548,6 @@ "ctxt": 0 }, "value": "VariableBase", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2630,7 +2566,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2656,7 +2591,6 @@ "ctxt": 0 }, "value": "HasStatics", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2682,7 +2616,6 @@ "ctxt": 0 }, "value": "staticMethod", - "typeAnnotation": null, "optional": false }, "function": { @@ -2738,7 +2671,6 @@ "ctxt": 0 }, "value": "ExtendsStatics", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2764,7 +2696,6 @@ "ctxt": 0 }, "value": "also", - "typeAnnotation": null, "optional": false }, "function": { @@ -2804,7 +2735,6 @@ "ctxt": 0 }, "value": "HasStatics", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassesErr/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassesErr/input.ts.json index 1a2fc93f6fb6..066ba3e32f7f 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassesErr/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsClassesErr/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false }, "value": null, @@ -75,7 +73,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -117,7 +114,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -172,7 +167,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "value": null, @@ -198,7 +192,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -223,7 +216,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -250,7 +242,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -281,7 +272,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -308,7 +298,6 @@ "ctxt": 0 }, "value": "O", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -330,6 +319,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -346,8 +336,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -399,7 +388,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -418,7 +406,6 @@ "ctxt": 0 }, "value": "O", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -444,7 +431,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -466,6 +452,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -482,8 +469,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -532,7 +518,6 @@ "ctxt": 0 }, "value": "O", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -558,7 +543,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -580,6 +564,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -596,8 +581,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -646,7 +630,6 @@ "ctxt": 0 }, "value": "O", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -672,7 +655,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -694,6 +676,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -710,8 +693,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -762,6 +744,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -778,8 +761,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -815,7 +797,6 @@ "ctxt": 0 }, "value": "O", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -841,7 +822,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -863,6 +843,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -879,8 +860,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -932,7 +912,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -951,7 +930,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -977,7 +955,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -999,6 +976,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1015,8 +993,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1052,7 +1029,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1078,7 +1054,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1100,6 +1075,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1116,8 +1092,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1166,7 +1141,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1192,7 +1166,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1214,6 +1187,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1230,8 +1204,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1269,6 +1242,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1285,8 +1259,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1335,7 +1308,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1361,7 +1333,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1383,6 +1354,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1399,8 +1371,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1434,7 +1405,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1481,6 +1451,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1497,8 +1468,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1532,7 +1502,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1574,7 +1543,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1635,7 +1603,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1654,7 +1621,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1680,7 +1646,6 @@ "ctxt": 0 }, "value": "AA", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1702,6 +1667,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1718,8 +1684,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1753,7 +1718,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1795,7 +1759,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1840,7 +1803,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1866,7 +1828,6 @@ "ctxt": 0 }, "value": "BB", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1888,6 +1849,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1904,8 +1866,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1939,7 +1900,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1989,7 +1949,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2042,7 +2001,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2068,7 +2026,6 @@ "ctxt": 0 }, "value": "CC", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2090,6 +2047,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2106,8 +2064,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2141,7 +2098,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2183,7 +2139,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2230,6 +2185,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2246,8 +2202,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2281,7 +2236,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2331,7 +2285,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2384,7 +2337,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsCommonjsRelativePath/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsCommonjsRelativePath/input.ts.json index f6c06b58e897..569606e61bea 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsCommonjsRelativePath/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsCommonjsRelativePath/input.ts.json @@ -38,7 +38,6 @@ "ctxt": 0 }, "value": "Thing", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -85,7 +84,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -117,7 +114,6 @@ "ctxt": 0 }, "value": "Thing", - "typeAnnotation": null, "optional": false } ] @@ -171,8 +167,8 @@ "ctxt": 0 }, "value": "Thing", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -196,7 +192,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -228,7 +223,6 @@ "ctxt": 0 }, "value": "Thing", - "typeAnnotation": null, "optional": false }, "computed": false @@ -267,7 +261,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -278,7 +271,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -299,7 +291,6 @@ "ctxt": 0 }, "value": "Thing", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsComputedNames/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsComputedNames/input.ts.json index 7a5bc209a417..676be41ed441 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsComputedNames/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsComputedNames/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "TopLevelSym", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -84,8 +83,8 @@ "ctxt": 0 }, "value": "InnerSym", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -102,7 +101,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -142,7 +140,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -153,7 +150,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -183,7 +179,6 @@ "ctxt": 0 }, "value": "TopLevelSym", - "typeAnnotation": null, "optional": false } }, @@ -211,8 +206,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -256,7 +251,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -277,7 +271,6 @@ "ctxt": 0 }, "value": "items", - "typeAnnotation": null, "optional": false }, "value": { @@ -305,7 +298,6 @@ "ctxt": 0 }, "value": "InnerSym", - "typeAnnotation": null, "optional": false } }, @@ -332,8 +324,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -353,7 +345,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -386,7 +377,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "property": { @@ -397,7 +387,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -440,8 +429,8 @@ "ctxt": 0 }, "value": "TopLevelSym", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -458,7 +447,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -493,8 +481,8 @@ "ctxt": 0 }, "value": "InnerSym", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -511,7 +499,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -538,7 +525,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -564,7 +550,6 @@ "ctxt": 0 }, "value": "TopLevelSym", - "typeAnnotation": null, "optional": false }, "value": { @@ -602,7 +587,6 @@ "ctxt": 0 }, "value": "InnerSym", - "typeAnnotation": null, "optional": false }, "value": { @@ -645,7 +629,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -672,8 +655,8 @@ "ctxt": 0 }, "value": "_p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -683,7 +666,6 @@ "ctxt": 0 }, "value": "InnerSym", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsConstsAsNamespacesWithReferences/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsConstsAsNamespacesWithReferences/input.ts.json index de7c85dd946b..0fa9aee80760 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsConstsAsNamespacesWithReferences/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsConstsAsNamespacesWithReferences/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "colors", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -59,7 +59,6 @@ "ctxt": 0 }, "value": "royalBlue", - "typeAnnotation": null, "optional": false }, "value": { @@ -116,8 +115,8 @@ "ctxt": 0 }, "value": "brandColors", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -137,7 +136,6 @@ "ctxt": 0 }, "value": "purple", - "typeAnnotation": null, "optional": false }, "value": { @@ -155,7 +153,6 @@ "ctxt": 0 }, "value": "colors", - "typeAnnotation": null, "optional": false }, "property": { @@ -166,7 +163,6 @@ "ctxt": 0 }, "value": "royalBlue", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsCrossfileMerge/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsCrossfileMerge/input.ts.json index 201216809efe..0d281653b900 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsCrossfileMerge/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsCrossfileMerge/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -107,7 +106,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -118,7 +116,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -138,7 +135,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -149,7 +145,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "computed": false @@ -193,7 +188,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -204,7 +198,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -217,7 +210,6 @@ "ctxt": 0 }, "value": "memberName", - "typeAnnotation": null, "optional": false }, "computed": false @@ -248,7 +240,6 @@ "ctxt": 0 }, "value": "validate", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -288,7 +279,6 @@ "ctxt": 0 }, "value": "validate", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsDefault/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsDefault/input.ts.json index 4dbb7d0163d4..9e0467b6cc74 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsDefault/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsDefault/input.ts.json @@ -40,7 +40,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [], @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -117,8 +115,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -128,7 +126,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "definite": false @@ -159,7 +156,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "exported": { @@ -170,7 +166,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false } } @@ -196,7 +191,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "span": { @@ -221,7 +215,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -299,8 +292,8 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -310,7 +303,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "definite": false @@ -341,7 +333,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "exported": { @@ -352,7 +343,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false } } @@ -384,7 +374,6 @@ "ctxt": 0 }, "value": "Fab", - "typeAnnotation": null, "optional": false } } @@ -416,7 +405,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -442,7 +430,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -481,7 +468,6 @@ "ctxt": 0 }, "value": "Fab", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -504,7 +490,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false } }, @@ -542,7 +527,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsDefaultsErr/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsDefaultsErr/input.ts.json index 6afc15628f2c..9b30fa5dd092 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsDefaultsErr/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsDefaultsErr/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Cls", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -130,7 +127,6 @@ "ctxt": 0 }, "value": "Cls", - "typeAnnotation": null, "optional": false } }, @@ -151,7 +147,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "span": { @@ -201,8 +196,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -240,7 +235,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "exported": { @@ -251,7 +245,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsDocCommentsOnConsts/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsDocCommentsOnConsts/input.ts.json index 409e42f05b98..a07b9813f878 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsDocCommentsOnConsts/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsDocCommentsOnConsts/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -105,7 +105,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -178,7 +177,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -189,7 +187,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -210,7 +207,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, { @@ -221,7 +217,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsEnumTag/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsEnumTag/input.ts.json index cf2fda1d8059..7f77d9efdb1d 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsEnumTag/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsEnumTag/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "Target", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -59,7 +59,6 @@ "ctxt": 0 }, "value": "START", - "typeAnnotation": null, "optional": false }, "value": { @@ -87,7 +86,6 @@ "ctxt": 0 }, "value": "MIDDLE", - "typeAnnotation": null, "optional": false }, "value": { @@ -115,7 +113,6 @@ "ctxt": 0 }, "value": "END", - "typeAnnotation": null, "optional": false }, "value": { @@ -143,7 +140,6 @@ "ctxt": 0 }, "value": "OK_I_GUESS", - "typeAnnotation": null, "optional": false }, "value": { @@ -195,8 +191,8 @@ "ctxt": 0 }, "value": "Second", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -216,7 +212,6 @@ "ctxt": 0 }, "value": "OK", - "typeAnnotation": null, "optional": false }, "value": { @@ -239,7 +234,6 @@ "ctxt": 0 }, "value": "FINE", - "typeAnnotation": null, "optional": false }, "value": { @@ -291,8 +285,8 @@ "ctxt": 0 }, "value": "Fs", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -312,7 +306,6 @@ "ctxt": 0 }, "value": "ADD1", - "typeAnnotation": null, "optional": false }, "value": { @@ -331,8 +324,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -351,7 +344,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -380,7 +372,6 @@ "ctxt": 0 }, "value": "ID", - "typeAnnotation": null, "optional": false }, "value": { @@ -399,8 +390,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -411,7 +402,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -430,7 +420,6 @@ "ctxt": 0 }, "value": "SUB1", - "typeAnnotation": null, "optional": false }, "value": { @@ -449,8 +438,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -469,7 +458,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -512,7 +500,6 @@ "ctxt": 0 }, "value": "consume", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -533,8 +520,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -553,8 +540,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -573,8 +560,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -617,8 +604,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -628,7 +615,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "definite": false @@ -660,8 +646,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -671,7 +657,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "definite": false @@ -703,8 +688,8 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -714,7 +699,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "definite": false @@ -746,8 +730,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -764,7 +748,6 @@ "ctxt": 0 }, "value": "Target", - "typeAnnotation": null, "optional": false }, "property": { @@ -775,7 +758,6 @@ "ctxt": 0 }, "value": "START", - "typeAnnotation": null, "optional": false }, "computed": false @@ -807,8 +789,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -851,7 +833,6 @@ "ctxt": 0 }, "value": "ff", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -872,8 +853,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -921,7 +902,6 @@ "ctxt": 0 }, "value": "Target", - "typeAnnotation": null, "optional": false }, "property": { @@ -932,7 +912,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": true @@ -994,7 +973,6 @@ "ctxt": 0 }, "value": "Target", - "typeAnnotation": null, "optional": false }, "property": { @@ -1005,7 +983,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": true diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsEnums/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsEnums/input.ts.json index e72872c7e65e..fe174a9a8d73 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsEnums/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsEnums/input.ts.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "members": [] @@ -60,7 +59,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "members": [ @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "Member", - "typeAnnotation": null, "optional": false }, "init": null @@ -104,7 +101,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "members": [] @@ -132,7 +128,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "exported": null @@ -159,7 +154,6 @@ "ctxt": 0 }, "value": "DD", - "typeAnnotation": null, "optional": false }, "members": [] @@ -187,7 +181,6 @@ "ctxt": 0 }, "value": "DD", - "typeAnnotation": null, "optional": false }, "exported": { @@ -198,7 +191,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false } } @@ -231,7 +223,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [] @@ -260,7 +251,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "exported": { @@ -271,7 +261,6 @@ "ctxt": 0 }, "value": "EE", - "typeAnnotation": null, "optional": false } } @@ -303,7 +292,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "exported": { @@ -314,7 +302,6 @@ "ctxt": 0 }, "value": "FF", - "typeAnnotation": null, "optional": false } } @@ -347,7 +334,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "members": [] @@ -377,7 +363,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "members": [ @@ -396,7 +381,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": { @@ -424,7 +408,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -444,7 +427,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -476,7 +458,6 @@ "ctxt": 0 }, "value": "H", - "typeAnnotation": null, "optional": false }, "members": [ @@ -495,7 +476,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": { @@ -528,7 +508,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": { @@ -573,7 +552,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "members": [ @@ -592,7 +570,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": { @@ -625,7 +602,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": { @@ -653,7 +629,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -685,7 +660,6 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false }, "members": [ @@ -704,7 +678,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": { @@ -732,7 +705,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -752,7 +724,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -784,7 +755,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "members": [ @@ -803,7 +773,6 @@ "ctxt": 0 }, "value": "None", - "typeAnnotation": null, "optional": false }, "init": { @@ -831,7 +800,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": { @@ -877,7 +845,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": { @@ -923,7 +890,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": { @@ -969,7 +935,6 @@ "ctxt": 0 }, "value": "Mask", - "typeAnnotation": null, "optional": false }, "init": { @@ -996,7 +961,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -1007,7 +971,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -1019,7 +982,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } @@ -1051,7 +1013,6 @@ "ctxt": 0 }, "value": "L", - "typeAnnotation": null, "optional": false }, "members": [ @@ -1070,7 +1031,6 @@ "ctxt": 0 }, "value": "None", - "typeAnnotation": null, "optional": false }, "init": { @@ -1098,7 +1058,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": { @@ -1144,7 +1103,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": { @@ -1190,7 +1148,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": { @@ -1236,7 +1193,6 @@ "ctxt": 0 }, "value": "Mask", - "typeAnnotation": null, "optional": false }, "init": { @@ -1263,7 +1219,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -1274,7 +1229,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -1286,7 +1240,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassExpression/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassExpression/input.ts.json index c1fc1096a259..efd3e8e4b23c 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassExpression/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassExpression/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "Thing", - "typeAnnotation": null, "optional": false }, "span": { @@ -87,7 +84,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -107,8 +103,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -158,7 +154,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -188,7 +183,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassExpressionAnonymous/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassExpressionAnonymous/input.ts.json index 9fabe9d29a2c..67dbf0a54952 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassExpressionAnonymous/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassExpressionAnonymous/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -97,8 +94,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -148,7 +145,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -178,7 +174,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub/input.ts.json index 0b248437dbf1..1e693e46f210 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -97,8 +94,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -148,7 +145,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -178,7 +174,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -235,7 +230,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -246,7 +240,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -259,7 +252,6 @@ "ctxt": 0 }, "value": "Sub", - "typeAnnotation": null, "optional": false }, "computed": false @@ -289,7 +281,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -339,7 +330,6 @@ "ctxt": 0 }, "value": "instance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -366,7 +356,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -377,7 +366,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassExpressionShadowing/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassExpressionShadowing/input.ts.json index 66ae0717be48..632c871dd568 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassExpressionShadowing/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassExpressionShadowing/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -60,7 +58,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -94,7 +91,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -120,7 +116,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -180,7 +175,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -191,7 +185,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -206,7 +199,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "span": { @@ -231,7 +223,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -281,7 +272,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -301,7 +291,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -360,7 +349,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -371,7 +359,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -384,7 +371,6 @@ "ctxt": 0 }, "value": "Another", - "typeAnnotation": null, "optional": false }, "computed": false @@ -397,7 +383,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassInstance1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassInstance1/input.ts.json index e19c73288a51..fee984057750 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassInstance1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassInstance1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -63,7 +62,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -94,7 +91,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassInstance2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassInstance2/input.ts.json index d80f07b70cec..e37002745c1b 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassInstance2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassInstance2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "stat", - "typeAnnotation": null, "optional": false }, "value": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -140,7 +137,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -151,7 +147,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -171,7 +166,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassInstance3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassInstance3/input.ts.json index 23e985216cd5..7edf5fb776e1 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassInstance3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedClassInstance3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "stat", - "typeAnnotation": null, "optional": false }, "value": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": { @@ -140,7 +137,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -151,7 +147,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -171,7 +166,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -216,7 +210,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -227,7 +220,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -240,7 +232,6 @@ "ctxt": 0 }, "value": "additional", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunction/input.ts.json index 469cba88bff6..8d6e124c0264 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunction/input.ts.json @@ -43,7 +43,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -54,7 +53,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "computed": false @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -197,7 +193,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -208,7 +203,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -221,7 +215,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "computed": false @@ -234,7 +227,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -257,7 +249,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunctionWithSub/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunctionWithSub/input.ts.json index 77167405c316..949b2d795b58 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunctionWithSub/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedConstructorFunctionWithSub/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -72,8 +70,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -129,7 +127,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -159,7 +156,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -211,7 +207,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -222,7 +217,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -235,7 +229,6 @@ "ctxt": 0 }, "value": "Sub", - "typeAnnotation": null, "optional": false }, "computed": false @@ -296,7 +289,6 @@ "ctxt": 0 }, "value": "instance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -323,7 +315,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -334,7 +325,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -410,7 +400,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -421,7 +410,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -434,7 +422,6 @@ "ctxt": 0 }, "value": "Sub", - "typeAnnotation": null, "optional": false }, "computed": false @@ -447,7 +434,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedVisibility/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedVisibility/input.ts.json index a069d28e5d42..0271c41af07d 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedVisibility/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignedVisibility/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "Obj", - "typeAnnotation": null, "optional": false }, "span": { @@ -87,7 +84,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -137,7 +133,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -192,8 +187,8 @@ "ctxt": 0 }, "value": "Obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -210,7 +205,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -248,7 +242,6 @@ "ctxt": 0 }, "value": "Container", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -274,7 +267,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -324,7 +316,6 @@ "ctxt": 0 }, "value": "usage", - "typeAnnotation": null, "optional": false }, "computed": false @@ -344,7 +335,6 @@ "ctxt": 0 }, "value": "Obj", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -394,7 +384,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -405,7 +394,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -418,7 +406,6 @@ "ctxt": 0 }, "value": "Container", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignmentExpressionPlusSecondary/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignmentExpressionPlusSecondary/input.ts.json index 134ab017d1b9..71737f617ad2 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignmentExpressionPlusSecondary/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignmentExpressionPlusSecondary/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "Strings", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -80,7 +79,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -134,7 +132,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -145,7 +142,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -168,7 +164,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false }, "value": { @@ -196,7 +191,6 @@ "ctxt": 0 }, "value": "also", - "typeAnnotation": null, "optional": false }, "value": { @@ -224,7 +218,6 @@ "ctxt": 0 }, "value": "desc", - "typeAnnotation": null, "optional": false }, "value": { @@ -245,7 +238,6 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, "optional": false }, "value": { @@ -307,7 +299,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -318,7 +309,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -331,7 +321,6 @@ "ctxt": 0 }, "value": "Strings", - "typeAnnotation": null, "optional": false }, "computed": false @@ -344,7 +333,6 @@ "ctxt": 0 }, "value": "Strings", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignmentWithKeywordName/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignmentWithKeywordName/input.ts.json index 0f01ba8b4a45..08ae00102227 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignmentWithKeywordName/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportAssignmentWithKeywordName/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -111,7 +109,6 @@ "ctxt": 0 }, "value": "extends", - "typeAnnotation": null, "optional": false }, "value": { @@ -139,7 +136,6 @@ "ctxt": 0 }, "value": "more", - "typeAnnotation": null, "optional": false }, "value": { @@ -160,7 +156,6 @@ "ctxt": 0 }, "value": "others", - "typeAnnotation": null, "optional": false }, "value": { @@ -202,7 +197,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportDefinePropertyEmit/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportDefinePropertyEmit/input.ts.json index e03222596926..b533a0d95fdb 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportDefinePropertyEmit/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportDefinePropertyEmit/input.ts.json @@ -35,7 +35,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -46,7 +45,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -80,7 +77,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -123,7 +119,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -136,7 +131,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "params": [], @@ -197,7 +191,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -208,7 +201,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -231,7 +223,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -242,7 +233,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -285,7 +275,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -298,7 +287,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "params": [], @@ -359,7 +347,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -370,7 +357,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -400,7 +386,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -411,7 +396,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -424,7 +408,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -467,7 +450,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -502,7 +484,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -523,8 +504,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -543,8 +524,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -622,7 +603,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -633,7 +613,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -656,7 +635,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -667,7 +645,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -710,7 +687,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -721,7 +697,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -742,7 +717,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -763,8 +737,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -783,8 +757,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -862,7 +836,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -873,7 +846,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -896,7 +868,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -907,7 +878,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -950,7 +920,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -961,7 +930,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -982,7 +950,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1003,8 +970,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1037,7 +1004,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1077,7 +1043,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -1088,7 +1053,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1111,7 +1075,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1122,7 +1085,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1165,7 +1127,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -1176,7 +1137,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -1216,7 +1176,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -1227,7 +1186,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1257,7 +1215,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1268,7 +1225,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1281,7 +1237,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1324,7 +1279,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -1349,7 +1303,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1360,7 +1313,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1373,7 +1325,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1396,7 +1347,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1417,8 +1367,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1437,8 +1387,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1486,7 +1436,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1497,7 +1446,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1524,7 +1472,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1535,7 +1482,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1581,7 +1527,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -1592,7 +1537,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1615,7 +1559,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1626,7 +1569,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1669,7 +1611,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -1680,7 +1621,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } } @@ -1701,7 +1641,6 @@ "ctxt": 0 }, "value": "hh", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1722,8 +1661,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1742,8 +1681,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1791,7 +1730,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1802,7 +1740,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1829,7 +1766,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1840,7 +1776,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1886,7 +1821,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -1897,7 +1831,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1920,7 +1853,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1931,7 +1863,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1974,7 +1905,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -1985,7 +1915,6 @@ "ctxt": 0 }, "value": "hh", - "typeAnnotation": null, "optional": false } } @@ -2025,7 +1954,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -2036,7 +1964,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2059,7 +1986,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -2070,7 +1996,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2113,7 +2038,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -2126,7 +2050,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "params": [], @@ -2187,7 +2110,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -2198,7 +2120,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2221,7 +2142,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -2232,7 +2152,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2275,7 +2194,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -2300,7 +2218,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -2311,7 +2228,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2324,7 +2240,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2366,7 +2281,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -2377,7 +2291,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2400,7 +2313,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -2411,7 +2323,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2454,7 +2365,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -2479,7 +2389,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -2490,7 +2399,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2503,7 +2411,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2545,7 +2452,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -2556,7 +2462,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2579,7 +2484,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -2590,7 +2494,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2633,7 +2536,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -2646,7 +2548,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportDoubleAssignmentInClosure/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportDoubleAssignmentInClosure/input.ts.json index 2554aa0cbf11..e56752aec3f4 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportDoubleAssignmentInClosure/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportDoubleAssignmentInClosure/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -65,7 +64,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -76,7 +74,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -97,8 +94,8 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "FunctionExpression", @@ -120,8 +117,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -176,7 +173,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "right": { @@ -204,7 +200,6 @@ "ctxt": 0 }, "value": "create", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -218,7 +213,6 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, "optional": false } } @@ -240,7 +234,6 @@ "ctxt": 0 }, "value": "defineProperties", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -261,7 +254,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -275,7 +267,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } @@ -293,7 +284,6 @@ "ctxt": 0 }, "value": "descriptors", - "typeAnnotation": null, "optional": false } } @@ -337,8 +327,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -398,7 +388,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -409,7 +398,6 @@ "ctxt": 0 }, "value": "methods", - "typeAnnotation": null, "optional": false }, "computed": false @@ -422,7 +410,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportForms/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportForms/input.ts.json index c7c31f45ac49..cc964d91ccf1 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportForms/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportForms/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -176,7 +174,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "imported": null @@ -222,7 +219,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "exported": null @@ -255,7 +251,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } } @@ -292,7 +287,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } }, @@ -319,7 +313,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } } @@ -364,7 +357,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "exported": null @@ -397,7 +389,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } } @@ -442,7 +433,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "exported": { @@ -453,7 +443,6 @@ "ctxt": 0 }, "value": "classContainer", - "typeAnnotation": null, "optional": false } } @@ -487,8 +476,8 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -505,7 +494,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -563,7 +551,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -574,7 +561,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -595,7 +581,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } ] @@ -627,8 +612,8 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -645,7 +630,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -703,7 +687,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -714,7 +697,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -727,7 +709,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } } @@ -757,8 +738,8 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -775,7 +756,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -840,7 +820,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -851,7 +830,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -864,7 +842,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "computed": false @@ -877,7 +854,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } } @@ -907,8 +883,8 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -925,7 +901,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -990,7 +965,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1001,7 +975,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1014,7 +987,6 @@ "ctxt": 0 }, "value": "names", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1027,7 +999,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportSpecifierNonlocal/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportSpecifierNonlocal/input.ts.json index 420f1fde5eda..c96e07ee20c9 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportSpecifierNonlocal/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportSpecifierNonlocal/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Thing", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "OtherThing", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -99,7 +97,6 @@ "ctxt": 0 }, "value": "Thing", - "typeAnnotation": null, "optional": false }, "exported": null @@ -119,7 +116,6 @@ "ctxt": 0 }, "value": "OtherThing", - "typeAnnotation": null, "optional": false }, "exported": { @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportSubAssignments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportSubAssignments/input.ts.json index df9c132e7508..bb1159430f3c 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportSubAssignments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportSubAssignments/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "Strings", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -80,7 +79,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -114,7 +112,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -161,7 +158,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -172,7 +168,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -185,7 +180,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } } @@ -227,7 +221,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -238,7 +231,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -251,7 +243,6 @@ "ctxt": 0 }, "value": "Strings", - "typeAnnotation": null, "optional": false }, "computed": false @@ -264,7 +255,6 @@ "ctxt": 0 }, "value": "Strings", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportedClassAliases/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportedClassAliases/input.ts.json index 6006c45a21eb..18462b6062dc 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportedClassAliases/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsExportedClassAliases/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "FancyError", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,8 +60,8 @@ "ctxt": 0 }, "value": "status", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -116,7 +114,6 @@ "ctxt": 0 }, "value": "status", - "typeAnnotation": null, "optional": false } ], @@ -216,7 +213,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -254,7 +250,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -265,7 +260,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -286,7 +280,6 @@ "ctxt": 0 }, "value": "FancyError", - "typeAnnotation": null, "optional": false } ] @@ -318,8 +311,8 @@ "ctxt": 0 }, "value": "errors", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -336,7 +329,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -394,7 +386,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -405,7 +396,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -426,7 +416,6 @@ "ctxt": 0 }, "value": "errors", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionClassesCjsExportAssignment/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionClassesCjsExportAssignment/input.ts.json index 2cc1ba03d737..2c1e4c72db7a 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionClassesCjsExportAssignment/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionClassesCjsExportAssignment/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Timer", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "timeout", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -94,7 +93,6 @@ "ctxt": 0 }, "value": "timeout", - "typeAnnotation": null, "optional": false }, "computed": false @@ -107,7 +105,6 @@ "ctxt": 0 }, "value": "timeout", - "typeAnnotation": null, "optional": false } } @@ -149,7 +146,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -160,7 +156,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -173,7 +168,6 @@ "ctxt": 0 }, "value": "Timer", - "typeAnnotation": null, "optional": false } } @@ -188,7 +182,6 @@ "ctxt": 0 }, "value": "Hook", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -209,8 +202,8 @@ "ctxt": 0 }, "value": "handle", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -266,7 +259,6 @@ "ctxt": 0 }, "value": "handle", - "typeAnnotation": null, "optional": false }, "computed": false @@ -279,7 +271,6 @@ "ctxt": 0 }, "value": "handle", - "typeAnnotation": null, "optional": false } } @@ -321,7 +312,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -332,7 +322,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -345,7 +334,6 @@ "ctxt": 0 }, "value": "Hook", - "typeAnnotation": null, "optional": false } } @@ -360,7 +348,6 @@ "ctxt": 0 }, "value": "Context", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -381,8 +368,8 @@ "ctxt": 0 }, "value": "input", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -446,7 +433,6 @@ "ctxt": 0 }, "value": "Context", - "typeAnnotation": null, "optional": false } } @@ -482,7 +468,6 @@ "ctxt": 0 }, "value": "Context", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -496,7 +481,6 @@ "ctxt": 0 }, "value": "input", - "typeAnnotation": null, "optional": false } } @@ -546,7 +530,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "computed": false @@ -581,7 +564,6 @@ "ctxt": 0 }, "value": "construct", - "typeAnnotation": null, "optional": false }, "computed": false @@ -597,7 +579,6 @@ "ctxt": 0 }, "value": "input", - "typeAnnotation": null, "optional": false } } @@ -643,7 +624,6 @@ "ctxt": 0 }, "value": "Context", - "typeAnnotation": null, "optional": false }, "property": { @@ -654,7 +634,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -677,7 +656,6 @@ "ctxt": 0 }, "value": "construct", - "typeAnnotation": null, "optional": false }, "params": [ @@ -697,8 +675,8 @@ "ctxt": 0 }, "value": "input", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -724,8 +702,8 @@ "ctxt": 0 }, "value": "handle", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -791,7 +769,6 @@ "ctxt": 0 }, "value": "input", - "typeAnnotation": null, "optional": false } } @@ -836,7 +813,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -847,7 +823,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -860,7 +835,6 @@ "ctxt": 0 }, "value": "Context", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionJSDoc/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionJSDoc/input.ts.json index b4b41c6f8d1e..ac2907320e31 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionJSDoc/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionJSDoc/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -44,8 +43,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -64,8 +63,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -107,7 +106,6 @@ "ctxt": 0 }, "value": "Aleph", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -133,7 +131,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -153,8 +150,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -173,8 +170,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -224,7 +221,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false }, "computed": false @@ -237,7 +233,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -262,7 +257,6 @@ "ctxt": 0 }, "value": "doIt", - "typeAnnotation": null, "optional": false }, "function": { @@ -333,8 +327,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionKeywordProp/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionKeywordProp/input.ts.json index ca86d82e78f3..b24a8d4bdb97 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionKeywordProp/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionKeywordProp/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -82,7 +80,6 @@ "ctxt": 0 }, "value": "null", - "typeAnnotation": null, "optional": false }, "computed": false @@ -108,7 +105,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -163,7 +159,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "property": { @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "async", - "typeAnnotation": null, "optional": false }, "computed": false @@ -220,7 +214,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "property": { @@ -231,7 +224,6 @@ "ctxt": 0 }, "value": "normal", - "typeAnnotation": null, "optional": false }, "computed": false @@ -257,7 +249,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -312,7 +303,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "property": { @@ -323,7 +313,6 @@ "ctxt": 0 }, "value": "class", - "typeAnnotation": null, "optional": false }, "computed": false @@ -369,7 +358,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "property": { @@ -380,7 +368,6 @@ "ctxt": 0 }, "value": "normal", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionKeywordPropExhaustive/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionKeywordPropExhaustive/input.ts.json index f21338f53e2d..203c6842eb9f 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionKeywordPropExhaustive/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionKeywordPropExhaustive/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -82,7 +80,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -139,7 +135,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -185,7 +180,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -196,7 +190,6 @@ "ctxt": 0 }, "value": "break", - "typeAnnotation": null, "optional": false }, "computed": false @@ -242,7 +235,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -253,7 +245,6 @@ "ctxt": 0 }, "value": "case", - "typeAnnotation": null, "optional": false }, "computed": false @@ -299,7 +290,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -310,7 +300,6 @@ "ctxt": 0 }, "value": "catch", - "typeAnnotation": null, "optional": false }, "computed": false @@ -356,7 +345,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -367,7 +355,6 @@ "ctxt": 0 }, "value": "class", - "typeAnnotation": null, "optional": false }, "computed": false @@ -413,7 +400,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -424,7 +410,6 @@ "ctxt": 0 }, "value": "const", - "typeAnnotation": null, "optional": false }, "computed": false @@ -470,7 +455,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -481,7 +465,6 @@ "ctxt": 0 }, "value": "continue", - "typeAnnotation": null, "optional": false }, "computed": false @@ -527,7 +510,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -538,7 +520,6 @@ "ctxt": 0 }, "value": "debugger", - "typeAnnotation": null, "optional": false }, "computed": false @@ -584,7 +565,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -595,7 +575,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "computed": false @@ -641,7 +620,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -652,7 +630,6 @@ "ctxt": 0 }, "value": "delete", - "typeAnnotation": null, "optional": false }, "computed": false @@ -698,7 +675,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -709,7 +685,6 @@ "ctxt": 0 }, "value": "do", - "typeAnnotation": null, "optional": false }, "computed": false @@ -755,7 +730,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -766,7 +740,6 @@ "ctxt": 0 }, "value": "else", - "typeAnnotation": null, "optional": false }, "computed": false @@ -812,7 +785,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -823,7 +795,6 @@ "ctxt": 0 }, "value": "enum", - "typeAnnotation": null, "optional": false }, "computed": false @@ -869,7 +840,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -880,7 +850,6 @@ "ctxt": 0 }, "value": "export", - "typeAnnotation": null, "optional": false }, "computed": false @@ -926,7 +895,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -937,7 +905,6 @@ "ctxt": 0 }, "value": "extends", - "typeAnnotation": null, "optional": false }, "computed": false @@ -983,7 +950,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -994,7 +960,6 @@ "ctxt": 0 }, "value": "false", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1040,7 +1005,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1051,7 +1015,6 @@ "ctxt": 0 }, "value": "finally", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1097,7 +1060,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1108,7 +1070,6 @@ "ctxt": 0 }, "value": "for", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1154,7 +1115,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1165,7 +1125,6 @@ "ctxt": 0 }, "value": "function", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1211,7 +1170,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1222,7 +1180,6 @@ "ctxt": 0 }, "value": "if", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1268,7 +1225,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1279,7 +1235,6 @@ "ctxt": 0 }, "value": "import", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1325,7 +1280,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1336,7 +1290,6 @@ "ctxt": 0 }, "value": "in", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1382,7 +1335,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1393,7 +1345,6 @@ "ctxt": 0 }, "value": "instanceof", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1439,7 +1390,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1450,7 +1400,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1496,7 +1445,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1507,7 +1455,6 @@ "ctxt": 0 }, "value": "null", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1553,7 +1500,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1564,7 +1510,6 @@ "ctxt": 0 }, "value": "return", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1610,7 +1555,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1621,7 +1565,6 @@ "ctxt": 0 }, "value": "super", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1667,7 +1610,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1678,7 +1620,6 @@ "ctxt": 0 }, "value": "switch", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1724,7 +1665,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1735,7 +1675,6 @@ "ctxt": 0 }, "value": "this", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1781,7 +1720,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1792,7 +1730,6 @@ "ctxt": 0 }, "value": "throw", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1838,7 +1775,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1849,7 +1785,6 @@ "ctxt": 0 }, "value": "true", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1895,7 +1830,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1906,7 +1840,6 @@ "ctxt": 0 }, "value": "try", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1952,7 +1885,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1963,7 +1895,6 @@ "ctxt": 0 }, "value": "typeof", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2009,7 +1940,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -2020,7 +1950,6 @@ "ctxt": 0 }, "value": "var", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2066,7 +1995,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -2077,7 +2005,6 @@ "ctxt": 0 }, "value": "void", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2123,7 +2050,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -2134,7 +2060,6 @@ "ctxt": 0 }, "value": "while", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2180,7 +2105,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -2191,7 +2115,6 @@ "ctxt": 0 }, "value": "with", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2237,7 +2160,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -2248,7 +2170,6 @@ "ctxt": 0 }, "value": "implements", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2294,7 +2215,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -2305,7 +2225,6 @@ "ctxt": 0 }, "value": "interface", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2351,7 +2270,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -2362,7 +2280,6 @@ "ctxt": 0 }, "value": "let", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2408,7 +2325,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -2419,7 +2335,6 @@ "ctxt": 0 }, "value": "package", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2465,7 +2380,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -2476,7 +2390,6 @@ "ctxt": 0 }, "value": "private", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2522,7 +2435,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -2533,7 +2445,6 @@ "ctxt": 0 }, "value": "protected", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2579,7 +2490,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -2590,7 +2500,6 @@ "ctxt": 0 }, "value": "public", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2636,7 +2545,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -2647,7 +2555,6 @@ "ctxt": 0 }, "value": "static", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2693,7 +2600,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -2704,7 +2610,6 @@ "ctxt": 0 }, "value": "yield", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2750,7 +2655,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -2761,7 +2665,6 @@ "ctxt": 0 }, "value": "abstract", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2807,7 +2710,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -2818,7 +2720,6 @@ "ctxt": 0 }, "value": "as", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2864,7 +2765,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -2875,7 +2775,6 @@ "ctxt": 0 }, "value": "asserts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2921,7 +2820,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -2932,7 +2830,6 @@ "ctxt": 0 }, "value": "any", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2978,7 +2875,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -2989,7 +2885,6 @@ "ctxt": 0 }, "value": "async", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3035,7 +2930,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -3046,7 +2940,6 @@ "ctxt": 0 }, "value": "await", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3092,7 +2985,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -3103,7 +2995,6 @@ "ctxt": 0 }, "value": "boolean", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3149,7 +3040,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -3160,7 +3050,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3206,7 +3095,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -3217,7 +3105,6 @@ "ctxt": 0 }, "value": "declare", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3263,7 +3150,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -3274,7 +3160,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3320,7 +3205,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -3331,7 +3215,6 @@ "ctxt": 0 }, "value": "infer", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3377,7 +3260,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -3388,7 +3270,6 @@ "ctxt": 0 }, "value": "is", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3434,7 +3315,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -3445,7 +3325,6 @@ "ctxt": 0 }, "value": "keyof", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3491,7 +3370,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -3502,7 +3380,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3548,7 +3425,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -3559,7 +3435,6 @@ "ctxt": 0 }, "value": "namespace", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3605,7 +3480,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -3616,7 +3490,6 @@ "ctxt": 0 }, "value": "never", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3662,7 +3535,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -3673,7 +3545,6 @@ "ctxt": 0 }, "value": "readonly", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3719,7 +3590,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -3730,7 +3600,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3776,7 +3645,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -3787,7 +3655,6 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3833,7 +3700,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -3844,7 +3710,6 @@ "ctxt": 0 }, "value": "object", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3890,7 +3755,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -3901,7 +3765,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3947,7 +3810,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -3958,7 +3820,6 @@ "ctxt": 0 }, "value": "string", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4004,7 +3865,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -4015,7 +3875,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4061,7 +3920,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -4072,7 +3930,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4118,7 +3975,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -4129,7 +3985,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4175,7 +4030,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -4186,7 +4040,6 @@ "ctxt": 0 }, "value": "unique", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4232,7 +4085,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -4243,7 +4095,6 @@ "ctxt": 0 }, "value": "unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4289,7 +4140,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -4300,7 +4150,6 @@ "ctxt": 0 }, "value": "from", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4346,7 +4195,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -4357,7 +4205,6 @@ "ctxt": 0 }, "value": "global", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4403,7 +4250,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -4414,7 +4260,6 @@ "ctxt": 0 }, "value": "bigint", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4460,7 +4305,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -4471,7 +4315,6 @@ "ctxt": 0 }, "value": "of", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionLikeClasses/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionLikeClasses/input.ts.json index 5787a1a356c7..d5cc2cf80220 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionLikeClasses/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionLikeClasses/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -44,8 +43,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -64,8 +63,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -129,7 +128,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } } @@ -165,7 +163,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -179,7 +176,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -193,7 +189,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -243,7 +238,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -256,7 +250,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -299,7 +292,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -312,7 +304,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -348,7 +339,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "imported": null @@ -388,7 +378,6 @@ "ctxt": 0 }, "value": "magnitude", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -409,8 +398,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -457,7 +446,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -468,7 +456,6 @@ "ctxt": 0 }, "value": "sqrt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -507,7 +494,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -518,7 +504,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -556,7 +541,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -567,7 +551,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionLikeClasses2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionLikeClasses2/input.ts.json index a27a45a32761..05566abe6dfd 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionLikeClasses2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionLikeClasses2/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Vec", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -44,8 +43,8 @@ "ctxt": 0 }, "value": "len", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -101,7 +100,6 @@ "ctxt": 0 }, "value": "storage", - "typeAnnotation": null, "optional": false }, "computed": false @@ -121,7 +119,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -135,7 +132,6 @@ "ctxt": 0 }, "value": "len", - "typeAnnotation": null, "optional": false } } @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "Vec", - "typeAnnotation": null, "optional": false }, "property": { @@ -193,7 +188,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -216,7 +210,6 @@ "ctxt": 0 }, "value": "dot", - "typeAnnotation": null, "optional": false }, "params": [ @@ -236,8 +229,8 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -292,7 +285,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "property": { @@ -303,7 +295,6 @@ "ctxt": 0 }, "value": "storage", - "typeAnnotation": null, "optional": false }, "computed": false @@ -316,7 +307,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -351,7 +341,6 @@ "ctxt": 0 }, "value": "storage", - "typeAnnotation": null, "optional": false }, "computed": false @@ -364,7 +353,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -400,7 +388,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -488,8 +475,8 @@ "ctxt": 0 }, "value": "sum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -536,8 +523,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -568,7 +555,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "right": { @@ -601,7 +587,6 @@ "ctxt": 0 }, "value": "storage", - "typeAnnotation": null, "optional": false }, "computed": false @@ -614,7 +599,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -637,7 +621,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -672,8 +655,8 @@ "ctxt": 0 }, "value": "sum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -720,7 +703,6 @@ "ctxt": 0 }, "value": "storage", - "typeAnnotation": null, "optional": false }, "computed": false @@ -733,7 +715,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": true @@ -760,7 +741,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "property": { @@ -771,7 +751,6 @@ "ctxt": 0 }, "value": "storage", - "typeAnnotation": null, "optional": false }, "computed": false @@ -784,7 +763,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": true @@ -811,7 +789,6 @@ "ctxt": 0 }, "value": "sum", - "typeAnnotation": null, "optional": false } } @@ -832,7 +809,6 @@ "ctxt": 0 }, "value": "magnitude", - "typeAnnotation": null, "optional": false }, "params": [], @@ -875,8 +851,8 @@ "ctxt": 0 }, "value": "sum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -923,8 +899,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -955,7 +931,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "right": { @@ -988,7 +963,6 @@ "ctxt": 0 }, "value": "storage", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1001,7 +975,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1024,7 +997,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -1059,8 +1031,8 @@ "ctxt": 0 }, "value": "sum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -1107,7 +1079,6 @@ "ctxt": 0 }, "value": "storage", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1120,7 +1091,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1170,7 +1140,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -1181,7 +1150,6 @@ "ctxt": 0 }, "value": "sqrt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1197,7 +1165,6 @@ "ctxt": 0 }, "value": "sum", - "typeAnnotation": null, "optional": false } } @@ -1233,7 +1200,6 @@ "ctxt": 0 }, "value": "Point2D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1254,8 +1220,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1274,8 +1240,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1339,7 +1305,6 @@ "ctxt": 0 }, "value": "Point2D", - "typeAnnotation": null, "optional": false } } @@ -1375,7 +1340,6 @@ "ctxt": 0 }, "value": "Point2D", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1389,7 +1353,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1403,7 +1366,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1444,7 +1406,6 @@ "ctxt": 0 }, "value": "Vec", - "typeAnnotation": null, "optional": false }, "property": { @@ -1455,7 +1416,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1526,7 +1486,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1539,7 +1498,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1582,7 +1540,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1595,7 +1552,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1638,7 +1594,6 @@ "ctxt": 0 }, "value": "Point2D", - "typeAnnotation": null, "optional": false }, "property": { @@ -1649,7 +1604,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1672,7 +1626,6 @@ "ctxt": 0 }, "value": "__proto__", - "typeAnnotation": null, "optional": false }, "value": { @@ -1683,7 +1636,6 @@ "ctxt": 0 }, "value": "Vec", - "typeAnnotation": null, "optional": false } }, @@ -1702,7 +1654,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -1751,7 +1702,6 @@ "ctxt": 0 }, "value": "storage", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1786,7 +1736,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "param": { @@ -1797,8 +1746,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -1853,7 +1802,6 @@ "ctxt": 0 }, "value": "storage", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1877,7 +1825,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1900,7 +1847,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -1949,7 +1895,6 @@ "ctxt": 0 }, "value": "storage", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1984,7 +1929,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "param": { @@ -1995,8 +1939,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -2051,7 +1995,6 @@ "ctxt": 0 }, "value": "storage", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2075,7 +2018,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -2110,7 +2052,6 @@ "ctxt": 0 }, "value": "Point2D", - "typeAnnotation": null, "optional": false }, "imported": null @@ -2165,8 +2106,8 @@ "ctxt": 0 }, "value": "origin", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2183,7 +2124,6 @@ "ctxt": 0 }, "value": "Point2D", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionPrototypeStatic/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionPrototypeStatic/input.ts.json index 40141c7e1cab..98b0638f4af0 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionPrototypeStatic/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionPrototypeStatic/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -60,7 +58,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false } } @@ -75,7 +72,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "property": { @@ -141,7 +136,6 @@ "ctxt": 0 }, "value": "staticMethod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -209,7 +203,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "property": { @@ -220,7 +213,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -233,7 +225,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false @@ -294,7 +285,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "property": { @@ -305,7 +295,6 @@ "ctxt": 0 }, "value": "staticProperty", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionWithDefaultAssignedMember/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionWithDefaultAssignedMember/input.ts.json index 8b5e3e28140c..a6fefe365096 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionWithDefaultAssignedMember/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionWithDefaultAssignedMember/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -82,7 +80,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -95,7 +92,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -141,7 +136,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "computed": false @@ -154,7 +148,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -189,7 +182,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -200,7 +192,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -213,7 +204,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctions/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctions/input.ts.json index e34671e92b31..d58ac32b03d1 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctions/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctions/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -66,7 +65,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -122,7 +120,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -133,7 +130,6 @@ "ctxt": 0 }, "value": "cat", - "typeAnnotation": null, "optional": false }, "computed": false @@ -171,7 +167,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -227,7 +222,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -238,7 +232,6 @@ "ctxt": 0 }, "value": "Cls", - "typeAnnotation": null, "optional": false }, "computed": false @@ -278,7 +271,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -299,8 +291,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -319,8 +311,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -387,7 +379,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -408,8 +399,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -428,8 +419,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -496,7 +487,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -517,8 +507,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -551,7 +541,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -593,7 +582,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { @@ -604,7 +592,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "computed": false @@ -617,7 +604,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -632,7 +618,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -653,8 +638,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -673,8 +658,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -722,7 +707,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -733,7 +717,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -760,7 +743,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -771,7 +753,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -811,7 +792,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "exported": null @@ -831,7 +811,6 @@ "ctxt": 0 }, "value": "hh", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -852,8 +831,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -872,8 +851,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -921,7 +900,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -932,7 +910,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -959,7 +936,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -970,7 +946,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1010,7 +985,6 @@ "ctxt": 0 }, "value": "hh", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1021,7 +995,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false } } @@ -1047,7 +1020,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1096,7 +1068,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1107,7 +1078,6 @@ "ctxt": 0 }, "value": "ii", - "typeAnnotation": null, "optional": false } } @@ -1139,7 +1109,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1150,7 +1119,6 @@ "ctxt": 0 }, "value": "jj", - "typeAnnotation": null, "optional": false } } @@ -1176,7 +1144,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionsCjs/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionsCjs/input.ts.json index 3c55383fb28d..9c66897cc966 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionsCjs/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsFunctionsCjs/input.ts.json @@ -43,7 +43,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -54,7 +53,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -82,7 +79,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "params": [], @@ -145,7 +141,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -156,7 +151,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -169,7 +163,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -184,7 +177,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "params": [], @@ -254,7 +246,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -265,7 +256,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -278,7 +268,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -291,7 +280,6 @@ "ctxt": 0 }, "value": "cat", - "typeAnnotation": null, "optional": false }, "computed": false @@ -349,7 +337,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -360,7 +347,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -373,7 +359,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -388,7 +373,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "params": [], @@ -458,7 +442,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -469,7 +452,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -482,7 +464,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -495,7 +476,6 @@ "ctxt": 0 }, "value": "Cls", - "typeAnnotation": null, "optional": false }, "computed": false @@ -555,7 +535,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -566,7 +545,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -579,7 +557,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -594,7 +571,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "params": [ @@ -614,8 +590,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -634,8 +610,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -723,7 +699,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -734,7 +709,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -747,7 +721,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false @@ -762,7 +735,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "params": [ @@ -782,8 +754,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -802,8 +774,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -891,7 +863,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -902,7 +873,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -915,7 +885,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -930,7 +899,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [ @@ -950,8 +918,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -984,7 +952,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1041,7 +1008,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1052,7 +1018,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1065,7 +1030,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1078,7 +1042,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1105,7 +1068,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1116,7 +1078,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1129,7 +1090,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1146,7 +1106,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1167,8 +1126,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1187,8 +1146,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1236,7 +1195,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1247,7 +1205,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1274,7 +1231,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1285,7 +1241,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1339,7 +1294,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1350,7 +1304,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1363,7 +1316,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1376,7 +1328,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } } @@ -1391,7 +1342,6 @@ "ctxt": 0 }, "value": "hh", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1412,8 +1362,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1432,8 +1382,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1481,7 +1431,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1492,7 +1441,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1519,7 +1467,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1530,7 +1477,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1584,7 +1530,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1595,7 +1540,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1608,7 +1552,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1621,7 +1564,6 @@ "ctxt": 0 }, "value": "hh", - "typeAnnotation": null, "optional": false } } @@ -1663,7 +1605,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1674,7 +1615,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1687,7 +1627,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1702,7 +1641,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1765,7 +1703,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1776,7 +1713,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1789,7 +1725,6 @@ "ctxt": 0 }, "value": "ii", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1816,7 +1751,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1827,7 +1761,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1840,7 +1773,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1884,7 +1816,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1895,7 +1826,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1908,7 +1838,6 @@ "ctxt": 0 }, "value": "jj", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1935,7 +1864,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1946,7 +1874,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1959,7 +1886,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2003,7 +1929,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -2014,7 +1939,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2027,7 +1951,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2042,7 +1965,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsGetterSetter/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsGetterSetter/input.ts.json index 9d97b4290346..fe923c731820 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsGetterSetter/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsGetterSetter/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -123,7 +121,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -149,7 +146,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -170,8 +166,8 @@ "ctxt": 0 }, "value": "_arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -226,7 +222,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -252,7 +247,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -316,7 +310,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -337,8 +330,8 @@ "ctxt": 0 }, "value": "_arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -393,7 +386,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -440,7 +432,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -451,7 +442,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -474,7 +464,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "property": { @@ -485,7 +474,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -528,7 +516,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "params": [], @@ -594,7 +581,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -641,7 +627,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -652,7 +637,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -675,7 +659,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -686,7 +669,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -729,7 +711,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "params": [ @@ -749,8 +730,8 @@ "ctxt": 0 }, "value": "_arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -798,7 +779,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -845,7 +825,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -856,7 +835,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -879,7 +857,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "property": { @@ -890,7 +867,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -933,7 +909,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "params": [], @@ -985,7 +960,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1005,8 +979,8 @@ "ctxt": 0 }, "value": "_arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsImportAliasExposedWithinNamespace/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsImportAliasExposedWithinNamespace/input.ts.json index 7edee1e5244b..900b9de756da 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsImportAliasExposedWithinNamespace/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsImportAliasExposedWithinNamespace/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "myTypes", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -70,7 +70,6 @@ "ctxt": 0 }, "value": "myTypes", - "typeAnnotation": null, "optional": false }, "exported": null @@ -103,7 +102,6 @@ "ctxt": 0 }, "value": "myTypes", - "typeAnnotation": null, "optional": false }, "imported": null @@ -151,8 +149,8 @@ "ctxt": 0 }, "value": "testFnTypes", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -177,7 +175,6 @@ "ctxt": 0 }, "value": "testFn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -198,8 +195,8 @@ "ctxt": 0 }, "value": "input", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -248,7 +245,6 @@ "ctxt": 0 }, "value": "input", - "typeAnnotation": null, "optional": false } }, @@ -307,7 +303,6 @@ "ctxt": 0 }, "value": "input", - "typeAnnotation": null, "optional": false } } @@ -371,7 +366,6 @@ "ctxt": 0 }, "value": "testFn", - "typeAnnotation": null, "optional": false }, "exported": null @@ -391,7 +385,6 @@ "ctxt": 0 }, "value": "testFnTypes", - "typeAnnotation": null, "optional": false }, "exported": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsImportAliasExposedWithinNamespaceCjs/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsImportAliasExposedWithinNamespaceCjs/input.ts.json index b500dbeedb8c..70f67874e840 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsImportAliasExposedWithinNamespaceCjs/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsImportAliasExposedWithinNamespaceCjs/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "myTypes", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "myTypes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -101,7 +99,6 @@ "ctxt": 0 }, "value": "myTypes", - "typeAnnotation": null, "optional": false } } @@ -146,7 +143,6 @@ "ctxt": 0 }, "value": "myTypes", - "typeAnnotation": null, "optional": false }, "value": null @@ -170,7 +166,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -223,8 +218,8 @@ "ctxt": 0 }, "value": "testFnTypes", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -249,7 +244,6 @@ "ctxt": 0 }, "value": "testFn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -270,8 +264,8 @@ "ctxt": 0 }, "value": "input", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -320,7 +314,6 @@ "ctxt": 0 }, "value": "input", - "typeAnnotation": null, "optional": false } }, @@ -379,7 +372,6 @@ "ctxt": 0 }, "value": "input", - "typeAnnotation": null, "optional": false } } @@ -450,7 +442,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -461,7 +452,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -482,7 +472,6 @@ "ctxt": 0 }, "value": "testFn", - "typeAnnotation": null, "optional": false }, { @@ -493,7 +482,6 @@ "ctxt": 0 }, "value": "testFnTypes", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsImportNamespacedType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsImportNamespacedType/input.ts.json index bc7f9e1a7aee..27ada3812f71 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsImportNamespacedType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsImportNamespacedType/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "dummy", - "typeAnnotation": null, "optional": false }, "imported": null @@ -77,8 +76,8 @@ "ctxt": 0 }, "value": "dot2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -117,8 +116,8 @@ "ctxt": 0 }, "value": "dummy", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsImportTypeBundled/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsImportTypeBundled/input.ts.json index 16dbc54baeb7..1cf5bd1fc667 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsImportTypeBundled/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsImportTypeBundled/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -101,7 +100,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -112,7 +110,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -125,7 +122,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -155,8 +151,8 @@ "ctxt": 0 }, "value": "items", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -186,7 +182,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -238,7 +233,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -249,7 +243,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -262,7 +255,6 @@ "ctxt": 0 }, "value": "items", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsInterfaces/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsInterfaces/input.ts.json index a1dbc32b45e1..973276ca5d6f 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsInterfaces/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsInterfaces/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -67,7 +66,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -97,7 +95,6 @@ "ctxt": 0 }, "value": "cat", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -149,7 +146,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -176,7 +172,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -197,7 +192,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -230,7 +224,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -267,7 +260,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -287,7 +279,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -313,7 +304,6 @@ "ctxt": 0 }, "value": "optionalField", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -342,7 +332,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -366,7 +355,6 @@ "ctxt": 0 }, "value": "readonlyField", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -403,7 +391,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -423,7 +410,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -449,7 +435,6 @@ "ctxt": 0 }, "value": "readonlyOptionalField", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -478,7 +463,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -529,6 +513,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -551,13 +536,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -582,7 +565,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -606,6 +588,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -628,13 +611,11 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -667,7 +648,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -687,7 +667,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -718,7 +697,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -770,6 +748,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -792,13 +771,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -823,7 +800,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -847,6 +823,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -869,13 +846,11 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -908,7 +883,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -928,7 +902,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -959,7 +932,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -984,7 +956,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1030,7 +1001,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1063,7 +1033,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1077,6 +1046,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1107,7 +1077,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1127,15 +1096,13 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } ], "typeAnn": { @@ -1168,7 +1135,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1208,7 +1174,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1233,7 +1198,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1247,6 +1211,7 @@ "ctxt": 0 }, "value": "a", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1263,8 +1228,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnn": { @@ -1302,7 +1266,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1328,8 +1291,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1393,7 +1356,6 @@ "ctxt": 0 }, "value": "optMethod", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1437,7 +1399,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1476,7 +1437,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1501,7 +1461,6 @@ "ctxt": 0 }, "value": "HH", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1540,7 +1499,6 @@ "ctxt": 0 }, "value": "HH", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1551,7 +1509,6 @@ "ctxt": 0 }, "value": "H", - "typeAnnotation": null, "optional": false } } @@ -1582,7 +1539,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1622,7 +1578,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1633,7 +1588,6 @@ "ctxt": 0 }, "value": "II", - "typeAnnotation": null, "optional": false } } @@ -1665,7 +1619,6 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false }, "exported": { @@ -1676,7 +1629,6 @@ "ctxt": 0 }, "value": "JJ", - "typeAnnotation": null, "optional": false } } @@ -1707,7 +1659,6 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1746,7 +1697,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1767,7 +1717,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1787,7 +1736,6 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1817,7 +1765,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1869,7 +1816,6 @@ "ctxt": 0 }, "value": "L", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1890,7 +1836,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1920,7 +1865,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1972,7 +1916,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1999,7 +1942,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2032,7 +1974,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2061,7 +2002,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2095,7 +2035,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2122,7 +2061,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2146,7 +2084,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -2172,7 +2109,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2205,7 +2141,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2234,7 +2169,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2268,7 +2202,6 @@ "ctxt": 0 }, "value": "O", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2293,6 +2226,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2309,8 +2243,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2363,7 +2296,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2384,7 +2316,6 @@ "ctxt": 0 }, "value": "O", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2423,7 +2354,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2444,7 +2374,6 @@ "ctxt": 0 }, "value": "O", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2469,6 +2398,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2485,8 +2415,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2552,7 +2481,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2573,7 +2501,6 @@ "ctxt": 0 }, "value": "O", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2598,6 +2525,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2614,8 +2542,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2681,7 +2608,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2702,7 +2628,6 @@ "ctxt": 0 }, "value": "O", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2727,6 +2652,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2743,8 +2669,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2795,6 +2720,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2811,8 +2737,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2865,7 +2790,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2890,6 +2814,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2906,8 +2831,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2960,7 +2884,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2981,7 +2904,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3020,7 +2942,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3041,7 +2962,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3066,6 +2986,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3082,8 +3003,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3136,7 +3056,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3157,7 +3076,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3182,6 +3100,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3198,8 +3117,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3265,7 +3183,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3286,7 +3203,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3311,6 +3227,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3327,8 +3244,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3366,6 +3282,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3382,8 +3299,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3449,7 +3365,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3474,6 +3389,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3490,8 +3406,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3525,7 +3440,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3572,6 +3486,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3588,8 +3503,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3623,7 +3537,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3665,7 +3578,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3727,7 +3639,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3748,7 +3659,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3787,7 +3697,6 @@ "ctxt": 0 }, "value": "AA", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3808,7 +3717,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3833,6 +3741,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3849,8 +3758,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3884,7 +3792,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3926,7 +3833,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3988,7 +3894,6 @@ "ctxt": 0 }, "value": "BB", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4009,7 +3914,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -4034,6 +3938,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4050,8 +3955,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4085,7 +3989,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4135,7 +4038,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4205,7 +4107,6 @@ "ctxt": 0 }, "value": "CC", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4226,7 +4127,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -4251,6 +4151,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4267,8 +4168,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4302,7 +4202,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4344,7 +4243,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4391,6 +4289,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4407,8 +4306,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4442,7 +4340,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4492,7 +4389,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsJSDocRedirectedLookups/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsJSDocRedirectedLookups/input.ts.json index c9565757d2b9..9a1324c8332d 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsJSDocRedirectedLookups/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsJSDocRedirectedLookups/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -77,8 +77,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -118,8 +118,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -159,8 +159,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -170,7 +170,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -202,8 +201,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -213,7 +212,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -245,8 +243,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NullLiteral", @@ -285,8 +283,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -348,8 +346,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -411,8 +409,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -452,8 +450,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -477,7 +475,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "property": { @@ -488,7 +485,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "computed": false @@ -538,8 +534,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -559,7 +555,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -608,8 +603,8 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -649,8 +644,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -690,8 +685,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -731,8 +726,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -772,8 +767,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -813,8 +808,8 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -824,7 +819,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsMissingGenerics/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsMissingGenerics/input.ts.json index aa45fb6df1b1..229ec5c1af6c 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsMissingGenerics/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsMissingGenerics/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -72,7 +71,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -93,8 +91,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsMissingTypeParameters/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsMissingTypeParameters/input.ts.json index 1cc53333413c..2c90e60f43e3 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsMissingTypeParameters/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsMissingTypeParameters/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -72,7 +71,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -93,8 +91,8 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -138,7 +136,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -190,7 +187,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsModuleReferenceHasEmit/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsModuleReferenceHasEmit/input.ts.json index d7407852bb67..23f6e6a670a5 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsModuleReferenceHasEmit/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsModuleReferenceHasEmit/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -65,8 +64,8 @@ "ctxt": 0 }, "value": "el", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NullLiteral", @@ -96,7 +95,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsMultipleExportFromMerge/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsMultipleExportFromMerge/input.ts.json index d16c1e3b2184..5e7e146f6873 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsMultipleExportFromMerge/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsMultipleExportFromMerge/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -87,8 +87,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -136,8 +136,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -176,7 +176,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "exported": null @@ -196,7 +195,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "exported": null @@ -216,7 +214,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "exported": null @@ -262,7 +259,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "exported": null @@ -308,7 +304,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "exported": null @@ -328,7 +323,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "exported": null @@ -374,7 +368,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "exported": null @@ -394,7 +387,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "exported": null @@ -440,7 +432,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "exported": { @@ -451,7 +442,6 @@ "ctxt": 0 }, "value": "aa", - "typeAnnotation": null, "optional": false } } @@ -496,7 +486,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "exported": { @@ -507,7 +496,6 @@ "ctxt": 0 }, "value": "bb", - "typeAnnotation": null, "optional": false } } @@ -552,7 +540,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "exported": null @@ -598,7 +585,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "exported": { @@ -609,7 +595,6 @@ "ctxt": 0 }, "value": "cc", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsNestedParams/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsNestedParams/input.ts.json index 124ac0bca2a3..1b302be8abcf 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsNestedParams/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsNestedParams/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "cancel", - "typeAnnotation": null, "optional": false }, "function": { @@ -78,7 +76,6 @@ "ctxt": 0 }, "value": "reason", - "typeAnnotation": null, "optional": false }, "value": null @@ -98,7 +95,6 @@ "ctxt": 0 }, "value": "code", - "typeAnnotation": null, "optional": false }, "value": null @@ -152,7 +148,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -178,7 +173,6 @@ "ctxt": 0 }, "value": "cancel", - "typeAnnotation": null, "optional": false }, "function": { @@ -214,7 +208,6 @@ "ctxt": 0 }, "value": "reason", - "typeAnnotation": null, "optional": false }, "value": null @@ -234,7 +227,6 @@ "ctxt": 0 }, "value": "suberr", - "typeAnnotation": null, "optional": false }, "value": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsOptionalTypeLiteralProps1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsOptionalTypeLiteralProps1/input.ts.json index bf4e2894a2e0..343c2b514a33 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsOptionalTypeLiteralProps1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsOptionalTypeLiteralProps1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,7 +51,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -92,7 +89,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null @@ -148,7 +144,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -159,7 +154,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -171,7 +165,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsOptionalTypeLiteralProps2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsOptionalTypeLiteralProps2/input.ts.json index 26c04d2974e7..ee272f1ce20b 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsOptionalTypeLiteralProps2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsOptionalTypeLiteralProps2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,7 +51,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -92,7 +89,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null @@ -148,7 +144,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -212,7 +206,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsParameterTagReusesInputNodeInEmit1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsParameterTagReusesInputNodeInEmit1/input.ts.json index 1725014917af..16e725070afe 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsParameterTagReusesInputNodeInEmit1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsParameterTagReusesInputNodeInEmit1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -90,8 +88,8 @@ "ctxt": 0 }, "value": "BaseFactory", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -131,7 +129,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -179,7 +176,6 @@ "ctxt": 0 }, "value": "BaseFactory", - "typeAnnotation": null, "optional": false }, "property": { @@ -190,7 +186,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "computed": false @@ -203,7 +198,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false } } @@ -238,7 +232,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -249,7 +242,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -262,7 +254,6 @@ "ctxt": 0 }, "value": "BaseFactory", - "typeAnnotation": null, "optional": false } } @@ -292,8 +283,8 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -311,8 +302,8 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -338,7 +329,6 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsParameterTagReusesInputNodeInEmit2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsParameterTagReusesInputNodeInEmit2/input.ts.json index d7ad4574cd71..92eb5b5af9eb 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsParameterTagReusesInputNodeInEmit2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsParameterTagReusesInputNodeInEmit2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -90,8 +88,8 @@ "ctxt": 0 }, "value": "BaseFactory", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -131,7 +129,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -179,7 +176,6 @@ "ctxt": 0 }, "value": "BaseFactory", - "typeAnnotation": null, "optional": false }, "property": { @@ -190,7 +186,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "computed": false @@ -203,7 +198,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false } } @@ -238,7 +232,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -249,7 +242,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -262,7 +254,6 @@ "ctxt": 0 }, "value": "BaseFactory", - "typeAnnotation": null, "optional": false } } @@ -292,8 +283,8 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -311,8 +302,8 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -338,7 +329,6 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsReexportAliases/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsReexportAliases/input.ts.json index d565236227af..6297ad0c2971 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsReexportAliases/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsReexportAliases/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "span": { @@ -63,7 +62,6 @@ "ctxt": 0 }, "value": "Fooa", - "typeAnnotation": null, "optional": false }, "imported": { @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false } } @@ -128,8 +125,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -146,7 +143,6 @@ "ctxt": 0 }, "value": "Fooa", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -180,7 +176,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "exported": { @@ -191,7 +186,6 @@ "ctxt": 0 }, "value": "Foob", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsReexportAliasesEsModuleInterop/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsReexportAliasesEsModuleInterop/input.ts.json index f9182f6dbdf5..f51b52789d23 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsReexportAliasesEsModuleInterop/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsReexportAliasesEsModuleInterop/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -63,7 +62,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -87,7 +84,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } } @@ -115,7 +111,6 @@ "ctxt": 0 }, "value": "Fooa", - "typeAnnotation": null, "optional": false }, "imported": { @@ -126,7 +121,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false } } @@ -180,8 +174,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -198,7 +192,6 @@ "ctxt": 0 }, "value": "Fooa", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -232,7 +225,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "exported": { @@ -243,7 +235,6 @@ "ctxt": 0 }, "value": "Foob", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsReexportedCjsAlias/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsReexportedCjsAlias/input.ts.json index 41703e88ca87..79d7161503b5 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsReexportedCjsAlias/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsReexportedCjsAlias/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -79,7 +78,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -112,7 +109,6 @@ "ctxt": 0 }, "value": "SomeClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -138,7 +134,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -224,7 +219,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -235,7 +229,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -256,7 +249,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, { @@ -267,7 +259,6 @@ "ctxt": 0 }, "value": "SomeClass", - "typeAnnotation": null, "optional": false } ] @@ -314,7 +305,6 @@ "ctxt": 0 }, "value": "SomeClass", - "typeAnnotation": null, "optional": false }, "value": null @@ -329,7 +319,6 @@ "ctxt": 0 }, "value": "SomeClass", - "typeAnnotation": null, "optional": false }, "value": { @@ -340,8 +329,8 @@ "ctxt": 0 }, "value": "Another", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -363,7 +352,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -421,7 +409,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -432,7 +419,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -453,7 +439,6 @@ "ctxt": 0 }, "value": "SomeClass", - "typeAnnotation": null, "optional": false }, { @@ -464,7 +449,6 @@ "ctxt": 0 }, "value": "Another", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsReferenceToClassInstanceCrossFile/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsReferenceToClassInstanceCrossFile/input.ts.json index 45cc6664d538..91bb4dd15f63 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsReferenceToClassInstanceCrossFile/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsReferenceToClassInstanceCrossFile/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Rectangle", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -83,7 +81,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -94,7 +91,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -163,7 +159,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -195,7 +189,6 @@ "ctxt": 0 }, "value": "Rectangle", - "typeAnnotation": null, "optional": false } ] @@ -242,7 +235,6 @@ "ctxt": 0 }, "value": "Rectangle", - "typeAnnotation": null, "optional": false }, "value": null @@ -266,7 +258,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -304,7 +295,6 @@ "ctxt": 0 }, "value": "Render", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -330,7 +320,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -380,7 +369,6 @@ "ctxt": 0 }, "value": "objects", - "typeAnnotation": null, "optional": false }, "computed": false @@ -416,7 +404,6 @@ "ctxt": 0 }, "value": "addRectangle", - "typeAnnotation": null, "optional": false }, "function": { @@ -460,8 +447,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -478,7 +465,6 @@ "ctxt": 0 }, "value": "Rectangle", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -532,7 +518,6 @@ "ctxt": 0 }, "value": "objects", - "typeAnnotation": null, "optional": false }, "computed": false @@ -545,7 +530,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -561,7 +545,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -584,7 +567,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -638,7 +620,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -649,7 +630,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -670,7 +650,6 @@ "ctxt": 0 }, "value": "Render", - "typeAnnotation": null, "optional": false } ] @@ -717,7 +696,6 @@ "ctxt": 0 }, "value": "Render", - "typeAnnotation": null, "optional": false }, "value": null @@ -741,7 +719,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -794,8 +771,8 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -812,7 +789,6 @@ "ctxt": 0 }, "value": "Render", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -851,7 +827,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "property": { @@ -862,7 +837,6 @@ "ctxt": 0 }, "value": "addRectangle", - "typeAnnotation": null, "optional": false }, "computed": false @@ -900,7 +874,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -911,7 +884,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -951,7 +923,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "property": { @@ -962,7 +933,6 @@ "ctxt": 0 }, "value": "objects", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsRestArgsWithThisTypeInJSDocFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsRestArgsWithThisTypeInJSDocFunction/input.ts.json index f60ceb01ed6e..a67b2ea3c862 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsRestArgsWithThisTypeInJSDocFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsRestArgsWithThisTypeInJSDocFunction/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Clazz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -70,8 +68,8 @@ "ctxt": 0 }, "value": "functionDeclaration", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsReusesExistingNodesMappingJSDocTypes/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsReusesExistingNodesMappingJSDocTypes/input.ts.json index 2d26f9c3ef25..e8f6cb790157 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsReusesExistingNodesMappingJSDocTypes/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsReusesExistingNodesMappingJSDocTypes/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NullLiteral", @@ -86,8 +86,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NullLiteral", @@ -134,8 +134,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NullLiteral", @@ -182,8 +182,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NullLiteral", @@ -230,8 +230,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NullLiteral", @@ -278,8 +278,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NullLiteral", @@ -326,8 +326,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NullLiteral", @@ -374,8 +374,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NullLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsSubclassWithExplicitNoArgumentConstructor/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsSubclassWithExplicitNoArgumentConstructor/input.ts.json index 2f22ac301c4d..302747707d08 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsSubclassWithExplicitNoArgumentConstructor/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsSubclassWithExplicitNoArgumentConstructor/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Super", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -69,8 +67,8 @@ "ctxt": 0 }, "value": "firstArg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -89,8 +87,8 @@ "ctxt": 0 }, "value": "secondArg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -131,7 +129,6 @@ "ctxt": 0 }, "value": "Sub", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -157,7 +154,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -244,7 +240,6 @@ "ctxt": 0 }, "value": "Super", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsThisTypes/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsThisTypes/input.ts.json index 8738928282c7..270ce738954b 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsThisTypes/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsThisTypes/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -122,7 +120,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "span": { @@ -147,7 +144,6 @@ "ctxt": 0 }, "value": "verify", - "typeAnnotation": null, "optional": false }, "function": { @@ -187,7 +183,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeAliases/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeAliases/input.ts.json index 4a2915bf3573..b7d6c2686e76 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeAliases/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeAliases/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "doTheThing", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,8 +48,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -93,7 +92,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -126,7 +124,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -151,7 +148,6 @@ "ctxt": 0 }, "value": "ExportedThing", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -177,7 +173,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -242,7 +237,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -253,7 +247,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -274,7 +267,6 @@ "ctxt": 0 }, "value": "doTheThing", - "typeAnnotation": null, "optional": false }, { @@ -285,7 +277,6 @@ "ctxt": 0 }, "value": "ExportedThing", - "typeAnnotation": null, "optional": false } ] @@ -302,7 +293,6 @@ "ctxt": 0 }, "value": "LocalThing", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -328,7 +318,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeReassignmentFromDeclaration/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeReassignmentFromDeclaration/input.ts.json index 2d26e8c083bd..522b705ef21d 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeReassignmentFromDeclaration/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeReassignmentFromDeclaration/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -105,6 +103,7 @@ "ctxt": 0 }, "value": "items", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -134,14 +133,12 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -163,7 +160,6 @@ "ctxt": 0 }, "value": "items", - "typeAnnotation": null, "optional": false } }, @@ -192,8 +188,8 @@ "ctxt": 0 }, "value": "items", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -238,7 +234,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -249,7 +244,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -262,7 +256,6 @@ "ctxt": 0 }, "value": "items", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeReassignmentFromDeclaration2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeReassignmentFromDeclaration2/input.ts.json index 2c67bc212510..f8adecb07f3c 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeReassignmentFromDeclaration2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeReassignmentFromDeclaration2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "getItems", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -157,7 +153,6 @@ "ctxt": 0 }, "value": "getItems", - "typeAnnotation": null, "optional": false } }, @@ -186,8 +181,8 @@ "ctxt": 0 }, "value": "items", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -211,7 +206,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -272,7 +266,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -283,7 +276,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -296,7 +288,6 @@ "ctxt": 0 }, "value": "items", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeReferences/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeReferences/input.ts.json index 2c1cf9c0fecf..39226823cd05 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeReferences/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeReferences/input.ts.json @@ -54,7 +54,6 @@ "ctxt": 0 }, "value": "Something", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,8 +99,8 @@ "ctxt": 0 }, "value": "Something", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -125,7 +124,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -157,7 +155,6 @@ "ctxt": 0 }, "value": "Something", - "typeAnnotation": null, "optional": false }, "computed": false @@ -191,8 +188,8 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -209,7 +206,6 @@ "ctxt": 0 }, "value": "Something", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -249,7 +245,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -260,7 +255,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -281,7 +275,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeReferences2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeReferences2/input.ts.json index 5349c2b15a83..a7ffc97965dc 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeReferences2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeReferences2/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -59,7 +59,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -82,7 +81,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": { @@ -142,7 +140,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -162,7 +159,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": null @@ -193,7 +189,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -225,7 +220,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "computed": false @@ -259,8 +253,8 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -278,7 +272,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -289,7 +282,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } }, @@ -327,7 +319,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -338,7 +329,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -359,7 +349,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeReferences3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeReferences3/input.ts.json index 806e88c1684d..3ea0a1082c18 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeReferences3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeReferences3/input.ts.json @@ -54,7 +54,6 @@ "ctxt": 0 }, "value": "Something", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,8 +99,8 @@ "ctxt": 0 }, "value": "Something", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -125,7 +124,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -157,7 +155,6 @@ "ctxt": 0 }, "value": "Something", - "typeAnnotation": null, "optional": false }, "computed": false @@ -203,7 +200,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -214,7 +210,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -227,7 +222,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -287,7 +281,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -298,7 +291,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -311,7 +303,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -324,7 +315,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -347,7 +337,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false }, "value": { @@ -365,7 +354,6 @@ "ctxt": 0 }, "value": "Something", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeReferences4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeReferences4/input.ts.json index 989e03343188..062b7ab87591 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeReferences4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypeReferences4/input.ts.json @@ -54,7 +54,6 @@ "ctxt": 0 }, "value": "Something", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -107,8 +106,8 @@ "ctxt": 0 }, "value": "Something", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -148,7 +147,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -183,7 +181,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "body": { @@ -219,8 +216,8 @@ "ctxt": 0 }, "value": "Something", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -244,7 +241,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -276,7 +272,6 @@ "ctxt": 0 }, "value": "Something", - "typeAnnotation": null, "optional": false }, "computed": false @@ -310,8 +305,8 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -328,7 +323,6 @@ "ctxt": 0 }, "value": "Something", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -361,7 +355,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false }, "exported": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypedefAndImportTypes/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypedefAndImportTypes/input.ts.json index 8f55bff3b483..9f5c74f251e7 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypedefAndImportTypes/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypedefAndImportTypes/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Conn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -73,7 +71,6 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, "optional": false }, "value": { @@ -111,7 +108,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -179,7 +175,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -203,7 +197,6 @@ "ctxt": 0 }, "value": "Conn", - "typeAnnotation": null, "optional": false } } @@ -218,7 +211,6 @@ "ctxt": 0 }, "value": "Wrap", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -244,7 +236,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -264,8 +255,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -315,7 +306,6 @@ "ctxt": 0 }, "value": "connItem", - "typeAnnotation": null, "optional": false }, "computed": false @@ -335,7 +325,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -346,7 +335,6 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, "optional": false }, "computed": false @@ -391,7 +379,6 @@ "ctxt": 0 }, "value": "another", - "typeAnnotation": null, "optional": false }, "computed": false @@ -454,7 +441,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -465,7 +451,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -486,7 +471,6 @@ "ctxt": 0 }, "value": "Wrap", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypedefPropertyAndExportAssignment/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypedefPropertyAndExportAssignment/input.ts.json index a69e3996154d..31127e1293f8 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypedefPropertyAndExportAssignment/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsTypedefPropertyAndExportAssignment/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "taskGroups", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "parseHTML", - "typeAnnotation": null, "optional": false }, "value": { @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": { @@ -101,7 +99,6 @@ "ctxt": 0 }, "value": "label", - "typeAnnotation": null, "optional": false }, "value": { @@ -132,7 +129,6 @@ "ctxt": 0 }, "value": "styleLayout", - "typeAnnotation": null, "optional": false }, "value": { @@ -153,7 +149,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": { @@ -181,7 +176,6 @@ "ctxt": 0 }, "value": "label", - "typeAnnotation": null, "optional": false }, "value": { @@ -233,8 +227,8 @@ "ctxt": 0 }, "value": "taskNameToGroup", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -279,7 +273,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -290,7 +283,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -311,7 +303,6 @@ "ctxt": 0 }, "value": "taskGroups", - "typeAnnotation": null, "optional": false }, { @@ -322,7 +313,6 @@ "ctxt": 0 }, "value": "taskNameToGroup", - "typeAnnotation": null, "optional": false } ] @@ -369,7 +359,6 @@ "ctxt": 0 }, "value": "taskGroups", - "typeAnnotation": null, "optional": false }, "value": null @@ -389,7 +378,6 @@ "ctxt": 0 }, "value": "taskNameToGroup", - "typeAnnotation": null, "optional": false }, "value": null @@ -413,7 +401,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -451,7 +438,6 @@ "ctxt": 0 }, "value": "MainThreadTasks", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -477,7 +463,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -497,8 +482,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -517,8 +502,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -571,7 +556,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -582,7 +566,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -595,7 +578,6 @@ "ctxt": 0 }, "value": "MainThreadTasks", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsUniqueSymbolUsage/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsUniqueSymbolUsage/input.ts.json index a90abe9966fa..e583951eb327 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsUniqueSymbolUsage/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/declarations/jsDeclarationsUniqueSymbolUsage/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "kSymbol", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -56,7 +56,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -102,7 +101,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -123,8 +121,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -157,7 +155,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/enumTag/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/enumTag/input.ts.json index 5cb22f97d3cb..f36e1b3cb697 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/enumTag/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/enumTag/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "Target", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "START", - "typeAnnotation": null, "optional": false }, "value": { @@ -80,7 +79,6 @@ "ctxt": 0 }, "value": "MIDDLE", - "typeAnnotation": null, "optional": false }, "value": { @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "END", - "typeAnnotation": null, "optional": false }, "value": { @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "MISTAKE", - "typeAnnotation": null, "optional": false }, "value": { @@ -159,7 +155,6 @@ "ctxt": 0 }, "value": "OK_I_GUESS", - "typeAnnotation": null, "optional": false }, "value": { @@ -203,8 +198,8 @@ "ctxt": 0 }, "value": "Second", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -224,7 +219,6 @@ "ctxt": 0 }, "value": "MISTAKE", - "typeAnnotation": null, "optional": false }, "value": { @@ -252,7 +246,6 @@ "ctxt": 0 }, "value": "OK", - "typeAnnotation": null, "optional": false }, "value": { @@ -275,7 +268,6 @@ "ctxt": 0 }, "value": "FINE", - "typeAnnotation": null, "optional": false }, "value": { @@ -319,8 +311,8 @@ "ctxt": 0 }, "value": "Fs", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -340,7 +332,6 @@ "ctxt": 0 }, "value": "ADD1", - "typeAnnotation": null, "optional": false }, "value": { @@ -359,8 +350,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -379,7 +370,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -408,7 +398,6 @@ "ctxt": 0 }, "value": "ID", - "typeAnnotation": null, "optional": false }, "value": { @@ -427,8 +416,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -439,7 +428,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -458,7 +446,6 @@ "ctxt": 0 }, "value": "SUB1", - "typeAnnotation": null, "optional": false }, "value": { @@ -477,8 +464,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -497,7 +484,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -532,7 +518,6 @@ "ctxt": 0 }, "value": "consume", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -553,8 +538,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -573,8 +558,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -593,8 +578,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -637,8 +622,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -648,7 +633,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "definite": false @@ -680,8 +664,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -691,7 +675,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "definite": false @@ -723,8 +706,8 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -734,7 +717,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "definite": false @@ -766,8 +748,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -784,7 +766,6 @@ "ctxt": 0 }, "value": "Target", - "typeAnnotation": null, "optional": false }, "property": { @@ -795,7 +776,6 @@ "ctxt": 0 }, "value": "START", - "typeAnnotation": null, "optional": false }, "computed": false @@ -827,8 +807,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -845,7 +825,6 @@ "ctxt": 0 }, "value": "Target", - "typeAnnotation": null, "optional": false }, "property": { @@ -856,7 +835,6 @@ "ctxt": 0 }, "value": "UNKNOWN", - "typeAnnotation": null, "optional": false }, "computed": false @@ -886,8 +864,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -904,7 +882,6 @@ "ctxt": 0 }, "value": "Second", - "typeAnnotation": null, "optional": false }, "property": { @@ -915,7 +892,6 @@ "ctxt": 0 }, "value": "MISTAKE", - "typeAnnotation": null, "optional": false }, "computed": false @@ -945,8 +921,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -981,7 +957,6 @@ "ctxt": 0 }, "value": "ff", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1002,8 +977,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1051,7 +1026,6 @@ "ctxt": 0 }, "value": "Target", - "typeAnnotation": null, "optional": false }, "property": { @@ -1062,7 +1036,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1124,7 +1097,6 @@ "ctxt": 0 }, "value": "Target", - "typeAnnotation": null, "optional": false }, "property": { @@ -1135,7 +1107,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": true diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/enumTagCircularReference/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/enumTagCircularReference/input.ts.json index 4a5e65fad8d2..597c22a63fa4 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/enumTagCircularReference/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/enumTagCircularReference/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/enumTagImported/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/enumTagImported/input.ts.json index 7f0f9e329427..7ffab3c267f5 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/enumTagImported/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/enumTagImported/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -77,8 +77,8 @@ "ctxt": 0 }, "value": "tost", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -121,7 +121,6 @@ "ctxt": 0 }, "value": "TestEnum", - "typeAnnotation": null, "optional": false }, "imported": null @@ -169,8 +168,8 @@ "ctxt": 0 }, "value": "tist", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -187,7 +186,6 @@ "ctxt": 0 }, "value": "TestEnum", - "typeAnnotation": null, "optional": false }, "property": { @@ -198,7 +196,6 @@ "ctxt": 0 }, "value": "ADD", - "typeAnnotation": null, "optional": false }, "computed": false @@ -239,8 +236,8 @@ "ctxt": 0 }, "value": "TestEnum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -260,7 +257,6 @@ "ctxt": 0 }, "value": "ADD", - "typeAnnotation": null, "optional": false }, "value": { @@ -288,7 +284,6 @@ "ctxt": 0 }, "value": "REMOVE", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/enumTagOnExports/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/enumTagOnExports/input.ts.json index 4f34bbbe1b11..f60c04da43ad 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/enumTagOnExports/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/enumTagOnExports/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -100,7 +98,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -111,7 +108,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -124,7 +120,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/enumTagOnExports2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/enumTagOnExports2/input.ts.json index 42b58189928f..a8efe28788fc 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/enumTagOnExports2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/enumTagOnExports2/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/enumTagUseBeforeDefCrash/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/enumTagUseBeforeDefCrash/input.ts.json index 2d5353a431e6..637fde15b78f 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/enumTagUseBeforeDefCrash/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/enumTagUseBeforeDefCrash/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/exportedAliasedEnumTag/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/exportedAliasedEnumTag/input.ts.json index 27468fc7ef32..5509194b6d89 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/exportedAliasedEnumTag/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/exportedAliasedEnumTag/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "middlewarify", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AssignmentExpression", @@ -57,7 +57,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -68,7 +67,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -117,7 +115,6 @@ "ctxt": 0 }, "value": "middlewarify", - "typeAnnotation": null, "optional": false }, "property": { @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "Type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -151,7 +147,6 @@ "ctxt": 0 }, "value": "BEFORE", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/exportedEnumTypeAndValue/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/exportedEnumTypeAndValue/input.ts.json index dd8cb9cd7d1d..76cdaf3a9bff 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/exportedEnumTypeAndValue/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/exportedEnumTypeAndValue/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "MyEnum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -75,7 +74,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -109,7 +107,6 @@ "ctxt": 0 }, "value": "MyEnum", - "typeAnnotation": null, "optional": false } }, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "MyEnum", - "typeAnnotation": null, "optional": false } } @@ -183,8 +179,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -201,7 +197,6 @@ "ctxt": 0 }, "value": "MyEnum", - "typeAnnotation": null, "optional": false }, "property": { @@ -212,7 +207,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/extendsTag1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/extendsTag1/input.ts.json index 94eec81c6f63..099cefa8781d 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/extendsTag1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/extendsTag1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "My", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -35,7 +34,6 @@ "ctxt": 0 }, "value": "Set", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/extendsTag2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/extendsTag2/input.ts.json index 6c1fdfd2bf45..cb65a065cad1 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/extendsTag2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/extendsTag2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -75,7 +73,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -101,7 +98,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -153,7 +149,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/extendsTag3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/extendsTag3/input.ts.json index 8e091c02209a..8d0ce43ad18d 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/extendsTag3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/extendsTag3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -75,7 +73,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -101,7 +98,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -153,7 +149,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/extendsTag4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/extendsTag4/input.ts.json index ebb01726524b..3ceca5985e7e 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/extendsTag4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/extendsTag4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/extendsTagEmit/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/extendsTagEmit/input.ts.json index 8fe18b2fce19..918035e1c777 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/extendsTagEmit/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/extendsTagEmit/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "imported": null @@ -97,7 +95,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/instantiateTemplateTagTypeParameterOnVariableStatement/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/instantiateTemplateTagTypeParameterOnVariableStatement/input.ts.json index 4608f97ed47b..22e280bc1821 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/instantiateTemplateTagTypeParameterOnVariableStatement/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/instantiateTemplateTagTypeParameterOnVariableStatement/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "seq", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -70,8 +70,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -82,7 +82,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "async": false, @@ -124,8 +123,8 @@ "ctxt": 0 }, "value": "text1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -170,8 +169,8 @@ "ctxt": 0 }, "value": "text2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -216,8 +215,8 @@ "ctxt": 0 }, "value": "text3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -241,7 +240,6 @@ "ctxt": 0 }, "value": "seq", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -255,7 +253,6 @@ "ctxt": 0 }, "value": "text1", - "typeAnnotation": null, "optional": false } } @@ -273,7 +270,6 @@ "ctxt": 0 }, "value": "text2", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAccessibilityTags/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAccessibilityTags/input.ts.json index 0b2a53d8d058..384a21c78e99 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAccessibilityTags/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAccessibilityTags/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "priv", - "typeAnnotation": null, "optional": false }, "value": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "prot", - "typeAnnotation": null, "optional": false }, "value": { @@ -118,7 +115,6 @@ "ctxt": 0 }, "value": "pub", - "typeAnnotation": null, "optional": false }, "value": { @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "ack", - "typeAnnotation": null, "optional": false }, "function": { @@ -205,7 +200,6 @@ "ctxt": 0 }, "value": "priv", - "typeAnnotation": null, "optional": false }, "computed": false @@ -239,7 +233,6 @@ "ctxt": 0 }, "value": "ack", - "typeAnnotation": null, "optional": false }, "function": { @@ -260,8 +253,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -308,7 +301,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -334,7 +326,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -384,7 +375,6 @@ "ctxt": 0 }, "value": "priv2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -438,7 +428,6 @@ "ctxt": 0 }, "value": "prot2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -492,7 +481,6 @@ "ctxt": 0 }, "value": "pub2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -528,7 +516,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "function": { @@ -577,7 +564,6 @@ "ctxt": 0 }, "value": "priv2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -613,7 +599,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -639,7 +624,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -704,7 +688,6 @@ "ctxt": 0 }, "value": "priv", - "typeAnnotation": null, "optional": false }, "computed": false @@ -732,7 +715,6 @@ "ctxt": 0 }, "value": "prot", - "typeAnnotation": null, "optional": false }, "computed": false @@ -761,7 +743,6 @@ "ctxt": 0 }, "value": "pub", - "typeAnnotation": null, "optional": false }, "computed": false @@ -790,7 +771,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -808,7 +788,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -834,7 +813,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "function": { @@ -899,7 +877,6 @@ "ctxt": 0 }, "value": "priv2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -927,7 +904,6 @@ "ctxt": 0 }, "value": "prot2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -956,7 +932,6 @@ "ctxt": 0 }, "value": "pub2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -985,7 +960,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1038,7 +1012,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1052,7 +1025,6 @@ "ctxt": 0 }, "value": "priv", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1079,7 +1051,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1093,7 +1064,6 @@ "ctxt": 0 }, "value": "prot", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1121,7 +1091,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1135,7 +1104,6 @@ "ctxt": 0 }, "value": "pub", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1187,7 +1155,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1201,7 +1168,6 @@ "ctxt": 0 }, "value": "priv", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1228,7 +1194,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1242,7 +1207,6 @@ "ctxt": 0 }, "value": "prot", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1270,7 +1234,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1284,7 +1247,6 @@ "ctxt": 0 }, "value": "pub", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1336,7 +1298,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1350,7 +1311,6 @@ "ctxt": 0 }, "value": "priv2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1377,7 +1337,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1391,7 +1350,6 @@ "ctxt": 0 }, "value": "prot2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1419,7 +1377,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1433,7 +1390,6 @@ "ctxt": 0 }, "value": "pub2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1485,7 +1441,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1499,7 +1454,6 @@ "ctxt": 0 }, "value": "priv2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1526,7 +1480,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1540,7 +1493,6 @@ "ctxt": 0 }, "value": "prot2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1568,7 +1520,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1582,7 +1533,6 @@ "ctxt": 0 }, "value": "pub2", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAccessibilityTagsDeclarations/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAccessibilityTagsDeclarations/input.ts.json index ac3cb6fe4126..bd180820554f 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAccessibilityTagsDeclarations/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAccessibilityTagsDeclarations/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Protected", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,8 +60,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -113,7 +111,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -126,7 +123,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -151,7 +147,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -200,7 +195,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -234,7 +228,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "function": { @@ -283,7 +276,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -317,7 +309,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "function": { @@ -338,8 +329,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -395,7 +386,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -408,7 +398,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -443,7 +432,6 @@ "ctxt": 0 }, "value": "Private", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -469,7 +457,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -489,8 +476,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -540,7 +527,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -553,7 +539,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -578,7 +563,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -627,7 +611,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -661,7 +644,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "function": { @@ -710,7 +692,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -744,7 +725,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "function": { @@ -765,8 +745,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -822,7 +802,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -835,7 +814,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -870,7 +848,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -896,7 +873,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -916,8 +892,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -936,8 +912,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -956,8 +932,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugmentsMissingType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugmentsMissingType/input.ts.json index e46cc56a9dab..6f916cade8d2 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugmentsMissingType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugmentsMissingType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -130,7 +127,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -205,7 +200,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -233,7 +227,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugments_errorInExtendsExpression/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugments_errorInExtendsExpression/input.ts.json index afd8885578b8..6630a408be57 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugments_errorInExtendsExpression/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugments_errorInExtendsExpression/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "err", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugments_nameMismatch/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugments_nameMismatch/input.ts.json index 5d9be69ca81f..bbe3f83b2035 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugments_nameMismatch/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugments_nameMismatch/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -89,7 +86,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugments_noExtends/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugments_noExtends/input.ts.json index 84f913d89dac..d1f91a1d77f2 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugments_noExtends/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugments_noExtends/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -130,7 +127,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -205,7 +200,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugments_notAClass/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugments_notAClass/input.ts.json index a7509c49ed64..9b9eeeff9f02 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugments_notAClass/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugments_notAClass/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugments_qualifiedName/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugments_qualifiedName/input.ts.json index 6b966e22aa5c..3abb349aa9ba 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugments_qualifiedName/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugments_qualifiedName/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugments_withTypeParameter/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugments_withTypeParameter/input.ts.json index 0add6d87849a..f0dbf83b9091 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugments_withTypeParameter/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocAugments_withTypeParameter/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -157,7 +152,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -206,7 +200,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -234,7 +227,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocBindingInUnreachableCode/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocBindingInUnreachableCode/input.ts.json index d1e00e3cda3f..4c16dd927e61 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocBindingInUnreachableCode/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocBindingInUnreachableCode/input.ts.json @@ -55,8 +55,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -78,8 +78,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocFunctionType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocFunctionType/input.ts.json index 447b8eaf68d6..8c64a2468669 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocFunctionType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocFunctionType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "id1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -107,8 +105,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -125,7 +123,6 @@ "ctxt": 0 }, "value": "id1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -151,8 +148,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -208,7 +205,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -221,7 +217,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -251,7 +246,6 @@ "ctxt": 0 }, "value": "id2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -272,8 +266,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -306,7 +300,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -327,7 +320,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -353,7 +345,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -373,8 +364,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -424,7 +415,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -437,7 +427,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -479,8 +468,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -497,7 +486,6 @@ "ctxt": 0 }, "value": "id2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -511,7 +499,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } @@ -547,8 +534,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -565,7 +552,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -610,7 +596,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "property": { @@ -621,7 +606,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -652,8 +636,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -675,8 +659,8 @@ "ctxt": 0 }, "value": "ab", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -695,8 +679,8 @@ "ctxt": 0 }, "value": "onetwo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -744,7 +728,6 @@ "ctxt": 0 }, "value": "ab", - "typeAnnotation": null, "optional": false }, "right": { @@ -803,7 +786,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -824,8 +806,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -881,7 +863,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -894,7 +875,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -931,8 +911,8 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -949,7 +929,6 @@ "ctxt": 0 }, "value": "id2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -963,7 +942,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false } } @@ -999,8 +977,8 @@ "ctxt": 0 }, "value": "z2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1017,7 +995,6 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1062,7 +1039,6 @@ "ctxt": 0 }, "value": "z2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1073,7 +1049,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1104,8 +1079,8 @@ "ctxt": 0 }, "value": "construct", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -1127,8 +1102,8 @@ "ctxt": 0 }, "value": "dref", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1168,7 +1143,6 @@ "ctxt": 0 }, "value": "dref", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1224,8 +1198,8 @@ "ctxt": 0 }, "value": "z3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1242,7 +1216,6 @@ "ctxt": 0 }, "value": "construct", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1256,7 +1229,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false } } @@ -1289,7 +1261,6 @@ "ctxt": 0 }, "value": "z3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1300,7 +1271,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1331,8 +1301,8 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -1354,8 +1324,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1411,7 +1381,6 @@ "ctxt": 0 }, "value": "not_length_on_purpose", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1424,7 +1393,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -1465,8 +1433,8 @@ "ctxt": 0 }, "value": "y3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1483,7 +1451,6 @@ "ctxt": 0 }, "value": "id2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1497,7 +1464,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false } } @@ -1518,7 +1484,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1551,8 +1516,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1587,7 +1552,6 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, "optional": false } } @@ -1620,7 +1584,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1684,7 +1647,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocFunction_missingReturn/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocFunction_missingReturn/input.ts.json index a95c157f1520..fed4a14580d0 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocFunction_missingReturn/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocFunction_missingReturn/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_class/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_class/input.ts.json index adcfd84c78c9..6dd6902f9417 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_class/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_class/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -83,7 +81,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -120,7 +117,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -212,7 +207,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -238,7 +232,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -309,7 +302,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -351,8 +343,8 @@ "ctxt": 0 }, "value": "Ns", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -397,7 +389,6 @@ "ctxt": 0 }, "value": "Ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -408,7 +399,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -438,7 +428,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -521,8 +510,8 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ClassExpression", @@ -549,7 +538,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -634,8 +622,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -655,7 +643,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "value": { @@ -683,7 +670,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -756,7 +742,6 @@ "ctxt": 0 }, "value": "CC", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -782,7 +767,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "value": { @@ -810,7 +794,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -909,8 +892,8 @@ "ctxt": 0 }, "value": "C5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -947,7 +930,6 @@ "ctxt": 0 }, "value": "Ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -958,7 +940,6 @@ "ctxt": 0 }, "value": "C5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -979,7 +960,6 @@ "ctxt": 0 }, "value": "C5", - "typeAnnotation": null, "optional": false }, "right": { @@ -1007,7 +987,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_interface/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_interface/input.ts.json index cb60e9890d91..20a6c4ad83a1 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_interface/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_interface/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "mNumber", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -89,7 +87,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -115,7 +112,6 @@ "ctxt": 0 }, "value": "mNumber", - "typeAnnotation": null, "optional": false }, "function": { @@ -181,7 +177,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -207,7 +202,6 @@ "ctxt": 0 }, "value": "mNumber", - "typeAnnotation": null, "optional": false }, "function": { @@ -278,7 +272,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_interface_multiple/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_interface_multiple/input.ts.json index f561ad957857..eae666a06dc6 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_interface_multiple/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_interface_multiple/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Drawable", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "draw", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "Sizable", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -124,7 +121,6 @@ "ctxt": 0 }, "value": "size", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -162,7 +158,6 @@ "ctxt": 0 }, "value": "Square", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -188,7 +183,6 @@ "ctxt": 0 }, "value": "draw", - "typeAnnotation": null, "optional": false }, "function": { @@ -252,7 +246,6 @@ "ctxt": 0 }, "value": "size", - "typeAnnotation": null, "optional": false }, "function": { @@ -318,7 +311,6 @@ "ctxt": 0 }, "value": "BadSquare", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -344,7 +336,6 @@ "ctxt": 0 }, "value": "size", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_missingType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_missingType/input.ts.json index e9a920108d95..9baac615c5f3 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_missingType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_missingType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -130,7 +127,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_namespacedInterface/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_namespacedInterface/input.ts.json index e1815a51ff27..113f63cb2e4b 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_namespacedInterface/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_namespacedInterface/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "mNumber", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -122,7 +119,6 @@ "ctxt": 0 }, "value": "AT", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -149,7 +145,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -182,7 +177,6 @@ "ctxt": 0 }, "value": "gen", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -210,7 +204,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -234,7 +227,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -260,7 +252,6 @@ "ctxt": 0 }, "value": "mNumber", - "typeAnnotation": null, "optional": false }, "function": { @@ -326,7 +317,6 @@ "ctxt": 0 }, "value": "BAT", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -352,7 +342,6 @@ "ctxt": 0 }, "value": "gen", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_properties/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_properties/input.ts.json index 2750dee302de..0b6b638ad38c 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_properties/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_properties/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -130,7 +127,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -157,7 +153,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -183,7 +178,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -223,7 +217,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -249,7 +242,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -299,7 +291,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_signatures/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_signatures/input.ts.json index 4438bec54ad5..8ba99c0e1e9a 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_signatures/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImplements_signatures/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Sig", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "index", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -103,7 +102,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImportType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImportType/input.ts.json index 22c359735f03..763609fdf75d 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImportType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImportType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -111,6 +110,7 @@ "ctxt": 0 }, "value": "exports", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -127,8 +127,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -160,6 +159,7 @@ "ctxt": 0 }, "value": "module", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -191,7 +191,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -219,8 +218,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -237,7 +235,6 @@ "ctxt": 0 }, "value": "Chunk", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -263,7 +260,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -313,7 +309,6 @@ "ctxt": 0 }, "value": "chunk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -371,7 +366,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -382,7 +376,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -395,7 +388,6 @@ "ctxt": 0 }, "value": "Chunk", - "typeAnnotation": null, "optional": false } } @@ -425,8 +417,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -455,7 +447,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -466,7 +457,6 @@ "ctxt": 0 }, "value": "chunk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -497,8 +487,8 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -515,7 +505,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -568,8 +557,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -598,7 +587,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -609,7 +597,6 @@ "ctxt": 0 }, "value": "chunk", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImportType2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImportType2/input.ts.json index cacab6caa9e2..a0655639ad0d 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImportType2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImportType2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -111,6 +110,7 @@ "ctxt": 0 }, "value": "exports", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -127,8 +127,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -160,6 +159,7 @@ "ctxt": 0 }, "value": "module", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -191,7 +191,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -219,8 +218,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -257,7 +255,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -268,7 +265,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -283,7 +279,6 @@ "ctxt": 0 }, "value": "Chunk", - "typeAnnotation": null, "optional": false }, "span": { @@ -308,7 +303,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -358,7 +352,6 @@ "ctxt": 0 }, "value": "chunk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -413,8 +406,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -443,7 +436,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -454,7 +446,6 @@ "ctxt": 0 }, "value": "chunk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -485,8 +476,8 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -503,7 +494,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -556,8 +546,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -586,7 +576,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -597,7 +586,6 @@ "ctxt": 0 }, "value": "chunk", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImportTypeReferenceToClassAlias/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImportTypeReferenceToClassAlias/input.ts.json index 1174be5877bf..ea159ec1742a 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImportTypeReferenceToClassAlias/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImportTypeReferenceToClassAlias/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "function": { @@ -117,7 +115,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -141,7 +137,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "computed": false @@ -154,7 +149,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } @@ -169,7 +163,6 @@ "ctxt": 0 }, "value": "demo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -190,8 +183,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -231,7 +224,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -242,7 +234,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImportTypeReferenceToCommonjsModule/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImportTypeReferenceToCommonjsModule/input.ts.json index 2cdc065ed7d1..f248bf626815 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImportTypeReferenceToCommonjsModule/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImportTypeReferenceToCommonjsModule/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "config", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "fix", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,8 +90,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -113,7 +112,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false } }, @@ -127,7 +125,6 @@ "ctxt": 0 }, "value": "demo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -148,8 +145,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -189,7 +186,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -200,7 +196,6 @@ "ctxt": 0 }, "value": "fix", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImportTypeReferenceToESModule/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImportTypeReferenceToESModule/input.ts.json index 6dab596506e0..b78c5e9aa319 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImportTypeReferenceToESModule/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImportTypeReferenceToESModule/input.ts.json @@ -38,6 +38,7 @@ "ctxt": 0 }, "value": "config", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,8 +55,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -73,7 +73,6 @@ "ctxt": 0 }, "value": "demo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,8 +93,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -135,7 +134,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -146,7 +144,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImportTypeReferenceToStringLiteral/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImportTypeReferenceToStringLiteral/input.ts.json index 821ec301bca5..9c3f6b1d078a 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImportTypeReferenceToStringLiteral/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocImportTypeReferenceToStringLiteral/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "FOO", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -85,8 +85,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocIndexSignature/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocIndexSignature/input.ts.json index e1b7c196d23c..1479ad99ad1d 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocIndexSignature/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocIndexSignature/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "o1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -64,8 +64,8 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -97,8 +97,8 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -115,7 +115,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -136,8 +135,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -185,7 +184,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -196,7 +194,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -242,7 +239,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -253,7 +249,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocLiteral/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocLiteral/input.ts.json index 5ff6c81ddaf2..39b26c48988b 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocLiteral/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocLiteral/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -57,8 +56,8 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -77,8 +76,8 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -97,8 +96,8 @@ "ctxt": 0 }, "value": "p4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -117,8 +116,8 @@ "ctxt": 0 }, "value": "p5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -191,7 +190,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "right": { @@ -202,7 +200,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false } }, @@ -214,7 +211,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false } }, @@ -226,7 +222,6 @@ "ctxt": 0 }, "value": "p4", - "typeAnnotation": null, "optional": false } }, @@ -238,7 +233,6 @@ "ctxt": 0 }, "value": "p5", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocNeverUndefinedNull/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocNeverUndefinedNull/input.ts.json index 829107a6ecc7..d82f8fd7a387 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocNeverUndefinedNull/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocNeverUndefinedNull/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -57,8 +56,8 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -77,8 +76,8 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParamTag2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParamTag2/input.ts.json index fe65b20fe1e2..a4b0fc0db398 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParamTag2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParamTag2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "good1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,7 +51,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -98,8 +95,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -133,7 +130,6 @@ "ctxt": 0 }, "value": "good2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -189,7 +184,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -230,7 +224,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null @@ -250,7 +243,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null @@ -291,7 +283,6 @@ "ctxt": 0 }, "value": "good3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -312,8 +303,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -347,7 +338,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -367,7 +357,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -393,8 +382,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -428,7 +417,6 @@ "ctxt": 0 }, "value": "good4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -464,7 +452,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -484,7 +471,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -525,7 +511,6 @@ "ctxt": 0 }, "value": "good5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -561,7 +546,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -581,7 +565,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -607,8 +590,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -642,7 +625,6 @@ "ctxt": 0 }, "value": "good6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -678,7 +660,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -698,7 +679,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -739,7 +719,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null @@ -759,7 +738,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null @@ -800,7 +778,6 @@ "ctxt": 0 }, "value": "good7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -821,8 +798,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -856,7 +833,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -876,7 +852,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -902,8 +877,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -937,7 +912,6 @@ "ctxt": 0 }, "value": "good8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -973,7 +947,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -993,7 +966,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -1034,7 +1006,6 @@ "ctxt": 0 }, "value": "bad1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1055,8 +1026,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1090,7 +1061,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -1110,7 +1080,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -1151,7 +1120,6 @@ "ctxt": 0 }, "value": "bad2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1172,8 +1140,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1207,7 +1175,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -1227,7 +1194,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParamTagTypeLiteral/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParamTagTypeLiteral/input.ts.json index 4c71b414f1ac..300fb2e9e2d9 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParamTagTypeLiteral/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParamTagTypeLiteral/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "normal", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "notSpecial", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "notSpecial", - "typeAnnotation": null, "optional": false } } @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "normal", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -155,8 +151,8 @@ "ctxt": 0 }, "value": "opts1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -196,7 +192,6 @@ "ctxt": 0 }, "value": "opts1", - "typeAnnotation": null, "optional": false }, "property": { @@ -207,7 +202,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -242,7 +236,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -266,7 +259,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -301,7 +293,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -322,8 +313,8 @@ "ctxt": 0 }, "value": "opts2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -370,7 +361,6 @@ "ctxt": 0 }, "value": "opts2", - "typeAnnotation": null, "optional": false }, "property": { @@ -392,7 +382,6 @@ "ctxt": 0 }, "value": "anotherX", - "typeAnnotation": null, "optional": false }, "computed": false @@ -427,7 +416,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -461,7 +449,6 @@ "ctxt": 0 }, "value": "anotherX", - "typeAnnotation": null, "optional": false }, "value": { @@ -499,7 +486,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -520,8 +506,8 @@ "ctxt": 0 }, "value": "opts3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -561,7 +547,6 @@ "ctxt": 0 }, "value": "opts3", - "typeAnnotation": null, "optional": false }, "property": { @@ -572,7 +557,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -607,7 +591,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -631,7 +614,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -666,7 +648,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -687,8 +668,8 @@ "ctxt": 0 }, "value": "opts4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -735,7 +716,6 @@ "ctxt": 0 }, "value": "opts4", - "typeAnnotation": null, "optional": false }, "property": { @@ -757,7 +737,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -792,7 +771,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -826,7 +804,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -864,7 +841,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -885,8 +861,8 @@ "ctxt": 0 }, "value": "opts5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -954,7 +930,6 @@ "ctxt": 0 }, "value": "opts5", - "typeAnnotation": null, "optional": false }, "property": { @@ -976,7 +951,6 @@ "ctxt": 0 }, "value": "what", - "typeAnnotation": null, "optional": false }, "computed": false @@ -989,7 +963,6 @@ "ctxt": 0 }, "value": "bad", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1013,7 +986,6 @@ "ctxt": 0 }, "value": "idea", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1048,7 +1020,6 @@ "ctxt": 0 }, "value": "opts5", - "typeAnnotation": null, "optional": false }, "property": { @@ -1070,7 +1041,6 @@ "ctxt": 0 }, "value": "unnest", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1105,7 +1075,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1139,7 +1108,6 @@ "ctxt": 0 }, "value": "help", - "typeAnnotation": null, "optional": false }, "value": { @@ -1167,7 +1135,6 @@ "ctxt": 0 }, "value": "what", - "typeAnnotation": null, "optional": false }, "value": { @@ -1188,7 +1155,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1216,7 +1182,6 @@ "ctxt": 0 }, "value": "bad", - "typeAnnotation": null, "optional": false }, "value": { @@ -1247,7 +1212,6 @@ "ctxt": 0 }, "value": "idea", - "typeAnnotation": null, "optional": false }, "value": { @@ -1275,7 +1239,6 @@ "ctxt": 0 }, "value": "oh", - "typeAnnotation": null, "optional": false }, "value": { @@ -1307,7 +1270,6 @@ "ctxt": 0 }, "value": "unnest", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParseBackquotedParamName/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParseBackquotedParamName/input.ts.json index 7a69c988077b..63127f1d8c7e 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParseBackquotedParamName/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParseBackquotedParamName/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -57,8 +56,8 @@ "ctxt": 0 }, "value": "bwarg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -92,7 +91,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -113,6 +111,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -129,8 +128,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParseDotDotDotInJSDocFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParseDotDotDotInJSDocFunction/input.ts.json index ec78fb9c697b..41d896bed3b2 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParseDotDotDotInJSDocFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParseDotDotDotInJSDocFunction/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "callback", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -78,7 +77,6 @@ "ctxt": 0 }, "value": "callback", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -193,8 +191,8 @@ "ctxt": 0 }, "value": "stringFromCharCode", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -211,7 +209,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "property": { @@ -222,7 +219,6 @@ "ctxt": 0 }, "value": "fromCharCode", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParseHigherOrderFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParseHigherOrderFunction/input.ts.json index 2c1b1bed00ab..e239f83fd3c2 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParseHigherOrderFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParseHigherOrderFunction/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -61,8 +61,8 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -80,7 +80,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -94,7 +93,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParseMatchingBackticks/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParseMatchingBackticks/input.ts.json index 769d57fa0a8a..2dae0257d484 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParseMatchingBackticks/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParseMatchingBackticks/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -44,8 +43,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -64,8 +63,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -84,8 +83,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -104,8 +103,8 @@ "ctxt": 0 }, "value": "alpha", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -124,8 +123,8 @@ "ctxt": 0 }, "value": "beta", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -144,8 +143,8 @@ "ctxt": 0 }, "value": "gamma", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -218,7 +217,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -229,7 +227,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -241,7 +238,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } }, @@ -253,7 +249,6 @@ "ctxt": 0 }, "value": "alpha", - "typeAnnotation": null, "optional": false } }, @@ -265,7 +260,6 @@ "ctxt": 0 }, "value": "beta", - "typeAnnotation": null, "optional": false } }, @@ -277,7 +271,6 @@ "ctxt": 0 }, "value": "gamma", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParseParenthesizedJSDocParameter/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParseParenthesizedJSDocParameter/input.ts.json index c517a3372552..23b84237fda9 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParseParenthesizedJSDocParameter/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParseParenthesizedJSDocParameter/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -76,7 +76,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -87,7 +86,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParseStarEquals/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParseStarEquals/input.ts.json index 4bed268aee1d..814e942067c4 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParseStarEquals/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocParseStarEquals/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,8 +48,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -118,8 +117,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -136,7 +135,6 @@ "ctxt": 0 }, "value": "cbf", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -157,8 +155,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocPostfixEqualsAddsOptionality/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocPostfixEqualsAddsOptionality/input.ts.json index 93ebcf35edca..e18e92ab7e52 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocPostfixEqualsAddsOptionality/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocPostfixEqualsAddsOptionality/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -79,8 +78,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -116,8 +115,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -152,8 +151,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -163,7 +162,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -197,7 +195,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -226,7 +223,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -267,7 +263,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -281,7 +276,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -311,7 +305,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -341,7 +334,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -362,8 +354,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -404,8 +396,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -441,8 +433,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -477,8 +469,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -488,7 +480,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -522,7 +513,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -551,7 +541,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -592,7 +581,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -606,7 +594,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -636,7 +623,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocPrefixPostfixParsing/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocPrefixPostfixParsing/input.ts.json index cd0ef823d4b1..916867ba3646 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocPrefixPostfixParsing/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocPrefixPostfixParsing/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -57,8 +56,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -77,8 +76,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -97,8 +96,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -117,8 +116,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -137,8 +136,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -157,8 +156,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -177,8 +176,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -197,8 +196,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -217,8 +216,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -237,8 +236,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -257,8 +256,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -277,8 +276,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -297,8 +296,8 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -317,8 +316,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocPrivateName1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocPrivateName1/input.ts.json index 5c94fb4a7f56..fb6b06f1241e 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocPrivateName1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocPrivateName1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocPrototypePropertyAccessWithType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocPrototypePropertyAccessWithType/input.ts.json index 61162097d816..ffef1e39e64a 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocPrototypePropertyAccessWithType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocPrototypePropertyAccessWithType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -133,7 +131,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -157,7 +153,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -192,7 +187,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -206,7 +200,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocReadonly/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocReadonly/input.ts.json index 9618ccec7bff..42b88f6872f3 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocReadonly/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocReadonly/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "LOL", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -118,7 +115,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -206,7 +201,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -260,7 +254,6 @@ "ctxt": 0 }, "value": "ka", - "typeAnnotation": null, "optional": false }, "computed": false @@ -313,8 +306,8 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -331,7 +324,6 @@ "ctxt": 0 }, "value": "LOL", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -371,7 +363,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "property": { @@ -382,7 +373,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocReadonlyDeclarations/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocReadonlyDeclarations/input.ts.json index ec7e50ab6183..c58e25accbe0 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocReadonlyDeclarations/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocReadonlyDeclarations/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -100,8 +97,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -151,7 +148,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -207,7 +202,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -220,7 +214,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -266,7 +259,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -280,7 +272,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -296,7 +287,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -353,7 +343,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -386,7 +375,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -412,7 +400,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -432,8 +419,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocReturnTag1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocReturnTag1/input.ts.json index 016efad9e786..7dd66a0d5789 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocReturnTag1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocReturnTag1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -69,7 +68,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -122,7 +120,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateClass/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateClass/input.ts.json index b448494ecda7..94ff0cd69471 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateClass/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateClass/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,8 +60,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -113,7 +111,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -126,7 +123,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -151,7 +147,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -172,8 +167,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -192,8 +187,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -212,8 +207,8 @@ "ctxt": 0 }, "value": "alpha", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -253,7 +248,6 @@ "ctxt": 0 }, "value": "alpha", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -274,7 +268,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -288,7 +281,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -345,8 +337,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -363,7 +355,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -411,8 +402,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -429,7 +420,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -482,7 +472,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { @@ -493,7 +482,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -513,7 +501,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "property": { @@ -524,7 +511,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateConstructorFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateConstructorFunction/input.ts.json index 9dc4ca99e310..465d1c69b8ca 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateConstructorFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateConstructorFunction/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Zet", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -86,7 +85,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "computed": false @@ -130,7 +128,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -143,7 +140,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -192,7 +188,6 @@ "ctxt": 0 }, "value": "Zet", - "typeAnnotation": null, "optional": false }, "property": { @@ -203,7 +198,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -216,7 +210,6 @@ "ctxt": 0 }, "value": "add", - "typeAnnotation": null, "optional": false }, "computed": false @@ -241,8 +234,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -261,8 +254,8 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -318,7 +311,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "computed": false @@ -339,7 +331,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -365,7 +356,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -395,7 +385,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -424,7 +413,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "computed": false @@ -468,8 +456,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -486,7 +474,6 @@ "ctxt": 0 }, "value": "Zet", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -539,7 +526,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "property": { @@ -550,7 +536,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -596,7 +581,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "property": { @@ -607,7 +591,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateConstructorFunction2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateConstructorFunction2/input.ts.json index a89abc619071..ee132a43be9e 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateConstructorFunction2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateConstructorFunction2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Zet", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -86,7 +85,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "computed": false @@ -130,7 +128,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -143,7 +140,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -192,7 +188,6 @@ "ctxt": 0 }, "value": "Zet", - "typeAnnotation": null, "optional": false }, "property": { @@ -203,7 +198,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -216,7 +210,6 @@ "ctxt": 0 }, "value": "add", - "typeAnnotation": null, "optional": false }, "computed": false @@ -241,8 +234,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -261,8 +254,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -318,7 +311,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "computed": false @@ -339,7 +331,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -357,7 +348,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -368,7 +358,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "computed": false @@ -406,7 +395,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "computed": false @@ -446,8 +434,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -464,7 +452,6 @@ "ctxt": 0 }, "value": "Zet", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -517,7 +504,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "property": { @@ -528,7 +514,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -574,7 +559,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "property": { @@ -585,7 +569,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "computed": false @@ -626,8 +609,8 @@ "ctxt": 0 }, "value": "answer", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -651,7 +634,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "property": { @@ -662,7 +644,6 @@ "ctxt": 0 }, "value": "add", - "typeAnnotation": null, "optional": false }, "computed": false @@ -700,7 +681,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "value": { @@ -748,8 +728,8 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -769,7 +749,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateTag/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateTag/input.ts.json index 6fad8737b0ca..6a5593a6e7c4 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateTag/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateTag/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -79,7 +78,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -120,8 +118,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -145,7 +143,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -181,7 +178,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -202,8 +198,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -244,7 +240,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -285,8 +280,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -310,7 +305,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -378,7 +372,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "property": { @@ -389,7 +382,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -402,7 +394,6 @@ "ctxt": 0 }, "value": "animate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -427,8 +418,8 @@ "ctxt": 0 }, "value": "keyframes", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateTag2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateTag2/input.ts.json index e202c7dbacb2..6319f98fb27c 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateTag2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateTag2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -75,8 +74,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -109,7 +108,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateTag3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateTag3/input.ts.json index 47ea09386e9f..8d7a67af7ee6 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateTag3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateTag3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -57,8 +56,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -77,8 +76,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -97,8 +96,8 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -117,8 +116,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -182,7 +181,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -193,7 +191,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -220,7 +217,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -231,7 +227,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -244,7 +239,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -273,7 +267,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "property": { @@ -284,7 +277,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -311,7 +303,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "property": { @@ -322,7 +313,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -335,7 +325,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -357,7 +346,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -368,7 +356,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -397,7 +384,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false } } @@ -420,7 +406,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -453,7 +438,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -477,7 +461,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -500,7 +483,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -528,7 +510,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -553,7 +534,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -577,7 +557,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -600,7 +579,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -623,7 +601,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -634,7 +611,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -696,7 +672,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -720,7 +695,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -746,7 +720,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -760,7 +733,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -807,7 +779,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -828,8 +799,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateTag4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateTag4/input.ts.json index 323ee5da5e6d..4fdbfbd66c21 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateTag4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateTag4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Multimap", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -141,7 +139,6 @@ "ctxt": 0 }, "value": "Multimap", - "typeAnnotation": null, "optional": false }, "property": { @@ -152,7 +149,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -165,7 +161,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -190,8 +185,8 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -246,7 +241,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -267,7 +261,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "right": { @@ -322,8 +315,8 @@ "ctxt": 0 }, "value": "Multimap2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -381,7 +374,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -445,7 +437,6 @@ "ctxt": 0 }, "value": "Multimap2", - "typeAnnotation": null, "optional": false }, "property": { @@ -456,7 +447,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -469,7 +459,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -494,8 +483,8 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -550,7 +539,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -571,7 +559,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "right": { @@ -626,8 +613,8 @@ "ctxt": 0 }, "value": "Ns", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -672,7 +659,6 @@ "ctxt": 0 }, "value": "Ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -683,7 +669,6 @@ "ctxt": 0 }, "value": "Multimap3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -744,7 +729,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -813,7 +797,6 @@ "ctxt": 0 }, "value": "Ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -824,7 +807,6 @@ "ctxt": 0 }, "value": "Multimap3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -837,7 +819,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -850,7 +831,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -875,8 +855,8 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -931,7 +911,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -952,7 +931,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "right": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateTag5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateTag5/input.ts.json index df2c20a3bf9d..c76a300d078c 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateTag5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTemplateTag5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Multimap", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -134,7 +132,6 @@ "ctxt": 0 }, "value": "Multimap", - "typeAnnotation": null, "optional": false }, "property": { @@ -145,7 +142,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -168,7 +164,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "params": [ @@ -188,8 +183,8 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -244,7 +239,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -265,7 +259,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "right": { @@ -322,8 +315,8 @@ "ctxt": 0 }, "value": "Multimap2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -381,7 +374,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -438,7 +430,6 @@ "ctxt": 0 }, "value": "Multimap2", - "typeAnnotation": null, "optional": false }, "property": { @@ -449,7 +440,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -472,7 +462,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "value": { @@ -495,8 +484,8 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -551,7 +540,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -572,7 +560,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "right": { @@ -630,8 +617,8 @@ "ctxt": 0 }, "value": "Ns", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -676,7 +663,6 @@ "ctxt": 0 }, "value": "Ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -687,7 +673,6 @@ "ctxt": 0 }, "value": "Multimap3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -748,7 +733,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -810,7 +794,6 @@ "ctxt": 0 }, "value": "Ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -821,7 +804,6 @@ "ctxt": 0 }, "value": "Multimap3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -834,7 +816,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -857,7 +838,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "params": [ @@ -877,8 +857,8 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -933,7 +913,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -954,7 +933,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "right": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTwoLineTypedef/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTwoLineTypedef/input.ts.json index 85e1bd016ae3..1522729e1605 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTwoLineTypedef/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTwoLineTypedef/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "LoadCallback", - "typeAnnotation": null, "optional": false }, "typeParams": null, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeDefAtStartOfFile/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeDefAtStartOfFile/input.ts.json index 708acecec343..fd57d61fd1e6 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeDefAtStartOfFile/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeDefAtStartOfFile/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -64,8 +64,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeFromChainedAssignment/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeFromChainedAssignment/input.ts.json index 85b7ce80ff0d..74596a529aa7 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeFromChainedAssignment/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeFromChainedAssignment/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -127,7 +125,6 @@ "ctxt": 0 }, "value": "first", - "typeAnnotation": null, "optional": false }, "computed": false @@ -163,7 +160,6 @@ "ctxt": 0 }, "value": "second", - "typeAnnotation": null, "optional": false }, "computed": false @@ -224,7 +220,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -235,7 +230,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -248,7 +242,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -283,7 +276,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -294,7 +286,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -307,7 +298,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -322,7 +312,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [ @@ -342,8 +331,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -384,7 +373,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -410,7 +398,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -457,7 +444,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -468,7 +454,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -496,7 +481,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -507,7 +491,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -522,7 +505,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "params": [ @@ -542,8 +524,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -584,7 +566,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "right": { @@ -610,7 +591,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -652,8 +632,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -670,7 +650,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -709,7 +688,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -720,7 +698,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -776,7 +753,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -787,7 +763,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -843,7 +818,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -854,7 +828,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -910,7 +883,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -921,7 +893,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -978,7 +949,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -989,7 +959,6 @@ "ctxt": 0 }, "value": "first", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeFromChainedAssignment2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeFromChainedAssignment2/input.ts.json index 00471f5300c9..a911c7632d0e 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeFromChainedAssignment2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeFromChainedAssignment2/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -75,7 +73,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -86,7 +83,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -101,7 +97,6 @@ "ctxt": 0 }, "value": "fg", - "typeAnnotation": null, "optional": false }, "params": [ @@ -121,8 +116,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -163,7 +158,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -224,7 +218,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -235,7 +228,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -248,7 +240,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "computed": false @@ -283,7 +274,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -294,7 +284,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -307,7 +296,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": false @@ -322,7 +310,6 @@ "ctxt": 0 }, "value": "hi", - "typeAnnotation": null, "optional": false }, "params": [ @@ -342,8 +329,8 @@ "ctxt": 0 }, "value": "mom", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -384,7 +371,6 @@ "ctxt": 0 }, "value": "mom", - "typeAnnotation": null, "optional": false } ], @@ -501,8 +487,8 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -519,7 +505,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -576,7 +561,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -587,7 +571,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -643,7 +626,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -654,7 +636,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -710,7 +691,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -721,7 +701,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "computed": false @@ -772,7 +751,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -783,7 +761,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeFromChainedAssignment3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeFromChainedAssignment3/input.ts.json index 627e5ee7a82f..e7c3894db1c8 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeFromChainedAssignment3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeFromChainedAssignment3/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "wrapSync", - "typeAnnotation": null, "optional": false }, "computed": false @@ -75,7 +73,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -86,7 +83,6 @@ "ctxt": 0 }, "value": "selectSeries", - "typeAnnotation": null, "optional": false }, "computed": false @@ -114,7 +110,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -125,7 +120,6 @@ "ctxt": 0 }, "value": "selectLimit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -153,7 +147,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -164,7 +157,6 @@ "ctxt": 0 }, "value": "select", - "typeAnnotation": null, "optional": false }, "computed": false @@ -192,7 +184,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -203,7 +194,6 @@ "ctxt": 0 }, "value": "foldr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -231,7 +221,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -242,7 +231,6 @@ "ctxt": 0 }, "value": "foldl", - "typeAnnotation": null, "optional": false }, "computed": false @@ -270,7 +258,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -281,7 +268,6 @@ "ctxt": 0 }, "value": "inject", - "typeAnnotation": null, "optional": false }, "computed": false @@ -309,7 +295,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -320,7 +305,6 @@ "ctxt": 0 }, "value": "forEachOfLimit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -348,7 +332,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -359,7 +342,6 @@ "ctxt": 0 }, "value": "forEachOfSeries", - "typeAnnotation": null, "optional": false }, "computed": false @@ -387,7 +369,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -398,7 +379,6 @@ "ctxt": 0 }, "value": "forEachOf", - "typeAnnotation": null, "optional": false }, "computed": false @@ -426,7 +406,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -437,7 +416,6 @@ "ctxt": 0 }, "value": "forEachLimit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -465,7 +443,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -476,7 +453,6 @@ "ctxt": 0 }, "value": "forEachSeries", - "typeAnnotation": null, "optional": false }, "computed": false @@ -504,7 +480,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -515,7 +490,6 @@ "ctxt": 0 }, "value": "forEach", - "typeAnnotation": null, "optional": false }, "computed": false @@ -543,7 +517,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -554,7 +527,6 @@ "ctxt": 0 }, "value": "findSeries", - "typeAnnotation": null, "optional": false }, "computed": false @@ -582,7 +554,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -593,7 +564,6 @@ "ctxt": 0 }, "value": "findLimit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -621,7 +591,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -632,7 +601,6 @@ "ctxt": 0 }, "value": "find", - "typeAnnotation": null, "optional": false }, "computed": false @@ -660,7 +628,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -671,7 +638,6 @@ "ctxt": 0 }, "value": "anySeries", - "typeAnnotation": null, "optional": false }, "computed": false @@ -699,7 +665,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -710,7 +675,6 @@ "ctxt": 0 }, "value": "anyLimit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -738,7 +702,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -749,7 +712,6 @@ "ctxt": 0 }, "value": "any", - "typeAnnotation": null, "optional": false }, "computed": false @@ -777,7 +739,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -788,7 +749,6 @@ "ctxt": 0 }, "value": "allSeries", - "typeAnnotation": null, "optional": false }, "computed": false @@ -816,7 +776,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -827,7 +786,6 @@ "ctxt": 0 }, "value": "allLimit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -855,7 +813,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -866,7 +823,6 @@ "ctxt": 0 }, "value": "all", - "typeAnnotation": null, "optional": false }, "computed": false @@ -894,7 +850,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -905,7 +860,6 @@ "ctxt": 0 }, "value": "whilst", - "typeAnnotation": null, "optional": false }, "computed": false @@ -933,7 +887,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -944,7 +897,6 @@ "ctxt": 0 }, "value": "waterfall", - "typeAnnotation": null, "optional": false }, "computed": false @@ -972,7 +924,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -983,7 +934,6 @@ "ctxt": 0 }, "value": "until", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1011,7 +961,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -1022,7 +971,6 @@ "ctxt": 0 }, "value": "unmemoize", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1050,7 +998,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -1061,7 +1008,6 @@ "ctxt": 0 }, "value": "tryEach", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1089,7 +1035,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -1100,7 +1045,6 @@ "ctxt": 0 }, "value": "transform", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1128,7 +1072,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -1139,7 +1082,6 @@ "ctxt": 0 }, "value": "timesSeries", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1167,7 +1109,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -1178,7 +1119,6 @@ "ctxt": 0 }, "value": "timesLimit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1206,7 +1146,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -1217,7 +1156,6 @@ "ctxt": 0 }, "value": "times", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1245,7 +1183,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -1256,7 +1193,6 @@ "ctxt": 0 }, "value": "timeout", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1284,7 +1220,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -1295,7 +1230,6 @@ "ctxt": 0 }, "value": "sortBy", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1323,7 +1257,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -1334,7 +1267,6 @@ "ctxt": 0 }, "value": "someSeries", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1362,7 +1294,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -1373,7 +1304,6 @@ "ctxt": 0 }, "value": "someLimit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1401,7 +1331,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -1412,7 +1341,6 @@ "ctxt": 0 }, "value": "some", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1440,7 +1368,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -1451,7 +1378,6 @@ "ctxt": 0 }, "value": "setImmediate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1479,7 +1405,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -1490,7 +1415,6 @@ "ctxt": 0 }, "value": "series", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1518,7 +1442,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -1529,7 +1452,6 @@ "ctxt": 0 }, "value": "seq", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1557,7 +1479,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -1568,7 +1489,6 @@ "ctxt": 0 }, "value": "retryable", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1596,7 +1516,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -1607,7 +1526,6 @@ "ctxt": 0 }, "value": "retry", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1635,7 +1553,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -1646,7 +1563,6 @@ "ctxt": 0 }, "value": "rejectSeries", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1674,7 +1590,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -1685,7 +1600,6 @@ "ctxt": 0 }, "value": "rejectLimit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1713,7 +1627,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -1724,7 +1637,6 @@ "ctxt": 0 }, "value": "reject", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1752,7 +1664,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -1763,7 +1674,6 @@ "ctxt": 0 }, "value": "reflectAll", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1791,7 +1701,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -1802,7 +1711,6 @@ "ctxt": 0 }, "value": "reflect", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1830,7 +1738,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -1841,7 +1748,6 @@ "ctxt": 0 }, "value": "reduceRight", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1869,7 +1775,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -1880,7 +1785,6 @@ "ctxt": 0 }, "value": "reduce", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1908,7 +1812,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -1919,7 +1822,6 @@ "ctxt": 0 }, "value": "race", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1947,7 +1849,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -1958,7 +1859,6 @@ "ctxt": 0 }, "value": "queue", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1986,7 +1886,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -1997,7 +1896,6 @@ "ctxt": 0 }, "value": "priorityQueue", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2025,7 +1923,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2036,7 +1933,6 @@ "ctxt": 0 }, "value": "parallelLimit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2064,7 +1960,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2075,7 +1970,6 @@ "ctxt": 0 }, "value": "parallel", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2103,7 +1997,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2114,7 +2007,6 @@ "ctxt": 0 }, "value": "nextTick", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2142,7 +2034,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2153,7 +2044,6 @@ "ctxt": 0 }, "value": "memoize", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2181,7 +2071,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2192,7 +2081,6 @@ "ctxt": 0 }, "value": "mapValuesSeries", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2220,7 +2108,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2231,7 +2118,6 @@ "ctxt": 0 }, "value": "mapValuesLimit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2259,7 +2145,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2270,7 +2155,6 @@ "ctxt": 0 }, "value": "mapValues", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2298,7 +2182,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2309,7 +2192,6 @@ "ctxt": 0 }, "value": "mapSeries", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2337,7 +2219,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2348,7 +2229,6 @@ "ctxt": 0 }, "value": "mapLimit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2376,7 +2256,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2387,7 +2266,6 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2415,7 +2293,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2426,7 +2303,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2454,7 +2330,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2465,7 +2340,6 @@ "ctxt": 0 }, "value": "groupBySeries", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2493,7 +2367,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2504,7 +2377,6 @@ "ctxt": 0 }, "value": "groupByLimit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2532,7 +2404,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2543,7 +2414,6 @@ "ctxt": 0 }, "value": "groupBy", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2571,7 +2441,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2582,7 +2451,6 @@ "ctxt": 0 }, "value": "forever", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2610,7 +2478,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2621,7 +2488,6 @@ "ctxt": 0 }, "value": "filterSeries", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2649,7 +2515,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2660,7 +2525,6 @@ "ctxt": 0 }, "value": "filterLimit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2688,7 +2552,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2699,7 +2562,6 @@ "ctxt": 0 }, "value": "filter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2727,7 +2589,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2738,7 +2599,6 @@ "ctxt": 0 }, "value": "everySeries", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2766,7 +2626,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2777,7 +2636,6 @@ "ctxt": 0 }, "value": "everyLimit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2805,7 +2663,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2816,7 +2673,6 @@ "ctxt": 0 }, "value": "every", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2844,7 +2700,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2855,7 +2710,6 @@ "ctxt": 0 }, "value": "ensureAsync", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2883,7 +2737,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2894,7 +2747,6 @@ "ctxt": 0 }, "value": "eachSeries", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2922,7 +2774,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2933,7 +2784,6 @@ "ctxt": 0 }, "value": "eachOfSeries", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2961,7 +2811,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2972,7 +2821,6 @@ "ctxt": 0 }, "value": "eachOfLimit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3000,7 +2848,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -3011,7 +2858,6 @@ "ctxt": 0 }, "value": "eachOf", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3039,7 +2885,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -3050,7 +2895,6 @@ "ctxt": 0 }, "value": "eachLimit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3078,7 +2922,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -3089,7 +2932,6 @@ "ctxt": 0 }, "value": "each", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3117,7 +2959,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -3128,7 +2969,6 @@ "ctxt": 0 }, "value": "during", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3156,7 +2996,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -3167,7 +3006,6 @@ "ctxt": 0 }, "value": "doWhilst", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3195,7 +3033,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -3206,7 +3043,6 @@ "ctxt": 0 }, "value": "doUntil", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3234,7 +3070,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -3245,7 +3080,6 @@ "ctxt": 0 }, "value": "doDuring", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3273,7 +3107,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -3284,7 +3117,6 @@ "ctxt": 0 }, "value": "dir", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3312,7 +3144,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -3323,7 +3154,6 @@ "ctxt": 0 }, "value": "detectSeries", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3351,7 +3181,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -3362,7 +3191,6 @@ "ctxt": 0 }, "value": "detectLimit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3390,7 +3218,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -3401,7 +3228,6 @@ "ctxt": 0 }, "value": "detect", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3429,7 +3255,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -3440,7 +3265,6 @@ "ctxt": 0 }, "value": "constant", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3468,7 +3292,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -3479,7 +3302,6 @@ "ctxt": 0 }, "value": "concatSeries", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3507,7 +3329,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -3518,7 +3339,6 @@ "ctxt": 0 }, "value": "concatLimit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3546,7 +3366,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -3557,7 +3376,6 @@ "ctxt": 0 }, "value": "concat", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3585,7 +3403,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -3596,7 +3413,6 @@ "ctxt": 0 }, "value": "compose", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3624,7 +3440,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -3635,7 +3450,6 @@ "ctxt": 0 }, "value": "cargo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3663,7 +3477,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -3674,7 +3487,6 @@ "ctxt": 0 }, "value": "autoInject", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3702,7 +3514,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -3713,7 +3524,6 @@ "ctxt": 0 }, "value": "auto", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3741,7 +3551,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -3752,7 +3561,6 @@ "ctxt": 0 }, "value": "asyncify", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3780,7 +3588,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -3791,7 +3598,6 @@ "ctxt": 0 }, "value": "applyEachSeries", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3819,7 +3625,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -3830,7 +3635,6 @@ "ctxt": 0 }, "value": "applyEach", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3858,7 +3662,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -3869,7 +3672,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3882,7 +3684,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceExports/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceExports/input.ts.json index 03942ca70493..02ef4bd8030b 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceExports/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceExports/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -88,8 +86,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceToImport/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceToImport/input.ts.json index 21d912328e6e..3b51c3ec5a3a 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceToImport/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceToImport/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -56,7 +56,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "computed": false @@ -122,8 +120,8 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "OptionalChainingExpression", @@ -159,7 +157,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -191,7 +188,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "computed": false @@ -226,8 +222,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -244,7 +240,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -276,7 +271,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -287,7 +281,6 @@ "ctxt": 0 }, "value": "start", - "typeAnnotation": null, "optional": false }, "computed": false @@ -315,7 +308,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -326,7 +318,6 @@ "ctxt": 0 }, "value": "end", - "typeAnnotation": null, "optional": false }, "computed": false @@ -357,8 +348,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -375,7 +366,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -407,7 +397,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -418,7 +407,6 @@ "ctxt": 0 }, "value": "start", - "typeAnnotation": null, "optional": false }, "computed": false @@ -446,7 +434,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -457,7 +444,6 @@ "ctxt": 0 }, "value": "end", - "typeAnnotation": null, "optional": false }, "computed": false @@ -480,7 +466,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -506,7 +491,6 @@ "ctxt": 0 }, "value": "start", - "typeAnnotation": null, "optional": false }, "value": null, @@ -552,7 +536,6 @@ "ctxt": 0 }, "value": "end", - "typeAnnotation": null, "optional": false }, "value": null, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceToImportOfClassExpression/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceToImportOfClassExpression/input.ts.json index 7c5a785c5c53..dd7e0cca219b 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceToImportOfClassExpression/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceToImportOfClassExpression/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "MW", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,8 +60,8 @@ "ctxt": 0 }, "value": "compiler", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -113,7 +111,6 @@ "ctxt": 0 }, "value": "compiler", - "typeAnnotation": null, "optional": false }, "computed": false @@ -126,7 +123,6 @@ "ctxt": 0 }, "value": "compiler", - "typeAnnotation": null, "optional": false } } @@ -173,7 +169,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -197,7 +191,6 @@ "ctxt": 0 }, "value": "MW", - "typeAnnotation": null, "optional": false } } @@ -227,8 +220,8 @@ "ctxt": 0 }, "value": "MW", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -245,7 +238,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -303,7 +295,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -314,7 +305,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -329,7 +319,6 @@ "ctxt": 0 }, "value": "MC", - "typeAnnotation": null, "optional": false }, "span": { @@ -354,7 +343,6 @@ "ctxt": 0 }, "value": "watch", - "typeAnnotation": null, "optional": false }, "function": { @@ -395,7 +383,6 @@ "ctxt": 0 }, "value": "MW", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceToImportOfFunctionExpression/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceToImportOfFunctionExpression/input.ts.json index 717674ecf297..16c8b6f060c8 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceToImportOfFunctionExpression/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceToImportOfFunctionExpression/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "MW", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,8 +60,8 @@ "ctxt": 0 }, "value": "compiler", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -113,7 +111,6 @@ "ctxt": 0 }, "value": "compiler", - "typeAnnotation": null, "optional": false }, "computed": false @@ -126,7 +123,6 @@ "ctxt": 0 }, "value": "compiler", - "typeAnnotation": null, "optional": false } } @@ -173,7 +169,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -197,7 +191,6 @@ "ctxt": 0 }, "value": "MW", - "typeAnnotation": null, "optional": false } } @@ -227,8 +220,8 @@ "ctxt": 0 }, "value": "MW", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -245,7 +238,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -303,7 +295,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -314,7 +305,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -329,7 +319,6 @@ "ctxt": 0 }, "value": "MC", - "typeAnnotation": null, "optional": false }, "params": [], @@ -372,8 +361,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -410,7 +399,6 @@ "ctxt": 0 }, "value": "MW", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -424,7 +412,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceToMergedClass/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceToMergedClass/input.ts.json index 7dae9330cf2d..fcdde2eca812 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceToMergedClass/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceToMergedClass/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "Workspace", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -109,7 +109,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -120,7 +119,6 @@ "ctxt": 0 }, "value": "isServiceProject", - "typeAnnotation": null, "optional": false }, "computed": false @@ -159,7 +157,6 @@ "ctxt": 0 }, "value": "Workspace", - "typeAnnotation": null, "optional": false }, "property": { @@ -170,7 +167,6 @@ "ctxt": 0 }, "value": "Project", - "typeAnnotation": null, "optional": false }, "computed": false @@ -185,7 +181,6 @@ "ctxt": 0 }, "value": "wp", - "typeAnnotation": null, "optional": false }, "params": [], @@ -248,7 +243,6 @@ "ctxt": 0 }, "value": "Workspace", - "typeAnnotation": null, "optional": false }, "property": { @@ -259,7 +253,6 @@ "ctxt": 0 }, "value": "Project", - "typeAnnotation": null, "optional": false }, "computed": false @@ -272,7 +265,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -295,7 +287,6 @@ "ctxt": 0 }, "value": "isServiceProject", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceToValue/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceToValue/input.ts.json index 93f6d83df98a..7b4899372581 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceToValue/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceToValue/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "process", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "image", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -78,7 +77,6 @@ "ctxt": 0 }, "value": "image", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceUseBeforeDef/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceUseBeforeDef/input.ts.json index 1b45ae381037..f52bd53e2c77 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceUseBeforeDef/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeReferenceUseBeforeDef/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NullLiteral", @@ -56,7 +56,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeTag/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeTag/input.ts.json index b4fdfdc33762..ad75bf4c2a67 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeTag/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeTag/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -64,8 +64,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -97,8 +97,8 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -130,8 +130,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -163,8 +163,8 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -196,8 +196,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -229,8 +229,8 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -262,8 +262,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -295,8 +295,8 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -328,8 +328,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -361,8 +361,8 @@ "ctxt": 0 }, "value": "Nl", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -394,8 +394,8 @@ "ctxt": 0 }, "value": "nl", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -427,8 +427,8 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -460,8 +460,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -493,8 +493,8 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -526,8 +526,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -559,8 +559,8 @@ "ctxt": 0 }, "value": "nullable", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -592,8 +592,8 @@ "ctxt": 0 }, "value": "Obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -625,8 +625,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -658,8 +658,8 @@ "ctxt": 0 }, "value": "Func", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -691,8 +691,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -724,8 +724,8 @@ "ctxt": 0 }, "value": "ctor", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -757,6 +757,7 @@ "ctxt": 0 }, "value": "S", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -773,8 +774,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -806,6 +806,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -822,8 +823,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -855,6 +855,7 @@ "ctxt": 0 }, "value": "N", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -871,8 +872,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -904,6 +904,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -920,8 +921,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -953,6 +953,7 @@ "ctxt": 0 }, "value": "B", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -969,8 +970,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1002,6 +1002,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1018,8 +1019,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1051,6 +1051,7 @@ "ctxt": 0 }, "value": "V", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1067,8 +1068,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1100,6 +1100,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1116,8 +1117,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1149,6 +1149,7 @@ "ctxt": 0 }, "value": "U", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1165,8 +1166,7 @@ }, "kind": "undefined" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1198,6 +1198,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1214,8 +1215,7 @@ }, "kind": "undefined" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1247,6 +1247,7 @@ "ctxt": 0 }, "value": "Nl", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1263,8 +1264,7 @@ }, "kind": "null" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1296,6 +1296,7 @@ "ctxt": 0 }, "value": "nl", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1312,8 +1313,7 @@ }, "kind": "null" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1345,6 +1345,7 @@ "ctxt": 0 }, "value": "A", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1369,8 +1370,7 @@ "kind": "any" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1402,6 +1402,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1426,8 +1427,7 @@ "kind": "any" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1459,6 +1459,7 @@ "ctxt": 0 }, "value": "P", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1481,7 +1482,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1504,8 +1504,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1537,6 +1536,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1559,7 +1559,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1582,8 +1581,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1615,6 +1613,7 @@ "ctxt": 0 }, "value": "nullable", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1650,8 +1649,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1683,6 +1681,7 @@ "ctxt": 0 }, "value": "Obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1699,8 +1698,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1732,6 +1730,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1748,8 +1747,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1781,6 +1779,7 @@ "ctxt": 0 }, "value": "Func", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1803,13 +1802,11 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1841,6 +1838,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1864,6 +1862,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1880,8 +1879,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -1903,8 +1901,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1936,6 +1933,7 @@ "ctxt": 0 }, "value": "ctor", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1959,6 +1957,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1975,8 +1974,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -2011,7 +2009,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2042,8 +2039,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeTagCast/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeTagCast/input.ts.json index 108696c947fc..0e63f897b09c 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeTagCast/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeTagCast/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "W", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,8 +80,8 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -137,8 +137,8 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -186,8 +186,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -219,8 +219,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -252,8 +252,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -324,8 +324,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -381,7 +381,6 @@ "ctxt": 0 }, "value": "SomeBase", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -407,7 +406,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -457,7 +455,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -495,7 +492,6 @@ "ctxt": 0 }, "value": "SomeDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -521,7 +517,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -597,7 +592,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -627,7 +621,6 @@ "ctxt": 0 }, "value": "SomeBase", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -645,7 +638,6 @@ "ctxt": 0 }, "value": "SomeOther", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -671,7 +663,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -721,7 +712,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false @@ -759,7 +749,6 @@ "ctxt": 0 }, "value": "SomeFakeClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -816,7 +805,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -869,8 +857,8 @@ "ctxt": 0 }, "value": "someBase", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -887,7 +875,6 @@ "ctxt": 0 }, "value": "SomeBase", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -922,8 +909,8 @@ "ctxt": 0 }, "value": "someDerived", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -940,7 +927,6 @@ "ctxt": 0 }, "value": "SomeDerived", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -975,8 +961,8 @@ "ctxt": 0 }, "value": "someOther", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -993,7 +979,6 @@ "ctxt": 0 }, "value": "SomeOther", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1028,8 +1013,8 @@ "ctxt": 0 }, "value": "someFakeClass", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1046,7 +1031,6 @@ "ctxt": 0 }, "value": "SomeFakeClass", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1079,8 +1063,8 @@ "ctxt": 0 }, "value": "someBase", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -1097,7 +1081,6 @@ "ctxt": 0 }, "value": "someDerived", - "typeAnnotation": null, "optional": false } } @@ -1126,8 +1109,8 @@ "ctxt": 0 }, "value": "someBase", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -1144,7 +1127,6 @@ "ctxt": 0 }, "value": "someBase", - "typeAnnotation": null, "optional": false } } @@ -1173,8 +1155,8 @@ "ctxt": 0 }, "value": "someBase", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -1191,7 +1173,6 @@ "ctxt": 0 }, "value": "someOther", - "typeAnnotation": null, "optional": false } } @@ -1220,8 +1201,8 @@ "ctxt": 0 }, "value": "someDerived", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -1238,7 +1219,6 @@ "ctxt": 0 }, "value": "someDerived", - "typeAnnotation": null, "optional": false } } @@ -1267,8 +1247,8 @@ "ctxt": 0 }, "value": "someDerived", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -1285,7 +1265,6 @@ "ctxt": 0 }, "value": "someBase", - "typeAnnotation": null, "optional": false } } @@ -1314,8 +1293,8 @@ "ctxt": 0 }, "value": "someDerived", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -1332,7 +1311,6 @@ "ctxt": 0 }, "value": "someOther", - "typeAnnotation": null, "optional": false } } @@ -1361,8 +1339,8 @@ "ctxt": 0 }, "value": "someOther", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -1379,7 +1357,6 @@ "ctxt": 0 }, "value": "someDerived", - "typeAnnotation": null, "optional": false } } @@ -1408,8 +1385,8 @@ "ctxt": 0 }, "value": "someOther", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -1426,7 +1403,6 @@ "ctxt": 0 }, "value": "someBase", - "typeAnnotation": null, "optional": false } } @@ -1455,8 +1431,8 @@ "ctxt": 0 }, "value": "someOther", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -1473,7 +1449,6 @@ "ctxt": 0 }, "value": "someOther", - "typeAnnotation": null, "optional": false } } @@ -1502,8 +1477,8 @@ "ctxt": 0 }, "value": "someFakeClass", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1513,7 +1488,6 @@ "ctxt": 0 }, "value": "someBase", - "typeAnnotation": null, "optional": false } } @@ -1541,8 +1515,8 @@ "ctxt": 0 }, "value": "someFakeClass", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1552,7 +1526,6 @@ "ctxt": 0 }, "value": "someDerived", - "typeAnnotation": null, "optional": false } } @@ -1580,8 +1553,8 @@ "ctxt": 0 }, "value": "someBase", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1591,7 +1564,6 @@ "ctxt": 0 }, "value": "someFakeClass", - "typeAnnotation": null, "optional": false } } @@ -1619,8 +1591,8 @@ "ctxt": 0 }, "value": "someBase", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -1637,7 +1609,6 @@ "ctxt": 0 }, "value": "someFakeClass", - "typeAnnotation": null, "optional": false } } @@ -1668,8 +1639,8 @@ "ctxt": 0 }, "value": "numOrStr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1701,8 +1672,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1739,7 +1710,6 @@ "ctxt": 0 }, "value": "numOrStr", - "typeAnnotation": null, "optional": false }, "right": { @@ -1750,7 +1720,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1786,8 +1755,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1797,7 +1766,6 @@ "ctxt": 0 }, "value": "numOrStr", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeTagParameterType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeTagParameterType/input.ts.json index 4b2a5de08b3a..ab0e645b01d6 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeTagParameterType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeTagParameterType/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -85,8 +85,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -120,7 +120,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -141,8 +140,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -183,8 +182,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeTagRequiredParameters/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeTagRequiredParameters/input.ts.json index 3198c15dfcae..635fe14cd657 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeTagRequiredParameters/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/jsdocTypeTagRequiredParameters/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -82,7 +82,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -103,8 +102,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -138,7 +137,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -159,8 +157,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -206,7 +204,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -235,7 +232,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -264,7 +260,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/moduleExportsElementAccessAssignment/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/moduleExportsElementAccessAssignment/input.ts.json index f0f3112d3a85..92f129328e50 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/moduleExportsElementAccessAssignment/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/moduleExportsElementAccessAssignment/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -122,7 +119,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -159,7 +155,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -211,7 +206,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -248,7 +242,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -307,7 +300,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -318,7 +310,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -357,7 +348,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -416,7 +406,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -506,7 +495,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -549,7 +537,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false @@ -590,8 +577,8 @@ "ctxt": 0 }, "value": "mod1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -608,7 +595,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -658,7 +644,6 @@ "ctxt": 0 }, "value": "mod1", - "typeAnnotation": null, "optional": false }, "property": { @@ -669,7 +654,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -697,7 +681,6 @@ "ctxt": 0 }, "value": "mod1", - "typeAnnotation": null, "optional": false }, "property": { @@ -708,7 +691,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -736,7 +718,6 @@ "ctxt": 0 }, "value": "mod1", - "typeAnnotation": null, "optional": false }, "property": { @@ -747,7 +728,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -775,7 +755,6 @@ "ctxt": 0 }, "value": "mod1", - "typeAnnotation": null, "optional": false }, "property": { @@ -786,7 +765,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -821,7 +799,6 @@ "ctxt": 0 }, "value": "mod1", - "typeAnnotation": null, "optional": false }, "property": { @@ -832,7 +809,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -845,7 +821,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false @@ -873,7 +848,6 @@ "ctxt": 0 }, "value": "mod1", - "typeAnnotation": null, "optional": false }, "property": { @@ -884,7 +858,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/moduleExportsElementAccessAssignment2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/moduleExportsElementAccessAssignment2/input.ts.json index 0aac658b483a..70b6a30973d5 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/moduleExportsElementAccessAssignment2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/moduleExportsElementAccessAssignment2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "GlobalThing", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -81,7 +80,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -102,8 +100,8 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -122,8 +120,8 @@ "ctxt": 0 }, "value": "ctor", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -142,8 +140,8 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -192,7 +190,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false } }, @@ -249,7 +246,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -282,7 +278,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false } }, @@ -296,7 +291,6 @@ "ctxt": 0 }, "value": "ctor", - "typeAnnotation": null, "optional": false } } @@ -334,7 +328,6 @@ "ctxt": 0 }, "value": "GlobalThing", - "typeAnnotation": null, "optional": false }, "property": { @@ -345,7 +338,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/noAssertForUnparseableTypedefs/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/noAssertForUnparseableTypedefs/input.ts.json index 73eaa6dc764b..84247644c055 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/noAssertForUnparseableTypedefs/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/noAssertForUnparseableTypedefs/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "nope", - "typeAnnotation": null, "optional": false }, "imported": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/noDuplicateJsdoc1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/noDuplicateJsdoc1/input.ts.json index f401e1463b65..2da3e37273f3 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/noDuplicateJsdoc1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/noDuplicateJsdoc1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AssignmentExpression", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagBracketsAddOptionalUndefined/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagBracketsAddOptionalUndefined/input.ts.json index 37513f9fbe3c..1bdbf8fe1de5 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagBracketsAddOptionalUndefined/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagBracketsAddOptionalUndefined/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -57,8 +56,8 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -77,8 +76,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -119,8 +118,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -130,7 +129,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -158,8 +156,8 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -169,7 +167,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -197,8 +194,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -208,7 +205,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -242,7 +238,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -271,7 +266,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -285,7 +279,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -299,7 +292,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -313,7 +305,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -343,7 +334,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagNestedWithoutTopLevelObject/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagNestedWithoutTopLevelObject/input.ts.json index 924cb2268711..23eed4977d10 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagNestedWithoutTopLevelObject/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagNestedWithoutTopLevelObject/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "xyz", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -78,7 +77,6 @@ "ctxt": 0 }, "value": "xyz", - "typeAnnotation": null, "optional": false }, "property": { @@ -89,7 +87,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagNestedWithoutTopLevelObject2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagNestedWithoutTopLevelObject2/input.ts.json index cddb0d346d0f..8da1aa381fc6 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagNestedWithoutTopLevelObject2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagNestedWithoutTopLevelObject2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "xyz", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -85,7 +84,6 @@ "ctxt": 0 }, "value": "xyz", - "typeAnnotation": null, "optional": false }, "property": { @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagNestedWithoutTopLevelObject3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagNestedWithoutTopLevelObject3/input.ts.json index 326aef2a5526..b38d6e04c456 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagNestedWithoutTopLevelObject3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagNestedWithoutTopLevelObject3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "xyz", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -85,7 +84,6 @@ "ctxt": 0 }, "value": "xyz", - "typeAnnotation": null, "optional": false }, "property": { @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagNestedWithoutTopLevelObject4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagNestedWithoutTopLevelObject4/input.ts.json index c09e116cf053..b0118c4296d0 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagNestedWithoutTopLevelObject4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagNestedWithoutTopLevelObject4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "xyz", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -85,7 +84,6 @@ "ctxt": 0 }, "value": "xyz", - "typeAnnotation": null, "optional": false }, "property": { @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagOnCallExpression/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagOnCallExpression/input.ts.json index 92eaa4e06584..5e61b1b9807f 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagOnCallExpression/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagOnCallExpression/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "factory", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "type", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -116,7 +115,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -127,7 +125,6 @@ "ctxt": 0 }, "value": "inherits", - "typeAnnotation": null, "optional": false }, "computed": false @@ -147,7 +144,6 @@ "ctxt": 0 }, "value": "factory", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagOnFunctionUsingArguments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagOnFunctionUsingArguments/input.ts.json index a350840874fd..55567543284b 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagOnFunctionUsingArguments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagOnFunctionUsingArguments/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "factory", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "type", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -96,7 +95,6 @@ "ctxt": 0 }, "value": "concat", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -140,8 +138,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -193,8 +191,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -222,8 +220,8 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -240,7 +238,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "property": { @@ -251,7 +248,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -276,7 +272,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "right": { @@ -287,7 +282,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false } }, @@ -308,7 +302,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -343,8 +336,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -361,7 +354,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "property": { @@ -372,7 +364,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": true @@ -397,7 +388,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -418,7 +408,6 @@ "ctxt": 0 }, "value": "correct", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -452,7 +441,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false } } @@ -485,7 +473,6 @@ "ctxt": 0 }, "value": "correct", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagTypeResolution/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagTypeResolution/input.ts.json index bc6c563eb46b..6330a7a5c67d 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagTypeResolution/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagTypeResolution/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -72,8 +70,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -92,8 +90,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -133,7 +131,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -147,7 +144,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -189,8 +185,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -207,7 +203,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -257,7 +252,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -291,8 +285,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagTypeResolution2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagTypeResolution2/input.ts.json index 6bcab26cd395..5f9abfa67671 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagTypeResolution2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagTypeResolution2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -57,8 +56,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -104,7 +103,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -128,7 +126,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -164,7 +161,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "params": [ @@ -184,8 +180,8 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -232,7 +228,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "property": { @@ -243,7 +238,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagWrapping/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagWrapping/input.ts.json index 3cf4e20dd46e..811a3050f978 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagWrapping/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/paramTagWrapping/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "good", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -57,8 +56,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -77,8 +76,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -124,7 +123,6 @@ "ctxt": 0 }, "value": "good", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -178,7 +176,6 @@ "ctxt": 0 }, "value": "bad", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -199,8 +196,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -219,8 +216,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -239,8 +236,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -286,7 +283,6 @@ "ctxt": 0 }, "value": "bad", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/returnTagTypeGuard/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/returnTagTypeGuard/input.ts.json index 7b6f16096c78..935c4c73df9b 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/returnTagTypeGuard/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/returnTagTypeGuard/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Entry", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "isInit", - "typeAnnotation": null, "optional": false }, "function": { @@ -149,8 +145,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -215,7 +211,6 @@ "ctxt": 0 }, "value": "Group", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -241,7 +236,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -291,7 +285,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -332,7 +325,6 @@ "ctxt": 0 }, "value": "isInit", - "typeAnnotation": null, "optional": false }, "function": { @@ -353,8 +345,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -419,7 +411,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -440,8 +431,8 @@ "ctxt": 0 }, "value": "chunk", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -484,8 +475,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -516,7 +507,6 @@ "ctxt": 0 }, "value": "chunk", - "typeAnnotation": null, "optional": false }, "property": { @@ -527,7 +517,6 @@ "ctxt": 0 }, "value": "isInit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -543,7 +532,6 @@ "ctxt": 0 }, "value": "chunk", - "typeAnnotation": null, "optional": false } } @@ -565,7 +553,6 @@ "ctxt": 0 }, "value": "chunk", - "typeAnnotation": null, "optional": false }, "property": { @@ -576,7 +563,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -596,7 +582,6 @@ "ctxt": 0 }, "value": "chunk", - "typeAnnotation": null, "optional": false }, "property": { @@ -607,7 +592,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -632,7 +616,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -653,7 +636,6 @@ "ctxt": 0 }, "value": "isBoolean", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -674,8 +656,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -724,7 +706,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } }, @@ -761,7 +742,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -782,8 +762,8 @@ "ctxt": 0 }, "value": "val", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -823,7 +803,6 @@ "ctxt": 0 }, "value": "isBoolean", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -837,7 +816,6 @@ "ctxt": 0 }, "value": "val", - "typeAnnotation": null, "optional": false } } @@ -867,7 +845,6 @@ "ctxt": 0 }, "value": "val", - "typeAnnotation": null, "optional": false } } @@ -892,7 +869,6 @@ "ctxt": 0 }, "value": "isNumber", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -913,8 +889,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -963,7 +939,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1000,7 +975,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1021,8 +995,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1062,7 +1036,6 @@ "ctxt": 0 }, "value": "isNumber", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1076,7 +1049,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1114,7 +1086,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/seeTag1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/seeTag1/input.ts.json index 6c814a7f4de2..e89037837575 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/seeTag1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/seeTag1/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -97,7 +95,6 @@ "ctxt": 0 }, "value": "NS", - "typeAnnotation": null, "optional": false }, "body": { @@ -130,7 +127,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -160,7 +156,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -189,7 +184,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -229,8 +223,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -275,8 +269,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -321,8 +315,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/seeTag2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/seeTag2/input.ts.json index 43fdea389887..6e9184831a58 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/seeTag2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/seeTag2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -77,8 +77,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -123,8 +123,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -169,8 +169,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -215,8 +215,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -261,8 +261,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -307,8 +307,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/syntaxErrors/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/syntaxErrors/input.ts.json index f899599e9562..de122f584e4f 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/syntaxErrors/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/syntaxErrors/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -152,8 +147,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -172,8 +167,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -192,8 +187,8 @@ "ctxt": 0 }, "value": "skipped", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -241,7 +236,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -252,7 +246,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -272,7 +265,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -283,7 +275,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -322,8 +313,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -340,7 +331,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -364,7 +354,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "value": { @@ -400,7 +389,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "value": { @@ -436,7 +424,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/thisTag1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/thisTag1/input.ts.json index 4acfa83d2b60..6cb217220811 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/thisTag1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/thisTag1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -94,7 +93,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -114,7 +112,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -125,7 +122,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -164,8 +160,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -183,7 +179,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, { @@ -196,7 +191,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -244,7 +238,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -255,7 +248,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/tsNoCheckForTypescript/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/tsNoCheckForTypescript/input.ts.json index 441548559663..73a6efe45b7d 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/tsNoCheckForTypescript/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/tsNoCheckForTypescript/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -95,7 +95,6 @@ "ctxt": 0 }, "value": "Aleph", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -125,7 +124,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -172,7 +170,6 @@ "ctxt": 0 }, "value": "Bet", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -198,7 +195,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "value": { @@ -263,7 +259,6 @@ "ctxt": 0 }, "value": "Aleph", - "typeAnnotation": null, "optional": false }, "typeArguments": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/typeParameterExtendsUnionConstraintDistributed/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/typeParameterExtendsUnionConstraintDistributed/input.ts.json index 3531397d7ea5..ec194d8b1372 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/typeParameterExtendsUnionConstraintDistributed/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/typeParameterExtendsUnionConstraintDistributed/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -81,7 +80,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -102,6 +100,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -124,13 +123,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -163,7 +160,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -194,7 +190,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -212,7 +207,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -251,7 +245,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -271,7 +264,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -296,7 +288,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -355,7 +346,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -376,6 +366,7 @@ "ctxt": 0 }, "value": "ab", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -406,7 +397,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -426,15 +416,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -467,7 +455,6 @@ "ctxt": 0 }, "value": "ab", - "typeAnnotation": null, "optional": false } } @@ -498,7 +485,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -516,7 +502,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -538,7 +523,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -556,7 +540,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -610,7 +593,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -630,7 +612,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -653,7 +634,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -673,7 +653,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/typeTagCircularReferenceOnConstructorFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/typeTagCircularReferenceOnConstructorFunction/input.ts.json index fde12adcc910..e3bb23f882b6 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/typeTagCircularReferenceOnConstructorFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/typeTagCircularReferenceOnConstructorFunction/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "property": { @@ -82,7 +80,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/typeTagModuleExports/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/typeTagModuleExports/input.ts.json index 5134ed030f06..5177669a79e3 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/typeTagModuleExports/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/typeTagModuleExports/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/typeTagPrototypeAssignment/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/typeTagPrototypeAssignment/input.ts.json index b828a1abb31b..101718504da4 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/typeTagPrototypeAssignment/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/typeTagPrototypeAssignment/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -82,7 +80,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/typeTagWithGenericSignature/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/typeTagWithGenericSignature/input.ts.json index 9817f1395dea..5ddacf5d0710 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/typeTagWithGenericSignature/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/typeTagWithGenericSignature/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "typed", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false } } @@ -107,8 +105,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -125,7 +123,6 @@ "ctxt": 0 }, "value": "typed", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefCrossModule/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefCrossModule/input.ts.json index 86b87170fb97..ed727f2f0083 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefCrossModule/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefCrossModule/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "module", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,8 +90,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -128,7 +127,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -139,7 +137,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -152,7 +149,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } @@ -167,7 +163,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -224,7 +219,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -264,7 +258,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -321,7 +314,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -375,7 +367,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -386,7 +377,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "computed": false @@ -447,7 +437,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -497,8 +486,8 @@ "ctxt": 0 }, "value": "both1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -518,7 +507,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "value": { @@ -546,7 +534,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -590,8 +577,8 @@ "ctxt": 0 }, "value": "both2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -601,7 +588,6 @@ "ctxt": 0 }, "value": "both1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -633,8 +619,8 @@ "ctxt": 0 }, "value": "both3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -644,7 +630,6 @@ "ctxt": 0 }, "value": "both2", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefCrossModule2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefCrossModule2/input.ts.json index d71beedead1b..63378132c76a 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefCrossModule2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefCrossModule2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -63,7 +62,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -127,7 +124,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -138,7 +134,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -161,7 +156,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -210,8 +204,8 @@ "ctxt": 0 }, "value": "Qux", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -256,7 +250,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -267,7 +260,6 @@ "ctxt": 0 }, "value": "Quid", - "typeAnnotation": null, "optional": false }, "computed": false @@ -313,7 +305,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -324,7 +315,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -347,7 +337,6 @@ "ctxt": 0 }, "value": "Quack", - "typeAnnotation": null, "optional": false }, "value": { @@ -389,8 +378,8 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -407,7 +396,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -460,8 +448,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -493,8 +481,8 @@ "ctxt": 0 }, "value": "bb", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -526,8 +514,8 @@ "ctxt": 0 }, "value": "bbb", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -551,7 +539,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -562,7 +549,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefCrossModule3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefCrossModule3/input.ts.json index 761d556d55c5..0bb5bb594a1f 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefCrossModule3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefCrossModule3/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -141,7 +139,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -152,7 +149,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -165,7 +161,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefCrossModule4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefCrossModule4/input.ts.json index 9fa8bb720ab4..0bb64818ed31 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefCrossModule4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefCrossModule4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -63,7 +62,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -97,7 +94,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -108,7 +104,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefCrossModule5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefCrossModule5/input.ts.json index bce1935fd2bd..49e7fd2f8464 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefCrossModule5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefCrossModule5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -85,8 +83,8 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefInnerNamepaths/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefInnerNamepaths/input.ts.json index 0584538d3d54..459fa16b5cea 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefInnerNamepaths/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefInnerNamepaths/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,8 +60,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefMultipleTypeParameters/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefMultipleTypeParameters/input.ts.json index 0b2ed0492d9b..f8c6e649b157 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefMultipleTypeParameters/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefMultipleTypeParameters/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "tuvwx", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -64,8 +64,8 @@ "ctxt": 0 }, "value": "wrong", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -97,8 +97,8 @@ "ctxt": 0 }, "value": "insufficient", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -130,6 +130,7 @@ "ctxt": 0 }, "value": "actually", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -152,7 +153,6 @@ "ctxt": 0 }, "value": "Everything", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -187,7 +187,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -248,7 +247,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -298,7 +296,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,8 +352,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefTagExtraneousProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefTagExtraneousProperty/input.ts.json index 8c4efbc955a2..06d902c1de1a 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefTagExtraneousProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefTagExtraneousProperty/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "bye", - "typeAnnotation": null, "optional": false }, "value": { @@ -91,7 +90,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -125,7 +123,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "ignoreMe", - "typeAnnotation": null, "optional": false }, "computed": false @@ -187,7 +183,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefTagNested/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefTagNested/input.ts.json index 7aa178302874..91fa7fe0abdf 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefTagNested/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefTagNested/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "ex", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -64,8 +64,8 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -85,7 +85,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -113,7 +112,6 @@ "ctxt": 0 }, "value": "icons", - "typeAnnotation": null, "optional": false }, "value": { @@ -134,7 +132,6 @@ "ctxt": 0 }, "value": "image32", - "typeAnnotation": null, "optional": false }, "value": { @@ -162,7 +159,6 @@ "ctxt": 0 }, "value": "image64", - "typeAnnotation": null, "optional": false }, "value": { @@ -214,8 +210,8 @@ "ctxt": 0 }, "value": "intercessor", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -255,8 +251,8 @@ "ctxt": 0 }, "value": "mistake", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -288,8 +284,8 @@ "ctxt": 0 }, "value": "sala", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -309,7 +305,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -337,7 +332,6 @@ "ctxt": 0 }, "value": "not", - "typeAnnotation": null, "optional": false }, "value": { @@ -360,7 +354,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "value": { @@ -406,7 +399,6 @@ "ctxt": 0 }, "value": "sala", - "typeAnnotation": null, "optional": false }, "property": { @@ -417,7 +409,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -445,7 +436,6 @@ "ctxt": 0 }, "value": "sala", - "typeAnnotation": null, "optional": false }, "property": { @@ -456,7 +446,6 @@ "ctxt": 0 }, "value": "not", - "typeAnnotation": null, "optional": false }, "computed": false @@ -484,7 +473,6 @@ "ctxt": 0 }, "value": "sala", - "typeAnnotation": null, "optional": false }, "property": { @@ -495,7 +483,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefTagTypeResolution/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefTagTypeResolution/input.ts.json index a31a07bfb633..b56e460b1d92 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefTagTypeResolution/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefTagTypeResolution/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -107,8 +105,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -133,7 +131,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -154,8 +151,8 @@ "ctxt": 0 }, "value": "vvvvv", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -204,8 +201,8 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -223,8 +220,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefTagWrapping/input.ts.json b/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefTagWrapping/input.ts.json index 4b8207299675..824f678fbb34 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefTagWrapping/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/jsdoc/typedefTagWrapping/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "callIt", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -57,8 +56,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -98,7 +97,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -112,7 +110,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false } } @@ -137,7 +134,6 @@ "ctxt": 0 }, "value": "check", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -158,8 +154,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -206,7 +202,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -217,7 +212,6 @@ "ctxt": 0 }, "value": "boo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -237,7 +231,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -248,7 +241,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false }, "computed": false @@ -268,7 +260,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -279,7 +270,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false }, "computed": false @@ -303,7 +293,6 @@ "ctxt": 0 }, "value": "use1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -324,8 +313,8 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -344,8 +333,8 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -364,8 +353,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -384,8 +373,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -425,7 +414,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -439,7 +427,6 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, "optional": false } }, @@ -453,7 +440,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false } }, @@ -467,7 +453,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false } } @@ -492,7 +477,6 @@ "ctxt": 0 }, "value": "use2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -513,8 +497,8 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -533,8 +517,8 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -553,8 +537,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -573,8 +557,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -614,7 +598,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -628,7 +611,6 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, "optional": false } }, @@ -642,7 +624,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false } }, @@ -656,7 +637,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false } } @@ -681,7 +661,6 @@ "ctxt": 0 }, "value": "check5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -702,8 +681,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -750,7 +729,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -761,7 +739,6 @@ "ctxt": 0 }, "value": "boo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -781,7 +758,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -792,7 +768,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false }, "computed": false @@ -812,7 +787,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -823,7 +797,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false }, "computed": false @@ -847,7 +820,6 @@ "ctxt": 0 }, "value": "check6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -868,8 +840,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -909,7 +881,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -920,7 +891,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenCanBeTupleTypex/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenCanBeTupleTypex/input.tsx.json index e323b4b3180a..30603f04acca 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenCanBeTupleTypex/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenCanBeTupleTypex/input.tsx.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false } } @@ -66,7 +65,6 @@ "ctxt": 0 }, "value": "ResizablePanelProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -143,7 +140,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "right": { @@ -154,7 +150,6 @@ "ctxt": 0 }, "value": "ReactNode", - "typeAnnotation": null, "optional": false } }, @@ -186,7 +181,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "right": { @@ -197,7 +191,6 @@ "ctxt": 0 }, "value": "ReactNode", - "typeAnnotation": null, "optional": false } }, @@ -222,7 +215,6 @@ "ctxt": 0 }, "value": "ResizablePanel", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -248,7 +240,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -259,7 +250,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -289,7 +279,6 @@ "ctxt": 0 }, "value": "ResizablePanelProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -332,8 +321,8 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -352,7 +341,6 @@ "ctxt": 0 }, "value": "ResizablePanel", - "typeAnnotation": null, "optional": false }, "span": { @@ -392,7 +380,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -434,7 +421,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -475,7 +461,6 @@ "ctxt": 0 }, "value": "ResizablePanel", - "typeAnnotation": null, "optional": false } } @@ -509,8 +494,8 @@ "ctxt": 0 }, "value": "testErr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -529,7 +514,6 @@ "ctxt": 0 }, "value": "ResizablePanel", - "typeAnnotation": null, "optional": false }, "span": { @@ -569,7 +553,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -611,7 +594,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -653,7 +635,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -694,7 +675,6 @@ "ctxt": 0 }, "value": "ResizablePanel", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty10x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty10x/input.tsx.json index c2efe5566f95..82cee6d0ebf0 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty10x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty10x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "ElementAttributesProperty", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -154,7 +150,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -226,7 +220,6 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -268,7 +261,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -310,7 +302,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -336,7 +327,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "value": null, @@ -382,7 +372,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -432,7 +421,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -471,7 +459,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -523,8 +510,8 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -543,7 +530,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -583,7 +569,6 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false }, "span": { @@ -622,7 +607,6 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false } } @@ -654,7 +638,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "span": { @@ -693,7 +676,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false } } @@ -714,7 +696,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -748,8 +729,8 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -768,7 +749,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -808,7 +788,6 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false }, "span": { @@ -847,7 +826,6 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false } } @@ -885,6 +863,7 @@ "ctxt": 0 }, "value": "user", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -901,8 +880,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "body": { @@ -922,7 +900,6 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false }, "span": { @@ -957,7 +934,6 @@ "ctxt": 0 }, "value": "user", - "typeAnnotation": null, "optional": false }, "property": { @@ -968,7 +944,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -990,7 +965,6 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false } } @@ -1017,7 +991,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1051,8 +1024,8 @@ "ctxt": 0 }, "value": "k3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1071,7 +1044,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1169,7 +1141,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1203,8 +1174,8 @@ "ctxt": 0 }, "value": "k4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1223,7 +1194,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "span": { @@ -1263,7 +1233,6 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false }, "span": { @@ -1302,7 +1271,6 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false } } @@ -1333,7 +1301,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty11x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty11x/input.tsx.json index d4d0ea578d4e..7b2534277032 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty11x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty11x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "ElementAttributesProperty", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -154,7 +150,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -226,7 +220,6 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -268,7 +261,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -310,7 +302,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -336,7 +327,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "value": null, @@ -382,7 +372,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -432,7 +421,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -471,7 +459,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -523,8 +510,8 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -543,7 +530,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -583,7 +569,6 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false }, "span": { @@ -622,7 +607,6 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false } } @@ -654,7 +638,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "span": { @@ -693,7 +676,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false } } @@ -714,7 +696,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -748,8 +729,8 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -768,7 +749,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -808,7 +788,6 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false }, "span": { @@ -847,7 +826,6 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false } } @@ -885,6 +863,7 @@ "ctxt": 0 }, "value": "user", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -901,8 +880,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "body": { @@ -922,7 +900,6 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false }, "span": { @@ -957,7 +934,6 @@ "ctxt": 0 }, "value": "user", - "typeAnnotation": null, "optional": false }, "property": { @@ -968,7 +944,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -990,7 +965,6 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false } } @@ -1017,7 +991,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1051,8 +1024,8 @@ "ctxt": 0 }, "value": "k3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1071,7 +1044,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1169,7 +1141,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1203,8 +1174,8 @@ "ctxt": 0 }, "value": "k4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1223,7 +1194,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "span": { @@ -1263,7 +1233,6 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false }, "span": { @@ -1302,7 +1271,6 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false } } @@ -1333,7 +1301,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty12x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty12x/input.tsx.json index 19e43bc12f83..6b1a736cfc81 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty12x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty12x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "ButtonProp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -178,7 +174,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -207,7 +202,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -228,7 +222,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -254,7 +247,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -298,6 +290,7 @@ "ctxt": 0 }, "value": "condition", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -314,8 +307,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -337,7 +329,6 @@ "ctxt": 0 }, "value": "condition", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -372,7 +363,6 @@ "ctxt": 0 }, "value": "InnerButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -411,7 +401,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -466,7 +455,6 @@ "ctxt": 0 }, "value": "InnerButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -505,7 +493,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -543,7 +530,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -582,7 +568,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -613,7 +598,6 @@ "ctxt": 0 }, "value": "InnerButton", - "typeAnnotation": null, "optional": false } } @@ -652,7 +636,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -663,7 +646,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -693,7 +675,6 @@ "ctxt": 0 }, "value": "ButtonProp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -726,7 +707,6 @@ "ctxt": 0 }, "value": "InnerButtonProp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -756,7 +736,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -795,7 +774,6 @@ "ctxt": 0 }, "value": "InnerButton", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -821,7 +799,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -871,7 +848,6 @@ "ctxt": 0 }, "value": "button", - "typeAnnotation": null, "optional": false }, "span": { @@ -910,7 +886,6 @@ "ctxt": 0 }, "value": "button", - "typeAnnotation": null, "optional": false } } @@ -946,7 +921,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -957,7 +931,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -987,7 +960,6 @@ "ctxt": 0 }, "value": "InnerButtonProp", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty13x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty13x/input.tsx.json index ebc3e35c39ef..2690c0ca7b0f 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty13x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty13x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "ButtonProp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -178,7 +174,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -207,7 +202,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -228,7 +222,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -254,7 +247,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -304,7 +296,6 @@ "ctxt": 0 }, "value": "InnerButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -343,7 +334,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -364,7 +354,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "value": { @@ -414,7 +403,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -453,7 +441,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -484,7 +471,6 @@ "ctxt": 0 }, "value": "InnerButton", - "typeAnnotation": null, "optional": false } } @@ -520,7 +506,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -531,7 +516,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -561,7 +545,6 @@ "ctxt": 0 }, "value": "ButtonProp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -594,7 +577,6 @@ "ctxt": 0 }, "value": "InnerButtonProp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -624,7 +606,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -663,7 +644,6 @@ "ctxt": 0 }, "value": "InnerButton", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -689,7 +669,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -739,7 +718,6 @@ "ctxt": 0 }, "value": "button", - "typeAnnotation": null, "optional": false }, "span": { @@ -778,7 +756,6 @@ "ctxt": 0 }, "value": "button", - "typeAnnotation": null, "optional": false } } @@ -814,7 +791,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -825,7 +801,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -855,7 +830,6 @@ "ctxt": 0 }, "value": "InnerButtonProp", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty14x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty14x/input.tsx.json index 43654b739956..755033533a23 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty14x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty14x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -178,7 +174,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -217,7 +212,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -228,7 +222,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -258,7 +251,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -269,7 +261,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -294,7 +285,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -320,7 +310,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -370,7 +359,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -409,7 +397,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -445,7 +432,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -456,7 +442,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -503,7 +488,6 @@ "ctxt": 0 }, "value": "AnotherButton", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -524,6 +508,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -540,8 +525,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -583,7 +567,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "span": { @@ -622,7 +605,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false } } @@ -645,7 +627,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -666,6 +647,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -688,13 +670,11 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -736,7 +716,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -771,7 +750,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -782,7 +760,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -804,7 +781,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -842,8 +818,8 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -862,7 +838,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "span": { @@ -886,7 +861,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -922,7 +896,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -987,7 +960,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "span": { @@ -1019,7 +991,6 @@ "ctxt": 0 }, "value": "AnotherButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -1050,7 +1021,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false } } @@ -1084,8 +1054,8 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1104,7 +1074,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "span": { @@ -1128,7 +1097,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1164,7 +1132,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1220,7 +1187,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "span": { @@ -1262,7 +1228,6 @@ "ctxt": 0 }, "value": "AnotherButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -1293,7 +1258,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false } } @@ -1327,8 +1291,8 @@ "ctxt": 0 }, "value": "k3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1347,7 +1311,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "span": { @@ -1371,7 +1334,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1407,7 +1369,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1463,7 +1424,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "span": { @@ -1495,7 +1455,6 @@ "ctxt": 0 }, "value": "AnotherButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -1536,7 +1495,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false } } @@ -1560,7 +1518,6 @@ "ctxt": 0 }, "value": "SingleChildProp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1590,7 +1547,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1632,7 +1588,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1674,7 +1629,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1705,7 +1659,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -1716,7 +1669,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -1738,7 +1690,6 @@ "ctxt": 0 }, "value": "SingleChildComp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1759,6 +1710,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1781,13 +1733,11 @@ "ctxt": 0 }, "value": "SingleChildProp", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1829,7 +1779,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1864,7 +1813,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -1875,7 +1823,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1897,7 +1844,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1935,8 +1881,8 @@ "ctxt": 0 }, "value": "k4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1955,7 +1901,6 @@ "ctxt": 0 }, "value": "SingleChildComp", - "typeAnnotation": null, "optional": false }, "span": { @@ -1979,7 +1924,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2015,7 +1959,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2071,7 +2014,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "span": { @@ -2103,7 +2045,6 @@ "ctxt": 0 }, "value": "AnotherButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -2144,7 +2085,6 @@ "ctxt": 0 }, "value": "SingleChildComp", - "typeAnnotation": null, "optional": false } } @@ -2178,8 +2118,8 @@ "ctxt": 0 }, "value": "k5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2198,7 +2138,6 @@ "ctxt": 0 }, "value": "SingleChildComp", - "typeAnnotation": null, "optional": false }, "span": { @@ -2222,7 +2161,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2258,7 +2196,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2323,7 +2260,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "span": { @@ -2355,7 +2291,6 @@ "ctxt": 0 }, "value": "AnotherButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -2386,7 +2321,6 @@ "ctxt": 0 }, "value": "SingleChildComp", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty15x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty15x/input.tsx.json index 0afd332abf6b..2d714ce4b5f5 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty15x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty15x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -74,8 +73,8 @@ "ctxt": 0 }, "value": "Tag", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -93,6 +92,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -109,8 +109,7 @@ }, "members": [] } - }, - "optional": false + } } ], "body": { @@ -130,7 +129,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -158,7 +156,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -197,8 +194,8 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -217,7 +214,6 @@ "ctxt": 0 }, "value": "Tag", - "typeAnnotation": null, "optional": false }, "span": { @@ -261,8 +257,8 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -281,7 +277,6 @@ "ctxt": 0 }, "value": "Tag", - "typeAnnotation": null, "optional": false }, "span": { @@ -309,7 +304,6 @@ "ctxt": 0 }, "value": "Tag", - "typeAnnotation": null, "optional": false } } @@ -343,8 +337,8 @@ "ctxt": 0 }, "value": "k3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -363,7 +357,6 @@ "ctxt": 0 }, "value": "Tag", - "typeAnnotation": null, "optional": false }, "span": { @@ -387,7 +380,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "value": { @@ -414,7 +406,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -442,7 +433,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -485,8 +475,8 @@ "ctxt": 0 }, "value": "k4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -505,7 +495,6 @@ "ctxt": 0 }, "value": "Tag", - "typeAnnotation": null, "optional": false }, "span": { @@ -529,7 +518,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "value": { @@ -569,7 +557,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -597,7 +584,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -618,7 +604,6 @@ "ctxt": 0 }, "value": "Tag", - "typeAnnotation": null, "optional": false } } @@ -652,8 +637,8 @@ "ctxt": 0 }, "value": "k5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -672,7 +657,6 @@ "ctxt": 0 }, "value": "Tag", - "typeAnnotation": null, "optional": false }, "span": { @@ -696,7 +680,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "value": { @@ -736,7 +719,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -764,7 +746,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -786,7 +767,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -814,7 +794,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -835,7 +814,6 @@ "ctxt": 0 }, "value": "Tag", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty1x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty1x/input.tsx.json index 3e0343026626..95d958d425d3 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty1x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty1x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -178,7 +174,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -226,7 +221,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -237,7 +231,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -261,7 +254,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -282,6 +274,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -304,13 +297,11 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -352,7 +343,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -387,7 +377,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -398,7 +387,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -420,7 +408,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -458,8 +445,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -478,7 +465,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "span": { @@ -502,7 +488,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -538,7 +523,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -571,7 +555,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "value": { @@ -625,8 +608,8 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -645,7 +628,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "span": { @@ -669,7 +651,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -705,7 +686,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -754,7 +734,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false } } @@ -788,8 +767,8 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -808,7 +787,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "span": { @@ -832,7 +810,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -868,7 +845,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -918,7 +894,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -957,7 +932,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -988,7 +962,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty2x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty2x/input.tsx.json index cf02cc1d4fa8..6c3af14600c7 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty2x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty2x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -178,7 +174,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -226,7 +221,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -237,7 +231,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -261,7 +254,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -282,6 +274,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -304,13 +297,11 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -352,7 +343,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -387,7 +377,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -398,7 +387,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -420,7 +408,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -458,8 +445,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -478,7 +465,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "span": { @@ -502,7 +488,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -538,7 +523,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -592,8 +576,8 @@ "ctxt": 0 }, "value": "k0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -612,7 +596,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "span": { @@ -636,7 +619,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -672,7 +654,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -705,7 +686,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "value": { @@ -754,7 +734,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false } } @@ -788,8 +767,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -809,7 +788,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "value": { @@ -858,8 +836,8 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -878,7 +856,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "span": { @@ -902,7 +879,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -938,7 +914,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -971,7 +946,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } @@ -1006,7 +980,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false } } @@ -1040,8 +1013,8 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1060,7 +1033,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "span": { @@ -1084,7 +1056,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1120,7 +1091,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1170,7 +1140,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1209,7 +1178,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1247,6 +1215,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1263,8 +1232,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -1284,7 +1252,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1322,7 +1289,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false } }, @@ -1352,7 +1318,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1389,7 +1354,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false } } @@ -1423,8 +1387,8 @@ "ctxt": 0 }, "value": "k3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1443,7 +1407,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "span": { @@ -1467,7 +1430,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1503,7 +1465,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1553,7 +1514,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1592,7 +1552,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1650,7 +1609,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false } } @@ -1684,8 +1642,8 @@ "ctxt": 0 }, "value": "k4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1704,7 +1662,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "span": { @@ -1728,7 +1685,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1764,7 +1720,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1814,7 +1769,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1853,7 +1807,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1884,7 +1837,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false } } @@ -1918,8 +1870,8 @@ "ctxt": 0 }, "value": "k5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1938,7 +1890,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "span": { @@ -1962,7 +1913,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1998,7 +1948,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2048,7 +1997,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -2087,7 +2035,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -2119,7 +2066,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -2158,7 +2104,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -2189,7 +2134,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty3x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty3x/input.tsx.json index eecb093b83a1..3e38c52ea56c 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty3x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty3x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "IUser", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "Name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -138,7 +135,6 @@ "ctxt": 0 }, "value": "IFetchUserProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -168,7 +164,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -198,6 +193,7 @@ "ctxt": 0 }, "value": "user", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -220,13 +216,11 @@ "ctxt": 0 }, "value": "IUser", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -254,7 +248,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -265,7 +258,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -289,7 +281,6 @@ "ctxt": 0 }, "value": "FetchUser", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -315,7 +306,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -371,7 +361,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "computed": false @@ -413,7 +402,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -426,7 +414,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false @@ -464,7 +451,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "computed": false @@ -477,7 +463,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "computed": false @@ -525,7 +510,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -536,7 +520,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -566,7 +549,6 @@ "ctxt": 0 }, "value": "IFetchUserProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -594,7 +576,6 @@ "ctxt": 0 }, "value": "UserName0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -644,7 +625,6 @@ "ctxt": 0 }, "value": "FetchUser", - "typeAnnotation": null, "optional": false }, "span": { @@ -690,8 +670,8 @@ "ctxt": 0 }, "value": "user", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -718,7 +698,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "span": { @@ -753,7 +732,6 @@ "ctxt": 0 }, "value": "user", - "typeAnnotation": null, "optional": false }, "property": { @@ -764,7 +742,6 @@ "ctxt": 0 }, "value": "Name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -786,7 +763,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false } } @@ -824,7 +800,6 @@ "ctxt": 0 }, "value": "FetchUser", - "typeAnnotation": null, "optional": false } } @@ -848,7 +823,6 @@ "ctxt": 0 }, "value": "UserName1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -898,7 +872,6 @@ "ctxt": 0 }, "value": "FetchUser", - "typeAnnotation": null, "optional": false }, "span": { @@ -944,8 +917,8 @@ "ctxt": 0 }, "value": "user", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -972,7 +945,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "span": { @@ -1007,7 +979,6 @@ "ctxt": 0 }, "value": "user", - "typeAnnotation": null, "optional": false }, "property": { @@ -1018,7 +989,6 @@ "ctxt": 0 }, "value": "Name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1040,7 +1010,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false } } @@ -1078,7 +1047,6 @@ "ctxt": 0 }, "value": "FetchUser", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty4x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty4x/input.tsx.json index abe3cd5f43e0..596f2372e37d 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty4x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty4x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "IUser", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "Name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -138,7 +135,6 @@ "ctxt": 0 }, "value": "IFetchUserProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -168,7 +164,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -198,6 +193,7 @@ "ctxt": 0 }, "value": "user", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -220,13 +216,11 @@ "ctxt": 0 }, "value": "IUser", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -254,7 +248,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -265,7 +258,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -289,7 +281,6 @@ "ctxt": 0 }, "value": "FetchUser", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -315,7 +306,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -371,7 +361,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "computed": false @@ -413,7 +402,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -426,7 +414,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false @@ -464,7 +451,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "computed": false @@ -477,7 +463,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "computed": false @@ -525,7 +510,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -536,7 +520,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -566,7 +549,6 @@ "ctxt": 0 }, "value": "IFetchUserProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -594,7 +576,6 @@ "ctxt": 0 }, "value": "UserName", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -644,7 +625,6 @@ "ctxt": 0 }, "value": "FetchUser", - "typeAnnotation": null, "optional": false }, "span": { @@ -690,8 +670,8 @@ "ctxt": 0 }, "value": "user", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -718,7 +698,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "span": { @@ -753,7 +732,6 @@ "ctxt": 0 }, "value": "user", - "typeAnnotation": null, "optional": false }, "property": { @@ -764,7 +742,6 @@ "ctxt": 0 }, "value": "NAme", - "typeAnnotation": null, "optional": false }, "computed": false @@ -786,7 +763,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false } } @@ -824,7 +800,6 @@ "ctxt": 0 }, "value": "FetchUser", - "typeAnnotation": null, "optional": false } } @@ -848,7 +823,6 @@ "ctxt": 0 }, "value": "UserName1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -898,7 +872,6 @@ "ctxt": 0 }, "value": "FetchUser", - "typeAnnotation": null, "optional": false }, "span": { @@ -944,8 +917,8 @@ "ctxt": 0 }, "value": "user", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -972,7 +945,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "span": { @@ -1007,7 +979,6 @@ "ctxt": 0 }, "value": "user", - "typeAnnotation": null, "optional": false }, "property": { @@ -1018,7 +989,6 @@ "ctxt": 0 }, "value": "Name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1040,7 +1010,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false } } @@ -1085,8 +1054,8 @@ "ctxt": 0 }, "value": "user", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1113,7 +1082,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "span": { @@ -1148,7 +1116,6 @@ "ctxt": 0 }, "value": "user", - "typeAnnotation": null, "optional": false }, "property": { @@ -1159,7 +1126,6 @@ "ctxt": 0 }, "value": "Name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1181,7 +1147,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false } } @@ -1219,7 +1184,6 @@ "ctxt": 0 }, "value": "FetchUser", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty5x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty5x/input.tsx.json index 8d99a2e81d57..21e2ed17b43e 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty5x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty5x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -178,7 +174,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -207,7 +202,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -228,7 +222,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -254,7 +247,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -304,7 +296,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -343,7 +334,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -379,7 +369,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -390,7 +379,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -437,7 +425,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -458,6 +445,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -480,13 +468,11 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -528,7 +514,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -563,7 +548,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -574,7 +558,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -596,7 +579,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -634,8 +616,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -654,7 +636,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "span": { @@ -678,7 +659,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -714,7 +694,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -768,8 +747,8 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -788,7 +767,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "span": { @@ -812,7 +790,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -848,7 +825,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -898,7 +874,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "span": { @@ -939,7 +914,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false } } @@ -973,8 +947,8 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -993,7 +967,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "span": { @@ -1017,7 +990,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1053,7 +1025,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1101,7 +1072,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false } }, @@ -1131,7 +1101,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty6x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty6x/input.tsx.json index a3e9ccb81156..ac46900e7057 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty6x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty6x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -178,7 +174,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -217,7 +212,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -228,7 +222,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -258,7 +251,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -269,7 +261,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -294,7 +285,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -320,7 +310,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -370,7 +359,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -409,7 +397,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -445,7 +432,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -456,7 +442,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -503,7 +488,6 @@ "ctxt": 0 }, "value": "AnotherButton", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -524,6 +508,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -540,8 +525,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -583,7 +567,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "span": { @@ -622,7 +605,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false } } @@ -645,7 +627,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -666,6 +647,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -688,13 +670,11 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -736,7 +716,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -771,7 +750,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -782,7 +760,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -804,7 +781,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -842,8 +818,8 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -862,7 +838,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "span": { @@ -886,7 +861,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -922,7 +896,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -972,7 +945,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "span": { @@ -1014,7 +986,6 @@ "ctxt": 0 }, "value": "AnotherButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -1055,7 +1026,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false } } @@ -1089,8 +1059,8 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1109,7 +1079,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "span": { @@ -1133,7 +1102,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1169,7 +1137,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1219,7 +1186,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "span": { @@ -1261,7 +1227,6 @@ "ctxt": 0 }, "value": "AnotherButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -1302,7 +1267,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false } } @@ -1336,8 +1300,8 @@ "ctxt": 0 }, "value": "k3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1356,7 +1320,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "span": { @@ -1380,7 +1343,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1416,7 +1378,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1456,7 +1417,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "span": { @@ -1498,7 +1458,6 @@ "ctxt": 0 }, "value": "AnotherButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -1539,7 +1498,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false } } @@ -1573,8 +1531,8 @@ "ctxt": 0 }, "value": "k4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1593,7 +1551,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "span": { @@ -1617,7 +1574,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1653,7 +1609,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1693,7 +1648,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "span": { @@ -1724,7 +1678,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty7x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty7x/input.tsx.json index dcdc16892151..db2b9eac5eb2 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty7x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty7x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -178,7 +174,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -217,7 +212,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -228,7 +222,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -258,7 +251,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -269,7 +261,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -294,7 +285,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -320,7 +310,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -370,7 +359,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -409,7 +397,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -445,7 +432,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -456,7 +442,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -503,7 +488,6 @@ "ctxt": 0 }, "value": "AnotherButton", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -524,6 +508,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -540,8 +525,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -583,7 +567,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "span": { @@ -622,7 +605,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false } } @@ -645,7 +627,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -666,6 +647,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -688,13 +670,11 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -736,7 +716,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -771,7 +750,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -782,7 +760,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -804,7 +781,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -842,8 +818,8 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -862,7 +838,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "span": { @@ -886,7 +861,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -922,7 +896,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -962,7 +935,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "span": { @@ -1004,7 +976,6 @@ "ctxt": 0 }, "value": "AnotherButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -1035,7 +1006,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false } } @@ -1069,8 +1039,8 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1089,7 +1059,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "span": { @@ -1113,7 +1082,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1149,7 +1117,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1189,7 +1156,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "span": { @@ -1231,7 +1197,6 @@ "ctxt": 0 }, "value": "AnotherButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -1272,7 +1237,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false } } @@ -1306,8 +1270,8 @@ "ctxt": 0 }, "value": "k3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1326,7 +1290,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "span": { @@ -1350,7 +1313,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1386,7 +1348,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1436,7 +1397,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "span": { @@ -1478,7 +1438,6 @@ "ctxt": 0 }, "value": "AnotherButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -1509,7 +1468,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty8x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty8x/input.tsx.json index 67dafcd9e930..4b8d56e75ff1 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty8x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty8x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -178,7 +174,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -226,7 +221,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -237,7 +231,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -291,7 +284,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -302,7 +294,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -330,7 +321,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -356,7 +346,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -406,7 +395,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -445,7 +433,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -481,7 +468,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -492,7 +478,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -539,7 +524,6 @@ "ctxt": 0 }, "value": "AnotherButton", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -560,6 +544,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -576,8 +561,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -619,7 +603,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "span": { @@ -658,7 +641,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false } } @@ -681,7 +663,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -702,6 +683,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -724,13 +706,11 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -772,7 +752,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -807,7 +786,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -818,7 +796,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -840,7 +817,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -878,8 +854,8 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -898,7 +874,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "span": { @@ -922,7 +897,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -958,7 +932,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -998,7 +971,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "span": { @@ -1040,7 +1012,6 @@ "ctxt": 0 }, "value": "AnotherButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -1071,7 +1042,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false } } @@ -1105,8 +1075,8 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1125,7 +1095,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "span": { @@ -1149,7 +1118,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1185,7 +1153,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1225,7 +1192,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "span": { @@ -1267,7 +1233,6 @@ "ctxt": 0 }, "value": "AnotherButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -1308,7 +1273,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false } } @@ -1342,8 +1306,8 @@ "ctxt": 0 }, "value": "k3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1362,7 +1326,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "span": { @@ -1386,7 +1349,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1422,7 +1384,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1472,7 +1433,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "span": { @@ -1514,7 +1474,6 @@ "ctxt": 0 }, "value": "AnotherButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -1545,7 +1504,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false } } @@ -1579,8 +1537,8 @@ "ctxt": 0 }, "value": "k4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1599,7 +1557,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false }, "span": { @@ -1623,7 +1580,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1659,7 +1615,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1699,7 +1654,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "span": { @@ -1740,7 +1694,6 @@ "ctxt": 0 }, "value": "Comp", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty9x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty9x/input.tsx.json index 4de393d8224a..d9790161dda0 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty9x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxChildrenProperty9x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -74,8 +73,8 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -94,7 +93,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -134,7 +132,6 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false }, "span": { @@ -173,7 +170,6 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false } } @@ -205,7 +201,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "span": { @@ -244,7 +239,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false } } @@ -265,7 +259,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -299,8 +292,8 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -319,7 +312,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -359,7 +351,6 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false }, "span": { @@ -398,7 +389,6 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false } } @@ -436,6 +426,7 @@ "ctxt": 0 }, "value": "user", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -452,8 +443,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "body": { @@ -473,7 +463,6 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false }, "span": { @@ -508,7 +497,6 @@ "ctxt": 0 }, "value": "user", - "typeAnnotation": null, "optional": false }, "property": { @@ -519,7 +507,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -541,7 +528,6 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false } } @@ -568,7 +554,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -602,8 +587,8 @@ "ctxt": 0 }, "value": "k3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -622,7 +607,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -720,7 +704,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxGenericTagHasCorrectInferencesx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxGenericTagHasCorrectInferencesx/input.tsx.json index b0ed07033886..17d8593b638e 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxGenericTagHasCorrectInferencesx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxGenericTagHasCorrectInferencesx/input.tsx.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false } } @@ -66,7 +65,6 @@ "ctxt": 0 }, "value": "BaseProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -126,7 +123,6 @@ "ctxt": 0 }, "value": "initialValues", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -155,7 +151,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -179,7 +174,6 @@ "ctxt": 0 }, "value": "nextValues", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -209,6 +203,7 @@ "ctxt": 0 }, "value": "cur", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -231,13 +226,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -263,7 +256,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -286,7 +278,6 @@ "ctxt": 0 }, "value": "GenericComponent", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -312,7 +303,6 @@ "ctxt": 0 }, "value": "iv", - "typeAnnotation": null, "optional": false }, "value": null, @@ -338,7 +328,6 @@ "ctxt": 0 }, "value": "Values", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -370,7 +359,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -381,7 +369,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -410,7 +397,6 @@ "ctxt": 0 }, "value": "Props", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -439,7 +425,6 @@ "ctxt": 0 }, "value": "Values", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -486,7 +471,6 @@ "ctxt": 0 }, "value": "Props", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -506,7 +490,6 @@ "ctxt": 0 }, "value": "BaseProps", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -532,7 +515,6 @@ "ctxt": 0 }, "value": "Values", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -580,8 +562,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -600,7 +582,6 @@ "ctxt": 0 }, "value": "GenericComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -624,7 +605,6 @@ "ctxt": 0 }, "value": "initialValues", - "typeAnnotation": null, "optional": false }, "value": { @@ -652,7 +632,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -689,7 +668,6 @@ "ctxt": 0 }, "value": "nextValues", - "typeAnnotation": null, "optional": false }, "value": { @@ -715,8 +693,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -727,7 +705,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -773,8 +750,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -793,7 +770,6 @@ "ctxt": 0 }, "value": "GenericComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -817,7 +793,6 @@ "ctxt": 0 }, "value": "initialValues", - "typeAnnotation": null, "optional": false }, "value": { @@ -853,7 +828,6 @@ "ctxt": 0 }, "value": "nextValues", - "typeAnnotation": null, "optional": false }, "value": { @@ -879,8 +853,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -891,7 +865,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -937,8 +910,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -957,7 +930,6 @@ "ctxt": 0 }, "value": "GenericComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -981,7 +953,6 @@ "ctxt": 0 }, "value": "initialValues", - "typeAnnotation": null, "optional": false }, "value": { @@ -1009,7 +980,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1046,7 +1016,6 @@ "ctxt": 0 }, "value": "nextValues", - "typeAnnotation": null, "optional": false }, "value": { @@ -1072,8 +1041,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1101,7 +1070,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1119,7 +1087,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1130,7 +1097,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1182,8 +1148,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1202,7 +1168,6 @@ "ctxt": 0 }, "value": "GenericComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -1226,7 +1191,6 @@ "ctxt": 0 }, "value": "initialValues", - "typeAnnotation": null, "optional": false }, "value": { @@ -1254,7 +1218,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1291,7 +1254,6 @@ "ctxt": 0 }, "value": "nextValues", - "typeAnnotation": null, "optional": false }, "value": { @@ -1317,8 +1279,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1336,7 +1298,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1347,7 +1308,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxIntersectionElementPropsTypex/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxIntersectionElementPropsTypex/input.tsx.json index 4efd365aeb03..8ce7a3fab9f3 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxIntersectionElementPropsTypex/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxIntersectionElementPropsTypex/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "ElementAttributesProperty", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -121,7 +118,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -147,7 +143,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -167,6 +162,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -189,7 +185,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -215,7 +210,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -223,8 +217,7 @@ ] } } - }, - "optional": false + } } } ], @@ -247,7 +240,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "value": null, @@ -273,7 +265,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -299,7 +290,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -344,7 +334,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -365,7 +354,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -384,7 +372,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -411,7 +398,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -459,7 +445,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -502,7 +487,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -538,8 +522,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -556,7 +540,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -580,7 +563,6 @@ "ctxt": 0 }, "value": "foobar", - "typeAnnotation": null, "optional": false }, "value": { @@ -633,8 +615,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -653,7 +635,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "span": { @@ -677,7 +658,6 @@ "ctxt": 0 }, "value": "foobar", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxSubtleSkipContextSensitiveBugx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxSubtleSkipContextSensitiveBugx/input.tsx.json index 8867d2970940..b0a9452f48d7 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxSubtleSkipContextSensitiveBugx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxSubtleSkipContextSensitiveBugx/input.tsx.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false } } @@ -66,7 +65,6 @@ "ctxt": 0 }, "value": "ErrorResult", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "error", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -148,7 +145,6 @@ "ctxt": 0 }, "value": "AsyncLoaderProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -175,7 +171,6 @@ "ctxt": 0 }, "value": "TResult", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -208,7 +203,6 @@ "ctxt": 0 }, "value": "prop1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -253,7 +247,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -279,7 +272,6 @@ "ctxt": 0 }, "value": "TResult", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -308,7 +300,6 @@ "ctxt": 0 }, "value": "prop2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -338,6 +329,7 @@ "ctxt": 0 }, "value": "result", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -360,7 +352,6 @@ "ctxt": 0 }, "value": "Exclude", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -386,7 +377,6 @@ "ctxt": 0 }, "value": "TResult", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -406,7 +396,6 @@ "ctxt": 0 }, "value": "ErrorResult", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -414,8 +403,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -453,7 +441,6 @@ "ctxt": 0 }, "value": "AsyncLoader", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -479,7 +466,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -543,7 +529,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -554,7 +539,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -583,7 +567,6 @@ "ctxt": 0 }, "value": "TResult", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -614,7 +597,6 @@ "ctxt": 0 }, "value": "AsyncLoaderProps", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -640,7 +622,6 @@ "ctxt": 0 }, "value": "TResult", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -662,7 +643,6 @@ "ctxt": 0 }, "value": "load", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -706,7 +686,6 @@ "ctxt": 0 }, "value": "success", - "typeAnnotation": null, "optional": false }, "value": { @@ -749,7 +728,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -792,7 +770,6 @@ "ctxt": 0 }, "value": "success", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -843,7 +820,6 @@ "ctxt": 0 }, "value": "ErrorResult", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -880,8 +856,8 @@ "ctxt": 0 }, "value": "loader", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -900,7 +876,6 @@ "ctxt": 0 }, "value": "AsyncLoader", - "typeAnnotation": null, "optional": false }, "span": { @@ -924,7 +899,6 @@ "ctxt": 0 }, "value": "prop1", - "typeAnnotation": null, "optional": false }, "value": { @@ -942,7 +916,6 @@ "ctxt": 0 }, "value": "load", - "typeAnnotation": null, "optional": false } } @@ -962,7 +935,6 @@ "ctxt": 0 }, "value": "prop2", - "typeAnnotation": null, "optional": false }, "value": { @@ -988,8 +960,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1000,7 +972,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxUnionSFXContextualTypeInferredCorrectlyx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxUnionSFXContextualTypeInferredCorrectlyx/input.tsx.json index 490dc768a2f3..673735e02858 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxUnionSFXContextualTypeInferredCorrectlyx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/checkJsxUnionSFXContextualTypeInferredCorrectlyx/input.tsx.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false } } @@ -66,7 +65,6 @@ "ctxt": 0 }, "value": "PS", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "multi", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -146,7 +143,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -207,7 +203,6 @@ "ctxt": 0 }, "value": "onChange", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -237,6 +232,7 @@ "ctxt": 0 }, "value": "selection", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -272,8 +268,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -316,7 +311,6 @@ "ctxt": 0 }, "value": "PM", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -346,7 +340,6 @@ "ctxt": 0 }, "value": "multi", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -396,7 +389,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -446,7 +438,6 @@ "ctxt": 0 }, "value": "onChange", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -476,6 +467,7 @@ "ctxt": 0 }, "value": "selection", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -500,8 +492,7 @@ "kind": "string" } } - }, - "optional": false + } } ], "typeParams": null, @@ -546,7 +537,6 @@ "ctxt": 0 }, "value": "ComponentWithUnion", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -567,6 +557,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -597,7 +588,6 @@ "ctxt": 0 }, "value": "PM", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -617,15 +607,13 @@ "ctxt": 0 }, "value": "PS", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -667,7 +655,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "span": { @@ -695,7 +682,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false } } @@ -726,7 +712,6 @@ "ctxt": 0 }, "value": "HereIsTheError", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -776,7 +761,6 @@ "ctxt": 0 }, "value": "ComponentWithUnion", - "typeAnnotation": null, "optional": false }, "span": { @@ -800,7 +784,6 @@ "ctxt": 0 }, "value": "multi", - "typeAnnotation": null, "optional": false }, "value": { @@ -836,7 +819,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -877,7 +859,6 @@ "ctxt": 0 }, "value": "onChange", - "typeAnnotation": null, "optional": false }, "value": { @@ -903,8 +884,8 @@ "ctxt": 0 }, "value": "val", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -929,7 +910,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -940,7 +920,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -956,7 +935,6 @@ "ctxt": 0 }, "value": "val", - "typeAnnotation": null, "optional": false } } @@ -1009,7 +987,6 @@ "ctxt": 0 }, "value": "ComponentWithUnion", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1033,7 +1010,6 @@ "ctxt": 0 }, "value": "multi", - "typeAnnotation": null, "optional": false }, "value": { @@ -1056,7 +1032,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -1084,7 +1059,6 @@ "ctxt": 0 }, "value": "onChange", - "typeAnnotation": null, "optional": false }, "value": { @@ -1103,8 +1077,8 @@ "ctxt": 0 }, "value": "val", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1129,7 +1103,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -1140,7 +1113,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1156,7 +1128,6 @@ "ctxt": 0 }, "value": "val", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/commentEmittingInPreserveJsx1x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/commentEmittingInPreserveJsx1x/input.tsx.json index 05095e2be822..5ea0cd5a58eb 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/commentEmittingInPreserveJsx1x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/commentEmittingInPreserveJsx1x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -112,7 +110,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -142,7 +139,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -207,7 +203,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -237,7 +232,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -308,7 +302,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -338,7 +331,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -409,7 +401,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/correctlyMarkAliasAsReferences1x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/correctlyMarkAliasAsReferences1x/input.tsx.json index 7ba9a9e1d1f4..cf4783fc058b 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/correctlyMarkAliasAsReferences1x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/correctlyMarkAliasAsReferences1x/input.tsx.json @@ -54,7 +54,6 @@ "ctxt": 0 }, "value": "cx", - "typeAnnotation": null, "optional": false } } @@ -99,7 +98,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false } } @@ -146,8 +144,8 @@ "ctxt": 0 }, "value": "buttonProps", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -179,8 +177,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -199,7 +197,6 @@ "ctxt": 0 }, "value": "button", - "typeAnnotation": null, "optional": false }, "span": { @@ -223,7 +220,6 @@ "ctxt": 0 }, "value": "buttonProps", - "typeAnnotation": null, "optional": false } } @@ -259,7 +255,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -283,7 +278,6 @@ "ctxt": 0 }, "value": "className", - "typeAnnotation": null, "optional": false }, "value": { @@ -308,7 +302,6 @@ "ctxt": 0 }, "value": "cx", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -349,7 +342,6 @@ "ctxt": 0 }, "value": "class2", - "typeAnnotation": null, "optional": false }, "value": { @@ -403,7 +395,6 @@ "ctxt": 0 }, "value": "button", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/correctlyMarkAliasAsReferences2x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/correctlyMarkAliasAsReferences2x/input.tsx.json index 0b8d33a08c18..9acca4cda32e 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/correctlyMarkAliasAsReferences2x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/correctlyMarkAliasAsReferences2x/input.tsx.json @@ -54,7 +54,6 @@ "ctxt": 0 }, "value": "cx", - "typeAnnotation": null, "optional": false } } @@ -99,7 +98,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false } } @@ -146,6 +144,7 @@ "ctxt": 0 }, "value": "buttonProps", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -172,6 +171,7 @@ "ctxt": 0 }, "value": "attributeName", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -188,8 +188,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -231,8 +230,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -264,8 +262,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -284,7 +282,6 @@ "ctxt": 0 }, "value": "button", - "typeAnnotation": null, "optional": false }, "span": { @@ -308,7 +305,6 @@ "ctxt": 0 }, "value": "buttonProps", - "typeAnnotation": null, "optional": false } } @@ -344,7 +340,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -368,7 +363,6 @@ "ctxt": 0 }, "value": "className", - "typeAnnotation": null, "optional": false }, "value": { @@ -393,7 +387,6 @@ "ctxt": 0 }, "value": "cx", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -434,7 +427,6 @@ "ctxt": 0 }, "value": "class2", - "typeAnnotation": null, "optional": false }, "value": { @@ -488,7 +480,6 @@ "ctxt": 0 }, "value": "button", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/correctlyMarkAliasAsReferences3x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/correctlyMarkAliasAsReferences3x/input.tsx.json index 682d19698853..9b172b979ffd 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/correctlyMarkAliasAsReferences3x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/correctlyMarkAliasAsReferences3x/input.tsx.json @@ -54,7 +54,6 @@ "ctxt": 0 }, "value": "cx", - "typeAnnotation": null, "optional": false } } @@ -99,7 +98,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false } } @@ -146,8 +144,8 @@ "ctxt": 0 }, "value": "buttonProps", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -179,8 +177,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -199,7 +197,6 @@ "ctxt": 0 }, "value": "button", - "typeAnnotation": null, "optional": false }, "span": { @@ -223,7 +220,6 @@ "ctxt": 0 }, "value": "buttonProps", - "typeAnnotation": null, "optional": false } } @@ -259,7 +255,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -283,7 +278,6 @@ "ctxt": 0 }, "value": "className", - "typeAnnotation": null, "optional": false }, "value": { @@ -308,7 +302,6 @@ "ctxt": 0 }, "value": "cx", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -349,7 +342,6 @@ "ctxt": 0 }, "value": "class2", - "typeAnnotation": null, "optional": false }, "value": { @@ -403,7 +395,6 @@ "ctxt": 0 }, "value": "button", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/correctlyMarkAliasAsReferences4x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/correctlyMarkAliasAsReferences4x/input.tsx.json index f8725c3a903d..619f7ce8cda0 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/correctlyMarkAliasAsReferences4x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/correctlyMarkAliasAsReferences4x/input.tsx.json @@ -54,7 +54,6 @@ "ctxt": 0 }, "value": "cx", - "typeAnnotation": null, "optional": false } } @@ -99,7 +98,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false } } @@ -146,6 +144,7 @@ "ctxt": 0 }, "value": "buttonProps", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -172,6 +171,7 @@ "ctxt": 0 }, "value": "attributeName", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -188,8 +188,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -231,8 +230,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -264,8 +262,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -284,7 +282,6 @@ "ctxt": 0 }, "value": "button", - "typeAnnotation": null, "optional": false }, "span": { @@ -308,7 +305,6 @@ "ctxt": 0 }, "value": "buttonProps", - "typeAnnotation": null, "optional": false } }, @@ -327,7 +323,6 @@ "ctxt": 0 }, "value": "className", - "typeAnnotation": null, "optional": false }, "value": { @@ -352,7 +347,6 @@ "ctxt": 0 }, "value": "cx", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -393,7 +387,6 @@ "ctxt": 0 }, "value": "class2", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/inline/inlineJsxAndJsxFragPragmaOverridesCompilerOptionsx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/inline/inlineJsxAndJsxFragPragmaOverridesCompilerOptionsx/input.tsx.json index 26387a7d17ca..fbf2f2ba641a 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/inline/inlineJsxAndJsxFragPragmaOverridesCompilerOptionsx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/inline/inlineJsxAndJsxFragPragmaOverridesCompilerOptionsx/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "global", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -102,6 +99,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -118,8 +116,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -172,7 +169,6 @@ "ctxt": 0 }, "value": "createElement", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -223,7 +219,6 @@ "ctxt": 0 }, "value": "Fragment", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -274,7 +269,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -325,7 +319,6 @@ "ctxt": 0 }, "value": "Frag", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -376,7 +369,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -433,7 +425,6 @@ "ctxt": 0 }, "value": "createElement", - "typeAnnotation": null, "optional": false }, "imported": null @@ -453,7 +444,6 @@ "ctxt": 0 }, "value": "Fragment", - "typeAnnotation": null, "optional": false }, "imported": null @@ -516,7 +506,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -544,7 +533,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false } } @@ -583,7 +571,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "imported": null @@ -603,7 +590,6 @@ "ctxt": 0 }, "value": "Frag", - "typeAnnotation": null, "optional": false }, "imported": null @@ -666,7 +652,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -694,7 +679,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -733,7 +717,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "imported": null @@ -796,7 +779,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -824,7 +806,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -863,7 +844,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "imported": null @@ -909,7 +889,6 @@ "ctxt": 0 }, "value": "Fragment", - "typeAnnotation": null, "optional": false }, "imported": null @@ -972,7 +951,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -1000,7 +978,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/inline/inlineJsxAndJsxFragPragmax/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/inline/inlineJsxAndJsxFragPragmax/input.tsx.json index 3dc89a6a75ed..f5fcca67d08a 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/inline/inlineJsxAndJsxFragPragmax/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/inline/inlineJsxAndJsxFragPragmax/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "global", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -102,6 +99,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -118,8 +116,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -172,7 +169,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -223,7 +219,6 @@ "ctxt": 0 }, "value": "jsx", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -274,7 +269,6 @@ "ctxt": 0 }, "value": "Fragment", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -331,7 +325,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "imported": null @@ -351,7 +344,6 @@ "ctxt": 0 }, "value": "Fragment", - "typeAnnotation": null, "optional": false }, "imported": null @@ -414,7 +406,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -442,7 +433,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -481,7 +471,6 @@ "ctxt": 0 }, "value": "jsx", - "typeAnnotation": null, "optional": false }, "imported": null @@ -544,7 +533,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -572,7 +560,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/inline/inlineJsxFactoryDeclarationsLocalTypesx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/inline/inlineJsxFactoryDeclarationsLocalTypesx/input.tsx.json index 74178f983099..7a7cc391b622 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/inline/inlineJsxFactoryDeclarationsLocalTypesx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/inline/inlineJsxFactoryDeclarationsLocalTypesx/input.tsx.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "dom", - "typeAnnotation": null, "optional": false }, "body": { @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -84,7 +82,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -109,6 +106,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -125,8 +123,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -171,7 +168,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -201,7 +197,6 @@ "ctxt": 0 }, "value": "__domBrand", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -243,7 +238,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -281,7 +275,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -317,7 +310,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -349,7 +341,6 @@ "ctxt": 0 }, "value": "ElementClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -370,7 +361,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -400,7 +390,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -428,7 +417,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -454,7 +442,6 @@ "ctxt": 0 }, "value": "ElementAttributesProperty", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -484,7 +471,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -528,7 +514,6 @@ "ctxt": 0 }, "value": "ElementChildrenAttribute", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -558,7 +543,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -611,7 +595,6 @@ "ctxt": 0 }, "value": "dom", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -652,7 +635,6 @@ "ctxt": 0 }, "value": "dom", - "typeAnnotation": null, "optional": false }, "right": { @@ -663,7 +645,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false } }, @@ -675,7 +656,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -708,7 +688,6 @@ "ctxt": 0 }, "value": "predom", - "typeAnnotation": null, "optional": false }, "body": { @@ -736,7 +715,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -762,7 +740,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -787,6 +764,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -803,8 +781,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -849,7 +826,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -879,7 +855,6 @@ "ctxt": 0 }, "value": "__predomBrand", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -921,7 +896,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -959,7 +933,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -995,7 +968,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1027,7 +999,6 @@ "ctxt": 0 }, "value": "ElementClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1048,7 +1019,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1078,7 +1048,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1106,7 +1075,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1132,7 +1100,6 @@ "ctxt": 0 }, "value": "ElementAttributesProperty", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1162,7 +1129,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1206,7 +1172,6 @@ "ctxt": 0 }, "value": "ElementChildrenAttribute", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1236,7 +1201,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1289,7 +1253,6 @@ "ctxt": 0 }, "value": "predom", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1330,7 +1293,6 @@ "ctxt": 0 }, "value": "predom", - "typeAnnotation": null, "optional": false }, "right": { @@ -1341,7 +1303,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false } }, @@ -1353,7 +1314,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -1385,7 +1345,6 @@ "ctxt": 0 }, "value": "predom", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1440,8 +1399,8 @@ "ctxt": 0 }, "value": "MySFC", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1459,6 +1418,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1490,7 +1450,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1532,7 +1491,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1574,7 +1532,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1614,7 +1571,6 @@ "ctxt": 0 }, "value": "predom", - "typeAnnotation": null, "optional": false }, "right": { @@ -1625,7 +1581,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false } }, @@ -1637,7 +1592,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -1649,8 +1603,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -1670,7 +1623,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "span": { @@ -1705,7 +1657,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "property": { @@ -1716,7 +1667,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1754,7 +1704,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "property": { @@ -1765,7 +1714,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1811,7 +1759,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "property": { @@ -1822,7 +1769,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1842,7 +1788,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "property": { @@ -1853,7 +1798,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1897,7 +1841,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1910,7 +1853,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1932,7 +1874,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1964,7 +1905,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1990,7 +1930,6 @@ "ctxt": 0 }, "value": "__predomBrand", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2036,7 +1975,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2058,6 +1996,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2089,7 +2028,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2131,7 +2069,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2173,7 +2110,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2213,7 +2149,6 @@ "ctxt": 0 }, "value": "predom", - "typeAnnotation": null, "optional": false }, "right": { @@ -2224,7 +2159,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false } }, @@ -2236,7 +2170,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -2248,8 +2181,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2280,7 +2212,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -2323,7 +2254,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "span": { @@ -2383,7 +2313,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2396,7 +2325,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2449,7 +2377,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2462,7 +2389,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2523,7 +2449,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2536,7 +2461,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2571,7 +2495,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2584,7 +2507,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2638,7 +2560,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2651,7 +2572,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2683,7 +2603,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -2727,7 +2646,6 @@ "ctxt": 0 }, "value": "predom", - "typeAnnotation": null, "optional": false }, "right": { @@ -2738,7 +2656,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false } }, @@ -2750,7 +2667,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -2791,8 +2707,8 @@ "ctxt": 0 }, "value": "tree", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2811,7 +2727,6 @@ "ctxt": 0 }, "value": "MySFC", - "typeAnnotation": null, "optional": false }, "span": { @@ -2835,7 +2750,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -2871,7 +2785,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2914,7 +2827,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "span": { @@ -2938,7 +2850,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -2974,7 +2885,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -3019,7 +2929,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "span": { @@ -3043,7 +2952,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -3079,7 +2987,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -3123,7 +3030,6 @@ "ctxt": 0 }, "value": "MySFC", - "typeAnnotation": null, "optional": false } } @@ -3157,7 +3063,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "span": { @@ -3185,7 +3090,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false } } @@ -3214,7 +3118,6 @@ "ctxt": 0 }, "value": "dom", - "typeAnnotation": null, "optional": false }, "imported": null @@ -3260,7 +3163,6 @@ "ctxt": 0 }, "value": "prerendered", - "typeAnnotation": null, "optional": false } }, @@ -3279,7 +3181,6 @@ "ctxt": 0 }, "value": "MySFC", - "typeAnnotation": null, "optional": false }, "imported": null @@ -3299,7 +3200,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "imported": null @@ -3319,7 +3219,6 @@ "ctxt": 0 }, "value": "tree", - "typeAnnotation": null, "optional": false }, "imported": null @@ -3367,8 +3266,8 @@ "ctxt": 0 }, "value": "elem", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -3378,7 +3277,6 @@ "ctxt": 0 }, "value": "prerendered", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3408,8 +3306,8 @@ "ctxt": 0 }, "value": "elem", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "JSXElement", @@ -3428,7 +3326,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "span": { @@ -3456,7 +3353,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false } } @@ -3488,8 +3384,8 @@ "ctxt": 0 }, "value": "DOMSFC", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -3507,6 +3403,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3538,7 +3435,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3580,7 +3476,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3622,7 +3517,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3662,7 +3556,6 @@ "ctxt": 0 }, "value": "dom", - "typeAnnotation": null, "optional": false }, "right": { @@ -3673,7 +3566,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false } }, @@ -3685,7 +3577,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -3697,8 +3588,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -3718,7 +3608,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "span": { @@ -3753,7 +3642,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "property": { @@ -3764,7 +3652,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3802,7 +3689,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "property": { @@ -3813,7 +3699,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3859,7 +3744,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "property": { @@ -3870,7 +3754,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3890,7 +3773,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "property": { @@ -3901,7 +3783,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3930,7 +3811,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "property": { @@ -3941,7 +3821,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3963,7 +3842,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -3987,7 +3865,6 @@ "ctxt": 0 }, "value": "DOMClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4013,7 +3890,6 @@ "ctxt": 0 }, "value": "__domBrand", - "typeAnnotation": null, "optional": false }, "value": null, @@ -4059,7 +3935,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -4081,6 +3956,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4112,7 +3988,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4154,7 +4029,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4196,7 +4070,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4236,7 +4109,6 @@ "ctxt": 0 }, "value": "dom", - "typeAnnotation": null, "optional": false }, "right": { @@ -4247,7 +4119,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false } }, @@ -4259,7 +4130,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -4271,8 +4141,7 @@ } ] } - }, - "optional": false + } } } ], @@ -4303,7 +4172,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -4346,7 +4214,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "span": { @@ -4396,7 +4263,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4409,7 +4275,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4462,7 +4327,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4475,7 +4339,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4536,7 +4399,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4549,7 +4411,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4584,7 +4445,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4597,7 +4457,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4641,7 +4500,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4654,7 +4512,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4676,7 +4533,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -4720,7 +4576,6 @@ "ctxt": 0 }, "value": "dom", - "typeAnnotation": null, "optional": false }, "right": { @@ -4731,7 +4586,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false } }, @@ -4743,7 +4597,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -4776,8 +4629,8 @@ "ctxt": 0 }, "value": "_tree", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -4796,7 +4649,6 @@ "ctxt": 0 }, "value": "DOMSFC", - "typeAnnotation": null, "optional": false }, "span": { @@ -4820,7 +4672,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -4856,7 +4707,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -4899,7 +4749,6 @@ "ctxt": 0 }, "value": "DOMClass", - "typeAnnotation": null, "optional": false }, "span": { @@ -4923,7 +4772,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -4959,7 +4807,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -5004,7 +4851,6 @@ "ctxt": 0 }, "value": "DOMClass", - "typeAnnotation": null, "optional": false }, "span": { @@ -5028,7 +4874,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -5064,7 +4909,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -5108,7 +4952,6 @@ "ctxt": 0 }, "value": "DOMSFC", - "typeAnnotation": null, "optional": false } } @@ -5142,8 +4985,8 @@ "ctxt": 0 }, "value": "_brokenTree", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -5162,7 +5005,6 @@ "ctxt": 0 }, "value": "MySFC", - "typeAnnotation": null, "optional": false }, "span": { @@ -5186,7 +5028,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -5222,7 +5063,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -5265,7 +5105,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "span": { @@ -5289,7 +5128,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -5325,7 +5163,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -5370,7 +5207,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "span": { @@ -5394,7 +5230,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -5430,7 +5265,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -5474,7 +5308,6 @@ "ctxt": 0 }, "value": "MySFC", - "typeAnnotation": null, "optional": false } } @@ -5508,8 +5341,8 @@ "ctxt": 0 }, "value": "_brokenTree2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -5528,7 +5361,6 @@ "ctxt": 0 }, "value": "DOMSFC", - "typeAnnotation": null, "optional": false }, "span": { @@ -5552,7 +5384,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -5588,7 +5419,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -5629,7 +5459,6 @@ "ctxt": 0 }, "value": "tree", - "typeAnnotation": null, "optional": false } }, @@ -5648,7 +5477,6 @@ "ctxt": 0 }, "value": "tree", - "typeAnnotation": null, "optional": false } } @@ -5668,7 +5496,6 @@ "ctxt": 0 }, "value": "DOMSFC", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/inline/inlineJsxFactoryLocalTypeGlobalFallbackx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/inline/inlineJsxFactoryLocalTypeGlobalFallbackx/input.tsx.json index aaeb3ea788c1..562494eedffc 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/inline/inlineJsxFactoryLocalTypeGlobalFallbackx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/inline/inlineJsxFactoryLocalTypeGlobalFallbackx/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "global", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -102,6 +99,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -118,8 +116,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -164,7 +161,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -194,7 +190,6 @@ "ctxt": 0 }, "value": "__domBrand", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -236,7 +231,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -272,7 +266,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -297,7 +290,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -341,7 +333,6 @@ "ctxt": 0 }, "value": "ElementAttributesProperty", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -371,7 +362,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -415,7 +405,6 @@ "ctxt": 0 }, "value": "ElementChildrenAttribute", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -445,7 +434,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -497,7 +485,6 @@ "ctxt": 0 }, "value": "dom", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -536,7 +523,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -547,7 +533,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -580,7 +565,6 @@ "ctxt": 0 }, "value": "predom", - "typeAnnotation": null, "optional": false }, "body": { @@ -608,7 +592,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -634,7 +617,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -659,6 +641,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -675,8 +658,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -721,7 +703,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -751,7 +732,6 @@ "ctxt": 0 }, "value": "__predomBrand", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -793,7 +773,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -829,7 +808,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -854,7 +832,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -898,7 +875,6 @@ "ctxt": 0 }, "value": "ElementAttributesProperty", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -928,7 +904,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -972,7 +947,6 @@ "ctxt": 0 }, "value": "ElementChildrenAttribute", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1002,7 +976,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1055,7 +1028,6 @@ "ctxt": 0 }, "value": "predom", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1096,7 +1068,6 @@ "ctxt": 0 }, "value": "predom", - "typeAnnotation": null, "optional": false }, "right": { @@ -1107,7 +1078,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false } }, @@ -1119,7 +1089,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -1151,7 +1120,6 @@ "ctxt": 0 }, "value": "predom", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1198,7 +1166,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "span": { @@ -1226,7 +1193,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false } } @@ -1255,7 +1221,6 @@ "ctxt": 0 }, "value": "dom", - "typeAnnotation": null, "optional": false }, "imported": null @@ -1301,7 +1266,6 @@ "ctxt": 0 }, "value": "prerendered", - "typeAnnotation": null, "optional": false } } @@ -1348,8 +1312,8 @@ "ctxt": 0 }, "value": "elem", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1359,7 +1323,6 @@ "ctxt": 0 }, "value": "prerendered", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1389,8 +1352,8 @@ "ctxt": 0 }, "value": "elem", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "JSXElement", @@ -1409,7 +1372,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "span": { @@ -1437,7 +1399,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/inline/inlineJsxFactoryOverridesCompilerOptionx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/inline/inlineJsxFactoryOverridesCompilerOptionx/input.tsx.json index 30a7d6e7e4eb..75987fe32dff 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/inline/inlineJsxFactoryOverridesCompilerOptionx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/inline/inlineJsxFactoryOverridesCompilerOptionx/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "global", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -102,6 +99,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -118,8 +116,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -172,7 +169,6 @@ "ctxt": 0 }, "value": "dom", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -229,7 +225,6 @@ "ctxt": 0 }, "value": "dom", - "typeAnnotation": null, "optional": false }, "exported": { @@ -240,7 +235,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -272,7 +266,6 @@ "ctxt": 0 }, "value": "dom", - "typeAnnotation": null, "optional": false }, "imported": null @@ -319,7 +312,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "span": { @@ -347,7 +339,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false } } @@ -376,7 +367,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "imported": null @@ -423,7 +413,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "span": { @@ -451,7 +440,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/inline/inlineJsxFactoryWithFragmentIsErrorx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/inline/inlineJsxFactoryWithFragmentIsErrorx/input.tsx.json index fe85837cdb8b..f7cf35d2af1e 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/inline/inlineJsxFactoryWithFragmentIsErrorx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/inline/inlineJsxFactoryWithFragmentIsErrorx/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "global", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -102,6 +99,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -118,8 +116,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -172,7 +169,6 @@ "ctxt": 0 }, "value": "dom", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -223,7 +219,6 @@ "ctxt": 0 }, "value": "createElement", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -280,7 +275,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false } } @@ -342,7 +336,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "span": { @@ -370,7 +363,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false } } @@ -409,7 +401,6 @@ "ctxt": 0 }, "value": "dom", - "typeAnnotation": null, "optional": false }, "imported": null @@ -472,7 +463,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "span": { @@ -500,7 +490,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/jsxCheckJsxNoTypeArgumentsAllowedx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/jsxCheckJsxNoTypeArgumentsAllowedx/input.tsx.json index cb598e8f451a..d2689ee5cbbb 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/jsxCheckJsxNoTypeArgumentsAllowedx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/jsxCheckJsxNoTypeArgumentsAllowedx/input.tsx.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false } } @@ -68,7 +67,6 @@ "ctxt": 0 }, "value": "MyComp", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "internalProp", - "typeAnnotation": null, "optional": false }, "value": null, @@ -120,7 +117,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -152,7 +148,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -163,7 +158,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -192,7 +186,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -223,7 +216,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -264,7 +256,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -294,7 +285,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -336,7 +326,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -389,7 +378,6 @@ "ctxt": 0 }, "value": "MyComp", - "typeAnnotation": null, "optional": false }, "imported": null @@ -409,7 +397,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "imported": null @@ -455,7 +442,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false } } @@ -502,8 +488,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -522,7 +508,6 @@ "ctxt": 0 }, "value": "MyComp", - "typeAnnotation": null, "optional": false }, "span": { @@ -546,7 +531,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -582,7 +566,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -625,7 +608,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/jsxReactTestSuitex/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/jsxReactTestSuitex/input.tsx.json index 923d330adc78..3a4b5356fbb0 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/jsxReactTestSuitex/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/jsxReactTestSuitex/input.tsx.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "React", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "Component", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "Composite", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,6 +178,7 @@ "ctxt": 0 }, "value": "Composite2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -194,8 +195,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -227,6 +227,7 @@ "ctxt": 0 }, "value": "Child", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -243,8 +244,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -276,6 +276,7 @@ "ctxt": 0 }, "value": "Namespace", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -292,8 +293,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -325,6 +325,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,8 +342,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -374,6 +374,7 @@ "ctxt": 0 }, "value": "bar", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -390,8 +391,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -423,6 +423,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -439,8 +440,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -472,6 +472,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -488,8 +489,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -521,6 +521,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -537,8 +538,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -570,6 +570,7 @@ "ctxt": 0 }, "value": "hasOwnProperty", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -586,8 +587,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -618,7 +618,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -657,7 +656,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -687,7 +685,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -747,7 +744,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -760,7 +756,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false @@ -792,7 +787,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -822,7 +816,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -862,7 +855,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -892,7 +884,6 @@ "ctxt": 0 }, "value": "br", - "typeAnnotation": null, "optional": false }, "span": { @@ -923,7 +914,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -955,7 +945,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "span": { @@ -983,7 +972,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -1004,7 +992,6 @@ "ctxt": 0 }, "value": "br", - "typeAnnotation": null, "optional": false }, "span": { @@ -1034,7 +1021,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false } } @@ -1054,7 +1040,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false } } @@ -1086,7 +1071,6 @@ "ctxt": 0 }, "value": "br", - "typeAnnotation": null, "optional": false }, "span": { @@ -1127,7 +1111,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1157,7 +1140,6 @@ "ctxt": 0 }, "value": "Composite", - "typeAnnotation": null, "optional": false }, "span": { @@ -1217,7 +1199,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1230,7 +1211,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1262,7 +1242,6 @@ "ctxt": 0 }, "value": "Composite", - "typeAnnotation": null, "optional": false } } @@ -1292,7 +1271,6 @@ "ctxt": 0 }, "value": "Composite", - "typeAnnotation": null, "optional": false }, "span": { @@ -1332,7 +1310,6 @@ "ctxt": 0 }, "value": "Composite2", - "typeAnnotation": null, "optional": false }, "span": { @@ -1373,7 +1350,6 @@ "ctxt": 0 }, "value": "Composite", - "typeAnnotation": null, "optional": false } } @@ -1404,8 +1380,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1424,7 +1400,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1448,7 +1423,6 @@ "ctxt": 0 }, "value": "attr1", - "typeAnnotation": null, "optional": false }, "value": { @@ -1512,7 +1486,6 @@ "ctxt": 0 }, "value": "attr2", - "typeAnnotation": null, "optional": false }, "value": { @@ -1622,7 +1595,6 @@ "ctxt": 0 }, "value": "attr3", - "typeAnnotation": null, "optional": false }, "value": { @@ -1732,7 +1704,6 @@ "ctxt": 0 }, "value": "attr4", - "typeAnnotation": null, "optional": false }, "value": { @@ -1781,7 +1752,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1821,7 +1791,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1913,7 +1882,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -1978,7 +1946,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false } } @@ -2036,7 +2003,6 @@ "ctxt": 0 }, "value": "br", - "typeAnnotation": null, "optional": false }, "span": { @@ -2129,7 +2095,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -2167,7 +2132,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -2191,7 +2155,6 @@ "ctxt": 0 }, "value": "attr1", - "typeAnnotation": null, "optional": false }, "value": { @@ -2241,7 +2204,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -2265,7 +2227,6 @@ "ctxt": 0 }, "value": "attr2", - "typeAnnotation": null, "optional": false }, "value": { @@ -2316,7 +2277,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -2347,7 +2307,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -2386,7 +2345,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -2416,7 +2374,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -2455,7 +2412,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -2485,7 +2441,6 @@ "ctxt": 0 }, "value": "hasOwnProperty", - "typeAnnotation": null, "optional": false }, "span": { @@ -2524,7 +2479,6 @@ "ctxt": 0 }, "value": "hasOwnProperty", - "typeAnnotation": null, "optional": false } } @@ -2554,7 +2508,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "span": { @@ -2578,7 +2531,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "value": { @@ -2630,7 +2582,6 @@ "ctxt": 0 }, "value": "Namespace", - "typeAnnotation": null, "optional": false }, "property": { @@ -2641,7 +2592,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false } }, @@ -2686,7 +2636,6 @@ "ctxt": 0 }, "value": "Namespace", - "typeAnnotation": null, "optional": false }, "property": { @@ -2697,7 +2646,6 @@ "ctxt": 0 }, "value": "DeepNamespace", - "typeAnnotation": null, "optional": false } }, @@ -2709,7 +2657,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false } }, @@ -2750,7 +2697,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "span": { @@ -2774,7 +2720,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2793,7 +2738,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2829,7 +2773,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null @@ -2866,7 +2809,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "span": { @@ -2905,7 +2847,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2926,7 +2867,6 @@ "ctxt": 0 }, "value": "sound", - "typeAnnotation": null, "optional": false }, "value": { @@ -2976,7 +2916,6 @@ "ctxt": 0 }, "value": "font-face", - "typeAnnotation": null, "optional": false }, "span": { @@ -3016,7 +2955,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "span": { @@ -3040,7 +2978,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -3058,7 +2995,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -3095,7 +3031,6 @@ "ctxt": 0 }, "value": "x-component", - "typeAnnotation": null, "optional": false }, "span": { @@ -3135,7 +3070,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "span": { @@ -3159,7 +3093,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3195,7 +3128,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "span": { @@ -3219,7 +3151,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3238,7 +3169,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -3291,7 +3221,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "span": { @@ -3315,7 +3244,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3334,7 +3262,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -3370,7 +3297,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null @@ -3407,7 +3333,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "span": { @@ -3431,7 +3356,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -3467,7 +3391,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -3503,7 +3426,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "span": { @@ -3527,7 +3449,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -3563,7 +3484,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -3596,7 +3516,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } }, @@ -3615,7 +3534,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -3641,7 +3559,6 @@ "ctxt": 0 }, "value": "Child", - "typeAnnotation": null, "optional": false }, "span": { @@ -3672,7 +3589,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false } } @@ -3702,7 +3618,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "span": { @@ -3726,7 +3641,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -3782,8 +3696,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -3803,7 +3717,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -3827,7 +3740,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } ] @@ -3849,7 +3761,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -3901,7 +3812,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/jsxSpreadOverwritesAttributeStrictx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/jsxSpreadOverwritesAttributeStrictx/input.tsx.json index 033f77e637e6..8a841adab12b 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/jsxSpreadOverwritesAttributeStrictx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/jsxSpreadOverwritesAttributeStrictx/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "Props", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -178,7 +174,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -220,7 +215,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -274,6 +268,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -296,13 +291,11 @@ "ctxt": 0 }, "value": "Props", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -322,7 +315,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -345,7 +337,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -389,8 +380,8 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -408,6 +399,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -430,13 +422,11 @@ "ctxt": 0 }, "value": "Props", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -456,7 +446,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -491,7 +480,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "property": { @@ -502,7 +490,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -524,7 +511,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -563,8 +549,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -583,7 +569,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "span": { @@ -607,7 +592,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } } @@ -631,7 +615,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } } @@ -665,8 +648,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -685,7 +668,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "span": { @@ -709,7 +691,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -745,7 +726,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } } @@ -769,7 +749,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } } @@ -803,8 +782,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -823,7 +802,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "span": { @@ -847,7 +825,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -883,7 +860,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } } @@ -907,7 +883,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } } @@ -941,8 +916,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -961,7 +936,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "span": { @@ -985,7 +959,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1021,7 +994,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1057,7 +1029,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } } @@ -1081,7 +1052,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } } @@ -1115,8 +1085,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1135,7 +1105,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "span": { @@ -1159,7 +1128,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1195,7 +1163,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -1231,7 +1198,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } }, @@ -1260,7 +1226,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -1296,7 +1261,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } } @@ -1330,8 +1294,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1350,7 +1314,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "span": { @@ -1374,7 +1337,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1410,7 +1372,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -1446,7 +1407,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } }, @@ -1475,7 +1435,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1498,7 +1457,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -1534,7 +1492,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformChildrenx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformChildrenx/input.tsx.json index e55644ab2d5a..f86cab39d335 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformChildrenx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformChildrenx/input.tsx.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -51,7 +51,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -90,7 +89,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformCustomImportPragmax/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformCustomImportPragmax/input.tsx.json index 1f692d54c6b9..74309664d904 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformCustomImportPragmax/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformCustomImportPragmax/input.tsx.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXFragment", @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "span": { @@ -105,7 +104,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -137,7 +135,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -161,7 +158,6 @@ "ctxt": 0 }, "value": "className", - "typeAnnotation": null, "optional": false }, "value": { @@ -199,7 +195,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -290,8 +285,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXFragment", @@ -336,7 +331,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "span": { @@ -364,7 +358,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -396,7 +389,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -420,7 +412,6 @@ "ctxt": 0 }, "value": "className", - "typeAnnotation": null, "optional": false }, "value": { @@ -458,7 +449,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformCustomImportx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformCustomImportx/input.tsx.json index ba78a7411c4d..cae6723186e5 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformCustomImportx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformCustomImportx/input.tsx.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXFragment", @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "span": { @@ -105,7 +104,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -137,7 +135,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -161,7 +158,6 @@ "ctxt": 0 }, "value": "className", - "typeAnnotation": null, "optional": false }, "value": { @@ -199,7 +195,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformKeyPropCustomImportPragmax/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformKeyPropCustomImportPragmax/input.tsx.json index e99f35ce302f..0ee58e1b801c 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformKeyPropCustomImportPragmax/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformKeyPropCustomImportPragmax/input.tsx.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "answer", - "typeAnnotation": null, "optional": false }, "value": { @@ -96,8 +95,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -116,7 +115,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -140,7 +138,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "value": { @@ -173,7 +170,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } } @@ -208,7 +204,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -242,8 +237,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -262,7 +257,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -286,7 +280,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } }, @@ -305,7 +298,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "value": { @@ -354,7 +346,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -425,8 +416,8 @@ "ctxt": 0 }, "value": "props2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -446,7 +437,6 @@ "ctxt": 0 }, "value": "answer", - "typeAnnotation": null, "optional": false }, "value": { @@ -490,8 +480,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -510,7 +500,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -534,7 +523,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "value": { @@ -567,7 +555,6 @@ "ctxt": 0 }, "value": "props2", - "typeAnnotation": null, "optional": false } } @@ -602,7 +589,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -636,8 +622,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -656,7 +642,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -680,7 +665,6 @@ "ctxt": 0 }, "value": "props2", - "typeAnnotation": null, "optional": false } }, @@ -699,7 +683,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "value": { @@ -748,7 +731,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformKeyPropCustomImportx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformKeyPropCustomImportx/input.tsx.json index 3758ba4a4997..00ebb5c9fa85 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformKeyPropCustomImportx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformKeyPropCustomImportx/input.tsx.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "answer", - "typeAnnotation": null, "optional": false }, "value": { @@ -96,8 +95,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -116,7 +115,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -140,7 +138,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "value": { @@ -173,7 +170,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } } @@ -208,7 +204,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -242,8 +237,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -262,7 +257,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -286,7 +280,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } }, @@ -305,7 +298,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "value": { @@ -354,7 +346,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformKeyPropx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformKeyPropx/input.tsx.json index e5c841fb033e..650cfb336c7b 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformKeyPropx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformKeyPropx/input.tsx.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "answer", - "typeAnnotation": null, "optional": false }, "value": { @@ -96,8 +95,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -116,7 +115,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -140,7 +138,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "value": { @@ -173,7 +170,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } } @@ -208,7 +204,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -242,8 +237,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -262,7 +257,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -286,7 +280,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } }, @@ -305,7 +298,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "value": { @@ -354,7 +346,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformNestedSelfClosingChildx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformNestedSelfClosingChildx/input.tsx.json index 79f1d4cc8c10..0749e948f257 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformNestedSelfClosingChildx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformNestedSelfClosingChildx/input.tsx.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false } } @@ -80,7 +79,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -91,7 +89,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -197,7 +192,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -236,7 +230,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -247,7 +240,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -272,7 +264,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -312,7 +303,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -354,7 +344,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -395,7 +384,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -434,7 +422,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -445,7 +432,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -470,7 +456,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -556,7 +541,6 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -580,8 +564,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -601,7 +585,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -625,7 +608,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "value": { @@ -643,7 +625,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -668,7 +649,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -688,7 +668,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -729,7 +708,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformSubstitutesNamesFragmentx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformSubstitutesNamesFragmentx/input.tsx.json index e0c93fe38223..ae27b06b57cd 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformSubstitutesNamesFragmentx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformSubstitutesNamesFragmentx/input.tsx.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXFragment", @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "span": { @@ -105,7 +104,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -137,7 +135,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -165,7 +162,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformSubstitutesNamesx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformSubstitutesNamesx/input.tsx.json index df68ac12551f..aed51c0ca1a5 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformSubstitutesNamesx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/jsxs/jsxJsxsCjsTransformSubstitutesNamesx/input.tsx.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -51,7 +51,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -79,7 +78,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeErrorsx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeErrorsx/input.tsx.json index 6349b48d4869..cf91013774eb 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeErrorsx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeErrorsx/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -148,7 +144,6 @@ "ctxt": 0 }, "value": "text", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "width", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -237,7 +231,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -293,7 +286,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -317,7 +309,6 @@ "ctxt": 0 }, "value": "text", - "typeAnnotation": null, "optional": false }, "value": { @@ -370,7 +361,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -394,7 +384,6 @@ "ctxt": 0 }, "value": "width", - "typeAnnotation": null, "optional": false }, "value": { @@ -453,8 +442,8 @@ "ctxt": 0 }, "value": "attribs", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -474,7 +463,6 @@ "ctxt": 0 }, "value": "text", - "typeAnnotation": null, "optional": false }, "value": { @@ -517,7 +505,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -541,7 +528,6 @@ "ctxt": 0 }, "value": "attribs", - "typeAnnotation": null, "optional": false } } @@ -577,7 +563,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -601,7 +586,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -634,7 +618,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution10x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution10x/input.tsx.json index 12380ce218ac..3be07fce0014 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution10x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution10x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -111,7 +108,6 @@ "ctxt": 0 }, "value": "ElementAttributesProperty", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -141,7 +137,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "MyComponent", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -246,7 +239,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "value": null, @@ -276,6 +268,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -292,8 +285,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -365,7 +357,6 @@ "ctxt": 0 }, "value": "MyComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -389,7 +380,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -439,7 +429,6 @@ "ctxt": 0 }, "value": "MyComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -463,7 +452,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -516,7 +504,6 @@ "ctxt": 0 }, "value": "MyComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -540,7 +527,6 @@ "ctxt": 0 }, "value": "data-bar", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution11x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution11x/input.tsx.json index ef9a282a3bb1..9ec4065477e7 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution11x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution11x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -111,7 +108,6 @@ "ctxt": 0 }, "value": "ElementAttributesProperty", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -141,7 +137,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -169,7 +164,6 @@ "ctxt": 0 }, "value": "IntrinsicAttributes", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -199,7 +193,6 @@ "ctxt": 0 }, "value": "ref", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -241,7 +234,6 @@ "ctxt": 0 }, "value": "MyComponent", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -267,7 +259,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -313,7 +304,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "value": null, @@ -348,7 +338,6 @@ "ctxt": 0 }, "value": "ref", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -419,8 +408,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -439,7 +428,6 @@ "ctxt": 0 }, "value": "MyComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -463,7 +451,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution12x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution12x/input.tsx.json index fc615adc2203..6f20b36899bc 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution12x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution12x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -111,7 +108,6 @@ "ctxt": 0 }, "value": "ElementAttributesProperty", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -141,7 +137,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -169,7 +164,6 @@ "ctxt": 0 }, "value": "IntrinsicAttributes", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -199,7 +193,6 @@ "ctxt": 0 }, "value": "ref", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -241,7 +234,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -267,7 +259,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -287,6 +278,7 @@ "ctxt": 0 }, "value": "props", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -309,13 +301,11 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } }, { @@ -334,6 +324,7 @@ "ctxt": 0 }, "value": "context", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -350,8 +341,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -374,7 +364,6 @@ "ctxt": 0 }, "value": "setState", - "typeAnnotation": null, "optional": false }, "function": { @@ -395,6 +384,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -418,6 +408,7 @@ "ctxt": 0 }, "value": "prevState", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -440,13 +431,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -456,6 +445,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -478,13 +468,11 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -510,15 +498,13 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -537,6 +523,7 @@ "ctxt": 0 }, "value": "callback", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -571,8 +558,7 @@ } } } - }, - "optional": true + } } } ], @@ -625,7 +611,6 @@ "ctxt": 0 }, "value": "setState", - "typeAnnotation": null, "optional": false }, "function": { @@ -646,6 +631,7 @@ "ctxt": 0 }, "value": "state", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -668,13 +654,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -693,6 +677,7 @@ "ctxt": 0 }, "value": "callback", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -727,8 +712,7 @@ } } } - }, - "optional": true + } } } ], @@ -781,7 +765,6 @@ "ctxt": 0 }, "value": "forceUpdate", - "typeAnnotation": null, "optional": false }, "function": { @@ -802,6 +785,7 @@ "ctxt": 0 }, "value": "callBack", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -836,8 +820,7 @@ } } } - }, - "optional": true + } } } ], @@ -890,7 +873,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -929,7 +911,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -940,7 +921,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -969,7 +949,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "value": null, @@ -995,7 +974,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1026,7 +1004,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1052,7 +1029,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1083,7 +1059,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1140,7 +1115,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1161,7 +1135,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1187,7 +1160,6 @@ "ctxt": 0 }, "value": "ComponentClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1214,7 +1186,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1247,6 +1218,7 @@ "ctxt": 0 }, "value": "props", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1269,13 +1241,11 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } }, { "type": "Identifier", @@ -1285,6 +1255,7 @@ "ctxt": 0 }, "value": "context", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1301,8 +1272,7 @@ }, "kind": "any" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -1327,7 +1297,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1353,7 +1322,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1393,7 +1361,6 @@ "ctxt": 0 }, "value": "TestMod", - "typeAnnotation": null, "optional": false }, "body": { @@ -1419,7 +1386,6 @@ "ctxt": 0 }, "value": "TestClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1440,7 +1406,6 @@ "ctxt": 0 }, "value": "ComponentClass", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1475,7 +1440,6 @@ "ctxt": 0 }, "value": "reqd", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1542,6 +1506,7 @@ "ctxt": 0 }, "value": "Test", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1564,13 +1529,11 @@ "ctxt": 0 }, "value": "TestClass", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1605,8 +1568,8 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1623,7 +1586,6 @@ "ctxt": 0 }, "value": "TestMod", - "typeAnnotation": null, "optional": false }, "property": { @@ -1634,7 +1596,6 @@ "ctxt": 0 }, "value": "Test", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1668,8 +1629,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1688,7 +1649,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "span": { @@ -1732,8 +1692,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1754,7 +1714,6 @@ "ctxt": 0 }, "value": "TestMod", - "typeAnnotation": null, "optional": false }, "property": { @@ -1765,7 +1724,6 @@ "ctxt": 0 }, "value": "Test", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution13x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution13x/input.tsx.json index 9dd2ebe95800..9e6b44acd328 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution13x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution13x/input.tsx.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Test", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -65,7 +64,6 @@ "ctxt": 0 }, "value": "Test", - "typeAnnotation": null, "optional": false }, "span": { @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "Test", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution14x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution14x/input.tsx.json index 382d2a7fab14..98b169362366 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution14x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution14x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -154,7 +150,6 @@ "ctxt": 0 }, "value": "ElementAttributesProperty", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -231,7 +225,6 @@ "ctxt": 0 }, "value": "IProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -261,7 +254,6 @@ "ctxt": 0 }, "value": "primaryText", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -298,6 +290,7 @@ "ctxt": 0 }, "value": "propName", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -314,8 +307,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -374,7 +366,6 @@ "ctxt": 0 }, "value": "VerticalNavMenuItem", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -395,6 +386,7 @@ "ctxt": 0 }, "value": "prop", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -417,13 +409,11 @@ "ctxt": 0 }, "value": "IProps", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -465,7 +455,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -504,7 +493,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -527,7 +515,6 @@ "ctxt": 0 }, "value": "VerticalNav", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -577,7 +564,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -617,7 +603,6 @@ "ctxt": 0 }, "value": "VerticalNavMenuItem", - "typeAnnotation": null, "optional": false }, "span": { @@ -641,7 +626,6 @@ "ctxt": 0 }, "value": "primaryText", - "typeAnnotation": null, "optional": false }, "value": { @@ -696,7 +680,6 @@ "ctxt": 0 }, "value": "VerticalNavMenuItem", - "typeAnnotation": null, "optional": false }, "span": { @@ -720,7 +703,6 @@ "ctxt": 0 }, "value": "justRandomProp", - "typeAnnotation": null, "optional": false }, "value": { @@ -756,7 +738,6 @@ "ctxt": 0 }, "value": "primaryText", - "typeAnnotation": null, "optional": false }, "value": { @@ -816,7 +797,6 @@ "ctxt": 0 }, "value": "VerticalNavMenuItem", - "typeAnnotation": null, "optional": false }, "span": { @@ -840,7 +820,6 @@ "ctxt": 0 }, "value": "justRandomProp1", - "typeAnnotation": null, "optional": false }, "value": { @@ -876,7 +855,6 @@ "ctxt": 0 }, "value": "primaryText", - "typeAnnotation": null, "optional": false }, "value": { @@ -935,7 +913,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution15x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution15x/input.tsx.json index 1f5c02ef3430..06bd759b9c9e 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution15x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution15x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "BigGreeter", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -85,7 +83,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -167,7 +163,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -201,7 +196,6 @@ "ctxt": 0 }, "value": "greeting", - "typeAnnotation": null, "optional": false }, "value": null, @@ -248,7 +242,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -259,7 +252,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -321,8 +313,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -341,7 +333,6 @@ "ctxt": 0 }, "value": "BigGreeter", - "typeAnnotation": null, "optional": false }, "span": { @@ -365,7 +356,6 @@ "ctxt": 0 }, "value": "prop1", - "typeAnnotation": null, "optional": false }, "value": { @@ -419,8 +409,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -439,7 +429,6 @@ "ctxt": 0 }, "value": "BigGreeter", - "typeAnnotation": null, "optional": false }, "span": { @@ -463,7 +452,6 @@ "ctxt": 0 }, "value": "ref", - "typeAnnotation": null, "optional": false }, "value": { @@ -489,8 +477,8 @@ "ctxt": 0 }, "value": "input", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -539,7 +527,6 @@ "ctxt": 0 }, "value": "textInput", - "typeAnnotation": null, "optional": false }, "computed": false @@ -552,7 +539,6 @@ "ctxt": 0 }, "value": "input", - "typeAnnotation": null, "optional": false } } @@ -602,8 +588,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -622,7 +608,6 @@ "ctxt": 0 }, "value": "BigGreeter", - "typeAnnotation": null, "optional": false }, "span": { @@ -646,7 +631,6 @@ "ctxt": 0 }, "value": "data-extra", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution16x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution16x/input.tsx.json index 96918285fcb1..f1ee18e5bc93 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution16x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution16x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "Address", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "street", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "country", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -180,7 +176,6 @@ "ctxt": 0 }, "value": "CanadianAddress", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -201,7 +196,6 @@ "ctxt": 0 }, "value": "Address", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -231,7 +225,6 @@ "ctxt": 0 }, "value": "postalCode", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -275,7 +268,6 @@ "ctxt": 0 }, "value": "AmericanAddress", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -296,7 +288,6 @@ "ctxt": 0 }, "value": "Address", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -326,7 +317,6 @@ "ctxt": 0 }, "value": "zipCode", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -371,7 +361,6 @@ "ctxt": 0 }, "value": "Properties", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -398,7 +387,6 @@ "ctxt": 0 }, "value": "CanadianAddress", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -418,7 +406,6 @@ "ctxt": 0 }, "value": "AmericanAddress", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -443,7 +430,6 @@ "ctxt": 0 }, "value": "AddressComp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -469,7 +455,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -533,7 +518,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -544,7 +528,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -574,7 +557,6 @@ "ctxt": 0 }, "value": "Properties", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -618,8 +600,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -638,7 +620,6 @@ "ctxt": 0 }, "value": "AddressComp", - "typeAnnotation": null, "optional": false }, "span": { @@ -662,7 +643,6 @@ "ctxt": 0 }, "value": "postalCode", - "typeAnnotation": null, "optional": false }, "value": { @@ -695,7 +675,6 @@ "ctxt": 0 }, "value": "street", - "typeAnnotation": null, "optional": false }, "value": { @@ -728,7 +707,6 @@ "ctxt": 0 }, "value": "country", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution1x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution1x/input.tsx.json index 18d221d819de..b084bae61e3c 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution1x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution1x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -139,7 +135,6 @@ "ctxt": 0 }, "value": "Attribs1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -163,7 +158,6 @@ "ctxt": 0 }, "value": "test2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -201,7 +195,6 @@ "ctxt": 0 }, "value": "reqd", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -248,7 +241,6 @@ "ctxt": 0 }, "value": "var", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -286,7 +278,6 @@ "ctxt": 0 }, "value": "var", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -338,7 +329,6 @@ "ctxt": 0 }, "value": "Attribs1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -368,7 +358,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -410,7 +399,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -463,7 +451,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -487,7 +474,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -540,7 +526,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -580,7 +565,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -604,7 +588,6 @@ "ctxt": 0 }, "value": "data-x", - "typeAnnotation": null, "optional": false }, "value": { @@ -657,7 +640,6 @@ "ctxt": 0 }, "value": "test2", - "typeAnnotation": null, "optional": false }, "span": { @@ -681,7 +663,6 @@ "ctxt": 0 }, "value": "reqd", - "typeAnnotation": null, "optional": false }, "value": { @@ -731,7 +712,6 @@ "ctxt": 0 }, "value": "test2", - "typeAnnotation": null, "optional": false }, "span": { @@ -755,7 +735,6 @@ "ctxt": 0 }, "value": "reqd", - "typeAnnotation": null, "optional": false }, "value": { @@ -813,7 +792,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -837,7 +815,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -895,7 +872,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -919,7 +895,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -972,7 +947,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -996,7 +970,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1046,7 +1019,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -1070,7 +1042,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1120,7 +1091,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -1144,7 +1114,6 @@ "ctxt": 0 }, "value": "var", - "typeAnnotation": null, "optional": false }, "value": { @@ -1194,7 +1163,6 @@ "ctxt": 0 }, "value": "test2", - "typeAnnotation": null, "optional": false }, "span": { @@ -1234,7 +1202,6 @@ "ctxt": 0 }, "value": "test2", - "typeAnnotation": null, "optional": false }, "span": { @@ -1258,7 +1225,6 @@ "ctxt": 0 }, "value": "reqd", - "typeAnnotation": null, "optional": false }, "value": { @@ -1311,7 +1277,6 @@ "ctxt": 0 }, "value": "var", - "typeAnnotation": null, "optional": false }, "span": { @@ -1335,7 +1300,6 @@ "ctxt": 0 }, "value": "var", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution2x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution2x/input.tsx.json index 93655c457818..6f7a32753936 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution2x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution2x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -139,7 +135,6 @@ "ctxt": 0 }, "value": "Attribs1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -168,7 +163,6 @@ "ctxt": 0 }, "value": "Attribs1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -198,7 +192,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -228,6 +221,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -244,8 +238,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -297,7 +290,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -321,7 +313,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "value": { @@ -347,8 +338,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -366,7 +357,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -377,7 +367,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -421,7 +410,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -445,7 +433,6 @@ "ctxt": 0 }, "value": "data-c1", - "typeAnnotation": null, "optional": false }, "value": { @@ -471,8 +458,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -490,7 +477,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -501,7 +487,6 @@ "ctxt": 0 }, "value": "leng", - "typeAnnotation": null, "optional": false }, "computed": false @@ -545,7 +530,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -569,7 +553,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "value": { @@ -595,8 +578,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -614,7 +597,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -625,7 +607,6 @@ "ctxt": 0 }, "value": "leng", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution3x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution3x/input.tsx.json index 3af325b90ab3..fedec54ca35e 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution3x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution3x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -139,7 +135,6 @@ "ctxt": 0 }, "value": "Attribs1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -168,7 +163,6 @@ "ctxt": 0 }, "value": "Attribs1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -198,7 +192,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -282,7 +274,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -336,8 +327,8 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -357,7 +348,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -405,7 +395,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -429,7 +418,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } } @@ -466,8 +454,8 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -487,7 +475,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -530,7 +517,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -554,7 +540,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false } } @@ -591,8 +576,8 @@ "ctxt": 0 }, "value": "obj3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -612,7 +597,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -655,7 +639,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -679,7 +662,6 @@ "ctxt": 0 }, "value": "obj3", - "typeAnnotation": null, "optional": false } } @@ -716,8 +698,8 @@ "ctxt": 0 }, "value": "obj4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -737,7 +719,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -760,7 +741,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -803,7 +783,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -827,7 +806,6 @@ "ctxt": 0 }, "value": "obj4", - "typeAnnotation": null, "optional": false } }, @@ -846,7 +824,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -897,8 +874,8 @@ "ctxt": 0 }, "value": "obj5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -918,7 +895,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -941,7 +917,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -984,7 +959,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -1008,7 +982,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1041,7 +1014,6 @@ "ctxt": 0 }, "value": "obj5", - "typeAnnotation": null, "optional": false } } @@ -1078,8 +1050,8 @@ "ctxt": 0 }, "value": "obj6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1099,7 +1071,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1127,7 +1098,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1150,7 +1120,6 @@ "ctxt": 0 }, "value": "extra", - "typeAnnotation": null, "optional": false }, "value": { @@ -1193,7 +1162,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -1217,7 +1185,6 @@ "ctxt": 0 }, "value": "obj6", - "typeAnnotation": null, "optional": false } } @@ -1254,8 +1221,8 @@ "ctxt": 0 }, "value": "obj7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1275,7 +1242,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1323,7 +1289,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -1347,7 +1312,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1383,7 +1347,6 @@ "ctxt": 0 }, "value": "obj7", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution4x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution4x/input.tsx.json index 78c287ecdf2e..53302d6e2254 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution4x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution4x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -139,7 +135,6 @@ "ctxt": 0 }, "value": "Attribs1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -168,7 +163,6 @@ "ctxt": 0 }, "value": "Attribs1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -198,7 +192,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -212,6 +205,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -228,8 +222,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -278,7 +271,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -312,7 +304,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -331,8 +322,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -385,7 +376,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -419,7 +409,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -438,8 +427,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -457,7 +446,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -468,7 +456,6 @@ "ctxt": 0 }, "value": "len", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution6x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution6x/input.tsx.json index 612afbb0600a..1b926e2ec582 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution6x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution6x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -148,7 +144,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -237,7 +231,6 @@ "ctxt": 0 }, "value": "test2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -275,7 +268,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -336,7 +328,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -360,7 +351,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": null @@ -397,7 +387,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -421,7 +410,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -471,7 +459,6 @@ "ctxt": 0 }, "value": "test2", - "typeAnnotation": null, "optional": false }, "span": { @@ -511,7 +498,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -535,7 +521,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": null @@ -572,7 +557,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -596,7 +580,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -649,7 +632,6 @@ "ctxt": 0 }, "value": "test2", - "typeAnnotation": null, "optional": false }, "span": { @@ -673,7 +655,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution7x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution7x/input.tsx.json index a21834c44f05..b051b69c0e2a 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution7x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution7x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -212,7 +208,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -236,7 +231,6 @@ "ctxt": 0 }, "value": "data-foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -289,7 +283,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -313,7 +306,6 @@ "ctxt": 0 }, "value": "data-foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -371,7 +363,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -395,7 +386,6 @@ "ctxt": 0 }, "value": "data-bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -453,7 +443,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -477,7 +466,6 @@ "ctxt": 0 }, "value": "data-bar", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution8x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution8x/input.tsx.json index 212e39b84ea1..ab4aee678812 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution8x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution8x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -148,7 +144,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -210,6 +205,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -226,8 +222,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -258,7 +253,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "span": { @@ -282,7 +276,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution9x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution9x/input.tsx.json index 3c4f30203b95..c1af41dee2c0 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution9x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolution9x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -111,7 +108,6 @@ "ctxt": 0 }, "value": "ElementAttributesProperty", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -141,7 +137,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -172,7 +167,6 @@ "ctxt": 0 }, "value": "Props", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -202,7 +196,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -248,7 +241,6 @@ "ctxt": 0 }, "value": "MyComponent", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -274,7 +266,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -320,7 +311,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "value": null, @@ -355,7 +345,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -426,7 +415,6 @@ "ctxt": 0 }, "value": "MyComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -450,7 +438,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -500,7 +487,6 @@ "ctxt": 0 }, "value": "MyComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -524,7 +510,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolutionx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolutionx/input.tsx.json index 3edfd461e299..bf2f90b3ba23 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolutionx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxAttributeResolutionx/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -117,7 +114,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -159,7 +155,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxCorrectlyParseLessThanComparison1x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxCorrectlyParseLessThanComparison1x/input.tsx.json index 46b0326a6286..d3769133bf17 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxCorrectlyParseLessThanComparison1x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxCorrectlyParseLessThanComparison1x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "body": { @@ -149,7 +145,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -175,7 +170,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -195,6 +189,7 @@ "ctxt": 0 }, "value": "props", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -217,13 +212,11 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } }, { @@ -242,6 +235,7 @@ "ctxt": 0 }, "value": "context", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -258,8 +252,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -282,7 +275,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "value": null, @@ -308,7 +300,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -350,7 +341,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -371,7 +361,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -402,7 +391,6 @@ "ctxt": 0 }, "value": "ShortDetails", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -428,7 +416,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -492,7 +479,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -505,7 +491,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false @@ -559,7 +544,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -587,7 +571,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -627,7 +610,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -638,7 +620,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -668,7 +649,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -679,7 +659,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -718,7 +697,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxDefaultAttributesResolution1x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxDefaultAttributesResolution1x/input.tsx.json index a43e44686e78..72091526a4ea 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxDefaultAttributesResolution1x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxDefaultAttributesResolution1x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -133,7 +130,6 @@ "ctxt": 0 }, "value": "Poisoned", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -159,7 +155,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -202,7 +197,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -241,7 +235,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -276,7 +269,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -287,7 +279,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -317,7 +308,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -360,8 +350,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -380,7 +370,6 @@ "ctxt": 0 }, "value": "Poisoned", - "typeAnnotation": null, "optional": false }, "span": { @@ -404,7 +393,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxDefaultAttributesResolution2x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxDefaultAttributesResolution2x/input.tsx.json index 021776abe8d6..adfcec1c3a76 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxDefaultAttributesResolution2x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxDefaultAttributesResolution2x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -141,7 +138,6 @@ "ctxt": 0 }, "value": "Poisoned", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -167,7 +163,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -210,7 +205,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -249,7 +243,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -284,7 +277,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -295,7 +287,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -325,7 +316,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -368,8 +358,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -388,7 +378,6 @@ "ctxt": 0 }, "value": "Poisoned", - "typeAnnotation": null, "optional": false }, "span": { @@ -412,7 +401,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxDefaultAttributesResolution3x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxDefaultAttributesResolution3x/input.tsx.json index 0357821c46d2..68be8996dcd6 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxDefaultAttributesResolution3x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxDefaultAttributesResolution3x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -141,7 +138,6 @@ "ctxt": 0 }, "value": "Poisoned", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -167,7 +163,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -210,7 +205,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -249,7 +243,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -284,7 +277,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -295,7 +287,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -325,7 +316,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -368,8 +358,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -388,7 +378,6 @@ "ctxt": 0 }, "value": "Poisoned", - "typeAnnotation": null, "optional": false }, "span": { @@ -412,7 +401,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName1x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName1x/input.tsx.json index c33a462e1666..9510d8f9955a 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName1x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName1x/input.tsx.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "CustomTag", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -76,7 +76,6 @@ "ctxt": 0 }, "value": "CustomTag", - "typeAnnotation": null, "optional": false }, "span": { @@ -115,7 +114,6 @@ "ctxt": 0 }, "value": "CustomTag", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName2x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName2x/input.tsx.json index 8a21dedfc6ac..cf9808654396 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName2x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName2x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -167,8 +163,8 @@ "ctxt": 0 }, "value": "customTag", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -212,7 +208,6 @@ "ctxt": 0 }, "value": "customTag", - "typeAnnotation": null, "optional": false }, "span": { @@ -251,7 +246,6 @@ "ctxt": 0 }, "value": "customTag", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName3x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName3x/input.tsx.json index 75f4adeef764..e4b6d9f1d0d9 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName3x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName3x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -167,6 +163,7 @@ "ctxt": 0 }, "value": "CustomTag", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -196,8 +193,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -241,7 +237,6 @@ "ctxt": 0 }, "value": "CustomTag", - "typeAnnotation": null, "optional": false }, "span": { @@ -280,7 +275,6 @@ "ctxt": 0 }, "value": "CustomTag", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName4x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName4x/input.tsx.json index 8adb0e2a6c78..8e51d6a4e9e2 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName4x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName4x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -152,7 +148,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -209,6 +204,7 @@ "ctxt": 0 }, "value": "CustomTag", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -238,8 +234,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -283,7 +278,6 @@ "ctxt": 0 }, "value": "CustomTag", - "typeAnnotation": null, "optional": false }, "span": { @@ -322,7 +316,6 @@ "ctxt": 0 }, "value": "CustomTag", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName5x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName5x/input.tsx.json index 73efe19ea271..e54e843a4426 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName5x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName5x/input.tsx.json @@ -47,7 +47,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -83,7 +82,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -141,7 +138,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false } } @@ -180,7 +176,6 @@ "ctxt": 0 }, "value": "Text", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -206,7 +201,6 @@ "ctxt": 0 }, "value": "_tagName", - "typeAnnotation": null, "optional": false }, "value": { @@ -265,7 +259,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -317,7 +310,6 @@ "ctxt": 0 }, "value": "this", - "typeAnnotation": null, "optional": false }, "property": { @@ -328,7 +320,6 @@ "ctxt": 0 }, "value": "_tagName", - "typeAnnotation": null, "optional": false } }, @@ -375,7 +366,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -386,7 +376,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName6x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName6x/input.tsx.json index 516912032e17..56cf27cee9f2 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName6x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName6x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -167,8 +163,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -188,7 +184,6 @@ "ctxt": 0 }, "value": "tag", - "typeAnnotation": null, "optional": false }, "value": { @@ -237,8 +232,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -259,7 +254,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -270,7 +264,6 @@ "ctxt": 0 }, "value": "tag", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName7x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName7x/input.tsx.json index 380e183ae8da..bdbca482dadb 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName7x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName7x/input.tsx.json @@ -47,7 +47,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -83,7 +82,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -141,7 +138,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false } } @@ -180,7 +176,6 @@ "ctxt": 0 }, "value": "Text", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -206,7 +201,6 @@ "ctxt": 0 }, "value": "_tagName", - "typeAnnotation": null, "optional": false }, "value": { @@ -265,7 +259,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -315,7 +308,6 @@ "ctxt": 0 }, "value": "this", - "typeAnnotation": null, "optional": false }, "span": { @@ -361,7 +353,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -372,7 +363,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName8x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName8x/input.tsx.json index 9e059066c421..0d44029ba1b0 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName8x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName8x/input.tsx.json @@ -47,7 +47,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -83,7 +82,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -141,7 +138,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false } } @@ -180,7 +176,6 @@ "ctxt": 0 }, "value": "Text", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -206,7 +201,6 @@ "ctxt": 0 }, "value": "_tagName", - "typeAnnotation": null, "optional": false }, "value": { @@ -265,7 +259,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -317,7 +310,6 @@ "ctxt": 0 }, "value": "this", - "typeAnnotation": null, "optional": false }, "property": { @@ -328,7 +320,6 @@ "ctxt": 0 }, "value": "_tagName", - "typeAnnotation": null, "optional": false } }, @@ -370,7 +361,6 @@ "ctxt": 0 }, "value": "this", - "typeAnnotation": null, "optional": false }, "property": { @@ -381,7 +371,6 @@ "ctxt": 0 }, "value": "_tagName", - "typeAnnotation": null, "optional": false } } @@ -418,7 +407,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -429,7 +417,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName9x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName9x/input.tsx.json index 32f7d3a946b8..b9e355e18587 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName9x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxDynamicTagName9x/input.tsx.json @@ -47,7 +47,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -83,7 +82,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -141,7 +138,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false } } @@ -180,7 +176,6 @@ "ctxt": 0 }, "value": "Text", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -206,7 +201,6 @@ "ctxt": 0 }, "value": "_tagName", - "typeAnnotation": null, "optional": false }, "value": { @@ -278,7 +272,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -330,7 +323,6 @@ "ctxt": 0 }, "value": "this", - "typeAnnotation": null, "optional": false }, "property": { @@ -341,7 +333,6 @@ "ctxt": 0 }, "value": "_tagName", - "typeAnnotation": null, "optional": false } }, @@ -383,7 +374,6 @@ "ctxt": 0 }, "value": "this", - "typeAnnotation": null, "optional": false }, "property": { @@ -394,7 +384,6 @@ "ctxt": 0 }, "value": "_tagName", - "typeAnnotation": null, "optional": false } } @@ -431,7 +420,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -442,7 +430,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution10x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution10x/input.tsx.json index 485877fe8a02..7db37c6c8b03 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution10x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution10x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "ElementClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -154,7 +150,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -188,7 +183,6 @@ "ctxt": 0 }, "value": "Obj1type", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -218,6 +212,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -234,8 +229,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -269,7 +263,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -328,6 +321,7 @@ "ctxt": 0 }, "value": "Obj1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -350,13 +344,11 @@ "ctxt": 0 }, "value": "Obj1type", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -387,7 +379,6 @@ "ctxt": 0 }, "value": "Obj1", - "typeAnnotation": null, "optional": false }, "span": { @@ -411,7 +402,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -455,7 +445,6 @@ "ctxt": 0 }, "value": "Obj2type", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -485,6 +474,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -501,8 +491,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -536,7 +525,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -578,7 +566,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -637,6 +624,7 @@ "ctxt": 0 }, "value": "Obj2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -659,13 +647,11 @@ "ctxt": 0 }, "value": "Obj2type", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -696,7 +682,6 @@ "ctxt": 0 }, "value": "Obj2", - "typeAnnotation": null, "optional": false }, "span": { @@ -720,7 +705,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -756,7 +740,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution11x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution11x/input.tsx.json index 0f94e5eedd52..da06537a1b5a 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution11x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution11x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "ElementAttributesProperty", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -111,7 +108,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -145,7 +141,6 @@ "ctxt": 0 }, "value": "Obj1type", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -175,6 +170,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -191,8 +187,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -242,6 +237,7 @@ "ctxt": 0 }, "value": "Obj1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -264,13 +260,11 @@ "ctxt": 0 }, "value": "Obj1type", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -301,7 +295,6 @@ "ctxt": 0 }, "value": "Obj1", - "typeAnnotation": null, "optional": false }, "span": { @@ -325,7 +318,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -369,7 +361,6 @@ "ctxt": 0 }, "value": "Obj2type", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -399,6 +390,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -415,8 +407,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -450,7 +441,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -509,6 +499,7 @@ "ctxt": 0 }, "value": "Obj2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -531,13 +522,11 @@ "ctxt": 0 }, "value": "Obj2type", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -568,7 +557,6 @@ "ctxt": 0 }, "value": "Obj2", - "typeAnnotation": null, "optional": false }, "span": { @@ -592,7 +580,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -636,7 +623,6 @@ "ctxt": 0 }, "value": "Obj3type", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -666,6 +652,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -682,8 +669,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -717,7 +703,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -776,6 +761,7 @@ "ctxt": 0 }, "value": "Obj3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -798,13 +784,11 @@ "ctxt": 0 }, "value": "Obj3type", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -835,7 +819,6 @@ "ctxt": 0 }, "value": "Obj3", - "typeAnnotation": null, "optional": false }, "span": { @@ -859,7 +842,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution12x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution12x/input.tsx.json index fd7d6f8ef5b6..d01c1068ad61 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution12x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution12x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "ElementAttributesProperty", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "pr", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -154,7 +150,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -188,7 +183,6 @@ "ctxt": 0 }, "value": "Obj1type", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -218,6 +212,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -234,8 +229,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -285,6 +279,7 @@ "ctxt": 0 }, "value": "Obj1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -307,13 +302,11 @@ "ctxt": 0 }, "value": "Obj1type", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -344,7 +337,6 @@ "ctxt": 0 }, "value": "Obj1", - "typeAnnotation": null, "optional": false }, "span": { @@ -368,7 +360,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -412,7 +403,6 @@ "ctxt": 0 }, "value": "Obj2type", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -442,6 +432,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -458,8 +449,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -493,7 +483,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -535,7 +524,6 @@ "ctxt": 0 }, "value": "pr", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -594,6 +582,7 @@ "ctxt": 0 }, "value": "Obj2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -616,13 +605,11 @@ "ctxt": 0 }, "value": "Obj2type", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -653,7 +640,6 @@ "ctxt": 0 }, "value": "Obj2", - "typeAnnotation": null, "optional": false }, "span": { @@ -677,7 +663,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -721,7 +706,6 @@ "ctxt": 0 }, "value": "Obj3type", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -751,6 +735,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -767,8 +752,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -802,7 +786,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -861,6 +844,7 @@ "ctxt": 0 }, "value": "Obj3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -883,13 +867,11 @@ "ctxt": 0 }, "value": "Obj3type", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -920,7 +902,6 @@ "ctxt": 0 }, "value": "Obj3", - "typeAnnotation": null, "optional": false }, "span": { @@ -944,7 +925,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -998,6 +978,7 @@ "ctxt": 0 }, "value": "attributes", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1014,8 +995,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1046,7 +1026,6 @@ "ctxt": 0 }, "value": "Obj3", - "typeAnnotation": null, "optional": false }, "span": { @@ -1070,7 +1049,6 @@ "ctxt": 0 }, "value": "attributes", - "typeAnnotation": null, "optional": false } } @@ -1106,7 +1084,6 @@ "ctxt": 0 }, "value": "Obj3", - "typeAnnotation": null, "optional": false }, "span": { @@ -1155,7 +1132,6 @@ "ctxt": 0 }, "value": "Obj4type", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1185,6 +1161,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1201,8 +1178,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1236,7 +1212,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1278,7 +1253,6 @@ "ctxt": 0 }, "value": "pr", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1316,7 +1290,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1380,6 +1353,7 @@ "ctxt": 0 }, "value": "Obj4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1402,13 +1376,11 @@ "ctxt": 0 }, "value": "Obj4type", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1439,7 +1411,6 @@ "ctxt": 0 }, "value": "Obj4", - "typeAnnotation": null, "optional": false }, "span": { @@ -1463,7 +1434,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1516,7 +1486,6 @@ "ctxt": 0 }, "value": "Obj4", - "typeAnnotation": null, "optional": false }, "span": { @@ -1540,7 +1509,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution13x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution13x/input.tsx.json index 96787a23beaa..cc7c5e2d82b4 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution13x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution13x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "ElementAttributesProperty", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "pr1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -152,7 +148,6 @@ "ctxt": 0 }, "value": "pr2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -199,7 +194,6 @@ "ctxt": 0 }, "value": "Obj1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -229,6 +223,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -245,8 +240,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -296,6 +290,7 @@ "ctxt": 0 }, "value": "obj1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -318,13 +313,11 @@ "ctxt": 0 }, "value": "Obj1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -355,7 +348,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "span": { @@ -379,7 +371,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution14x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution14x/input.tsx.json index 257aac62c916..331d491e58f8 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution14x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution14x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -83,7 +81,6 @@ "ctxt": 0 }, "value": "Obj1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -113,6 +110,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -129,8 +127,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -180,6 +177,7 @@ "ctxt": 0 }, "value": "obj1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -202,13 +200,11 @@ "ctxt": 0 }, "value": "Obj1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -239,7 +235,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "span": { @@ -263,7 +258,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution15x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution15x/input.tsx.json index 180cb4b47e7f..4a7ba0bd7929 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution15x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution15x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "ElementAttributesProperty", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "pr1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -152,7 +148,6 @@ "ctxt": 0 }, "value": "pr2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -196,7 +191,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -230,7 +224,6 @@ "ctxt": 0 }, "value": "Obj1type", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -260,6 +253,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -276,8 +270,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -327,6 +320,7 @@ "ctxt": 0 }, "value": "Obj1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -349,13 +343,11 @@ "ctxt": 0 }, "value": "Obj1type", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -386,7 +378,6 @@ "ctxt": 0 }, "value": "Obj1", - "typeAnnotation": null, "optional": false }, "span": { @@ -410,7 +401,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution16x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution16x/input.tsx.json index fbbc018f28e6..167399d2ee8c 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution16x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution16x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "Obj1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -81,6 +79,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -97,8 +96,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -148,6 +146,7 @@ "ctxt": 0 }, "value": "obj1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -170,13 +169,11 @@ "ctxt": 0 }, "value": "Obj1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -207,7 +204,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "span": { @@ -231,7 +227,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution17x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution17x/input.tsx.json index 9ffbbe64d12d..464293a68525 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution17x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution17x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -140,7 +137,6 @@ "ctxt": 0 }, "value": "MyElement", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -201,7 +197,6 @@ "ctxt": 0 }, "value": "MyElement", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -238,7 +233,6 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -281,7 +275,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -333,7 +326,6 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, "optional": false }, "property": { @@ -344,7 +336,6 @@ "ctxt": 0 }, "value": "MyElement", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution18x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution18x/input.tsx.json index 91c7c5232618..43c375fe44b2 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution18x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution18x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution19x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution19x/input.tsx.json index 302b9f368d6c..1c71a91c60f1 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution19x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution19x/input.tsx.json @@ -56,7 +56,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -82,7 +81,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -118,7 +116,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -159,7 +156,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false } } @@ -204,7 +200,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "imported": null @@ -251,7 +246,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution1x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution1x/input.tsx.json index c888f20bad64..91714cf9d4ab 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution1x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution1x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -166,7 +162,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -206,7 +201,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution2x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution2x/input.tsx.json index 5e29a57f7016..ca923ea4fd0b 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution2x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution2x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -105,6 +102,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,8 +119,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -179,7 +176,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -219,7 +215,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution3x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution3x/input.tsx.json index 89c0733e2395..9ce70b61a455 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution3x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution3x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -105,6 +102,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,8 +119,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -156,7 +153,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -222,7 +218,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -246,7 +241,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -296,7 +290,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -320,7 +313,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution4x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution4x/input.tsx.json index 3d151db78184..7193ba1ed679 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution4x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution4x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -148,7 +144,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -195,7 +190,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -233,7 +227,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -294,7 +287,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -318,7 +310,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -368,7 +359,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -392,7 +382,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": { @@ -442,7 +431,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -466,7 +454,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution5x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution5x/input.tsx.json index b57205585c16..9dae28536792 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution5x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution5x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution6x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution6x/input.tsx.json index f1b39e5e4067..8da0e7b8b431 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution6x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution6x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -124,6 +121,7 @@ "ctxt": 0 }, "value": "div", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -140,8 +138,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -172,7 +169,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -196,7 +192,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution7x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution7x/input.tsx.json index d2e1218173fc..f7585ca24d13 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution7x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution7x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "body": { @@ -159,6 +155,7 @@ "ctxt": 0 }, "value": "div", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -175,8 +172,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -213,7 +209,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -224,7 +219,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } }, @@ -249,7 +243,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -301,7 +294,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -312,7 +304,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false } }, @@ -346,7 +337,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "body": { @@ -374,7 +364,6 @@ "ctxt": 0 }, "value": "mine", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -385,7 +374,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false } }, @@ -415,7 +403,6 @@ "ctxt": 0 }, "value": "mine", - "typeAnnotation": null, "optional": false }, "property": { @@ -426,7 +413,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } }, @@ -451,7 +437,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -503,7 +488,6 @@ "ctxt": 0 }, "value": "mine", - "typeAnnotation": null, "optional": false }, "property": { @@ -514,7 +498,6 @@ "ctxt": 0 }, "value": "non", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution8x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution8x/input.tsx.json index a00631399658..0b30082512b0 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution8x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution8x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -124,8 +121,8 @@ "ctxt": 0 }, "value": "Div", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -164,7 +161,6 @@ "ctxt": 0 }, "value": "Div", - "typeAnnotation": null, "optional": false }, "span": { @@ -190,7 +186,6 @@ "ctxt": 0 }, "value": "Fact", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -272,7 +267,6 @@ "ctxt": 0 }, "value": "Fact", - "typeAnnotation": null, "optional": false }, "span": { @@ -298,7 +292,6 @@ "ctxt": 0 }, "value": "Fnum", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -381,7 +374,6 @@ "ctxt": 0 }, "value": "Fnum", - "typeAnnotation": null, "optional": false }, "span": { @@ -412,7 +404,6 @@ "ctxt": 0 }, "value": "Obj1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -508,6 +499,7 @@ "ctxt": 0 }, "value": "Obj1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -530,13 +522,11 @@ "ctxt": 0 }, "value": "Obj1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -567,7 +557,6 @@ "ctxt": 0 }, "value": "Obj1", - "typeAnnotation": null, "optional": false }, "span": { @@ -598,7 +587,6 @@ "ctxt": 0 }, "value": "Obj2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -667,6 +655,7 @@ "ctxt": 0 }, "value": "Obj2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -689,13 +678,11 @@ "ctxt": 0 }, "value": "Obj2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -726,7 +713,6 @@ "ctxt": 0 }, "value": "Obj2", - "typeAnnotation": null, "optional": false }, "span": { @@ -757,7 +743,6 @@ "ctxt": 0 }, "value": "Obj3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -798,6 +783,7 @@ "ctxt": 0 }, "value": "Obj3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -820,13 +806,11 @@ "ctxt": 0 }, "value": "Obj3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -857,7 +841,6 @@ "ctxt": 0 }, "value": "Obj3", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution9x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution9x/input.tsx.json index b03a7f4dfb99..a8ba65a73198 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution9x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolution9x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "something", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -107,7 +104,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -141,7 +137,6 @@ "ctxt": 0 }, "value": "Obj1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -171,6 +166,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -187,8 +183,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -222,7 +217,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -269,6 +263,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -285,8 +280,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -320,7 +314,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -379,6 +372,7 @@ "ctxt": 0 }, "value": "Obj1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -401,13 +395,11 @@ "ctxt": 0 }, "value": "Obj1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -438,7 +430,6 @@ "ctxt": 0 }, "value": "Obj1", - "typeAnnotation": null, "optional": false }, "span": { @@ -469,7 +460,6 @@ "ctxt": 0 }, "value": "Obj2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -499,6 +489,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -515,8 +506,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -550,7 +540,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -597,6 +586,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -613,8 +603,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -648,7 +637,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -707,6 +695,7 @@ "ctxt": 0 }, "value": "Obj2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -729,13 +718,11 @@ "ctxt": 0 }, "value": "Obj2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -766,7 +753,6 @@ "ctxt": 0 }, "value": "Obj2", - "typeAnnotation": null, "optional": false }, "span": { @@ -797,7 +783,6 @@ "ctxt": 0 }, "value": "Obj3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -827,6 +812,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -843,8 +829,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -878,7 +863,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -925,6 +909,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -941,8 +926,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -976,7 +960,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1018,7 +1001,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1077,6 +1059,7 @@ "ctxt": 0 }, "value": "Obj3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1099,13 +1082,11 @@ "ctxt": 0 }, "value": "Obj3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1136,7 +1117,6 @@ "ctxt": 0 }, "value": "Obj3", - "typeAnnotation": null, "optional": false }, "span": { @@ -1160,7 +1140,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolutionx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolutionx/input.tsx.json index edd55394cc42..49e80b8ba6a8 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolutionx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxElementResolutionx/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "foundFirst", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -117,7 +114,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -222,7 +218,6 @@ "ctxt": 0 }, "value": "foundFirst", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -249,7 +244,6 @@ "ctxt": 0 }, "value": "Other", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -283,7 +277,6 @@ "ctxt": 0 }, "value": "Dotted", - "typeAnnotation": null, "optional": false }, "body": { @@ -311,7 +304,6 @@ "ctxt": 0 }, "value": "Name", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -357,8 +349,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -377,7 +369,6 @@ "ctxt": 0 }, "value": "foundFirst", - "typeAnnotation": null, "optional": false }, "span": { @@ -401,7 +392,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -455,8 +445,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -475,7 +465,6 @@ "ctxt": 0 }, "value": "string_named", - "typeAnnotation": null, "optional": false }, "span": { @@ -519,8 +508,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -539,7 +528,6 @@ "ctxt": 0 }, "value": "Other", - "typeAnnotation": null, "optional": false }, "span": { @@ -583,8 +571,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -605,7 +593,6 @@ "ctxt": 0 }, "value": "Dotted", - "typeAnnotation": null, "optional": false }, "property": { @@ -616,7 +603,6 @@ "ctxt": 0 }, "value": "Name", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxEmit1x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxEmit1x/input.tsx.json index ea257a20c725..2f2a5f8d88f9 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxEmit1x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxEmit1x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -105,6 +102,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,8 +119,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -180,8 +177,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -213,8 +210,8 @@ "ctxt": 0 }, "value": "selfClosed1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -233,7 +230,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -277,8 +273,8 @@ "ctxt": 0 }, "value": "selfClosed2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -297,7 +293,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -321,7 +316,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -375,8 +369,8 @@ "ctxt": 0 }, "value": "selfClosed3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -395,7 +389,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -419,7 +412,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -473,8 +465,8 @@ "ctxt": 0 }, "value": "selfClosed4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -493,7 +485,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -517,7 +508,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -550,7 +540,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -604,8 +593,8 @@ "ctxt": 0 }, "value": "selfClosed5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -624,7 +613,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -648,7 +636,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -684,7 +671,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -738,8 +724,8 @@ "ctxt": 0 }, "value": "selfClosed6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -758,7 +744,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -782,7 +767,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -823,7 +807,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -877,8 +860,8 @@ "ctxt": 0 }, "value": "selfClosed7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -897,7 +880,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -921,7 +903,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -939,7 +920,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -959,7 +939,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1013,8 +992,8 @@ "ctxt": 0 }, "value": "openClosed1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1033,7 +1012,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1061,7 +1039,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1095,8 +1072,8 @@ "ctxt": 0 }, "value": "openClosed2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1115,7 +1092,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1139,7 +1115,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -1188,7 +1163,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1222,8 +1196,8 @@ "ctxt": 0 }, "value": "openClosed3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1242,7 +1216,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1266,7 +1239,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -1304,7 +1276,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1324,7 +1295,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1358,8 +1328,8 @@ "ctxt": 0 }, "value": "openClosed4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1378,7 +1348,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1402,7 +1371,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -1448,7 +1416,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "right": { @@ -1459,7 +1426,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1480,7 +1446,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1514,8 +1479,8 @@ "ctxt": 0 }, "value": "openClosed5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1534,7 +1499,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1558,7 +1522,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -1604,7 +1567,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "right": { @@ -1615,7 +1577,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1636,7 +1597,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1655,7 +1615,6 @@ "ctxt": 0 }, "value": "SomeClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1681,7 +1640,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -1725,8 +1683,8 @@ "ctxt": 0 }, "value": "rewrites1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1745,7 +1703,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1803,7 +1760,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1837,8 +1793,8 @@ "ctxt": 0 }, "value": "rewrites2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1857,7 +1813,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1895,7 +1850,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -1913,7 +1867,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -1927,7 +1880,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1950,7 +1902,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1984,8 +1935,8 @@ "ctxt": 0 }, "value": "rewrites3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2004,7 +1955,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -2040,7 +1990,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } ] @@ -2062,7 +2011,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -2096,8 +2044,8 @@ "ctxt": 0 }, "value": "rewrites4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2116,7 +2064,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -2140,7 +2087,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2193,7 +2139,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -2227,8 +2172,8 @@ "ctxt": 0 }, "value": "rewrites5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2247,7 +2192,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -2271,7 +2215,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2299,7 +2242,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -2317,7 +2259,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -2331,7 +2272,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -2359,7 +2299,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -2393,8 +2332,8 @@ "ctxt": 0 }, "value": "rewrites6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2413,7 +2352,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -2437,7 +2375,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2463,7 +2400,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } ] @@ -2490,7 +2426,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -2544,8 +2479,8 @@ "ctxt": 0 }, "value": "whitespace1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2564,7 +2499,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -2603,7 +2537,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -2637,8 +2570,8 @@ "ctxt": 0 }, "value": "whitespace2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2657,7 +2590,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -2695,7 +2627,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -2725,7 +2656,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -2759,8 +2689,8 @@ "ctxt": 0 }, "value": "whitespace3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2779,7 +2709,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -2817,7 +2746,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -2847,7 +2775,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxEmit2x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxEmit2x/input.tsx.json index 40a607e4058a..cc64a423d0b4 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxEmit2x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxEmit2x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -105,6 +102,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,8 +119,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -180,6 +177,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -196,8 +194,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -217,6 +214,7 @@ "ctxt": 0 }, "value": "p2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -233,8 +231,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -254,6 +251,7 @@ "ctxt": 0 }, "value": "p3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -270,8 +268,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -303,8 +300,8 @@ "ctxt": 0 }, "value": "spreads1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -323,7 +320,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -347,7 +343,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false } } @@ -371,7 +366,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false } } @@ -391,7 +385,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -425,8 +418,8 @@ "ctxt": 0 }, "value": "spreads2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -445,7 +438,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -469,7 +461,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false } } @@ -493,7 +484,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false } } @@ -513,7 +503,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -547,8 +536,8 @@ "ctxt": 0 }, "value": "spreads3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -567,7 +556,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -591,7 +579,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -609,7 +596,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false } } @@ -629,7 +615,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false } } @@ -653,7 +638,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false } } @@ -673,7 +657,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -707,8 +690,8 @@ "ctxt": 0 }, "value": "spreads4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -727,7 +710,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -751,7 +733,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false } }, @@ -770,7 +751,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -788,7 +768,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false } } @@ -813,7 +792,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false } } @@ -833,7 +811,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -867,8 +844,8 @@ "ctxt": 0 }, "value": "spreads5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -887,7 +864,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -911,7 +887,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -929,7 +904,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false } } @@ -949,7 +923,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false } }, @@ -968,7 +941,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -986,7 +958,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false } } @@ -1011,7 +982,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false } } @@ -1031,7 +1001,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxEmit3x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxEmit3x/input.tsx.json index 2753b8fd24f4..8225e41e7327 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxEmit3x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxEmit3x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -144,7 +140,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -170,7 +165,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -218,7 +212,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "body": { @@ -246,7 +239,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -288,7 +280,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -322,7 +313,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, { @@ -342,7 +332,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "span": { @@ -384,7 +373,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "body": { @@ -418,7 +406,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, { @@ -438,7 +425,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "span": { @@ -479,7 +465,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, { @@ -499,7 +484,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "span": { @@ -541,7 +525,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -582,7 +565,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "property": { @@ -593,7 +575,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -617,7 +598,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "property": { @@ -628,7 +608,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false } }, @@ -667,7 +646,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -703,8 +681,8 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -742,7 +720,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, { @@ -762,7 +739,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxExternalModuleEmit1x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxExternalModuleEmit1x/input.tsx.json index 0eaad26a7239..da776b651f44 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxExternalModuleEmit1x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxExternalModuleEmit1x/input.tsx.json @@ -47,7 +47,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -83,7 +82,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -141,7 +138,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false } } @@ -186,7 +182,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "imported": null @@ -226,7 +221,6 @@ "ctxt": 0 }, "value": "App", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -252,7 +246,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -295,7 +288,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "span": { @@ -340,7 +332,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -351,7 +342,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -412,7 +402,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false } } @@ -451,7 +440,6 @@ "ctxt": 0 }, "value": "Button", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -477,7 +465,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -520,7 +507,6 @@ "ctxt": 0 }, "value": "button", - "typeAnnotation": null, "optional": false }, "span": { @@ -559,7 +545,6 @@ "ctxt": 0 }, "value": "button", - "typeAnnotation": null, "optional": false } } @@ -594,7 +579,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -605,7 +589,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxExternalModuleEmit2x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxExternalModuleEmit2x/input.tsx.json index ac4bb6310089..0b861c5b08b6 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxExternalModuleEmit2x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxExternalModuleEmit2x/input.tsx.json @@ -62,6 +62,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -78,8 +79,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -101,7 +101,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -131,7 +130,6 @@ "ctxt": 0 }, "value": "Main", - "typeAnnotation": null, "optional": false } } @@ -178,8 +176,8 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -199,8 +197,8 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -231,7 +229,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "span": { @@ -255,7 +252,6 @@ "ctxt": 0 }, "value": "handler", - "typeAnnotation": null, "optional": false }, "value": { @@ -273,7 +269,6 @@ "ctxt": 0 }, "value": "Main", - "typeAnnotation": null, "optional": false } } @@ -298,7 +293,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } } @@ -328,7 +322,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "span": { @@ -352,7 +345,6 @@ "ctxt": 0 }, "value": "Main", - "typeAnnotation": null, "optional": false } } @@ -376,7 +368,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxFragmentPreserveEmitx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxFragmentPreserveEmitx/input.tsx.json index e60b2b9d83cf..65dfeade949f 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxFragmentPreserveEmitx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxFragmentPreserveEmitx/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -105,6 +102,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,8 +119,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -180,6 +177,7 @@ "ctxt": 0 }, "value": "React", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -196,8 +194,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -387,7 +384,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -426,7 +422,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false } } @@ -448,7 +443,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -487,7 +481,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -543,7 +536,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -582,7 +574,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false } } @@ -620,7 +611,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -659,7 +649,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false } } @@ -681,7 +670,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -720,7 +708,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false } } @@ -752,7 +739,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -791,7 +777,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxFragmentReactEmitx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxFragmentReactEmitx/input.tsx.json index 38ebe105907f..e03eba21f009 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxFragmentReactEmitx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxFragmentReactEmitx/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -105,6 +102,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,8 +119,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -180,6 +177,7 @@ "ctxt": 0 }, "value": "React", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -196,8 +194,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -387,7 +384,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -426,7 +422,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false } } @@ -448,7 +443,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -487,7 +481,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -543,7 +536,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -582,7 +574,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false } } @@ -620,7 +611,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -659,7 +649,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false } } @@ -681,7 +670,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -720,7 +708,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false } } @@ -752,7 +739,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -791,7 +777,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType1x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType1x/input.tsx.json index 352f24f4b0d6..51f4fb568c1d 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType1x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType1x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -74,8 +73,8 @@ "ctxt": 0 }, "value": "decorator", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -97,6 +96,7 @@ "ctxt": 0 }, "value": "Component", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,7 +121,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "right": { @@ -132,7 +131,6 @@ "ctxt": 0 }, "value": "StatelessComponent", - "typeAnnotation": null, "optional": false } }, @@ -159,7 +157,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -167,8 +164,7 @@ ] } } - }, - "optional": false + } } } ], @@ -209,8 +205,8 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -230,7 +226,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "span": { @@ -254,7 +249,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } } @@ -278,7 +272,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false } } @@ -316,7 +309,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -348,7 +340,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "right": { @@ -359,7 +350,6 @@ "ctxt": 0 }, "value": "StatelessComponent", - "typeAnnotation": null, "optional": false } }, @@ -386,7 +376,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -425,8 +414,8 @@ "ctxt": 0 }, "value": "decorator2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -448,6 +437,7 @@ "ctxt": 0 }, "value": "Component", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -472,7 +462,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "right": { @@ -483,7 +472,6 @@ "ctxt": 0 }, "value": "StatelessComponent", - "typeAnnotation": null, "optional": false } }, @@ -510,7 +498,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -518,8 +505,7 @@ ] } } - }, - "optional": false + } } } ], @@ -560,8 +546,8 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -581,7 +567,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "span": { @@ -605,7 +590,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } }, @@ -624,7 +608,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -665,7 +648,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false } } @@ -703,7 +685,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -730,7 +711,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -786,7 +766,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "right": { @@ -797,7 +776,6 @@ "ctxt": 0 }, "value": "StatelessComponent", - "typeAnnotation": null, "optional": false } }, @@ -824,7 +802,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -863,8 +840,8 @@ "ctxt": 0 }, "value": "decorator3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -886,6 +863,7 @@ "ctxt": 0 }, "value": "Component", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -910,7 +888,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "right": { @@ -921,7 +898,6 @@ "ctxt": 0 }, "value": "StatelessComponent", - "typeAnnotation": null, "optional": false } }, @@ -948,7 +924,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -956,8 +931,7 @@ ] } } - }, - "optional": false + } } } ], @@ -998,8 +972,8 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1019,7 +993,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "span": { @@ -1043,7 +1016,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1079,7 +1051,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } } @@ -1103,7 +1074,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false } } @@ -1141,7 +1111,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1168,7 +1137,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1213,7 +1181,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1240,7 +1207,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1296,7 +1262,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "right": { @@ -1307,7 +1272,6 @@ "ctxt": 0 }, "value": "StatelessComponent", - "typeAnnotation": null, "optional": false } }, @@ -1334,7 +1298,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType2x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType2x/input.tsx.json index 112147ba05b2..c0f031b6050a 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType2x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType2x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -74,8 +73,8 @@ "ctxt": 0 }, "value": "decorator4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -97,6 +96,7 @@ "ctxt": 0 }, "value": "Component", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,7 +121,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "right": { @@ -132,7 +131,6 @@ "ctxt": 0 }, "value": "StatelessComponent", - "typeAnnotation": null, "optional": false } }, @@ -159,7 +157,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -167,8 +164,7 @@ ] } } - }, - "optional": false + } } } ], @@ -209,8 +205,8 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -230,7 +226,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "span": { @@ -254,7 +249,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } }, @@ -273,7 +267,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -319,7 +312,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false } } @@ -357,7 +349,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -384,7 +375,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -440,7 +430,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "right": { @@ -451,7 +440,6 @@ "ctxt": 0 }, "value": "StatelessComponent", - "typeAnnotation": null, "optional": false } }, @@ -478,7 +466,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType3x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType3x/input.tsx.json index 010f5e55fb0b..9416ccba5fa4 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType3x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType3x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -85,7 +83,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -167,7 +163,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -202,7 +197,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -213,7 +207,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -242,7 +235,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -269,7 +261,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -321,7 +312,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -375,7 +365,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -403,7 +392,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -429,7 +417,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -472,7 +459,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "span": { @@ -511,7 +497,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -532,7 +517,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -587,7 +571,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -598,7 +581,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -627,7 +609,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -658,7 +639,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType4x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType4x/input.tsx.json index ae70698abe64..bf2b6fa54f5f 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType4x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType4x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -85,7 +83,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -167,7 +163,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -202,7 +197,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -213,7 +207,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -242,7 +235,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -269,7 +261,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -324,7 +315,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -352,7 +342,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -378,7 +367,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -421,7 +409,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "span": { @@ -460,7 +447,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -481,7 +467,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -536,7 +521,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -547,7 +531,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -576,7 +559,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -607,7 +589,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType5x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType5x/input.tsx.json index 3fc1a0b149eb..07318b90d101 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType5x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType5x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -85,7 +83,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -167,7 +163,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -202,7 +197,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -213,7 +207,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -242,7 +235,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -269,7 +261,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -324,7 +315,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -352,7 +342,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -378,7 +367,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "value": null, @@ -404,7 +392,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -435,7 +422,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -478,7 +464,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "span": { @@ -517,7 +502,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -538,7 +522,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -593,7 +576,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -604,7 +586,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -633,7 +614,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -664,7 +644,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType6x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType6x/input.tsx.json index 84a5d9c9df9b..428f9d0bbc27 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType6x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType6x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -85,7 +83,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -167,7 +163,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -202,7 +197,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -213,7 +207,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -242,7 +235,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -269,7 +261,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -321,7 +312,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -375,7 +365,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -403,7 +392,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -429,7 +417,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "value": null, @@ -455,7 +442,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -486,7 +472,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -529,7 +514,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "span": { @@ -568,7 +552,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -589,7 +572,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -644,7 +626,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -655,7 +636,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -684,7 +664,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -715,7 +694,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType7x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType7x/input.tsx.json index 563099364e77..d05052678f61 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType7x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType7x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -80,6 +78,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,13 +101,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -176,7 +172,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -187,7 +182,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -220,8 +214,8 @@ "ctxt": 0 }, "value": "decorator", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -243,6 +237,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -265,13 +260,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -313,7 +306,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "span": { @@ -337,7 +329,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } } @@ -376,7 +367,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -415,8 +405,8 @@ "ctxt": 0 }, "value": "decorator1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -438,6 +428,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -460,13 +451,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -508,7 +497,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "span": { @@ -532,7 +520,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } }, @@ -551,7 +538,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -604,7 +590,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -631,7 +616,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType8x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType8x/input.tsx.json index d87125536285..bf3c8cec27e3 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType8x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType8x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -80,6 +78,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,13 +101,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -176,7 +172,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -187,7 +182,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -220,8 +214,8 @@ "ctxt": 0 }, "value": "decorator", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -243,6 +237,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -265,13 +260,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -313,7 +306,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "span": { @@ -337,7 +329,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } } @@ -376,7 +367,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -415,8 +405,8 @@ "ctxt": 0 }, "value": "decorator1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -438,6 +428,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -460,13 +451,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -508,7 +497,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "span": { @@ -532,7 +520,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } } @@ -571,7 +558,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -598,7 +584,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType9x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType9x/input.tsx.json index 43f5a52eea92..abb1f62ce248 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType9x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxGenericAttributesType9x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -66,7 +65,6 @@ "ctxt": 0 }, "value": "makeP", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -87,6 +85,7 @@ "ctxt": 0 }, "value": "Ctor", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -111,7 +110,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "right": { @@ -122,7 +120,6 @@ "ctxt": 0 }, "value": "ComponentClass", - "typeAnnotation": null, "optional": false } }, @@ -149,7 +146,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -157,8 +153,7 @@ ] } } - }, - "optional": false + } } } ], @@ -208,7 +203,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -258,7 +252,6 @@ "ctxt": 0 }, "value": "Ctor", - "typeAnnotation": null, "optional": false }, "span": { @@ -297,7 +290,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -341,7 +333,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -352,7 +343,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -382,7 +372,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -393,7 +382,6 @@ "ctxt": 0 }, "value": "PureComponent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -423,7 +411,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -469,7 +456,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxInArrowFunctionx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxInArrowFunctionx/input.tsx.json index 89082c7c8a95..9a370f7aa3d4 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxInArrowFunctionx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxInArrowFunctionx/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -148,7 +144,6 @@ "ctxt": 0 }, "value": "text", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -209,7 +204,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -254,7 +248,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -278,7 +271,6 @@ "ctxt": 0 }, "value": "text", - "typeAnnotation": null, "optional": false }, "value": { @@ -325,7 +317,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -355,7 +346,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -391,8 +381,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -412,7 +402,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -436,7 +425,6 @@ "ctxt": 0 }, "value": "text", - "typeAnnotation": null, "optional": false }, "value": { @@ -483,7 +471,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -513,7 +500,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -565,7 +551,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -589,7 +574,6 @@ "ctxt": 0 }, "value": "text", - "typeAnnotation": null, "optional": false }, "value": { @@ -637,7 +621,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -667,7 +650,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -712,7 +694,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -736,7 +717,6 @@ "ctxt": 0 }, "value": "text", - "typeAnnotation": null, "optional": false }, "value": { @@ -774,7 +754,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -801,7 +780,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxIntrinsicAttributeErrorsx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxIntrinsicAttributeErrorsx/input.tsx.json index 5497177f75c3..546f25f76533 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxIntrinsicAttributeErrorsx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxIntrinsicAttributeErrorsx/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "ElementClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -154,7 +150,6 @@ "ctxt": 0 }, "value": "IntrinsicAttributes", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -247,7 +241,6 @@ "ctxt": 0 }, "value": "IntrinsicClassAttributes", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -274,7 +267,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -307,7 +299,6 @@ "ctxt": 0 }, "value": "ref", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -336,7 +327,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -362,7 +352,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -392,7 +381,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -430,7 +418,6 @@ "ctxt": 0 }, "value": "text", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -472,7 +459,6 @@ "ctxt": 0 }, "value": "width", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -519,7 +505,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -566,7 +551,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -596,6 +580,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -612,8 +597,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -647,7 +631,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -689,7 +672,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -747,6 +729,7 @@ "ctxt": 0 }, "value": "E", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -769,13 +752,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -806,7 +787,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "span": { @@ -830,7 +810,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxLibraryManagedAttributesx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxLibraryManagedAttributesx/input.tsx.json index 4359b20bf566..e93a13e9be71 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxLibraryManagedAttributesx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxLibraryManagedAttributesx/input.tsx.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "Defaultize", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "TProps", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "TDefaults", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -108,7 +105,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -126,7 +122,6 @@ "ctxt": 0 }, "value": "Extract", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -160,7 +155,6 @@ "ctxt": 0 }, "value": "TProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -189,7 +183,6 @@ "ctxt": 0 }, "value": "TDefaults", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -225,7 +218,6 @@ "ctxt": 0 }, "value": "TProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -245,7 +237,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -275,7 +266,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -293,7 +283,6 @@ "ctxt": 0 }, "value": "Exclude", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -327,7 +316,6 @@ "ctxt": 0 }, "value": "TProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -356,7 +344,6 @@ "ctxt": 0 }, "value": "TDefaults", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -392,7 +379,6 @@ "ctxt": 0 }, "value": "TProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -412,7 +398,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -434,7 +419,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -460,7 +444,6 @@ "ctxt": 0 }, "value": "TDefaults", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -487,7 +470,6 @@ "ctxt": 0 }, "value": "InferredPropTypes", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -513,7 +495,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -544,7 +525,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -570,7 +550,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -610,7 +589,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -630,7 +608,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -651,7 +628,6 @@ "ctxt": 0 }, "value": "PropTypeChecker", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -684,7 +660,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -713,7 +688,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -746,7 +720,6 @@ "ctxt": 0 }, "value": "PropTypeChecker", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -772,7 +745,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -792,7 +764,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -815,7 +786,6 @@ "ctxt": 0 }, "value": "checkedType", - "typeAnnotation": null, "optional": false } } @@ -857,6 +827,7 @@ "ctxt": 0 }, "value": "checkedType", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -882,8 +853,7 @@ "kind": "symbol" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -905,7 +875,6 @@ "ctxt": 0 }, "value": "PropTypeChecker", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -932,7 +901,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -953,7 +921,6 @@ "ctxt": 0 }, "value": "TRequired", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1002,6 +969,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1018,8 +986,7 @@ }, "kind": "any" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1029,6 +996,7 @@ "ctxt": 0 }, "value": "propName", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1045,8 +1013,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1056,6 +1023,7 @@ "ctxt": 0 }, "value": "componentName", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1072,8 +1040,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1083,6 +1050,7 @@ "ctxt": 0 }, "value": "location", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1099,8 +1067,7 @@ }, "kind": "any" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1110,6 +1077,7 @@ "ctxt": 0 }, "value": "propFullName", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1126,8 +1094,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1165,7 +1132,6 @@ "ctxt": 0 }, "value": "isRequired", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1194,7 +1160,6 @@ "ctxt": 0 }, "value": "PropTypeChecker", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1220,7 +1185,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1264,7 +1228,6 @@ "ctxt": 0 }, "value": "checkedType", - "typeAnnotation": null, "optional": false }, "computed": true, @@ -1300,7 +1263,6 @@ "ctxt": 0 }, "value": "TRequired", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1337,7 +1299,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1365,7 +1326,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1414,7 +1374,6 @@ "ctxt": 0 }, "value": "PropTypes", - "typeAnnotation": null, "optional": false }, "body": { @@ -1457,6 +1416,7 @@ "ctxt": 0 }, "value": "number", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1479,7 +1439,6 @@ "ctxt": 0 }, "value": "PropTypeChecker", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1502,8 +1461,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1543,6 +1501,7 @@ "ctxt": 0 }, "value": "string", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1565,7 +1524,6 @@ "ctxt": 0 }, "value": "PropTypeChecker", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1588,8 +1546,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1629,6 +1586,7 @@ "ctxt": 0 }, "value": "node", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1651,7 +1609,6 @@ "ctxt": 0 }, "value": "PropTypeChecker", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1677,7 +1634,6 @@ "ctxt": 0 }, "value": "ReactNode", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1685,8 +1641,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1713,7 +1668,6 @@ "ctxt": 0 }, "value": "ReactNode", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1758,7 +1712,6 @@ "ctxt": 0 }, "value": "ReactComponent", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1803,7 +1756,6 @@ "ctxt": 0 }, "value": "ReactComponent", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1829,7 +1781,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1849,6 +1800,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1871,13 +1823,11 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1900,7 +1850,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1934,7 +1883,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1954,7 +1902,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1989,7 +1936,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2025,7 +1971,6 @@ "ctxt": 0 }, "value": "ReactNode", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2067,7 +2012,6 @@ "ctxt": 0 }, "value": "setState", - "typeAnnotation": null, "optional": false }, "function": { @@ -2088,6 +2032,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2110,7 +2055,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2136,7 +2080,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2144,8 +2087,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2181,7 +2123,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2209,7 +2150,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -2246,7 +2186,6 @@ "ctxt": 0 }, "value": "ReactNode", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2285,7 +2224,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2314,7 +2252,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2350,7 +2287,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -2376,7 +2312,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2397,7 +2332,6 @@ "ctxt": 0 }, "value": "ReactComponent", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2428,7 +2362,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2460,7 +2393,6 @@ "ctxt": 0 }, "value": "LibraryManagedAttributes", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2486,7 +2418,6 @@ "ctxt": 0 }, "value": "TComponent", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2507,7 +2438,6 @@ "ctxt": 0 }, "value": "TProps", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2537,7 +2467,6 @@ "ctxt": 0 }, "value": "TComponent", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2566,7 +2495,6 @@ "ctxt": 0 }, "value": "defaultProps", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2602,7 +2530,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2628,7 +2555,6 @@ "ctxt": 0 }, "value": "propTypes", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2664,7 +2590,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2691,7 +2616,6 @@ "ctxt": 0 }, "value": "Defaultize", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2725,7 +2649,6 @@ "ctxt": 0 }, "value": "TProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2745,7 +2668,6 @@ "ctxt": 0 }, "value": "InferredPropTypes", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2771,7 +2693,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2796,7 +2717,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2826,7 +2746,6 @@ "ctxt": 0 }, "value": "TComponent", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2855,7 +2774,6 @@ "ctxt": 0 }, "value": "defaultProps", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2891,7 +2809,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2918,7 +2835,6 @@ "ctxt": 0 }, "value": "Defaultize", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2944,7 +2860,6 @@ "ctxt": 0 }, "value": "TProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2964,7 +2879,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2994,7 +2908,6 @@ "ctxt": 0 }, "value": "TComponent", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3023,7 +2936,6 @@ "ctxt": 0 }, "value": "propTypes", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3059,7 +2971,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3094,7 +3005,6 @@ "ctxt": 0 }, "value": "TProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3114,7 +3024,6 @@ "ctxt": 0 }, "value": "InferredPropTypes", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3140,7 +3049,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3165,7 +3073,6 @@ "ctxt": 0 }, "value": "TProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3187,7 +3094,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3213,7 +3119,6 @@ "ctxt": 0 }, "value": "propTypes", - "typeAnnotation": null, "optional": false }, "value": { @@ -3234,7 +3139,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -3252,7 +3156,6 @@ "ctxt": 0 }, "value": "PropTypes", - "typeAnnotation": null, "optional": false }, "property": { @@ -3263,7 +3166,6 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3279,7 +3181,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -3297,7 +3198,6 @@ "ctxt": 0 }, "value": "PropTypes", - "typeAnnotation": null, "optional": false }, "property": { @@ -3308,7 +3208,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3324,7 +3223,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -3349,7 +3247,6 @@ "ctxt": 0 }, "value": "PropTypes", - "typeAnnotation": null, "optional": false }, "property": { @@ -3360,7 +3257,6 @@ "ctxt": 0 }, "value": "string", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3373,7 +3269,6 @@ "ctxt": 0 }, "value": "isRequired", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3407,7 +3302,6 @@ "ctxt": 0 }, "value": "defaultProps", - "typeAnnotation": null, "optional": false }, "value": { @@ -3428,7 +3322,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -3463,7 +3356,6 @@ "ctxt": 0 }, "value": "ReactComponent", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -3496,8 +3388,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -3516,7 +3408,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "span": { @@ -3540,7 +3431,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -3576,7 +3466,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -3609,7 +3498,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -3663,8 +3551,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -3683,7 +3571,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "span": { @@ -3707,7 +3594,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -3764,8 +3650,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -3784,7 +3670,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "span": { @@ -3808,7 +3693,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -3841,7 +3725,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -3895,8 +3778,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -3915,7 +3798,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "span": { @@ -3939,7 +3821,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -3972,7 +3853,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -4005,7 +3885,6 @@ "ctxt": 0 }, "value": "bat", - "typeAnnotation": null, "optional": false }, "value": { @@ -4059,8 +3938,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -4079,7 +3958,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "span": { @@ -4103,7 +3981,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -4139,7 +4016,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -4174,7 +4050,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -4228,8 +4103,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -4248,7 +4123,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "span": { @@ -4272,7 +4146,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -4308,7 +4181,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -4341,7 +4213,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -4382,7 +4253,6 @@ "ctxt": 0 }, "value": "JustPropTypes", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4408,7 +4278,6 @@ "ctxt": 0 }, "value": "propTypes", - "typeAnnotation": null, "optional": false }, "value": { @@ -4429,7 +4298,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -4447,7 +4315,6 @@ "ctxt": 0 }, "value": "PropTypes", - "typeAnnotation": null, "optional": false }, "property": { @@ -4458,7 +4325,6 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4474,7 +4340,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -4499,7 +4364,6 @@ "ctxt": 0 }, "value": "PropTypes", - "typeAnnotation": null, "optional": false }, "property": { @@ -4510,7 +4374,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4523,7 +4386,6 @@ "ctxt": 0 }, "value": "isRequired", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4551,7 +4413,6 @@ "ctxt": 0 }, "value": "ReactComponent", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -4584,8 +4445,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -4604,7 +4465,6 @@ "ctxt": 0 }, "value": "JustPropTypes", - "typeAnnotation": null, "optional": false }, "span": { @@ -4628,7 +4488,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -4664,7 +4523,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -4718,8 +4576,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -4738,7 +4596,6 @@ "ctxt": 0 }, "value": "JustPropTypes", - "typeAnnotation": null, "optional": false }, "span": { @@ -4762,7 +4619,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -4816,8 +4672,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -4836,7 +4692,6 @@ "ctxt": 0 }, "value": "JustPropTypes", - "typeAnnotation": null, "optional": false }, "span": { @@ -4860,7 +4715,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -4895,7 +4749,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -4949,8 +4802,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -4969,7 +4822,6 @@ "ctxt": 0 }, "value": "JustPropTypes", - "typeAnnotation": null, "optional": false }, "span": { @@ -4993,7 +4845,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -5029,7 +4880,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -5070,7 +4920,6 @@ "ctxt": 0 }, "value": "JustDefaultProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5096,7 +4945,6 @@ "ctxt": 0 }, "value": "defaultProps", - "typeAnnotation": null, "optional": false }, "value": { @@ -5117,7 +4965,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -5152,7 +4999,6 @@ "ctxt": 0 }, "value": "ReactComponent", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -5185,8 +5031,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -5205,7 +5051,6 @@ "ctxt": 0 }, "value": "JustDefaultProps", - "typeAnnotation": null, "optional": false }, "span": { @@ -5229,7 +5074,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -5286,8 +5130,8 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -5306,7 +5150,6 @@ "ctxt": 0 }, "value": "JustDefaultProps", - "typeAnnotation": null, "optional": false }, "span": { @@ -5330,7 +5173,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -5366,7 +5208,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -5420,8 +5261,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -5440,7 +5281,6 @@ "ctxt": 0 }, "value": "JustDefaultProps", - "typeAnnotation": null, "optional": false }, "span": { @@ -5464,7 +5304,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -5508,7 +5347,6 @@ "ctxt": 0 }, "value": "FooProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5538,7 +5376,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5577,7 +5414,6 @@ "ctxt": 0 }, "value": "BothWithSpecifiedGeneric", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5603,7 +5439,6 @@ "ctxt": 0 }, "value": "propTypes", - "typeAnnotation": null, "optional": false }, "value": { @@ -5624,7 +5459,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -5642,7 +5476,6 @@ "ctxt": 0 }, "value": "PropTypes", - "typeAnnotation": null, "optional": false }, "property": { @@ -5653,7 +5486,6 @@ "ctxt": 0 }, "value": "string", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5669,7 +5501,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -5687,7 +5518,6 @@ "ctxt": 0 }, "value": "PropTypes", - "typeAnnotation": null, "optional": false }, "property": { @@ -5698,7 +5528,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5714,7 +5543,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -5739,7 +5567,6 @@ "ctxt": 0 }, "value": "PropTypes", - "typeAnnotation": null, "optional": false }, "property": { @@ -5750,7 +5577,6 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5763,7 +5589,6 @@ "ctxt": 0 }, "value": "isRequired", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5797,7 +5622,6 @@ "ctxt": 0 }, "value": "defaultProps", - "typeAnnotation": null, "optional": false }, "value": { @@ -5818,7 +5642,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -5858,7 +5681,6 @@ "ctxt": 0 }, "value": "ReactComponent", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -5886,7 +5708,6 @@ "ctxt": 0 }, "value": "FooProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5920,8 +5741,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -5940,7 +5761,6 @@ "ctxt": 0 }, "value": "BothWithSpecifiedGeneric", - "typeAnnotation": null, "optional": false }, "span": { @@ -5964,7 +5784,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -5997,7 +5816,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -6030,7 +5848,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -6087,8 +5904,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -6107,7 +5924,6 @@ "ctxt": 0 }, "value": "BothWithSpecifiedGeneric", - "typeAnnotation": null, "optional": false }, "span": { @@ -6131,7 +5947,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -6185,8 +6000,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -6205,7 +6020,6 @@ "ctxt": 0 }, "value": "BothWithSpecifiedGeneric", - "typeAnnotation": null, "optional": false }, "span": { @@ -6229,7 +6043,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -6262,7 +6075,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -6319,8 +6131,8 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -6339,7 +6151,6 @@ "ctxt": 0 }, "value": "BothWithSpecifiedGeneric", - "typeAnnotation": null, "optional": false }, "span": { @@ -6363,7 +6174,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -6396,7 +6206,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -6432,7 +6241,6 @@ "ctxt": 0 }, "value": "bat", - "typeAnnotation": null, "optional": false }, "value": { @@ -6486,8 +6294,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -6506,7 +6314,6 @@ "ctxt": 0 }, "value": "BothWithSpecifiedGeneric", - "typeAnnotation": null, "optional": false }, "span": { @@ -6530,7 +6337,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -6563,7 +6369,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -6598,7 +6403,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -6655,8 +6459,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -6675,7 +6479,6 @@ "ctxt": 0 }, "value": "BothWithSpecifiedGeneric", - "typeAnnotation": null, "optional": false }, "span": { @@ -6699,7 +6502,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -6732,7 +6534,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -6765,7 +6566,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -6806,7 +6606,6 @@ "ctxt": 0 }, "value": "JustPropTypesWithSpecifiedGeneric", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6832,7 +6631,6 @@ "ctxt": 0 }, "value": "propTypes", - "typeAnnotation": null, "optional": false }, "value": { @@ -6853,7 +6651,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -6871,7 +6668,6 @@ "ctxt": 0 }, "value": "PropTypes", - "typeAnnotation": null, "optional": false }, "property": { @@ -6882,7 +6678,6 @@ "ctxt": 0 }, "value": "string", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6898,7 +6693,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -6923,7 +6717,6 @@ "ctxt": 0 }, "value": "PropTypes", - "typeAnnotation": null, "optional": false }, "property": { @@ -6934,7 +6727,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6947,7 +6739,6 @@ "ctxt": 0 }, "value": "isRequired", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6975,7 +6766,6 @@ "ctxt": 0 }, "value": "ReactComponent", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -7003,7 +6793,6 @@ "ctxt": 0 }, "value": "FooProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7037,8 +6826,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -7057,7 +6846,6 @@ "ctxt": 0 }, "value": "JustPropTypesWithSpecifiedGeneric", - "typeAnnotation": null, "optional": false }, "span": { @@ -7081,7 +6869,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -7114,7 +6901,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -7168,8 +6954,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -7188,7 +6974,6 @@ "ctxt": 0 }, "value": "JustPropTypesWithSpecifiedGeneric", - "typeAnnotation": null, "optional": false }, "span": { @@ -7212,7 +6997,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -7269,8 +7053,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -7289,7 +7073,6 @@ "ctxt": 0 }, "value": "JustPropTypesWithSpecifiedGeneric", - "typeAnnotation": null, "optional": false }, "span": { @@ -7313,7 +7096,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -7348,7 +7130,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -7402,8 +7183,8 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -7422,7 +7203,6 @@ "ctxt": 0 }, "value": "JustPropTypesWithSpecifiedGeneric", - "typeAnnotation": null, "optional": false }, "span": { @@ -7446,7 +7226,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -7479,7 +7258,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -7520,7 +7298,6 @@ "ctxt": 0 }, "value": "JustDefaultPropsWithSpecifiedGeneric", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7546,7 +7323,6 @@ "ctxt": 0 }, "value": "defaultProps", - "typeAnnotation": null, "optional": false }, "value": { @@ -7567,7 +7343,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -7607,7 +7382,6 @@ "ctxt": 0 }, "value": "ReactComponent", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -7635,7 +7409,6 @@ "ctxt": 0 }, "value": "FooProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7669,8 +7442,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -7689,7 +7462,6 @@ "ctxt": 0 }, "value": "JustDefaultPropsWithSpecifiedGeneric", - "typeAnnotation": null, "optional": false }, "span": { @@ -7713,7 +7485,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -7767,8 +7538,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -7787,7 +7558,6 @@ "ctxt": 0 }, "value": "JustDefaultPropsWithSpecifiedGeneric", - "typeAnnotation": null, "optional": false }, "span": { @@ -7811,7 +7581,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -7844,7 +7613,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -7898,8 +7666,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -7918,7 +7686,6 @@ "ctxt": 0 }, "value": "JustDefaultPropsWithSpecifiedGeneric", - "typeAnnotation": null, "optional": false }, "span": { @@ -7942,7 +7709,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -7999,8 +7765,8 @@ "ctxt": 0 }, "value": "aa", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -8019,7 +7785,6 @@ "ctxt": 0 }, "value": "JustDefaultPropsWithSpecifiedGeneric", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxNoJsxx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxNoJsxx/input.tsx.json index 7cb7fc047755..3d58b7723e79 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxNoJsxx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxNoJsxx/input.tsx.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "nope", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxOpeningClosingNamesx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxOpeningClosingNamesx/input.tsx.json index 2812774919e3..1261c2feb853 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxOpeningClosingNamesx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxOpeningClosingNamesx/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -85,7 +83,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -105,7 +102,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "body": { @@ -125,7 +121,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "body": { @@ -161,6 +156,7 @@ "ctxt": 0 }, "value": "D", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -177,8 +173,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -220,7 +215,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -231,7 +225,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -243,7 +236,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -255,7 +247,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false } }, @@ -301,7 +292,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -312,7 +302,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -324,7 +313,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -336,7 +324,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxParseTests1x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxParseTests1x/input.tsx.json index 107f10d2d9e4..5d372509bea0 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxParseTests1x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxParseTests1x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -136,7 +132,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -177,8 +172,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -197,7 +192,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -227,7 +221,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -257,7 +250,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -287,7 +279,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -315,7 +306,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -336,7 +326,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false } } @@ -357,7 +346,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -378,7 +366,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxParseTests2x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxParseTests2x/input.tsx.json index d5a360313754..24d1abbd216f 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxParseTests2x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxParseTests2x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -136,7 +132,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -177,8 +172,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -197,7 +192,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -225,7 +219,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxPreserveEmit1x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxPreserveEmit1x/input.tsx.json index 344790c4c24e..7f6b39441dbc 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxPreserveEmit1x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxPreserveEmit1x/input.tsx.json @@ -62,6 +62,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -78,8 +79,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -101,7 +101,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -125,7 +124,6 @@ "ctxt": 0 }, "value": "ReactRouter", - "typeAnnotation": null, "optional": false }, "body": { @@ -161,6 +159,7 @@ "ctxt": 0 }, "value": "Route", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -177,8 +176,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -200,7 +198,6 @@ "ctxt": 0 }, "value": "Thing", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -265,7 +262,6 @@ "ctxt": 0 }, "value": "ReactRouter", - "typeAnnotation": null, "optional": false } } @@ -289,7 +285,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -332,7 +327,6 @@ "ctxt": 0 }, "value": "ReactRouter", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -375,7 +369,6 @@ "ctxt": 0 }, "value": "Route", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -388,7 +381,6 @@ "ctxt": 0 }, "value": "ReactRouter", - "typeAnnotation": null, "optional": false }, "right": { @@ -399,7 +391,6 @@ "ctxt": 0 }, "value": "Route", - "typeAnnotation": null, "optional": false } } @@ -429,8 +420,8 @@ "ctxt": 0 }, "value": "routes1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -449,7 +440,6 @@ "ctxt": 0 }, "value": "Route", - "typeAnnotation": null, "optional": false }, "span": { @@ -485,7 +475,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -528,6 +517,7 @@ "ctxt": 0 }, "value": "X", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -544,8 +534,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -573,7 +562,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -609,8 +597,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -629,7 +617,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "span": { @@ -657,7 +644,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxPreserveEmit2x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxPreserveEmit2x/input.tsx.json index f7dccba38c31..5ba5ee40707e 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxPreserveEmit2x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxPreserveEmit2x/input.tsx.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "Route", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,8 +80,8 @@ "ctxt": 0 }, "value": "routes1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -100,7 +100,6 @@ "ctxt": 0 }, "value": "Route", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxPreserveEmit3x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxPreserveEmit3x/input.tsx.json index d0d48322b78c..98809786b470 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxPreserveEmit3x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxPreserveEmit3x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -105,6 +102,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,8 +119,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -187,8 +184,8 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -219,7 +216,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "imported": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactComponentWithDefaultTypeParameter1x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactComponentWithDefaultTypeParameter1x/input.tsx.json index f2e54f24e5d8..148fe7a100bd 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactComponentWithDefaultTypeParameter1x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactComponentWithDefaultTypeParameter1x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -175,7 +171,6 @@ "ctxt": 0 }, "value": "MyComp", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -201,7 +196,6 @@ "ctxt": 0 }, "value": "internalProp", - "typeAnnotation": null, "optional": false }, "value": null, @@ -227,7 +221,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -259,7 +252,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -270,7 +262,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -299,7 +290,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -318,7 +308,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -349,7 +338,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -392,8 +380,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -412,7 +400,6 @@ "ctxt": 0 }, "value": "MyComp", - "typeAnnotation": null, "optional": false }, "span": { @@ -436,7 +423,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -472,7 +458,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactComponentWithDefaultTypeParameter2x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactComponentWithDefaultTypeParameter2x/input.tsx.json index 0cdde79d8141..c3f0f7eee8eb 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactComponentWithDefaultTypeParameter2x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactComponentWithDefaultTypeParameter2x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -175,7 +171,6 @@ "ctxt": 0 }, "value": "MyComp", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -201,7 +196,6 @@ "ctxt": 0 }, "value": "internalProp", - "typeAnnotation": null, "optional": false }, "value": null, @@ -227,7 +221,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -259,7 +252,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -270,7 +262,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -299,7 +290,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -318,7 +308,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -349,7 +338,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -392,8 +380,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -412,7 +400,6 @@ "ctxt": 0 }, "value": "MyComp", - "typeAnnotation": null, "optional": false }, "span": { @@ -456,8 +443,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -476,7 +463,6 @@ "ctxt": 0 }, "value": "MyComp", - "typeAnnotation": null, "optional": false }, "span": { @@ -500,7 +486,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactComponentWithDefaultTypeParameter3x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactComponentWithDefaultTypeParameter3x/input.tsx.json index 259755ea2861..62aa1d51e2d4 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactComponentWithDefaultTypeParameter3x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactComponentWithDefaultTypeParameter3x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -175,7 +171,6 @@ "ctxt": 0 }, "value": "MyComp", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -201,7 +196,6 @@ "ctxt": 0 }, "value": "internalProp", - "typeAnnotation": null, "optional": false }, "value": null, @@ -227,7 +221,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -259,7 +252,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -270,7 +262,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -299,7 +290,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -317,7 +307,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -349,7 +338,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -392,8 +380,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -412,7 +400,6 @@ "ctxt": 0 }, "value": "MyComp", - "typeAnnotation": null, "optional": false }, "span": { @@ -456,8 +443,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -476,7 +463,6 @@ "ctxt": 0 }, "value": "MyComp", - "typeAnnotation": null, "optional": false }, "span": { @@ -500,7 +486,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -536,7 +521,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -590,8 +574,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -610,7 +594,6 @@ "ctxt": 0 }, "value": "MyComp", - "typeAnnotation": null, "optional": false }, "span": { @@ -634,7 +617,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit1x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit1x/input.tsx.json index 2daebe3fdc7a..745756e813fe 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit1x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit1x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -105,6 +102,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,8 +119,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -180,6 +177,7 @@ "ctxt": 0 }, "value": "React", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -196,8 +194,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -229,8 +226,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -262,8 +259,8 @@ "ctxt": 0 }, "value": "selfClosed1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -282,7 +279,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -326,8 +322,8 @@ "ctxt": 0 }, "value": "selfClosed2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -346,7 +342,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -370,7 +365,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -424,8 +418,8 @@ "ctxt": 0 }, "value": "selfClosed3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -444,7 +438,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -468,7 +461,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -522,8 +514,8 @@ "ctxt": 0 }, "value": "selfClosed4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -542,7 +534,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -566,7 +557,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -599,7 +589,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -653,8 +642,8 @@ "ctxt": 0 }, "value": "selfClosed5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -673,7 +662,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -697,7 +685,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -733,7 +720,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -787,8 +773,8 @@ "ctxt": 0 }, "value": "selfClosed6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -807,7 +793,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -831,7 +816,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -872,7 +856,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -926,8 +909,8 @@ "ctxt": 0 }, "value": "selfClosed7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -946,7 +929,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -970,7 +952,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -988,7 +969,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1008,7 +988,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1041,7 +1020,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -1082,8 +1060,8 @@ "ctxt": 0 }, "value": "openClosed1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1102,7 +1080,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1130,7 +1107,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1164,8 +1140,8 @@ "ctxt": 0 }, "value": "openClosed2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1184,7 +1160,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1208,7 +1183,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -1257,7 +1231,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1291,8 +1264,8 @@ "ctxt": 0 }, "value": "openClosed3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1311,7 +1284,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1335,7 +1307,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -1373,7 +1344,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1393,7 +1363,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1427,8 +1396,8 @@ "ctxt": 0 }, "value": "openClosed4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1447,7 +1416,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1471,7 +1439,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -1517,7 +1484,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "right": { @@ -1528,7 +1494,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1549,7 +1514,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1583,8 +1547,8 @@ "ctxt": 0 }, "value": "openClosed5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1603,7 +1567,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1627,7 +1590,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -1660,7 +1622,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -1693,7 +1654,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "right": { @@ -1704,7 +1664,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1725,7 +1684,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1744,7 +1702,6 @@ "ctxt": 0 }, "value": "SomeClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1770,7 +1727,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -1814,8 +1770,8 @@ "ctxt": 0 }, "value": "rewrites1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1834,7 +1790,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1892,7 +1847,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1926,8 +1880,8 @@ "ctxt": 0 }, "value": "rewrites2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1946,7 +1900,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1984,7 +1937,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -2002,7 +1954,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -2016,7 +1967,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -2039,7 +1989,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -2073,8 +2022,8 @@ "ctxt": 0 }, "value": "rewrites3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2093,7 +2042,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -2129,7 +2077,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } ] @@ -2151,7 +2098,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -2185,8 +2131,8 @@ "ctxt": 0 }, "value": "rewrites4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2205,7 +2151,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -2229,7 +2174,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2282,7 +2226,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -2316,8 +2259,8 @@ "ctxt": 0 }, "value": "rewrites5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2336,7 +2279,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -2360,7 +2302,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2388,7 +2329,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -2406,7 +2346,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -2420,7 +2359,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -2448,7 +2386,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -2482,8 +2419,8 @@ "ctxt": 0 }, "value": "rewrites6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2502,7 +2439,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -2526,7 +2462,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2552,7 +2487,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } ] @@ -2579,7 +2513,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -2633,8 +2566,8 @@ "ctxt": 0 }, "value": "whitespace1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2653,7 +2586,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -2692,7 +2624,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -2726,8 +2657,8 @@ "ctxt": 0 }, "value": "whitespace2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2746,7 +2677,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -2784,7 +2714,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -2814,7 +2743,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -2848,8 +2776,8 @@ "ctxt": 0 }, "value": "whitespace3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2868,7 +2796,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -2906,7 +2833,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -2936,7 +2862,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit2x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit2x/input.tsx.json index bbc1711a1820..687fe5543b3c 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit2x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit2x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -105,6 +102,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,8 +119,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -180,6 +177,7 @@ "ctxt": 0 }, "value": "React", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -196,8 +194,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -229,6 +226,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -245,8 +243,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -266,6 +263,7 @@ "ctxt": 0 }, "value": "p2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -282,8 +280,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -303,6 +300,7 @@ "ctxt": 0 }, "value": "p3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -319,8 +317,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -352,8 +349,8 @@ "ctxt": 0 }, "value": "spreads1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -372,7 +369,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -396,7 +392,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false } } @@ -420,7 +415,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false } } @@ -440,7 +434,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -474,8 +467,8 @@ "ctxt": 0 }, "value": "spreads2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -494,7 +487,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -518,7 +510,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false } } @@ -542,7 +533,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false } } @@ -562,7 +552,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -596,8 +585,8 @@ "ctxt": 0 }, "value": "spreads3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -616,7 +605,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -640,7 +628,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -658,7 +645,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false } } @@ -678,7 +664,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false } } @@ -702,7 +687,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false } } @@ -722,7 +706,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -756,8 +739,8 @@ "ctxt": 0 }, "value": "spreads4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -776,7 +759,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -800,7 +782,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false } }, @@ -819,7 +800,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -837,7 +817,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false } } @@ -862,7 +841,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false } } @@ -882,7 +860,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -916,8 +893,8 @@ "ctxt": 0 }, "value": "spreads5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -936,7 +913,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -960,7 +936,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -978,7 +953,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false } } @@ -998,7 +972,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false } }, @@ -1017,7 +990,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1035,7 +1007,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false } } @@ -1060,7 +1031,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false } } @@ -1080,7 +1050,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit3x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit3x/input.tsx.json index 3797ddb89492..bcaabb4762b2 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit3x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit3x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -93,6 +91,7 @@ "ctxt": 0 }, "value": "React", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -109,8 +108,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -142,8 +140,8 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -163,8 +161,8 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -184,8 +182,8 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -216,7 +214,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "span": { @@ -256,7 +253,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "span": { @@ -295,7 +291,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false } } @@ -327,7 +322,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "span": { @@ -369,7 +363,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "span": { @@ -401,7 +394,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "span": { @@ -432,7 +424,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit4x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit4x/input.tsx.json index 9a00751791b3..60f0ec67f008 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit4x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit4x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -105,6 +102,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,8 +119,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -180,6 +177,7 @@ "ctxt": 0 }, "value": "React", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -196,8 +194,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -229,6 +226,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -245,8 +243,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -278,8 +275,8 @@ "ctxt": 0 }, "value": "openClosed1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -298,7 +295,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -336,7 +332,6 @@ "ctxt": 0 }, "value": "blah", - "typeAnnotation": null, "optional": false } }, @@ -366,7 +361,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -400,8 +394,8 @@ "ctxt": 0 }, "value": "spread1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -420,7 +414,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -444,7 +437,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -463,7 +455,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit5x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit5x/input.tsx.json index 7dd9f47fc890..8e2936eedc93 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit5x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit5x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -105,6 +102,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,8 +119,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -187,8 +184,8 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -219,7 +216,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "imported": null @@ -267,6 +263,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -283,8 +280,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -316,8 +312,8 @@ "ctxt": 0 }, "value": "spread1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -336,7 +332,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -360,7 +355,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -393,7 +387,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -412,7 +405,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit6x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit6x/input.tsx.json index 76d4af469e1d..dfad6e4083de 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit6x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit6x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -105,6 +102,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,8 +119,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -172,7 +169,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -215,6 +211,7 @@ "ctxt": 0 }, "value": "React", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -231,8 +228,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -260,7 +256,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -296,6 +291,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -312,8 +308,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -345,8 +340,8 @@ "ctxt": 0 }, "value": "spread1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -365,7 +360,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -389,7 +383,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -422,7 +415,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -441,7 +433,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -495,8 +486,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -515,7 +506,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -554,7 +544,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit7x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit7x/input.tsx.json index 371c47880382..2898ec214ac8 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit7x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmit7x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -105,6 +102,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,8 +119,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -180,8 +177,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -200,7 +197,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -224,7 +220,6 @@ "ctxt": 0 }, "value": "x-y", - "typeAnnotation": null, "optional": false }, "value": { @@ -262,7 +257,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -296,8 +290,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -316,7 +310,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -340,7 +333,6 @@ "ctxt": 0 }, "value": "xx-y", - "typeAnnotation": null, "optional": false }, "value": { @@ -378,7 +370,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -412,8 +403,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -432,7 +423,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -456,7 +446,6 @@ "ctxt": 0 }, "value": "x-yy", - "typeAnnotation": null, "optional": false }, "value": { @@ -494,7 +483,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -528,8 +516,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -548,7 +536,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -572,7 +559,6 @@ "ctxt": 0 }, "value": "xx-yy", - "typeAnnotation": null, "optional": false }, "value": { @@ -610,7 +596,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -644,8 +629,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -664,7 +649,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -688,7 +672,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -726,7 +709,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -760,8 +742,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -780,7 +762,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -804,7 +785,6 @@ "ctxt": 0 }, "value": "xx", - "typeAnnotation": null, "optional": false }, "value": { @@ -842,7 +822,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -876,8 +855,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -896,7 +875,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -920,7 +898,6 @@ "ctxt": 0 }, "value": "xxx", - "typeAnnotation": null, "optional": false }, "value": { @@ -958,7 +935,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -992,8 +968,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1012,7 +988,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1036,7 +1011,6 @@ "ctxt": 0 }, "value": "xxxx", - "typeAnnotation": null, "optional": false }, "value": { @@ -1074,7 +1048,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1108,8 +1081,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1128,7 +1101,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1152,7 +1124,6 @@ "ctxt": 0 }, "value": "xxxxx", - "typeAnnotation": null, "optional": false }, "value": { @@ -1190,7 +1161,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmitNestingx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmitNestingx/input.tsx.json index cdb383fa7a57..1dc5b3a2dd35 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmitNestingx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmitNestingx/input.tsx.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "vdom", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "ctrl", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "model", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,8 +178,8 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -197,8 +197,8 @@ "ctxt": 0 }, "value": "ctrl", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -208,8 +208,8 @@ "ctxt": 0 }, "value": "model", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -229,7 +229,6 @@ "ctxt": 0 }, "value": "section", - "typeAnnotation": null, "optional": false }, "span": { @@ -253,7 +252,6 @@ "ctxt": 0 }, "value": "class", - "typeAnnotation": null, "optional": false }, "value": { @@ -303,7 +301,6 @@ "ctxt": 0 }, "value": "header", - "typeAnnotation": null, "optional": false }, "span": { @@ -327,7 +324,6 @@ "ctxt": 0 }, "value": "class", - "typeAnnotation": null, "optional": false }, "value": { @@ -377,7 +373,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "span": { @@ -416,7 +411,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false } } @@ -448,7 +442,6 @@ "ctxt": 0 }, "value": "input", - "typeAnnotation": null, "optional": false }, "span": { @@ -472,7 +465,6 @@ "ctxt": 0 }, "value": "class", - "typeAnnotation": null, "optional": false }, "value": { @@ -505,7 +497,6 @@ "ctxt": 0 }, "value": "autofocus", - "typeAnnotation": null, "optional": false }, "value": null @@ -525,7 +516,6 @@ "ctxt": 0 }, "value": "autocomplete", - "typeAnnotation": null, "optional": false }, "value": { @@ -558,7 +548,6 @@ "ctxt": 0 }, "value": "placeholder", - "typeAnnotation": null, "optional": false }, "value": { @@ -591,7 +580,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -616,7 +604,6 @@ "ctxt": 0 }, "value": "model", - "typeAnnotation": null, "optional": false }, "property": { @@ -627,7 +614,6 @@ "ctxt": 0 }, "value": "newTodo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -649,7 +635,6 @@ "ctxt": 0 }, "value": "onKeyup", - "typeAnnotation": null, "optional": false }, "value": { @@ -688,7 +673,6 @@ "ctxt": 0 }, "value": "ctrl", - "typeAnnotation": null, "optional": false }, "property": { @@ -699,7 +683,6 @@ "ctxt": 0 }, "value": "addTodo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -712,7 +695,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -728,7 +710,6 @@ "ctxt": 0 }, "value": "ctrl", - "typeAnnotation": null, "optional": false } }, @@ -742,7 +723,6 @@ "ctxt": 0 }, "value": "model", - "typeAnnotation": null, "optional": false } } @@ -784,7 +764,6 @@ "ctxt": 0 }, "value": "header", - "typeAnnotation": null, "optional": false } } @@ -816,7 +795,6 @@ "ctxt": 0 }, "value": "section", - "typeAnnotation": null, "optional": false }, "span": { @@ -840,7 +818,6 @@ "ctxt": 0 }, "value": "class", - "typeAnnotation": null, "optional": false }, "value": { @@ -873,7 +850,6 @@ "ctxt": 0 }, "value": "style", - "typeAnnotation": null, "optional": false }, "value": { @@ -901,7 +877,6 @@ "ctxt": 0 }, "value": "display", - "typeAnnotation": null, "optional": false }, "value": { @@ -941,7 +916,6 @@ "ctxt": 0 }, "value": "model", - "typeAnnotation": null, "optional": false }, "property": { @@ -952,7 +926,6 @@ "ctxt": 0 }, "value": "todos", - "typeAnnotation": null, "optional": false }, "computed": false @@ -979,7 +952,6 @@ "ctxt": 0 }, "value": "model", - "typeAnnotation": null, "optional": false }, "property": { @@ -990,7 +962,6 @@ "ctxt": 0 }, "value": "todos", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1003,7 +974,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1076,7 +1046,6 @@ "ctxt": 0 }, "value": "input", - "typeAnnotation": null, "optional": false }, "span": { @@ -1100,7 +1069,6 @@ "ctxt": 0 }, "value": "class", - "typeAnnotation": null, "optional": false }, "value": { @@ -1133,7 +1101,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "value": { @@ -1166,7 +1133,6 @@ "ctxt": 0 }, "value": "onChange", - "typeAnnotation": null, "optional": false }, "value": { @@ -1205,7 +1171,6 @@ "ctxt": 0 }, "value": "ctrl", - "typeAnnotation": null, "optional": false }, "property": { @@ -1216,7 +1181,6 @@ "ctxt": 0 }, "value": "toggleAll", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1229,7 +1193,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1245,7 +1208,6 @@ "ctxt": 0 }, "value": "ctrl", - "typeAnnotation": null, "optional": false } } @@ -1288,7 +1250,6 @@ "ctxt": 0 }, "value": "ul", - "typeAnnotation": null, "optional": false }, "span": { @@ -1312,7 +1273,6 @@ "ctxt": 0 }, "value": "class", - "typeAnnotation": null, "optional": false }, "value": { @@ -1381,7 +1341,6 @@ "ctxt": 0 }, "value": "model", - "typeAnnotation": null, "optional": false }, "property": { @@ -1392,7 +1351,6 @@ "ctxt": 0 }, "value": "filteredTodos", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1405,7 +1363,6 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1429,8 +1386,8 @@ "ctxt": 0 }, "value": "todo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1450,7 +1407,6 @@ "ctxt": 0 }, "value": "li", - "typeAnnotation": null, "optional": false }, "span": { @@ -1474,7 +1430,6 @@ "ctxt": 0 }, "value": "class", - "typeAnnotation": null, "optional": false }, "value": { @@ -1502,7 +1457,6 @@ "ctxt": 0 }, "value": "todo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1525,7 +1479,6 @@ "ctxt": 0 }, "value": "completed", - "typeAnnotation": null, "optional": false }, "value": { @@ -1543,7 +1496,6 @@ "ctxt": 0 }, "value": "todo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1554,7 +1506,6 @@ "ctxt": 0 }, "value": "completed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1570,7 +1521,6 @@ "ctxt": 0 }, "value": "editing", - "typeAnnotation": null, "optional": false }, "value": { @@ -1589,7 +1539,6 @@ "ctxt": 0 }, "value": "todo", - "typeAnnotation": null, "optional": false }, "right": { @@ -1607,7 +1556,6 @@ "ctxt": 0 }, "value": "model", - "typeAnnotation": null, "optional": false }, "property": { @@ -1618,7 +1566,6 @@ "ctxt": 0 }, "value": "editedTodo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1661,7 +1608,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1685,7 +1631,6 @@ "ctxt": 0 }, "value": "class", - "typeAnnotation": null, "optional": false }, "value": { @@ -1762,7 +1707,6 @@ "ctxt": 0 }, "value": "todo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1773,7 +1717,6 @@ "ctxt": 0 }, "value": "editable", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1797,7 +1740,6 @@ "ctxt": 0 }, "value": "input", - "typeAnnotation": null, "optional": false }, "span": { @@ -1821,7 +1763,6 @@ "ctxt": 0 }, "value": "class", - "typeAnnotation": null, "optional": false }, "value": { @@ -1854,7 +1795,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "value": { @@ -1892,7 +1832,6 @@ "ctxt": 0 }, "value": "input", - "typeAnnotation": null, "optional": false } } @@ -1934,7 +1873,6 @@ "ctxt": 0 }, "value": "label", - "typeAnnotation": null, "optional": false }, "span": { @@ -1958,7 +1896,6 @@ "ctxt": 0 }, "value": "onDoubleClick", - "typeAnnotation": null, "optional": false }, "value": { @@ -2013,7 +1950,6 @@ "ctxt": 0 }, "value": "ctrl", - "typeAnnotation": null, "optional": false }, "property": { @@ -2024,7 +1960,6 @@ "ctxt": 0 }, "value": "editTodo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2040,7 +1975,6 @@ "ctxt": 0 }, "value": "todo", - "typeAnnotation": null, "optional": false } } @@ -2084,7 +2018,6 @@ "ctxt": 0 }, "value": "todo", - "typeAnnotation": null, "optional": false }, "property": { @@ -2095,7 +2028,6 @@ "ctxt": 0 }, "value": "title", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2117,7 +2049,6 @@ "ctxt": 0 }, "value": "label", - "typeAnnotation": null, "optional": false } } @@ -2149,7 +2080,6 @@ "ctxt": 0 }, "value": "button", - "typeAnnotation": null, "optional": false }, "span": { @@ -2173,7 +2103,6 @@ "ctxt": 0 }, "value": "class", - "typeAnnotation": null, "optional": false }, "value": { @@ -2206,7 +2135,6 @@ "ctxt": 0 }, "value": "onClick", - "typeAnnotation": null, "optional": false }, "value": { @@ -2245,7 +2173,6 @@ "ctxt": 0 }, "value": "ctrl", - "typeAnnotation": null, "optional": false }, "property": { @@ -2256,7 +2183,6 @@ "ctxt": 0 }, "value": "removeTodo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2269,7 +2195,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2285,7 +2210,6 @@ "ctxt": 0 }, "value": "ctrl", - "typeAnnotation": null, "optional": false } }, @@ -2299,7 +2223,6 @@ "ctxt": 0 }, "value": "todo", - "typeAnnotation": null, "optional": false } } @@ -2328,7 +2251,6 @@ "ctxt": 0 }, "value": "button", - "typeAnnotation": null, "optional": false } } @@ -2360,7 +2282,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -2384,7 +2305,6 @@ "ctxt": 0 }, "value": "class", - "typeAnnotation": null, "optional": false }, "value": { @@ -2434,7 +2354,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -2458,7 +2377,6 @@ "ctxt": 0 }, "value": "class", - "typeAnnotation": null, "optional": false }, "value": { @@ -2509,7 +2427,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -2540,7 +2457,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -2571,7 +2487,6 @@ "ctxt": 0 }, "value": "li", - "typeAnnotation": null, "optional": false } } @@ -2612,7 +2527,6 @@ "ctxt": 0 }, "value": "ul", - "typeAnnotation": null, "optional": false } } @@ -2643,7 +2557,6 @@ "ctxt": 0 }, "value": "section", - "typeAnnotation": null, "optional": false } } @@ -2674,7 +2587,6 @@ "ctxt": 0 }, "value": "section", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmitWhitespace2x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmitWhitespace2x/input.tsx.json index 1a563b57e699..50d4798f332f 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmitWhitespace2x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmitWhitespace2x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -105,6 +102,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,8 +119,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -180,6 +177,7 @@ "ctxt": 0 }, "value": "React", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -196,8 +194,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -228,7 +225,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -268,7 +264,6 @@ "ctxt": 0 }, "value": "code", - "typeAnnotation": null, "optional": false }, "span": { @@ -307,7 +302,6 @@ "ctxt": 0 }, "value": "code", - "typeAnnotation": null, "optional": false } } @@ -338,7 +332,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -368,7 +361,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -398,7 +390,6 @@ "ctxt": 0 }, "value": "code", - "typeAnnotation": null, "optional": false }, "span": { @@ -437,7 +428,6 @@ "ctxt": 0 }, "value": "code", - "typeAnnotation": null, "optional": false } } @@ -468,7 +458,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -498,7 +487,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -528,7 +516,6 @@ "ctxt": 0 }, "value": "code", - "typeAnnotation": null, "optional": false }, "span": { @@ -569,7 +556,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmitWhitespacex/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmitWhitespacex/input.tsx.json index a68a69f81206..0e29e89e3296 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmitWhitespacex/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxReactEmitWhitespacex/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -105,6 +102,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,8 +119,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -180,6 +177,7 @@ "ctxt": 0 }, "value": "React", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -196,8 +194,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -229,8 +226,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -269,7 +266,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -308,7 +304,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -338,7 +333,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -376,7 +370,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -406,7 +399,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -436,7 +428,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -474,7 +465,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -504,7 +494,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -534,7 +523,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -572,7 +560,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } }, @@ -602,7 +589,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -632,7 +618,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -671,7 +656,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -701,7 +685,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -740,7 +723,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -770,7 +752,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -809,7 +790,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -839,7 +819,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -878,7 +857,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -908,7 +886,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -947,7 +924,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -977,7 +953,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1016,7 +991,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1046,7 +1020,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1085,7 +1058,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSfcReturnNullStrictNullChecksx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSfcReturnNullStrictNullChecksx/input.tsx.json index d5b1c954d6a9..135176141440 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSfcReturnNullStrictNullChecksx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSfcReturnNullStrictNullChecksx/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -74,8 +73,8 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -93,6 +92,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -109,8 +109,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "body": { @@ -140,7 +139,6 @@ "ctxt": 0 }, "value": "Greet", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -161,6 +159,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -192,7 +191,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -220,8 +218,7 @@ } ] } - }, - "optional": false + } } } ], @@ -287,8 +284,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -307,7 +304,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "span": { @@ -351,8 +347,8 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -371,7 +367,6 @@ "ctxt": 0 }, "value": "Greet", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSfcReturnNullx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSfcReturnNullx/input.tsx.json index 7a8dd4706286..7a191a9807cf 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSfcReturnNullx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSfcReturnNullx/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -74,8 +73,8 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -93,6 +92,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -109,8 +109,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "body": { @@ -140,7 +139,6 @@ "ctxt": 0 }, "value": "Greet", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -161,6 +159,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -192,7 +191,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -220,8 +218,7 @@ } ] } - }, - "optional": false + } } } ], @@ -287,8 +284,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -307,7 +304,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "span": { @@ -351,8 +347,8 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -371,7 +367,6 @@ "ctxt": 0 }, "value": "Greet", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSfcReturnUndefinedStrictNullChecksx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSfcReturnUndefinedStrictNullChecksx/input.tsx.json index 52914fc7a078..edb664b35ae3 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSfcReturnUndefinedStrictNullChecksx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSfcReturnUndefinedStrictNullChecksx/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -74,8 +73,8 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -93,6 +92,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -109,8 +109,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "body": { @@ -121,7 +120,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "async": false, @@ -143,7 +141,6 @@ "ctxt": 0 }, "value": "Greet", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -164,6 +161,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -195,7 +193,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -223,8 +220,7 @@ } ] } - }, - "optional": false + } } } ], @@ -257,7 +253,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -293,8 +288,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -313,7 +308,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "span": { @@ -357,8 +351,8 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -377,7 +371,6 @@ "ctxt": 0 }, "value": "Greet", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution10x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution10x/input.tsx.json index 8fafe820bc7f..d89b6415355a 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution10x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution10x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "OptionProp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -141,7 +138,6 @@ "ctxt": 0 }, "value": "Opt", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -167,7 +163,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -210,7 +205,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -249,7 +243,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -284,7 +277,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -295,7 +287,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -325,7 +316,6 @@ "ctxt": 0 }, "value": "OptionProp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -368,6 +358,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -390,13 +381,11 @@ "ctxt": 0 }, "value": "OptionProp", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -436,6 +425,7 @@ "ctxt": 0 }, "value": "obj1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -458,13 +448,11 @@ "ctxt": 0 }, "value": "OptionProp", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -484,7 +472,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -528,8 +515,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -548,7 +535,6 @@ "ctxt": 0 }, "value": "Opt", - "typeAnnotation": null, "optional": false }, "span": { @@ -572,7 +558,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } }, @@ -591,7 +576,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -648,8 +632,8 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -668,7 +652,6 @@ "ctxt": 0 }, "value": "Opt", - "typeAnnotation": null, "optional": false }, "span": { @@ -692,7 +675,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } }, @@ -711,7 +693,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -765,8 +746,8 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -785,7 +766,6 @@ "ctxt": 0 }, "value": "Opt", - "typeAnnotation": null, "optional": false }, "span": { @@ -809,7 +789,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } }, @@ -828,7 +807,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -885,8 +863,8 @@ "ctxt": 0 }, "value": "y3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -905,7 +883,6 @@ "ctxt": 0 }, "value": "Opt", - "typeAnnotation": null, "optional": false }, "span": { @@ -929,7 +906,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution11x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution11x/input.tsx.json index 5b1dd969c967..ab90a1493c2f 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution11x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution11x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -74,8 +73,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -115,6 +114,7 @@ "ctxt": 0 }, "value": "obj1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -146,7 +146,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -182,8 +181,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -203,7 +201,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -247,6 +244,7 @@ "ctxt": 0 }, "value": "obj3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -278,7 +276,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -328,7 +325,6 @@ "ctxt": 0 }, "value": "overwrite", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -356,8 +352,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -377,7 +372,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -400,7 +394,6 @@ "ctxt": 0 }, "value": "overwrite", - "typeAnnotation": null, "optional": false }, "value": { @@ -439,7 +432,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -469,7 +461,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -519,7 +510,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -569,7 +559,6 @@ "ctxt": 0 }, "value": "overwrite", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -608,7 +597,6 @@ "ctxt": 0 }, "value": "OverWriteAttr", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -634,7 +622,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -677,7 +664,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -716,7 +702,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -751,7 +736,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -762,7 +746,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -792,7 +775,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -835,6 +817,7 @@ "ctxt": 0 }, "value": "anyobj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -851,8 +834,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -884,8 +866,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -904,7 +886,6 @@ "ctxt": 0 }, "value": "OverWriteAttr", - "typeAnnotation": null, "optional": false }, "span": { @@ -928,7 +909,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } }, @@ -947,7 +927,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -967,7 +946,6 @@ "ctxt": 0 }, "value": "overwrite", - "typeAnnotation": null, "optional": false }, "value": { @@ -1000,7 +978,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } } @@ -1040,8 +1017,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1060,7 +1037,6 @@ "ctxt": 0 }, "value": "OverWriteAttr", - "typeAnnotation": null, "optional": false }, "span": { @@ -1084,7 +1060,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } }, @@ -1103,7 +1078,6 @@ "ctxt": 0 }, "value": "obj3", - "typeAnnotation": null, "optional": false } } @@ -1143,8 +1117,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1163,7 +1137,6 @@ "ctxt": 0 }, "value": "OverWriteAttr", - "typeAnnotation": null, "optional": false }, "span": { @@ -1187,7 +1160,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1223,7 +1195,6 @@ "ctxt": 0 }, "value": "overwrite", - "typeAnnotation": null, "optional": false }, "value": { @@ -1256,7 +1227,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } }, @@ -1285,7 +1255,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1337,8 +1306,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1357,7 +1326,6 @@ "ctxt": 0 }, "value": "OverWriteAttr", - "typeAnnotation": null, "optional": false }, "span": { @@ -1381,7 +1349,6 @@ "ctxt": 0 }, "value": "overwrite", - "typeAnnotation": null, "optional": false }, "value": { @@ -1414,7 +1381,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } }, @@ -1433,7 +1399,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1479,7 +1444,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1502,7 +1466,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1525,7 +1488,6 @@ "ctxt": 0 }, "value": "overwrite", - "typeAnnotation": null, "optional": false }, "value": { @@ -1582,8 +1544,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1602,7 +1564,6 @@ "ctxt": 0 }, "value": "OverWriteAttr", - "typeAnnotation": null, "optional": false }, "span": { @@ -1636,7 +1597,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1677,7 +1637,6 @@ "ctxt": 0 }, "value": "overwrite", - "typeAnnotation": null, "optional": false }, "value": { @@ -1723,7 +1682,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1775,8 +1733,8 @@ "ctxt": 0 }, "value": "x5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1795,7 +1753,6 @@ "ctxt": 0 }, "value": "OverWriteAttr", - "typeAnnotation": null, "optional": false }, "span": { @@ -1819,7 +1776,6 @@ "ctxt": 0 }, "value": "anyobj", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution12x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution12x/input.tsx.json index 4c87be990db2..ca851811ea4e 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution12x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution12x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -74,8 +73,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -115,6 +114,7 @@ "ctxt": 0 }, "value": "obj1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -146,7 +146,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -182,8 +181,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -203,7 +201,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -247,6 +244,7 @@ "ctxt": 0 }, "value": "obj3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -278,7 +276,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -328,7 +325,6 @@ "ctxt": 0 }, "value": "overwrite", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -356,8 +352,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -377,7 +372,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -400,7 +394,6 @@ "ctxt": 0 }, "value": "overwrite", - "typeAnnotation": null, "optional": false }, "value": { @@ -439,7 +432,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -469,7 +461,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -519,7 +510,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -569,7 +559,6 @@ "ctxt": 0 }, "value": "overwrite", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -608,7 +597,6 @@ "ctxt": 0 }, "value": "OverWriteAttr", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -634,7 +622,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -677,7 +664,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -716,7 +702,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -751,7 +736,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -762,7 +746,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -792,7 +775,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -835,6 +817,7 @@ "ctxt": 0 }, "value": "anyobj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -851,8 +834,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -884,8 +866,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -904,7 +886,6 @@ "ctxt": 0 }, "value": "OverWriteAttr", - "typeAnnotation": null, "optional": false }, "span": { @@ -928,7 +909,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } }, @@ -947,7 +927,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -967,7 +946,6 @@ "ctxt": 0 }, "value": "overwrite", - "typeAnnotation": null, "optional": false }, "value": { @@ -1000,7 +978,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } } @@ -1040,8 +1017,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1060,7 +1037,6 @@ "ctxt": 0 }, "value": "OverWriteAttr", - "typeAnnotation": null, "optional": false }, "span": { @@ -1084,7 +1060,6 @@ "ctxt": 0 }, "value": "overwrite", - "typeAnnotation": null, "optional": false }, "value": { @@ -1117,7 +1092,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } }, @@ -1136,7 +1110,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1182,7 +1155,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1234,8 +1206,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1254,7 +1226,6 @@ "ctxt": 0 }, "value": "OverWriteAttr", - "typeAnnotation": null, "optional": false }, "span": { @@ -1278,7 +1249,6 @@ "ctxt": 0 }, "value": "anyobj", - "typeAnnotation": null, "optional": false } }, @@ -1297,7 +1267,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1354,8 +1323,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1374,7 +1343,6 @@ "ctxt": 0 }, "value": "OverWriteAttr", - "typeAnnotation": null, "optional": false }, "span": { @@ -1398,7 +1366,6 @@ "ctxt": 0 }, "value": "overwrite", - "typeAnnotation": null, "optional": false }, "value": { @@ -1431,7 +1398,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } }, @@ -1460,7 +1426,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution13x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution13x/input.tsx.json index 72eea25cc3d5..605e09982b2a 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution13x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution13x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "ComponentProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "property1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "property2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "params": [ @@ -202,6 +197,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -224,13 +220,11 @@ "ctxt": 0 }, "value": "ComponentProps", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -273,6 +267,7 @@ "ctxt": 0 }, "value": "condition1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -289,8 +284,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -312,7 +306,6 @@ "ctxt": 0 }, "value": "condition1", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -354,7 +347,6 @@ "ctxt": 0 }, "value": "ChildComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -378,7 +370,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } } @@ -432,7 +423,6 @@ "ctxt": 0 }, "value": "ChildComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -456,7 +446,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } }, @@ -475,7 +464,6 @@ "ctxt": 0 }, "value": "property1", - "typeAnnotation": null, "optional": false }, "value": { @@ -528,7 +516,6 @@ "ctxt": 0 }, "value": "AnotherComponentProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -558,7 +545,6 @@ "ctxt": 0 }, "value": "property1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -597,7 +583,6 @@ "ctxt": 0 }, "value": "ChildComponent", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -633,7 +618,6 @@ "ctxt": 0 }, "value": "property1", - "typeAnnotation": null, "optional": false }, "value": null @@ -662,7 +646,6 @@ "ctxt": 0 }, "value": "AnotherComponentProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -716,7 +699,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -744,7 +726,6 @@ "ctxt": 0 }, "value": "property1", - "typeAnnotation": null, "optional": false } } @@ -764,7 +745,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution14x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution14x/input.tsx.json index 8ca2d447fa81..7ca1fed80a12 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution14x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution14x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "ComponentProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "property1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "property2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "params": [ @@ -202,6 +197,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -224,13 +220,11 @@ "ctxt": 0 }, "value": "ComponentProps", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -279,7 +273,6 @@ "ctxt": 0 }, "value": "AnotherComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -303,7 +296,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } }, @@ -322,7 +314,6 @@ "ctxt": 0 }, "value": "Property1", - "typeAnnotation": null, "optional": false }, "value": null @@ -359,7 +350,6 @@ "ctxt": 0 }, "value": "AnotherComponentProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -389,7 +379,6 @@ "ctxt": 0 }, "value": "property1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -428,7 +417,6 @@ "ctxt": 0 }, "value": "AnotherComponent", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -464,7 +452,6 @@ "ctxt": 0 }, "value": "property1", - "typeAnnotation": null, "optional": false }, "value": null @@ -493,7 +480,6 @@ "ctxt": 0 }, "value": "AnotherComponentProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -547,7 +533,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -575,7 +560,6 @@ "ctxt": 0 }, "value": "property1", - "typeAnnotation": null, "optional": false } } @@ -595,7 +579,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution15x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution15x/input.tsx.json index 01ed392a7e17..207c02f3c29f 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution15x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution15x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "ComponentProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "property1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "property2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "params": [ @@ -202,6 +197,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -224,13 +220,11 @@ "ctxt": 0 }, "value": "ComponentProps", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -279,7 +273,6 @@ "ctxt": 0 }, "value": "AnotherComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -303,7 +296,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } }, @@ -322,7 +314,6 @@ "ctxt": 0 }, "value": "property2", - "typeAnnotation": null, "optional": false }, "value": null @@ -342,7 +333,6 @@ "ctxt": 0 }, "value": "AnotherProperty1", - "typeAnnotation": null, "optional": false }, "value": { @@ -392,7 +382,6 @@ "ctxt": 0 }, "value": "AnotherComponentProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -422,7 +411,6 @@ "ctxt": 0 }, "value": "property1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -464,7 +452,6 @@ "ctxt": 0 }, "value": "AnotherProperty1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -506,7 +493,6 @@ "ctxt": 0 }, "value": "property2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -545,7 +531,6 @@ "ctxt": 0 }, "value": "AnotherComponent", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -581,7 +566,6 @@ "ctxt": 0 }, "value": "property1", - "typeAnnotation": null, "optional": false }, "value": null @@ -610,7 +594,6 @@ "ctxt": 0 }, "value": "AnotherComponentProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -664,7 +647,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -692,7 +674,6 @@ "ctxt": 0 }, "value": "property1", - "typeAnnotation": null, "optional": false } } @@ -712,7 +693,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution16x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution16x/input.tsx.json index 149fdec86b6d..f63ee68b721e 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution16x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution16x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "ComponentProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "property1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "property2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "params": [ @@ -202,6 +197,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -224,13 +220,11 @@ "ctxt": 0 }, "value": "ComponentProps", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -279,7 +273,6 @@ "ctxt": 0 }, "value": "AnotherComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -303,7 +296,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } } @@ -339,7 +331,6 @@ "ctxt": 0 }, "value": "AnotherComponentProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -369,7 +360,6 @@ "ctxt": 0 }, "value": "property1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -411,7 +401,6 @@ "ctxt": 0 }, "value": "AnotherProperty1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -453,7 +442,6 @@ "ctxt": 0 }, "value": "property2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -492,7 +480,6 @@ "ctxt": 0 }, "value": "AnotherComponent", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -528,7 +515,6 @@ "ctxt": 0 }, "value": "property1", - "typeAnnotation": null, "optional": false }, "value": null @@ -557,7 +543,6 @@ "ctxt": 0 }, "value": "AnotherComponentProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -611,7 +596,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -639,7 +623,6 @@ "ctxt": 0 }, "value": "property1", - "typeAnnotation": null, "optional": false } } @@ -659,7 +642,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution17x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution17x/input.tsx.json index 078a3dcc5ee9..0b06e8463211 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution17x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution17x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "global", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -108,7 +105,6 @@ "ctxt": 0 }, "value": "ElementAttributesProperty", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -138,7 +134,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -198,6 +193,7 @@ "ctxt": 0 }, "value": "React", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -214,8 +210,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -239,7 +234,6 @@ "ctxt": 0 }, "value": "Empty", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -265,7 +259,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -308,7 +301,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -347,7 +339,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -382,7 +373,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -393,7 +383,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -456,6 +445,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -495,7 +485,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -553,8 +542,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -586,8 +574,8 @@ "ctxt": 0 }, "value": "unionedSpread", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -606,7 +594,6 @@ "ctxt": 0 }, "value": "Empty", - "typeAnnotation": null, "optional": false }, "span": { @@ -630,7 +617,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution1x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution1x/input.tsx.json index 9339b18676ac..f0c3d1b64faf 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution1x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution1x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "Poisoned", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -85,7 +83,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -167,7 +163,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -202,7 +197,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -213,7 +207,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -275,8 +268,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -316,8 +309,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -336,7 +329,6 @@ "ctxt": 0 }, "value": "Poisoned", - "typeAnnotation": null, "optional": false }, "span": { @@ -360,7 +352,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -400,8 +391,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -420,7 +411,6 @@ "ctxt": 0 }, "value": "Poisoned", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution2x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution2x/input.tsx.json index 7bd8dfa354bc..28500b21d2ca 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution2x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution2x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "PoisonedProp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -188,7 +184,6 @@ "ctxt": 0 }, "value": "Poisoned", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -214,7 +209,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -257,7 +251,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -296,7 +289,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -331,7 +323,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -342,7 +333,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -372,7 +362,6 @@ "ctxt": 0 }, "value": "PoisonedProp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -415,8 +404,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -455,7 +444,6 @@ "ctxt": 0 }, "value": "Poisoned", - "typeAnnotation": null, "optional": false }, "span": { @@ -489,7 +477,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -517,7 +504,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -571,8 +557,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -591,7 +577,6 @@ "ctxt": 0 }, "value": "Poisoned", - "typeAnnotation": null, "optional": false }, "span": { @@ -615,7 +600,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -655,8 +639,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -675,7 +659,6 @@ "ctxt": 0 }, "value": "Poisoned", - "typeAnnotation": null, "optional": false }, "span": { @@ -719,8 +702,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -739,7 +722,6 @@ "ctxt": 0 }, "value": "Poisoned", - "typeAnnotation": null, "optional": false }, "span": { @@ -763,7 +745,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -783,7 +764,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -824,8 +804,8 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -844,7 +824,6 @@ "ctxt": 0 }, "value": "Poisoned", - "typeAnnotation": null, "optional": false }, "span": { @@ -878,7 +857,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -901,7 +879,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -958,8 +935,8 @@ "ctxt": 0 }, "value": "w1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -978,7 +955,6 @@ "ctxt": 0 }, "value": "Poisoned", - "typeAnnotation": null, "optional": false }, "span": { @@ -1012,7 +988,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1035,7 +1010,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1071,7 +1045,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution3x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution3x/input.tsx.json index f6653e562f74..316bd9175045 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution3x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution3x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "PoisonedProp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -175,7 +171,6 @@ "ctxt": 0 }, "value": "Poisoned", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -201,7 +196,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -244,7 +238,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -283,7 +276,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -318,7 +310,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -329,7 +320,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -359,7 +349,6 @@ "ctxt": 0 }, "value": "PoisonedProp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -402,8 +391,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -423,7 +412,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -451,7 +439,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -495,8 +482,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -515,7 +502,6 @@ "ctxt": 0 }, "value": "Poisoned", - "typeAnnotation": null, "optional": false }, "span": { @@ -539,7 +525,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -579,8 +564,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -599,7 +584,6 @@ "ctxt": 0 }, "value": "Poisoned", - "typeAnnotation": null, "optional": false }, "span": { @@ -623,7 +607,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -656,7 +639,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution4x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution4x/input.tsx.json index 929987c3945a..e91d59c4d3ac 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution4x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution4x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "PoisonedProp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -183,7 +179,6 @@ "ctxt": 0 }, "value": "Poisoned", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -209,7 +204,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -252,7 +246,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -291,7 +284,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -326,7 +318,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -337,7 +328,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -367,7 +357,6 @@ "ctxt": 0 }, "value": "PoisonedProp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -410,6 +399,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -432,13 +422,11 @@ "ctxt": 0 }, "value": "PoisonedProp", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -458,7 +446,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -486,7 +473,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -530,8 +516,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -550,7 +536,6 @@ "ctxt": 0 }, "value": "Poisoned", - "typeAnnotation": null, "optional": false }, "span": { @@ -574,7 +559,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -599,7 +583,6 @@ "ctxt": 0 }, "value": "EmptyProp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -625,7 +608,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -668,7 +650,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -707,7 +688,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -742,7 +722,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -753,7 +732,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -815,6 +793,7 @@ "ctxt": 0 }, "value": "j", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -831,8 +810,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -864,8 +842,8 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -884,7 +862,6 @@ "ctxt": 0 }, "value": "EmptyProp", - "typeAnnotation": null, "optional": false }, "span": { @@ -946,8 +923,8 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -966,7 +943,6 @@ "ctxt": 0 }, "value": "EmptyProp", - "typeAnnotation": null, "optional": false }, "span": { @@ -990,7 +966,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false } } @@ -1030,8 +1005,8 @@ "ctxt": 0 }, "value": "e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1050,7 +1025,6 @@ "ctxt": 0 }, "value": "EmptyProp", - "typeAnnotation": null, "optional": false }, "span": { @@ -1084,7 +1058,6 @@ "ctxt": 0 }, "value": "ref", - "typeAnnotation": null, "optional": false }, "value": { @@ -1103,8 +1076,8 @@ "ctxt": 0 }, "value": "input", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1153,7 +1126,6 @@ "ctxt": 0 }, "value": "textInput", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1166,7 +1138,6 @@ "ctxt": 0 }, "value": "input", - "typeAnnotation": null, "optional": false } } @@ -1218,8 +1189,8 @@ "ctxt": 0 }, "value": "e4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1238,7 +1209,6 @@ "ctxt": 0 }, "value": "EmptyProp", - "typeAnnotation": null, "optional": false }, "span": { @@ -1262,7 +1232,6 @@ "ctxt": 0 }, "value": "data-prop", - "typeAnnotation": null, "optional": false }, "value": null @@ -1303,8 +1272,8 @@ "ctxt": 0 }, "value": "e5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1323,7 +1292,6 @@ "ctxt": 0 }, "value": "EmptyProp", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution5x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution5x/input.tsx.json index 968ee0cddb10..c7519bf9968d 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution5x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution5x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "PoisonedProp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -183,7 +179,6 @@ "ctxt": 0 }, "value": "Poisoned", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -209,7 +204,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -252,7 +246,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -291,7 +284,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -326,7 +318,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -337,7 +328,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -367,7 +357,6 @@ "ctxt": 0 }, "value": "PoisonedProp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -410,8 +399,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -431,7 +420,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -459,7 +447,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -503,8 +490,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -523,7 +510,6 @@ "ctxt": 0 }, "value": "Poisoned", - "typeAnnotation": null, "optional": false }, "span": { @@ -547,7 +533,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -572,7 +557,6 @@ "ctxt": 0 }, "value": "EmptyProp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -598,7 +582,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -641,7 +624,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -680,7 +662,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -714,7 +695,6 @@ "ctxt": 0 }, "value": "greeting", - "typeAnnotation": null, "optional": false }, "value": null, @@ -761,7 +741,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -772,7 +751,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -834,8 +812,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -855,7 +833,6 @@ "ctxt": 0 }, "value": "prop1", - "typeAnnotation": null, "optional": false }, "value": { @@ -899,8 +876,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -919,7 +896,6 @@ "ctxt": 0 }, "value": "EmptyProp", - "typeAnnotation": null, "optional": false }, "span": { @@ -943,7 +919,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution6x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution6x/input.tsx.json index 577ec7edb10e..7ce8d00485e8 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution6x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution6x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -65,7 +64,6 @@ "ctxt": 0 }, "value": "TextProps", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -101,7 +99,6 @@ "ctxt": 0 }, "value": "editable", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -161,7 +158,6 @@ "ctxt": 0 }, "value": "editable", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -211,7 +207,6 @@ "ctxt": 0 }, "value": "onEdit", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -241,6 +236,7 @@ "ctxt": 0 }, "value": "newText", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -257,8 +253,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -298,7 +293,6 @@ "ctxt": 0 }, "value": "TextComponent", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -324,7 +318,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -367,7 +360,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -406,7 +398,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false } } @@ -441,7 +432,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -452,7 +442,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -482,7 +471,6 @@ "ctxt": 0 }, "value": "TextProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -525,8 +513,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -545,7 +533,6 @@ "ctxt": 0 }, "value": "TextComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -569,7 +556,6 @@ "ctxt": 0 }, "value": "editable", - "typeAnnotation": null, "optional": false }, "value": { @@ -626,6 +612,7 @@ "ctxt": 0 }, "value": "textProps", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -648,13 +635,11 @@ "ctxt": 0 }, "value": "TextProps", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -674,7 +659,6 @@ "ctxt": 0 }, "value": "editable", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution7x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution7x/input.tsx.json index cc0d137f3d58..acd613586acc 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution7x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution7x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -65,7 +64,6 @@ "ctxt": 0 }, "value": "TextProps", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -101,7 +99,6 @@ "ctxt": 0 }, "value": "editable", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -161,7 +158,6 @@ "ctxt": 0 }, "value": "editable", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -211,7 +207,6 @@ "ctxt": 0 }, "value": "onEdit", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -241,6 +236,7 @@ "ctxt": 0 }, "value": "newText", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -257,8 +253,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -298,7 +293,6 @@ "ctxt": 0 }, "value": "TextComponent", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -324,7 +318,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -367,7 +360,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -406,7 +398,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false } } @@ -441,7 +432,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -452,7 +442,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -482,7 +471,6 @@ "ctxt": 0 }, "value": "TextProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -525,6 +513,7 @@ "ctxt": 0 }, "value": "textPropsFalse", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -547,13 +536,11 @@ "ctxt": 0 }, "value": "TextProps", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -573,7 +560,6 @@ "ctxt": 0 }, "value": "editable", - "typeAnnotation": null, "optional": false }, "value": { @@ -617,8 +603,8 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -637,7 +623,6 @@ "ctxt": 0 }, "value": "TextComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -661,7 +646,6 @@ "ctxt": 0 }, "value": "textPropsFalse", - "typeAnnotation": null, "optional": false } } @@ -701,6 +685,7 @@ "ctxt": 0 }, "value": "textPropsTrue", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -723,13 +708,11 @@ "ctxt": 0 }, "value": "TextProps", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -749,7 +732,6 @@ "ctxt": 0 }, "value": "editable", - "typeAnnotation": null, "optional": false }, "value": { @@ -772,7 +754,6 @@ "ctxt": 0 }, "value": "onEdit", - "typeAnnotation": null, "optional": false }, "value": { @@ -829,8 +810,8 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -849,7 +830,6 @@ "ctxt": 0 }, "value": "TextComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -873,7 +853,6 @@ "ctxt": 0 }, "value": "textPropsTrue", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution8x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution8x/input.tsx.json index 901d8d2481ab..ad6e607400c3 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution8x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution8x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -74,8 +73,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -115,8 +114,8 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -136,7 +135,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -180,8 +178,8 @@ "ctxt": 0 }, "value": "obj3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -201,7 +199,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -224,7 +221,6 @@ "ctxt": 0 }, "value": "overwrite", - "typeAnnotation": null, "optional": false }, "value": { @@ -263,7 +259,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -293,7 +288,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -335,7 +329,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -377,7 +370,6 @@ "ctxt": 0 }, "value": "overwrite", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -416,7 +408,6 @@ "ctxt": 0 }, "value": "OverWriteAttr", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -442,7 +433,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -485,7 +475,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -524,7 +513,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -559,7 +547,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -570,7 +557,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -600,7 +586,6 @@ "ctxt": 0 }, "value": "Prop", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -643,8 +628,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -663,7 +648,6 @@ "ctxt": 0 }, "value": "OverWriteAttr", - "typeAnnotation": null, "optional": false }, "span": { @@ -687,7 +671,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } }, @@ -706,7 +689,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -726,7 +708,6 @@ "ctxt": 0 }, "value": "overwrite", - "typeAnnotation": null, "optional": false }, "value": { @@ -759,7 +740,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } } @@ -799,8 +779,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -819,7 +799,6 @@ "ctxt": 0 }, "value": "OverWriteAttr", - "typeAnnotation": null, "optional": false }, "span": { @@ -843,7 +822,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } }, @@ -862,7 +840,6 @@ "ctxt": 0 }, "value": "obj3", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution9x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution9x/input.tsx.json index e6d142e6ce93..889137be4e13 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution9x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadAttributesResolution9x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "OptionProp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -183,7 +179,6 @@ "ctxt": 0 }, "value": "Opt", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -209,7 +204,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -252,7 +246,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -291,7 +284,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -326,7 +318,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -337,7 +328,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -367,7 +357,6 @@ "ctxt": 0 }, "value": "OptionProp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -410,6 +399,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -432,13 +422,11 @@ "ctxt": 0 }, "value": "OptionProp", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -478,6 +466,7 @@ "ctxt": 0 }, "value": "obj1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -500,13 +489,11 @@ "ctxt": 0 }, "value": "OptionProp", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -526,7 +513,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -570,8 +556,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -590,7 +576,6 @@ "ctxt": 0 }, "value": "Opt", - "typeAnnotation": null, "optional": false }, "span": { @@ -634,8 +619,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -654,7 +639,6 @@ "ctxt": 0 }, "value": "Opt", - "typeAnnotation": null, "optional": false }, "span": { @@ -678,7 +662,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -718,8 +701,8 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -738,7 +721,6 @@ "ctxt": 0 }, "value": "Opt", - "typeAnnotation": null, "optional": false }, "span": { @@ -762,7 +744,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } } @@ -802,8 +783,8 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -822,7 +803,6 @@ "ctxt": 0 }, "value": "Opt", - "typeAnnotation": null, "optional": false }, "span": { @@ -846,7 +826,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } }, @@ -865,7 +844,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -906,8 +884,8 @@ "ctxt": 0 }, "value": "y3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -926,7 +904,6 @@ "ctxt": 0 }, "value": "Opt", - "typeAnnotation": null, "optional": false }, "span": { @@ -950,7 +927,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadChildrenInvalidTypex/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadChildrenInvalidTypex/input.tsx.json index bca7a66e4638..82762c5d5825 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadChildrenInvalidTypex/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadChildrenInvalidTypex/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -105,6 +102,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,8 +119,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -180,6 +177,7 @@ "ctxt": 0 }, "value": "React", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -196,8 +194,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -219,7 +216,6 @@ "ctxt": 0 }, "value": "TodoProp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -249,7 +245,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -291,7 +286,6 @@ "ctxt": 0 }, "value": "todo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -335,7 +329,6 @@ "ctxt": 0 }, "value": "TodoListProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -365,7 +358,6 @@ "ctxt": 0 }, "value": "todos", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -401,7 +393,6 @@ "ctxt": 0 }, "value": "TodoProp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -423,7 +414,6 @@ "ctxt": 0 }, "value": "Todo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -444,6 +434,7 @@ "ctxt": 0 }, "value": "prop", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -475,7 +466,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -517,7 +507,6 @@ "ctxt": 0 }, "value": "todo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -545,8 +534,7 @@ } ] } - }, - "optional": false + } } } ], @@ -588,7 +576,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -645,7 +632,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "property": { @@ -656,7 +642,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": false @@ -669,7 +654,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -692,7 +676,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "property": { @@ -703,7 +686,6 @@ "ctxt": 0 }, "value": "todo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -726,7 +708,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -749,7 +730,6 @@ "ctxt": 0 }, "value": "TodoList", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -785,7 +765,6 @@ "ctxt": 0 }, "value": "todos", - "typeAnnotation": null, "optional": false }, "value": null @@ -814,7 +793,6 @@ "ctxt": 0 }, "value": "TodoListProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -861,7 +839,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -908,7 +885,6 @@ "ctxt": 0 }, "value": "Todo", - "typeAnnotation": null, "optional": false }, "span": { @@ -932,7 +908,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "value": { @@ -964,7 +939,6 @@ "ctxt": 0 }, "value": "todos", - "typeAnnotation": null, "optional": false }, "property": { @@ -986,7 +960,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1008,7 +981,6 @@ "ctxt": 0 }, "value": "todo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1040,7 +1012,6 @@ "ctxt": 0 }, "value": "todos", - "typeAnnotation": null, "optional": false }, "property": { @@ -1062,7 +1033,6 @@ "ctxt": 0 }, "value": "todo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1103,7 +1073,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1126,7 +1095,6 @@ "ctxt": 0 }, "value": "TodoListNoError", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1162,7 +1130,6 @@ "ctxt": 0 }, "value": "todos", - "typeAnnotation": null, "optional": false }, "value": null @@ -1191,7 +1158,6 @@ "ctxt": 0 }, "value": "TodoListProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1238,7 +1204,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1299,7 +1264,6 @@ "ctxt": 0 }, "value": "Todo", - "typeAnnotation": null, "optional": false }, "span": { @@ -1323,7 +1287,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "value": { @@ -1355,7 +1318,6 @@ "ctxt": 0 }, "value": "todos", - "typeAnnotation": null, "optional": false }, "property": { @@ -1377,7 +1339,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1399,7 +1360,6 @@ "ctxt": 0 }, "value": "todo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1431,7 +1391,6 @@ "ctxt": 0 }, "value": "todos", - "typeAnnotation": null, "optional": false }, "property": { @@ -1453,7 +1412,6 @@ "ctxt": 0 }, "value": "todo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1505,7 +1463,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1543,6 +1500,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1565,13 +1523,11 @@ "ctxt": 0 }, "value": "TodoListProps", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1602,7 +1558,6 @@ "ctxt": 0 }, "value": "TodoList", - "typeAnnotation": null, "optional": false }, "span": { @@ -1626,7 +1581,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadChildrenx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadChildrenx/input.tsx.json index 51ca8fdfbc8f..1c691e7624ba 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadChildrenx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxSpreadChildrenx/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -105,6 +102,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,8 +119,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -180,6 +177,7 @@ "ctxt": 0 }, "value": "React", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -196,8 +194,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -219,7 +216,6 @@ "ctxt": 0 }, "value": "TodoProp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -249,7 +245,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -291,7 +286,6 @@ "ctxt": 0 }, "value": "todo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -335,7 +329,6 @@ "ctxt": 0 }, "value": "TodoListProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -365,7 +358,6 @@ "ctxt": 0 }, "value": "todos", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -401,7 +393,6 @@ "ctxt": 0 }, "value": "TodoProp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -423,7 +414,6 @@ "ctxt": 0 }, "value": "Todo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -444,6 +434,7 @@ "ctxt": 0 }, "value": "prop", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -475,7 +466,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -517,7 +507,6 @@ "ctxt": 0 }, "value": "todo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -545,8 +534,7 @@ } ] } - }, - "optional": false + } } } ], @@ -588,7 +576,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -645,7 +632,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "property": { @@ -656,7 +642,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": false @@ -669,7 +654,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -692,7 +676,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "property": { @@ -703,7 +686,6 @@ "ctxt": 0 }, "value": "todo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -726,7 +708,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -749,7 +730,6 @@ "ctxt": 0 }, "value": "TodoList", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -785,7 +765,6 @@ "ctxt": 0 }, "value": "todos", - "typeAnnotation": null, "optional": false }, "value": null @@ -814,7 +793,6 @@ "ctxt": 0 }, "value": "TodoListProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -861,7 +839,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -913,7 +890,6 @@ "ctxt": 0 }, "value": "todos", - "typeAnnotation": null, "optional": false }, "property": { @@ -924,7 +900,6 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -948,8 +923,8 @@ "ctxt": 0 }, "value": "todo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -969,7 +944,6 @@ "ctxt": 0 }, "value": "Todo", - "typeAnnotation": null, "optional": false }, "span": { @@ -993,7 +967,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "value": { @@ -1018,7 +991,6 @@ "ctxt": 0 }, "value": "todo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1029,7 +1001,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1051,7 +1022,6 @@ "ctxt": 0 }, "value": "todo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1076,7 +1046,6 @@ "ctxt": 0 }, "value": "todo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1087,7 +1056,6 @@ "ctxt": 0 }, "value": "todo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1137,7 +1105,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -1175,6 +1142,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1197,13 +1165,11 @@ "ctxt": 0 }, "value": "TodoListProps", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1234,7 +1200,6 @@ "ctxt": 0 }, "value": "TodoList", - "typeAnnotation": null, "optional": false }, "span": { @@ -1258,7 +1223,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentOverload1x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentOverload1x/input.tsx.json index c36553d8241f..db5a3cc87181 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentOverload1x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentOverload1x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -80,6 +78,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -111,7 +110,6 @@ "ctxt": 0 }, "value": "yxx", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -139,8 +137,7 @@ } ] } - }, - "optional": false + } } } ], @@ -178,7 +175,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -189,7 +185,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -207,7 +202,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -228,6 +222,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -259,7 +254,6 @@ "ctxt": 0 }, "value": "yxx1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -301,7 +295,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -329,8 +322,7 @@ } ] } - }, - "optional": false + } } } ], @@ -368,7 +360,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -379,7 +370,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -397,7 +387,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -418,6 +407,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -449,7 +439,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -491,7 +480,6 @@ "ctxt": 0 }, "value": "yy1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -519,8 +507,7 @@ } ] } - }, - "optional": false + } } } ], @@ -558,7 +545,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -569,7 +555,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -587,7 +572,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -608,6 +592,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -639,7 +624,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -681,7 +665,6 @@ "ctxt": 0 }, "value": "yy1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -723,7 +706,6 @@ "ctxt": 0 }, "value": "yy2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -751,8 +733,7 @@ } ] } - }, - "optional": false + } } } ], @@ -790,7 +771,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -801,7 +781,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -819,7 +798,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -840,6 +818,7 @@ "ctxt": 0 }, "value": "l1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -871,7 +850,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -944,8 +922,7 @@ } ] } - }, - "optional": false + } } } ], @@ -983,7 +960,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -994,7 +970,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -1027,8 +1002,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1047,7 +1022,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -1071,7 +1045,6 @@ "ctxt": 0 }, "value": "yxx", - "typeAnnotation": null, "optional": false }, "value": { @@ -1125,8 +1098,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1145,7 +1118,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -1169,7 +1141,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "value": { @@ -1205,7 +1176,6 @@ "ctxt": 0 }, "value": "yy1", - "typeAnnotation": null, "optional": false }, "value": { @@ -1259,8 +1229,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1279,7 +1249,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -1303,7 +1272,6 @@ "ctxt": 0 }, "value": "yxx", - "typeAnnotation": null, "optional": false }, "value": { @@ -1336,7 +1304,6 @@ "ctxt": 0 }, "value": "ignore-prop", - "typeAnnotation": null, "optional": false }, "value": null @@ -1377,8 +1344,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1397,7 +1364,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -1421,7 +1387,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "value": { @@ -1454,7 +1419,6 @@ "ctxt": 0 }, "value": "data-prop", - "typeAnnotation": null, "optional": false }, "value": null @@ -1495,8 +1459,8 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1515,7 +1479,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -1539,7 +1502,6 @@ "ctxt": 0 }, "value": "yxx1", - "typeAnnotation": null, "optional": false }, "value": { @@ -1588,7 +1550,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false } } @@ -1607,7 +1568,6 @@ "ctxt": 0 }, "value": "TestingOneThing", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1638,7 +1598,6 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, "optional": false }, "value": { @@ -1649,8 +1608,8 @@ "ctxt": 0 }, "value": "string", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1693,7 +1652,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -1704,7 +1662,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -1722,7 +1679,6 @@ "ctxt": 0 }, "value": "TestingOneThing", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1743,6 +1699,7 @@ "ctxt": 0 }, "value": "j", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1819,7 +1776,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1847,8 +1803,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1886,7 +1841,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -1897,7 +1851,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -1915,7 +1868,6 @@ "ctxt": 0 }, "value": "TestingOneThing", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1936,6 +1888,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1967,7 +1920,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2009,7 +1961,6 @@ "ctxt": 0 }, "value": "direction", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2037,8 +1988,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2076,7 +2026,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -2087,7 +2036,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -2105,7 +2053,6 @@ "ctxt": 0 }, "value": "TestingOneThing", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2126,6 +2073,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2157,7 +2105,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2199,7 +2146,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2227,8 +2173,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2266,7 +2211,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -2277,7 +2221,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -2310,8 +2253,8 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2330,7 +2273,6 @@ "ctxt": 0 }, "value": "TestingOneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -2354,7 +2296,6 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, "optional": false }, "value": null @@ -2374,7 +2315,6 @@ "ctxt": 0 }, "value": "extra-data", - "typeAnnotation": null, "optional": false }, "value": null @@ -2415,8 +2355,8 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2435,7 +2375,6 @@ "ctxt": 0 }, "value": "TestingOneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -2459,7 +2398,6 @@ "ctxt": 0 }, "value": "extra-data", - "typeAnnotation": null, "optional": false }, "value": { @@ -2513,8 +2451,8 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2533,7 +2471,6 @@ "ctxt": 0 }, "value": "TestingOneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -2557,7 +2494,6 @@ "ctxt": 0 }, "value": "extra-data", - "typeAnnotation": null, "optional": false }, "value": { @@ -2590,7 +2526,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "value": { @@ -2644,8 +2579,8 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2664,7 +2599,6 @@ "ctxt": 0 }, "value": "TestingOneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -2688,7 +2622,6 @@ "ctxt": 0 }, "value": "extra-data", - "typeAnnotation": null, "optional": false }, "value": { @@ -2721,7 +2654,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "value": { @@ -2757,7 +2689,6 @@ "ctxt": 0 }, "value": "direction", - "typeAnnotation": null, "optional": false }, "value": { @@ -2814,8 +2745,8 @@ "ctxt": 0 }, "value": "d5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2834,7 +2765,6 @@ "ctxt": 0 }, "value": "TestingOneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -2858,7 +2788,6 @@ "ctxt": 0 }, "value": "extra-data", - "typeAnnotation": null, "optional": false }, "value": { @@ -2891,7 +2820,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "value": { @@ -2924,7 +2852,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -2963,7 +2890,6 @@ "ctxt": 0 }, "value": "TestingOptional", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2984,6 +2910,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3015,7 +2942,6 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3057,7 +2983,6 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3085,8 +3010,7 @@ } ] } - }, - "optional": false + } } } ], @@ -3124,7 +3048,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -3135,7 +3058,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -3153,7 +3075,6 @@ "ctxt": 0 }, "value": "TestingOptional", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3174,6 +3095,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3205,7 +3127,6 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3247,7 +3168,6 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3289,7 +3209,6 @@ "ctxt": 0 }, "value": "y3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3317,8 +3236,7 @@ } ] } - }, - "optional": false + } } } ], @@ -3356,7 +3274,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -3367,7 +3284,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -3400,8 +3316,8 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -3420,7 +3336,6 @@ "ctxt": 0 }, "value": "TestingOptional", - "typeAnnotation": null, "optional": false }, "span": { @@ -3464,8 +3379,8 @@ "ctxt": 0 }, "value": "e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -3484,7 +3399,6 @@ "ctxt": 0 }, "value": "TestingOptional", - "typeAnnotation": null, "optional": false }, "span": { @@ -3508,7 +3422,6 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, "optional": false }, "value": { @@ -3562,8 +3475,8 @@ "ctxt": 0 }, "value": "e4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -3582,7 +3495,6 @@ "ctxt": 0 }, "value": "TestingOptional", - "typeAnnotation": null, "optional": false }, "span": { @@ -3606,7 +3518,6 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, "optional": false }, "value": { @@ -3639,7 +3550,6 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, "optional": false }, "value": { @@ -3696,8 +3606,8 @@ "ctxt": 0 }, "value": "e5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -3716,7 +3626,6 @@ "ctxt": 0 }, "value": "TestingOptional", - "typeAnnotation": null, "optional": false }, "span": { @@ -3740,7 +3649,6 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, "optional": false }, "value": null @@ -3760,7 +3668,6 @@ "ctxt": 0 }, "value": "y3", - "typeAnnotation": null, "optional": false }, "value": null @@ -3801,8 +3708,8 @@ "ctxt": 0 }, "value": "e6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -3821,7 +3728,6 @@ "ctxt": 0 }, "value": "TestingOptional", - "typeAnnotation": null, "optional": false }, "span": { @@ -3845,7 +3751,6 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, "optional": false }, "value": null @@ -3865,7 +3770,6 @@ "ctxt": 0 }, "value": "y3", - "typeAnnotation": null, "optional": false }, "value": null @@ -3885,7 +3789,6 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, "optional": false }, "value": { @@ -3942,8 +3845,8 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -3962,7 +3865,6 @@ "ctxt": 0 }, "value": "TestingOptional", - "typeAnnotation": null, "optional": false }, "span": { @@ -3986,7 +3888,6 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, "optional": false }, "value": null @@ -4006,7 +3907,6 @@ "ctxt": 0 }, "value": "y3", - "typeAnnotation": null, "optional": false }, "value": null @@ -4026,7 +3926,6 @@ "ctxt": 0 }, "value": "extra-prop", - "typeAnnotation": null, "optional": false }, "value": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentOverload2x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentOverload2x/input.tsx.json index 541c0ddd9d85..1acf17e125bc 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentOverload2x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentOverload2x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -98,7 +96,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -127,7 +123,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -148,6 +143,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -179,7 +175,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -221,7 +216,6 @@ "ctxt": 0 }, "value": "yy1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -249,8 +243,7 @@ } ] } - }, - "optional": false + } } } ], @@ -288,7 +281,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -299,7 +291,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -332,8 +323,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -353,7 +344,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "value": { @@ -376,7 +366,6 @@ "ctxt": 0 }, "value": "yy1", - "typeAnnotation": null, "optional": false }, "value": { @@ -425,8 +414,8 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -446,7 +435,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "value": { @@ -490,8 +478,8 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -511,7 +499,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "value": { @@ -586,6 +573,7 @@ "ctxt": 0 }, "value": "defaultObj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -602,8 +590,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -635,8 +622,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -655,7 +642,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -699,8 +685,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -719,7 +705,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -743,7 +728,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -783,8 +767,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -803,7 +787,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -865,8 +848,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -885,7 +868,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -909,7 +891,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } }, @@ -928,7 +909,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -968,8 +948,8 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -988,7 +968,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -1012,7 +991,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } }, @@ -1031,7 +1009,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "value": { @@ -1077,7 +1054,6 @@ "ctxt": 0 }, "value": "yy1", - "typeAnnotation": null, "optional": false }, "value": { @@ -1134,8 +1110,8 @@ "ctxt": 0 }, "value": "c6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1154,7 +1130,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -1178,7 +1153,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } }, @@ -1207,7 +1181,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "value": { @@ -1230,7 +1203,6 @@ "ctxt": 0 }, "value": "yy1", - "typeAnnotation": null, "optional": false }, "value": { @@ -1287,8 +1259,8 @@ "ctxt": 0 }, "value": "c7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1307,7 +1279,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -1331,7 +1302,6 @@ "ctxt": 0 }, "value": "defaultObj", - "typeAnnotation": null, "optional": false } }, @@ -1350,7 +1320,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "value": null @@ -1370,7 +1339,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -1410,8 +1378,8 @@ "ctxt": 0 }, "value": "c8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1430,7 +1398,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -1454,7 +1421,6 @@ "ctxt": 0 }, "value": "ignore-prop", - "typeAnnotation": null, "optional": false }, "value": { @@ -1511,8 +1477,8 @@ "ctxt": 0 }, "value": "c9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1531,7 +1497,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -1620,8 +1585,8 @@ "ctxt": 0 }, "value": "c10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1640,7 +1605,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -1664,7 +1628,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false } }, @@ -1683,7 +1646,6 @@ "ctxt": 0 }, "value": "yy1", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentOverload3x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentOverload3x/input.tsx.json index 039cf6e45190..ce935da28f17 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentOverload3x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentOverload3x/input.tsx.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Context", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "color", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "ZeroThingOrTwoThing", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -129,7 +126,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -140,7 +136,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -158,7 +153,6 @@ "ctxt": 0 }, "value": "ZeroThingOrTwoThing", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -179,6 +173,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -210,7 +205,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -252,7 +246,6 @@ "ctxt": 0 }, "value": "yy1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -280,8 +273,7 @@ } ] } - }, - "optional": false + } } }, { @@ -300,6 +292,7 @@ "ctxt": 0 }, "value": "context", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -322,13 +315,11 @@ "ctxt": 0 }, "value": "Context", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -366,7 +357,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -377,7 +367,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -410,6 +399,7 @@ "ctxt": 0 }, "value": "obj2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -426,8 +416,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -459,8 +448,8 @@ "ctxt": 0 }, "value": "two1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -479,7 +468,6 @@ "ctxt": 0 }, "value": "ZeroThingOrTwoThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -523,8 +511,8 @@ "ctxt": 0 }, "value": "two2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -543,7 +531,6 @@ "ctxt": 0 }, "value": "ZeroThingOrTwoThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -567,7 +554,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "value": { @@ -603,7 +589,6 @@ "ctxt": 0 }, "value": "yy1", - "typeAnnotation": null, "optional": false }, "value": { @@ -657,8 +642,8 @@ "ctxt": 0 }, "value": "two3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -677,7 +662,6 @@ "ctxt": 0 }, "value": "ZeroThingOrTwoThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -701,7 +685,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false } } @@ -741,8 +724,8 @@ "ctxt": 0 }, "value": "two4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -761,7 +744,6 @@ "ctxt": 0 }, "value": "ZeroThingOrTwoThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -785,7 +767,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "value": { @@ -821,7 +802,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false } } @@ -861,8 +841,8 @@ "ctxt": 0 }, "value": "two5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -881,7 +861,6 @@ "ctxt": 0 }, "value": "ZeroThingOrTwoThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -905,7 +884,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false } }, @@ -924,7 +902,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "value": { @@ -966,7 +943,6 @@ "ctxt": 0 }, "value": "ThreeThing", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -987,6 +963,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1018,7 +995,6 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1046,8 +1022,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1085,7 +1060,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -1096,7 +1070,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -1114,7 +1087,6 @@ "ctxt": 0 }, "value": "ThreeThing", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1135,6 +1107,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1166,7 +1139,6 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1194,8 +1166,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1233,7 +1204,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -1244,7 +1214,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -1262,7 +1231,6 @@ "ctxt": 0 }, "value": "ThreeThing", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1283,6 +1251,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1314,7 +1283,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1356,7 +1324,6 @@ "ctxt": 0 }, "value": "yy1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1384,8 +1351,7 @@ } ] } - }, - "optional": false + } } }, { @@ -1404,6 +1370,7 @@ "ctxt": 0 }, "value": "context", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1426,13 +1393,11 @@ "ctxt": 0 }, "value": "Context", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1451,6 +1416,7 @@ "ctxt": 0 }, "value": "updater", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1467,8 +1433,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1506,7 +1471,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -1517,7 +1481,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -1550,8 +1513,8 @@ "ctxt": 0 }, "value": "three1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1570,7 +1533,6 @@ "ctxt": 0 }, "value": "ThreeThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -1594,7 +1556,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "value": { @@ -1630,7 +1591,6 @@ "ctxt": 0 }, "value": "yy1", - "typeAnnotation": null, "optional": false }, "value": { @@ -1684,8 +1644,8 @@ "ctxt": 0 }, "value": "three2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1704,7 +1664,6 @@ "ctxt": 0 }, "value": "ThreeThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -1728,7 +1687,6 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, "optional": false }, "value": { @@ -1782,8 +1740,8 @@ "ctxt": 0 }, "value": "three3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1802,7 +1760,6 @@ "ctxt": 0 }, "value": "ThreeThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -1826,7 +1783,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false } }, @@ -1845,7 +1801,6 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentOverload4x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentOverload4x/input.tsx.json index 65d9e37aeee2..ded79447252d 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentOverload4x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentOverload4x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -98,7 +96,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -127,7 +123,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -148,6 +143,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -179,7 +175,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -221,7 +216,6 @@ "ctxt": 0 }, "value": "yy1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -249,8 +243,7 @@ } ] } - }, - "optional": false + } } } ], @@ -288,7 +281,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -299,7 +291,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -332,8 +323,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -353,7 +344,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "value": { @@ -376,7 +366,6 @@ "ctxt": 0 }, "value": "yy1", - "typeAnnotation": null, "optional": false }, "value": { @@ -425,6 +414,7 @@ "ctxt": 0 }, "value": "obj2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -441,8 +431,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -474,8 +463,8 @@ "ctxt": 0 }, "value": "c0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -494,7 +483,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -518,7 +506,6 @@ "ctxt": 0 }, "value": "extraProp", - "typeAnnotation": null, "optional": false }, "value": null @@ -559,8 +546,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -579,7 +566,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -603,7 +589,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "value": { @@ -660,8 +645,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -680,7 +665,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -704,7 +688,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } }, @@ -723,7 +706,6 @@ "ctxt": 0 }, "value": "yy1", - "typeAnnotation": null, "optional": false }, "value": null @@ -764,8 +746,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -784,7 +766,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -808,7 +789,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } }, @@ -837,7 +817,6 @@ "ctxt": 0 }, "value": "extra", - "typeAnnotation": null, "optional": false }, "value": { @@ -894,8 +873,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -914,7 +893,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -938,7 +916,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } }, @@ -957,7 +934,6 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, "optional": false }, "value": { @@ -1014,8 +990,8 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1034,7 +1010,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -1058,7 +1033,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } }, @@ -1087,7 +1061,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "value": { @@ -1139,8 +1112,8 @@ "ctxt": 0 }, "value": "c6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1159,7 +1132,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -1183,7 +1155,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false } }, @@ -1212,7 +1183,6 @@ "ctxt": 0 }, "value": "extra", - "typeAnnotation": null, "optional": false }, "value": { @@ -1269,8 +1239,8 @@ "ctxt": 0 }, "value": "c7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1289,7 +1259,6 @@ "ctxt": 0 }, "value": "OneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -1313,7 +1282,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false } }, @@ -1332,7 +1300,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "value": null @@ -1358,7 +1325,6 @@ "ctxt": 0 }, "value": "TestingOneThing", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1379,6 +1345,7 @@ "ctxt": 0 }, "value": "j", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1441,8 +1408,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1480,7 +1446,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -1491,7 +1456,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -1509,7 +1473,6 @@ "ctxt": 0 }, "value": "TestingOneThing", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1530,6 +1493,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1561,7 +1525,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1603,7 +1566,6 @@ "ctxt": 0 }, "value": "direction", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1631,8 +1593,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1670,7 +1631,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -1681,7 +1641,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -1714,8 +1673,8 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1734,7 +1693,6 @@ "ctxt": 0 }, "value": "TestingOneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -1758,7 +1716,6 @@ "ctxt": 0 }, "value": "extra-data", - "typeAnnotation": null, "optional": false }, "value": null @@ -1799,8 +1756,8 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1819,7 +1776,6 @@ "ctxt": 0 }, "value": "TestingOneThing", - "typeAnnotation": null, "optional": false }, "span": { @@ -1843,7 +1799,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "value": { @@ -1876,7 +1831,6 @@ "ctxt": 0 }, "value": "direction", - "typeAnnotation": null, "optional": false }, "value": { @@ -1915,7 +1869,6 @@ "ctxt": 0 }, "value": "TestingOptional", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1936,6 +1889,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1967,7 +1921,6 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2009,7 +1962,6 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2037,8 +1989,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2076,7 +2027,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -2087,7 +2037,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -2105,7 +2054,6 @@ "ctxt": 0 }, "value": "TestingOptional", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2126,6 +2074,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2157,7 +2106,6 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2199,7 +2147,6 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2241,7 +2188,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2272,7 +2218,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -2283,7 +2228,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -2294,8 +2238,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2333,7 +2276,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -2344,7 +2286,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -2362,7 +2303,6 @@ "ctxt": 0 }, "value": "TestingOptional", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2383,6 +2323,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2414,7 +2355,6 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2456,7 +2396,6 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2498,7 +2437,6 @@ "ctxt": 0 }, "value": "y3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2526,8 +2464,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2565,7 +2502,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -2576,7 +2512,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -2609,8 +2544,8 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2629,7 +2564,6 @@ "ctxt": 0 }, "value": "TestingOptional", - "typeAnnotation": null, "optional": false }, "span": { @@ -2653,7 +2587,6 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, "optional": false }, "value": null @@ -2673,7 +2606,6 @@ "ctxt": 0 }, "value": "y3", - "typeAnnotation": null, "optional": false }, "value": { @@ -2727,8 +2659,8 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2747,7 +2679,6 @@ "ctxt": 0 }, "value": "TestingOptional", - "typeAnnotation": null, "optional": false }, "span": { @@ -2771,7 +2702,6 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, "optional": false }, "value": { @@ -2804,7 +2734,6 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, "optional": false }, "value": { @@ -2840,7 +2769,6 @@ "ctxt": 0 }, "value": "y3", - "typeAnnotation": null, "optional": false }, "value": null @@ -2881,8 +2809,8 @@ "ctxt": 0 }, "value": "e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2901,7 +2829,6 @@ "ctxt": 0 }, "value": "TestingOptional", - "typeAnnotation": null, "optional": false }, "span": { @@ -2925,7 +2852,6 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, "optional": false }, "value": { @@ -2958,7 +2884,6 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, "optional": false }, "value": { @@ -2994,7 +2919,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "value": { @@ -3048,8 +2972,8 @@ "ctxt": 0 }, "value": "e4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -3068,7 +2992,6 @@ "ctxt": 0 }, "value": "TestingOptional", - "typeAnnotation": null, "optional": false }, "span": { @@ -3092,7 +3015,6 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, "optional": false }, "value": { @@ -3125,7 +3047,6 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, "optional": false }, "value": { @@ -3177,7 +3098,6 @@ "ctxt": 0 }, "value": "TestingOptional", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentOverload5x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentOverload5x/input.tsx.json index fb8e8f0af78e..f7503bccef61 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentOverload5x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentOverload5x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "ClickableProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -101,7 +99,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -143,7 +140,6 @@ "ctxt": 0 }, "value": "className", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -195,7 +191,6 @@ "ctxt": 0 }, "value": "ButtonProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -216,7 +211,6 @@ "ctxt": 0 }, "value": "ClickableProps", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -246,7 +240,6 @@ "ctxt": 0 }, "value": "onClick", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -277,7 +270,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "right": { @@ -288,7 +280,6 @@ "ctxt": 0 }, "value": "MouseEventHandler", - "typeAnnotation": null, "optional": false } }, @@ -341,7 +332,6 @@ "ctxt": 0 }, "value": "LinkProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -362,7 +352,6 @@ "ctxt": 0 }, "value": "ClickableProps", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -392,7 +381,6 @@ "ctxt": 0 }, "value": "to", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -444,7 +432,6 @@ "ctxt": 0 }, "value": "HyphenProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -465,7 +452,6 @@ "ctxt": 0 }, "value": "ClickableProps", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -553,8 +539,8 @@ "ctxt": 0 }, "value": "obj0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -574,7 +560,6 @@ "ctxt": 0 }, "value": "to", - "typeAnnotation": null, "optional": false }, "value": { @@ -623,8 +608,8 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -644,7 +629,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "value": { @@ -672,7 +656,6 @@ "ctxt": 0 }, "value": "to", - "typeAnnotation": null, "optional": false }, "value": { @@ -721,8 +704,8 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -742,7 +725,6 @@ "ctxt": 0 }, "value": "onClick", - "typeAnnotation": null, "optional": false }, "value": { @@ -799,6 +781,7 @@ "ctxt": 0 }, "value": "obj3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -815,8 +798,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -840,7 +822,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -861,6 +842,7 @@ "ctxt": 0 }, "value": "buttonProps", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -883,13 +865,11 @@ "ctxt": 0 }, "value": "ButtonProps", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -927,7 +907,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -938,7 +917,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -964,7 +942,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -985,6 +962,7 @@ "ctxt": 0 }, "value": "linkProps", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1007,13 +985,11 @@ "ctxt": 0 }, "value": "LinkProps", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1051,7 +1027,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -1062,7 +1037,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -1088,7 +1062,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1109,6 +1082,7 @@ "ctxt": 0 }, "value": "hyphenProps", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1131,13 +1105,11 @@ "ctxt": 0 }, "value": "HyphenProps", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1175,7 +1147,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -1186,7 +1157,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -1212,7 +1182,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1233,6 +1202,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1263,7 +1233,6 @@ "ctxt": 0 }, "value": "ButtonProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1283,7 +1252,6 @@ "ctxt": 0 }, "value": "LinkProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1303,15 +1271,13 @@ "ctxt": 0 }, "value": "HyphenProps", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -1354,8 +1320,8 @@ "ctxt": 0 }, "value": "linkProps", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -1372,7 +1338,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1390,7 +1355,6 @@ "ctxt": 0 }, "value": "LinkProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1422,7 +1386,6 @@ "ctxt": 0 }, "value": "linkProps", - "typeAnnotation": null, "optional": false }, "property": { @@ -1433,7 +1396,6 @@ "ctxt": 0 }, "value": "to", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1483,7 +1445,6 @@ "ctxt": 0 }, "value": "_buildMainLink", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1499,7 +1460,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } } @@ -1548,7 +1508,6 @@ "ctxt": 0 }, "value": "_buildMainButton", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1564,7 +1523,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } } @@ -1601,7 +1559,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -1612,7 +1569,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -1646,8 +1602,8 @@ "ctxt": 0 }, "value": "b0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1666,7 +1622,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -1690,7 +1645,6 @@ "ctxt": 0 }, "value": "to", - "typeAnnotation": null, "optional": false }, "value": { @@ -1723,7 +1677,6 @@ "ctxt": 0 }, "value": "onClick", - "typeAnnotation": null, "optional": false }, "value": { @@ -1749,8 +1702,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1800,7 +1753,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false } } @@ -1834,8 +1786,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1854,7 +1806,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -1878,7 +1829,6 @@ "ctxt": 0 }, "value": "onClick", - "typeAnnotation": null, "optional": false }, "value": { @@ -1904,6 +1854,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1920,8 +1871,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "body": { @@ -1955,7 +1905,6 @@ "ctxt": 0 }, "value": "obj0", - "typeAnnotation": null, "optional": false } } @@ -1990,7 +1939,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false } } @@ -2024,8 +1972,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2044,7 +1992,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -2078,7 +2025,6 @@ "ctxt": 0 }, "value": "to", - "typeAnnotation": null, "optional": false }, "value": { @@ -2114,7 +2060,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false } } @@ -2154,8 +2099,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2174,7 +2119,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -2208,7 +2152,6 @@ "ctxt": 0 }, "value": "to", - "typeAnnotation": null, "optional": false }, "value": { @@ -2254,7 +2197,6 @@ "ctxt": 0 }, "value": "onClick", - "typeAnnotation": null, "optional": false }, "value": { @@ -2273,8 +2215,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2331,8 +2273,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2351,7 +2293,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -2375,7 +2316,6 @@ "ctxt": 0 }, "value": "obj3", - "typeAnnotation": null, "optional": false } }, @@ -2394,7 +2334,6 @@ "ctxt": 0 }, "value": "to", - "typeAnnotation": null, "optional": false }, "value": null @@ -2435,8 +2374,8 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2455,7 +2394,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -2489,7 +2427,6 @@ "ctxt": 0 }, "value": "onClick", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2509,6 +2446,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2525,8 +2463,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2568,7 +2505,6 @@ "ctxt": 0 }, "value": "obj0", - "typeAnnotation": null, "optional": false } } @@ -2608,8 +2544,8 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2628,7 +2564,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -2662,7 +2597,6 @@ "ctxt": 0 }, "value": "onClick", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2682,6 +2616,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2698,8 +2633,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2741,7 +2675,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "value": { @@ -2798,8 +2731,8 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2818,7 +2751,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -2852,7 +2784,6 @@ "ctxt": 0 }, "value": "onClick", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2872,6 +2803,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2888,8 +2820,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2931,7 +2862,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "value": { @@ -2964,7 +2894,6 @@ "ctxt": 0 }, "value": "className", - "typeAnnotation": null, "optional": false }, "value": null @@ -3005,8 +2934,8 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -3025,7 +2954,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -3049,7 +2977,6 @@ "ctxt": 0 }, "value": "data-format", - "typeAnnotation": null, "optional": false }, "value": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentOverload6x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentOverload6x/input.tsx.json index 42e3f7b79bac..36f8da41f2c6 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentOverload6x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentOverload6x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "ClickableProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -101,7 +99,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -143,7 +140,6 @@ "ctxt": 0 }, "value": "className", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -195,7 +191,6 @@ "ctxt": 0 }, "value": "ButtonProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -216,7 +211,6 @@ "ctxt": 0 }, "value": "ClickableProps", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -246,7 +240,6 @@ "ctxt": 0 }, "value": "onClick", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -277,7 +270,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "right": { @@ -288,7 +280,6 @@ "ctxt": 0 }, "value": "MouseEventHandler", - "typeAnnotation": null, "optional": false } }, @@ -341,7 +332,6 @@ "ctxt": 0 }, "value": "LinkProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -362,7 +352,6 @@ "ctxt": 0 }, "value": "ClickableProps", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -392,7 +381,6 @@ "ctxt": 0 }, "value": "to", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -444,7 +432,6 @@ "ctxt": 0 }, "value": "HyphenProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -465,7 +452,6 @@ "ctxt": 0 }, "value": "ClickableProps", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -553,8 +539,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -574,7 +560,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "value": { @@ -602,7 +587,6 @@ "ctxt": 0 }, "value": "to", - "typeAnnotation": null, "optional": false }, "value": { @@ -651,6 +635,7 @@ "ctxt": 0 }, "value": "obj1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -667,8 +652,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -700,8 +684,8 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -721,7 +705,6 @@ "ctxt": 0 }, "value": "onClick", - "typeAnnotation": null, "optional": false }, "value": { @@ -770,7 +753,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -791,6 +773,7 @@ "ctxt": 0 }, "value": "buttonProps", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -813,13 +796,11 @@ "ctxt": 0 }, "value": "ButtonProps", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -857,7 +838,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -868,7 +848,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -894,7 +873,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -915,6 +893,7 @@ "ctxt": 0 }, "value": "linkProps", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -937,13 +916,11 @@ "ctxt": 0 }, "value": "LinkProps", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -981,7 +958,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -992,7 +968,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -1018,7 +993,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1039,6 +1013,7 @@ "ctxt": 0 }, "value": "hyphenProps", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1061,13 +1036,11 @@ "ctxt": 0 }, "value": "HyphenProps", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1105,7 +1078,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -1116,7 +1088,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -1142,7 +1113,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1163,6 +1133,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1193,7 +1164,6 @@ "ctxt": 0 }, "value": "ButtonProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1213,7 +1183,6 @@ "ctxt": 0 }, "value": "LinkProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1233,15 +1202,13 @@ "ctxt": 0 }, "value": "HyphenProps", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -1284,8 +1251,8 @@ "ctxt": 0 }, "value": "linkProps", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -1302,7 +1269,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1320,7 +1286,6 @@ "ctxt": 0 }, "value": "LinkProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1352,7 +1317,6 @@ "ctxt": 0 }, "value": "linkProps", - "typeAnnotation": null, "optional": false }, "property": { @@ -1363,7 +1327,6 @@ "ctxt": 0 }, "value": "to", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1413,7 +1376,6 @@ "ctxt": 0 }, "value": "_buildMainLink", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1429,7 +1391,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } } @@ -1478,7 +1439,6 @@ "ctxt": 0 }, "value": "_buildMainButton", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1494,7 +1454,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } } @@ -1531,7 +1490,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -1542,7 +1500,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -1576,8 +1533,8 @@ "ctxt": 0 }, "value": "b0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1596,7 +1553,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -1620,7 +1576,6 @@ "ctxt": 0 }, "value": "to", - "typeAnnotation": null, "optional": false }, "value": { @@ -1669,7 +1624,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false } } @@ -1703,8 +1657,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1723,7 +1677,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -1747,7 +1700,6 @@ "ctxt": 0 }, "value": "onClick", - "typeAnnotation": null, "optional": false }, "value": { @@ -1773,8 +1725,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1824,7 +1776,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false } } @@ -1858,8 +1809,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1878,7 +1829,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -1902,7 +1852,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -1942,8 +1891,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1962,7 +1911,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -1996,7 +1944,6 @@ "ctxt": 0 }, "value": "to", - "typeAnnotation": null, "optional": false }, "value": { @@ -2027,7 +1974,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -2067,8 +2013,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2087,7 +2033,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -2111,7 +2056,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } } @@ -2151,8 +2095,8 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2171,7 +2115,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -2195,7 +2138,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } }, @@ -2214,7 +2156,6 @@ "ctxt": 0 }, "value": "to", - "typeAnnotation": null, "optional": false }, "value": { @@ -2268,8 +2209,8 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2288,7 +2229,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -2312,7 +2252,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false } } @@ -2352,8 +2291,8 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2372,7 +2311,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -2406,7 +2344,6 @@ "ctxt": 0 }, "value": "onClick", - "typeAnnotation": null, "optional": false }, "value": { @@ -2454,7 +2391,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -2465,7 +2401,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2539,8 +2474,8 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2559,7 +2494,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -2593,7 +2527,6 @@ "ctxt": 0 }, "value": "onClick", - "typeAnnotation": null, "optional": false }, "params": [], @@ -2656,8 +2589,8 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2676,7 +2609,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -2700,7 +2632,6 @@ "ctxt": 0 }, "value": "to", - "typeAnnotation": null, "optional": false }, "value": { @@ -2733,7 +2664,6 @@ "ctxt": 0 }, "value": "extra-prop", - "typeAnnotation": null, "optional": false }, "value": null @@ -2769,7 +2699,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false } } @@ -2803,8 +2732,8 @@ "ctxt": 0 }, "value": "b10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2823,7 +2752,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -2847,7 +2775,6 @@ "ctxt": 0 }, "value": "to", - "typeAnnotation": null, "optional": false }, "value": { @@ -2880,7 +2807,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "value": { @@ -2918,7 +2844,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false } } @@ -2952,8 +2877,8 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2972,7 +2897,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -2996,7 +2920,6 @@ "ctxt": 0 }, "value": "onClick", - "typeAnnotation": null, "optional": false }, "value": { @@ -3022,8 +2945,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3057,7 +2980,6 @@ "ctxt": 0 }, "value": "className", - "typeAnnotation": null, "optional": false }, "value": { @@ -3090,7 +3012,6 @@ "ctxt": 0 }, "value": "data-format", - "typeAnnotation": null, "optional": false }, "value": null @@ -3126,7 +3047,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false } } @@ -3160,8 +3080,8 @@ "ctxt": 0 }, "value": "b12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -3180,7 +3100,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -3204,7 +3123,6 @@ "ctxt": 0 }, "value": "data-format", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentWithDefaultTypeParameter1x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentWithDefaultTypeParameter1x/input.tsx.json index 90ac5b972035..680110ea46af 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentWithDefaultTypeParameter1x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentWithDefaultTypeParameter1x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "MyComponentProp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "values", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -133,7 +130,6 @@ "ctxt": 0 }, "value": "MyComponent", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -154,6 +150,7 @@ "ctxt": 0 }, "value": "attr", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -176,13 +173,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -224,7 +219,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -263,7 +257,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -296,7 +289,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -315,7 +307,6 @@ "ctxt": 0 }, "value": "MyComponentProp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -350,8 +341,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -370,7 +361,6 @@ "ctxt": 0 }, "value": "MyComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -394,7 +384,6 @@ "ctxt": 0 }, "value": "values", - "typeAnnotation": null, "optional": false }, "value": null @@ -435,8 +424,8 @@ "ctxt": 0 }, "value": "i1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -455,7 +444,6 @@ "ctxt": 0 }, "value": "MyComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -479,7 +467,6 @@ "ctxt": 0 }, "value": "values", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentWithDefaultTypeParameter2x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentWithDefaultTypeParameter2x/input.tsx.json index 363d1d426031..b23d94a67eb4 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentWithDefaultTypeParameter2x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentWithDefaultTypeParameter2x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "MyComponentProp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "values", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -133,7 +130,6 @@ "ctxt": 0 }, "value": "MyComponent1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -154,6 +150,7 @@ "ctxt": 0 }, "value": "attr", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -176,13 +173,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -224,7 +219,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -263,7 +257,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -296,7 +289,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -314,7 +306,6 @@ "ctxt": 0 }, "value": "MyComponentProp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -350,8 +341,8 @@ "ctxt": 0 }, "value": "i1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -370,7 +361,6 @@ "ctxt": 0 }, "value": "MyComponent1", - "typeAnnotation": null, "optional": false }, "span": { @@ -394,7 +384,6 @@ "ctxt": 0 }, "value": "values", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponents2x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponents2x/input.tsx.json index dfb3a7b045b5..d74bff25dbed 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponents2x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponents2x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "Greet", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,6 +78,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -111,7 +110,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -139,8 +137,7 @@ } ] } - }, - "optional": false + } } } ], @@ -182,7 +179,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -220,7 +216,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -240,7 +235,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -263,7 +257,6 @@ "ctxt": 0 }, "value": "BigGreeter", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -289,7 +282,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -332,7 +324,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -360,7 +351,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -394,7 +384,6 @@ "ctxt": 0 }, "value": "greeting", - "typeAnnotation": null, "optional": false }, "value": null, @@ -441,7 +430,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -452,7 +440,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -491,7 +478,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -557,8 +543,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -577,7 +563,6 @@ "ctxt": 0 }, "value": "Greet", - "typeAnnotation": null, "optional": false }, "span": { @@ -621,8 +606,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -641,7 +626,6 @@ "ctxt": 0 }, "value": "Greet", - "typeAnnotation": null, "optional": false }, "span": { @@ -665,7 +649,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "value": { @@ -719,8 +702,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -739,7 +722,6 @@ "ctxt": 0 }, "value": "Greet", - "typeAnnotation": null, "optional": false }, "span": { @@ -763,7 +745,6 @@ "ctxt": 0 }, "value": "ref", - "typeAnnotation": null, "optional": false }, "value": { @@ -817,8 +798,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -837,7 +818,6 @@ "ctxt": 0 }, "value": "BigGreeter", - "typeAnnotation": null, "optional": false }, "span": { @@ -861,7 +841,6 @@ "ctxt": 0 }, "value": "ref", - "typeAnnotation": null, "optional": false }, "value": { @@ -887,8 +866,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -920,7 +899,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -931,7 +909,6 @@ "ctxt": 0 }, "value": "greeting", - "typeAnnotation": null, "optional": false }, "computed": false @@ -944,7 +921,6 @@ "ctxt": 0 }, "value": "substr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1008,8 +984,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1028,7 +1004,6 @@ "ctxt": 0 }, "value": "BigGreeter", - "typeAnnotation": null, "optional": false }, "span": { @@ -1052,7 +1027,6 @@ "ctxt": 0 }, "value": "ref", - "typeAnnotation": null, "optional": false }, "value": { @@ -1078,8 +1052,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1111,7 +1085,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1122,7 +1095,6 @@ "ctxt": 0 }, "value": "greeting", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1135,7 +1107,6 @@ "ctxt": 0 }, "value": "subtr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1199,8 +1170,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1219,7 +1190,6 @@ "ctxt": 0 }, "value": "BigGreeter", - "typeAnnotation": null, "optional": false }, "span": { @@ -1243,7 +1213,6 @@ "ctxt": 0 }, "value": "ref", - "typeAnnotation": null, "optional": false }, "value": { @@ -1269,8 +1238,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1288,7 +1257,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1299,7 +1267,6 @@ "ctxt": 0 }, "value": "notARealProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1347,8 +1314,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1367,7 +1334,6 @@ "ctxt": 0 }, "value": "BigGreeter", - "typeAnnotation": null, "optional": false }, "span": { @@ -1391,7 +1357,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "value": { @@ -1448,8 +1413,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1468,7 +1433,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1492,7 +1456,6 @@ "ctxt": 0 }, "value": "ref", - "typeAnnotation": null, "optional": false }, "value": { @@ -1518,8 +1481,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1537,7 +1500,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1548,7 +1510,6 @@ "ctxt": 0 }, "value": "innerText", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1596,8 +1557,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1616,7 +1577,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -1640,7 +1600,6 @@ "ctxt": 0 }, "value": "ref", - "typeAnnotation": null, "optional": false }, "value": { @@ -1666,8 +1625,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1685,7 +1644,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1696,7 +1654,6 @@ "ctxt": 0 }, "value": "propertyNotOnHtmlDivElement", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponents3x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponents3x/input.tsx.json index 85a8d791b90e..7a28e22f5473 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponents3x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponents3x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -74,8 +73,8 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -93,6 +92,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -109,8 +109,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "body": { @@ -130,7 +129,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -179,8 +177,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -199,7 +197,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "span": { @@ -243,6 +240,7 @@ "ctxt": 0 }, "value": "MainMenu", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -267,7 +265,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "right": { @@ -278,7 +275,6 @@ "ctxt": 0 }, "value": "StatelessComponent", - "typeAnnotation": null, "optional": false } }, @@ -302,8 +298,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -321,8 +316,8 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -349,7 +344,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -389,7 +383,6 @@ "ctxt": 0 }, "value": "h3", - "typeAnnotation": null, "optional": false }, "span": { @@ -428,7 +421,6 @@ "ctxt": 0 }, "value": "h3", - "typeAnnotation": null, "optional": false } } @@ -459,7 +451,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -499,6 +490,7 @@ "ctxt": 0 }, "value": "App", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -523,7 +515,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "right": { @@ -534,7 +525,6 @@ "ctxt": 0 }, "value": "StatelessComponent", - "typeAnnotation": null, "optional": false } }, @@ -570,7 +560,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -585,8 +574,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -619,7 +607,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "value": null @@ -653,7 +640,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -693,7 +679,6 @@ "ctxt": 0 }, "value": "MainMenu", - "typeAnnotation": null, "optional": false }, "span": { @@ -734,7 +719,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentsWithTypeArguments1x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentsWithTypeArguments1x/input.tsx.json index 576cb44df9b2..0a5692f47128 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentsWithTypeArguments1x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentsWithTypeArguments1x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "ComponentWithTwoAttributes", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -80,6 +78,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -111,7 +110,6 @@ "ctxt": 0 }, "value": "key1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -140,7 +138,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -164,7 +161,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -193,7 +189,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -203,8 +198,7 @@ } ] } - }, - "optional": false + } } } ], @@ -240,7 +234,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -261,7 +254,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -293,7 +285,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -304,7 +295,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -322,7 +312,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -343,6 +332,7 @@ "ctxt": 0 }, "value": "key1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -365,13 +355,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -390,6 +378,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -412,13 +401,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -461,8 +448,8 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -481,7 +468,6 @@ "ctxt": 0 }, "value": "ComponentWithTwoAttributes", - "typeAnnotation": null, "optional": false }, "span": { @@ -505,7 +491,6 @@ "ctxt": 0 }, "value": "key1", - "typeAnnotation": null, "optional": false }, "value": { @@ -523,7 +508,6 @@ "ctxt": 0 }, "value": "key1", - "typeAnnotation": null, "optional": false } } @@ -543,7 +527,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -561,7 +544,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -602,8 +584,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -622,7 +604,6 @@ "ctxt": 0 }, "value": "ComponentWithTwoAttributes", - "typeAnnotation": null, "optional": false }, "span": { @@ -654,7 +635,6 @@ "ctxt": 0 }, "value": "key1", - "typeAnnotation": null, "optional": false }, { @@ -667,7 +647,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -678,7 +657,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -700,7 +678,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "value": { @@ -756,7 +733,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -777,7 +753,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -797,7 +772,6 @@ "ctxt": 0 }, "value": "Link", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -818,6 +792,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -849,7 +824,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -879,6 +853,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -901,13 +876,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -934,8 +907,7 @@ } ] } - }, - "optional": false + } } } ], @@ -971,7 +943,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1003,7 +974,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -1014,7 +984,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -1032,7 +1001,6 @@ "ctxt": 0 }, "value": "createLink", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1053,6 +1021,7 @@ "ctxt": 0 }, "value": "func", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1076,6 +1045,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1092,8 +1062,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1115,8 +1084,7 @@ } } } - }, - "optional": false + } } } ], @@ -1159,8 +1127,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1179,7 +1147,6 @@ "ctxt": 0 }, "value": "Link", - "typeAnnotation": null, "optional": false }, "span": { @@ -1203,7 +1170,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -1221,7 +1187,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false } } @@ -1254,7 +1219,6 @@ "ctxt": 0 }, "value": "createLink1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1275,6 +1239,7 @@ "ctxt": 0 }, "value": "func", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1298,6 +1263,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1314,8 +1280,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1337,8 +1302,7 @@ } } } - }, - "optional": false + } } } ], @@ -1381,8 +1345,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1401,7 +1365,6 @@ "ctxt": 0 }, "value": "Link", - "typeAnnotation": null, "optional": false }, "span": { @@ -1425,7 +1388,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -1443,7 +1405,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false } } @@ -1481,7 +1442,6 @@ "ctxt": 0 }, "value": "InferParamProp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1508,7 +1468,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1541,7 +1500,6 @@ "ctxt": 0 }, "value": "values", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1570,7 +1528,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1596,7 +1553,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1623,7 +1579,6 @@ "ctxt": 0 }, "value": "selectHandler", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1653,6 +1608,7 @@ "ctxt": 0 }, "value": "selectedVal", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1675,13 +1631,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1719,7 +1673,6 @@ "ctxt": 0 }, "value": "InferParamComponent", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1740,6 +1693,7 @@ "ctxt": 0 }, "value": "attr", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1762,7 +1716,6 @@ "ctxt": 0 }, "value": "InferParamProp", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1788,7 +1741,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1796,8 +1748,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1833,7 +1784,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1865,7 +1815,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -1876,7 +1825,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -1909,8 +1857,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1929,7 +1877,6 @@ "ctxt": 0 }, "value": "InferParamComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -1953,7 +1900,6 @@ "ctxt": 0 }, "value": "values", - "typeAnnotation": null, "optional": false }, "value": { @@ -2038,7 +1984,6 @@ "ctxt": 0 }, "value": "selectHandler", - "typeAnnotation": null, "optional": false }, "value": { @@ -2064,8 +2009,8 @@ "ctxt": 0 }, "value": "val", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentsWithTypeArguments2x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentsWithTypeArguments2x/input.tsx.json index 185899ed28c7..469416277e2f 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentsWithTypeArguments2x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentsWithTypeArguments2x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "ComponentSpecific1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -80,6 +78,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -111,7 +110,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -140,7 +138,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -195,8 +192,7 @@ } ] } - }, - "optional": false + } } } ], @@ -232,7 +228,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -264,7 +259,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -275,7 +269,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -293,7 +286,6 @@ "ctxt": 0 }, "value": "ComponentSpecific2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -314,6 +306,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -345,7 +338,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -374,7 +366,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -384,8 +375,7 @@ } ] } - }, - "optional": false + } } } ], @@ -421,7 +411,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -453,7 +442,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -464,7 +452,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -482,7 +469,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -503,6 +489,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -525,13 +512,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -574,8 +559,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -594,7 +579,6 @@ "ctxt": 0 }, "value": "ComponentSpecific1", - "typeAnnotation": null, "optional": false }, "span": { @@ -618,7 +602,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false } }, @@ -637,7 +620,6 @@ "ctxt": 0 }, "value": "ignore-prop", - "typeAnnotation": null, "optional": false }, "value": { @@ -696,7 +678,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -723,7 +704,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -767,7 +747,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -788,6 +767,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -810,13 +790,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -859,8 +837,8 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -879,7 +857,6 @@ "ctxt": 0 }, "value": "ComponentSpecific1", - "typeAnnotation": null, "optional": false }, "span": { @@ -903,7 +880,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false } } @@ -945,7 +921,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -965,7 +940,6 @@ "ctxt": 0 }, "value": "Link", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -986,6 +960,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1017,7 +992,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1047,6 +1021,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1069,13 +1044,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1102,8 +1075,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1139,7 +1111,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1171,7 +1142,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -1182,7 +1152,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -1200,7 +1169,6 @@ "ctxt": 0 }, "value": "createLink", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1221,6 +1189,7 @@ "ctxt": 0 }, "value": "func", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1244,6 +1213,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1260,8 +1230,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1271,6 +1240,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1287,8 +1257,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -1310,8 +1279,7 @@ } } } - }, - "optional": false + } } } ], @@ -1354,8 +1322,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1374,7 +1342,6 @@ "ctxt": 0 }, "value": "Link", - "typeAnnotation": null, "optional": false }, "span": { @@ -1398,7 +1365,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -1416,7 +1382,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false } } @@ -1454,7 +1419,6 @@ "ctxt": 0 }, "value": "InferParamProp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1481,7 +1445,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1514,7 +1477,6 @@ "ctxt": 0 }, "value": "values", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1543,7 +1505,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1569,7 +1530,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1596,7 +1556,6 @@ "ctxt": 0 }, "value": "selectHandler", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1626,6 +1585,7 @@ "ctxt": 0 }, "value": "selectedVal", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1648,13 +1608,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1692,7 +1650,6 @@ "ctxt": 0 }, "value": "InferParamComponent", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1713,6 +1670,7 @@ "ctxt": 0 }, "value": "attr", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1735,7 +1693,6 @@ "ctxt": 0 }, "value": "InferParamProp", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1761,7 +1718,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1769,8 +1725,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1806,7 +1761,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1838,7 +1792,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -1849,7 +1802,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -1882,8 +1834,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1902,7 +1854,6 @@ "ctxt": 0 }, "value": "InferParamComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -1926,7 +1877,6 @@ "ctxt": 0 }, "value": "values", - "typeAnnotation": null, "optional": false }, "value": { @@ -2011,7 +1961,6 @@ "ctxt": 0 }, "value": "selectHandler", - "typeAnnotation": null, "optional": false }, "value": { @@ -2037,6 +1986,7 @@ "ctxt": 0 }, "value": "val", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2053,8 +2003,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentsWithTypeArguments3x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentsWithTypeArguments3x/input.tsx.json index 99a70bf1273f..477a6387f623 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentsWithTypeArguments3x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentsWithTypeArguments3x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "OverloadComponent", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -139,7 +135,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -157,7 +152,6 @@ "ctxt": 0 }, "value": "OverloadComponent", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -178,6 +172,7 @@ "ctxt": 0 }, "value": "attr", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -209,7 +204,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -238,7 +232,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -262,7 +255,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -335,8 +327,7 @@ } ] } - }, - "optional": false + } } } ], @@ -372,7 +363,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -404,7 +394,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -415,7 +404,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -433,7 +421,6 @@ "ctxt": 0 }, "value": "OverloadComponent", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -454,6 +441,7 @@ "ctxt": 0 }, "value": "attr", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -485,7 +473,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -514,7 +501,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -538,7 +524,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -567,7 +552,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -577,8 +561,7 @@ } ] } - }, - "optional": false + } } } ], @@ -614,7 +597,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -635,7 +617,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -667,7 +648,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -678,7 +658,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -696,7 +675,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -717,6 +695,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -739,13 +718,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -764,6 +741,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -786,13 +764,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -835,8 +811,8 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -855,7 +831,6 @@ "ctxt": 0 }, "value": "OverloadComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -879,7 +854,6 @@ "ctxt": 0 }, "value": "arg1", - "typeAnnotation": null, "optional": false } }, @@ -898,7 +872,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -931,7 +904,6 @@ "ctxt": 0 }, "value": "ignore-prop", - "typeAnnotation": null, "optional": false }, "value": null @@ -972,8 +944,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -992,7 +964,6 @@ "ctxt": 0 }, "value": "OverloadComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -1016,7 +987,6 @@ "ctxt": 0 }, "value": "arg2", - "typeAnnotation": null, "optional": false } }, @@ -1035,7 +1005,6 @@ "ctxt": 0 }, "value": "ignore-pro", - "typeAnnotation": null, "optional": false }, "value": { @@ -1089,8 +1058,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1109,7 +1078,6 @@ "ctxt": 0 }, "value": "OverloadComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -1133,7 +1101,6 @@ "ctxt": 0 }, "value": "arg2", - "typeAnnotation": null, "optional": false } } @@ -1173,8 +1140,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1193,7 +1160,6 @@ "ctxt": 0 }, "value": "OverloadComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -1217,7 +1183,6 @@ "ctxt": 0 }, "value": "arg1", - "typeAnnotation": null, "optional": false } }, @@ -1236,7 +1201,6 @@ "ctxt": 0 }, "value": "ignore-prop", - "typeAnnotation": null, "optional": false }, "value": null @@ -1277,8 +1241,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1297,7 +1261,6 @@ "ctxt": 0 }, "value": "OverloadComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -1341,8 +1304,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1361,7 +1324,6 @@ "ctxt": 0 }, "value": "OverloadComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -1385,7 +1347,6 @@ "ctxt": 0 }, "value": "arg2", - "typeAnnotation": null, "optional": false } }, @@ -1404,7 +1365,6 @@ "ctxt": 0 }, "value": "ignore-prop", - "typeAnnotation": null, "optional": false }, "value": { @@ -1437,7 +1397,6 @@ "ctxt": 0 }, "value": "arg1", - "typeAnnotation": null, "optional": false } } @@ -1477,8 +1436,8 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1497,7 +1456,6 @@ "ctxt": 0 }, "value": "OverloadComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -1521,7 +1479,6 @@ "ctxt": 0 }, "value": "arg2", - "typeAnnotation": null, "optional": false } }, @@ -1540,7 +1497,6 @@ "ctxt": 0 }, "value": "ignore-prop", - "typeAnnotation": null, "optional": false }, "value": null @@ -1560,7 +1516,6 @@ "ctxt": 0 }, "value": "arg1", - "typeAnnotation": null, "optional": false } } @@ -1602,7 +1557,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1629,7 +1583,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1674,7 +1627,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1701,7 +1653,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1743,7 +1694,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1787,7 +1737,6 @@ "ctxt": 0 }, "value": "Link", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1808,6 +1757,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1839,7 +1789,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1869,6 +1818,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1891,13 +1841,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1924,8 +1872,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1961,7 +1908,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1993,7 +1939,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -2004,7 +1949,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -2022,7 +1966,6 @@ "ctxt": 0 }, "value": "Link", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2043,6 +1986,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2074,7 +2018,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2104,6 +2047,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2126,13 +2070,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2142,6 +2084,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2158,8 +2101,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -2186,8 +2128,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2223,7 +2164,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2255,7 +2195,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -2266,7 +2205,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -2284,7 +2222,6 @@ "ctxt": 0 }, "value": "createLink", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2305,6 +2242,7 @@ "ctxt": 0 }, "value": "func", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2328,6 +2266,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2344,8 +2283,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -2367,8 +2305,7 @@ } } } - }, - "optional": false + } } } ], @@ -2411,8 +2348,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2431,7 +2368,6 @@ "ctxt": 0 }, "value": "Link", - "typeAnnotation": null, "optional": false }, "span": { @@ -2455,7 +2391,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -2473,7 +2408,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false } } @@ -2514,8 +2448,8 @@ "ctxt": 0 }, "value": "o1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2534,7 +2468,6 @@ "ctxt": 0 }, "value": "Link", - "typeAnnotation": null, "optional": false }, "span": { @@ -2558,7 +2491,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "value": { @@ -2584,6 +2516,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2600,8 +2533,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2611,6 +2543,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2627,8 +2560,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentsWithTypeArguments4x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentsWithTypeArguments4x/input.tsx.json index a24b7df9b905..09ada843ff2c 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentsWithTypeArguments4x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentsWithTypeArguments4x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "OverloadComponent", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -139,7 +135,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -157,7 +152,6 @@ "ctxt": 0 }, "value": "OverloadComponent", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -178,6 +172,7 @@ "ctxt": 0 }, "value": "attr", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -209,7 +204,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -238,7 +232,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -262,7 +255,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -335,8 +327,7 @@ } ] } - }, - "optional": false + } } } ], @@ -372,7 +363,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -404,7 +394,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -415,7 +404,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -433,7 +421,6 @@ "ctxt": 0 }, "value": "OverloadComponent", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -454,6 +441,7 @@ "ctxt": 0 }, "value": "attr", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -485,7 +473,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -514,7 +501,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -538,7 +524,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -567,7 +552,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -577,8 +561,7 @@ } ] } - }, - "optional": false + } } } ], @@ -614,7 +597,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -635,7 +617,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -667,7 +648,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -678,7 +658,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -696,7 +675,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -717,6 +695,7 @@ "ctxt": 0 }, "value": "arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -739,13 +718,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -764,6 +741,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -786,13 +764,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -835,8 +811,8 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -855,7 +831,6 @@ "ctxt": 0 }, "value": "OverloadComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -879,7 +854,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -904,7 +878,6 @@ "ctxt": 0 }, "value": "arg1", - "typeAnnotation": null, "optional": false }, "property": { @@ -915,7 +888,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -958,8 +930,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -978,7 +950,6 @@ "ctxt": 0 }, "value": "OverloadComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -1002,7 +973,6 @@ "ctxt": 0 }, "value": "arg1", - "typeAnnotation": null, "optional": false } }, @@ -1021,7 +991,6 @@ "ctxt": 0 }, "value": "ignore-prop", - "typeAnnotation": null, "optional": false }, "value": null @@ -1064,7 +1033,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1091,7 +1059,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1136,7 +1103,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1163,7 +1129,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1205,7 +1170,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentsWithTypeArguments5x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentsWithTypeArguments5x/input.tsx.json index f5365beb0025..915b307f1287 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentsWithTypeArguments5x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxStatelessFunctionComponentsWithTypeArguments5x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -80,6 +78,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,13 +101,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -176,7 +172,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -187,7 +182,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -205,7 +199,6 @@ "ctxt": 0 }, "value": "createComponent", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -226,6 +219,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -248,13 +242,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -297,8 +289,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -317,7 +309,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "span": { @@ -341,7 +332,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false } } @@ -381,8 +371,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -401,7 +391,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "span": { @@ -425,7 +414,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false } }, @@ -444,7 +432,6 @@ "ctxt": 0 }, "value": "prop1", - "typeAnnotation": null, "optional": false }, "value": null @@ -487,7 +474,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -514,7 +500,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -558,7 +543,6 @@ "ctxt": 0 }, "value": "ComponentSpecific", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -579,6 +563,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,7 +595,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -639,7 +623,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -649,8 +632,7 @@ } ] } - }, - "optional": false + } } } ], @@ -686,7 +668,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -718,7 +699,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -729,7 +709,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -747,7 +726,6 @@ "ctxt": 0 }, "value": "ComponentSpecific1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -768,6 +746,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -799,7 +778,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -828,7 +806,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -883,8 +860,7 @@ } ] } - }, - "optional": false + } } } ], @@ -920,7 +896,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -952,7 +927,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -963,7 +937,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -981,7 +954,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1002,6 +974,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1024,13 +997,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1073,8 +1044,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1093,7 +1064,6 @@ "ctxt": 0 }, "value": "ComponentSpecific", - "typeAnnotation": null, "optional": false }, "span": { @@ -1117,7 +1087,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false } }, @@ -1136,7 +1105,6 @@ "ctxt": 0 }, "value": "ignore-prop", - "typeAnnotation": null, "optional": false }, "value": { @@ -1190,8 +1158,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1210,7 +1178,6 @@ "ctxt": 0 }, "value": "ComponentSpecific1", - "typeAnnotation": null, "optional": false }, "span": { @@ -1234,7 +1201,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false } }, @@ -1253,7 +1219,6 @@ "ctxt": 0 }, "value": "ignore-prop", - "typeAnnotation": null, "optional": false }, "value": { @@ -1310,8 +1275,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1330,7 +1295,6 @@ "ctxt": 0 }, "value": "ComponentSpecific", - "typeAnnotation": null, "optional": false }, "span": { @@ -1354,7 +1318,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false } }, @@ -1373,7 +1336,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": { @@ -1427,8 +1389,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1447,7 +1409,6 @@ "ctxt": 0 }, "value": "ComponentSpecific", - "typeAnnotation": null, "optional": false }, "span": { @@ -1471,7 +1432,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false } }, @@ -1490,7 +1450,6 @@ "ctxt": 0 }, "value": "prop1", - "typeAnnotation": null, "optional": false }, "value": { @@ -1546,7 +1505,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1573,7 +1531,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxTypeErrorsx/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxTypeErrorsx/input.tsx.json index ca1df22aa74d..38808722ffde 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxTypeErrorsx/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxTypeErrorsx/input.tsx.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -51,7 +51,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -75,7 +74,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": { @@ -129,8 +127,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -149,7 +147,6 @@ "ctxt": 0 }, "value": "img", - "typeAnnotation": null, "optional": false }, "span": { @@ -173,7 +170,6 @@ "ctxt": 0 }, "value": "srce", - "typeAnnotation": null, "optional": false }, "value": { @@ -227,8 +223,8 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -248,7 +244,6 @@ "ctxt": 0 }, "value": "oops", - "typeAnnotation": null, "optional": false }, "value": { @@ -292,8 +287,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -312,7 +307,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -336,7 +330,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": { @@ -354,7 +347,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false } } @@ -395,8 +387,8 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -415,7 +407,6 @@ "ctxt": 0 }, "value": "imag", - "typeAnnotation": null, "optional": false }, "span": { @@ -439,7 +430,6 @@ "ctxt": 0 }, "value": "src", - "typeAnnotation": null, "optional": false }, "value": { @@ -478,7 +468,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -504,7 +493,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "value": null, @@ -539,7 +527,6 @@ "ctxt": 0 }, "value": "pt", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -577,7 +564,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -619,7 +605,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -666,7 +651,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -708,7 +692,6 @@ "ctxt": 0 }, "value": "reqd", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -779,8 +762,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -799,7 +782,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "span": { @@ -823,7 +805,6 @@ "ctxt": 0 }, "value": "reqd", - "typeAnnotation": null, "optional": false }, "value": { @@ -880,8 +861,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -900,7 +881,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "span": { @@ -924,7 +904,6 @@ "ctxt": 0 }, "value": "pt", - "typeAnnotation": null, "optional": false }, "value": { @@ -952,7 +931,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -975,7 +953,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionElementType1x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionElementType1x/input.tsx.json index 0759861ba7d0..54c20f430734 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionElementType1x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionElementType1x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "SFC1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,6 +78,7 @@ "ctxt": 0 }, "value": "prop", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -111,7 +110,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -139,8 +137,7 @@ } ] } - }, - "optional": false + } } } ], @@ -182,7 +179,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -221,7 +217,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -252,7 +247,6 @@ "ctxt": 0 }, "value": "SFC2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -273,6 +267,7 @@ "ctxt": 0 }, "value": "prop", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -304,7 +299,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -332,8 +326,7 @@ } ] } - }, - "optional": false + } } } ], @@ -375,7 +368,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "span": { @@ -414,7 +406,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false } } @@ -452,8 +443,8 @@ "ctxt": 0 }, "value": "SFCComp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -471,7 +462,6 @@ "ctxt": 0 }, "value": "SFC1", - "typeAnnotation": null, "optional": false }, "right": { @@ -482,7 +472,6 @@ "ctxt": 0 }, "value": "SFC2", - "typeAnnotation": null, "optional": false } }, @@ -514,7 +503,6 @@ "ctxt": 0 }, "value": "SFCComp", - "typeAnnotation": null, "optional": false }, "span": { @@ -538,7 +526,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionElementType2x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionElementType2x/input.tsx.json index fa543fa59a1f..88cacfebd6b0 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionElementType2x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionElementType2x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "SFC1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -80,6 +78,7 @@ "ctxt": 0 }, "value": "prop", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -111,7 +110,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -139,8 +137,7 @@ } ] } - }, - "optional": false + } } } ], @@ -182,7 +179,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -221,7 +217,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -252,7 +247,6 @@ "ctxt": 0 }, "value": "SFC2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -273,6 +267,7 @@ "ctxt": 0 }, "value": "prop", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -304,7 +299,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -332,8 +326,7 @@ } ] } - }, - "optional": false + } } } ], @@ -375,7 +368,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "span": { @@ -414,7 +406,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false } } @@ -452,8 +443,8 @@ "ctxt": 0 }, "value": "SFCComp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -471,7 +462,6 @@ "ctxt": 0 }, "value": "SFC1", - "typeAnnotation": null, "optional": false }, "right": { @@ -482,7 +472,6 @@ "ctxt": 0 }, "value": "SFC2", - "typeAnnotation": null, "optional": false } }, @@ -514,7 +503,6 @@ "ctxt": 0 }, "value": "SFCComp", - "typeAnnotation": null, "optional": false }, "span": { @@ -538,7 +526,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionElementType3x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionElementType3x/input.tsx.json index 37de6fb3a4df..3f7cbd49f0d3 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionElementType3x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionElementType3x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "RC1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -85,7 +83,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -149,7 +146,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -160,7 +156,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -199,7 +194,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -250,7 +244,6 @@ "ctxt": 0 }, "value": "RC2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -276,7 +269,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -339,7 +331,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -386,7 +377,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -397,7 +387,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -436,7 +425,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -487,7 +475,6 @@ "ctxt": 0 }, "value": "RC3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -513,7 +500,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -577,7 +563,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -588,7 +573,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -635,7 +619,6 @@ "ctxt": 0 }, "value": "RC4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -661,7 +644,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -725,7 +707,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -736,7 +717,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -798,8 +778,8 @@ "ctxt": 0 }, "value": "EmptyRCComp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -817,7 +797,6 @@ "ctxt": 0 }, "value": "RC3", - "typeAnnotation": null, "optional": false }, "right": { @@ -828,7 +807,6 @@ "ctxt": 0 }, "value": "RC4", - "typeAnnotation": null, "optional": false } }, @@ -861,8 +839,8 @@ "ctxt": 0 }, "value": "PartRCComp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -880,7 +858,6 @@ "ctxt": 0 }, "value": "RC1", - "typeAnnotation": null, "optional": false }, "right": { @@ -891,7 +868,6 @@ "ctxt": 0 }, "value": "RC4", - "typeAnnotation": null, "optional": false } }, @@ -924,8 +900,8 @@ "ctxt": 0 }, "value": "RCComp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -943,7 +919,6 @@ "ctxt": 0 }, "value": "RC1", - "typeAnnotation": null, "optional": false }, "right": { @@ -954,7 +929,6 @@ "ctxt": 0 }, "value": "RC2", - "typeAnnotation": null, "optional": false } }, @@ -987,8 +961,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1007,7 +981,6 @@ "ctxt": 0 }, "value": "RCComp", - "typeAnnotation": null, "optional": false }, "span": { @@ -1031,7 +1004,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1085,8 +1057,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1105,7 +1077,6 @@ "ctxt": 0 }, "value": "EmptyRCComp", - "typeAnnotation": null, "optional": false }, "span": { @@ -1149,8 +1120,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1169,7 +1140,6 @@ "ctxt": 0 }, "value": "EmptyRCComp", - "typeAnnotation": null, "optional": false }, "span": { @@ -1193,7 +1163,6 @@ "ctxt": 0 }, "value": "data-prop", - "typeAnnotation": null, "optional": false }, "value": { @@ -1247,8 +1216,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1267,7 +1236,6 @@ "ctxt": 0 }, "value": "PartRCComp", - "typeAnnotation": null, "optional": false }, "span": { @@ -1311,8 +1279,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1331,7 +1299,6 @@ "ctxt": 0 }, "value": "PartRCComp", - "typeAnnotation": null, "optional": false }, "span": { @@ -1355,7 +1322,6 @@ "ctxt": 0 }, "value": "data-extra", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionElementType4x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionElementType4x/input.tsx.json index 56e3353017c8..c8b5e1172db5 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionElementType4x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionElementType4x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "RC1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -85,7 +83,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -149,7 +146,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -160,7 +156,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -199,7 +194,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -250,7 +244,6 @@ "ctxt": 0 }, "value": "RC2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -276,7 +269,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -339,7 +331,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -386,7 +377,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -397,7 +387,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -436,7 +425,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -487,7 +475,6 @@ "ctxt": 0 }, "value": "RC3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -513,7 +500,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -577,7 +563,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -588,7 +573,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -635,7 +619,6 @@ "ctxt": 0 }, "value": "RC4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -661,7 +644,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -725,7 +707,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -736,7 +717,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -798,8 +778,8 @@ "ctxt": 0 }, "value": "RCComp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -817,7 +797,6 @@ "ctxt": 0 }, "value": "RC1", - "typeAnnotation": null, "optional": false }, "right": { @@ -828,7 +807,6 @@ "ctxt": 0 }, "value": "RC2", - "typeAnnotation": null, "optional": false } }, @@ -861,8 +839,8 @@ "ctxt": 0 }, "value": "EmptyRCComp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -880,7 +858,6 @@ "ctxt": 0 }, "value": "RC3", - "typeAnnotation": null, "optional": false }, "right": { @@ -891,7 +868,6 @@ "ctxt": 0 }, "value": "RC4", - "typeAnnotation": null, "optional": false } }, @@ -924,8 +900,8 @@ "ctxt": 0 }, "value": "PartRCComp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -943,7 +919,6 @@ "ctxt": 0 }, "value": "RC1", - "typeAnnotation": null, "optional": false }, "right": { @@ -954,7 +929,6 @@ "ctxt": 0 }, "value": "RC4", - "typeAnnotation": null, "optional": false } }, @@ -987,8 +961,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1007,7 +981,6 @@ "ctxt": 0 }, "value": "RCComp", - "typeAnnotation": null, "optional": false }, "span": { @@ -1031,7 +1004,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -1072,8 +1044,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1092,7 +1064,6 @@ "ctxt": 0 }, "value": "PartRCComp", - "typeAnnotation": null, "optional": false }, "span": { @@ -1116,7 +1087,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1173,8 +1143,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1193,7 +1163,6 @@ "ctxt": 0 }, "value": "EmptyRCComp", - "typeAnnotation": null, "optional": false }, "span": { @@ -1217,7 +1186,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionElementType5x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionElementType5x/input.tsx.json index 7577cf72d68b..80c8c59e0cfc 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionElementType5x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionElementType5x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "EmptySFC1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -102,7 +100,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -141,7 +138,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "EmptySFC2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -207,7 +202,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -246,7 +240,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -269,7 +262,6 @@ "ctxt": 0 }, "value": "SFC2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -290,6 +282,7 @@ "ctxt": 0 }, "value": "prop", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -321,7 +314,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -349,8 +341,7 @@ } ] } - }, - "optional": false + } } } ], @@ -392,7 +383,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "span": { @@ -431,7 +421,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false } } @@ -469,8 +458,8 @@ "ctxt": 0 }, "value": "EmptySFCComp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -488,7 +477,6 @@ "ctxt": 0 }, "value": "EmptySFC1", - "typeAnnotation": null, "optional": false }, "right": { @@ -499,7 +487,6 @@ "ctxt": 0 }, "value": "EmptySFC2", - "typeAnnotation": null, "optional": false } }, @@ -532,8 +519,8 @@ "ctxt": 0 }, "value": "SFC2AndEmptyComp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -551,7 +538,6 @@ "ctxt": 0 }, "value": "SFC2", - "typeAnnotation": null, "optional": false }, "right": { @@ -562,7 +548,6 @@ "ctxt": 0 }, "value": "EmptySFC1", - "typeAnnotation": null, "optional": false } }, @@ -595,8 +580,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -615,7 +600,6 @@ "ctxt": 0 }, "value": "EmptySFCComp", - "typeAnnotation": null, "optional": false }, "span": { @@ -659,8 +643,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -679,7 +663,6 @@ "ctxt": 0 }, "value": "EmptySFCComp", - "typeAnnotation": null, "optional": false }, "span": { @@ -703,7 +686,6 @@ "ctxt": 0 }, "value": "data-prop", - "typeAnnotation": null, "optional": false }, "value": null @@ -744,8 +726,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -764,7 +746,6 @@ "ctxt": 0 }, "value": "SFC2AndEmptyComp", - "typeAnnotation": null, "optional": false }, "span": { @@ -788,7 +769,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionElementType6x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionElementType6x/input.tsx.json index 88088d23a14f..6ce35f63658a 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionElementType6x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionElementType6x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "EmptySFC1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -102,7 +100,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -141,7 +138,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "EmptySFC2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -207,7 +202,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false }, "span": { @@ -246,7 +240,6 @@ "ctxt": 0 }, "value": "div", - "typeAnnotation": null, "optional": false } } @@ -269,7 +262,6 @@ "ctxt": 0 }, "value": "SFC2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -290,6 +282,7 @@ "ctxt": 0 }, "value": "prop", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -321,7 +314,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -349,8 +341,7 @@ } ] } - }, - "optional": false + } } } ], @@ -392,7 +383,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false }, "span": { @@ -431,7 +421,6 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, "optional": false } } @@ -469,8 +458,8 @@ "ctxt": 0 }, "value": "EmptySFCComp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -488,7 +477,6 @@ "ctxt": 0 }, "value": "EmptySFC1", - "typeAnnotation": null, "optional": false }, "right": { @@ -499,7 +487,6 @@ "ctxt": 0 }, "value": "EmptySFC2", - "typeAnnotation": null, "optional": false } }, @@ -532,8 +519,8 @@ "ctxt": 0 }, "value": "SFC2AndEmptyComp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -551,7 +538,6 @@ "ctxt": 0 }, "value": "SFC2", - "typeAnnotation": null, "optional": false }, "right": { @@ -562,7 +548,6 @@ "ctxt": 0 }, "value": "EmptySFC1", - "typeAnnotation": null, "optional": false } }, @@ -595,8 +580,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -615,7 +600,6 @@ "ctxt": 0 }, "value": "EmptySFCComp", - "typeAnnotation": null, "optional": false }, "span": { @@ -639,7 +623,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -680,8 +663,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -700,7 +683,6 @@ "ctxt": 0 }, "value": "SFC2AndEmptyComp", - "typeAnnotation": null, "optional": false }, "span": { @@ -724,7 +706,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -778,8 +759,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -798,7 +779,6 @@ "ctxt": 0 }, "value": "SFC2AndEmptyComp", - "typeAnnotation": null, "optional": false }, "span": { @@ -842,8 +822,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -862,7 +842,6 @@ "ctxt": 0 }, "value": "SFC2AndEmptyComp", - "typeAnnotation": null, "optional": false }, "span": { @@ -886,7 +865,6 @@ "ctxt": 0 }, "value": "data-prop", - "typeAnnotation": null, "optional": false }, "value": null diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionTypeComponent1x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionTypeComponent1x/input.tsx.json index 2e4aa0fd6f05..be8df601a410 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionTypeComponent1x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionTypeComponent1x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "ComponentProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "AnyComponent", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -133,7 +130,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "right": { @@ -144,7 +140,6 @@ "ctxt": 0 }, "value": "StatelessComponent", - "typeAnnotation": null, "optional": false } }, @@ -185,7 +180,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "right": { @@ -196,7 +190,6 @@ "ctxt": 0 }, "value": "ComponentClass", - "typeAnnotation": null, "optional": false } }, @@ -238,7 +231,6 @@ "ctxt": 0 }, "value": "MyComponent", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -264,7 +256,6 @@ "ctxt": 0 }, "value": "render", - "typeAnnotation": null, "optional": false }, "function": { @@ -323,7 +314,6 @@ "ctxt": 0 }, "value": "AnyComponent", - "typeAnnotation": null, "optional": false }, "value": null @@ -355,7 +345,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -395,7 +384,6 @@ "ctxt": 0 }, "value": "AnyComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -441,7 +429,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -452,7 +439,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -482,7 +468,6 @@ "ctxt": 0 }, "value": "ComponentProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -524,7 +509,6 @@ "ctxt": 0 }, "value": "MyComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -548,7 +532,6 @@ "ctxt": 0 }, "value": "AnyComponent", - "typeAnnotation": null, "optional": false }, "value": { @@ -583,7 +566,6 @@ "ctxt": 0 }, "value": "button", - "typeAnnotation": null, "optional": false }, "span": { @@ -622,7 +604,6 @@ "ctxt": 0 }, "value": "button", - "typeAnnotation": null, "optional": false } } @@ -652,7 +633,6 @@ "ctxt": 0 }, "value": "MyButtonComponent", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -678,7 +658,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "property": { @@ -689,7 +668,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "computed": false @@ -750,7 +728,6 @@ "ctxt": 0 }, "value": "MyComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -774,7 +751,6 @@ "ctxt": 0 }, "value": "AnyComponent", - "typeAnnotation": null, "optional": false }, "value": { @@ -792,7 +768,6 @@ "ctxt": 0 }, "value": "MyButtonComponent", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionTypeComponent2x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionTypeComponent2x/input.tsx.json index 8724240cb94b..af053d685d02 100644 --- a/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionTypeComponent2x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/jsx/tsxUnionTypeComponent2x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -65,7 +64,6 @@ "ctxt": 0 }, "value": "Invalid1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "right": { @@ -105,7 +102,6 @@ "ctxt": 0 }, "value": "ComponentClass", - "typeAnnotation": null, "optional": false } }, @@ -166,6 +162,7 @@ "ctxt": 0 }, "value": "X", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -188,13 +185,11 @@ "ctxt": 0 }, "value": "Invalid1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -233,7 +228,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/tsc/moduleResolution/scopedPackagesClassic/input.ts.json b/ecmascript/parser/tests/typescript/tsc/moduleResolution/scopedPackagesClassic/input.ts.json index d14f72912475..0177ba52ba0f 100644 --- a/ecmascript/parser/tests/typescript/tsc/moduleResolution/scopedPackagesClassic/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/moduleResolution/scopedPackagesClassic/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -78,7 +78,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "imported": null diff --git a/ecmascript/parser/tests/typescript/tsc/moduleResolution/untypedModuleImport_allowJs/input.ts.json b/ecmascript/parser/tests/typescript/tsc/moduleResolution/untypedModuleImport_allowJs/input.ts.json index 3d83355f4353..4af31d0cece8 100644 --- a/ecmascript/parser/tests/typescript/tsc/moduleResolution/untypedModuleImport_allowJs/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/moduleResolution/untypedModuleImport_allowJs/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "computed": false @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "params": [], @@ -139,7 +136,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -190,7 +186,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -201,7 +196,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript3/Accessors/parserES3Accessors1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript3/Accessors/parserES3Accessors1/input.ts.json index 81c92ce30735..2af9eeeef7cf 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript3/Accessors/parserES3Accessors1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript3/Accessors/parserES3Accessors1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript3/Accessors/parserES3Accessors2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript3/Accessors/parserES3Accessors2/input.ts.json index 09eb5b4c144c..cd16744eacaa 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript3/Accessors/parserES3Accessors2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript3/Accessors/parserES3Accessors2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,8 +61,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript3/Accessors/parserES3Accessors3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript3/Accessors/parserES3Accessors3/input.ts.json index a08227659c01..4d6fe11b7500 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript3/Accessors/parserES3Accessors3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript3/Accessors/parserES3Accessors3/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -57,7 +57,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript3/Accessors/parserES3Accessors4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript3/Accessors/parserES3Accessors4/input.ts.json index 9787d3511593..85e1624d6e38 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript3/Accessors/parserES3Accessors4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript3/Accessors/parserES3Accessors4/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -57,7 +57,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "param": { @@ -68,8 +67,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Accessors/parserAccessors1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Accessors/parserAccessors1/input.ts.json index a3f0d6a1da51..95c642f7ea6f 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Accessors/parserAccessors1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Accessors/parserAccessors1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Accessors/parserAccessors2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Accessors/parserAccessors2/input.ts.json index d7fc9f57e9e3..7b13cfcb0639 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Accessors/parserAccessors2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Accessors/parserAccessors2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,8 +61,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Accessors/parserAccessors3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Accessors/parserAccessors3/input.ts.json index 5b41d28a0f1d..dfa5d103a081 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Accessors/parserAccessors3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Accessors/parserAccessors3/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -57,7 +57,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Accessors/parserAccessors4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Accessors/parserAccessors4/input.ts.json index 64dd942bb77a..cdb1aca0b42b 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Accessors/parserAccessors4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Accessors/parserAccessors4/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -57,7 +57,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "param": { @@ -68,8 +67,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression1/input.ts.json index bde0ef7f4515..9fdaf7d56713 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression10/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression10/input.ts.json index ae9d006539c2..88903c3df1ca 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression10/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression10/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression11/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression11/input.ts.json index feebf272dbd6..6bc5c0d0d007 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression11/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression11/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression12/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression12/input.ts.json index 26283efa451f..02a276542145 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression12/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression12/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression13/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression13/input.ts.json index eccebb5acbf8..aa1a8e9e8e43 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression13/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression13/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression14/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression14/input.ts.json index a443f84f21df..00fb9d7a11d7 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression14/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression14/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression15/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression15/input.ts.json index 868ea3c7c7dc..d56a3758ece3 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression15/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression15/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression2/input.ts.json index 0e842640c6eb..8ba301eba68d 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression3/input.ts.json index 9e4399ce24ed..458692b28c81 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression3/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression4/input.ts.json index c07f1d8f9d76..ec7bb3b12dee 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression4/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression5/input.ts.json index 52ffbb259f62..22be09d2eb18 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression6/input.ts.json index d55afe35c29b..a2e228ad0efa 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression7/input.ts.json index 8d49ed3d45a0..2f65be667208 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression7/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression8/input.ts.json index c7f17d8cffa4..a580611b690f 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression8/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression9/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression9/input.ts.json index 1f3001d917bc..62cd5f3626d2 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression9/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrayLiteralExpressions/parserArrayLiteralExpression9/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression1/input.ts.json index afa96e0ced72..cf77d3c7eeb3 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,6 +50,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression4/input.ts.json index e3ed1ff79ab1..368b77ae21e0 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression4/input.ts.json @@ -29,8 +29,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression5/input.ts.json index 3d0040a47f73..ba4357a7ef44 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression5/input.ts.json @@ -35,7 +35,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression6/input.ts.json index 38a0925fa925..008898e84742 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "q", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -73,6 +72,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -89,8 +89,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -153,7 +152,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -207,8 +205,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -225,7 +223,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "property": { @@ -236,7 +233,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression7/input.ts.json index a287f2f2645f..b781c7cccb3c 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression7/input.ts.json @@ -38,7 +38,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/AutomaticSemicolonInsertion/parserAutomaticSemicolonInsertion1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/AutomaticSemicolonInsertion/parserAutomaticSemicolonInsertion1/input.ts.json index 5a520c2e5880..26ff59d5c696 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/AutomaticSemicolonInsertion/parserAutomaticSemicolonInsertion1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/AutomaticSemicolonInsertion/parserAutomaticSemicolonInsertion1/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -90,6 +89,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -112,13 +112,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -150,6 +148,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -172,13 +171,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -208,8 +205,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -219,7 +216,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -247,8 +243,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -258,7 +254,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } @@ -288,6 +283,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -332,8 +328,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -363,8 +358,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -374,7 +369,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -402,8 +396,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -413,7 +407,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClass1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClass1/input.ts.json index 09df373207f5..aed4598882f7 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClass1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClass1/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "NullLogger", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "information", - "typeAnnotation": null, "optional": false }, "function": { @@ -129,7 +127,6 @@ "ctxt": 0 }, "value": "debug", - "typeAnnotation": null, "optional": false }, "function": { @@ -209,7 +206,6 @@ "ctxt": 0 }, "value": "warning", - "typeAnnotation": null, "optional": false }, "function": { @@ -289,7 +285,6 @@ "ctxt": 0 }, "value": "error", - "typeAnnotation": null, "optional": false }, "function": { @@ -369,7 +364,6 @@ "ctxt": 0 }, "value": "fatal", - "typeAnnotation": null, "optional": false }, "function": { @@ -449,7 +443,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "function": { @@ -470,6 +463,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -486,8 +480,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -554,7 +547,6 @@ "ctxt": 0 }, "value": "ILogger", - "typeAnnotation": null, "optional": false }, "typeArguments": null diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClass2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClass2/input.ts.json index c7ded15d0533..0cda25410c6d 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClass2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClass2/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "LoggerAdapter", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -71,6 +69,7 @@ "ctxt": 0 }, "value": "logger", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -93,13 +92,11 @@ "ctxt": 0 }, "value": "ILogger", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -149,7 +146,6 @@ "ctxt": 0 }, "value": "_information", - "typeAnnotation": null, "optional": false }, "computed": false @@ -191,7 +187,6 @@ "ctxt": 0 }, "value": "logger", - "typeAnnotation": null, "optional": false }, "computed": false @@ -204,7 +199,6 @@ "ctxt": 0 }, "value": "information", - "typeAnnotation": null, "optional": false }, "computed": false @@ -240,7 +234,6 @@ "ctxt": 0 }, "value": "ILogger", - "typeAnnotation": null, "optional": false }, "typeArguments": null diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration10/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration10/input.ts.json index a0e51a9e8f92..a80ff6036ddf 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration10/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration10/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -65,7 +63,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration11/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration11/input.ts.json index df2d653b153b..2b932c727e2c 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration11/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration11/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -65,7 +63,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration12/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration12/input.ts.json index 282621521c30..4e255f1c97ce 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration12/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration12/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -65,7 +63,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -85,8 +82,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration13/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration13/input.ts.json index 0edef4e475d6..05898855e689 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration13/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration13/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration14/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration14/input.ts.json index 40b96d90d675..f3160c3db9ae 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration14/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration14/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration15/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration15/input.ts.json index 716e52bfc783..967214a74312 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration15/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration15/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration16/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration16/input.ts.json index 3896145871d7..368b83b773c9 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration16/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration16/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration17/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration17/input.ts.json index 6902afd4844b..e7f918293697 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration17/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration17/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Enumerator", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "atEnd", - "typeAnnotation": null, "optional": false }, "function": { @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "moveNext", - "typeAnnotation": null, "optional": false }, "function": { @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, "optional": false }, "function": { @@ -188,7 +184,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -208,6 +203,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -224,8 +220,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration19/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration19/input.ts.json index 5fe2e7496b73..72a109bc1bab 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration19/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration19/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration20/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration20/input.ts.json index dfb3e50f1307..e5b70041a552 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration20/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration20/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration21/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration21/input.ts.json index 9d9c1b327e2c..52c6a9c8a22d 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration21/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration21/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration22/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration22/input.ts.json index 0ece5668991c..d38cdb411e25 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration22/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration22/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration23/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration23/input.ts.json index 60ee42fbb13d..3870c245b465 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration23/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration23/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration24/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration24/input.ts.json index 86088e673317..47fc0ec669c4 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration24/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration24/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "any", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration25/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration25/input.ts.json index c07b039b0e89..05feaffa6054 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration25/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration25/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "IList", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -133,7 +129,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -171,7 +166,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -197,7 +191,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "function": { @@ -234,7 +227,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -262,7 +254,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -327,7 +318,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -352,7 +342,6 @@ "ctxt": 0 }, "value": "IList", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -378,7 +367,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration26/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration26/input.ts.json index a79bd451337f..6aa479af0d2e 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration26/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration26/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "var", - "typeAnnotation": null, "optional": false }, "value": null, @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "public", - "typeAnnotation": null, "optional": false }, "value": null, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration7.d/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration7.d/input.ts.json index 00c303175e31..e675a20f3445 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration7.d/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration7.d/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": true, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration8/input.ts.json index eabaf25b4a42..5192da6ce6ac 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration8/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration9/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration9/input.ts.json index 80fa56bc3919..b7800f4eb6af 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration9/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclaration9/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclarationIndexSignature1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclarationIndexSignature1/input.ts.json index d5fc2daad692..5cb1dd078bfe 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclarationIndexSignature1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ClassDeclarations/parserClassDeclarationIndexSignature1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -38,6 +37,7 @@ "ctxt": 0 }, "value": "index", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,8 +54,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName2/input.ts.json index 038abb59ed65..cfd0e4484440 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -59,7 +59,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName3/input.ts.json index 4ce261282af7..0187430a63a5 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName3/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -59,7 +59,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName4/input.ts.json index f0fd2d32bb6b..207dfa8a7e02 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName4/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -64,7 +64,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration1/input.ts.json index 28c0d42f539f..0f97a22e98c5 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration5/input.ts.json index b7886323a265..2f9b28b09c85 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnum1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnum1/input.ts.json index dc322c3dcad8..77a230144e9e 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnum1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnum1/input.ts.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "SignatureFlags", - "typeAnnotation": null, "optional": false }, "members": [ @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "None", - "typeAnnotation": null, "optional": false }, "init": { @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "IsIndexer", - "typeAnnotation": null, "optional": false }, "init": { @@ -105,7 +102,6 @@ "ctxt": 0 }, "value": "IsStringIndexer", - "typeAnnotation": null, "optional": false }, "init": { @@ -151,7 +147,6 @@ "ctxt": 0 }, "value": "IsNumberIndexer", - "typeAnnotation": null, "optional": false }, "init": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnum2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnum2/input.ts.json index 91a4c1f0069b..6240da8587fd 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnum2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnum2/input.ts.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "SignatureFlags", - "typeAnnotation": null, "optional": false }, "members": [ @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "None", - "typeAnnotation": null, "optional": false }, "init": { @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "IsIndexer", - "typeAnnotation": null, "optional": false }, "init": { @@ -105,7 +102,6 @@ "ctxt": 0 }, "value": "IsStringIndexer", - "typeAnnotation": null, "optional": false }, "init": { @@ -151,7 +147,6 @@ "ctxt": 0 }, "value": "IsNumberIndexer", - "typeAnnotation": null, "optional": false }, "init": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnum3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnum3/input.ts.json index 91808836fb8a..b73d7535052e 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnum3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnum3/input.ts.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "SignatureFlags", - "typeAnnotation": null, "optional": false }, "members": [] diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnum6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnum6/input.ts.json index fd10b39aa1da..a6c0e773b103 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnum6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnum6/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnum7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnum7/input.ts.json index 05bd09682603..ba846b0065e5 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnum7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnum7/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration1/input.ts.json index 837c841ec741..26f33c3e4e68 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration1/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "init": { @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "init": null diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration2.d/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration2.d/input.ts.json index 91da6ff55c58..26de685f932b 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration2.d/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration2.d/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [] diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration3/input.ts.json index 4b5596e02d0b..fa34383a92de 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration3/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration5/input.ts.json index bec5a373fcf5..a5842deb7801 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration5/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": { @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -90,7 +87,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": { @@ -118,7 +114,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "init": null diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration6/input.ts.json index 8aed5bc426eb..03b787855143 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration6/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": { @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -90,7 +87,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": { @@ -136,7 +132,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "init": null diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserInterfaceKeywordInEnum/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserInterfaceKeywordInEnum/input.ts.json index 783514f5d2f4..9777603e575e 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserInterfaceKeywordInEnum/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserInterfaceKeywordInEnum/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "interface", - "typeAnnotation": null, "optional": false }, "init": null diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserInterfaceKeywordInEnum1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserInterfaceKeywordInEnum1/input.ts.json index 6f37b51fc2c2..26baebedebea 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserInterfaceKeywordInEnum1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/EnumDeclarations/parserInterfaceKeywordInEnum1/input.ts.json @@ -45,7 +45,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "members": [ @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "interface", - "typeAnnotation": null, "optional": false }, "init": null diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic11/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic11/input.ts.json index eb06cf0d8564..849304c0ed0d 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic11/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic11/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "public", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic14/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic14/input.ts.json index 0d6dac5066e8..f5bdb52e6a5d 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic14/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic14/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "public", - "typeAnnotation": null, "optional": false }, "function": { @@ -87,7 +85,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic2/input.ts.json index a3513071e51c..8e121400faeb 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "public", - "typeAnnotation": null, "optional": false }, "value": null, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic3/input.ts.json index 7a81b730656c..36cd61e193a4 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "public", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic4/input.ts.json index 8f38c8779816..bfbcf907aff7 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "public", - "typeAnnotation": null, "optional": false }, "value": null, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic5/input.ts.json index 4897cb930cac..34f7b33de5c5 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "public", - "typeAnnotation": null, "optional": false }, "value": null, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction4/input.ts.json index e14bf4bf7762..3700dcac2b8d 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction4/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -61,8 +61,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction4/input.ts.json index e14bf4bf7762..3700dcac2b8d 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction4/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -61,8 +61,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable1/input.ts.json index b0019b2d97cb..243e380fd817 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable1/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "IPoint", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "getDist", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "Shapes", - "typeAnnotation": null, "optional": false }, "body": { @@ -124,7 +121,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -150,7 +146,6 @@ "ctxt": 0 }, "value": "con", - "typeAnnotation": null, "optional": false }, "value": null, @@ -209,7 +204,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -231,6 +225,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -247,8 +242,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -269,6 +263,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -285,8 +280,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -317,7 +311,6 @@ "ctxt": 0 }, "value": "getDist", - "typeAnnotation": null, "optional": false }, "function": { @@ -365,7 +358,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -376,7 +368,6 @@ "ctxt": 0 }, "value": "sqrt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -423,7 +414,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -451,7 +441,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -488,7 +477,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -516,7 +504,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -556,7 +543,6 @@ "ctxt": 0 }, "value": "origin", - "typeAnnotation": null, "optional": false }, "value": { @@ -574,7 +560,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -637,7 +622,6 @@ "ctxt": 0 }, "value": "IPoint", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -673,6 +657,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -695,13 +680,11 @@ "ctxt": 0 }, "value": "IPoint", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -725,7 +708,6 @@ "ctxt": 0 }, "value": "Shapes", - "typeAnnotation": null, "optional": false }, "property": { @@ -736,7 +718,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "computed": false @@ -798,8 +779,8 @@ "ctxt": 0 }, "value": "dist", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -823,7 +804,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -834,7 +814,6 @@ "ctxt": 0 }, "value": "getDist", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/ParameterLists/parserErrorRecovery_ParameterList6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/ParameterLists/parserErrorRecovery_ParameterList6/input.ts.json index 3aeadc550645..1cbfdee8f80d 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/ParameterLists/parserErrorRecovery_ParameterList6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/ParameterLists/parserErrorRecovery_ParameterList6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "banana", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -85,13 +84,11 @@ "ctxt": 0 }, "value": "break", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/VariableLists/parserVariableStatement1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/VariableLists/parserVariableStatement1/input.ts.json index 631a6bcf8ca4..44c2e77bffa5 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/VariableLists/parserVariableStatement1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/VariableLists/parserVariableStatement1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -52,8 +52,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -73,8 +73,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/VariableLists/parserVariableStatement2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/VariableLists/parserVariableStatement2/input.ts.json index ffa0ae2310bc..4bb5eb921be3 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/VariableLists/parserVariableStatement2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/VariableLists/parserVariableStatement2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -52,8 +52,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -73,8 +73,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/VariableLists/parserVariableStatement3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/VariableLists/parserVariableStatement3/input.ts.json index efc0046fc71d..c60ddcf76512 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/VariableLists/parserVariableStatement3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/VariableLists/parserVariableStatement3/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -52,8 +52,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -73,8 +73,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/VariableLists/parserVariableStatement4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/VariableLists/parserVariableStatement4/input.ts.json index f1f43e9b25c1..449f85d836cb 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/VariableLists/parserVariableStatement4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/VariableLists/parserVariableStatement4/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -52,8 +52,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -73,8 +73,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/parserCommaInTypeMemberList1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/parserCommaInTypeMemberList1/input.ts.json index f855ad28c2e3..01f997636837 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/parserCommaInTypeMemberList1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/parserCommaInTypeMemberList1/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "workItem", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -104,7 +104,6 @@ "ctxt": 0 }, "value": "width", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -132,8 +131,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/parserCommaInTypeMemberList2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/parserCommaInTypeMemberList2/input.ts.json index 8a11c4f68cce..02d9116b97d2 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/parserCommaInTypeMemberList2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/parserCommaInTypeMemberList2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -56,7 +56,6 @@ "ctxt": 0 }, "value": "$", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +66,6 @@ "ctxt": 0 }, "value": "extend", - "typeAnnotation": null, "optional": false }, "computed": false @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "workItem", - "typeAnnotation": null, "optional": false }, "value": { @@ -119,7 +116,6 @@ "ctxt": 0 }, "value": "_workItem", - "typeAnnotation": null, "optional": false }, "computed": false @@ -173,7 +169,6 @@ "ctxt": 0 }, "value": "workItem", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -225,7 +220,6 @@ "ctxt": 0 }, "value": "workItem", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -267,7 +261,6 @@ "ctxt": 0 }, "value": "width", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/parserModifierOnPropertySignature2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/parserModifierOnPropertySignature2/input.ts.json index 3e9928910894..cb1333b8f7dd 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/parserModifierOnPropertySignature2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ErrorRecovery/parserModifierOnPropertySignature2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "public", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "biz", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ExportAssignments/parserExportAssignment1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ExportAssignments/parserExportAssignment1/input.ts.json index ec8d51663b59..d81000719c64 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ExportAssignments/parserExportAssignment1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ExportAssignments/parserExportAssignment1/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ExportAssignments/parserExportAssignment2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ExportAssignments/parserExportAssignment2/input.ts.json index 625cc7950140..bb2d8112b737 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ExportAssignments/parserExportAssignment2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ExportAssignments/parserExportAssignment2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ExportAssignments/parserExportAssignment6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ExportAssignments/parserExportAssignment6/input.ts.json index 29ff433ac7ad..1d07ec5537f0 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ExportAssignments/parserExportAssignment6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ExportAssignments/parserExportAssignment6/input.ts.json @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ExportAssignments/parserExportAssignment7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ExportAssignments/parserExportAssignment7/input.ts.json index 4170d201be98..5b3a6e03c0a9 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ExportAssignments/parserExportAssignment7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ExportAssignments/parserExportAssignment7/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ExportAssignments/parserExportAssignment8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ExportAssignments/parserExportAssignment8/input.ts.json index 9042482a9f90..41ff9a2fd43f 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ExportAssignments/parserExportAssignment8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ExportAssignments/parserExportAssignment8/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Expressions/parserAssignmentExpression1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Expressions/parserAssignmentExpression1/input.ts.json index 03360cf98be8..a309bcea01e2 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Expressions/parserAssignmentExpression1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Expressions/parserAssignmentExpression1/input.ts.json @@ -43,7 +43,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Expressions/parserConditionalExpression1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Expressions/parserConditionalExpression1/input.ts.json index 6cc09f50f977..4eaf75492d50 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Expressions/parserConditionalExpression1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Expressions/parserConditionalExpression1/input.ts.json @@ -43,8 +43,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -76,7 +76,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "computed": false @@ -89,7 +88,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": true @@ -119,7 +117,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -130,7 +127,6 @@ "ctxt": 0 }, "value": "JW", - "typeAnnotation": null, "optional": false }, "computed": false @@ -172,7 +168,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -183,7 +178,6 @@ "ctxt": 0 }, "value": "e5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -210,7 +204,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -251,7 +243,6 @@ "ctxt": 0 }, "value": "JW", - "typeAnnotation": null, "optional": false }, "computed": false @@ -271,7 +262,6 @@ "ctxt": 0 }, "value": "_", - "typeAnnotation": null, "optional": false }, "property": { @@ -282,7 +272,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "computed": false @@ -315,7 +304,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Expressions/parserInvocationOfMemberAccessOffOfObjectCreationExpression1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Expressions/parserInvocationOfMemberAccessOffOfObjectCreationExpression1/input.ts.json index 40b0f65e8aa8..313a8a0853d9 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Expressions/parserInvocationOfMemberAccessOffOfObjectCreationExpression1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Expressions/parserInvocationOfMemberAccessOffOfObjectCreationExpression1/input.ts.json @@ -42,7 +42,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Expressions/parserObjectCreation2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Expressions/parserObjectCreation2/input.ts.json index d80648ff338e..3f952b6e1428 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Expressions/parserObjectCreation2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Expressions/parserObjectCreation2/input.ts.json @@ -35,7 +35,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Expressions/parserUnaryExpression2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Expressions/parserUnaryExpression2/input.ts.json index d284e593acf9..dc5594543e57 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Expressions/parserUnaryExpression2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Expressions/parserUnaryExpression2/input.ts.json @@ -42,8 +42,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Expressions/parserUnaryExpression7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Expressions/parserUnaryExpression7/input.ts.json index 5c818bf9b5a8..51ae3d967a73 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Expressions/parserUnaryExpression7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Expressions/parserUnaryExpression7/input.ts.json @@ -37,7 +37,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration1.d/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration1.d/input.ts.json index 7a2e21e72d21..b46378a79681 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration1.d/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration1.d/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": true, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration3/input.ts.json index 521a4d9cf66d..39eb29de55f5 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration4/input.ts.json index aeca6f1f8d29..95e2c1983624 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration5/input.ts.json index 6e742268872a..4431afd3a95b 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration6/input.ts.json index 0711d6817320..bc1d806967a5 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration6/input.ts.json @@ -24,7 +24,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration7/input.ts.json index 48b4603c834b..db473bdd54b9 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration7/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration8/input.ts.json index ba0fd895c026..456d8dcef176 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration8/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Fuzz/parser768531/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Fuzz/parser768531/input.ts.json index c45de5572d3f..50ecdca7b925 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Fuzz/parser768531/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Fuzz/parser768531/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguity1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguity1/input.ts.json index 14ba25c23613..36243ca42bb1 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguity1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguity1/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -89,7 +87,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguity2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguity2/input.ts.json index afbb1333f3aa..27818263578b 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguity2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguity2/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -61,7 +59,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } @@ -84,7 +81,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "right": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguity3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguity3/input.ts.json index 7d89dd993d9e..0347b0114884 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguity3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguity3/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -61,7 +59,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } @@ -84,7 +81,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "right": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguityWithBinaryOperator1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguityWithBinaryOperator1/input.ts.json index 68e49ac3caae..84b273aaf231 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguityWithBinaryOperator1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguityWithBinaryOperator1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -81,8 +80,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -102,8 +101,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -141,7 +140,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -152,7 +150,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -172,7 +169,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -198,7 +194,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguityWithBinaryOperator2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguityWithBinaryOperator2/input.ts.json index 6135ca8a0fd1..f1e58898c02e 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguityWithBinaryOperator2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguityWithBinaryOperator2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -81,8 +80,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -102,8 +101,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -141,7 +140,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -152,7 +150,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -172,7 +169,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -198,7 +194,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguityWithBinaryOperator3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguityWithBinaryOperator3/input.ts.json index d1b5726ab53e..079893fcaa80 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguityWithBinaryOperator3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguityWithBinaryOperator3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -81,8 +80,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -102,8 +101,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -141,7 +140,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -152,7 +150,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -172,7 +169,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -198,7 +194,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguityWithBinaryOperator4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguityWithBinaryOperator4/input.ts.json index 16a2aaa0b3bd..a06240829c8f 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguityWithBinaryOperator4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserAmbiguityWithBinaryOperator4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -81,8 +80,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -102,8 +101,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -132,7 +131,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -154,7 +152,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -192,7 +189,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -212,7 +208,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserCastVersusArrowFunction1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserCastVersusArrowFunction1/input.ts.json index c02a939a79ad..e155c64330d8 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserCastVersusArrowFunction1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserCastVersusArrowFunction1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -76,7 +76,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -115,8 +114,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -133,7 +132,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -151,7 +149,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -186,8 +183,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -205,8 +202,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -243,7 +240,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -282,8 +278,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -301,8 +297,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -312,8 +308,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -350,7 +346,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -389,8 +384,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -415,8 +410,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -444,8 +439,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -493,7 +488,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -532,8 +526,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -557,7 +551,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -576,7 +569,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -611,8 +603,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -644,7 +636,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, { @@ -655,7 +646,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } ] @@ -676,7 +666,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -711,8 +700,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -752,8 +741,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -781,8 +770,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -812,7 +801,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserConstructorAmbiguity1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserConstructorAmbiguity1/input.ts.json index 38f36dff46d8..13763cf29df0 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserConstructorAmbiguity1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserConstructorAmbiguity1/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserConstructorAmbiguity2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserConstructorAmbiguity2/input.ts.json index 316522c173fc..452129b7c58c 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserConstructorAmbiguity2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserConstructorAmbiguity2/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserConstructorAmbiguity4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserConstructorAmbiguity4/input.ts.json index 908bfc28cb6a..ac755c89f970 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserConstructorAmbiguity4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserConstructorAmbiguity4/input.ts.json @@ -43,7 +43,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -57,7 +56,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -80,7 +77,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericClass1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericClass1/input.ts.json index 946788c74e76..2c402e3cfa3e 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericClass1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericClass1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,7 +51,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericClass2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericClass2/input.ts.json index 35c693ba754b..33bdf259d5da 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericClass2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericClass2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,7 +51,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -73,7 +71,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint1/input.ts.json index db18daf42fb8..46e899d3a54c 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,7 +51,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint2/input.ts.json index d420fa10fccb..d1690f36d8cc 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,7 +51,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -96,7 +93,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint3/input.ts.json index 3f525c0529bc..80a8b6d177ca 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,7 +51,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -96,7 +93,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint4/input.ts.json index d8c2f036bfe7..780bf4a557da 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,7 +51,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -96,7 +93,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -122,7 +118,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint5/input.ts.json index e6ae5c1805d9..f2a9e89c24b0 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,7 +51,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -96,7 +93,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -122,7 +118,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint6/input.ts.json index 63c74a0c2a6c..a8b60fd96104 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,7 +51,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -96,7 +93,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -122,7 +118,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint7/input.ts.json index 5a252acb79e8..ff2605f84990 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericConstraint7/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,7 +51,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -96,7 +93,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -122,7 +118,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericsInInterfaceDeclaration1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericsInInterfaceDeclaration1/input.ts.json index 4e729f8c125b..4d22dc9837bc 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericsInInterfaceDeclaration1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericsInInterfaceDeclaration1/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -136,7 +132,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -163,7 +158,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -191,7 +185,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -220,7 +213,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -245,7 +237,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -273,7 +264,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -302,7 +292,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -359,7 +348,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -416,7 +404,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericsInTypeContexts1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericsInTypeContexts1/input.ts.json index 48c844e7c2b3..adbca6b491a5 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericsInTypeContexts1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericsInTypeContexts1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -35,7 +34,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -63,7 +61,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -86,7 +83,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -112,7 +108,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -147,6 +142,7 @@ "ctxt": 0 }, "value": "v1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -195,7 +190,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -203,8 +197,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -236,6 +229,7 @@ "ctxt": 0 }, "value": "v2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -258,7 +252,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -284,7 +277,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -292,8 +284,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -332,6 +323,7 @@ "ctxt": 0 }, "value": "v3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -356,7 +348,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -367,7 +358,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false } }, @@ -394,7 +384,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -402,8 +391,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -435,6 +423,7 @@ "ctxt": 0 }, "value": "v3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -461,7 +450,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "right": { @@ -472,7 +460,6 @@ "ctxt": 0 }, "value": "H", - "typeAnnotation": null, "optional": false } }, @@ -484,7 +471,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false } }, @@ -511,7 +497,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -519,8 +504,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -552,6 +536,7 @@ "ctxt": 0 }, "value": "v6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -581,7 +566,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -607,7 +591,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -616,8 +599,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -634,7 +616,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -655,6 +636,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -677,7 +659,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -703,7 +684,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -711,8 +691,7 @@ ] } } - }, - "optional": false + } } } ], @@ -746,7 +725,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -791,7 +769,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -817,7 +794,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericsInTypeContexts2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericsInTypeContexts2/input.ts.json index 539371870e5c..7aa55a016f87 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericsInTypeContexts2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericsInTypeContexts2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -35,7 +34,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -63,7 +61,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -89,7 +86,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -112,7 +108,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -138,7 +133,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -164,7 +158,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -193,7 +186,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -219,7 +211,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -245,7 +236,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -268,7 +258,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -294,7 +283,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -320,7 +308,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -361,6 +348,7 @@ "ctxt": 0 }, "value": "v1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -383,7 +371,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -409,7 +396,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -435,7 +421,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -458,7 +443,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -484,7 +468,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -510,7 +493,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -524,8 +506,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -557,6 +538,7 @@ "ctxt": 0 }, "value": "v2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -579,7 +561,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -605,7 +586,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -631,7 +611,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -654,7 +633,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -680,7 +658,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -706,7 +683,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -720,8 +696,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -760,6 +735,7 @@ "ctxt": 0 }, "value": "v3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -784,7 +760,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -795,7 +770,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false } }, @@ -822,7 +796,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -848,7 +821,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -871,7 +843,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -897,7 +868,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -923,7 +893,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -937,8 +906,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -970,6 +938,7 @@ "ctxt": 0 }, "value": "v4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -996,7 +965,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "right": { @@ -1007,7 +975,6 @@ "ctxt": 0 }, "value": "H", - "typeAnnotation": null, "optional": false } }, @@ -1019,7 +986,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false } }, @@ -1046,7 +1012,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1072,7 +1037,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1095,7 +1059,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1121,7 +1084,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1147,7 +1109,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1161,8 +1122,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1194,6 +1154,7 @@ "ctxt": 0 }, "value": "v6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1223,7 +1184,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1249,7 +1209,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1275,7 +1234,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1298,7 +1256,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1324,7 +1281,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1350,7 +1306,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1365,8 +1320,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1383,7 +1337,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1404,6 +1357,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1426,7 +1380,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1452,7 +1405,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1478,7 +1430,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1501,7 +1452,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1527,7 +1477,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1553,7 +1502,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1567,8 +1515,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1602,7 +1549,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1647,7 +1593,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1673,7 +1618,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1699,7 +1643,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1722,7 +1665,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1748,7 +1690,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1774,7 +1715,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericsInVariableDeclaration1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericsInVariableDeclaration1/input.ts.json index 6a18de5a7574..e77faaf322d2 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericsInVariableDeclaration1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserGenericsInVariableDeclaration1/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,7 +54,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -79,7 +79,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -87,8 +86,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -128,6 +126,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -150,7 +149,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -176,7 +174,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -184,8 +181,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -225,6 +221,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -247,7 +244,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -273,7 +269,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -299,7 +294,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -310,8 +304,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -351,6 +344,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -373,7 +367,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -399,7 +392,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -425,7 +417,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -436,8 +427,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -477,6 +467,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -499,7 +490,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -525,7 +515,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -551,7 +540,6 @@ "ctxt": 0 }, "value": "Quux", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -577,7 +565,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -591,8 +578,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -632,6 +618,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -654,7 +641,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -680,7 +666,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -706,7 +691,6 @@ "ctxt": 0 }, "value": "Quux", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -732,7 +716,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -746,8 +729,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserObjectCreation1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserObjectCreation1/input.ts.json index b6ca5b29f5e7..03781ce53597 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserObjectCreation1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Generics/parserObjectCreation1/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "autoToken", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -55,8 +56,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -73,7 +73,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration1/input.ts.json index ccb4441e9a9d..5a14ecd5a24f 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -38,6 +37,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,8 +54,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration2/input.ts.json index 4a8aec86f2fb..7e9cc505052a 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -38,6 +37,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,8 +54,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -97,7 +96,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "value": null, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration3/input.ts.json index 080d020a6f9a..306c6c49b510 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -38,6 +37,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,8 +54,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -97,7 +96,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "value": null, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration4/input.ts.json index 72c64c505114..5d6d7daa7baf 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -38,6 +37,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,8 +54,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -97,7 +96,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "value": null, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration5/input.ts.json index b502f1615324..f81ca206aa41 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration5/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": true, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration7/input.ts.json index f11dfa9658f2..5adcf298b935 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration7/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration8/input.ts.json index d040267998ff..e43d46d2f09d 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration8/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "string", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessor1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessor1/input.ts.json index 5bc18c1faffc..f9e603ce87c2 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessor1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessor1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -109,8 +106,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration1/input.ts.json index 6fed51d94a3b..e1c4879137c3 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration15/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration15/input.ts.json index 7a67e839fdfa..221825919a2d 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration15/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration15/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -79,8 +78,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration2/input.ts.json index ad014bf1e702..c928a90e986d 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration3/input.ts.json index c3e560baae96..1a5e50adba06 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration4/input.ts.json index f95aa66416cd..1ae67ad076d3 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,8 +61,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration5/input.ts.json index 2a4dbcf622de..ab97ccd4099a 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -66,8 +65,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration6/input.ts.json index 4b81c3a0532a..382264bb792c 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -61,8 +60,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclarationAmbiguities1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclarationAmbiguities1/input.ts.json index 3fecbc23e6b6..073958923b1a 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclarationAmbiguities1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclarationAmbiguities1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "public", - "typeAnnotation": null, "optional": false }, "function": { @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "static", - "typeAnnotation": null, "optional": false }, "function": { @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "public", - "typeAnnotation": null, "optional": false }, "function": { @@ -180,7 +176,6 @@ "ctxt": 0 }, "value": "static", - "typeAnnotation": null, "optional": false }, "function": { @@ -226,7 +221,6 @@ "ctxt": 0 }, "value": "public", - "typeAnnotation": null, "optional": false }, "function": { @@ -272,7 +266,6 @@ "ctxt": 0 }, "value": "static", - "typeAnnotation": null, "optional": false }, "function": { @@ -318,7 +311,6 @@ "ctxt": 0 }, "value": "public", - "typeAnnotation": null, "optional": false }, "function": { @@ -364,7 +356,6 @@ "ctxt": 0 }, "value": "static", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration5/input.ts.json index 725ac0cad936..b0cc352e3a19 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "value": null, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature1/input.ts.json index 1f21e6a20a20..f9ffe4df2cb9 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature1/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature10/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature10/input.ts.json index e5d60fa5e768..1d86443daf16 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature10/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature10/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature11/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature11/input.ts.json index acaf36c02711..8bb6ddbd5df6 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature11/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature11/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -79,7 +78,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature12/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature12/input.ts.json index 126a12d6415d..78304e4bde46 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature12/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature12/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -79,7 +78,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature2/input.ts.json index 0bae5d5ccb2b..942aab8274b8 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature3/input.ts.json index 5f29fa1f0137..22b804e81e46 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature3/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature4/input.ts.json index 2bcad8131f52..b4491f7eb8c0 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature4/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature5/input.ts.json index 2e3d183daf3a..ab137469fb28 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature5/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature6/input.ts.json index db1414ef76e0..25c5aabf2657 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature6/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature7/input.ts.json index 5c55cbcfa403..f065dff970fa 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature7/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -84,7 +83,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature8/input.ts.json index 931359cd568f..8a52a936dcb5 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature8/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -84,7 +83,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature9/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature9/input.ts.json index a695a5c6e1d4..128a5c99bf59 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature9/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/MethodSignatures/parserMethodSignature9/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModule1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModule1/input.ts.json index 51bb6afb929c..9370e8e4a904 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModule1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModule1/input.ts.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "CompilerDiagnostics", - "typeAnnotation": null, "optional": false }, "body": { @@ -73,8 +72,8 @@ "ctxt": 0 }, "value": "debug", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -112,7 +111,6 @@ "ctxt": 0 }, "value": "IDiagnosticWriter", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -142,7 +140,6 @@ "ctxt": 0 }, "value": "Alert", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -156,6 +153,7 @@ "ctxt": 0 }, "value": "output", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -172,8 +170,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -231,6 +228,7 @@ "ctxt": 0 }, "value": "diagnosticWriter", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -253,13 +251,11 @@ "ctxt": 0 }, "value": "IDiagnosticWriter", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -306,6 +302,7 @@ "ctxt": 0 }, "value": "analysisPass", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -322,8 +319,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -356,7 +352,6 @@ "ctxt": 0 }, "value": "Alert", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -377,6 +372,7 @@ "ctxt": 0 }, "value": "output", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -393,8 +389,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -427,7 +422,6 @@ "ctxt": 0 }, "value": "diagnosticWriter", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -467,7 +461,6 @@ "ctxt": 0 }, "value": "diagnosticWriter", - "typeAnnotation": null, "optional": false }, "property": { @@ -478,7 +471,6 @@ "ctxt": 0 }, "value": "Alert", - "typeAnnotation": null, "optional": false }, "computed": false @@ -494,7 +486,6 @@ "ctxt": 0 }, "value": "output", - "typeAnnotation": null, "optional": false } } @@ -531,7 +522,6 @@ "ctxt": 0 }, "value": "debugPrint", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -552,6 +542,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -568,8 +559,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -602,7 +592,6 @@ "ctxt": 0 }, "value": "debug", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -635,7 +624,6 @@ "ctxt": 0 }, "value": "Alert", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -649,7 +637,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -686,7 +673,6 @@ "ctxt": 0 }, "value": "assert", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -707,6 +693,7 @@ "ctxt": 0 }, "value": "condition", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -723,8 +710,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -743,6 +729,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -759,8 +746,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -793,7 +779,6 @@ "ctxt": 0 }, "value": "debug", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -827,7 +812,6 @@ "ctxt": 0 }, "value": "condition", - "typeAnnotation": null, "optional": false } }, @@ -861,7 +845,6 @@ "ctxt": 0 }, "value": "Alert", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -875,7 +858,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration10/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration10/input.ts.json index 9fc9f42445ea..dd8f3101be6c 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration10/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration10/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration11/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration11/input.ts.json index 431f2993fb9d..61d6f6d8b7d4 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration11/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration11/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "string", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -82,7 +80,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -103,6 +100,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -119,8 +117,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -169,7 +166,6 @@ "ctxt": 0 }, "value": "string", - "typeAnnotation": null, "optional": false }, "property": { @@ -180,7 +176,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -232,6 +227,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -256,7 +252,6 @@ "ctxt": 0 }, "value": "string", - "typeAnnotation": null, "optional": false }, "right": { @@ -267,14 +262,12 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration12/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration12/input.ts.json index 37b89ba70a85..5c0f0a8aae27 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration12/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration12/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "body": { @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "string", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration3.d/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration3.d/input.ts.json index eeb81d60012f..15a31552f9c7 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration3.d/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration3.d/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration4/input.ts.json index c7f0bf66e8f9..491a4098a062 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration4/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false }, "body": { @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration6/input.ts.json index 8946213542bb..9baf44477c63 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration6/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration7/input.ts.json index 0aed70f6c4c7..71a0e32db2c2 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration7/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, "optional": false }, "body": { @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration8/input.ts.json index 81dfe02f8633..25bf4dc2c6e7 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration8/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "body": { @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration9/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration9/input.ts.json index 53a9a7cf0c60..8c0a95924a6e 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration9/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration9/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "body": { @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, "optional": false }, "body": { @@ -63,7 +61,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ObjectLiterals/parserObjectLiterals1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ObjectLiterals/parserObjectLiterals1/input.ts.json index 099264ecb7b4..8999f9a1a132 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ObjectLiterals/parserObjectLiterals1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ObjectLiterals/parserObjectLiterals1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -75,7 +74,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ObjectTypes/parserObjectType1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ObjectTypes/parserObjectType1/input.ts.json index 24260cbefcae..2798b3ecb24b 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ObjectTypes/parserObjectType1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ObjectTypes/parserObjectType1/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ObjectTypes/parserObjectType2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ObjectTypes/parserObjectType2/input.ts.json index b6a5455820a7..b3fe0f16bc92 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ObjectTypes/parserObjectType2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ObjectTypes/parserObjectType2/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,8 +90,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ObjectTypes/parserObjectType3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ObjectTypes/parserObjectType3/input.ts.json index bfb97e638ae0..e9451b643398 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ObjectTypes/parserObjectType3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ObjectTypes/parserObjectType3/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -88,7 +88,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -100,8 +99,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ObjectTypes/parserObjectType4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ObjectTypes/parserObjectType4/input.ts.json index e6b6c222de05..b41c8546f58b 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ObjectTypes/parserObjectType4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ObjectTypes/parserObjectType4/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -88,7 +88,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -100,8 +99,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList12/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList12/input.ts.json index 5b2d4dd66660..9b4f08d00333 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList12/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList12/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList13/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList13/input.ts.json index 56877862a70a..e97883cff658 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList13/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList13/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,8 +50,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": null, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList14/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList14/input.ts.json index 68d1681b1674..fae3082078e9 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList14/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList14/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -70,8 +68,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList15/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList15/input.ts.json index 014a4cfe4ec1..fd24795f8e3c 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList15/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList15/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -44,8 +43,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -82,7 +81,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -103,8 +101,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -123,8 +121,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList16/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList16/input.ts.json index e5eb303cc6f6..47f94fc6a3ac 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList16/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList16/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -70,8 +68,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -119,7 +117,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -140,8 +137,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -160,8 +157,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList17/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList17/input.ts.json index 1eedcf58423e..a57a46ecb294 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList17/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList17/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -69,8 +67,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -124,8 +121,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -144,8 +141,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList4/input.ts.json index 7ea7f18df597..b5a5212797d8 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList5/input.ts.json index 61c7840ab2ac..9ac26ce8796b 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -62,8 +61,8 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeParams": null, @@ -89,7 +88,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList6/input.ts.json index 50fefa538680..07c1c183052b 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "C", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -85,8 +84,8 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeParams": null, @@ -108,8 +107,7 @@ } } } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList7/input.ts.json index b49b07a12329..71d47e73624f 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList7/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -64,6 +62,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,8 +79,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -126,6 +123,7 @@ "ctxt": 0 }, "value": "p2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -142,8 +140,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -166,7 +163,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -188,6 +184,7 @@ "ctxt": 0 }, "value": "p3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -204,8 +201,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList8/input.ts.json index a3f81d7e5602..9d11429d1d02 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/ParameterLists/parserParameterList8/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -64,6 +62,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,8 +79,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -126,6 +123,7 @@ "ctxt": 0 }, "value": "p2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -142,8 +140,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -166,7 +163,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -188,6 +184,7 @@ "ctxt": 0 }, "value": "p3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -204,8 +201,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertyAssignments/parserFunctionPropertyAssignment1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertyAssignments/parserFunctionPropertyAssignment1/input.ts.json index 58b2dc3c35f3..cf25d1b9a53e 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertyAssignments/parserFunctionPropertyAssignment1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertyAssignments/parserFunctionPropertyAssignment1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertyAssignments/parserFunctionPropertyAssignment2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertyAssignments/parserFunctionPropertyAssignment2/input.ts.json index f9333e6da20e..56de5064038c 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertyAssignments/parserFunctionPropertyAssignment2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertyAssignments/parserFunctionPropertyAssignment2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertyAssignments/parserFunctionPropertyAssignment3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertyAssignments/parserFunctionPropertyAssignment3/input.ts.json index fd13a7f0cc96..09655fc8a564 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertyAssignments/parserFunctionPropertyAssignment3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertyAssignments/parserFunctionPropertyAssignment3/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertyAssignments/parserFunctionPropertyAssignment4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertyAssignments/parserFunctionPropertyAssignment4/input.ts.json index ab19e4934c4c..000d71ac5428 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertyAssignments/parserFunctionPropertyAssignment4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertyAssignments/parserFunctionPropertyAssignment4/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -94,7 +94,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature1/input.ts.json index f6b414cf37f0..c63deaa51df0 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature1/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature10/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature10/input.ts.json index 8435bf70978d..247f3fe3d195 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature10/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature10/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature11/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature11/input.ts.json index ed6a21b478e7..986ecfb8ef7b 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature11/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature11/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature12/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature12/input.ts.json index 2d4466313c68..563ba20f5d08 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature12/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature12/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature2/input.ts.json index 0b0e16d39760..0d3f9b8ad3a5 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature3/input.ts.json index e3d70afdf390..c905ab64ca40 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature3/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature4/input.ts.json index 7e8dfa01db8d..9ce7b9c63f6e 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature4/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature5/input.ts.json index 017cab4b7000..3344489bb0a8 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature5/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature6/input.ts.json index 3db94c766308..670e56f197cf 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature6/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature7/input.ts.json index e93d224c12b1..0b7edaa28e7c 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature7/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature8/input.ts.json index 62d67bb8d515..0d8b3f096294 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature8/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature9/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature9/input.ts.json index 9c33b0d64300..98ca08a15c85 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature9/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/PropertySignatures/parserPropertySignature9/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Protected/Protected3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Protected/Protected3/input.ts.json index 3e03f02e5b46..5a208800c96b 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Protected/Protected3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Protected/Protected3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Protected/Protected5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Protected/Protected5/input.ts.json index ded4a448e71f..f5c4cd99590a 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Protected/Protected5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Protected/Protected5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Protected/Protected8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Protected/Protected8/input.ts.json index ccb27f6b7d40..3fcdf9586571 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Protected/Protected8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Protected/Protected8/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "protected", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Protected/Protected9/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Protected/Protected9/input.ts.json index e7cf6ef5f418..79a02c01b1f0 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Protected/Protected9/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Protected/Protected9/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -64,8 +62,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RealWorld/parserindenter/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RealWorld/parserindenter/input.ts.json index 7be3583d8bdf..f2a0234c2a58 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RealWorld/parserindenter/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RealWorld/parserindenter/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Formatting", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "Indenter", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "indentationBag", - "typeAnnotation": null, "optional": false }, "value": null, @@ -103,7 +100,6 @@ "ctxt": 0 }, "value": "IndentationBag", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -134,7 +130,6 @@ "ctxt": 0 }, "value": "scriptBlockBeginLineNumber", - "typeAnnotation": null, "optional": false }, "value": null, @@ -180,7 +175,6 @@ "ctxt": 0 }, "value": "offsetIndentationDeltas", - "typeAnnotation": null, "optional": false }, "value": null, @@ -206,7 +200,6 @@ "ctxt": 0 }, "value": "Dictionary_int_int", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -237,7 +230,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -259,6 +251,7 @@ "ctxt": 0 }, "value": "logger", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -283,7 +276,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -294,14 +286,12 @@ "ctxt": 0 }, "value": "ILogger", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } }, { @@ -322,6 +312,7 @@ "ctxt": 0 }, "value": "tree", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -344,13 +335,11 @@ "ctxt": 0 }, "value": "ParseTree", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -371,6 +360,7 @@ "ctxt": 0 }, "value": "snapshot", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -393,13 +383,11 @@ "ctxt": 0 }, "value": "ITextSnapshot", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -420,6 +408,7 @@ "ctxt": 0 }, "value": "languageHostIndentation", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -436,8 +425,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -458,6 +446,7 @@ "ctxt": 0 }, "value": "editorOptions", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -482,7 +471,6 @@ "ctxt": 0 }, "value": "Services", - "typeAnnotation": null, "optional": false }, "right": { @@ -493,14 +481,12 @@ "ctxt": 0 }, "value": "EditorOptions", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } }, { @@ -521,6 +507,7 @@ "ctxt": 0 }, "value": "firstToken", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -543,13 +530,11 @@ "ctxt": 0 }, "value": "TokenSpan", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -570,6 +555,7 @@ "ctxt": 0 }, "value": "smartIndent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -586,8 +572,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -637,7 +622,6 @@ "ctxt": 0 }, "value": "indentationBag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -657,7 +641,6 @@ "ctxt": 0 }, "value": "IndentationBag", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -686,7 +669,6 @@ "ctxt": 0 }, "value": "snapshot", - "typeAnnotation": null, "optional": false }, "computed": false @@ -735,7 +717,6 @@ "ctxt": 0 }, "value": "scriptBlockBeginLineNumber", - "typeAnnotation": null, "optional": false }, "computed": false @@ -798,7 +779,6 @@ "ctxt": 0 }, "value": "offsetIndentationDeltas", - "typeAnnotation": null, "optional": false }, "computed": false @@ -818,7 +798,6 @@ "ctxt": 0 }, "value": "Dictionary_int_int", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -877,7 +856,6 @@ "ctxt": 0 }, "value": "tree", - "typeAnnotation": null, "optional": false }, "computed": false @@ -890,7 +868,6 @@ "ctxt": 0 }, "value": "Root", - "typeAnnotation": null, "optional": false }, "computed": false @@ -903,7 +880,6 @@ "ctxt": 0 }, "value": "SetIndentationOverride", - "typeAnnotation": null, "optional": false }, "computed": false @@ -967,7 +943,6 @@ "ctxt": 0 }, "value": "ApplyScriptBlockIndentation", - "typeAnnotation": null, "optional": false }, "computed": false @@ -998,7 +973,6 @@ "ctxt": 0 }, "value": "languageHostIndentation", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1029,7 +1003,6 @@ "ctxt": 0 }, "value": "tree", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1076,7 +1049,6 @@ "ctxt": 0 }, "value": "FillInheritedIndentation", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1107,7 +1079,6 @@ "ctxt": 0 }, "value": "tree", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1137,7 +1108,6 @@ "ctxt": 0 }, "value": "GetIndentationEdits", - "typeAnnotation": null, "optional": false }, "function": { @@ -1158,6 +1128,7 @@ "ctxt": 0 }, "value": "token", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1180,13 +1151,11 @@ "ctxt": 0 }, "value": "TokenSpan", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1205,6 +1174,7 @@ "ctxt": 0 }, "value": "nextToken", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1227,13 +1197,11 @@ "ctxt": 0 }, "value": "TokenSpan", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1252,6 +1220,7 @@ "ctxt": 0 }, "value": "node", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1274,13 +1243,11 @@ "ctxt": 0 }, "value": "ParseNode", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1299,6 +1266,7 @@ "ctxt": 0 }, "value": "sameLineIndent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1315,8 +1283,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -1378,7 +1345,6 @@ "ctxt": 0 }, "value": "logger", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1391,7 +1357,6 @@ "ctxt": 0 }, "value": "information", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1451,7 +1416,6 @@ "ctxt": 0 }, "value": "logger", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1464,7 +1428,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1602,7 +1565,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false }, "property": { @@ -1613,7 +1575,6 @@ "ctxt": 0 }, "value": "Span", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1626,7 +1587,6 @@ "ctxt": 0 }, "value": "startPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1679,7 +1639,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false }, "property": { @@ -1690,7 +1649,6 @@ "ctxt": 0 }, "value": "Span", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1703,7 +1661,6 @@ "ctxt": 0 }, "value": "endPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1772,7 +1729,6 @@ "ctxt": 0 }, "value": "nextToken", - "typeAnnotation": null, "optional": false }, "right": { @@ -1850,7 +1806,6 @@ "ctxt": 0 }, "value": "nextToken", - "typeAnnotation": null, "optional": false }, "property": { @@ -1861,7 +1816,6 @@ "ctxt": 0 }, "value": "Span", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1874,7 +1828,6 @@ "ctxt": 0 }, "value": "startPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1926,7 +1879,6 @@ "ctxt": 0 }, "value": "nextToken", - "typeAnnotation": null, "optional": false }, "property": { @@ -1937,7 +1889,6 @@ "ctxt": 0 }, "value": "Span", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1950,7 +1901,6 @@ "ctxt": 0 }, "value": "endPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2027,8 +1977,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2060,7 +2010,6 @@ "ctxt": 0 }, "value": "GetIndentationEditsWorker", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2076,7 +2025,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false } }, @@ -2090,7 +2038,6 @@ "ctxt": 0 }, "value": "nextToken", - "typeAnnotation": null, "optional": false } }, @@ -2104,7 +2051,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false } }, @@ -2118,7 +2064,6 @@ "ctxt": 0 }, "value": "sameLineIndent", - "typeAnnotation": null, "optional": false } } @@ -2173,7 +2118,6 @@ "ctxt": 0 }, "value": "logger", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2186,7 +2130,6 @@ "ctxt": 0 }, "value": "information", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2234,8 +2177,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2266,7 +2209,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "right": { @@ -2291,7 +2233,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "property": { @@ -2302,7 +2243,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2328,7 +2268,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -2365,8 +2304,8 @@ "ctxt": 0 }, "value": "edit", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2390,7 +2329,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "property": { @@ -2401,7 +2339,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2417,7 +2354,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -2472,7 +2408,6 @@ "ctxt": 0 }, "value": "logger", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2485,7 +2420,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2570,7 +2504,6 @@ "ctxt": 0 }, "value": "edit", - "typeAnnotation": null, "optional": false }, "property": { @@ -2581,7 +2514,6 @@ "ctxt": 0 }, "value": "position", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2632,7 +2564,6 @@ "ctxt": 0 }, "value": "edit", - "typeAnnotation": null, "optional": false }, "property": { @@ -2643,7 +2574,6 @@ "ctxt": 0 }, "value": "position", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2663,7 +2593,6 @@ "ctxt": 0 }, "value": "edit", - "typeAnnotation": null, "optional": false }, "property": { @@ -2674,7 +2603,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2719,7 +2647,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -2730,7 +2657,6 @@ "ctxt": 0 }, "value": "stringToLiteral", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2753,7 +2679,6 @@ "ctxt": 0 }, "value": "edit", - "typeAnnotation": null, "optional": false }, "property": { @@ -2764,7 +2689,6 @@ "ctxt": 0 }, "value": "replaceWith", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2828,7 +2752,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false } } @@ -2859,7 +2782,6 @@ "ctxt": 0 }, "value": "List_TextEditInfo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2887,7 +2809,6 @@ "ctxt": 0 }, "value": "GetIndentationEditsWorker", - "typeAnnotation": null, "optional": false }, "function": { @@ -2908,6 +2829,7 @@ "ctxt": 0 }, "value": "token", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2930,13 +2852,11 @@ "ctxt": 0 }, "value": "TokenSpan", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2955,6 +2875,7 @@ "ctxt": 0 }, "value": "nextToken", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2977,13 +2898,11 @@ "ctxt": 0 }, "value": "TokenSpan", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3002,6 +2921,7 @@ "ctxt": 0 }, "value": "node", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3024,13 +2944,11 @@ "ctxt": 0 }, "value": "ParseNode", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3049,6 +2967,7 @@ "ctxt": 0 }, "value": "sameLineIndent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3065,8 +2984,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -3109,8 +3027,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -3127,7 +3045,6 @@ "ctxt": 0 }, "value": "List_TextEditInfo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3162,6 +3079,7 @@ "ctxt": 0 }, "value": "indentationInfo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3184,13 +3102,11 @@ "ctxt": 0 }, "value": "IndentationInfo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -3241,7 +3157,6 @@ "ctxt": 0 }, "value": "AdjustStartOffsetIfNeeded", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3257,7 +3172,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false } }, @@ -3271,7 +3185,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false } } @@ -3317,7 +3230,6 @@ "ctxt": 0 }, "value": "scriptBlockBeginLineNumber", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3344,7 +3256,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false }, "property": { @@ -3355,7 +3266,6 @@ "ctxt": 0 }, "value": "lineNumber", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3387,7 +3297,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false } } @@ -3426,7 +3335,6 @@ "ctxt": 0 }, "value": "sameLineIndent", - "typeAnnotation": null, "optional": false } }, @@ -3460,7 +3368,6 @@ "ctxt": 0 }, "value": "IsMultiLineString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3476,7 +3383,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false } } @@ -3507,7 +3413,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false } } @@ -3538,8 +3443,8 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -3571,7 +3476,6 @@ "ctxt": 0 }, "value": "GetSpecialCaseIndentation", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3587,7 +3491,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false } }, @@ -3601,7 +3504,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false } } @@ -3633,7 +3535,6 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, "optional": false }, "right": { @@ -3706,7 +3607,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -3717,7 +3617,6 @@ "ctxt": 0 }, "value": "CanIndent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3749,7 +3648,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -3760,7 +3658,6 @@ "ctxt": 0 }, "value": "Parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3819,7 +3716,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false }, "property": { @@ -3830,7 +3726,6 @@ "ctxt": 0 }, "value": "Span", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3843,7 +3738,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3856,7 +3750,6 @@ "ctxt": 0 }, "value": "start", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3900,7 +3793,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -3911,7 +3803,6 @@ "ctxt": 0 }, "value": "Parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3924,7 +3815,6 @@ "ctxt": 0 }, "value": "AuthorNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3937,7 +3827,6 @@ "ctxt": 0 }, "value": "Details", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3950,7 +3839,6 @@ "ctxt": 0 }, "value": "StartOffset", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3980,8 +3868,8 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -3998,7 +3886,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -4009,7 +3896,6 @@ "ctxt": 0 }, "value": "Parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4054,7 +3940,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -4065,7 +3950,6 @@ "ctxt": 0 }, "value": "CanIndent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4117,7 +4001,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false }, "property": { @@ -4128,7 +4011,6 @@ "ctxt": 0 }, "value": "Span", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4141,7 +4023,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4154,7 +4035,6 @@ "ctxt": 0 }, "value": "start", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4191,7 +4071,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -4202,7 +4081,6 @@ "ctxt": 0 }, "value": "AuthorNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4215,7 +4093,6 @@ "ctxt": 0 }, "value": "Details", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4228,7 +4105,6 @@ "ctxt": 0 }, "value": "StartOffset", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4266,8 +4142,8 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -4291,7 +4167,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -4302,7 +4177,6 @@ "ctxt": 0 }, "value": "GetEffectiveIndentation", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4380,7 +4254,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false }, "property": { @@ -4391,7 +4264,6 @@ "ctxt": 0 }, "value": "Token", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4411,7 +4283,6 @@ "ctxt": 0 }, "value": "AuthorTokenKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -4422,7 +4293,6 @@ "ctxt": 0 }, "value": "atkIdentifier", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4444,7 +4314,6 @@ "ctxt": 0 }, "value": "nextToken", - "typeAnnotation": null, "optional": false }, "right": { @@ -4480,7 +4349,6 @@ "ctxt": 0 }, "value": "nextToken", - "typeAnnotation": null, "optional": false }, "property": { @@ -4491,7 +4359,6 @@ "ctxt": 0 }, "value": "Token", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4511,7 +4378,6 @@ "ctxt": 0 }, "value": "AuthorTokenKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -4522,7 +4388,6 @@ "ctxt": 0 }, "value": "atkColon", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4560,8 +4425,8 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -4585,7 +4450,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -4596,7 +4460,6 @@ "ctxt": 0 }, "value": "GetEffectiveChildrenIndentation", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4651,8 +4514,8 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -4684,7 +4547,6 @@ "ctxt": 0 }, "value": "ApplyIndentationDeltaFromParent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4700,7 +4562,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false } }, @@ -4714,7 +4575,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false } } @@ -4756,7 +4616,6 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, "optional": false }, "right": { @@ -4801,8 +4660,8 @@ "ctxt": 0 }, "value": "edit", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4834,7 +4693,6 @@ "ctxt": 0 }, "value": "GetIndentEdit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4850,7 +4708,6 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, "optional": false } }, @@ -4885,7 +4742,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false }, "property": { @@ -4896,7 +4752,6 @@ "ctxt": 0 }, "value": "Span", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4909,7 +4764,6 @@ "ctxt": 0 }, "value": "startPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4928,7 +4782,6 @@ "ctxt": 0 }, "value": "sameLineIndent", - "typeAnnotation": null, "optional": false } } @@ -4962,7 +4815,6 @@ "ctxt": 0 }, "value": "edit", - "typeAnnotation": null, "optional": false }, "right": { @@ -5019,7 +4871,6 @@ "ctxt": 0 }, "value": "RegisterIndentation", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5035,7 +4886,6 @@ "ctxt": 0 }, "value": "edit", - "typeAnnotation": null, "optional": false } }, @@ -5049,7 +4899,6 @@ "ctxt": 0 }, "value": "sameLineIndent", - "typeAnnotation": null, "optional": false } } @@ -5086,7 +4935,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "property": { @@ -5097,7 +4945,6 @@ "ctxt": 0 }, "value": "add", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5113,7 +4960,6 @@ "ctxt": 0 }, "value": "edit", - "typeAnnotation": null, "optional": false } } @@ -5151,7 +4997,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false }, "property": { @@ -5162,7 +5007,6 @@ "ctxt": 0 }, "value": "Token", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5182,7 +5026,6 @@ "ctxt": 0 }, "value": "AuthorTokenKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -5193,7 +5036,6 @@ "ctxt": 0 }, "value": "atkComment", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5232,8 +5074,8 @@ "ctxt": 0 }, "value": "commentEdits", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5265,7 +5107,6 @@ "ctxt": 0 }, "value": "GetCommentIndentationEdits", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5281,7 +5122,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false } } @@ -5321,7 +5161,6 @@ "ctxt": 0 }, "value": "commentEdits", - "typeAnnotation": null, "optional": false }, "property": { @@ -5332,7 +5171,6 @@ "ctxt": 0 }, "value": "foreach", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5356,8 +5194,8 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5397,7 +5235,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "property": { @@ -5408,7 +5245,6 @@ "ctxt": 0 }, "value": "add", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5424,7 +5260,6 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, "optional": false } } @@ -5471,7 +5306,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false } } @@ -5502,7 +5336,6 @@ "ctxt": 0 }, "value": "List_TextEditInfo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5530,7 +5363,6 @@ "ctxt": 0 }, "value": "GetCommentIndentationEdits", - "typeAnnotation": null, "optional": false }, "function": { @@ -5551,6 +5383,7 @@ "ctxt": 0 }, "value": "token", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5573,13 +5406,11 @@ "ctxt": 0 }, "value": "TokenSpan", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5622,8 +5453,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -5640,7 +5471,6 @@ "ctxt": 0 }, "value": "List_TextEditInfo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -5680,7 +5510,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false }, "property": { @@ -5691,7 +5520,6 @@ "ctxt": 0 }, "value": "Token", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5711,7 +5539,6 @@ "ctxt": 0 }, "value": "AuthorTokenKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -5722,7 +5549,6 @@ "ctxt": 0 }, "value": "atkComment", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5743,7 +5569,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false } }, @@ -5774,8 +5599,8 @@ "ctxt": 0 }, "value": "commentLastLineNumber", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5814,7 +5639,6 @@ "ctxt": 0 }, "value": "snapshot", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5827,7 +5651,6 @@ "ctxt": 0 }, "value": "GetLineNumberFromPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5864,7 +5687,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false }, "property": { @@ -5875,7 +5697,6 @@ "ctxt": 0 }, "value": "Span", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5888,7 +5709,6 @@ "ctxt": 0 }, "value": "endPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5941,7 +5761,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false }, "property": { @@ -5952,7 +5771,6 @@ "ctxt": 0 }, "value": "lineNumber", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5968,7 +5786,6 @@ "ctxt": 0 }, "value": "commentLastLineNumber", - "typeAnnotation": null, "optional": false } }, @@ -5987,7 +5804,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false } }, @@ -6018,8 +5834,8 @@ "ctxt": 0 }, "value": "commentFirstLineIndentationDelta", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6051,7 +5867,6 @@ "ctxt": 0 }, "value": "GetIndentationDelta", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6088,7 +5903,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false }, "property": { @@ -6099,7 +5913,6 @@ "ctxt": 0 }, "value": "Span", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6112,7 +5925,6 @@ "ctxt": 0 }, "value": "startPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6162,7 +5974,6 @@ "ctxt": 0 }, "value": "commentFirstLineIndentationDelta", - "typeAnnotation": null, "optional": false }, "right": { @@ -6173,7 +5984,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -6217,8 +6027,8 @@ "ctxt": 0 }, "value": "line", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6250,7 +6060,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false }, "property": { @@ -6261,7 +6070,6 @@ "ctxt": 0 }, "value": "lineNumber", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6299,7 +6107,6 @@ "ctxt": 0 }, "value": "line", - "typeAnnotation": null, "optional": false }, "right": { @@ -6310,7 +6117,6 @@ "ctxt": 0 }, "value": "commentLastLineNumber", - "typeAnnotation": null, "optional": false } }, @@ -6331,7 +6137,6 @@ "ctxt": 0 }, "value": "line", - "typeAnnotation": null, "optional": false } }, @@ -6368,8 +6173,8 @@ "ctxt": 0 }, "value": "lineStartPosition", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6422,7 +6227,6 @@ "ctxt": 0 }, "value": "snapshot", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6435,7 +6239,6 @@ "ctxt": 0 }, "value": "GetLineFromLineNumber", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6451,7 +6254,6 @@ "ctxt": 0 }, "value": "line", - "typeAnnotation": null, "optional": false } } @@ -6466,7 +6268,6 @@ "ctxt": 0 }, "value": "startPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6503,8 +6304,8 @@ "ctxt": 0 }, "value": "lineIndent", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6536,7 +6337,6 @@ "ctxt": 0 }, "value": "GetLineIndentationForOffset", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6552,7 +6352,6 @@ "ctxt": 0 }, "value": "lineStartPosition", - "typeAnnotation": null, "optional": false } } @@ -6588,8 +6387,8 @@ "ctxt": 0 }, "value": "commentIndentationInfo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6621,7 +6420,6 @@ "ctxt": 0 }, "value": "ApplyIndentationDelta2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6637,7 +6435,6 @@ "ctxt": 0 }, "value": "lineIndent", - "typeAnnotation": null, "optional": false } }, @@ -6651,7 +6448,6 @@ "ctxt": 0 }, "value": "commentFirstLineIndentationDelta", - "typeAnnotation": null, "optional": false } } @@ -6685,7 +6481,6 @@ "ctxt": 0 }, "value": "commentIndentationInfo", - "typeAnnotation": null, "optional": false }, "right": { @@ -6730,8 +6525,8 @@ "ctxt": 0 }, "value": "tokenStartPosition", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6749,7 +6544,6 @@ "ctxt": 0 }, "value": "lineStartPosition", - "typeAnnotation": null, "optional": false }, "right": { @@ -6767,7 +6561,6 @@ "ctxt": 0 }, "value": "lineIndent", - "typeAnnotation": null, "optional": false }, "property": { @@ -6778,7 +6571,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6813,8 +6605,8 @@ "ctxt": 0 }, "value": "commentIndentationEdit", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6846,7 +6638,6 @@ "ctxt": 0 }, "value": "GetIndentEdit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6862,7 +6653,6 @@ "ctxt": 0 }, "value": "commentIndentationInfo", - "typeAnnotation": null, "optional": false } }, @@ -6876,7 +6666,6 @@ "ctxt": 0 }, "value": "tokenStartPosition", - "typeAnnotation": null, "optional": false } }, @@ -6922,7 +6711,6 @@ "ctxt": 0 }, "value": "commentIndentationEdit", - "typeAnnotation": null, "optional": false }, "right": { @@ -6971,7 +6759,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "property": { @@ -6982,7 +6769,6 @@ "ctxt": 0 }, "value": "add", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6998,7 +6784,6 @@ "ctxt": 0 }, "value": "commentIndentationEdit", - "typeAnnotation": null, "optional": false } } @@ -7036,7 +6821,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false } } @@ -7067,7 +6851,6 @@ "ctxt": 0 }, "value": "List_TextEditInfo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7095,7 +6878,6 @@ "ctxt": 0 }, "value": "GetIndentSizeFromIndentText", - "typeAnnotation": null, "optional": false }, "function": { @@ -7116,6 +6898,7 @@ "ctxt": 0 }, "value": "indentText", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7132,8 +6915,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -7152,6 +6934,7 @@ "ctxt": 0 }, "value": "editorOptions", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7176,7 +6959,6 @@ "ctxt": 0 }, "value": "Services", - "typeAnnotation": null, "optional": false }, "right": { @@ -7187,14 +6969,12 @@ "ctxt": 0 }, "value": "EditorOptions", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } } ], @@ -7234,7 +7014,6 @@ "ctxt": 0 }, "value": "GetIndentSizeFromText", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7248,7 +7027,6 @@ "ctxt": 0 }, "value": "indentText", - "typeAnnotation": null, "optional": false } }, @@ -7262,7 +7040,6 @@ "ctxt": 0 }, "value": "editorOptions", - "typeAnnotation": null, "optional": false } }, @@ -7326,7 +7103,6 @@ "ctxt": 0 }, "value": "GetIndentSizeFromText", - "typeAnnotation": null, "optional": false }, "function": { @@ -7347,6 +7123,7 @@ "ctxt": 0 }, "value": "text", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7363,8 +7140,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -7383,6 +7159,7 @@ "ctxt": 0 }, "value": "editorOptions", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7407,7 +7184,6 @@ "ctxt": 0 }, "value": "Services", - "typeAnnotation": null, "optional": false }, "right": { @@ -7418,14 +7194,12 @@ "ctxt": 0 }, "value": "EditorOptions", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } }, { @@ -7444,6 +7218,7 @@ "ctxt": 0 }, "value": "includeNonIndentChars", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7460,8 +7235,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -7504,8 +7278,8 @@ "ctxt": 0 }, "value": "indentSize", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -7552,8 +7326,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -7584,7 +7358,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "right": { @@ -7602,7 +7375,6 @@ "ctxt": 0 }, "value": "text", - "typeAnnotation": null, "optional": false }, "property": { @@ -7613,7 +7385,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7636,7 +7407,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -7673,8 +7443,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7698,7 +7468,6 @@ "ctxt": 0 }, "value": "text", - "typeAnnotation": null, "optional": false }, "property": { @@ -7709,7 +7478,6 @@ "ctxt": 0 }, "value": "charAt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7725,7 +7493,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -7759,7 +7526,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -7800,8 +7566,8 @@ "ctxt": 0 }, "value": "indentSize", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -7834,7 +7600,6 @@ "ctxt": 0 }, "value": "indentSize", - "typeAnnotation": null, "optional": false }, "right": { @@ -7852,7 +7617,6 @@ "ctxt": 0 }, "value": "editorOptions", - "typeAnnotation": null, "optional": false }, "property": { @@ -7863,7 +7627,6 @@ "ctxt": 0 }, "value": "TabSize", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7893,7 +7656,6 @@ "ctxt": 0 }, "value": "indentSize", - "typeAnnotation": null, "optional": false }, "right": { @@ -7911,7 +7673,6 @@ "ctxt": 0 }, "value": "editorOptions", - "typeAnnotation": null, "optional": false }, "property": { @@ -7922,7 +7683,6 @@ "ctxt": 0 }, "value": "TabSize", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7955,7 +7715,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -7996,8 +7755,8 @@ "ctxt": 0 }, "value": "indentSize", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -8033,7 +7792,6 @@ "ctxt": 0 }, "value": "includeNonIndentChars", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -8059,8 +7817,8 @@ "ctxt": 0 }, "value": "indentSize", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -8105,7 +7863,6 @@ "ctxt": 0 }, "value": "indentSize", - "typeAnnotation": null, "optional": false } } @@ -8153,7 +7910,6 @@ "ctxt": 0 }, "value": "GetSpecialCaseIndentation", - "typeAnnotation": null, "optional": false }, "function": { @@ -8174,6 +7930,7 @@ "ctxt": 0 }, "value": "token", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8196,13 +7953,11 @@ "ctxt": 0 }, "value": "TokenSpan", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -8221,6 +7976,7 @@ "ctxt": 0 }, "value": "node", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8243,13 +7999,11 @@ "ctxt": 0 }, "value": "ParseNode", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -8292,6 +8046,7 @@ "ctxt": 0 }, "value": "indentationInfo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8314,13 +8069,11 @@ "ctxt": 0 }, "value": "IndentationInfo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -8356,7 +8109,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false }, "property": { @@ -8367,7 +8119,6 @@ "ctxt": 0 }, "value": "Token", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8395,7 +8146,6 @@ "ctxt": 0 }, "value": "AuthorTokenKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -8406,7 +8156,6 @@ "ctxt": 0 }, "value": "atkLCurly", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8435,8 +8184,8 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -8468,7 +8217,6 @@ "ctxt": 0 }, "value": "GetSpecialCaseIndentationForLCurly", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8484,7 +8232,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false } } @@ -8508,7 +8255,6 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, "optional": false } } @@ -8536,7 +8282,6 @@ "ctxt": 0 }, "value": "AuthorTokenKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -8547,7 +8292,6 @@ "ctxt": 0 }, "value": "atkElse", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8576,7 +8320,6 @@ "ctxt": 0 }, "value": "AuthorTokenKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -8587,7 +8330,6 @@ "ctxt": 0 }, "value": "atkRBrack", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8616,8 +8358,8 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -8641,7 +8383,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -8652,7 +8393,6 @@ "ctxt": 0 }, "value": "GetNodeStartLineIndentation", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8689,7 +8429,6 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, "optional": false } } @@ -8717,7 +8456,6 @@ "ctxt": 0 }, "value": "AuthorTokenKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -8728,7 +8466,6 @@ "ctxt": 0 }, "value": "atkRCurly", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8786,7 +8523,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -8797,7 +8533,6 @@ "ctxt": 0 }, "value": "AuthorNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8810,7 +8545,6 @@ "ctxt": 0 }, "value": "Details", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8823,7 +8557,6 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8843,7 +8576,6 @@ "ctxt": 0 }, "value": "AuthorParseNodeKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -8854,7 +8586,6 @@ "ctxt": 0 }, "value": "apnkBlock", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8890,7 +8621,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -8901,7 +8631,6 @@ "ctxt": 0 }, "value": "AuthorNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8914,7 +8643,6 @@ "ctxt": 0 }, "value": "EdgeLabel", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8934,7 +8662,6 @@ "ctxt": 0 }, "value": "AuthorParseNodeEdge", - "typeAnnotation": null, "optional": false }, "property": { @@ -8945,7 +8672,6 @@ "ctxt": 0 }, "value": "apneBody", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8975,8 +8701,8 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -8993,7 +8719,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -9004,7 +8729,6 @@ "ctxt": 0 }, "value": "Parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9036,8 +8760,8 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -9061,7 +8785,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -9072,7 +8795,6 @@ "ctxt": 0 }, "value": "GetNodeStartLineIndentation", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9109,7 +8831,6 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, "optional": false } } @@ -9137,7 +8858,6 @@ "ctxt": 0 }, "value": "AuthorTokenKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -9148,7 +8868,6 @@ "ctxt": 0 }, "value": "atkWhile", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9198,7 +8917,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -9209,7 +8927,6 @@ "ctxt": 0 }, "value": "AuthorNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9222,7 +8939,6 @@ "ctxt": 0 }, "value": "Details", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9235,7 +8951,6 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9255,7 +8970,6 @@ "ctxt": 0 }, "value": "AuthorParseNodeKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -9266,7 +8980,6 @@ "ctxt": 0 }, "value": "apnkDoWhile", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9303,8 +9016,8 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -9328,7 +9041,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -9339,7 +9051,6 @@ "ctxt": 0 }, "value": "GetNodeStartLineIndentation", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9376,7 +9087,6 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, "optional": false } } @@ -9424,7 +9134,6 @@ "ctxt": 0 }, "value": "AuthorTokenKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -9435,7 +9144,6 @@ "ctxt": 0 }, "value": "atkSColon", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9478,7 +9186,6 @@ "ctxt": 0 }, "value": "GetSpecialCaseIndentationForSemicolon", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9494,7 +9201,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false } }, @@ -9508,7 +9214,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false } } @@ -9540,7 +9245,6 @@ "ctxt": 0 }, "value": "AuthorTokenKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -9551,7 +9255,6 @@ "ctxt": 0 }, "value": "atkComment", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9594,7 +9297,6 @@ "ctxt": 0 }, "value": "GetSpecialCaseIndentationForComment", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9610,7 +9312,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false } }, @@ -9624,7 +9325,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false } } @@ -9658,7 +9358,6 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, "optional": false } } @@ -9693,7 +9392,6 @@ "ctxt": 0 }, "value": "IndentationInfo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9721,7 +9419,6 @@ "ctxt": 0 }, "value": "GetSpecialCaseIndentationForLCurly", - "typeAnnotation": null, "optional": false }, "function": { @@ -9742,6 +9439,7 @@ "ctxt": 0 }, "value": "node", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9764,13 +9462,11 @@ "ctxt": 0 }, "value": "ParseNode", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -9813,6 +9509,7 @@ "ctxt": 0 }, "value": "indentationInfo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9835,13 +9532,11 @@ "ctxt": 0 }, "value": "IndentationInfo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -9915,7 +9610,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -9926,7 +9620,6 @@ "ctxt": 0 }, "value": "AuthorNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9939,7 +9632,6 @@ "ctxt": 0 }, "value": "Details", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9952,7 +9644,6 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9972,7 +9663,6 @@ "ctxt": 0 }, "value": "AuthorParseNodeKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -9983,7 +9673,6 @@ "ctxt": 0 }, "value": "apnkFncDecl", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10019,7 +9708,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -10030,7 +9718,6 @@ "ctxt": 0 }, "value": "AuthorNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10043,7 +9730,6 @@ "ctxt": 0 }, "value": "EdgeLabel", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10063,7 +9749,6 @@ "ctxt": 0 }, "value": "AuthorParseNodeEdge", - "typeAnnotation": null, "optional": false }, "property": { @@ -10074,7 +9759,6 @@ "ctxt": 0 }, "value": "apneThen", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10111,7 +9795,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -10122,7 +9805,6 @@ "ctxt": 0 }, "value": "AuthorNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10135,7 +9817,6 @@ "ctxt": 0 }, "value": "EdgeLabel", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10155,7 +9836,6 @@ "ctxt": 0 }, "value": "AuthorParseNodeEdge", - "typeAnnotation": null, "optional": false }, "property": { @@ -10166,7 +9846,6 @@ "ctxt": 0 }, "value": "apneElse", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10204,8 +9883,8 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -10229,7 +9908,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -10240,7 +9918,6 @@ "ctxt": 0 }, "value": "GetNodeStartLineIndentation", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10277,7 +9954,6 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, "optional": false } } @@ -10335,7 +10011,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -10346,7 +10021,6 @@ "ctxt": 0 }, "value": "AuthorNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10359,7 +10033,6 @@ "ctxt": 0 }, "value": "Details", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10372,7 +10045,6 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10392,7 +10064,6 @@ "ctxt": 0 }, "value": "AuthorParseNodeKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -10403,7 +10074,6 @@ "ctxt": 0 }, "value": "apnkObject", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10439,7 +10109,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -10450,7 +10119,6 @@ "ctxt": 0 }, "value": "CanIndent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10512,8 +10180,8 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -10537,7 +10205,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -10548,7 +10215,6 @@ "ctxt": 0 }, "value": "GetEffectiveIndentation", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10585,7 +10251,6 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, "optional": false } } @@ -10616,7 +10281,6 @@ "ctxt": 0 }, "value": "IndentationInfo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10644,7 +10308,6 @@ "ctxt": 0 }, "value": "GetSpecialCaseIndentationForSemicolon", - "typeAnnotation": null, "optional": false }, "function": { @@ -10665,6 +10328,7 @@ "ctxt": 0 }, "value": "token", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10687,13 +10351,11 @@ "ctxt": 0 }, "value": "TokenSpan", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -10712,6 +10374,7 @@ "ctxt": 0 }, "value": "node", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10734,13 +10397,11 @@ "ctxt": 0 }, "value": "ParseNode", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -10783,6 +10444,7 @@ "ctxt": 0 }, "value": "indentationInfo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10805,13 +10467,11 @@ "ctxt": 0 }, "value": "IndentationInfo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -10855,7 +10515,6 @@ "ctxt": 0 }, "value": "smartIndent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10891,8 +10550,8 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -10916,7 +10575,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -10927,7 +10585,6 @@ "ctxt": 0 }, "value": "GetEffectiveChildrenIndentation", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10964,7 +10621,6 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, "optional": false } } @@ -11022,7 +10678,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -11033,7 +10688,6 @@ "ctxt": 0 }, "value": "AuthorNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11046,7 +10700,6 @@ "ctxt": 0 }, "value": "Details", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11059,7 +10712,6 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11079,7 +10731,6 @@ "ctxt": 0 }, "value": "AuthorParseNodeKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -11090,7 +10741,6 @@ "ctxt": 0 }, "value": "apnkFor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11129,8 +10779,8 @@ "ctxt": 0 }, "value": "semiColonStartSpan", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -11147,7 +10797,6 @@ "ctxt": 0 }, "value": "Span", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -11182,7 +10831,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false }, "property": { @@ -11193,7 +10841,6 @@ "ctxt": 0 }, "value": "Span", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11206,7 +10853,6 @@ "ctxt": 0 }, "value": "startPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11257,8 +10903,8 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -11282,7 +10928,6 @@ "ctxt": 0 }, "value": "ParseTree", - "typeAnnotation": null, "optional": false }, "property": { @@ -11293,7 +10938,6 @@ "ctxt": 0 }, "value": "FindCommonParentNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11309,7 +10953,6 @@ "ctxt": 0 }, "value": "semiColonStartSpan", - "typeAnnotation": null, "optional": false } }, @@ -11323,7 +10966,6 @@ "ctxt": 0 }, "value": "semiColonStartSpan", - "typeAnnotation": null, "optional": false } }, @@ -11337,7 +10979,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false } } @@ -11369,8 +11010,8 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -11394,7 +11035,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -11405,7 +11045,6 @@ "ctxt": 0 }, "value": "GetEffectiveChildrenIndentation", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11442,7 +11081,6 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, "optional": false } } @@ -11496,7 +11134,6 @@ "ctxt": 0 }, "value": "IndentationInfo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11524,7 +11161,6 @@ "ctxt": 0 }, "value": "GetSpecialCaseIndentationForComment", - "typeAnnotation": null, "optional": false }, "function": { @@ -11545,6 +11181,7 @@ "ctxt": 0 }, "value": "token", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11567,13 +11204,11 @@ "ctxt": 0 }, "value": "TokenSpan", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -11592,6 +11227,7 @@ "ctxt": 0 }, "value": "node", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11614,13 +11250,11 @@ "ctxt": 0 }, "value": "ParseNode", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -11663,6 +11297,7 @@ "ctxt": 0 }, "value": "indentationInfo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11685,13 +11320,11 @@ "ctxt": 0 }, "value": "IndentationInfo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -11730,8 +11363,8 @@ "ctxt": 0 }, "value": "twoCharSpan", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -11762,7 +11395,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false }, "property": { @@ -11773,7 +11405,6 @@ "ctxt": 0 }, "value": "Span", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11786,7 +11417,6 @@ "ctxt": 0 }, "value": "Intersection", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11809,7 +11439,6 @@ "ctxt": 0 }, "value": "Span", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -11844,7 +11473,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false }, "property": { @@ -11855,7 +11483,6 @@ "ctxt": 0 }, "value": "Span", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11868,7 +11495,6 @@ "ctxt": 0 }, "value": "startPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11931,7 +11557,6 @@ "ctxt": 0 }, "value": "twoCharSpan", - "typeAnnotation": null, "optional": false }, "right": { @@ -11988,7 +11613,6 @@ "ctxt": 0 }, "value": "twoCharSpan", - "typeAnnotation": null, "optional": false }, "property": { @@ -11999,7 +11623,6 @@ "ctxt": 0 }, "value": "GetText", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12052,7 +11675,6 @@ "ctxt": 0 }, "value": "twoCharSpan", - "typeAnnotation": null, "optional": false }, "property": { @@ -12063,7 +11685,6 @@ "ctxt": 0 }, "value": "GetText", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12135,7 +11756,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -12146,7 +11766,6 @@ "ctxt": 0 }, "value": "ChildrenIndentationDelta", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12183,7 +11802,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -12194,7 +11812,6 @@ "ctxt": 0 }, "value": "Parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12232,8 +11849,8 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -12250,7 +11867,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -12261,7 +11877,6 @@ "ctxt": 0 }, "value": "Parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12306,7 +11921,6 @@ "ctxt": 0 }, "value": "CanIndentComment", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12322,7 +11936,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false } }, @@ -12336,7 +11949,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false } } @@ -12374,8 +11986,8 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -12399,7 +12011,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -12410,7 +12021,6 @@ "ctxt": 0 }, "value": "GetEffectiveChildrenIndentationForComment", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12465,8 +12075,8 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -12498,7 +12108,6 @@ "ctxt": 0 }, "value": "ApplyIndentationDeltaFromParent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12514,7 +12123,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false } }, @@ -12528,7 +12136,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false } } @@ -12559,7 +12166,6 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, "optional": false } } @@ -12590,7 +12196,6 @@ "ctxt": 0 }, "value": "IndentationInfo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12618,7 +12223,6 @@ "ctxt": 0 }, "value": "CanIndentComment", - "typeAnnotation": null, "optional": false }, "function": { @@ -12639,6 +12243,7 @@ "ctxt": 0 }, "value": "token", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12661,13 +12266,11 @@ "ctxt": 0 }, "value": "TokenSpan", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -12686,6 +12289,7 @@ "ctxt": 0 }, "value": "node", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12708,13 +12312,11 @@ "ctxt": 0 }, "value": "ParseNode", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -12768,7 +12370,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -12779,7 +12380,6 @@ "ctxt": 0 }, "value": "AuthorNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12792,7 +12392,6 @@ "ctxt": 0 }, "value": "Details", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12805,7 +12404,6 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12833,7 +12431,6 @@ "ctxt": 0 }, "value": "AuthorParseNodeKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -12844,7 +12441,6 @@ "ctxt": 0 }, "value": "apnkProg", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12873,7 +12469,6 @@ "ctxt": 0 }, "value": "AuthorParseNodeKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -12884,7 +12479,6 @@ "ctxt": 0 }, "value": "apnkBlock", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12913,7 +12507,6 @@ "ctxt": 0 }, "value": "AuthorParseNodeKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -12924,7 +12517,6 @@ "ctxt": 0 }, "value": "apnkSwitch", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12953,7 +12545,6 @@ "ctxt": 0 }, "value": "AuthorParseNodeKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -12964,7 +12555,6 @@ "ctxt": 0 }, "value": "apnkCase", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12993,7 +12583,6 @@ "ctxt": 0 }, "value": "AuthorParseNodeKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -13004,7 +12593,6 @@ "ctxt": 0 }, "value": "apnkDefaultCase", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13033,7 +12621,6 @@ "ctxt": 0 }, "value": "AuthorParseNodeKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -13044,7 +12631,6 @@ "ctxt": 0 }, "value": "apnkIf", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13073,7 +12659,6 @@ "ctxt": 0 }, "value": "AuthorParseNodeKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -13084,7 +12669,6 @@ "ctxt": 0 }, "value": "apnkFor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13113,7 +12697,6 @@ "ctxt": 0 }, "value": "AuthorParseNodeKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -13124,7 +12707,6 @@ "ctxt": 0 }, "value": "apnkForIn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13153,7 +12735,6 @@ "ctxt": 0 }, "value": "AuthorParseNodeKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -13164,7 +12745,6 @@ "ctxt": 0 }, "value": "apnkWhile", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13193,7 +12773,6 @@ "ctxt": 0 }, "value": "AuthorParseNodeKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -13204,7 +12783,6 @@ "ctxt": 0 }, "value": "apnkWith", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13233,7 +12811,6 @@ "ctxt": 0 }, "value": "AuthorParseNodeKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -13244,7 +12821,6 @@ "ctxt": 0 }, "value": "apnkDoWhile", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13273,7 +12849,6 @@ "ctxt": 0 }, "value": "AuthorParseNodeKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -13284,7 +12859,6 @@ "ctxt": 0 }, "value": "apnkObject", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13331,7 +12905,6 @@ "ctxt": 0 }, "value": "AuthorParseNodeKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -13342,7 +12915,6 @@ "ctxt": 0 }, "value": "apnkFncDecl", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13373,8 +12945,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -13414,8 +12986,8 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -13439,7 +13011,6 @@ "ctxt": 0 }, "value": "ParseNodeExtensions", - "typeAnnotation": null, "optional": false }, "property": { @@ -13450,7 +13021,6 @@ "ctxt": 0 }, "value": "FindChildrenWithEdge", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13466,7 +13036,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false } }, @@ -13487,7 +13056,6 @@ "ctxt": 0 }, "value": "AuthorParseNodeEdge", - "typeAnnotation": null, "optional": false }, "property": { @@ -13498,7 +13066,6 @@ "ctxt": 0 }, "value": "apneArgument", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13540,7 +13107,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "property": { @@ -13551,7 +13117,6 @@ "ctxt": 0 }, "value": "foreach", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13575,8 +13140,8 @@ "ctxt": 0 }, "value": "argumentNode", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -13631,7 +13196,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false }, "property": { @@ -13642,7 +13206,6 @@ "ctxt": 0 }, "value": "Span", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13655,7 +13218,6 @@ "ctxt": 0 }, "value": "startPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13692,7 +13254,6 @@ "ctxt": 0 }, "value": "argumentNode", - "typeAnnotation": null, "optional": false }, "property": { @@ -13703,7 +13264,6 @@ "ctxt": 0 }, "value": "AuthorNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13716,7 +13276,6 @@ "ctxt": 0 }, "value": "Details", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13729,7 +13288,6 @@ "ctxt": 0 }, "value": "StartOffset", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13758,8 +13316,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -13801,7 +13359,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false } } @@ -13870,7 +13427,6 @@ "ctxt": 0 }, "value": "ApplyScriptBlockIndentation", - "typeAnnotation": null, "optional": false }, "function": { @@ -13891,6 +13447,7 @@ "ctxt": 0 }, "value": "languageHostIndentation", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13907,8 +13464,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -13927,6 +13483,7 @@ "ctxt": 0 }, "value": "tree", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13949,13 +13506,11 @@ "ctxt": 0 }, "value": "ParseTree", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -14004,7 +13559,6 @@ "ctxt": 0 }, "value": "languageHostIndentation", - "typeAnnotation": null, "optional": false }, "right": { @@ -14039,7 +13593,6 @@ "ctxt": 0 }, "value": "tree", - "typeAnnotation": null, "optional": false }, "property": { @@ -14050,7 +13603,6 @@ "ctxt": 0 }, "value": "StartNodeSelf", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14101,8 +13653,8 @@ "ctxt": 0 }, "value": "scriptBlockIndentation", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -14134,7 +13686,6 @@ "ctxt": 0 }, "value": "ApplyIndentationLevel", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14150,7 +13701,6 @@ "ctxt": 0 }, "value": "languageHostIndentation", - "typeAnnotation": null, "optional": false } }, @@ -14209,7 +13759,6 @@ "ctxt": 0 }, "value": "tree", - "typeAnnotation": null, "optional": false }, "property": { @@ -14220,7 +13769,6 @@ "ctxt": 0 }, "value": "Root", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14233,7 +13781,6 @@ "ctxt": 0 }, "value": "SetIndentationOverride", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14249,7 +13796,6 @@ "ctxt": 0 }, "value": "scriptBlockIndentation", - "typeAnnotation": null, "optional": false } } @@ -14301,7 +13847,6 @@ "ctxt": 0 }, "value": "GetIndentEdit", - "typeAnnotation": null, "optional": false }, "function": { @@ -14322,6 +13867,7 @@ "ctxt": 0 }, "value": "indentInfo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -14344,13 +13890,11 @@ "ctxt": 0 }, "value": "IndentationInfo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -14369,6 +13913,7 @@ "ctxt": 0 }, "value": "tokenStartPosition", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -14385,8 +13930,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -14405,6 +13949,7 @@ "ctxt": 0 }, "value": "sameLineIndent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -14421,8 +13966,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -14465,8 +14009,8 @@ "ctxt": 0 }, "value": "indentText", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -14498,7 +14042,6 @@ "ctxt": 0 }, "value": "ApplyIndentationLevel", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14521,7 +14064,6 @@ "ctxt": 0 }, "value": "indentInfo", - "typeAnnotation": null, "optional": false }, "property": { @@ -14532,7 +14074,6 @@ "ctxt": 0 }, "value": "Prefix", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14555,7 +14096,6 @@ "ctxt": 0 }, "value": "indentInfo", - "typeAnnotation": null, "optional": false }, "property": { @@ -14566,7 +14106,6 @@ "ctxt": 0 }, "value": "Level", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14594,7 +14133,6 @@ "ctxt": 0 }, "value": "sameLineIndent", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -14627,7 +14165,6 @@ "ctxt": 0 }, "value": "TextEditInfo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -14641,7 +14178,6 @@ "ctxt": 0 }, "value": "tokenStartPosition", - "typeAnnotation": null, "optional": false } }, @@ -14667,7 +14203,6 @@ "ctxt": 0 }, "value": "indentText", - "typeAnnotation": null, "optional": false } } @@ -14710,8 +14245,8 @@ "ctxt": 0 }, "value": "snapshotLine", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -14750,7 +14285,6 @@ "ctxt": 0 }, "value": "snapshot", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14763,7 +14297,6 @@ "ctxt": 0 }, "value": "GetLineFromPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14779,7 +14312,6 @@ "ctxt": 0 }, "value": "tokenStartPosition", - "typeAnnotation": null, "optional": false } } @@ -14815,8 +14347,8 @@ "ctxt": 0 }, "value": "currentIndentSpan", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -14833,7 +14365,6 @@ "ctxt": 0 }, "value": "Span", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -14861,7 +14392,6 @@ "ctxt": 0 }, "value": "snapshotLine", - "typeAnnotation": null, "optional": false }, "property": { @@ -14872,7 +14402,6 @@ "ctxt": 0 }, "value": "startPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14899,7 +14428,6 @@ "ctxt": 0 }, "value": "tokenStartPosition", - "typeAnnotation": null, "optional": false }, "right": { @@ -14924,7 +14452,6 @@ "ctxt": 0 }, "value": "snapshotLine", - "typeAnnotation": null, "optional": false }, "property": { @@ -14935,7 +14462,6 @@ "ctxt": 0 }, "value": "startPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14977,8 +14503,8 @@ "ctxt": 0 }, "value": "currentIndentText", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -15017,7 +14543,6 @@ "ctxt": 0 }, "value": "snapshot", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15030,7 +14555,6 @@ "ctxt": 0 }, "value": "GetText", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15046,7 +14570,6 @@ "ctxt": 0 }, "value": "currentIndentSpan", - "typeAnnotation": null, "optional": false } } @@ -15080,7 +14603,6 @@ "ctxt": 0 }, "value": "currentIndentText", - "typeAnnotation": null, "optional": false }, "right": { @@ -15091,7 +14613,6 @@ "ctxt": 0 }, "value": "indentText", - "typeAnnotation": null, "optional": false } }, @@ -15147,7 +14668,6 @@ "ctxt": 0 }, "value": "logger", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15160,7 +14680,6 @@ "ctxt": 0 }, "value": "debug", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15208,8 +14727,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -15237,8 +14756,8 @@ "ctxt": 0 }, "value": "len", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -15255,7 +14774,6 @@ "ctxt": 0 }, "value": "currentIndentText", - "typeAnnotation": null, "optional": false }, "property": { @@ -15266,7 +14784,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15291,7 +14808,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "right": { @@ -15302,7 +14818,6 @@ "ctxt": 0 }, "value": "len", - "typeAnnotation": null, "optional": false } }, @@ -15323,7 +14838,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -15360,8 +14874,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -15385,7 +14899,6 @@ "ctxt": 0 }, "value": "currentIndentText", - "typeAnnotation": null, "optional": false }, "property": { @@ -15396,7 +14909,6 @@ "ctxt": 0 }, "value": "charCodeAt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15412,7 +14924,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -15460,7 +14971,6 @@ "ctxt": 0 }, "value": "StringUtils", - "typeAnnotation": null, "optional": false }, "property": { @@ -15471,7 +14981,6 @@ "ctxt": 0 }, "value": "IsWhiteSpace", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15487,7 +14996,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -15532,7 +15040,6 @@ "ctxt": 0 }, "value": "Debug", - "typeAnnotation": null, "optional": false }, "property": { @@ -15543,7 +15050,6 @@ "ctxt": 0 }, "value": "Fail", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15595,7 +15101,6 @@ "ctxt": 0 }, "value": "snapshotLine", - "typeAnnotation": null, "optional": false }, "property": { @@ -15606,7 +15111,6 @@ "ctxt": 0 }, "value": "getText", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15662,7 +15166,6 @@ "ctxt": 0 }, "value": "TextEditInfo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -15690,7 +15193,6 @@ "ctxt": 0 }, "value": "currentIndentSpan", - "typeAnnotation": null, "optional": false }, "property": { @@ -15701,7 +15203,6 @@ "ctxt": 0 }, "value": "start", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15734,7 +15235,6 @@ "ctxt": 0 }, "value": "currentIndentSpan", - "typeAnnotation": null, "optional": false }, "property": { @@ -15745,7 +15245,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15764,7 +15263,6 @@ "ctxt": 0 }, "value": "indentText", - "typeAnnotation": null, "optional": false } } @@ -15822,7 +15320,6 @@ "ctxt": 0 }, "value": "TextEditInfo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -15850,7 +15347,6 @@ "ctxt": 0 }, "value": "ApplyIndentationLevel", - "typeAnnotation": null, "optional": false }, "function": { @@ -15871,6 +15367,7 @@ "ctxt": 0 }, "value": "existingIndentation", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -15887,8 +15384,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -15907,6 +15403,7 @@ "ctxt": 0 }, "value": "level", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -15923,8 +15420,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -15967,8 +15463,8 @@ "ctxt": 0 }, "value": "indentSize", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -16000,7 +15496,6 @@ "ctxt": 0 }, "value": "editorOptions", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16013,7 +15508,6 @@ "ctxt": 0 }, "value": "IndentSize", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16047,8 +15541,8 @@ "ctxt": 0 }, "value": "tabSize", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -16080,7 +15574,6 @@ "ctxt": 0 }, "value": "editorOptions", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16093,7 +15586,6 @@ "ctxt": 0 }, "value": "TabSize", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16127,8 +15619,8 @@ "ctxt": 0 }, "value": "convertTabsToSpaces", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -16160,7 +15652,6 @@ "ctxt": 0 }, "value": "editorOptions", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16173,7 +15664,6 @@ "ctxt": 0 }, "value": "ConvertTabsToSpaces", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16205,7 +15695,6 @@ "ctxt": 0 }, "value": "level", - "typeAnnotation": null, "optional": false }, "right": { @@ -16255,7 +15744,6 @@ "ctxt": 0 }, "value": "StringUtils", - "typeAnnotation": null, "optional": false }, "property": { @@ -16266,7 +15754,6 @@ "ctxt": 0 }, "value": "IsNullOrEmpty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16282,7 +15769,6 @@ "ctxt": 0 }, "value": "existingIndentation", - "typeAnnotation": null, "optional": false } } @@ -16338,8 +15824,8 @@ "ctxt": 0 }, "value": "totalIndent", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -16383,7 +15869,6 @@ "ctxt": 0 }, "value": "StringUtils", - "typeAnnotation": null, "optional": false }, "property": { @@ -16394,7 +15879,6 @@ "ctxt": 0 }, "value": "foreach", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16410,7 +15894,6 @@ "ctxt": 0 }, "value": "existingIndentation", - "typeAnnotation": null, "optional": false } }, @@ -16432,8 +15915,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -16467,7 +15950,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -16508,8 +15990,8 @@ "ctxt": 0 }, "value": "totalIndent", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -16519,7 +16001,6 @@ "ctxt": 0 }, "value": "tabSize", - "typeAnnotation": null, "optional": false } } @@ -16548,7 +16029,6 @@ "ctxt": 0 }, "value": "totalIndent", - "typeAnnotation": null, "optional": false } } @@ -16589,8 +16069,8 @@ "ctxt": 0 }, "value": "totalIndent", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -16608,7 +16088,6 @@ "ctxt": 0 }, "value": "level", - "typeAnnotation": null, "optional": false }, "right": { @@ -16619,7 +16098,6 @@ "ctxt": 0 }, "value": "indentSize", - "typeAnnotation": null, "optional": false } } @@ -16648,7 +16126,6 @@ "ctxt": 0 }, "value": "totalIndent", - "typeAnnotation": null, "optional": false }, "right": { @@ -16720,7 +16197,6 @@ "ctxt": 0 }, "value": "GetIndentString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16747,7 +16223,6 @@ "ctxt": 0 }, "value": "totalIndent", - "typeAnnotation": null, "optional": false } }, @@ -16761,7 +16236,6 @@ "ctxt": 0 }, "value": "tabSize", - "typeAnnotation": null, "optional": false } }, @@ -16775,7 +16249,6 @@ "ctxt": 0 }, "value": "convertTabsToSpaces", - "typeAnnotation": null, "optional": false } } @@ -16813,8 +16286,8 @@ "ctxt": 0 }, "value": "totalIndentSize", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -16832,7 +16305,6 @@ "ctxt": 0 }, "value": "level", - "typeAnnotation": null, "optional": false }, "right": { @@ -16843,7 +16315,6 @@ "ctxt": 0 }, "value": "indentSize", - "typeAnnotation": null, "optional": false } }, @@ -16888,7 +16359,6 @@ "ctxt": 0 }, "value": "GetIndentString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16904,7 +16374,6 @@ "ctxt": 0 }, "value": "existingIndentation", - "typeAnnotation": null, "optional": false } }, @@ -16918,7 +16387,6 @@ "ctxt": 0 }, "value": "totalIndentSize", - "typeAnnotation": null, "optional": false } }, @@ -16932,7 +16400,6 @@ "ctxt": 0 }, "value": "tabSize", - "typeAnnotation": null, "optional": false } }, @@ -16946,7 +16413,6 @@ "ctxt": 0 }, "value": "convertTabsToSpaces", - "typeAnnotation": null, "optional": false } } @@ -16998,7 +16464,6 @@ "ctxt": 0 }, "value": "GetIndentString", - "typeAnnotation": null, "optional": false }, "function": { @@ -17019,6 +16484,7 @@ "ctxt": 0 }, "value": "prefix", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -17035,8 +16501,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -17055,6 +16520,7 @@ "ctxt": 0 }, "value": "totalIndentSize", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -17071,8 +16537,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -17091,6 +16556,7 @@ "ctxt": 0 }, "value": "tabSize", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -17107,8 +16573,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -17127,6 +16592,7 @@ "ctxt": 0 }, "value": "convertTabsToSpaces", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -17143,8 +16609,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -17187,8 +16652,8 @@ "ctxt": 0 }, "value": "tabString", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -17205,7 +16670,6 @@ "ctxt": 0 }, "value": "convertTabsToSpaces", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -17230,7 +16694,6 @@ "ctxt": 0 }, "value": "StringUtils", - "typeAnnotation": null, "optional": false }, "property": { @@ -17241,7 +16704,6 @@ "ctxt": 0 }, "value": "create", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17274,7 +16736,6 @@ "ctxt": 0 }, "value": "tabSize", - "typeAnnotation": null, "optional": false } } @@ -17325,8 +16786,8 @@ "ctxt": 0 }, "value": "text", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -17383,7 +16844,6 @@ "ctxt": 0 }, "value": "StringUtils", - "typeAnnotation": null, "optional": false }, "property": { @@ -17394,7 +16854,6 @@ "ctxt": 0 }, "value": "IsNullOrEmpty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17410,7 +16869,6 @@ "ctxt": 0 }, "value": "prefix", - "typeAnnotation": null, "optional": false } } @@ -17441,8 +16899,8 @@ "ctxt": 0 }, "value": "text", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -17452,7 +16910,6 @@ "ctxt": 0 }, "value": "prefix", - "typeAnnotation": null, "optional": false } } @@ -17484,8 +16941,8 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -17523,7 +16980,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false }, "right": { @@ -17542,7 +16998,6 @@ "ctxt": 0 }, "value": "totalIndentSize", - "typeAnnotation": null, "optional": false }, "right": { @@ -17553,7 +17008,6 @@ "ctxt": 0 }, "value": "tabSize", - "typeAnnotation": null, "optional": false } } @@ -17589,8 +17043,8 @@ "ctxt": 0 }, "value": "text", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -17600,7 +17054,6 @@ "ctxt": 0 }, "value": "tabString", - "typeAnnotation": null, "optional": false } } @@ -17628,8 +17081,8 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -17639,7 +17092,6 @@ "ctxt": 0 }, "value": "tabSize", - "typeAnnotation": null, "optional": false } } @@ -17670,7 +17122,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false }, "right": { @@ -17681,7 +17132,6 @@ "ctxt": 0 }, "value": "totalIndentSize", - "typeAnnotation": null, "optional": false } }, @@ -17716,8 +17166,8 @@ "ctxt": 0 }, "value": "text", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -17759,7 +17209,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false } } @@ -17782,7 +17231,6 @@ "ctxt": 0 }, "value": "text", - "typeAnnotation": null, "optional": false } } @@ -17830,7 +17278,6 @@ "ctxt": 0 }, "value": "ApplyIndentationDeltaFromParent", - "typeAnnotation": null, "optional": false }, "function": { @@ -17851,6 +17298,7 @@ "ctxt": 0 }, "value": "token", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -17873,13 +17321,11 @@ "ctxt": 0 }, "value": "TokenSpan", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -17898,6 +17344,7 @@ "ctxt": 0 }, "value": "node", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -17920,13 +17367,11 @@ "ctxt": 0 }, "value": "ParseNode", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -17969,6 +17414,7 @@ "ctxt": 0 }, "value": "indentationInfo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -17991,13 +17437,11 @@ "ctxt": 0 }, "value": "IndentationInfo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -18036,8 +17480,8 @@ "ctxt": 0 }, "value": "indentableParent", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -18047,7 +17491,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "definite": false @@ -18085,7 +17528,6 @@ "ctxt": 0 }, "value": "indentableParent", - "typeAnnotation": null, "optional": false }, "right": { @@ -18127,7 +17569,6 @@ "ctxt": 0 }, "value": "indentableParent", - "typeAnnotation": null, "optional": false }, "property": { @@ -18138,7 +17579,6 @@ "ctxt": 0 }, "value": "CanIndent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18171,8 +17611,8 @@ "ctxt": 0 }, "value": "indentableParent", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -18189,7 +17629,6 @@ "ctxt": 0 }, "value": "indentableParent", - "typeAnnotation": null, "optional": false }, "property": { @@ -18200,7 +17639,6 @@ "ctxt": 0 }, "value": "Parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18239,7 +17677,6 @@ "ctxt": 0 }, "value": "indentableParent", - "typeAnnotation": null, "optional": false }, "right": { @@ -18288,7 +17725,6 @@ "ctxt": 0 }, "value": "indentableParent", - "typeAnnotation": null, "optional": false }, "property": { @@ -18299,7 +17735,6 @@ "ctxt": 0 }, "value": "AuthorNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18312,7 +17747,6 @@ "ctxt": 0 }, "value": "Details", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18325,7 +17759,6 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18345,7 +17778,6 @@ "ctxt": 0 }, "value": "AuthorParseNodeKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -18356,7 +17788,6 @@ "ctxt": 0 }, "value": "apnkProg", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18396,8 +17827,8 @@ "ctxt": 0 }, "value": "parentIndentationDeltaSize", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -18429,7 +17860,6 @@ "ctxt": 0 }, "value": "GetIndentationDelta", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18466,7 +17896,6 @@ "ctxt": 0 }, "value": "indentableParent", - "typeAnnotation": null, "optional": false }, "property": { @@ -18477,7 +17906,6 @@ "ctxt": 0 }, "value": "AuthorNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18490,7 +17918,6 @@ "ctxt": 0 }, "value": "Details", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18503,7 +17930,6 @@ "ctxt": 0 }, "value": "StartOffset", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18540,7 +17966,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false }, "property": { @@ -18551,7 +17976,6 @@ "ctxt": 0 }, "value": "Span", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18564,7 +17988,6 @@ "ctxt": 0 }, "value": "startPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18603,7 +18026,6 @@ "ctxt": 0 }, "value": "parentIndentationDeltaSize", - "typeAnnotation": null, "optional": false }, "right": { @@ -18614,7 +18036,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -18649,8 +18070,8 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -18682,7 +18103,6 @@ "ctxt": 0 }, "value": "ApplyIndentationDelta1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18719,7 +18139,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false }, "property": { @@ -18730,7 +18149,6 @@ "ctxt": 0 }, "value": "Span", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18743,7 +18161,6 @@ "ctxt": 0 }, "value": "startPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18762,7 +18179,6 @@ "ctxt": 0 }, "value": "parentIndentationDeltaSize", - "typeAnnotation": null, "optional": false } } @@ -18794,7 +18210,6 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, "optional": false } } @@ -18825,7 +18240,6 @@ "ctxt": 0 }, "value": "IndentationInfo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -18853,7 +18267,6 @@ "ctxt": 0 }, "value": "ApplyIndentationDelta1", - "typeAnnotation": null, "optional": false }, "function": { @@ -18874,6 +18287,7 @@ "ctxt": 0 }, "value": "tokenStartPosition", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -18890,8 +18304,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -18910,6 +18323,7 @@ "ctxt": 0 }, "value": "delta", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -18926,8 +18340,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -18970,8 +18383,8 @@ "ctxt": 0 }, "value": "snapshotLine", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -19010,7 +18423,6 @@ "ctxt": 0 }, "value": "snapshot", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19023,7 +18435,6 @@ "ctxt": 0 }, "value": "GetLineFromPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19039,7 +18450,6 @@ "ctxt": 0 }, "value": "tokenStartPosition", - "typeAnnotation": null, "optional": false } } @@ -19075,8 +18485,8 @@ "ctxt": 0 }, "value": "currentIndentSpan", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -19093,7 +18503,6 @@ "ctxt": 0 }, "value": "Span", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -19121,7 +18530,6 @@ "ctxt": 0 }, "value": "snapshotLine", - "typeAnnotation": null, "optional": false }, "property": { @@ -19132,7 +18540,6 @@ "ctxt": 0 }, "value": "startPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19159,7 +18566,6 @@ "ctxt": 0 }, "value": "tokenStartPosition", - "typeAnnotation": null, "optional": false }, "right": { @@ -19184,7 +18590,6 @@ "ctxt": 0 }, "value": "snapshotLine", - "typeAnnotation": null, "optional": false }, "property": { @@ -19195,7 +18600,6 @@ "ctxt": 0 }, "value": "startPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19237,8 +18641,8 @@ "ctxt": 0 }, "value": "currentIndent", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -19277,7 +18681,6 @@ "ctxt": 0 }, "value": "snapshot", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19290,7 +18693,6 @@ "ctxt": 0 }, "value": "GetText", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19306,7 +18708,6 @@ "ctxt": 0 }, "value": "currentIndentSpan", - "typeAnnotation": null, "optional": false } } @@ -19354,7 +18755,6 @@ "ctxt": 0 }, "value": "ApplyIndentationDelta2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19370,7 +18770,6 @@ "ctxt": 0 }, "value": "currentIndent", - "typeAnnotation": null, "optional": false } }, @@ -19384,7 +18783,6 @@ "ctxt": 0 }, "value": "delta", - "typeAnnotation": null, "optional": false } } @@ -19419,7 +18817,6 @@ "ctxt": 0 }, "value": "IndentationInfo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -19447,7 +18844,6 @@ "ctxt": 0 }, "value": "ApplyIndentationDelta2", - "typeAnnotation": null, "optional": false }, "function": { @@ -19468,6 +18864,7 @@ "ctxt": 0 }, "value": "currentIndent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -19484,8 +18881,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -19504,6 +18900,7 @@ "ctxt": 0 }, "value": "delta", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -19520,8 +18917,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -19562,7 +18958,6 @@ "ctxt": 0 }, "value": "delta", - "typeAnnotation": null, "optional": false }, "right": { @@ -19618,8 +19013,8 @@ "ctxt": 0 }, "value": "currentIndentSize", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -19643,7 +19038,6 @@ "ctxt": 0 }, "value": "Indenter", - "typeAnnotation": null, "optional": false }, "property": { @@ -19654,7 +19048,6 @@ "ctxt": 0 }, "value": "GetIndentSizeFromIndentText", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19670,7 +19063,6 @@ "ctxt": 0 }, "value": "currentIndent", - "typeAnnotation": null, "optional": false } }, @@ -19699,7 +19091,6 @@ "ctxt": 0 }, "value": "editorOptions", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19737,8 +19128,8 @@ "ctxt": 0 }, "value": "newIndentSize", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -19756,7 +19147,6 @@ "ctxt": 0 }, "value": "currentIndentSize", - "typeAnnotation": null, "optional": false }, "right": { @@ -19767,7 +19157,6 @@ "ctxt": 0 }, "value": "delta", - "typeAnnotation": null, "optional": false } }, @@ -19798,7 +19187,6 @@ "ctxt": 0 }, "value": "newIndentSize", - "typeAnnotation": null, "optional": false }, "right": { @@ -19842,8 +19230,8 @@ "ctxt": 0 }, "value": "newIndentSize", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -19885,8 +19273,8 @@ "ctxt": 0 }, "value": "newIndent", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -19918,7 +19306,6 @@ "ctxt": 0 }, "value": "GetIndentString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19945,7 +19332,6 @@ "ctxt": 0 }, "value": "newIndentSize", - "typeAnnotation": null, "optional": false } }, @@ -19981,7 +19367,6 @@ "ctxt": 0 }, "value": "editorOptions", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19994,7 +19379,6 @@ "ctxt": 0 }, "value": "TabSize", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20032,7 +19416,6 @@ "ctxt": 0 }, "value": "editorOptions", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20045,7 +19428,6 @@ "ctxt": 0 }, "value": "ConvertTabsToSpaces", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20081,7 +19463,6 @@ "ctxt": 0 }, "value": "newIndent", - "typeAnnotation": null, "optional": false }, "right": { @@ -20123,7 +19504,6 @@ "ctxt": 0 }, "value": "IndentationInfo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -20137,7 +19517,6 @@ "ctxt": 0 }, "value": "newIndent", - "typeAnnotation": null, "optional": false } }, @@ -20204,7 +19583,6 @@ "ctxt": 0 }, "value": "IndentationInfo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -20232,7 +19610,6 @@ "ctxt": 0 }, "value": "GetIndentationDelta", - "typeAnnotation": null, "optional": false }, "function": { @@ -20253,6 +19630,7 @@ "ctxt": 0 }, "value": "tokenStartPosition", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -20269,8 +19647,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -20289,6 +19666,7 @@ "ctxt": 0 }, "value": "childTokenStartPosition", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -20305,8 +19683,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -20353,7 +19730,6 @@ "ctxt": 0 }, "value": "Debug", - "typeAnnotation": null, "optional": false }, "property": { @@ -20364,7 +19740,6 @@ "ctxt": 0 }, "value": "Assert", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20388,7 +19763,6 @@ "ctxt": 0 }, "value": "childTokenStartPosition", - "typeAnnotation": null, "optional": false }, "right": { @@ -20399,7 +19773,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -20450,8 +19823,8 @@ "ctxt": 0 }, "value": "indentationDeltaSize", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -20490,7 +19863,6 @@ "ctxt": 0 }, "value": "offsetIndentationDeltas", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20503,7 +19875,6 @@ "ctxt": 0 }, "value": "GetValue", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20519,7 +19890,6 @@ "ctxt": 0 }, "value": "tokenStartPosition", - "typeAnnotation": null, "optional": false } } @@ -20553,7 +19923,6 @@ "ctxt": 0 }, "value": "indentationDeltaSize", - "typeAnnotation": null, "optional": false }, "right": { @@ -20598,8 +19967,8 @@ "ctxt": 0 }, "value": "indentEditInfo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -20638,7 +20007,6 @@ "ctxt": 0 }, "value": "indentationBag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20651,7 +20019,6 @@ "ctxt": 0 }, "value": "FindIndent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20667,7 +20034,6 @@ "ctxt": 0 }, "value": "tokenStartPosition", - "typeAnnotation": null, "optional": false } } @@ -20701,7 +20067,6 @@ "ctxt": 0 }, "value": "indentEditInfo", - "typeAnnotation": null, "optional": false }, "right": { @@ -20756,8 +20121,8 @@ "ctxt": 0 }, "value": "origIndentText", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -20796,7 +20161,6 @@ "ctxt": 0 }, "value": "snapshot", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20809,7 +20173,6 @@ "ctxt": 0 }, "value": "GetText", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20832,7 +20195,6 @@ "ctxt": 0 }, "value": "Span", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -20853,7 +20215,6 @@ "ctxt": 0 }, "value": "indentEditInfo", - "typeAnnotation": null, "optional": false }, "property": { @@ -20864,7 +20225,6 @@ "ctxt": 0 }, "value": "OrigIndentPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20894,7 +20254,6 @@ "ctxt": 0 }, "value": "indentEditInfo", - "typeAnnotation": null, "optional": false }, "property": { @@ -20905,7 +20264,6 @@ "ctxt": 0 }, "value": "OrigIndentLength", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20950,8 +20308,8 @@ "ctxt": 0 }, "value": "newIndentText", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -20975,7 +20333,6 @@ "ctxt": 0 }, "value": "indentEditInfo", - "typeAnnotation": null, "optional": false }, "property": { @@ -20986,7 +20343,6 @@ "ctxt": 0 }, "value": "Indentation", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21023,8 +20379,8 @@ "ctxt": 0 }, "value": "origIndentSize", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -21048,7 +20404,6 @@ "ctxt": 0 }, "value": "Indenter", - "typeAnnotation": null, "optional": false }, "property": { @@ -21059,7 +20414,6 @@ "ctxt": 0 }, "value": "GetIndentSizeFromText", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21075,7 +20429,6 @@ "ctxt": 0 }, "value": "origIndentText", - "typeAnnotation": null, "optional": false } }, @@ -21104,7 +20457,6 @@ "ctxt": 0 }, "value": "editorOptions", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21154,8 +20506,8 @@ "ctxt": 0 }, "value": "newIndentSize", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -21179,7 +20531,6 @@ "ctxt": 0 }, "value": "Indenter", - "typeAnnotation": null, "optional": false }, "property": { @@ -21190,7 +20541,6 @@ "ctxt": 0 }, "value": "GetIndentSizeFromIndentText", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21206,7 +20556,6 @@ "ctxt": 0 }, "value": "newIndentText", - "typeAnnotation": null, "optional": false } }, @@ -21235,7 +20584,6 @@ "ctxt": 0 }, "value": "editorOptions", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21271,7 +20619,6 @@ "ctxt": 0 }, "value": "childTokenStartPosition", - "typeAnnotation": null, "optional": false }, "right": { @@ -21316,8 +20663,8 @@ "ctxt": 0 }, "value": "childTokenLineStartPosition", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -21370,7 +20717,6 @@ "ctxt": 0 }, "value": "snapshot", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21383,7 +20729,6 @@ "ctxt": 0 }, "value": "GetLineFromPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21399,7 +20744,6 @@ "ctxt": 0 }, "value": "childTokenStartPosition", - "typeAnnotation": null, "optional": false } } @@ -21414,7 +20758,6 @@ "ctxt": 0 }, "value": "startPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21451,8 +20794,8 @@ "ctxt": 0 }, "value": "childIndentText", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -21491,7 +20834,6 @@ "ctxt": 0 }, "value": "snapshot", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21504,7 +20846,6 @@ "ctxt": 0 }, "value": "GetText", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21527,7 +20868,6 @@ "ctxt": 0 }, "value": "Span", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -21541,7 +20881,6 @@ "ctxt": 0 }, "value": "childTokenLineStartPosition", - "typeAnnotation": null, "optional": false } }, @@ -21563,7 +20902,6 @@ "ctxt": 0 }, "value": "childTokenStartPosition", - "typeAnnotation": null, "optional": false }, "right": { @@ -21574,7 +20912,6 @@ "ctxt": 0 }, "value": "childTokenLineStartPosition", - "typeAnnotation": null, "optional": false } } @@ -21615,8 +20952,8 @@ "ctxt": 0 }, "value": "childIndentSize", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -21640,7 +20977,6 @@ "ctxt": 0 }, "value": "Indenter", - "typeAnnotation": null, "optional": false }, "property": { @@ -21651,7 +20987,6 @@ "ctxt": 0 }, "value": "GetIndentSizeFromIndentText", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21667,7 +21002,6 @@ "ctxt": 0 }, "value": "childIndentText", - "typeAnnotation": null, "optional": false } }, @@ -21696,7 +21030,6 @@ "ctxt": 0 }, "value": "editorOptions", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21732,7 +21065,6 @@ "ctxt": 0 }, "value": "childIndentSize", - "typeAnnotation": null, "optional": false }, "right": { @@ -21743,7 +21075,6 @@ "ctxt": 0 }, "value": "origIndentSize", - "typeAnnotation": null, "optional": false } }, @@ -21770,8 +21101,8 @@ "ctxt": 0 }, "value": "origIndentSize", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -21795,7 +21126,6 @@ "ctxt": 0 }, "value": "Indenter", - "typeAnnotation": null, "optional": false }, "property": { @@ -21806,7 +21136,6 @@ "ctxt": 0 }, "value": "GetIndentSizeFromIndentText", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21822,7 +21151,6 @@ "ctxt": 0 }, "value": "origIndentText", - "typeAnnotation": null, "optional": false } }, @@ -21851,7 +21179,6 @@ "ctxt": 0 }, "value": "editorOptions", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21891,8 +21218,8 @@ "ctxt": 0 }, "value": "indentationDeltaSize", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -21910,7 +21237,6 @@ "ctxt": 0 }, "value": "newIndentSize", - "typeAnnotation": null, "optional": false }, "right": { @@ -21921,7 +21247,6 @@ "ctxt": 0 }, "value": "origIndentSize", - "typeAnnotation": null, "optional": false } } @@ -21971,7 +21296,6 @@ "ctxt": 0 }, "value": "offsetIndentationDeltas", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21984,7 +21308,6 @@ "ctxt": 0 }, "value": "Add", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22000,7 +21323,6 @@ "ctxt": 0 }, "value": "tokenStartPosition", - "typeAnnotation": null, "optional": false } }, @@ -22014,7 +21336,6 @@ "ctxt": 0 }, "value": "indentationDeltaSize", - "typeAnnotation": null, "optional": false } } @@ -22041,7 +21362,6 @@ "ctxt": 0 }, "value": "indentationDeltaSize", - "typeAnnotation": null, "optional": false } } @@ -22089,7 +21409,6 @@ "ctxt": 0 }, "value": "FillInheritedIndentation", - "typeAnnotation": null, "optional": false }, "function": { @@ -22110,6 +21429,7 @@ "ctxt": 0 }, "value": "tree", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -22132,13 +21452,11 @@ "ctxt": 0 }, "value": "ParseTree", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -22181,8 +21499,8 @@ "ctxt": 0 }, "value": "offset", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -22231,6 +21549,7 @@ "ctxt": 0 }, "value": "indentNode", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -22253,13 +21572,11 @@ "ctxt": 0 }, "value": "ParseNode", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -22303,7 +21620,6 @@ "ctxt": 0 }, "value": "tree", - "typeAnnotation": null, "optional": false }, "property": { @@ -22314,7 +21630,6 @@ "ctxt": 0 }, "value": "StartNodeSelf", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22398,7 +21713,6 @@ "ctxt": 0 }, "value": "smartIndent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22427,7 +21741,6 @@ "ctxt": 0 }, "value": "tree", - "typeAnnotation": null, "optional": false }, "property": { @@ -22438,7 +21751,6 @@ "ctxt": 0 }, "value": "StartNodePreviousSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22490,7 +21802,6 @@ "ctxt": 0 }, "value": "tree", - "typeAnnotation": null, "optional": false }, "property": { @@ -22501,7 +21812,6 @@ "ctxt": 0 }, "value": "StartNodeSelf", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22514,7 +21824,6 @@ "ctxt": 0 }, "value": "AuthorNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22527,7 +21836,6 @@ "ctxt": 0 }, "value": "Label", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22573,7 +21881,6 @@ "ctxt": 0 }, "value": "tree", - "typeAnnotation": null, "optional": false }, "property": { @@ -22584,7 +21891,6 @@ "ctxt": 0 }, "value": "StartNodePreviousSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22597,7 +21903,6 @@ "ctxt": 0 }, "value": "Label", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22644,8 +21949,8 @@ "ctxt": 0 }, "value": "indentNode", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -22662,7 +21967,6 @@ "ctxt": 0 }, "value": "tree", - "typeAnnotation": null, "optional": false }, "property": { @@ -22673,7 +21977,6 @@ "ctxt": 0 }, "value": "StartNodeSelf", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22703,8 +22006,8 @@ "ctxt": 0 }, "value": "offset", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -22735,7 +22038,6 @@ "ctxt": 0 }, "value": "tree", - "typeAnnotation": null, "optional": false }, "property": { @@ -22746,7 +22048,6 @@ "ctxt": 0 }, "value": "StartNodePreviousSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22759,7 +22060,6 @@ "ctxt": 0 }, "value": "Details", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22772,7 +22072,6 @@ "ctxt": 0 }, "value": "StartOffset", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22804,8 +22103,8 @@ "ctxt": 0 }, "value": "lineNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -22844,7 +22143,6 @@ "ctxt": 0 }, "value": "snapshot", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22857,7 +22155,6 @@ "ctxt": 0 }, "value": "GetLineNumberFromPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22873,7 +22170,6 @@ "ctxt": 0 }, "value": "offset", - "typeAnnotation": null, "optional": false } } @@ -22909,8 +22205,8 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -22920,7 +22216,6 @@ "ctxt": 0 }, "value": "indentNode", - "typeAnnotation": null, "optional": false }, "definite": false @@ -22965,7 +22260,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -22976,7 +22270,6 @@ "ctxt": 0 }, "value": "Parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23035,7 +22328,6 @@ "ctxt": 0 }, "value": "snapshot", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23048,7 +22340,6 @@ "ctxt": 0 }, "value": "GetLineNumberFromPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23092,7 +22383,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -23103,7 +22393,6 @@ "ctxt": 0 }, "value": "Parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23116,7 +22405,6 @@ "ctxt": 0 }, "value": "AuthorNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23129,7 +22417,6 @@ "ctxt": 0 }, "value": "Details", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23142,7 +22429,6 @@ "ctxt": 0 }, "value": "StartOffset", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23159,7 +22445,6 @@ "ctxt": 0 }, "value": "lineNum", - "typeAnnotation": null, "optional": false } } @@ -23195,8 +22480,8 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -23213,7 +22498,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -23224,7 +22508,6 @@ "ctxt": 0 }, "value": "Parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23260,7 +22543,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -23271,7 +22553,6 @@ "ctxt": 0 }, "value": "CanIndent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23310,8 +22591,8 @@ "ctxt": 0 }, "value": "indentNode", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -23321,7 +22602,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false } } @@ -23356,7 +22636,6 @@ "ctxt": 0 }, "value": "indentNode", - "typeAnnotation": null, "optional": false }, "property": { @@ -23367,7 +22646,6 @@ "ctxt": 0 }, "value": "IndentationDelta", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23425,6 +22703,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -23447,13 +22726,11 @@ "ctxt": 0 }, "value": "ParseNode", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -23490,7 +22767,6 @@ "ctxt": 0 }, "value": "smartIndent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23526,8 +22802,8 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -23544,7 +22820,6 @@ "ctxt": 0 }, "value": "tree", - "typeAnnotation": null, "optional": false }, "property": { @@ -23555,7 +22830,6 @@ "ctxt": 0 }, "value": "StartNodeSelf", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23593,7 +22867,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "right": { @@ -23642,7 +22915,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "property": { @@ -23653,7 +22925,6 @@ "ctxt": 0 }, "value": "AuthorNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23666,7 +22937,6 @@ "ctxt": 0 }, "value": "Details", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23679,7 +22949,6 @@ "ctxt": 0 }, "value": "StartOffset", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23728,7 +22997,6 @@ "ctxt": 0 }, "value": "firstToken", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23741,7 +23009,6 @@ "ctxt": 0 }, "value": "Span", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23754,7 +23021,6 @@ "ctxt": 0 }, "value": "startPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23787,8 +23053,8 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -23805,7 +23071,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "property": { @@ -23816,7 +23081,6 @@ "ctxt": 0 }, "value": "Parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23859,8 +23123,8 @@ "ctxt": 0 }, "value": "startNodeLineNumber", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -23899,7 +23163,6 @@ "ctxt": 0 }, "value": "snapshot", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23912,7 +23175,6 @@ "ctxt": 0 }, "value": "GetLineNumberFromPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23956,7 +23218,6 @@ "ctxt": 0 }, "value": "tree", - "typeAnnotation": null, "optional": false }, "property": { @@ -23967,7 +23228,6 @@ "ctxt": 0 }, "value": "StartNodeSelf", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23980,7 +23240,6 @@ "ctxt": 0 }, "value": "AuthorNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23993,7 +23252,6 @@ "ctxt": 0 }, "value": "Details", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24006,7 +23264,6 @@ "ctxt": 0 }, "value": "StartOffset", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24042,8 +23299,8 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -24067,7 +23324,6 @@ "ctxt": 0 }, "value": "tree", - "typeAnnotation": null, "optional": false }, "property": { @@ -24078,7 +23334,6 @@ "ctxt": 0 }, "value": "StartNodeSelf", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24091,7 +23346,6 @@ "ctxt": 0 }, "value": "Parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24129,7 +23383,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "right": { @@ -24157,7 +23410,6 @@ "ctxt": 0 }, "value": "startNodeLineNumber", - "typeAnnotation": null, "optional": false }, "right": { @@ -24197,7 +23449,6 @@ "ctxt": 0 }, "value": "snapshot", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24210,7 +23461,6 @@ "ctxt": 0 }, "value": "GetLineNumberFromPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24247,7 +23497,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "property": { @@ -24258,7 +23507,6 @@ "ctxt": 0 }, "value": "AuthorNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24271,7 +23519,6 @@ "ctxt": 0 }, "value": "Details", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24284,7 +23531,6 @@ "ctxt": 0 }, "value": "StartOffset", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24326,8 +23572,8 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -24344,7 +23590,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "property": { @@ -24355,7 +23600,6 @@ "ctxt": 0 }, "value": "Parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24399,7 +23643,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "right": { @@ -24441,7 +23684,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "property": { @@ -24452,7 +23694,6 @@ "ctxt": 0 }, "value": "CanIndent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24493,8 +23734,8 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -24511,7 +23752,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "property": { @@ -24522,7 +23762,6 @@ "ctxt": 0 }, "value": "Parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24563,7 +23802,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "right": { @@ -24612,7 +23850,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "property": { @@ -24623,7 +23860,6 @@ "ctxt": 0 }, "value": "AuthorNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24636,7 +23872,6 @@ "ctxt": 0 }, "value": "Details", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24649,7 +23884,6 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24669,7 +23903,6 @@ "ctxt": 0 }, "value": "AuthorParseNodeKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -24680,7 +23913,6 @@ "ctxt": 0 }, "value": "apnkProg", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24718,8 +23950,8 @@ "ctxt": 0 }, "value": "offset", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -24750,7 +23982,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "property": { @@ -24761,7 +23992,6 @@ "ctxt": 0 }, "value": "AuthorNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24774,7 +24004,6 @@ "ctxt": 0 }, "value": "Details", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24787,7 +24016,6 @@ "ctxt": 0 }, "value": "StartOffset", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24817,8 +24045,8 @@ "ctxt": 0 }, "value": "indentNode", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -24828,7 +24056,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false } } @@ -24867,7 +24094,6 @@ "ctxt": 0 }, "value": "indentNode", - "typeAnnotation": null, "optional": false }, "right": { @@ -24912,8 +24138,8 @@ "ctxt": 0 }, "value": "indentOverride", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -24945,7 +24171,6 @@ "ctxt": 0 }, "value": "GetLineIndentationForOffset", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24961,7 +24186,6 @@ "ctxt": 0 }, "value": "offset", - "typeAnnotation": null, "optional": false } } @@ -25026,7 +24250,6 @@ "ctxt": 0 }, "value": "smartIndent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25055,7 +24278,6 @@ "ctxt": 0 }, "value": "tree", - "typeAnnotation": null, "optional": false }, "property": { @@ -25066,7 +24288,6 @@ "ctxt": 0 }, "value": "StartNodePreviousSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25104,7 +24325,6 @@ "ctxt": 0 }, "value": "indentNode", - "typeAnnotation": null, "optional": false }, "property": { @@ -25115,7 +24335,6 @@ "ctxt": 0 }, "value": "Parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25181,7 +24400,6 @@ "ctxt": 0 }, "value": "ParseNodeExtensions", - "typeAnnotation": null, "optional": false }, "property": { @@ -25192,7 +24410,6 @@ "ctxt": 0 }, "value": "GetChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25215,7 +24432,6 @@ "ctxt": 0 }, "value": "indentNode", - "typeAnnotation": null, "optional": false }, "property": { @@ -25226,7 +24442,6 @@ "ctxt": 0 }, "value": "Parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25243,7 +24458,6 @@ "ctxt": 0 }, "value": "foreach", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25267,8 +24481,8 @@ "ctxt": 0 }, "value": "sibling", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -25302,7 +24516,6 @@ "ctxt": 0 }, "value": "sibling", - "typeAnnotation": null, "optional": false }, "right": { @@ -25313,7 +24526,6 @@ "ctxt": 0 }, "value": "indentNode", - "typeAnnotation": null, "optional": false } }, @@ -25354,7 +24566,6 @@ "ctxt": 0 }, "value": "sibling", - "typeAnnotation": null, "optional": false }, "property": { @@ -25365,7 +24576,6 @@ "ctxt": 0 }, "value": "CanIndent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25402,7 +24612,6 @@ "ctxt": 0 }, "value": "sibling", - "typeAnnotation": null, "optional": false }, "property": { @@ -25413,7 +24622,6 @@ "ctxt": 0 }, "value": "SetIndentationOverride", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25429,7 +24637,6 @@ "ctxt": 0 }, "value": "indentOverride", - "typeAnnotation": null, "optional": false } } @@ -25484,8 +24691,8 @@ "ctxt": 0 }, "value": "lastDelta", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -25525,8 +24732,8 @@ "ctxt": 0 }, "value": "lastLine", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -25565,7 +24772,6 @@ "ctxt": 0 }, "value": "snapshot", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25578,7 +24784,6 @@ "ctxt": 0 }, "value": "GetLineNumberFromPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25615,7 +24820,6 @@ "ctxt": 0 }, "value": "indentNode", - "typeAnnotation": null, "optional": false }, "property": { @@ -25626,7 +24830,6 @@ "ctxt": 0 }, "value": "AuthorNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25639,7 +24842,6 @@ "ctxt": 0 }, "value": "Details", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25652,7 +24854,6 @@ "ctxt": 0 }, "value": "StartOffset", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25688,7 +24889,6 @@ "ctxt": 0 }, "value": "indentNode", - "typeAnnotation": null, "optional": false }, "right": { @@ -25733,8 +24933,8 @@ "ctxt": 0 }, "value": "currentLine", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -25773,7 +24973,6 @@ "ctxt": 0 }, "value": "snapshot", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25786,7 +24985,6 @@ "ctxt": 0 }, "value": "GetLineNumberFromPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25823,7 +25021,6 @@ "ctxt": 0 }, "value": "indentNode", - "typeAnnotation": null, "optional": false }, "property": { @@ -25834,7 +25031,6 @@ "ctxt": 0 }, "value": "AuthorNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25847,7 +25043,6 @@ "ctxt": 0 }, "value": "Details", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25860,7 +25055,6 @@ "ctxt": 0 }, "value": "StartOffset", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25896,7 +25090,6 @@ "ctxt": 0 }, "value": "lastLine", - "typeAnnotation": null, "optional": false }, "right": { @@ -25907,7 +25100,6 @@ "ctxt": 0 }, "value": "currentLine", - "typeAnnotation": null, "optional": false } }, @@ -25942,8 +25134,8 @@ "ctxt": 0 }, "value": "lastLine", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -25953,7 +25145,6 @@ "ctxt": 0 }, "value": "currentLine", - "typeAnnotation": null, "optional": false } } @@ -25981,8 +25172,8 @@ "ctxt": 0 }, "value": "indentOverride", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -26014,7 +25205,6 @@ "ctxt": 0 }, "value": "ApplyIndentationLevel", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26030,7 +25220,6 @@ "ctxt": 0 }, "value": "indentOverride", - "typeAnnotation": null, "optional": false } }, @@ -26052,7 +25241,6 @@ "ctxt": 0 }, "value": "lastDelta", - "typeAnnotation": null, "optional": false } } @@ -26085,8 +25273,8 @@ "ctxt": 0 }, "value": "lastDelta", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -26132,7 +25320,6 @@ "ctxt": 0 }, "value": "indentNode", - "typeAnnotation": null, "optional": false }, "property": { @@ -26143,7 +25330,6 @@ "ctxt": 0 }, "value": "CanIndent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26188,7 +25374,6 @@ "ctxt": 0 }, "value": "indentNode", - "typeAnnotation": null, "optional": false }, "property": { @@ -26199,7 +25384,6 @@ "ctxt": 0 }, "value": "SetIndentationOverride", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26215,7 +25399,6 @@ "ctxt": 0 }, "value": "indentOverride", - "typeAnnotation": null, "optional": false } } @@ -26246,8 +25429,8 @@ "ctxt": 0 }, "value": "lastDelta", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -26264,7 +25447,6 @@ "ctxt": 0 }, "value": "indentNode", - "typeAnnotation": null, "optional": false }, "property": { @@ -26275,7 +25457,6 @@ "ctxt": 0 }, "value": "IndentationDelta", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26309,8 +25490,8 @@ "ctxt": 0 }, "value": "indentNode", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -26327,7 +25508,6 @@ "ctxt": 0 }, "value": "indentNode", - "typeAnnotation": null, "optional": false }, "property": { @@ -26338,7 +25518,6 @@ "ctxt": 0 }, "value": "Parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26396,7 +25575,6 @@ "ctxt": 0 }, "value": "GetLineIndentationForOffset", - "typeAnnotation": null, "optional": false }, "function": { @@ -26417,6 +25595,7 @@ "ctxt": 0 }, "value": "offset", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -26433,8 +25612,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -26477,6 +25655,7 @@ "ctxt": 0 }, "value": "indentationEdit", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -26499,13 +25678,11 @@ "ctxt": 0 }, "value": "IndentationEditInfo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -26535,8 +25712,8 @@ "ctxt": 0 }, "value": "indentationEdit", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -26575,7 +25752,6 @@ "ctxt": 0 }, "value": "indentationBag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26588,7 +25764,6 @@ "ctxt": 0 }, "value": "FindIndent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26604,7 +25779,6 @@ "ctxt": 0 }, "value": "offset", - "typeAnnotation": null, "optional": false } } @@ -26636,7 +25810,6 @@ "ctxt": 0 }, "value": "indentationEdit", - "typeAnnotation": null, "optional": false }, "right": { @@ -26685,7 +25858,6 @@ "ctxt": 0 }, "value": "indentationEdit", - "typeAnnotation": null, "optional": false }, "property": { @@ -26696,7 +25868,6 @@ "ctxt": 0 }, "value": "Indentation", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26740,8 +25911,8 @@ "ctxt": 0 }, "value": "line", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -26780,7 +25951,6 @@ "ctxt": 0 }, "value": "snapshot", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26793,7 +25963,6 @@ "ctxt": 0 }, "value": "GetLineFromPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26809,7 +25978,6 @@ "ctxt": 0 }, "value": "offset", - "typeAnnotation": null, "optional": false } } @@ -26845,8 +26013,8 @@ "ctxt": 0 }, "value": "lineText", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -26870,7 +26038,6 @@ "ctxt": 0 }, "value": "line", - "typeAnnotation": null, "optional": false }, "property": { @@ -26881,7 +26048,6 @@ "ctxt": 0 }, "value": "getText", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26918,8 +26084,8 @@ "ctxt": 0 }, "value": "index", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -26965,7 +26131,6 @@ "ctxt": 0 }, "value": "index", - "typeAnnotation": null, "optional": false }, "right": { @@ -26983,7 +26148,6 @@ "ctxt": 0 }, "value": "lineText", - "typeAnnotation": null, "optional": false }, "property": { @@ -26994,7 +26158,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27045,7 +26208,6 @@ "ctxt": 0 }, "value": "lineText", - "typeAnnotation": null, "optional": false }, "property": { @@ -27056,7 +26218,6 @@ "ctxt": 0 }, "value": "charAt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27072,7 +26233,6 @@ "ctxt": 0 }, "value": "index", - "typeAnnotation": null, "optional": false } } @@ -27124,7 +26284,6 @@ "ctxt": 0 }, "value": "lineText", - "typeAnnotation": null, "optional": false }, "property": { @@ -27135,7 +26294,6 @@ "ctxt": 0 }, "value": "charAt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27151,7 +26309,6 @@ "ctxt": 0 }, "value": "index", - "typeAnnotation": null, "optional": false } } @@ -27208,7 +26365,6 @@ "ctxt": 0 }, "value": "index", - "typeAnnotation": null, "optional": false } } @@ -27245,7 +26401,6 @@ "ctxt": 0 }, "value": "lineText", - "typeAnnotation": null, "optional": false }, "property": { @@ -27256,7 +26411,6 @@ "ctxt": 0 }, "value": "substr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27284,7 +26438,6 @@ "ctxt": 0 }, "value": "index", - "typeAnnotation": null, "optional": false } } @@ -27339,7 +26492,6 @@ "ctxt": 0 }, "value": "RegisterIndentation", - "typeAnnotation": null, "optional": false }, "function": { @@ -27360,6 +26512,7 @@ "ctxt": 0 }, "value": "indent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -27382,13 +26535,11 @@ "ctxt": 0 }, "value": "TextEditInfo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -27407,6 +26558,7 @@ "ctxt": 0 }, "value": "sameLineIndent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -27423,8 +26575,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -27467,6 +26618,7 @@ "ctxt": 0 }, "value": "indentationInfo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -27489,13 +26641,11 @@ "ctxt": 0 }, "value": "IndentationEditInfo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -27524,7 +26674,6 @@ "ctxt": 0 }, "value": "sameLineIndent", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -27560,8 +26709,8 @@ "ctxt": 0 }, "value": "lineStartPosition", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -27614,7 +26763,6 @@ "ctxt": 0 }, "value": "snapshot", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27627,7 +26775,6 @@ "ctxt": 0 }, "value": "GetLineFromPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27650,7 +26797,6 @@ "ctxt": 0 }, "value": "indent", - "typeAnnotation": null, "optional": false }, "property": { @@ -27661,7 +26807,6 @@ "ctxt": 0 }, "value": "Position", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27678,7 +26823,6 @@ "ctxt": 0 }, "value": "startPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27715,8 +26859,8 @@ "ctxt": 0 }, "value": "lineIndentLength", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -27741,7 +26885,6 @@ "ctxt": 0 }, "value": "indent", - "typeAnnotation": null, "optional": false }, "property": { @@ -27752,7 +26895,6 @@ "ctxt": 0 }, "value": "Position", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27765,7 +26907,6 @@ "ctxt": 0 }, "value": "lineStartPosition", - "typeAnnotation": null, "optional": false } }, @@ -27796,8 +26937,8 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -27821,7 +26962,6 @@ "ctxt": 0 }, "value": "IndentationEditInfo", - "typeAnnotation": null, "optional": false }, "property": { @@ -27832,7 +26972,6 @@ "ctxt": 0 }, "value": "create2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27855,7 +26994,6 @@ "ctxt": 0 }, "value": "indent", - "typeAnnotation": null, "optional": false }, "property": { @@ -27866,7 +27004,6 @@ "ctxt": 0 }, "value": "Position", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27889,7 +27026,6 @@ "ctxt": 0 }, "value": "indent", - "typeAnnotation": null, "optional": false }, "property": { @@ -27900,7 +27036,6 @@ "ctxt": 0 }, "value": "ReplaceWith", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27916,7 +27051,6 @@ "ctxt": 0 }, "value": "lineStartPosition", - "typeAnnotation": null, "optional": false } }, @@ -27930,7 +27064,6 @@ "ctxt": 0 }, "value": "lineIndentLength", - "typeAnnotation": null, "optional": false } } @@ -27972,8 +27105,8 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -27990,7 +27123,6 @@ "ctxt": 0 }, "value": "IndentationEditInfo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -28004,7 +27136,6 @@ "ctxt": 0 }, "value": "indent", - "typeAnnotation": null, "optional": false } } @@ -28060,7 +27191,6 @@ "ctxt": 0 }, "value": "indentationBag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28073,7 +27203,6 @@ "ctxt": 0 }, "value": "AddIndent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28089,7 +27218,6 @@ "ctxt": 0 }, "value": "indentationInfo", - "typeAnnotation": null, "optional": false } } @@ -28141,7 +27269,6 @@ "ctxt": 0 }, "value": "RegisterIndentation2", - "typeAnnotation": null, "optional": false }, "function": { @@ -28162,6 +27289,7 @@ "ctxt": 0 }, "value": "position", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -28178,8 +27306,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -28198,6 +27325,7 @@ "ctxt": 0 }, "value": "indent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -28214,8 +27342,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -28270,7 +27397,6 @@ "ctxt": 0 }, "value": "RegisterIndentation", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28293,7 +27419,6 @@ "ctxt": 0 }, "value": "TextEditInfo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -28307,7 +27432,6 @@ "ctxt": 0 }, "value": "position", - "typeAnnotation": null, "optional": false } }, @@ -28333,7 +27457,6 @@ "ctxt": 0 }, "value": "indent", - "typeAnnotation": null, "optional": false } } @@ -28401,7 +27524,6 @@ "ctxt": 0 }, "value": "AdjustStartOffsetIfNeeded", - "typeAnnotation": null, "optional": false }, "function": { @@ -28422,6 +27544,7 @@ "ctxt": 0 }, "value": "token", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -28444,13 +27567,11 @@ "ctxt": 0 }, "value": "TokenSpan", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -28469,6 +27590,7 @@ "ctxt": 0 }, "value": "node", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -28491,13 +27613,11 @@ "ctxt": 0 }, "value": "ParseNode", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -28538,7 +27658,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false }, "right": { @@ -28586,8 +27705,8 @@ "ctxt": 0 }, "value": "updateStartOffset", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -28624,7 +27743,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false }, "property": { @@ -28635,7 +27753,6 @@ "ctxt": 0 }, "value": "Token", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28663,7 +27780,6 @@ "ctxt": 0 }, "value": "AuthorTokenKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -28674,7 +27790,6 @@ "ctxt": 0 }, "value": "atkFunction", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28703,8 +27818,8 @@ "ctxt": 0 }, "value": "updateStartOffset", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -28743,7 +27858,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -28754,7 +27868,6 @@ "ctxt": 0 }, "value": "AuthorNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28767,7 +27880,6 @@ "ctxt": 0 }, "value": "Details", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28780,7 +27892,6 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28800,7 +27911,6 @@ "ctxt": 0 }, "value": "AuthorParseNodeKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -28811,7 +27921,6 @@ "ctxt": 0 }, "value": "apnkFncDecl", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28852,7 +27961,6 @@ "ctxt": 0 }, "value": "AuthorTokenKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -28863,7 +27971,6 @@ "ctxt": 0 }, "value": "atkLCurly", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28892,8 +27999,8 @@ "ctxt": 0 }, "value": "updateStartOffset", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -28932,7 +28039,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -28943,7 +28049,6 @@ "ctxt": 0 }, "value": "AuthorNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28956,7 +28061,6 @@ "ctxt": 0 }, "value": "Details", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28969,7 +28073,6 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28989,7 +28092,6 @@ "ctxt": 0 }, "value": "AuthorParseNodeKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -29000,7 +28102,6 @@ "ctxt": 0 }, "value": "apnkObject", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29041,7 +28142,6 @@ "ctxt": 0 }, "value": "AuthorTokenKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -29052,7 +28152,6 @@ "ctxt": 0 }, "value": "atkLBrack", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29081,8 +28180,8 @@ "ctxt": 0 }, "value": "updateStartOffset", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -29121,7 +28220,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -29132,7 +28230,6 @@ "ctxt": 0 }, "value": "AuthorNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29145,7 +28242,6 @@ "ctxt": 0 }, "value": "Details", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29158,7 +28254,6 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29178,7 +28273,6 @@ "ctxt": 0 }, "value": "AuthorParseNodeKind", - "typeAnnotation": null, "optional": false }, "property": { @@ -29189,7 +28283,6 @@ "ctxt": 0 }, "value": "apnkArray", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29225,7 +28318,6 @@ "ctxt": 0 }, "value": "updateStartOffset", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -29265,7 +28357,6 @@ "ctxt": 0 }, "value": "ParseNodeExtensions", - "typeAnnotation": null, "optional": false }, "property": { @@ -29276,7 +28367,6 @@ "ctxt": 0 }, "value": "SetNodeSpan", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29292,7 +28382,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false } }, @@ -29327,7 +28416,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false }, "property": { @@ -29338,7 +28426,6 @@ "ctxt": 0 }, "value": "Span", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29351,7 +28438,6 @@ "ctxt": 0 }, "value": "startPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29391,7 +28477,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -29402,7 +28487,6 @@ "ctxt": 0 }, "value": "AuthorNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29415,7 +28499,6 @@ "ctxt": 0 }, "value": "Details", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29428,7 +28511,6 @@ "ctxt": 0 }, "value": "EndOffset", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29486,7 +28568,6 @@ "ctxt": 0 }, "value": "IsMultiLineString", - "typeAnnotation": null, "optional": false }, "function": { @@ -29507,6 +28588,7 @@ "ctxt": 0 }, "value": "token", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -29529,13 +28611,11 @@ "ctxt": 0 }, "value": "TokenSpan", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -29591,7 +28671,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false }, "property": { @@ -29602,7 +28681,6 @@ "ctxt": 0 }, "value": "tokenID", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29629,7 +28707,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -29640,7 +28717,6 @@ "ctxt": 0 }, "value": "TokenID", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29653,7 +28729,6 @@ "ctxt": 0 }, "value": "StringLiteral", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29704,7 +28779,6 @@ "ctxt": 0 }, "value": "snapshot", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29717,7 +28791,6 @@ "ctxt": 0 }, "value": "GetLineNumberFromPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29754,7 +28827,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false }, "property": { @@ -29765,7 +28837,6 @@ "ctxt": 0 }, "value": "Span", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29778,7 +28849,6 @@ "ctxt": 0 }, "value": "endPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29827,7 +28897,6 @@ "ctxt": 0 }, "value": "snapshot", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29840,7 +28909,6 @@ "ctxt": 0 }, "value": "GetLineNumberFromPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29877,7 +28945,6 @@ "ctxt": 0 }, "value": "token", - "typeAnnotation": null, "optional": false }, "property": { @@ -29888,7 +28955,6 @@ "ctxt": 0 }, "value": "Span", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29901,7 +28967,6 @@ "ctxt": 0 }, "value": "startPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29966,7 +29031,6 @@ "ctxt": 0 }, "value": "ILineIndenationResolver", - "typeAnnotation": null, "optional": false }, "typeArguments": null diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509534/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509534/input.ts.json index 74e5c5e7bfb3..8258bfbb33f7 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509534/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509534/input.ts.json @@ -53,8 +53,8 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -71,7 +71,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -136,7 +135,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -147,7 +145,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -160,7 +157,6 @@ "ctxt": 0 }, "value": "route", - "typeAnnotation": null, "optional": false }, "computed": false @@ -185,8 +181,8 @@ "ctxt": 0 }, "value": "server", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -233,7 +229,6 @@ "ctxt": 0 }, "value": "server", - "typeAnnotation": null, "optional": false }, "property": { @@ -244,7 +239,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -282,7 +276,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -293,7 +286,6 @@ "ctxt": 0 }, "value": "env", - "typeAnnotation": null, "optional": false }, "computed": false @@ -306,7 +298,6 @@ "ctxt": 0 }, "value": "siteRoot", - "typeAnnotation": null, "optional": false }, "computed": false @@ -349,8 +340,8 @@ "ctxt": 0 }, "value": "req", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -369,8 +360,8 @@ "ctxt": 0 }, "value": "res", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -389,8 +380,8 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -437,7 +428,6 @@ "ctxt": 0 }, "value": "req", - "typeAnnotation": null, "optional": false }, "property": { @@ -448,7 +438,6 @@ "ctxt": 0 }, "value": "redirect", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509546/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509546/input.ts.json index adef9df1bd63..281be21e22a8 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509546/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509546/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Logger", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "public", - "typeAnnotation": null, "optional": false }, "value": null, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509546_1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509546_1/input.ts.json index adef9df1bd63..281be21e22a8 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509546_1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509546_1/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Logger", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "public", - "typeAnnotation": null, "optional": false }, "value": null, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509546_2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509546_2/input.ts.json index 4c80d9f9d251..f1c26f272140 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509546_2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509546_2/input.ts.json @@ -45,7 +45,6 @@ "ctxt": 0 }, "value": "Logger", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "public", - "typeAnnotation": null, "optional": false }, "value": null, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509677/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509677/input.ts.json index 4fc1bec657c2..f1ccdaa68d99 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509677/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509677/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,8 +90,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509693/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509693/input.ts.json index 695b82659708..9ed3b8e9d78f 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509693/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509693/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -83,7 +81,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -94,7 +91,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509698/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509698/input.ts.json index f1c63ea95d4a..5f1b187dd601 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509698/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser509698/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": true, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser536727/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser536727/input.ts.json index bdc016981727..3f1ef4074de8 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser536727/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser536727/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -76,8 +77,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -99,8 +99,7 @@ } } } - }, - "optional": false + } } } ], @@ -140,7 +139,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -197,8 +195,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -216,6 +214,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -232,8 +231,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -252,7 +250,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -304,8 +301,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -323,7 +320,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "async": false, @@ -357,7 +353,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -371,7 +366,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } } @@ -401,7 +395,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -423,7 +416,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "async": false, @@ -458,7 +450,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -472,7 +463,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser579071/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser579071/input.ts.json index 6cb64623e06e..ad9d6f66ed6d 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser579071/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser579071/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser596700/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser596700/input.ts.json index 880f82d6bda1..d5c0dc4177e0 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser596700/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser596700/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "regex2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser630933/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser630933/input.ts.json index 3ce10a2624eb..eebad9232004 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser630933/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser630933/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -77,8 +77,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -102,7 +102,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -113,7 +112,6 @@ "ctxt": 0 }, "value": "match", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser643728/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser643728/input.ts.json index 9c2514c8f3bb..c43e97659683 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser643728/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser643728/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser645086_3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser645086_3/input.ts.json index 83bfa224419f..f7005d6f3a64 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser645086_3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser645086_3/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser645086_4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser645086_4/input.ts.json index b257a99cd56f..1a033ebdc123 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser645086_4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser645086_4/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser645484/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser645484/input.ts.json index a5864334171d..a6cbd8b8c3b6 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser645484/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parser645484/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -89,8 +89,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parserNotHexLiteral1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parserNotHexLiteral1/input.ts.json index 87e32097d00a..744fc8c90bf4 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parserNotHexLiteral1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parserNotHexLiteral1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "e0", - "typeAnnotation": null, "optional": false }, "value": { @@ -80,7 +79,6 @@ "ctxt": 0 }, "value": "x0", - "typeAnnotation": null, "optional": false }, "value": { @@ -133,7 +131,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "info", - "typeAnnotation": null, "optional": false }, "computed": false @@ -167,7 +163,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -178,7 +173,6 @@ "ctxt": 0 }, "value": "x0", - "typeAnnotation": null, "optional": false }, "computed": false @@ -217,7 +211,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -228,7 +221,6 @@ "ctxt": 0 }, "value": "info", - "typeAnnotation": null, "optional": false }, "computed": false @@ -251,7 +243,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -262,7 +253,6 @@ "ctxt": 0 }, "value": "e0", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parserTernaryAndCommaOperators1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parserTernaryAndCommaOperators1/input.ts.json index 008dbe15c2a5..c9465a7839c8 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parserTernaryAndCommaOperators1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegressionTests/parserTernaryAndCommaOperators1/input.ts.json @@ -43,7 +43,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -54,7 +53,6 @@ "ctxt": 0 }, "value": "src", - "typeAnnotation": null, "optional": false }, "computed": false @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -105,7 +102,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parseRegularExpressionMixedWithComments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parseRegularExpressionMixedWithComments/input.ts.json index 8c0aebfa6956..1c405ae1cfb1 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parseRegularExpressionMixedWithComments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parseRegularExpressionMixedWithComments/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "regex1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", @@ -73,8 +73,8 @@ "ctxt": 0 }, "value": "regex2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", @@ -115,8 +115,8 @@ "ctxt": 0 }, "value": "regex3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -156,8 +156,8 @@ "ctxt": 0 }, "value": "regex4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -217,8 +217,8 @@ "ctxt": 0 }, "value": "regex5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpression2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpression2/input.ts.json index 29042333ea6e..201b2ee05170 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpression2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpression2/input.ts.json @@ -42,7 +42,6 @@ "ctxt": 0 }, "value": "href", - "typeAnnotation": null, "optional": false }, "property": { @@ -53,7 +52,6 @@ "ctxt": 0 }, "value": "match", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpression3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpression3/input.ts.json index 45b17f5f097a..09d77657ea2d 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpression3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpression3/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpression4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpression4/input.ts.json index 8eb5417dd478..d41a6fad6e87 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpression4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpression4/input.ts.json @@ -43,7 +43,6 @@ "ctxt": 0 }, "value": "Ca", - "typeAnnotation": null, "optional": false }, "property": { @@ -54,7 +53,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "computed": false @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -88,7 +85,6 @@ "ctxt": 0 }, "value": "href", - "typeAnnotation": null, "optional": false }, "computed": false @@ -135,7 +131,6 @@ "ctxt": 0 }, "value": "Ba", - "typeAnnotation": null, "optional": false }, "property": { @@ -146,7 +141,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "computed": false @@ -169,7 +163,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -180,7 +173,6 @@ "ctxt": 0 }, "value": "href", - "typeAnnotation": null, "optional": false }, "computed": false @@ -221,7 +213,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "computed": false @@ -244,7 +235,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -255,7 +245,6 @@ "ctxt": 0 }, "value": "href", - "typeAnnotation": null, "optional": false }, "computed": false @@ -305,7 +294,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "computed": false @@ -328,7 +316,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -339,7 +326,6 @@ "ctxt": 0 }, "value": "href", - "typeAnnotation": null, "optional": false }, "computed": false @@ -406,7 +392,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "computed": false @@ -429,7 +414,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -440,7 +424,6 @@ "ctxt": 0 }, "value": "href", - "typeAnnotation": null, "optional": false }, "computed": false @@ -472,8 +455,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -532,7 +515,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "computed": false @@ -555,7 +537,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -566,7 +547,6 @@ "ctxt": 0 }, "value": "href", - "typeAnnotation": null, "optional": false }, "computed": false @@ -606,8 +586,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -646,7 +626,6 @@ "ctxt": 0 }, "value": "encodeURIComponent", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -683,7 +662,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -722,7 +700,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -755,7 +732,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } @@ -781,8 +757,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -806,7 +782,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -817,7 +792,6 @@ "ctxt": 0 }, "value": "substring", - "typeAnnotation": null, "optional": false }, "computed": false @@ -876,7 +850,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -887,7 +860,6 @@ "ctxt": 0 }, "value": "href", - "typeAnnotation": null, "optional": false }, "computed": false @@ -900,7 +872,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -931,8 +902,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "UnaryExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpression5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpression5/input.ts.json index 1f7a0f81ae1c..b304fd5715f0 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpression5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpression5/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -63,7 +62,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "computed": false @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -97,7 +94,6 @@ "ctxt": 0 }, "value": "href", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpressionDivideAmbiguity1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpressionDivideAmbiguity1/input.ts.json index a319bafc28fc..d3c26779a6ff 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpressionDivideAmbiguity1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpressionDivideAmbiguity1/input.ts.json @@ -46,7 +46,6 @@ "ctxt": 0 }, "value": "notregexp", - "typeAnnotation": null, "optional": false } }, @@ -72,7 +71,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -83,7 +81,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpressionDivideAmbiguity2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpressionDivideAmbiguity2/input.ts.json index 7424921a4c63..636a971b3037 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpressionDivideAmbiguity2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpressionDivideAmbiguity2/input.ts.json @@ -54,7 +54,6 @@ "ctxt": 0 }, "value": "notregexp", - "typeAnnotation": null, "optional": false } }, @@ -80,7 +79,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -91,7 +89,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpressionDivideAmbiguity3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpressionDivideAmbiguity3/input.ts.json index 514ef392f309..83996dd09d21 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpressionDivideAmbiguity3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpressionDivideAmbiguity3/input.ts.json @@ -61,7 +61,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpressionDivideAmbiguity5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpressionDivideAmbiguity5/input.ts.json index a2ee276e2420..d1ee9109fb52 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpressionDivideAmbiguity5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpressionDivideAmbiguity5/input.ts.json @@ -35,7 +35,6 @@ "ctxt": 0 }, "value": "model", - "typeAnnotation": null, "optional": false }, "property": { @@ -46,7 +45,6 @@ "ctxt": 0 }, "value": "rotate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "rotateY", - "typeAnnotation": null, "optional": false }, "right": { @@ -108,7 +105,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -119,7 +115,6 @@ "ctxt": 0 }, "value": "PI", - "typeAnnotation": null, "optional": false }, "computed": false @@ -162,7 +157,6 @@ "ctxt": 0 }, "value": "rotateZ", - "typeAnnotation": null, "optional": false }, "right": { @@ -180,7 +174,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -191,7 +184,6 @@ "ctxt": 0 }, "value": "PI", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpressionDivideAmbiguity6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpressionDivideAmbiguity6/input.ts.json index b270f0479c2b..858209ed50b3 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpressionDivideAmbiguity6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/RegularExpressions/parserRegularExpressionDivideAmbiguity6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "c255lsqr8h", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -57,8 +56,8 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -77,8 +76,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -97,8 +96,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -117,8 +116,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -137,8 +136,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -157,8 +156,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -177,8 +176,8 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -221,8 +220,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -262,8 +261,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -300,7 +299,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -345,8 +343,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -364,7 +362,6 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, "optional": false }, "right": { @@ -375,7 +372,6 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, "optional": false } } @@ -423,7 +419,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -468,8 +463,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -517,7 +512,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -575,7 +569,6 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, "optional": false } }, @@ -587,7 +580,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } } @@ -636,7 +628,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -681,8 +672,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -738,7 +729,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -796,7 +786,6 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, "optional": false } }, @@ -808,7 +797,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -829,7 +817,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -840,7 +827,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } } @@ -889,7 +875,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -934,8 +919,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -991,7 +976,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -1049,7 +1033,6 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, "optional": false } }, @@ -1061,7 +1044,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } } @@ -1099,7 +1081,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -1111,7 +1092,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1160,7 +1140,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -1205,8 +1184,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1270,7 +1249,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -1328,7 +1306,6 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, "optional": false } }, @@ -1340,7 +1317,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } } @@ -1378,7 +1354,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -1390,7 +1365,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } } @@ -1411,7 +1385,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "right": { @@ -1422,7 +1395,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1471,7 +1443,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -1516,8 +1487,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1581,7 +1552,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -1639,7 +1609,6 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, "optional": false } }, @@ -1651,7 +1620,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } } @@ -1689,7 +1657,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -1701,7 +1668,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } } @@ -1739,7 +1705,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -1751,7 +1716,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } } @@ -1800,7 +1764,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -1845,8 +1808,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1918,7 +1881,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -1976,7 +1938,6 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, "optional": false } }, @@ -1988,7 +1949,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } } @@ -2026,7 +1986,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -2038,7 +1997,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } } @@ -2076,7 +2034,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -2088,7 +2045,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } } @@ -2109,7 +2065,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2120,7 +2075,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } } @@ -2169,7 +2123,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -2214,8 +2167,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -2287,7 +2240,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -2345,7 +2297,6 @@ "ctxt": 0 }, "value": "a0", - "typeAnnotation": null, "optional": false } }, @@ -2357,7 +2308,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } } @@ -2395,7 +2345,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -2407,7 +2356,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } } @@ -2445,7 +2393,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -2457,7 +2404,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } } @@ -2495,7 +2441,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -2507,7 +2452,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } } @@ -2556,7 +2500,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -2601,8 +2544,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -2674,7 +2617,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -2732,7 +2674,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } }, @@ -2744,7 +2685,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } } @@ -2782,7 +2722,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -2794,7 +2733,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } } @@ -2832,7 +2770,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -2844,7 +2781,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } } @@ -2865,7 +2801,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "right": { @@ -2876,7 +2811,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } } @@ -2925,7 +2859,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -2970,8 +2903,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -3035,7 +2968,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -3093,7 +3025,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -3105,7 +3036,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } } @@ -3143,7 +3073,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -3155,7 +3084,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } } @@ -3193,7 +3121,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -3205,7 +3132,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } } @@ -3254,7 +3180,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -3299,8 +3224,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -3364,7 +3289,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -3422,7 +3346,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } }, @@ -3434,7 +3357,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } } @@ -3472,7 +3394,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -3484,7 +3405,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } } @@ -3505,7 +3425,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "right": { @@ -3516,7 +3435,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } } @@ -3565,7 +3483,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -3610,8 +3527,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -3667,7 +3584,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -3725,7 +3641,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } }, @@ -3737,7 +3652,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } } @@ -3775,7 +3689,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -3787,7 +3700,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } } @@ -3836,7 +3748,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -3881,8 +3792,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -3938,7 +3849,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -3996,7 +3906,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } }, @@ -4008,7 +3917,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } } @@ -4029,7 +3937,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "right": { @@ -4040,7 +3947,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } } @@ -4089,7 +3995,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -4134,8 +4039,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -4183,7 +4088,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -4241,7 +4145,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } }, @@ -4253,7 +4156,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } } @@ -4302,7 +4204,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -4347,8 +4248,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -4396,7 +4297,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -4437,7 +4337,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "right": { @@ -4448,7 +4347,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } } @@ -4497,7 +4395,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -4549,7 +4446,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -4591,7 +4487,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/BreakStatements/parser_breakInIterationOrSwitchStatement4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/BreakStatements/parser_breakInIterationOrSwitchStatement4/input.ts.json index 110f1a0671e0..a8b110b4f758 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/BreakStatements/parser_breakInIterationOrSwitchStatement4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/BreakStatements/parser_breakInIterationOrSwitchStatement4/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -54,7 +54,6 @@ "ctxt": 0 }, "value": "something", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget1/input.ts.json index c3de93691cf3..8fde3ebc5022 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget1/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false }, "body": { @@ -39,7 +38,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget2/input.ts.json index 1479462de2cf..944f4866f767 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false }, "body": { @@ -63,7 +62,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget3/input.ts.json index 94ff67a8629c..39a0bdc29a32 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget3/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "target1", - "typeAnnotation": null, "optional": false }, "body": { @@ -39,7 +38,6 @@ "ctxt": 0 }, "value": "target2", - "typeAnnotation": null, "optional": false }, "body": { @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "target1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget4/input.ts.json index da20ecda110a..35dca7fe0e77 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/BreakStatements/parser_breakTarget4/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "target1", - "typeAnnotation": null, "optional": false }, "body": { @@ -39,7 +38,6 @@ "ctxt": 0 }, "value": "target2", - "typeAnnotation": null, "optional": false }, "body": { @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "target2", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ContinueStatements/parser_continueInIterationStatement4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ContinueStatements/parser_continueInIterationStatement4/input.ts.json index bf19eb2f96c4..721d09c233fc 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ContinueStatements/parser_continueInIterationStatement4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ContinueStatements/parser_continueInIterationStatement4/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -54,7 +54,6 @@ "ctxt": 0 }, "value": "something", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ContinueStatements/parser_continueLabel/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ContinueStatements/parser_continueLabel/input.ts.json index 6ee3ed3d56ac..b5bb9ddad4c3 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ContinueStatements/parser_continueLabel/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ContinueStatements/parser_continueLabel/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "label1", - "typeAnnotation": null, "optional": false }, "body": { @@ -56,8 +55,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "right": { @@ -118,7 +116,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -145,7 +142,6 @@ "ctxt": 0 }, "value": "label1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget2/input.ts.json index af264c9b4923..7d9c539900a0 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false }, "body": { @@ -63,7 +62,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget3/input.ts.json index fa2f1c52b52e..81222c2fcee2 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget3/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "target1", - "typeAnnotation": null, "optional": false }, "body": { @@ -39,7 +38,6 @@ "ctxt": 0 }, "value": "target2", - "typeAnnotation": null, "optional": false }, "body": { @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "target1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget4/input.ts.json index 12cd6c1a4dd7..b4bd5b77b1cc 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ContinueStatements/parser_continueTarget4/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "target1", - "typeAnnotation": null, "optional": false }, "body": { @@ -39,7 +38,6 @@ "ctxt": 0 }, "value": "target2", - "typeAnnotation": null, "optional": false }, "body": { @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "target2", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel3/input.ts.json index 6e455c7d4b52..ba6f8e1430c9 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel3/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false }, "body": { @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel4/input.ts.json index 586792e05ff8..45291fa7e432 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/LabeledStatements/parser_duplicateLabel4/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false }, "body": { @@ -66,7 +65,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ReturnStatements/parserReturnStatement3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ReturnStatements/parserReturnStatement3/input.ts.json index 90655a4f5ff6..e8579e99547d 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ReturnStatements/parserReturnStatement3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ReturnStatements/parserReturnStatement3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ReturnStatements/parserReturnStatement4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ReturnStatements/parserReturnStatement4/input.ts.json index 0393fd8b82f8..1816325d25c4 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ReturnStatements/parserReturnStatement4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/ReturnStatements/parserReturnStatement4/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -57,7 +57,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement10/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement10/input.ts.json index fa341a66d265..2f051b0c35ed 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement10/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement10/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -55,7 +55,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement11/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement11/input.ts.json index 54fc352bb8d5..88b5b487d073 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement11/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement11/input.ts.json @@ -47,8 +47,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -58,8 +58,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -78,7 +78,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement12/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement12/input.ts.json index 6c186906fb04..e840ff14134e 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement12/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement12/input.ts.json @@ -54,7 +54,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -74,7 +73,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement13/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement13/input.ts.json index 80cca2a965a6..0e2a1938c760 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement13/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement13/input.ts.json @@ -54,7 +54,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -74,7 +73,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement14/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement14/input.ts.json index 447f678f60c7..24e2c7fef9c3 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement14/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement14/input.ts.json @@ -47,8 +47,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -58,8 +58,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -78,7 +78,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement15/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement15/input.ts.json index e68012e31de3..242d1b2bc92c 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement15/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement15/input.ts.json @@ -47,8 +47,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -58,8 +58,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -78,7 +78,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement16/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement16/input.ts.json index ce976483a7ee..1e33bf5dfafa 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement16/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement16/input.ts.json @@ -54,7 +54,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -74,7 +73,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement17/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement17/input.ts.json index bea76c68b03c..6915a5387308 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement17/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement17/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "of", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement18/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement18/input.ts.json index d8d822bdb263..7fc13e51ad4e 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement18/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement18/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "of", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -55,7 +55,6 @@ "ctxt": 0 }, "value": "of", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement19/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement19/input.ts.json index 49664647a114..5fb915ae823c 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement19/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement19/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "of", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -54,7 +54,6 @@ "ctxt": 0 }, "value": "of", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement5/input.ts.json index d1280e6c2297..16f476314845 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement5/input.ts.json @@ -39,6 +39,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -55,8 +56,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -71,7 +71,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement8/input.ts.json index 28446c6ab50b..df6e93185827 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement8/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -55,7 +55,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement9/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement9/input.ts.json index 8b1fad17bd88..88994acb2679 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement9/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserES5ForOfStatement9/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -55,7 +55,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForInStatement5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForInStatement5/input.ts.json index ddcea5cb3daa..e0ec447a9b1b 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForInStatement5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForInStatement5/input.ts.json @@ -38,6 +38,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,8 +55,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -70,7 +70,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement2/input.ts.json index d29de87db3bc..66943083e4d2 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -64,8 +64,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -105,8 +105,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -128,8 +128,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "SequenceExpression", @@ -162,7 +162,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -173,7 +172,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": true @@ -201,7 +199,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -212,7 +209,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": true @@ -236,7 +232,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement3/input.ts.json index dcb3543ae548..fbec955f1558 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement3/input.ts.json @@ -21,8 +21,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "SequenceExpression", @@ -62,7 +62,6 @@ "ctxt": 0 }, "value": "_", - "typeAnnotation": null, "optional": false }, "property": { @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "jh", - "typeAnnotation": null, "optional": false }, "computed": false @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": true @@ -121,7 +118,6 @@ "ctxt": 0 }, "value": "_", - "typeAnnotation": null, "optional": false }, "property": { @@ -132,7 +128,6 @@ "ctxt": 0 }, "value": "jh", - "typeAnnotation": null, "optional": false }, "computed": false @@ -145,7 +140,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": true @@ -169,7 +163,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement4/input.ts.json index b7375fe87592..ecffd4b225dd 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement4/input.ts.json @@ -29,8 +29,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -50,7 +50,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement5/input.ts.json index ccd21894e0d8..ca568730e06d 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement5/input.ts.json @@ -32,7 +32,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement6/input.ts.json index df8f70042800..84f8bbf43599 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement6/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement7/input.ts.json index 836bff8fbbf2..87125dea9462 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement7/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement8/input.ts.json index 5cd6e1624547..83f1e9ce63e3 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserForStatement8/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserIfStatement2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserIfStatement2/input.ts.json index b647da31cfc1..4093a43259c7 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserIfStatement2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Statements/parserIfStatement2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "consequent": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/StrictMode/parserStrictMode1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/StrictMode/parserStrictMode1/input.ts.json index 32f226084baa..3526caa388db 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/StrictMode/parserStrictMode1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/StrictMode/parserStrictMode1/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -57,7 +56,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -115,7 +112,6 @@ "ctxt": 0 }, "value": "static", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/StrictMode/parserStrictMode15-negative/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/StrictMode/parserStrictMode15-negative/input.ts.json index 950abfc97f0f..4dbb28362b28 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/StrictMode/parserStrictMode15-negative/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/StrictMode/parserStrictMode15-negative/input.ts.json @@ -58,7 +58,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -69,7 +68,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": true diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/StrictMode/parserStrictMode3-negative/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/StrictMode/parserStrictMode3-negative/input.ts.json index ac79c7d7c70e..0c69e6be192d 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/StrictMode/parserStrictMode3-negative/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/StrictMode/parserStrictMode3-negative/input.ts.json @@ -29,8 +29,8 @@ "ctxt": 0 }, "value": "eval", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/StrictMode/parserStrictMode6-negative/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/StrictMode/parserStrictMode6-negative/input.ts.json index 99f6618ccde4..1a8a96ea3ed8 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/StrictMode/parserStrictMode6-negative/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/StrictMode/parserStrictMode6-negative/input.ts.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "eval", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/SuperExpressions/parserSuperExpression1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/SuperExpressions/parserSuperExpression1/input.ts.json index f8062e05aa3a..f59dea15b41f 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/SuperExpressions/parserSuperExpression1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/SuperExpressions/parserSuperExpression1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -98,7 +96,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false }, "body": { @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -185,7 +180,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -267,7 +260,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/SuperExpressions/parserSuperExpression2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/SuperExpressions/parserSuperExpression2/input.ts.json index 45df435e27da..98e1273d20d9 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/SuperExpressions/parserSuperExpression2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/SuperExpressions/parserSuperExpression2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "function": { @@ -100,7 +98,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/SuperExpressions/parserSuperExpression3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/SuperExpressions/parserSuperExpression3/input.ts.json index 93d156443afe..40562ec3154b 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/SuperExpressions/parserSuperExpression3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/SuperExpressions/parserSuperExpression3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "function": { @@ -98,7 +96,6 @@ "ctxt": 0 }, "value": "super", - "typeAnnotation": null, "optional": false }, "computed": false @@ -140,7 +137,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/SuperExpressions/parserSuperExpression4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/SuperExpressions/parserSuperExpression4/input.ts.json index 775f40aee68b..e2c64361b64d 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/SuperExpressions/parserSuperExpression4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/SuperExpressions/parserSuperExpression4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -99,7 +97,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -152,7 +149,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false }, "body": { @@ -172,7 +168,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -193,7 +188,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -219,7 +213,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -276,7 +269,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty1/input.ts.json index 4bacdf88fda2..00c9d04c0215 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty1/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty2/input.ts.json index b92f0e674c25..550f2914590e 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "unscopables", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty3/input.ts.json index 01cbf073e844..89624867f4ea 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "unscopables", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty4/input.ts.json index f646567b0af8..55715a80329a 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -60,7 +58,6 @@ "ctxt": 0 }, "value": "isRegExp", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty5/input.ts.json index 4eb3921ba32b..a1ada9345dc3 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -60,7 +58,6 @@ "ctxt": 0 }, "value": "isRegExp", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty6/input.ts.json index df00370038f9..f606c4eee5e8 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -60,7 +58,6 @@ "ctxt": 0 }, "value": "toStringTag", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty7/input.ts.json index f8293aefc84c..ba9417c6925a 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty7/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "toStringTag", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty8/input.ts.json index 44dab9668e6f..9047e4fe9c62 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty8/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -69,7 +70,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -80,7 +80,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false @@ -109,8 +108,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty9/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty9/input.ts.json index 268c02c0b951..d0deb63b020c 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty9/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Symbols/parserES5SymbolProperty9/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -69,7 +70,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -80,7 +80,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false @@ -110,8 +109,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/TupleTypes/TupleType1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/TupleTypes/TupleType1/input.ts.json index 263f3c51379b..82b069a3384f 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/TupleTypes/TupleType1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/TupleTypes/TupleType1/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/TupleTypes/TupleType2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/TupleTypes/TupleType2/input.ts.json index a29653142d5e..7077df8cbbcc 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/TupleTypes/TupleType2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/TupleTypes/TupleType2/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,8 +85,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/TupleTypes/TupleType3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/TupleTypes/TupleType3/input.ts.json index b18088490fb0..01295adee44a 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/TupleTypes/TupleType3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/TupleTypes/TupleType3/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "elemTypes": [] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/TupleTypes/TupleType5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/TupleTypes/TupleType5/input.ts.json index bd6739df8465..0a7b4397ce02 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/TupleTypes/TupleType5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/TupleTypes/TupleType5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Types/parserTypeQuery1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Types/parserTypeQuery1/input.ts.json index a64bc5d6daf5..e4cf96cfdf35 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Types/parserTypeQuery1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Types/parserTypeQuery1/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,12 +54,10 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Types/parserTypeQuery2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Types/parserTypeQuery2/input.ts.json index 6193c052a869..abbdd7aca013 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Types/parserTypeQuery2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Types/parserTypeQuery2/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,12 +54,10 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Types/parserTypeQuery5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Types/parserTypeQuery5/input.ts.json index 7809afce768e..31b88fe962d6 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Types/parserTypeQuery5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Types/parserTypeQuery5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -55,7 +56,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -66,13 +66,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Types/parserTypeQuery6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Types/parserTypeQuery6/input.ts.json index 017de65e272f..db2e30b9d191 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Types/parserTypeQuery6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Types/parserTypeQuery6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -55,7 +56,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -66,13 +66,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Types/parserTypeQuery7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Types/parserTypeQuery7/input.ts.json index 2788569db741..e311b323868b 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Types/parserTypeQuery7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Types/parserTypeQuery7/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,13 +61,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Types/parserTypeQuery9/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Types/parserTypeQuery9/input.ts.json index 750d8e4eee51..634eda2402ca 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Types/parserTypeQuery9/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/Types/parserTypeQuery9/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,13 +61,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration1/input.ts.json index 57d67265607d..461c2d9001c0 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "selection", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -42,7 +42,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -62,8 +61,8 @@ "ctxt": 0 }, "value": "position", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "definite": false @@ -93,8 +91,8 @@ "ctxt": 0 }, "value": "model", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "definite": false @@ -124,8 +121,8 @@ "ctxt": 0 }, "value": "support", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -135,7 +132,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration11/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration11/input.ts.json index 0e23b8571790..b597e157c0e3 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration11/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration11/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -52,8 +52,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration2/input.ts.json index 5f842cbe4580..bb4d52c8cb47 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration2/input.ts.json @@ -70,8 +70,8 @@ "ctxt": 0 }, "value": "check", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -126,8 +126,8 @@ "ctxt": 0 }, "value": "checkNot", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -186,7 +186,6 @@ "ctxt": 0 }, "value": "MUnit", - "typeAnnotation": null, "optional": false }, "property": { @@ -197,7 +196,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "computed": false @@ -213,7 +211,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration3/input.ts.json index 9eb8cc531fa6..9d22e81c2d4b 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "runTests", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "outfile", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -92,7 +91,6 @@ "ctxt": 0 }, "value": "Harness", - "typeAnnotation": null, "optional": false }, "property": { @@ -103,7 +101,6 @@ "ctxt": 0 }, "value": "Compiler", - "typeAnnotation": null, "optional": false }, "computed": false @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "WriterAggregator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -141,8 +137,8 @@ "ctxt": 0 }, "value": "outerr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -173,7 +169,6 @@ "ctxt": 0 }, "value": "Harness", - "typeAnnotation": null, "optional": false }, "property": { @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "Compiler", - "typeAnnotation": null, "optional": false }, "computed": false @@ -197,7 +191,6 @@ "ctxt": 0 }, "value": "WriterAggregator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -222,8 +215,8 @@ "ctxt": 0 }, "value": "compiler", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -254,7 +247,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -265,7 +257,6 @@ "ctxt": 0 }, "value": "TypeScriptCompiler", - "typeAnnotation": null, "optional": false }, "computed": false @@ -281,7 +272,6 @@ "ctxt": 0 }, "value": "outerr", - "typeAnnotation": null, "optional": false } } @@ -305,7 +295,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -316,7 +305,6 @@ "ctxt": 0 }, "value": "TypeScriptCompiler", - "typeAnnotation": null, "optional": false } }, @@ -340,8 +328,8 @@ "ctxt": 0 }, "value": "code", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration4.d/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration4.d/input.ts.json index 35f1d84a0b2d..c96ea92e3820 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration4.d/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration4.d/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration7/input.ts.json index 973f30b90f89..bd45fb62b723 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration7/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -52,8 +52,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration9/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration9/input.ts.json index 978012aa53b4..1647ad08bbe0 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration9/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration9/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parser15.4.4.14-9-2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parser15.4.4.14-9-2/input.ts.json index 9f730f03ed70..37545546b086 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parser15.4.4.14-9-2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parser15.4.4.14-9-2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "testcase", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -81,7 +80,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "value": { @@ -158,8 +156,8 @@ "ctxt": 0 }, "value": "one", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -199,8 +197,8 @@ "ctxt": 0 }, "value": "_float", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -275,8 +273,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -293,7 +291,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -319,7 +316,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -361,7 +357,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } }, @@ -467,7 +462,6 @@ "ctxt": 0 }, "value": "one", - "typeAnnotation": null, "optional": false } }, @@ -517,7 +511,6 @@ "ctxt": 0 }, "value": "_float", - "typeAnnotation": null, "optional": false } }, @@ -636,7 +629,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -647,7 +639,6 @@ "ctxt": 0 }, "value": "indexOf", - "typeAnnotation": null, "optional": false }, "computed": false @@ -743,7 +734,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -754,7 +744,6 @@ "ctxt": 0 }, "value": "indexOf", - "typeAnnotation": null, "optional": false }, "computed": false @@ -816,7 +805,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -827,7 +815,6 @@ "ctxt": 0 }, "value": "indexOf", - "typeAnnotation": null, "optional": false }, "computed": false @@ -898,7 +885,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -909,7 +895,6 @@ "ctxt": 0 }, "value": "indexOf", - "typeAnnotation": null, "optional": false }, "computed": false @@ -999,7 +984,6 @@ "ctxt": 0 }, "value": "runTestCase", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1013,7 +997,6 @@ "ctxt": 0 }, "value": "testcase", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserAdditiveExpression1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserAdditiveExpression1/input.ts.json index 12f93ea2e86f..efc10dec7250 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserAdditiveExpression1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserAdditiveExpression1/input.ts.json @@ -44,7 +44,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -55,7 +54,6 @@ "ctxt": 0 }, "value": "index", - "typeAnnotation": null, "optional": false }, "computed": false @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -114,7 +111,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserArgumentList1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserArgumentList1/input.ts.json index 0e2833c95994..a6725abef6e2 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserArgumentList1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserArgumentList1/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "removeClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -44,6 +43,7 @@ "ctxt": 0 }, "value": "node", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,13 +66,11 @@ "ctxt": 0 }, "value": "HTMLElement", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -91,6 +89,7 @@ "ctxt": 0 }, "value": "className", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -107,8 +106,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -156,7 +154,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -167,7 +164,6 @@ "ctxt": 0 }, "value": "className", - "typeAnnotation": null, "optional": false }, "computed": false @@ -201,7 +197,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -212,7 +207,6 @@ "ctxt": 0 }, "value": "className", - "typeAnnotation": null, "optional": false }, "computed": false @@ -225,7 +219,6 @@ "ctxt": 0 }, "value": "replace", - "typeAnnotation": null, "optional": false }, "computed": false @@ -248,7 +241,6 @@ "ctxt": 0 }, "value": "_classNameRegexp", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -262,7 +254,6 @@ "ctxt": 0 }, "value": "className", - "typeAnnotation": null, "optional": false } } @@ -292,8 +283,8 @@ "ctxt": 0 }, "value": "everything", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -312,8 +303,8 @@ "ctxt": 0 }, "value": "leftDelimiter", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -332,8 +323,8 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -352,8 +343,8 @@ "ctxt": 0 }, "value": "rightDelimiter", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -416,7 +407,6 @@ "ctxt": 0 }, "value": "leftDelimiter", - "typeAnnotation": null, "optional": false }, "property": { @@ -427,7 +417,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -447,7 +436,6 @@ "ctxt": 0 }, "value": "rightDelimiter", - "typeAnnotation": null, "optional": false }, "property": { @@ -458,7 +446,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserAstSpans1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserAstSpans1/input.ts.json index bfc6000abdc1..75702b421b6a 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserAstSpans1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserAstSpans1/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "i1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "i1_p1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "i1_f1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "i1_l1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -194,7 +190,6 @@ "ctxt": 0 }, "value": "i1_nc_p1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -236,7 +231,6 @@ "ctxt": 0 }, "value": "i1_nc_f1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -277,7 +271,6 @@ "ctxt": 0 }, "value": "i1_nc_l1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -337,7 +330,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -379,7 +371,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -420,7 +411,6 @@ "ctxt": 0 }, "value": "l1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -480,7 +470,6 @@ "ctxt": 0 }, "value": "nc_p1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -522,7 +511,6 @@ "ctxt": 0 }, "value": "nc_f1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -563,7 +551,6 @@ "ctxt": 0 }, "value": "nc_l1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -620,7 +607,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -646,7 +632,6 @@ "ctxt": 0 }, "value": "i1_p1", - "typeAnnotation": null, "optional": false }, "value": null, @@ -692,7 +677,6 @@ "ctxt": 0 }, "value": "i1_f1", - "typeAnnotation": null, "optional": false }, "function": { @@ -738,7 +722,6 @@ "ctxt": 0 }, "value": "i1_l1", - "typeAnnotation": null, "optional": false }, "value": null, @@ -802,7 +785,6 @@ "ctxt": 0 }, "value": "i1_nc_p1", - "typeAnnotation": null, "optional": false }, "value": null, @@ -848,7 +830,6 @@ "ctxt": 0 }, "value": "i1_nc_f1", - "typeAnnotation": null, "optional": false }, "function": { @@ -894,7 +875,6 @@ "ctxt": 0 }, "value": "i1_nc_l1", - "typeAnnotation": null, "optional": false }, "value": null, @@ -958,7 +938,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1004,7 +983,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "function": { @@ -1050,7 +1028,6 @@ "ctxt": 0 }, "value": "l1", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1114,7 +1091,6 @@ "ctxt": 0 }, "value": "nc_p1", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1160,7 +1136,6 @@ "ctxt": 0 }, "value": "nc_f1", - "typeAnnotation": null, "optional": false }, "function": { @@ -1206,7 +1181,6 @@ "ctxt": 0 }, "value": "nc_l1", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1276,7 +1250,6 @@ "ctxt": 0 }, "value": "i1", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1308,6 +1281,7 @@ "ctxt": 0 }, "value": "i1_i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1330,13 +1304,11 @@ "ctxt": 0 }, "value": "i1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1372,7 +1344,6 @@ "ctxt": 0 }, "value": "i1_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1383,7 +1354,6 @@ "ctxt": 0 }, "value": "i1_f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1421,7 +1391,6 @@ "ctxt": 0 }, "value": "i1_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1432,7 +1401,6 @@ "ctxt": 0 }, "value": "i1_nc_f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1470,7 +1438,6 @@ "ctxt": 0 }, "value": "i1_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1481,7 +1448,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1519,7 +1485,6 @@ "ctxt": 0 }, "value": "i1_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1530,7 +1495,6 @@ "ctxt": 0 }, "value": "nc_f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1568,7 +1532,6 @@ "ctxt": 0 }, "value": "i1_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1579,7 +1542,6 @@ "ctxt": 0 }, "value": "i1_l1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1617,7 +1579,6 @@ "ctxt": 0 }, "value": "i1_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1628,7 +1589,6 @@ "ctxt": 0 }, "value": "i1_nc_l1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1666,7 +1626,6 @@ "ctxt": 0 }, "value": "i1_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1677,7 +1636,6 @@ "ctxt": 0 }, "value": "l1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1715,7 +1673,6 @@ "ctxt": 0 }, "value": "i1_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1726,7 +1683,6 @@ "ctxt": 0 }, "value": "nc_l1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1760,8 +1716,8 @@ "ctxt": 0 }, "value": "c1_i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1778,7 +1734,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1817,7 +1772,6 @@ "ctxt": 0 }, "value": "c1_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1828,7 +1782,6 @@ "ctxt": 0 }, "value": "i1_f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1866,7 +1819,6 @@ "ctxt": 0 }, "value": "c1_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1877,7 +1829,6 @@ "ctxt": 0 }, "value": "i1_nc_f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1915,7 +1866,6 @@ "ctxt": 0 }, "value": "c1_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1926,7 +1876,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1964,7 +1913,6 @@ "ctxt": 0 }, "value": "c1_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1975,7 +1923,6 @@ "ctxt": 0 }, "value": "nc_f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2013,7 +1960,6 @@ "ctxt": 0 }, "value": "c1_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -2024,7 +1970,6 @@ "ctxt": 0 }, "value": "i1_l1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2062,7 +2007,6 @@ "ctxt": 0 }, "value": "c1_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -2073,7 +2017,6 @@ "ctxt": 0 }, "value": "i1_nc_l1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2111,7 +2054,6 @@ "ctxt": 0 }, "value": "c1_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -2122,7 +2064,6 @@ "ctxt": 0 }, "value": "l1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2160,7 +2101,6 @@ "ctxt": 0 }, "value": "c1_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -2171,7 +2111,6 @@ "ctxt": 0 }, "value": "nc_l1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2203,8 +2142,8 @@ "ctxt": 0 }, "value": "i1_i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2214,7 +2153,6 @@ "ctxt": 0 }, "value": "c1_i", - "typeAnnotation": null, "optional": false } } @@ -2248,7 +2186,6 @@ "ctxt": 0 }, "value": "i1_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -2259,7 +2196,6 @@ "ctxt": 0 }, "value": "i1_f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2297,7 +2233,6 @@ "ctxt": 0 }, "value": "i1_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -2308,7 +2243,6 @@ "ctxt": 0 }, "value": "i1_nc_f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2346,7 +2280,6 @@ "ctxt": 0 }, "value": "i1_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -2357,7 +2290,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2395,7 +2327,6 @@ "ctxt": 0 }, "value": "i1_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -2406,7 +2337,6 @@ "ctxt": 0 }, "value": "nc_f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2444,7 +2374,6 @@ "ctxt": 0 }, "value": "i1_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -2455,7 +2384,6 @@ "ctxt": 0 }, "value": "i1_l1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2493,7 +2421,6 @@ "ctxt": 0 }, "value": "i1_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -2504,7 +2431,6 @@ "ctxt": 0 }, "value": "i1_nc_l1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2542,7 +2468,6 @@ "ctxt": 0 }, "value": "i1_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -2553,7 +2478,6 @@ "ctxt": 0 }, "value": "l1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2591,7 +2515,6 @@ "ctxt": 0 }, "value": "i1_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -2602,7 +2525,6 @@ "ctxt": 0 }, "value": "nc_l1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2621,7 +2543,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2647,7 +2568,6 @@ "ctxt": 0 }, "value": "c2_p1", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2693,7 +2613,6 @@ "ctxt": 0 }, "value": "c2_f1", - "typeAnnotation": null, "optional": false }, "function": { @@ -2739,7 +2658,6 @@ "ctxt": 0 }, "value": "c2_prop", - "typeAnnotation": null, "optional": false }, "function": { @@ -2803,7 +2721,6 @@ "ctxt": 0 }, "value": "c2_nc_p1", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2849,7 +2766,6 @@ "ctxt": 0 }, "value": "c2_nc_f1", - "typeAnnotation": null, "optional": false }, "function": { @@ -2895,7 +2811,6 @@ "ctxt": 0 }, "value": "c2_nc_prop", - "typeAnnotation": null, "optional": false }, "function": { @@ -2959,7 +2874,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3005,7 +2919,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "function": { @@ -3051,7 +2964,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "function": { @@ -3115,7 +3027,6 @@ "ctxt": 0 }, "value": "nc_p1", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3161,7 +3072,6 @@ "ctxt": 0 }, "value": "nc_f1", - "typeAnnotation": null, "optional": false }, "function": { @@ -3207,7 +3117,6 @@ "ctxt": 0 }, "value": "nc_prop", - "typeAnnotation": null, "optional": false }, "function": { @@ -3271,7 +3180,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -3291,6 +3199,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3307,8 +3216,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -3358,7 +3266,6 @@ "ctxt": 0 }, "value": "c2_p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3371,7 +3278,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3398,7 +3304,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3424,7 +3329,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -3513,7 +3417,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3541,7 +3444,6 @@ "ctxt": 0 }, "value": "c2_p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3568,7 +3470,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3614,7 +3515,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "function": { @@ -3660,7 +3560,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "function": { @@ -3724,7 +3623,6 @@ "ctxt": 0 }, "value": "nc_p1", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3770,7 +3668,6 @@ "ctxt": 0 }, "value": "nc_f1", - "typeAnnotation": null, "optional": false }, "function": { @@ -3816,7 +3713,6 @@ "ctxt": 0 }, "value": "nc_prop", - "typeAnnotation": null, "optional": false }, "function": { @@ -3874,7 +3770,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -3907,8 +3802,8 @@ "ctxt": 0 }, "value": "c2_i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -3925,7 +3820,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3973,8 +3867,8 @@ "ctxt": 0 }, "value": "c3_i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -3991,7 +3885,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4030,7 +3923,6 @@ "ctxt": 0 }, "value": "c2_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -4041,7 +3933,6 @@ "ctxt": 0 }, "value": "c2_f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4079,7 +3970,6 @@ "ctxt": 0 }, "value": "c2_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -4090,7 +3980,6 @@ "ctxt": 0 }, "value": "c2_nc_f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4128,7 +4017,6 @@ "ctxt": 0 }, "value": "c2_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -4139,7 +4027,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4177,7 +4064,6 @@ "ctxt": 0 }, "value": "c2_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -4188,7 +4074,6 @@ "ctxt": 0 }, "value": "nc_f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4226,7 +4111,6 @@ "ctxt": 0 }, "value": "c3_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -4237,7 +4121,6 @@ "ctxt": 0 }, "value": "c2_f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4275,7 +4158,6 @@ "ctxt": 0 }, "value": "c3_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -4286,7 +4168,6 @@ "ctxt": 0 }, "value": "c2_nc_f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4324,7 +4205,6 @@ "ctxt": 0 }, "value": "c3_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -4335,7 +4215,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4373,7 +4252,6 @@ "ctxt": 0 }, "value": "c3_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -4384,7 +4262,6 @@ "ctxt": 0 }, "value": "nc_f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4416,8 +4293,8 @@ "ctxt": 0 }, "value": "c2_i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4427,7 +4304,6 @@ "ctxt": 0 }, "value": "c3_i", - "typeAnnotation": null, "optional": false } } @@ -4461,7 +4337,6 @@ "ctxt": 0 }, "value": "c2_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -4472,7 +4347,6 @@ "ctxt": 0 }, "value": "c2_f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4510,7 +4384,6 @@ "ctxt": 0 }, "value": "c2_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -4521,7 +4394,6 @@ "ctxt": 0 }, "value": "c2_nc_f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4559,7 +4431,6 @@ "ctxt": 0 }, "value": "c2_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -4570,7 +4441,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4608,7 +4478,6 @@ "ctxt": 0 }, "value": "c2_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -4619,7 +4488,6 @@ "ctxt": 0 }, "value": "nc_f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4638,7 +4506,6 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4657,7 +4524,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -4690,8 +4556,8 @@ "ctxt": 0 }, "value": "c4_i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -4708,7 +4574,6 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4746,7 +4611,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4776,7 +4640,6 @@ "ctxt": 0 }, "value": "i2_p1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4818,7 +4681,6 @@ "ctxt": 0 }, "value": "i2_f1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4859,7 +4721,6 @@ "ctxt": 0 }, "value": "i2_l1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4919,7 +4780,6 @@ "ctxt": 0 }, "value": "i2_nc_p1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4961,7 +4821,6 @@ "ctxt": 0 }, "value": "i2_nc_f1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5002,7 +4861,6 @@ "ctxt": 0 }, "value": "i2_nc_l1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5062,7 +4920,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5104,7 +4961,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5145,7 +5001,6 @@ "ctxt": 0 }, "value": "l1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5205,7 +5060,6 @@ "ctxt": 0 }, "value": "nc_p1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5247,7 +5101,6 @@ "ctxt": 0 }, "value": "nc_f1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5288,7 +5141,6 @@ "ctxt": 0 }, "value": "nc_l1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5350,7 +5202,6 @@ "ctxt": 0 }, "value": "i3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5371,7 +5222,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -5401,7 +5251,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5443,7 +5292,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5484,7 +5332,6 @@ "ctxt": 0 }, "value": "l1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5544,7 +5391,6 @@ "ctxt": 0 }, "value": "nc_p1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5586,7 +5432,6 @@ "ctxt": 0 }, "value": "nc_f1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5627,7 +5472,6 @@ "ctxt": 0 }, "value": "nc_l1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5699,6 +5543,7 @@ "ctxt": 0 }, "value": "i2_i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5721,13 +5566,11 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -5759,6 +5602,7 @@ "ctxt": 0 }, "value": "i3_i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5781,13 +5625,11 @@ "ctxt": 0 }, "value": "i3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -5823,7 +5665,6 @@ "ctxt": 0 }, "value": "i2_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -5834,7 +5675,6 @@ "ctxt": 0 }, "value": "i2_f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5872,7 +5712,6 @@ "ctxt": 0 }, "value": "i2_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -5883,7 +5722,6 @@ "ctxt": 0 }, "value": "i2_nc_f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5921,7 +5759,6 @@ "ctxt": 0 }, "value": "i2_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -5932,7 +5769,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5970,7 +5806,6 @@ "ctxt": 0 }, "value": "i2_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -5981,7 +5816,6 @@ "ctxt": 0 }, "value": "nc_f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6019,7 +5853,6 @@ "ctxt": 0 }, "value": "i2_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6030,7 +5863,6 @@ "ctxt": 0 }, "value": "i2_l1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6068,7 +5900,6 @@ "ctxt": 0 }, "value": "i2_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6079,7 +5910,6 @@ "ctxt": 0 }, "value": "i2_nc_l1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6117,7 +5947,6 @@ "ctxt": 0 }, "value": "i2_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6128,7 +5957,6 @@ "ctxt": 0 }, "value": "l1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6166,7 +5994,6 @@ "ctxt": 0 }, "value": "i2_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6177,7 +6004,6 @@ "ctxt": 0 }, "value": "nc_l1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6215,7 +6041,6 @@ "ctxt": 0 }, "value": "i3_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6226,7 +6051,6 @@ "ctxt": 0 }, "value": "i2_f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6264,7 +6088,6 @@ "ctxt": 0 }, "value": "i3_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6275,7 +6098,6 @@ "ctxt": 0 }, "value": "i2_nc_f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6313,7 +6135,6 @@ "ctxt": 0 }, "value": "i3_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6324,7 +6145,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6362,7 +6182,6 @@ "ctxt": 0 }, "value": "i3_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6373,7 +6192,6 @@ "ctxt": 0 }, "value": "nc_f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6411,7 +6229,6 @@ "ctxt": 0 }, "value": "i3_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6422,7 +6239,6 @@ "ctxt": 0 }, "value": "i2_l1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6460,7 +6276,6 @@ "ctxt": 0 }, "value": "i3_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6471,7 +6286,6 @@ "ctxt": 0 }, "value": "i2_nc_l1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6509,7 +6323,6 @@ "ctxt": 0 }, "value": "i3_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6520,7 +6333,6 @@ "ctxt": 0 }, "value": "l1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6558,7 +6370,6 @@ "ctxt": 0 }, "value": "i3_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6569,7 +6380,6 @@ "ctxt": 0 }, "value": "nc_l1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6601,8 +6411,8 @@ "ctxt": 0 }, "value": "i2_i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6612,7 +6422,6 @@ "ctxt": 0 }, "value": "i3_i", - "typeAnnotation": null, "optional": false } } @@ -6646,7 +6455,6 @@ "ctxt": 0 }, "value": "i2_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6657,7 +6465,6 @@ "ctxt": 0 }, "value": "i2_f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6695,7 +6502,6 @@ "ctxt": 0 }, "value": "i2_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6706,7 +6512,6 @@ "ctxt": 0 }, "value": "i2_nc_f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6744,7 +6549,6 @@ "ctxt": 0 }, "value": "i2_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6755,7 +6559,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6793,7 +6596,6 @@ "ctxt": 0 }, "value": "i2_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6804,7 +6606,6 @@ "ctxt": 0 }, "value": "nc_f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6842,7 +6643,6 @@ "ctxt": 0 }, "value": "i2_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6853,7 +6653,6 @@ "ctxt": 0 }, "value": "i2_l1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6891,7 +6690,6 @@ "ctxt": 0 }, "value": "i2_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6902,7 +6700,6 @@ "ctxt": 0 }, "value": "i2_nc_l1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6940,7 +6737,6 @@ "ctxt": 0 }, "value": "i2_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6951,7 +6747,6 @@ "ctxt": 0 }, "value": "l1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6989,7 +6784,6 @@ "ctxt": 0 }, "value": "i2_i", - "typeAnnotation": null, "optional": false }, "property": { @@ -7000,7 +6794,6 @@ "ctxt": 0 }, "value": "nc_l1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7019,7 +6812,6 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7045,7 +6837,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -7093,7 +6884,6 @@ "ctxt": 0 }, "value": "c6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7119,7 +6909,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -7149,7 +6938,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -7225,7 +7013,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7253,7 +7040,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7274,7 +7060,6 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserEmptyStatement1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserEmptyStatement1/input.ts.json index e63ec5e2b5ae..c726c9c60f5e 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserEmptyStatement1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserEmptyStatement1/input.ts.json @@ -47,8 +47,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserExportAsFunctionIdentifier/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserExportAsFunctionIdentifier/input.ts.json index ad8c13f6a99b..0a298a7122f6 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserExportAsFunctionIdentifier/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserExportAsFunctionIdentifier/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "export", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -104,6 +102,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -126,13 +125,11 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -164,8 +161,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -189,7 +186,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { @@ -200,7 +196,6 @@ "ctxt": 0 }, "value": "export", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserImportDeclaration1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserImportDeclaration1/input.ts.json index 8f979f2b1805..96653bb87582 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserImportDeclaration1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserImportDeclaration1/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -36,7 +35,6 @@ "ctxt": 0 }, "value": "TypeScriptServices", - "typeAnnotation": null, "optional": false }, "right": { @@ -47,7 +45,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserInExpression1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserInExpression1/input.ts.json index 107de0498b18..73f7e3c40090 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserInExpression1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserInExpression1/input.ts.json @@ -35,7 +35,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -46,7 +45,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserKeywordsAsIdentifierName1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserKeywordsAsIdentifierName1/input.ts.json index b98a1cd08a7e..c4e0361393ed 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserKeywordsAsIdentifierName1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserKeywordsAsIdentifierName1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "big", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "break", - "typeAnnotation": null, "optional": false }, "value": { @@ -75,7 +74,6 @@ "ctxt": 0 }, "value": "super", - "typeAnnotation": null, "optional": false }, "value": { @@ -98,7 +96,6 @@ "ctxt": 0 }, "value": "const", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserNoASIOnCallAfterFunctionExpression1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserNoASIOnCallAfterFunctionExpression1/input.ts.json index 093092715591..2a134f4af6ee 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserNoASIOnCallAfterFunctionExpression1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserNoASIOnCallAfterFunctionExpression1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -90,7 +90,6 @@ "ctxt": 0 }, "value": "window", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -115,7 +114,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserNotRegex2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserNotRegex2/input.ts.json index 6f1f39e9153b..9a71202db83d 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserNotRegex2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserNotRegex2/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "A", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "B", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "C", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,8 +178,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -204,7 +204,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "right": { @@ -244,7 +243,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -265,7 +263,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserObjectCreationArrayLiteral2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserObjectCreationArrayLiteral2/input.ts.json index 007775f38882..0f1442332010 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserObjectCreationArrayLiteral2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserObjectCreationArrayLiteral2/input.ts.json @@ -35,7 +35,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserObjectCreationArrayLiteral4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserObjectCreationArrayLiteral4/input.ts.json index 1bd7bc276e7b..2736fbbb3db4 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserObjectCreationArrayLiteral4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserObjectCreationArrayLiteral4/input.ts.json @@ -35,7 +35,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserOptionalTypeMembers1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserOptionalTypeMembers1/input.ts.json index 805a658d6852..f2d6aa95bd0a 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserOptionalTypeMembers1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserOptionalTypeMembers1/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "PropertyDescriptor2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "configurable", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "enumerable", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -135,7 +132,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -177,7 +173,6 @@ "ctxt": 0 }, "value": "writable", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -219,7 +214,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -260,7 +254,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -274,6 +267,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -290,8 +284,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "typeAnn": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserOverloadOnConstants1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserOverloadOnConstants1/input.ts.json index 6e3d2122bf9d..93d5f93bbb28 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserOverloadOnConstants1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserOverloadOnConstants1/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Document", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "createElement", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -65,6 +63,7 @@ "ctxt": 0 }, "value": "tagName", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -81,8 +80,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -107,7 +105,6 @@ "ctxt": 0 }, "value": "HTMLElement", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -131,7 +128,6 @@ "ctxt": 0 }, "value": "createElement", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -145,6 +141,7 @@ "ctxt": 0 }, "value": "tagName", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -174,8 +171,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": { @@ -200,7 +196,6 @@ "ctxt": 0 }, "value": "HTMLCanvasElement", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -224,7 +219,6 @@ "ctxt": 0 }, "value": "createElement", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -238,6 +232,7 @@ "ctxt": 0 }, "value": "tagName", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -267,8 +262,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": { @@ -293,7 +287,6 @@ "ctxt": 0 }, "value": "HTMLDivElement", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -317,7 +310,6 @@ "ctxt": 0 }, "value": "createElement", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -331,6 +323,7 @@ "ctxt": 0 }, "value": "tagName", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -360,8 +353,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": { @@ -386,7 +378,6 @@ "ctxt": 0 }, "value": "HTMLSpanElement", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserParenthesizedVariableAndFunctionInTernary/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserParenthesizedVariableAndFunctionInTernary/input.ts.json index d0b1dac84c28..ff18dcabb40b 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserParenthesizedVariableAndFunctionInTernary/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserParenthesizedVariableAndFunctionInTernary/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,8 +80,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -114,7 +114,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource1/input.ts.json index d138a87593af..74de00e8200d 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource1/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "body": { @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "CompilerDiagnostics", - "typeAnnotation": null, "optional": false }, "body": { @@ -101,8 +99,8 @@ "ctxt": 0 }, "value": "debug", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -140,7 +138,6 @@ "ctxt": 0 }, "value": "IDiagnosticWriter", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -170,7 +167,6 @@ "ctxt": 0 }, "value": "Alert", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -184,6 +180,7 @@ "ctxt": 0 }, "value": "output", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -200,8 +197,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -259,6 +255,7 @@ "ctxt": 0 }, "value": "diagnosticWriter", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -281,13 +278,11 @@ "ctxt": 0 }, "value": "IDiagnosticWriter", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -334,6 +329,7 @@ "ctxt": 0 }, "value": "analysisPass", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -350,8 +346,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -384,7 +379,6 @@ "ctxt": 0 }, "value": "Alert", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -405,6 +399,7 @@ "ctxt": 0 }, "value": "output", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -421,8 +416,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -455,7 +449,6 @@ "ctxt": 0 }, "value": "diagnosticWriter", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -495,7 +488,6 @@ "ctxt": 0 }, "value": "diagnosticWriter", - "typeAnnotation": null, "optional": false }, "property": { @@ -506,7 +498,6 @@ "ctxt": 0 }, "value": "Alert", - "typeAnnotation": null, "optional": false }, "computed": false @@ -522,7 +513,6 @@ "ctxt": 0 }, "value": "output", - "typeAnnotation": null, "optional": false } } @@ -559,7 +549,6 @@ "ctxt": 0 }, "value": "debugPrint", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -580,6 +569,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -596,8 +586,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -630,7 +619,6 @@ "ctxt": 0 }, "value": "debug", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -663,7 +651,6 @@ "ctxt": 0 }, "value": "Alert", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -677,7 +664,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -714,7 +700,6 @@ "ctxt": 0 }, "value": "assert", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -735,6 +720,7 @@ "ctxt": 0 }, "value": "condition", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -751,8 +737,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -771,6 +756,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -787,8 +773,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -821,7 +806,6 @@ "ctxt": 0 }, "value": "debug", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -855,7 +839,6 @@ "ctxt": 0 }, "value": "condition", - "typeAnnotation": null, "optional": false } }, @@ -889,7 +872,6 @@ "ctxt": 0 }, "value": "Alert", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -903,7 +885,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -953,7 +934,6 @@ "ctxt": 0 }, "value": "ILogger", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -983,7 +963,6 @@ "ctxt": 0 }, "value": "information", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1024,7 +1003,6 @@ "ctxt": 0 }, "value": "debug", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1065,7 +1043,6 @@ "ctxt": 0 }, "value": "warning", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1106,7 +1083,6 @@ "ctxt": 0 }, "value": "error", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1147,7 +1123,6 @@ "ctxt": 0 }, "value": "fatal", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1188,7 +1163,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1202,6 +1176,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1218,8 +1193,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -1262,7 +1236,6 @@ "ctxt": 0 }, "value": "NullLogger", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1288,7 +1261,6 @@ "ctxt": 0 }, "value": "information", - "typeAnnotation": null, "optional": false }, "function": { @@ -1368,7 +1340,6 @@ "ctxt": 0 }, "value": "debug", - "typeAnnotation": null, "optional": false }, "function": { @@ -1448,7 +1419,6 @@ "ctxt": 0 }, "value": "warning", - "typeAnnotation": null, "optional": false }, "function": { @@ -1528,7 +1498,6 @@ "ctxt": 0 }, "value": "error", - "typeAnnotation": null, "optional": false }, "function": { @@ -1608,7 +1577,6 @@ "ctxt": 0 }, "value": "fatal", - "typeAnnotation": null, "optional": false }, "function": { @@ -1688,7 +1656,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "function": { @@ -1709,6 +1676,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1725,8 +1693,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1793,7 +1760,6 @@ "ctxt": 0 }, "value": "ILogger", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1818,7 +1784,6 @@ "ctxt": 0 }, "value": "LoggerAdapter", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1844,7 +1809,6 @@ "ctxt": 0 }, "value": "_information", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1890,7 +1854,6 @@ "ctxt": 0 }, "value": "_debug", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1936,7 +1899,6 @@ "ctxt": 0 }, "value": "_warning", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1982,7 +1944,6 @@ "ctxt": 0 }, "value": "_error", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2028,7 +1989,6 @@ "ctxt": 0 }, "value": "_fatal", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2074,7 +2034,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2096,6 +2055,7 @@ "ctxt": 0 }, "value": "logger", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2118,13 +2078,11 @@ "ctxt": 0 }, "value": "ILogger", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2174,7 +2132,6 @@ "ctxt": 0 }, "value": "_information", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2216,7 +2173,6 @@ "ctxt": 0 }, "value": "logger", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2229,7 +2185,6 @@ "ctxt": 0 }, "value": "information", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2277,7 +2232,6 @@ "ctxt": 0 }, "value": "_debug", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2319,7 +2273,6 @@ "ctxt": 0 }, "value": "logger", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2332,7 +2285,6 @@ "ctxt": 0 }, "value": "debug", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2380,7 +2332,6 @@ "ctxt": 0 }, "value": "_warning", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2422,7 +2373,6 @@ "ctxt": 0 }, "value": "logger", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2435,7 +2385,6 @@ "ctxt": 0 }, "value": "warning", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2483,7 +2432,6 @@ "ctxt": 0 }, "value": "_error", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2525,7 +2473,6 @@ "ctxt": 0 }, "value": "logger", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2538,7 +2485,6 @@ "ctxt": 0 }, "value": "error", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2586,7 +2532,6 @@ "ctxt": 0 }, "value": "_fatal", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2628,7 +2573,6 @@ "ctxt": 0 }, "value": "logger", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2641,7 +2585,6 @@ "ctxt": 0 }, "value": "fatal", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2671,7 +2614,6 @@ "ctxt": 0 }, "value": "information", - "typeAnnotation": null, "optional": false }, "function": { @@ -2720,7 +2662,6 @@ "ctxt": 0 }, "value": "_information", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2770,7 +2711,6 @@ "ctxt": 0 }, "value": "debug", - "typeAnnotation": null, "optional": false }, "function": { @@ -2819,7 +2759,6 @@ "ctxt": 0 }, "value": "_debug", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2869,7 +2808,6 @@ "ctxt": 0 }, "value": "warning", - "typeAnnotation": null, "optional": false }, "function": { @@ -2918,7 +2856,6 @@ "ctxt": 0 }, "value": "_warning", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2968,7 +2905,6 @@ "ctxt": 0 }, "value": "error", - "typeAnnotation": null, "optional": false }, "function": { @@ -3017,7 +2953,6 @@ "ctxt": 0 }, "value": "_error", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3067,7 +3002,6 @@ "ctxt": 0 }, "value": "fatal", - "typeAnnotation": null, "optional": false }, "function": { @@ -3116,7 +3050,6 @@ "ctxt": 0 }, "value": "_fatal", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3166,7 +3099,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "function": { @@ -3187,6 +3119,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3203,8 +3136,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -3266,7 +3198,6 @@ "ctxt": 0 }, "value": "logger", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3279,7 +3210,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3295,7 +3225,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -3353,7 +3282,6 @@ "ctxt": 0 }, "value": "ILogger", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3378,7 +3306,6 @@ "ctxt": 0 }, "value": "BufferedLogger", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3404,7 +3331,6 @@ "ctxt": 0 }, "value": "logContents", - "typeAnnotation": null, "optional": false }, "value": { @@ -3442,7 +3368,6 @@ "ctxt": 0 }, "value": "information", - "typeAnnotation": null, "optional": false }, "function": { @@ -3522,7 +3447,6 @@ "ctxt": 0 }, "value": "debug", - "typeAnnotation": null, "optional": false }, "function": { @@ -3602,7 +3526,6 @@ "ctxt": 0 }, "value": "warning", - "typeAnnotation": null, "optional": false }, "function": { @@ -3682,7 +3605,6 @@ "ctxt": 0 }, "value": "error", - "typeAnnotation": null, "optional": false }, "function": { @@ -3762,7 +3684,6 @@ "ctxt": 0 }, "value": "fatal", - "typeAnnotation": null, "optional": false }, "function": { @@ -3842,7 +3763,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "function": { @@ -3863,6 +3783,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3879,8 +3800,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -3942,7 +3862,6 @@ "ctxt": 0 }, "value": "logContents", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3955,7 +3874,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3971,7 +3889,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -4029,7 +3946,6 @@ "ctxt": 0 }, "value": "ILogger", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -4054,7 +3970,6 @@ "ctxt": 0 }, "value": "timeFunction", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4075,6 +3990,7 @@ "ctxt": 0 }, "value": "logger", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4097,13 +4013,11 @@ "ctxt": 0 }, "value": "ILogger", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4122,6 +4036,7 @@ "ctxt": 0 }, "value": "funcDescription", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4138,8 +4053,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -4158,6 +4072,7 @@ "ctxt": 0 }, "value": "func", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4192,8 +4107,7 @@ } } } - }, - "optional": false + } } } ], @@ -4236,8 +4150,8 @@ "ctxt": 0 }, "value": "start", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -4262,7 +4176,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4298,8 +4211,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4316,7 +4229,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4351,8 +4263,8 @@ "ctxt": 0 }, "value": "end", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -4377,7 +4289,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4417,7 +4328,6 @@ "ctxt": 0 }, "value": "logger", - "typeAnnotation": null, "optional": false }, "property": { @@ -4428,7 +4338,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4468,7 +4377,6 @@ "ctxt": 0 }, "value": "funcDescription", - "typeAnnotation": null, "optional": false }, "right": { @@ -4509,7 +4417,6 @@ "ctxt": 0 }, "value": "end", - "typeAnnotation": null, "optional": false }, "right": { @@ -4520,7 +4427,6 @@ "ctxt": 0 }, "value": "start", - "typeAnnotation": null, "optional": false } } @@ -4561,7 +4467,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false } } @@ -4606,7 +4511,6 @@ "ctxt": 0 }, "value": "stringToLiteral", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4627,6 +4531,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4643,8 +4548,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -4663,6 +4567,7 @@ "ctxt": 0 }, "value": "length", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4679,8 +4584,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -4723,8 +4627,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -4769,8 +4673,8 @@ "ctxt": 0 }, "value": "addChar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -4788,6 +4692,7 @@ "ctxt": 0 }, "value": "index", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4804,8 +4709,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -4841,8 +4745,8 @@ "ctxt": 0 }, "value": "ch", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4866,7 +4770,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "property": { @@ -4877,7 +4780,6 @@ "ctxt": 0 }, "value": "charCodeAt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4893,7 +4795,6 @@ "ctxt": 0 }, "value": "index", - "typeAnnotation": null, "optional": false } } @@ -4919,7 +4820,6 @@ "ctxt": 0 }, "value": "ch", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -4963,8 +4863,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -5033,8 +4933,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -5103,8 +5003,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -5173,8 +5073,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -5243,8 +5143,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -5313,8 +5213,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -5383,8 +5283,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -5453,8 +5353,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -5515,8 +5415,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -5540,7 +5440,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "property": { @@ -5551,7 +5450,6 @@ "ctxt": 0 }, "value": "charAt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5567,7 +5465,6 @@ "ctxt": 0 }, "value": "index", - "typeAnnotation": null, "optional": false } } @@ -5616,8 +5513,8 @@ "ctxt": 0 }, "value": "tooLong", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -5649,7 +5546,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "property": { @@ -5660,7 +5556,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5673,7 +5568,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false } } @@ -5697,7 +5591,6 @@ "ctxt": 0 }, "value": "tooLong", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -5733,8 +5626,8 @@ "ctxt": 0 }, "value": "mid", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5752,7 +5645,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "right": { @@ -5801,8 +5693,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -5833,7 +5725,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "right": { @@ -5844,7 +5735,6 @@ "ctxt": 0 }, "value": "mid", - "typeAnnotation": null, "optional": false } }, @@ -5865,7 +5755,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -5891,7 +5780,6 @@ "ctxt": 0 }, "value": "addChar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5905,7 +5793,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -5937,8 +5824,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -5988,8 +5875,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -6014,7 +5901,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "property": { @@ -6025,7 +5911,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6038,7 +5923,6 @@ "ctxt": 0 }, "value": "mid", - "typeAnnotation": null, "optional": false } }, @@ -6062,7 +5946,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "right": { @@ -6080,7 +5963,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "property": { @@ -6091,7 +5973,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6114,7 +5995,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -6140,7 +6020,6 @@ "ctxt": 0 }, "value": "addChar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6154,7 +6033,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -6196,8 +6074,8 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -6214,7 +6092,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "property": { @@ -6225,7 +6102,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6264,8 +6140,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -6296,7 +6172,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "right": { @@ -6307,7 +6182,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false } }, @@ -6328,7 +6202,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -6354,7 +6227,6 @@ "ctxt": 0 }, "value": "addChar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6368,7 +6240,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -6395,7 +6266,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource12/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource12/input.ts.json index bba91b085ce9..f5935643ccca 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource12/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource12/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "body": { @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -100,6 +97,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -122,13 +120,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -138,6 +134,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -160,13 +157,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -191,7 +186,6 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -215,7 +209,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -244,7 +237,6 @@ "ctxt": 0 }, "value": "AstWalkOptions", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -268,7 +260,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -315,7 +306,6 @@ "ctxt": 0 }, "value": "AstWalkOptions", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -341,7 +331,6 @@ "ctxt": 0 }, "value": "goChildren", - "typeAnnotation": null, "optional": false }, "value": { @@ -379,7 +368,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "value": { @@ -417,7 +405,6 @@ "ctxt": 0 }, "value": "reverseSiblings", - "typeAnnotation": null, "optional": false }, "value": { @@ -455,7 +442,6 @@ "ctxt": 0 }, "value": "stopWalk", - "typeAnnotation": null, "optional": false }, "function": { @@ -483,6 +469,7 @@ "ctxt": 0 }, "value": "stop", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -499,8 +486,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "right": { "type": "BooleanLiteral", @@ -567,7 +553,6 @@ "ctxt": 0 }, "value": "goChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -588,7 +573,6 @@ "ctxt": 0 }, "value": "stop", - "typeAnnotation": null, "optional": false } } @@ -632,7 +616,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -653,7 +636,6 @@ "ctxt": 0 }, "value": "stop", - "typeAnnotation": null, "optional": false } } @@ -702,7 +684,6 @@ "ctxt": 0 }, "value": "IAstWalkCallback", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -732,6 +713,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -754,13 +736,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -770,6 +750,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -792,13 +773,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -808,6 +787,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -830,13 +810,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -861,7 +839,6 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -895,7 +872,6 @@ "ctxt": 0 }, "value": "IAstWalkChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -925,6 +901,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -947,13 +924,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -963,6 +938,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -985,13 +961,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1001,6 +975,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1023,13 +998,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1065,7 +1038,6 @@ "ctxt": 0 }, "value": "AstWalker", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1091,7 +1063,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1113,6 +1084,7 @@ "ctxt": 0 }, "value": "childrenWalkers", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1142,14 +1114,12 @@ "ctxt": 0 }, "value": "IAstWalkChildren", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } }, { @@ -1170,6 +1140,7 @@ "ctxt": 0 }, "value": "pre", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1192,13 +1163,11 @@ "ctxt": 0 }, "value": "IAstWalkCallback", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1219,6 +1188,7 @@ "ctxt": 0 }, "value": "post", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1241,13 +1211,11 @@ "ctxt": 0 }, "value": "IAstWalkCallback", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1268,6 +1236,7 @@ "ctxt": 0 }, "value": "options", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1290,13 +1259,11 @@ "ctxt": 0 }, "value": "AstWalkOptions", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1317,6 +1284,7 @@ "ctxt": 0 }, "value": "state", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1333,8 +1301,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1365,7 +1332,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "function": { @@ -1386,6 +1352,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1408,13 +1375,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1433,6 +1398,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1455,13 +1421,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1504,8 +1468,8 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1537,7 +1501,6 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1553,7 +1516,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } }, @@ -1567,7 +1529,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false } }, @@ -1612,7 +1573,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "right": { @@ -1623,7 +1583,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1658,8 +1617,8 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1669,7 +1628,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } } @@ -1715,7 +1673,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1728,7 +1685,6 @@ "ctxt": 0 }, "value": "goChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1766,8 +1722,8 @@ "ctxt": 0 }, "value": "svGoSib", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1799,7 +1755,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1812,7 +1767,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1866,7 +1820,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1879,7 +1832,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1939,7 +1891,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1959,7 +1910,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -1970,7 +1920,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1988,7 +1937,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } }, @@ -2002,7 +1950,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false } }, @@ -2066,7 +2013,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2079,7 +2025,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2092,7 +2037,6 @@ "ctxt": 0 }, "value": "svGoSib", - "typeAnnotation": null, "optional": false } } @@ -2152,7 +2096,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2165,7 +2108,6 @@ "ctxt": 0 }, "value": "goChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2214,7 +2156,6 @@ "ctxt": 0 }, "value": "post", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2252,8 +2193,8 @@ "ctxt": 0 }, "value": "postAst", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2285,7 +2226,6 @@ "ctxt": 0 }, "value": "post", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2301,7 +2241,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } }, @@ -2315,7 +2254,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false } }, @@ -2360,7 +2298,6 @@ "ctxt": 0 }, "value": "postAst", - "typeAnnotation": null, "optional": false }, "right": { @@ -2371,7 +2308,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2406,8 +2342,8 @@ "ctxt": 0 }, "value": "postAst", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2417,7 +2353,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -2441,7 +2376,6 @@ "ctxt": 0 }, "value": "postAst", - "typeAnnotation": null, "optional": false } } @@ -2470,7 +2404,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -2504,7 +2437,6 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2538,7 +2470,6 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2562,7 +2493,6 @@ "ctxt": 0 }, "value": "AstWalkerFactory", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2588,7 +2518,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "value": { @@ -2629,7 +2558,6 @@ "ctxt": 0 }, "value": "IAstWalkChildren", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2661,7 +2589,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -2710,7 +2637,6 @@ "ctxt": 0 }, "value": "initChildrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2739,7 +2665,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "function": { @@ -2760,6 +2685,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2782,13 +2708,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2807,6 +2731,7 @@ "ctxt": 0 }, "value": "pre", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2829,13 +2754,11 @@ "ctxt": 0 }, "value": "IAstWalkCallback", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2854,6 +2777,7 @@ "ctxt": 0 }, "value": "post", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2876,13 +2800,11 @@ "ctxt": 0 }, "value": "IAstWalkCallback", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } }, { @@ -2901,6 +2823,7 @@ "ctxt": 0 }, "value": "options", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2923,13 +2846,11 @@ "ctxt": 0 }, "value": "AstWalkOptions", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } }, { @@ -2948,6 +2869,7 @@ "ctxt": 0 }, "value": "state", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2964,8 +2886,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -3034,7 +2955,6 @@ "ctxt": 0 }, "value": "getWalker", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3050,7 +2970,6 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, "optional": false } }, @@ -3064,7 +2983,6 @@ "ctxt": 0 }, "value": "post", - "typeAnnotation": null, "optional": false } }, @@ -3078,7 +2996,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false } }, @@ -3092,7 +3009,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false } } @@ -3107,7 +3023,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3123,7 +3038,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } }, @@ -3169,7 +3083,6 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3197,7 +3110,6 @@ "ctxt": 0 }, "value": "getWalker", - "typeAnnotation": null, "optional": false }, "function": { @@ -3218,6 +3130,7 @@ "ctxt": 0 }, "value": "pre", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3240,13 +3153,11 @@ "ctxt": 0 }, "value": "IAstWalkCallback", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3265,6 +3176,7 @@ "ctxt": 0 }, "value": "post", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3287,13 +3199,11 @@ "ctxt": 0 }, "value": "IAstWalkCallback", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } }, { @@ -3312,6 +3222,7 @@ "ctxt": 0 }, "value": "options", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3334,13 +3245,11 @@ "ctxt": 0 }, "value": "AstWalkOptions", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } }, { @@ -3359,6 +3268,7 @@ "ctxt": 0 }, "value": "state", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3375,8 +3285,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -3431,7 +3340,6 @@ "ctxt": 0 }, "value": "getSlowWalker", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3447,7 +3355,6 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, "optional": false } }, @@ -3461,7 +3368,6 @@ "ctxt": 0 }, "value": "post", - "typeAnnotation": null, "optional": false } }, @@ -3475,7 +3381,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false } }, @@ -3489,7 +3394,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false } } @@ -3524,7 +3428,6 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3552,7 +3455,6 @@ "ctxt": 0 }, "value": "getSlowWalker", - "typeAnnotation": null, "optional": false }, "function": { @@ -3573,6 +3475,7 @@ "ctxt": 0 }, "value": "pre", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3595,13 +3498,11 @@ "ctxt": 0 }, "value": "IAstWalkCallback", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3620,6 +3521,7 @@ "ctxt": 0 }, "value": "post", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3642,13 +3544,11 @@ "ctxt": 0 }, "value": "IAstWalkCallback", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } }, { @@ -3667,6 +3567,7 @@ "ctxt": 0 }, "value": "options", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3689,13 +3590,11 @@ "ctxt": 0 }, "value": "AstWalkOptions", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } }, { @@ -3714,6 +3613,7 @@ "ctxt": 0 }, "value": "state", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3730,8 +3630,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -3772,7 +3671,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false } }, @@ -3807,8 +3705,8 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -3825,7 +3723,6 @@ "ctxt": 0 }, "value": "AstWalkOptions", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3859,7 +3756,6 @@ "ctxt": 0 }, "value": "AstWalker", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3888,7 +3784,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3904,7 +3799,6 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, "optional": false } }, @@ -3918,7 +3812,6 @@ "ctxt": 0 }, "value": "post", - "typeAnnotation": null, "optional": false } }, @@ -3932,7 +3825,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false } }, @@ -3946,7 +3838,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false } } @@ -3981,7 +3872,6 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4009,7 +3899,6 @@ "ctxt": 0 }, "value": "initChildrenWalkers", - "typeAnnotation": null, "optional": false }, "function": { @@ -4073,7 +3962,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4093,7 +3981,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -4104,7 +3991,6 @@ "ctxt": 0 }, "value": "None", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4126,7 +4012,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -4137,7 +4022,6 @@ "ctxt": 0 }, "value": "walkNone", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4189,7 +4073,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4209,7 +4092,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -4220,7 +4102,6 @@ "ctxt": 0 }, "value": "Empty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4242,7 +4123,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -4253,7 +4133,6 @@ "ctxt": 0 }, "value": "walkNone", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4305,7 +4184,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4325,7 +4203,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -4336,7 +4213,6 @@ "ctxt": 0 }, "value": "EmptyExpr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4358,7 +4234,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -4369,7 +4244,6 @@ "ctxt": 0 }, "value": "walkNone", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4421,7 +4295,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4441,7 +4314,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -4452,7 +4324,6 @@ "ctxt": 0 }, "value": "True", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4474,7 +4345,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -4485,7 +4355,6 @@ "ctxt": 0 }, "value": "walkNone", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4537,7 +4406,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4557,7 +4425,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -4568,7 +4435,6 @@ "ctxt": 0 }, "value": "False", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4590,7 +4456,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -4601,7 +4466,6 @@ "ctxt": 0 }, "value": "walkNone", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4653,7 +4517,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4673,7 +4536,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -4684,7 +4546,6 @@ "ctxt": 0 }, "value": "This", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4706,7 +4567,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -4717,7 +4577,6 @@ "ctxt": 0 }, "value": "walkNone", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4769,7 +4628,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4789,7 +4647,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -4800,7 +4657,6 @@ "ctxt": 0 }, "value": "Super", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4822,7 +4678,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -4833,7 +4688,6 @@ "ctxt": 0 }, "value": "walkNone", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4885,7 +4739,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4905,7 +4758,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -4916,7 +4768,6 @@ "ctxt": 0 }, "value": "QString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4938,7 +4789,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -4949,7 +4799,6 @@ "ctxt": 0 }, "value": "walkNone", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5001,7 +4850,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5021,7 +4869,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -5032,7 +4879,6 @@ "ctxt": 0 }, "value": "Regex", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5054,7 +4900,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -5065,7 +4910,6 @@ "ctxt": 0 }, "value": "walkNone", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5117,7 +4961,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5137,7 +4980,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -5148,7 +4990,6 @@ "ctxt": 0 }, "value": "Null", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5170,7 +5011,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -5181,7 +5021,6 @@ "ctxt": 0 }, "value": "walkNone", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5233,7 +5072,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5253,7 +5091,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -5264,7 +5101,6 @@ "ctxt": 0 }, "value": "ArrayLit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5286,7 +5122,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -5297,7 +5132,6 @@ "ctxt": 0 }, "value": "walkUnaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5349,7 +5183,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5369,7 +5202,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -5380,7 +5212,6 @@ "ctxt": 0 }, "value": "ObjectLit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5402,7 +5233,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -5413,7 +5243,6 @@ "ctxt": 0 }, "value": "walkUnaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5465,7 +5294,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5485,7 +5313,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -5496,7 +5323,6 @@ "ctxt": 0 }, "value": "Void", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5518,7 +5344,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -5529,7 +5354,6 @@ "ctxt": 0 }, "value": "walkUnaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5581,7 +5405,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5601,7 +5424,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -5612,7 +5434,6 @@ "ctxt": 0 }, "value": "Comma", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5634,7 +5455,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -5645,7 +5465,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5697,7 +5516,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5717,7 +5535,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -5728,7 +5545,6 @@ "ctxt": 0 }, "value": "Pos", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5750,7 +5566,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -5761,7 +5576,6 @@ "ctxt": 0 }, "value": "walkUnaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5813,7 +5627,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5833,7 +5646,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -5844,7 +5656,6 @@ "ctxt": 0 }, "value": "Neg", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5866,7 +5677,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -5877,7 +5687,6 @@ "ctxt": 0 }, "value": "walkUnaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5929,7 +5738,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5949,7 +5757,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -5960,7 +5767,6 @@ "ctxt": 0 }, "value": "Delete", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5982,7 +5788,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -5993,7 +5798,6 @@ "ctxt": 0 }, "value": "walkUnaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6045,7 +5849,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6065,7 +5868,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -6076,7 +5878,6 @@ "ctxt": 0 }, "value": "Await", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6098,7 +5899,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -6109,7 +5909,6 @@ "ctxt": 0 }, "value": "walkUnaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6161,7 +5960,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6181,7 +5979,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -6192,7 +5989,6 @@ "ctxt": 0 }, "value": "In", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6214,7 +6010,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -6225,7 +6020,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6277,7 +6071,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6297,7 +6090,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -6308,7 +6100,6 @@ "ctxt": 0 }, "value": "Dot", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6330,7 +6121,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -6341,7 +6131,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6393,7 +6182,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6413,7 +6201,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -6424,7 +6211,6 @@ "ctxt": 0 }, "value": "From", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6446,7 +6232,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -6457,7 +6242,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6509,7 +6293,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6529,7 +6312,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -6540,7 +6322,6 @@ "ctxt": 0 }, "value": "Is", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6562,7 +6343,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -6573,7 +6353,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6625,7 +6404,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6645,7 +6423,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -6656,7 +6433,6 @@ "ctxt": 0 }, "value": "InstOf", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6678,7 +6454,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -6689,7 +6464,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6741,7 +6515,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6761,7 +6534,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -6772,7 +6544,6 @@ "ctxt": 0 }, "value": "Typeof", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6794,7 +6565,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -6805,7 +6575,6 @@ "ctxt": 0 }, "value": "walkUnaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6857,7 +6626,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6877,7 +6645,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -6888,7 +6655,6 @@ "ctxt": 0 }, "value": "NumberLit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6910,7 +6676,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -6921,7 +6686,6 @@ "ctxt": 0 }, "value": "walkNone", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6973,7 +6737,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6993,7 +6756,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -7004,7 +6766,6 @@ "ctxt": 0 }, "value": "Name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7026,7 +6787,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -7037,7 +6797,6 @@ "ctxt": 0 }, "value": "walkNone", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7089,7 +6848,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7109,7 +6867,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -7120,7 +6877,6 @@ "ctxt": 0 }, "value": "TypeRef", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7142,7 +6898,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -7153,7 +6908,6 @@ "ctxt": 0 }, "value": "walkTypeReferenceChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7205,7 +6959,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7225,7 +6978,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -7236,7 +6988,6 @@ "ctxt": 0 }, "value": "Index", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7258,7 +7009,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -7269,7 +7019,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7321,7 +7070,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7341,7 +7089,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -7352,7 +7099,6 @@ "ctxt": 0 }, "value": "Call", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7374,7 +7120,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -7385,7 +7130,6 @@ "ctxt": 0 }, "value": "walkCallExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7437,7 +7181,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7457,7 +7200,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -7468,7 +7210,6 @@ "ctxt": 0 }, "value": "New", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7490,7 +7231,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -7501,7 +7241,6 @@ "ctxt": 0 }, "value": "walkCallExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7553,7 +7292,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7573,7 +7311,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -7584,7 +7321,6 @@ "ctxt": 0 }, "value": "Asg", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7606,7 +7342,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -7617,7 +7352,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7669,7 +7403,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7689,7 +7422,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -7700,7 +7432,6 @@ "ctxt": 0 }, "value": "AsgAdd", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7722,7 +7453,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -7733,7 +7463,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7785,7 +7514,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7805,7 +7533,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -7816,7 +7543,6 @@ "ctxt": 0 }, "value": "AsgSub", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7838,7 +7564,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -7849,7 +7574,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7901,7 +7625,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7921,7 +7644,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -7932,7 +7654,6 @@ "ctxt": 0 }, "value": "AsgDiv", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7954,7 +7675,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -7965,7 +7685,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8017,7 +7736,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8037,7 +7755,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -8048,7 +7765,6 @@ "ctxt": 0 }, "value": "AsgMul", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8070,7 +7786,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -8081,7 +7796,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8133,7 +7847,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8153,7 +7866,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -8164,7 +7876,6 @@ "ctxt": 0 }, "value": "AsgMod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8186,7 +7897,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -8197,7 +7907,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8249,7 +7958,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8269,7 +7977,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -8280,7 +7987,6 @@ "ctxt": 0 }, "value": "AsgAnd", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8302,7 +8008,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -8313,7 +8018,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8365,7 +8069,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8385,7 +8088,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -8396,7 +8098,6 @@ "ctxt": 0 }, "value": "AsgXor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8418,7 +8119,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -8429,7 +8129,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8481,7 +8180,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8501,7 +8199,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -8512,7 +8209,6 @@ "ctxt": 0 }, "value": "AsgOr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8534,7 +8230,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -8545,7 +8240,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8597,7 +8291,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8617,7 +8310,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -8628,7 +8320,6 @@ "ctxt": 0 }, "value": "AsgLsh", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8650,7 +8341,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -8661,7 +8351,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8713,7 +8402,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8733,7 +8421,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -8744,7 +8431,6 @@ "ctxt": 0 }, "value": "AsgRsh", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8766,7 +8452,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -8777,7 +8462,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8829,7 +8513,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8849,7 +8532,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -8860,7 +8542,6 @@ "ctxt": 0 }, "value": "AsgRs2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8882,7 +8563,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -8893,7 +8573,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8945,7 +8624,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8965,7 +8643,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -8976,7 +8653,6 @@ "ctxt": 0 }, "value": "ConditionalExpression", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8998,7 +8674,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -9009,7 +8684,6 @@ "ctxt": 0 }, "value": "walkTrinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9061,7 +8735,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9081,7 +8754,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -9092,7 +8764,6 @@ "ctxt": 0 }, "value": "LogOr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9114,7 +8785,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -9125,7 +8795,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9177,7 +8846,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9197,7 +8865,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -9208,7 +8875,6 @@ "ctxt": 0 }, "value": "LogAnd", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9230,7 +8896,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -9241,7 +8906,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9293,7 +8957,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9313,7 +8976,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -9324,7 +8986,6 @@ "ctxt": 0 }, "value": "Or", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9346,7 +9007,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -9357,7 +9017,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9409,7 +9068,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9429,7 +9087,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -9440,7 +9097,6 @@ "ctxt": 0 }, "value": "Xor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9462,7 +9118,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -9473,7 +9128,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9525,7 +9179,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9545,7 +9198,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -9556,7 +9208,6 @@ "ctxt": 0 }, "value": "And", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9578,7 +9229,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -9589,7 +9239,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9641,7 +9290,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9661,7 +9309,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -9672,7 +9319,6 @@ "ctxt": 0 }, "value": "Eq", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9694,7 +9340,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -9705,7 +9350,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9757,7 +9401,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9777,7 +9420,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -9788,7 +9430,6 @@ "ctxt": 0 }, "value": "Ne", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9810,7 +9451,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -9821,7 +9461,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9873,7 +9512,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9893,7 +9531,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -9904,7 +9541,6 @@ "ctxt": 0 }, "value": "Eqv", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9926,7 +9562,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -9937,7 +9572,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9989,7 +9623,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10009,7 +9642,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -10020,7 +9652,6 @@ "ctxt": 0 }, "value": "NEqv", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10042,7 +9673,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -10053,7 +9683,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10105,7 +9734,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10125,7 +9753,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -10136,7 +9763,6 @@ "ctxt": 0 }, "value": "Lt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10158,7 +9784,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -10169,7 +9794,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10221,7 +9845,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10241,7 +9864,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -10252,7 +9874,6 @@ "ctxt": 0 }, "value": "Le", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10274,7 +9895,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -10285,7 +9905,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10337,7 +9956,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10357,7 +9975,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -10368,7 +9985,6 @@ "ctxt": 0 }, "value": "Gt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10390,7 +10006,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -10401,7 +10016,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10453,7 +10067,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10473,7 +10086,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -10484,7 +10096,6 @@ "ctxt": 0 }, "value": "Ge", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10506,7 +10117,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -10517,7 +10127,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10569,7 +10178,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10589,7 +10197,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -10600,7 +10207,6 @@ "ctxt": 0 }, "value": "Add", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10622,7 +10228,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -10633,7 +10238,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10685,7 +10289,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10705,7 +10308,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -10716,7 +10318,6 @@ "ctxt": 0 }, "value": "Sub", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10738,7 +10339,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -10749,7 +10349,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10801,7 +10400,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10821,7 +10419,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -10832,7 +10429,6 @@ "ctxt": 0 }, "value": "Mul", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10854,7 +10450,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -10865,7 +10460,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10917,7 +10511,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10937,7 +10530,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -10948,7 +10540,6 @@ "ctxt": 0 }, "value": "Div", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10970,7 +10561,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -10981,7 +10571,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11033,7 +10622,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11053,7 +10641,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -11064,7 +10651,6 @@ "ctxt": 0 }, "value": "Mod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11086,7 +10672,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -11097,7 +10682,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11149,7 +10733,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11169,7 +10752,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -11180,7 +10762,6 @@ "ctxt": 0 }, "value": "Lsh", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11202,7 +10783,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -11213,7 +10793,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11265,7 +10844,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11285,7 +10863,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -11296,7 +10873,6 @@ "ctxt": 0 }, "value": "Rsh", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11318,7 +10894,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -11329,7 +10904,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11381,7 +10955,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11401,7 +10974,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -11412,7 +10984,6 @@ "ctxt": 0 }, "value": "Rs2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11434,7 +11005,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -11445,7 +11015,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11497,7 +11066,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11517,7 +11085,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -11528,7 +11095,6 @@ "ctxt": 0 }, "value": "Not", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11550,7 +11116,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -11561,7 +11126,6 @@ "ctxt": 0 }, "value": "walkUnaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11613,7 +11177,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11633,7 +11196,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -11644,7 +11206,6 @@ "ctxt": 0 }, "value": "LogNot", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11666,7 +11227,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -11677,7 +11237,6 @@ "ctxt": 0 }, "value": "walkUnaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11729,7 +11288,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11749,7 +11307,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -11760,7 +11317,6 @@ "ctxt": 0 }, "value": "IncPre", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11782,7 +11338,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -11793,7 +11348,6 @@ "ctxt": 0 }, "value": "walkUnaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11845,7 +11399,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11865,7 +11418,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -11876,7 +11428,6 @@ "ctxt": 0 }, "value": "DecPre", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11898,7 +11449,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -11909,7 +11459,6 @@ "ctxt": 0 }, "value": "walkUnaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11961,7 +11510,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11981,7 +11529,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -11992,7 +11539,6 @@ "ctxt": 0 }, "value": "IncPost", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12014,7 +11560,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -12025,7 +11570,6 @@ "ctxt": 0 }, "value": "walkUnaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12077,7 +11621,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12097,7 +11640,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -12108,7 +11650,6 @@ "ctxt": 0 }, "value": "DecPost", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12130,7 +11671,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -12141,7 +11681,6 @@ "ctxt": 0 }, "value": "walkUnaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12193,7 +11732,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12213,7 +11751,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -12224,7 +11761,6 @@ "ctxt": 0 }, "value": "TypeAssertion", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12246,7 +11782,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -12257,7 +11792,6 @@ "ctxt": 0 }, "value": "walkUnaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12309,7 +11843,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12329,7 +11862,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -12340,7 +11872,6 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12362,7 +11893,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -12373,7 +11903,6 @@ "ctxt": 0 }, "value": "walkFuncDeclChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12425,7 +11954,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12445,7 +11973,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -12456,7 +11983,6 @@ "ctxt": 0 }, "value": "Member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12478,7 +12004,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -12489,7 +12014,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12541,7 +12065,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12561,7 +12084,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -12572,7 +12094,6 @@ "ctxt": 0 }, "value": "VarDecl", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12594,7 +12115,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -12605,7 +12125,6 @@ "ctxt": 0 }, "value": "walkBoundDeclChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12657,7 +12176,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12677,7 +12195,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -12688,7 +12205,6 @@ "ctxt": 0 }, "value": "ArgDecl", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12710,7 +12226,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -12721,7 +12236,6 @@ "ctxt": 0 }, "value": "walkBoundDeclChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12773,7 +12287,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12793,7 +12306,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -12804,7 +12316,6 @@ "ctxt": 0 }, "value": "Return", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12826,7 +12337,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -12837,7 +12347,6 @@ "ctxt": 0 }, "value": "walkReturnStatementChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12889,7 +12398,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12909,7 +12417,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -12920,7 +12427,6 @@ "ctxt": 0 }, "value": "Break", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12942,7 +12448,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -12953,7 +12458,6 @@ "ctxt": 0 }, "value": "walkNone", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13005,7 +12509,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13025,7 +12528,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -13036,7 +12538,6 @@ "ctxt": 0 }, "value": "Continue", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13058,7 +12559,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -13069,7 +12569,6 @@ "ctxt": 0 }, "value": "walkNone", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13121,7 +12620,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13141,7 +12639,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -13152,7 +12649,6 @@ "ctxt": 0 }, "value": "Throw", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13174,7 +12670,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -13185,7 +12680,6 @@ "ctxt": 0 }, "value": "walkUnaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13237,7 +12731,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13257,7 +12750,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -13268,7 +12760,6 @@ "ctxt": 0 }, "value": "For", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13290,7 +12781,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -13301,7 +12791,6 @@ "ctxt": 0 }, "value": "walkForStatementChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13353,7 +12842,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13373,7 +12861,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -13384,7 +12871,6 @@ "ctxt": 0 }, "value": "ForIn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13406,7 +12892,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -13417,7 +12902,6 @@ "ctxt": 0 }, "value": "walkForInStatementChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13469,7 +12953,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13489,7 +12972,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -13500,7 +12982,6 @@ "ctxt": 0 }, "value": "If", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13522,7 +13003,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -13533,7 +13013,6 @@ "ctxt": 0 }, "value": "walkIfStatementChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13585,7 +13064,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13605,7 +13083,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -13616,7 +13093,6 @@ "ctxt": 0 }, "value": "While", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13638,7 +13114,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -13649,7 +13124,6 @@ "ctxt": 0 }, "value": "walkWhileStatementChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13701,7 +13175,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13721,7 +13194,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -13732,7 +13204,6 @@ "ctxt": 0 }, "value": "DoWhile", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13754,7 +13225,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -13765,7 +13235,6 @@ "ctxt": 0 }, "value": "walkDoWhileStatementChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13817,7 +13286,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13837,7 +13305,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -13848,7 +13315,6 @@ "ctxt": 0 }, "value": "Block", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13870,7 +13336,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -13881,7 +13346,6 @@ "ctxt": 0 }, "value": "walkBlockChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13933,7 +13397,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13953,7 +13416,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -13964,7 +13426,6 @@ "ctxt": 0 }, "value": "Case", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13986,7 +13447,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -13997,7 +13457,6 @@ "ctxt": 0 }, "value": "walkCaseStatementChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14049,7 +13508,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14069,7 +13527,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -14080,7 +13537,6 @@ "ctxt": 0 }, "value": "Switch", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14102,7 +13558,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -14113,7 +13568,6 @@ "ctxt": 0 }, "value": "walkSwitchStatementChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14165,7 +13619,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14185,7 +13638,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -14196,7 +13648,6 @@ "ctxt": 0 }, "value": "Try", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14218,7 +13669,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -14229,7 +13679,6 @@ "ctxt": 0 }, "value": "walkTryChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14281,7 +13730,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14301,7 +13749,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -14312,7 +13759,6 @@ "ctxt": 0 }, "value": "TryCatch", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14334,7 +13780,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -14345,7 +13790,6 @@ "ctxt": 0 }, "value": "walkTryCatchChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14397,7 +13841,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14417,7 +13860,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -14428,7 +13870,6 @@ "ctxt": 0 }, "value": "TryFinally", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14450,7 +13891,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -14461,7 +13901,6 @@ "ctxt": 0 }, "value": "walkTryFinallyChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14513,7 +13952,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14533,7 +13971,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -14544,7 +13981,6 @@ "ctxt": 0 }, "value": "Finally", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14566,7 +14002,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -14577,7 +14012,6 @@ "ctxt": 0 }, "value": "walkFinallyChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14629,7 +14063,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14649,7 +14082,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -14660,7 +14092,6 @@ "ctxt": 0 }, "value": "Catch", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14682,7 +14113,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -14693,7 +14123,6 @@ "ctxt": 0 }, "value": "walkCatchChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14745,7 +14174,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14765,7 +14193,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -14776,7 +14203,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14798,7 +14224,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -14809,7 +14234,6 @@ "ctxt": 0 }, "value": "walkListChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14861,7 +14285,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14881,7 +14304,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -14892,7 +14314,6 @@ "ctxt": 0 }, "value": "Script", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14914,7 +14335,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -14925,7 +14345,6 @@ "ctxt": 0 }, "value": "walkScriptChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14977,7 +14396,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14997,7 +14415,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -15008,7 +14425,6 @@ "ctxt": 0 }, "value": "ClassDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15030,7 +14446,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -15041,7 +14456,6 @@ "ctxt": 0 }, "value": "walkClassDeclChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15093,7 +14507,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15113,7 +14526,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -15124,7 +14536,6 @@ "ctxt": 0 }, "value": "InterfaceDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15146,7 +14557,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -15157,7 +14567,6 @@ "ctxt": 0 }, "value": "walkTypeDeclChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15209,7 +14618,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15229,7 +14637,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -15240,7 +14647,6 @@ "ctxt": 0 }, "value": "ModuleDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15262,7 +14668,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -15273,7 +14678,6 @@ "ctxt": 0 }, "value": "walkModuleDeclChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15325,7 +14729,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15345,7 +14748,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -15356,7 +14758,6 @@ "ctxt": 0 }, "value": "ImportDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15378,7 +14779,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -15389,7 +14789,6 @@ "ctxt": 0 }, "value": "walkImportDeclChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15441,7 +14840,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15461,7 +14859,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -15472,7 +14869,6 @@ "ctxt": 0 }, "value": "With", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15494,7 +14890,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -15505,7 +14900,6 @@ "ctxt": 0 }, "value": "walkWithStatementChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15557,7 +14951,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15577,7 +14970,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -15588,7 +14980,6 @@ "ctxt": 0 }, "value": "Label", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15610,7 +15001,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -15621,7 +15011,6 @@ "ctxt": 0 }, "value": "walkLabelChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15673,7 +15062,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15693,7 +15081,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -15704,7 +15091,6 @@ "ctxt": 0 }, "value": "LabeledStatement", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15726,7 +15112,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -15737,7 +15122,6 @@ "ctxt": 0 }, "value": "walkLabeledStatementChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15789,7 +15173,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15809,7 +15192,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -15820,7 +15202,6 @@ "ctxt": 0 }, "value": "EBStart", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15842,7 +15223,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -15853,7 +15233,6 @@ "ctxt": 0 }, "value": "walkNone", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15905,7 +15284,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15925,7 +15303,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -15936,7 +15313,6 @@ "ctxt": 0 }, "value": "GotoEB", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15958,7 +15334,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -15969,7 +15344,6 @@ "ctxt": 0 }, "value": "walkNone", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16021,7 +15395,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16041,7 +15414,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -16052,7 +15424,6 @@ "ctxt": 0 }, "value": "EndCode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16074,7 +15445,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -16085,7 +15455,6 @@ "ctxt": 0 }, "value": "walkNone", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16137,7 +15506,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16157,7 +15525,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -16168,7 +15535,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16190,7 +15556,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -16201,7 +15566,6 @@ "ctxt": 0 }, "value": "walkNone", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16253,7 +15617,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16273,7 +15636,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -16284,7 +15646,6 @@ "ctxt": 0 }, "value": "Comment", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16306,7 +15667,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -16317,7 +15677,6 @@ "ctxt": 0 }, "value": "walkNone", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16369,7 +15728,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16389,7 +15747,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -16400,7 +15757,6 @@ "ctxt": 0 }, "value": "Debugger", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16422,7 +15778,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "property": { @@ -16433,7 +15788,6 @@ "ctxt": 0 }, "value": "walkNone", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16472,8 +15826,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -16509,7 +15863,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -16531,7 +15884,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16603,7 +15955,6 @@ "ctxt": 0 }, "value": "childrenWalkers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16627,7 +15978,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": true @@ -16640,7 +15990,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -16674,7 +16023,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -16768,6 +16116,7 @@ "ctxt": 0 }, "value": "globalAstWalkerFactory", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -16790,13 +16139,11 @@ "ctxt": 0 }, "value": "AstWalkerFactory", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -16820,7 +16167,6 @@ "ctxt": 0 }, "value": "getAstWalkerFactory", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -16862,7 +16208,6 @@ "ctxt": 0 }, "value": "globalAstWalkerFactory", - "typeAnnotation": null, "optional": false } }, @@ -16897,8 +16242,8 @@ "ctxt": 0 }, "value": "globalAstWalkerFactory", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -16915,7 +16260,6 @@ "ctxt": 0 }, "value": "AstWalkerFactory", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -16942,7 +16286,6 @@ "ctxt": 0 }, "value": "globalAstWalkerFactory", - "typeAnnotation": null, "optional": false } } @@ -16973,7 +16316,6 @@ "ctxt": 0 }, "value": "AstWalkerFactory", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -16998,7 +16340,6 @@ "ctxt": 0 }, "value": "ChildrenWalkers", - "typeAnnotation": null, "optional": false }, "body": { @@ -17026,7 +16367,6 @@ "ctxt": 0 }, "value": "walkNone", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -17047,6 +16387,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -17069,13 +16410,11 @@ "ctxt": 0 }, "value": "ASTList", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -17094,6 +16433,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -17116,13 +16456,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -17141,6 +16479,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -17163,13 +16502,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -17227,7 +16564,6 @@ "ctxt": 0 }, "value": "walkListChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -17248,6 +16584,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -17270,13 +16607,11 @@ "ctxt": 0 }, "value": "ASTList", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -17295,6 +16630,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -17317,13 +16653,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -17342,6 +16676,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -17364,13 +16699,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -17413,8 +16746,8 @@ "ctxt": 0 }, "value": "len", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -17438,7 +16771,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -17449,7 +16781,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17462,7 +16793,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17500,7 +16830,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -17511,7 +16840,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17524,7 +16852,6 @@ "ctxt": 0 }, "value": "reverseSiblings", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17569,8 +16896,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -17588,7 +16915,6 @@ "ctxt": 0 }, "value": "len", - "typeAnnotation": null, "optional": false }, "right": { @@ -17621,7 +16947,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "right": { @@ -17651,7 +16976,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -17692,7 +17016,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -17703,7 +17026,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17716,7 +17038,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17766,7 +17087,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -17777,7 +17097,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17790,7 +17109,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": true @@ -17817,7 +17135,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -17828,7 +17145,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17858,7 +17174,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -17869,7 +17184,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17882,7 +17196,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": true @@ -17898,7 +17211,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -17956,8 +17268,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -17988,7 +17300,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "right": { @@ -17999,7 +17310,6 @@ "ctxt": 0 }, "value": "len", - "typeAnnotation": null, "optional": false } }, @@ -18020,7 +17330,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -18061,7 +17370,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -18072,7 +17380,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18085,7 +17392,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18135,7 +17441,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -18146,7 +17451,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18159,7 +17463,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": true @@ -18186,7 +17489,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -18197,7 +17499,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18227,7 +17528,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -18238,7 +17538,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18251,7 +17550,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": true @@ -18267,7 +17565,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -18327,7 +17624,6 @@ "ctxt": 0 }, "value": "walkUnaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -18348,6 +17644,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -18370,13 +17667,11 @@ "ctxt": 0 }, "value": "UnaryExpression", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -18395,6 +17690,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -18417,13 +17713,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -18442,6 +17736,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -18464,13 +17759,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -18510,7 +17803,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -18521,7 +17813,6 @@ "ctxt": 0 }, "value": "castTerm", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18564,7 +17855,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -18575,7 +17865,6 @@ "ctxt": 0 }, "value": "castTerm", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18602,7 +17891,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -18613,7 +17901,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18636,7 +17923,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -18647,7 +17933,6 @@ "ctxt": 0 }, "value": "castTerm", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18663,7 +17948,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -18698,7 +17982,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -18709,7 +17992,6 @@ "ctxt": 0 }, "value": "operand", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18752,7 +18034,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -18763,7 +18044,6 @@ "ctxt": 0 }, "value": "operand", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18790,7 +18070,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -18801,7 +18080,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18824,7 +18102,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -18835,7 +18112,6 @@ "ctxt": 0 }, "value": "operand", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18851,7 +18127,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -18905,7 +18180,6 @@ "ctxt": 0 }, "value": "walkBinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -18926,6 +18200,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -18948,13 +18223,11 @@ "ctxt": 0 }, "value": "BinaryExpression", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -18973,6 +18246,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -18995,13 +18269,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -19020,6 +18292,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -19042,13 +18315,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -19095,7 +18366,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -19106,7 +18376,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19119,7 +18388,6 @@ "ctxt": 0 }, "value": "reverseSiblings", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19154,7 +18422,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -19165,7 +18432,6 @@ "ctxt": 0 }, "value": "operand2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19208,7 +18474,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -19219,7 +18484,6 @@ "ctxt": 0 }, "value": "operand2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19246,7 +18510,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -19257,7 +18520,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19280,7 +18542,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -19291,7 +18552,6 @@ "ctxt": 0 }, "value": "operand2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19307,7 +18567,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -19357,7 +18616,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -19368,7 +18626,6 @@ "ctxt": 0 }, "value": "operand1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19403,7 +18660,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -19414,7 +18670,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19427,7 +18682,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19472,7 +18726,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -19483,7 +18736,6 @@ "ctxt": 0 }, "value": "operand1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19510,7 +18762,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -19521,7 +18772,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19544,7 +18794,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -19555,7 +18804,6 @@ "ctxt": 0 }, "value": "operand1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19571,7 +18819,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -19616,7 +18863,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -19627,7 +18873,6 @@ "ctxt": 0 }, "value": "operand1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19670,7 +18915,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -19681,7 +18925,6 @@ "ctxt": 0 }, "value": "operand1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19708,7 +18951,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -19719,7 +18961,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19742,7 +18983,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -19753,7 +18993,6 @@ "ctxt": 0 }, "value": "operand1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19769,7 +19008,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -19819,7 +19057,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -19830,7 +19067,6 @@ "ctxt": 0 }, "value": "operand2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19865,7 +19101,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -19876,7 +19111,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19889,7 +19123,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19934,7 +19167,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -19945,7 +19177,6 @@ "ctxt": 0 }, "value": "operand2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19972,7 +19203,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -19983,7 +19213,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20006,7 +19235,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -20017,7 +19245,6 @@ "ctxt": 0 }, "value": "operand2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20033,7 +19260,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -20090,7 +19316,6 @@ "ctxt": 0 }, "value": "walkTypeReferenceChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -20111,6 +19336,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -20133,13 +19359,11 @@ "ctxt": 0 }, "value": "TypeReference", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -20158,6 +19382,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -20180,13 +19405,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -20205,6 +19428,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -20227,13 +19451,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -20273,7 +19495,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -20284,7 +19505,6 @@ "ctxt": 0 }, "value": "term", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20327,7 +19547,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -20338,7 +19557,6 @@ "ctxt": 0 }, "value": "term", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20365,7 +19583,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -20376,7 +19593,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20399,7 +19615,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -20410,7 +19625,6 @@ "ctxt": 0 }, "value": "term", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20426,7 +19640,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -20480,7 +19693,6 @@ "ctxt": 0 }, "value": "walkCallExpressionChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -20501,6 +19713,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -20523,13 +19736,11 @@ "ctxt": 0 }, "value": "CallExpression", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -20548,6 +19759,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -20570,13 +19782,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -20595,6 +19805,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -20617,13 +19828,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -20678,7 +19887,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -20689,7 +19897,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20702,7 +19909,6 @@ "ctxt": 0 }, "value": "reverseSiblings", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20746,7 +19952,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -20757,7 +19962,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20784,7 +19988,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -20795,7 +19998,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20818,7 +20020,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -20829,7 +20030,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20845,7 +20045,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -20888,7 +20087,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -20899,7 +20097,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20933,7 +20130,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -20944,7 +20140,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20957,7 +20152,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21002,7 +20196,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -21013,7 +20206,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21047,7 +20239,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -21058,7 +20249,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21081,7 +20271,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -21092,7 +20281,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21108,7 +20296,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -21130,7 +20317,6 @@ "ctxt": 0 }, "value": "ASTList", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -21186,7 +20372,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -21197,7 +20382,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21210,7 +20394,6 @@ "ctxt": 0 }, "value": "reverseSiblings", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21245,7 +20428,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -21256,7 +20438,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21269,7 +20450,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21314,7 +20494,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -21325,7 +20504,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21352,7 +20530,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -21363,7 +20540,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21386,7 +20562,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -21397,7 +20572,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21413,7 +20587,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -21467,7 +20640,6 @@ "ctxt": 0 }, "value": "walkTrinaryExpressionChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -21488,6 +20660,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -21510,13 +20683,11 @@ "ctxt": 0 }, "value": "ConditionalExpression", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -21535,6 +20706,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -21557,13 +20729,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -21582,6 +20752,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -21604,13 +20775,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -21650,7 +20819,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -21661,7 +20829,6 @@ "ctxt": 0 }, "value": "operand1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21704,7 +20871,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -21715,7 +20881,6 @@ "ctxt": 0 }, "value": "operand1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21742,7 +20907,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -21753,7 +20917,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21776,7 +20939,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -21787,7 +20949,6 @@ "ctxt": 0 }, "value": "operand1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21803,7 +20964,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -21846,7 +21006,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -21857,7 +21016,6 @@ "ctxt": 0 }, "value": "operand2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21891,7 +21049,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -21902,7 +21059,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21915,7 +21071,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21960,7 +21115,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -21971,7 +21125,6 @@ "ctxt": 0 }, "value": "operand2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21998,7 +21151,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -22009,7 +21161,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22032,7 +21183,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -22043,7 +21193,6 @@ "ctxt": 0 }, "value": "operand2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22059,7 +21208,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -22102,7 +21250,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -22113,7 +21260,6 @@ "ctxt": 0 }, "value": "operand3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22147,7 +21293,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -22158,7 +21303,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22171,7 +21315,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22216,7 +21359,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -22227,7 +21369,6 @@ "ctxt": 0 }, "value": "operand3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22254,7 +21395,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -22265,7 +21405,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22288,7 +21427,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -22299,7 +21437,6 @@ "ctxt": 0 }, "value": "operand3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22315,7 +21452,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -22369,7 +21505,6 @@ "ctxt": 0 }, "value": "walkFuncDeclChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -22390,6 +21525,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -22412,13 +21548,11 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -22437,6 +21571,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -22459,13 +21594,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -22484,6 +21617,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -22506,13 +21640,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -22552,7 +21684,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -22563,7 +21694,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22606,7 +21736,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -22617,7 +21746,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22651,7 +21779,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -22662,7 +21789,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22685,7 +21811,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -22696,7 +21821,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22712,7 +21836,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -22734,7 +21857,6 @@ "ctxt": 0 }, "value": "Identifier", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -22784,7 +21906,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -22795,7 +21916,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22844,7 +21964,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -22855,7 +21974,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22868,7 +21986,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22881,7 +21998,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22927,7 +22043,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -22938,7 +22053,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22951,7 +22065,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22996,7 +22109,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -23007,7 +22119,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23041,7 +22152,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -23052,7 +22162,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23075,7 +22184,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -23086,7 +22194,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23102,7 +22209,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -23124,7 +22230,6 @@ "ctxt": 0 }, "value": "ASTList", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -23166,7 +22271,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -23177,7 +22281,6 @@ "ctxt": 0 }, "value": "returnTypeAnnotation", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23211,7 +22314,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -23222,7 +22324,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23235,7 +22336,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23280,7 +22380,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -23291,7 +22390,6 @@ "ctxt": 0 }, "value": "returnTypeAnnotation", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23318,7 +22416,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -23329,7 +22426,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23352,7 +22448,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -23363,7 +22458,6 @@ "ctxt": 0 }, "value": "returnTypeAnnotation", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23379,7 +22473,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -23430,7 +22523,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -23441,7 +22533,6 @@ "ctxt": 0 }, "value": "bod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23490,7 +22581,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -23501,7 +22591,6 @@ "ctxt": 0 }, "value": "bod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23514,7 +22603,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23527,7 +22615,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23573,7 +22660,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -23584,7 +22670,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23597,7 +22682,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23642,7 +22726,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -23653,7 +22736,6 @@ "ctxt": 0 }, "value": "bod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23687,7 +22769,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -23698,7 +22779,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23721,7 +22801,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -23732,7 +22811,6 @@ "ctxt": 0 }, "value": "bod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23748,7 +22826,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -23770,7 +22847,6 @@ "ctxt": 0 }, "value": "ASTList", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -23823,7 +22899,6 @@ "ctxt": 0 }, "value": "walkBoundDeclChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -23844,6 +22919,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -23866,13 +22942,11 @@ "ctxt": 0 }, "value": "BoundDecl", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -23891,6 +22965,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -23913,13 +22988,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -23938,6 +23011,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -23960,13 +23034,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -24006,7 +23078,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -24017,7 +23088,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24060,7 +23130,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -24071,7 +23140,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24105,7 +23173,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -24116,7 +23183,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24139,7 +23205,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -24150,7 +23215,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24166,7 +23230,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -24188,7 +23251,6 @@ "ctxt": 0 }, "value": "Identifier", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24222,7 +23284,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -24233,7 +23294,6 @@ "ctxt": 0 }, "value": "init", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24276,7 +23336,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -24287,7 +23346,6 @@ "ctxt": 0 }, "value": "init", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24314,7 +23372,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -24325,7 +23382,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24348,7 +23404,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -24359,7 +23414,6 @@ "ctxt": 0 }, "value": "init", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24375,7 +23429,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -24425,7 +23478,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -24436,7 +23488,6 @@ "ctxt": 0 }, "value": "typeExpr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24471,7 +23522,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -24482,7 +23532,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24495,7 +23544,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24540,7 +23588,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -24551,7 +23598,6 @@ "ctxt": 0 }, "value": "typeExpr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24578,7 +23624,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -24589,7 +23634,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24612,7 +23656,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -24623,7 +23666,6 @@ "ctxt": 0 }, "value": "typeExpr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24639,7 +23681,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -24693,7 +23734,6 @@ "ctxt": 0 }, "value": "walkReturnStatementChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -24714,6 +23754,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -24736,13 +23777,11 @@ "ctxt": 0 }, "value": "ReturnStatement", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -24761,6 +23800,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -24783,13 +23823,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -24808,6 +23846,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -24830,13 +23869,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -24876,7 +23913,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -24887,7 +23923,6 @@ "ctxt": 0 }, "value": "returnExpression", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24930,7 +23965,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -24941,7 +23975,6 @@ "ctxt": 0 }, "value": "returnExpression", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24968,7 +24001,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -24979,7 +24011,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25002,7 +24033,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -25013,7 +24043,6 @@ "ctxt": 0 }, "value": "returnExpression", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25029,7 +24058,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -25083,7 +24111,6 @@ "ctxt": 0 }, "value": "walkForStatementChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -25104,6 +24131,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -25126,13 +24154,11 @@ "ctxt": 0 }, "value": "ForStatement", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -25151,6 +24177,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -25173,13 +24200,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -25198,6 +24223,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -25220,13 +24246,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -25266,7 +24290,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -25277,7 +24300,6 @@ "ctxt": 0 }, "value": "init", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25320,7 +24342,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -25331,7 +24352,6 @@ "ctxt": 0 }, "value": "init", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25358,7 +24378,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -25369,7 +24388,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25392,7 +24410,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -25403,7 +24420,6 @@ "ctxt": 0 }, "value": "init", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25419,7 +24435,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -25462,7 +24477,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -25473,7 +24487,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25500,7 +24513,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -25511,7 +24523,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25524,7 +24535,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25568,7 +24578,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -25579,7 +24588,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25606,7 +24614,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -25617,7 +24624,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25640,7 +24646,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -25651,7 +24656,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25667,7 +24671,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -25710,7 +24713,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -25721,7 +24723,6 @@ "ctxt": 0 }, "value": "incr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25748,7 +24749,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -25759,7 +24759,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25772,7 +24771,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25816,7 +24814,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -25827,7 +24824,6 @@ "ctxt": 0 }, "value": "incr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25854,7 +24850,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -25865,7 +24860,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25888,7 +24882,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -25899,7 +24892,6 @@ "ctxt": 0 }, "value": "incr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25915,7 +24907,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -25958,7 +24949,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -25969,7 +24959,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25996,7 +24985,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -26007,7 +24995,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26020,7 +25007,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26064,7 +25050,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -26075,7 +25060,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26102,7 +25086,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -26113,7 +25096,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26136,7 +25118,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -26147,7 +25128,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26163,7 +25143,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -26217,7 +25196,6 @@ "ctxt": 0 }, "value": "walkForInStatementChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -26238,6 +25216,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -26260,13 +25239,11 @@ "ctxt": 0 }, "value": "ForInStatement", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -26285,6 +25262,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -26307,13 +25285,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -26332,6 +25308,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -26354,13 +25331,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -26408,7 +25383,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -26419,7 +25393,6 @@ "ctxt": 0 }, "value": "lval", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26446,7 +25419,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -26457,7 +25429,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26480,7 +25451,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -26491,7 +25461,6 @@ "ctxt": 0 }, "value": "lval", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26507,7 +25476,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -26545,7 +25513,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -26556,7 +25523,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26569,7 +25535,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26612,7 +25577,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -26623,7 +25587,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26650,7 +25613,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -26661,7 +25623,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26684,7 +25645,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -26695,7 +25655,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26711,7 +25670,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -26754,7 +25712,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -26765,7 +25722,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26799,7 +25755,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -26810,7 +25765,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26823,7 +25777,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26868,7 +25821,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -26879,7 +25831,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26906,7 +25857,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -26917,7 +25867,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26940,7 +25889,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -26951,7 +25899,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26967,7 +25914,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -27021,7 +25967,6 @@ "ctxt": 0 }, "value": "walkIfStatementChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -27042,6 +25987,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -27064,13 +26010,11 @@ "ctxt": 0 }, "value": "IfStatement", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -27089,6 +26033,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -27111,13 +26056,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -27136,6 +26079,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -27158,13 +26102,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -27212,7 +26154,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -27223,7 +26164,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27250,7 +26190,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -27261,7 +26200,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27284,7 +26222,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -27295,7 +26232,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27311,7 +26247,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -27350,7 +26285,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -27361,7 +26295,6 @@ "ctxt": 0 }, "value": "thenBod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27395,7 +26328,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -27406,7 +26338,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27419,7 +26350,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27464,7 +26394,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -27475,7 +26404,6 @@ "ctxt": 0 }, "value": "thenBod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27502,7 +26430,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -27513,7 +26440,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27536,7 +26462,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -27547,7 +26472,6 @@ "ctxt": 0 }, "value": "thenBod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27563,7 +26487,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -27606,7 +26529,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -27617,7 +26539,6 @@ "ctxt": 0 }, "value": "elseBod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27651,7 +26572,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -27662,7 +26582,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27675,7 +26594,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27720,7 +26638,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -27731,7 +26648,6 @@ "ctxt": 0 }, "value": "elseBod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27758,7 +26674,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -27769,7 +26684,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27792,7 +26706,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -27803,7 +26716,6 @@ "ctxt": 0 }, "value": "elseBod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27819,7 +26731,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -27873,7 +26784,6 @@ "ctxt": 0 }, "value": "walkWhileStatementChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -27894,6 +26804,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -27916,13 +26827,11 @@ "ctxt": 0 }, "value": "WhileStatement", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -27941,6 +26850,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -27963,13 +26873,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -27988,6 +26896,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -28010,13 +26919,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -28064,7 +26971,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -28075,7 +26981,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28102,7 +27007,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -28113,7 +27017,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28136,7 +27039,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -28147,7 +27049,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28163,7 +27064,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -28202,7 +27102,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -28213,7 +27112,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28247,7 +27145,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -28258,7 +27155,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28271,7 +27167,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28316,7 +27211,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -28327,7 +27221,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28354,7 +27247,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -28365,7 +27257,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28388,7 +27279,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -28399,7 +27289,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28415,7 +27304,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -28469,7 +27357,6 @@ "ctxt": 0 }, "value": "walkDoWhileStatementChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -28490,6 +27377,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -28512,13 +27400,11 @@ "ctxt": 0 }, "value": "DoWhileStatement", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -28537,6 +27423,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -28559,13 +27446,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -28584,6 +27469,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -28606,13 +27492,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -28660,7 +27544,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -28671,7 +27554,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28698,7 +27580,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -28709,7 +27590,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28732,7 +27612,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -28743,7 +27622,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28759,7 +27637,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -28798,7 +27675,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -28809,7 +27685,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28843,7 +27718,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -28854,7 +27728,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28867,7 +27740,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28912,7 +27784,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -28923,7 +27794,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28950,7 +27820,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -28961,7 +27830,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28984,7 +27852,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -28995,7 +27862,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29011,7 +27877,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -29065,7 +27930,6 @@ "ctxt": 0 }, "value": "walkBlockChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -29086,6 +27950,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -29108,13 +27973,11 @@ "ctxt": 0 }, "value": "Block", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -29133,6 +27996,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -29155,13 +28019,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -29180,6 +28042,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -29202,13 +28065,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -29248,7 +28109,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -29259,7 +28119,6 @@ "ctxt": 0 }, "value": "statements", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29302,7 +28161,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -29313,7 +28171,6 @@ "ctxt": 0 }, "value": "statements", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29347,7 +28204,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -29358,7 +28214,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29381,7 +28236,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -29392,7 +28246,6 @@ "ctxt": 0 }, "value": "statements", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29408,7 +28261,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -29430,7 +28282,6 @@ "ctxt": 0 }, "value": "ASTList", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -29483,7 +28334,6 @@ "ctxt": 0 }, "value": "walkCaseStatementChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -29504,6 +28354,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -29526,13 +28377,11 @@ "ctxt": 0 }, "value": "CaseStatement", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -29551,6 +28400,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -29573,13 +28423,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -29598,6 +28446,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -29620,13 +28469,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -29666,7 +28513,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -29677,7 +28523,6 @@ "ctxt": 0 }, "value": "expr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29720,7 +28565,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -29731,7 +28575,6 @@ "ctxt": 0 }, "value": "expr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29758,7 +28601,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -29769,7 +28611,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29792,7 +28633,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -29803,7 +28643,6 @@ "ctxt": 0 }, "value": "expr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29819,7 +28658,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -29862,7 +28700,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -29873,7 +28710,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29900,7 +28736,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -29911,7 +28746,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29924,7 +28758,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29968,7 +28801,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -29979,7 +28811,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30013,7 +28844,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -30024,7 +28854,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30047,7 +28876,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -30058,7 +28886,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30074,7 +28901,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -30096,7 +28922,6 @@ "ctxt": 0 }, "value": "ASTList", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -30149,7 +28974,6 @@ "ctxt": 0 }, "value": "walkSwitchStatementChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -30170,6 +28994,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -30192,13 +29017,11 @@ "ctxt": 0 }, "value": "SwitchStatement", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -30217,6 +29040,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -30239,13 +29063,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -30264,6 +29086,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -30286,13 +29109,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -30332,7 +29153,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -30343,7 +29163,6 @@ "ctxt": 0 }, "value": "val", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30386,7 +29205,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -30397,7 +29215,6 @@ "ctxt": 0 }, "value": "val", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30424,7 +29241,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -30435,7 +29251,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30458,7 +29273,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -30469,7 +29283,6 @@ "ctxt": 0 }, "value": "val", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30485,7 +29298,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -30535,7 +29347,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -30546,7 +29357,6 @@ "ctxt": 0 }, "value": "caseList", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30574,7 +29384,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -30585,7 +29394,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30598,7 +29406,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30642,7 +29449,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -30653,7 +29459,6 @@ "ctxt": 0 }, "value": "caseList", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30687,7 +29492,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -30698,7 +29502,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30721,7 +29524,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -30732,7 +29534,6 @@ "ctxt": 0 }, "value": "caseList", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30748,7 +29549,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -30770,7 +29570,6 @@ "ctxt": 0 }, "value": "ASTList", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -30823,7 +29622,6 @@ "ctxt": 0 }, "value": "walkTryChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -30844,6 +29642,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -30866,13 +29665,11 @@ "ctxt": 0 }, "value": "Try", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -30891,6 +29688,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -30913,13 +29711,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -30938,6 +29734,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -30960,13 +29757,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -31006,7 +29801,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -31017,7 +29811,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31060,7 +29853,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -31071,7 +29863,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31098,7 +29889,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -31109,7 +29899,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31132,7 +29921,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -31143,7 +29931,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31159,7 +29946,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -31213,7 +29999,6 @@ "ctxt": 0 }, "value": "walkTryCatchChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -31234,6 +30019,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -31256,13 +30042,11 @@ "ctxt": 0 }, "value": "TryCatch", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -31281,6 +30065,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -31303,13 +30088,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -31328,6 +30111,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -31350,13 +30134,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -31396,7 +30178,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -31407,7 +30188,6 @@ "ctxt": 0 }, "value": "tryNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31450,7 +30230,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -31461,7 +30240,6 @@ "ctxt": 0 }, "value": "tryNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31495,7 +30273,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -31506,7 +30283,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31529,7 +30305,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -31540,7 +30315,6 @@ "ctxt": 0 }, "value": "tryNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31556,7 +30330,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -31578,7 +30351,6 @@ "ctxt": 0 }, "value": "Try", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -31627,7 +30399,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -31638,7 +30409,6 @@ "ctxt": 0 }, "value": "catchNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31666,7 +30436,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -31677,7 +30446,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31690,7 +30458,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31734,7 +30501,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -31745,7 +30511,6 @@ "ctxt": 0 }, "value": "catchNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31779,7 +30544,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -31790,7 +30554,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31813,7 +30576,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -31824,7 +30586,6 @@ "ctxt": 0 }, "value": "catchNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31840,7 +30601,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -31862,7 +30622,6 @@ "ctxt": 0 }, "value": "Catch", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -31915,7 +30674,6 @@ "ctxt": 0 }, "value": "walkTryFinallyChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -31936,6 +30694,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -31958,13 +30717,11 @@ "ctxt": 0 }, "value": "TryFinally", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -31983,6 +30740,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -32005,13 +30763,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -32030,6 +30786,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -32052,13 +30809,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -32098,7 +30853,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -32109,7 +30863,6 @@ "ctxt": 0 }, "value": "tryNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32152,7 +30905,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -32163,7 +30915,6 @@ "ctxt": 0 }, "value": "tryNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32190,7 +30941,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -32201,7 +30951,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32224,7 +30973,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -32235,7 +30983,6 @@ "ctxt": 0 }, "value": "tryNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32251,7 +30998,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -32294,7 +31040,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -32305,7 +31050,6 @@ "ctxt": 0 }, "value": "finallyNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32332,7 +31076,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -32343,7 +31086,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32356,7 +31098,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32400,7 +31141,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -32411,7 +31151,6 @@ "ctxt": 0 }, "value": "finallyNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32445,7 +31184,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -32456,7 +31194,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32479,7 +31216,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -32490,7 +31226,6 @@ "ctxt": 0 }, "value": "finallyNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32506,7 +31241,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -32528,7 +31262,6 @@ "ctxt": 0 }, "value": "Finally", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -32581,7 +31314,6 @@ "ctxt": 0 }, "value": "walkFinallyChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -32602,6 +31334,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -32624,13 +31357,11 @@ "ctxt": 0 }, "value": "Finally", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -32649,6 +31380,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -32671,13 +31403,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -32696,6 +31426,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -32718,13 +31449,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -32764,7 +31493,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -32775,7 +31503,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32818,7 +31545,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -32829,7 +31555,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32856,7 +31581,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -32867,7 +31591,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32890,7 +31613,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -32901,7 +31623,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32917,7 +31638,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -32971,7 +31691,6 @@ "ctxt": 0 }, "value": "walkCatchChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -32992,6 +31711,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -33014,13 +31734,11 @@ "ctxt": 0 }, "value": "Catch", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -33039,6 +31757,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -33061,13 +31780,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -33086,6 +31803,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -33108,13 +31826,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -33154,7 +31870,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -33165,7 +31880,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33208,7 +31922,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -33219,7 +31932,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33253,7 +31965,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -33264,7 +31975,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33287,7 +31997,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -33298,7 +32007,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33314,7 +32022,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -33336,7 +32043,6 @@ "ctxt": 0 }, "value": "VarDecl", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -33385,7 +32091,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -33396,7 +32101,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33424,7 +32128,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -33435,7 +32138,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33448,7 +32150,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33492,7 +32193,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -33503,7 +32203,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33530,7 +32229,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -33541,7 +32239,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33564,7 +32261,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -33575,7 +32271,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33591,7 +32286,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -33645,7 +32339,6 @@ "ctxt": 0 }, "value": "walkRecordChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -33666,6 +32359,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -33688,13 +32382,11 @@ "ctxt": 0 }, "value": "NamedDeclaration", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -33713,6 +32405,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -33735,13 +32428,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -33760,6 +32451,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -33782,13 +32474,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -33836,7 +32526,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -33847,7 +32536,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33881,7 +32569,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -33892,7 +32579,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33915,7 +32601,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -33926,7 +32611,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33942,7 +32626,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -33964,7 +32647,6 @@ "ctxt": 0 }, "value": "Identifier", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -34009,7 +32691,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -34020,7 +32701,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34033,7 +32713,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34053,7 +32732,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -34064,7 +32742,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34108,7 +32785,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -34119,7 +32795,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34153,7 +32828,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -34164,7 +32838,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34187,7 +32860,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -34198,7 +32870,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34214,7 +32885,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -34236,7 +32906,6 @@ "ctxt": 0 }, "value": "ASTList", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -34289,7 +32958,6 @@ "ctxt": 0 }, "value": "walkNamedTypeChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -34310,6 +32978,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -34332,13 +33001,11 @@ "ctxt": 0 }, "value": "TypeDeclaration", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -34357,6 +33024,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -34379,13 +33047,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -34404,6 +33070,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -34426,13 +33093,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -34472,7 +33137,6 @@ "ctxt": 0 }, "value": "walkRecordChildren", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -34486,7 +33150,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } }, @@ -34500,7 +33163,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false } }, @@ -34514,7 +33176,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false } } @@ -34563,7 +33224,6 @@ "ctxt": 0 }, "value": "walkClassDeclChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -34584,6 +33244,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -34606,13 +33267,11 @@ "ctxt": 0 }, "value": "ClassDeclaration", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -34631,6 +33290,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -34653,13 +33313,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -34678,6 +33336,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -34700,13 +33359,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -34746,7 +33403,6 @@ "ctxt": 0 }, "value": "walkNamedTypeChildren", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -34760,7 +33416,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } }, @@ -34774,7 +33429,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false } }, @@ -34788,7 +33442,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false } } @@ -34833,7 +33486,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -34844,7 +33496,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34857,7 +33508,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34877,7 +33527,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -34888,7 +33537,6 @@ "ctxt": 0 }, "value": "extendsList", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34932,7 +33580,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -34943,7 +33590,6 @@ "ctxt": 0 }, "value": "extendsList", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34977,7 +33623,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -34988,7 +33633,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -35011,7 +33655,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -35022,7 +33665,6 @@ "ctxt": 0 }, "value": "extendsList", - "typeAnnotation": null, "optional": false }, "computed": false @@ -35038,7 +33680,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -35060,7 +33701,6 @@ "ctxt": 0 }, "value": "ASTList", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -35109,7 +33749,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -35120,7 +33759,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -35133,7 +33771,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -35153,7 +33790,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -35164,7 +33800,6 @@ "ctxt": 0 }, "value": "implementsList", - "typeAnnotation": null, "optional": false }, "computed": false @@ -35208,7 +33843,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -35219,7 +33853,6 @@ "ctxt": 0 }, "value": "implementsList", - "typeAnnotation": null, "optional": false }, "computed": false @@ -35253,7 +33886,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -35264,7 +33896,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -35287,7 +33918,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -35298,7 +33928,6 @@ "ctxt": 0 }, "value": "implementsList", - "typeAnnotation": null, "optional": false }, "computed": false @@ -35314,7 +33943,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -35336,7 +33964,6 @@ "ctxt": 0 }, "value": "ASTList", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -35389,7 +34016,6 @@ "ctxt": 0 }, "value": "walkScriptChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -35410,6 +34036,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -35432,13 +34059,11 @@ "ctxt": 0 }, "value": "Script", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -35457,6 +34082,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -35479,13 +34105,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -35504,6 +34128,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -35526,13 +34151,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -35572,7 +34195,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -35583,7 +34205,6 @@ "ctxt": 0 }, "value": "bod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -35626,7 +34247,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -35637,7 +34257,6 @@ "ctxt": 0 }, "value": "bod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -35671,7 +34290,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -35682,7 +34300,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -35705,7 +34322,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -35716,7 +34332,6 @@ "ctxt": 0 }, "value": "bod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -35732,7 +34347,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -35754,7 +34368,6 @@ "ctxt": 0 }, "value": "ASTList", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -35807,7 +34420,6 @@ "ctxt": 0 }, "value": "walkTypeDeclChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -35828,6 +34440,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -35850,13 +34463,11 @@ "ctxt": 0 }, "value": "InterfaceDeclaration", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -35875,6 +34486,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -35897,13 +34509,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -35922,6 +34532,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -35944,13 +34555,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -35990,7 +34599,6 @@ "ctxt": 0 }, "value": "walkNamedTypeChildren", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -36004,7 +34612,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } }, @@ -36018,7 +34625,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false } }, @@ -36032,7 +34638,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false } } @@ -36077,7 +34682,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -36088,7 +34692,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -36101,7 +34704,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -36121,7 +34723,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -36132,7 +34733,6 @@ "ctxt": 0 }, "value": "extendsList", - "typeAnnotation": null, "optional": false }, "computed": false @@ -36176,7 +34776,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -36187,7 +34786,6 @@ "ctxt": 0 }, "value": "extendsList", - "typeAnnotation": null, "optional": false }, "computed": false @@ -36221,7 +34819,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -36232,7 +34829,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -36255,7 +34851,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -36266,7 +34861,6 @@ "ctxt": 0 }, "value": "extendsList", - "typeAnnotation": null, "optional": false }, "computed": false @@ -36282,7 +34876,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -36304,7 +34897,6 @@ "ctxt": 0 }, "value": "ASTList", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -36353,7 +34945,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -36364,7 +34955,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -36377,7 +34967,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -36397,7 +34986,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -36408,7 +34996,6 @@ "ctxt": 0 }, "value": "implementsList", - "typeAnnotation": null, "optional": false }, "computed": false @@ -36452,7 +35039,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -36463,7 +35049,6 @@ "ctxt": 0 }, "value": "implementsList", - "typeAnnotation": null, "optional": false }, "computed": false @@ -36497,7 +35082,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -36508,7 +35092,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -36531,7 +35114,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -36542,7 +35124,6 @@ "ctxt": 0 }, "value": "implementsList", - "typeAnnotation": null, "optional": false }, "computed": false @@ -36558,7 +35139,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -36580,7 +35160,6 @@ "ctxt": 0 }, "value": "ASTList", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -36633,7 +35212,6 @@ "ctxt": 0 }, "value": "walkModuleDeclChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -36654,6 +35232,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -36676,13 +35255,11 @@ "ctxt": 0 }, "value": "ModuleDeclaration", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -36701,6 +35278,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -36723,13 +35301,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -36748,6 +35324,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -36770,13 +35347,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -36816,7 +35391,6 @@ "ctxt": 0 }, "value": "walkRecordChildren", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -36830,7 +35404,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } }, @@ -36844,7 +35417,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false } }, @@ -36858,7 +35430,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false } } @@ -36907,7 +35478,6 @@ "ctxt": 0 }, "value": "walkImportDeclChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -36928,6 +35498,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -36950,13 +35521,11 @@ "ctxt": 0 }, "value": "ImportDeclaration", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -36975,6 +35544,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -36997,13 +35567,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -37022,6 +35590,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -37044,13 +35613,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -37090,7 +35657,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -37101,7 +35667,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37144,7 +35709,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -37155,7 +35719,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37189,7 +35752,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -37200,7 +35762,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37223,7 +35784,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -37234,7 +35794,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37250,7 +35809,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -37272,7 +35830,6 @@ "ctxt": 0 }, "value": "Identifier", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -37306,7 +35863,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -37317,7 +35873,6 @@ "ctxt": 0 }, "value": "alias", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37360,7 +35915,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -37371,7 +35925,6 @@ "ctxt": 0 }, "value": "alias", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37398,7 +35951,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -37409,7 +35961,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37432,7 +35983,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -37443,7 +35993,6 @@ "ctxt": 0 }, "value": "alias", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37459,7 +36008,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -37513,7 +36061,6 @@ "ctxt": 0 }, "value": "walkWithStatementChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37534,6 +36081,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -37556,13 +36104,11 @@ "ctxt": 0 }, "value": "WithStatement", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -37581,6 +36127,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -37603,13 +36150,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -37628,6 +36173,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -37650,13 +36196,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -37696,7 +36240,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -37707,7 +36250,6 @@ "ctxt": 0 }, "value": "expr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37750,7 +36292,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -37761,7 +36302,6 @@ "ctxt": 0 }, "value": "expr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37788,7 +36328,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -37799,7 +36338,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37822,7 +36360,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -37833,7 +36370,6 @@ "ctxt": 0 }, "value": "expr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37849,7 +36385,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -37892,7 +36427,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -37903,7 +36437,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37930,7 +36463,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -37941,7 +36473,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37954,7 +36485,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37998,7 +36528,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -38009,7 +36538,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -38036,7 +36564,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -38047,7 +36574,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -38070,7 +36596,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -38081,7 +36606,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -38097,7 +36621,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -38151,7 +36674,6 @@ "ctxt": 0 }, "value": "walkLabelChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -38172,6 +36694,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -38194,13 +36717,11 @@ "ctxt": 0 }, "value": "Label", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -38219,6 +36740,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -38241,13 +36763,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -38266,6 +36786,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -38288,13 +36809,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -38352,7 +36871,6 @@ "ctxt": 0 }, "value": "walkLabeledStatementChildren", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -38373,6 +36891,7 @@ "ctxt": 0 }, "value": "preAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -38395,13 +36914,11 @@ "ctxt": 0 }, "value": "LabeledStatement", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -38420,6 +36937,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -38442,13 +36960,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -38467,6 +36983,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -38489,13 +37006,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -38543,7 +37058,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -38554,7 +37068,6 @@ "ctxt": 0 }, "value": "labels", - "typeAnnotation": null, "optional": false }, "computed": false @@ -38588,7 +37101,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -38599,7 +37111,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -38622,7 +37133,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -38633,7 +37143,6 @@ "ctxt": 0 }, "value": "labels", - "typeAnnotation": null, "optional": false }, "computed": false @@ -38649,7 +37158,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } @@ -38671,7 +37179,6 @@ "ctxt": 0 }, "value": "ASTList", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -38708,7 +37215,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -38719,7 +37225,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -38732,7 +37237,6 @@ "ctxt": 0 }, "value": "goNextSibling", - "typeAnnotation": null, "optional": false }, "computed": false @@ -38775,7 +37279,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -38786,7 +37289,6 @@ "ctxt": 0 }, "value": "stmt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -38813,7 +37315,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -38824,7 +37325,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -38847,7 +37347,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false }, "property": { @@ -38858,7 +37357,6 @@ "ctxt": 0 }, "value": "stmt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -38874,7 +37372,6 @@ "ctxt": 0 }, "value": "preAst", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource13/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource13/input.ts.json index 2b3e598fa261..4f3f279a4c92 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource13/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource13/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "body": { @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "AstWalkerWithDetailCallback", - "typeAnnotation": null, "optional": false }, "body": { @@ -76,7 +74,6 @@ "ctxt": 0 }, "value": "AstWalkerDetailCallback", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -106,7 +103,6 @@ "ctxt": 0 }, "value": "EmptyCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -120,8 +116,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -131,6 +127,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -153,13 +150,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -197,7 +192,6 @@ "ctxt": 0 }, "value": "EmptyExprCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -211,8 +205,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -222,6 +216,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -244,13 +239,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -288,7 +281,6 @@ "ctxt": 0 }, "value": "TrueCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -302,8 +294,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -313,6 +305,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -335,13 +328,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -379,7 +370,6 @@ "ctxt": 0 }, "value": "FalseCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -393,8 +383,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -404,6 +394,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -426,13 +417,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -470,7 +459,6 @@ "ctxt": 0 }, "value": "ThisCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -484,8 +472,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -495,6 +483,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -517,13 +506,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -561,7 +548,6 @@ "ctxt": 0 }, "value": "SuperCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -575,8 +561,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -586,6 +572,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -608,13 +595,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -652,7 +637,6 @@ "ctxt": 0 }, "value": "QStringCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -666,8 +650,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -677,6 +661,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -699,13 +684,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -743,7 +726,6 @@ "ctxt": 0 }, "value": "RegexCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -757,8 +739,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -768,6 +750,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -790,13 +773,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -834,7 +815,6 @@ "ctxt": 0 }, "value": "NullCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -848,8 +828,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -859,6 +839,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -881,13 +862,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -925,7 +904,6 @@ "ctxt": 0 }, "value": "ArrayLitCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -939,8 +917,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -950,6 +928,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -972,13 +951,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1016,7 +993,6 @@ "ctxt": 0 }, "value": "ObjectLitCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1030,8 +1006,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1041,6 +1017,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1063,13 +1040,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1107,7 +1082,6 @@ "ctxt": 0 }, "value": "VoidCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1121,8 +1095,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1132,6 +1106,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1154,13 +1129,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1198,7 +1171,6 @@ "ctxt": 0 }, "value": "CommaCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1212,8 +1184,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1223,6 +1195,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1245,13 +1218,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1289,7 +1260,6 @@ "ctxt": 0 }, "value": "PosCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1303,8 +1273,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1314,6 +1284,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1336,13 +1307,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1380,7 +1349,6 @@ "ctxt": 0 }, "value": "NegCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1394,8 +1362,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1405,6 +1373,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1427,13 +1396,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1471,7 +1438,6 @@ "ctxt": 0 }, "value": "DeleteCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1485,8 +1451,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1496,6 +1462,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1518,13 +1485,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1562,7 +1527,6 @@ "ctxt": 0 }, "value": "AwaitCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1576,8 +1540,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1587,6 +1551,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1609,13 +1574,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1653,7 +1616,6 @@ "ctxt": 0 }, "value": "InCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1667,8 +1629,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1678,6 +1640,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1700,13 +1663,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1744,7 +1705,6 @@ "ctxt": 0 }, "value": "DotCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1758,8 +1718,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1769,6 +1729,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1791,13 +1752,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1835,7 +1794,6 @@ "ctxt": 0 }, "value": "FromCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1849,8 +1807,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1860,6 +1818,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1882,13 +1841,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1926,7 +1883,6 @@ "ctxt": 0 }, "value": "IsCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1940,8 +1896,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1951,6 +1907,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1973,13 +1930,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -2017,7 +1972,6 @@ "ctxt": 0 }, "value": "InstOfCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2031,8 +1985,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2042,6 +1996,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2064,13 +2019,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -2108,7 +2061,6 @@ "ctxt": 0 }, "value": "TypeofCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2122,8 +2074,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2133,6 +2085,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2155,13 +2108,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -2199,7 +2150,6 @@ "ctxt": 0 }, "value": "NumberLitCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2213,8 +2163,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2224,6 +2174,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2246,13 +2197,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -2290,7 +2239,6 @@ "ctxt": 0 }, "value": "NameCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2304,8 +2252,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2315,6 +2263,7 @@ "ctxt": 0 }, "value": "identifierAst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2337,13 +2286,11 @@ "ctxt": 0 }, "value": "Identifier", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -2381,7 +2328,6 @@ "ctxt": 0 }, "value": "TypeRefCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2395,8 +2341,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2406,6 +2352,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2428,13 +2375,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -2472,7 +2417,6 @@ "ctxt": 0 }, "value": "IndexCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2486,8 +2430,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2497,6 +2441,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2519,13 +2464,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -2563,7 +2506,6 @@ "ctxt": 0 }, "value": "CallCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2577,8 +2519,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2588,6 +2530,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2610,13 +2553,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -2654,7 +2595,6 @@ "ctxt": 0 }, "value": "NewCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2668,8 +2608,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2679,6 +2619,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2701,13 +2642,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -2745,7 +2684,6 @@ "ctxt": 0 }, "value": "AsgCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2759,8 +2697,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2770,6 +2708,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2792,13 +2731,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -2836,7 +2773,6 @@ "ctxt": 0 }, "value": "AsgAddCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2850,8 +2786,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2861,6 +2797,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2883,13 +2820,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -2927,7 +2862,6 @@ "ctxt": 0 }, "value": "AsgSubCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2941,8 +2875,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2952,6 +2886,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2974,13 +2909,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -3018,7 +2951,6 @@ "ctxt": 0 }, "value": "AsgDivCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3032,8 +2964,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3043,6 +2975,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3065,13 +2998,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -3109,7 +3040,6 @@ "ctxt": 0 }, "value": "AsgMulCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3123,8 +3053,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3134,6 +3064,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3156,13 +3087,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -3200,7 +3129,6 @@ "ctxt": 0 }, "value": "AsgModCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3214,8 +3142,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3225,6 +3153,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3247,13 +3176,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -3291,7 +3218,6 @@ "ctxt": 0 }, "value": "AsgAndCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3305,8 +3231,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3316,6 +3242,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3338,13 +3265,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -3382,7 +3307,6 @@ "ctxt": 0 }, "value": "AsgXorCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3396,8 +3320,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3407,6 +3331,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3429,13 +3354,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -3473,7 +3396,6 @@ "ctxt": 0 }, "value": "AsgOrCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3487,8 +3409,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3498,6 +3420,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3520,13 +3443,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -3564,7 +3485,6 @@ "ctxt": 0 }, "value": "AsgLshCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3578,8 +3498,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3589,6 +3509,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3611,13 +3532,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -3655,7 +3574,6 @@ "ctxt": 0 }, "value": "AsgRshCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3669,8 +3587,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3680,6 +3598,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3702,13 +3621,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -3746,7 +3663,6 @@ "ctxt": 0 }, "value": "AsgRs2Callback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3760,8 +3676,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3771,6 +3687,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3793,13 +3710,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -3837,7 +3752,6 @@ "ctxt": 0 }, "value": "QMarkCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3851,8 +3765,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3862,6 +3776,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3884,13 +3799,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -3928,7 +3841,6 @@ "ctxt": 0 }, "value": "LogOrCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3942,8 +3854,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3953,6 +3865,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3975,13 +3888,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -4019,7 +3930,6 @@ "ctxt": 0 }, "value": "LogAndCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4033,8 +3943,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4044,6 +3954,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4066,13 +3977,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -4110,7 +4019,6 @@ "ctxt": 0 }, "value": "OrCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4124,8 +4032,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4135,6 +4043,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4157,13 +4066,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -4201,7 +4108,6 @@ "ctxt": 0 }, "value": "XorCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4215,8 +4121,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4226,6 +4132,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4248,13 +4155,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -4292,7 +4197,6 @@ "ctxt": 0 }, "value": "AndCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4306,8 +4210,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4317,6 +4221,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4339,13 +4244,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -4383,7 +4286,6 @@ "ctxt": 0 }, "value": "EqCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4397,8 +4299,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4408,6 +4310,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4430,13 +4333,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -4474,7 +4375,6 @@ "ctxt": 0 }, "value": "NeCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4488,8 +4388,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4499,6 +4399,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4521,13 +4422,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -4565,7 +4464,6 @@ "ctxt": 0 }, "value": "EqvCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4579,8 +4477,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4590,6 +4488,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4612,13 +4511,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -4656,7 +4553,6 @@ "ctxt": 0 }, "value": "NEqvCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4670,8 +4566,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4681,6 +4577,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4703,13 +4600,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -4747,7 +4642,6 @@ "ctxt": 0 }, "value": "LtCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4761,8 +4655,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4772,6 +4666,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4794,13 +4689,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -4838,7 +4731,6 @@ "ctxt": 0 }, "value": "LeCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4852,8 +4744,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4863,6 +4755,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4885,13 +4778,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -4929,7 +4820,6 @@ "ctxt": 0 }, "value": "GtCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4943,8 +4833,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4954,6 +4844,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4976,13 +4867,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -5020,7 +4909,6 @@ "ctxt": 0 }, "value": "GeCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5034,8 +4922,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5045,6 +4933,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5067,13 +4956,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -5111,7 +4998,6 @@ "ctxt": 0 }, "value": "AddCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5125,8 +5011,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5136,6 +5022,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5158,13 +5045,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -5202,7 +5087,6 @@ "ctxt": 0 }, "value": "SubCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5216,8 +5100,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5227,6 +5111,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5249,13 +5134,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -5293,7 +5176,6 @@ "ctxt": 0 }, "value": "MulCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5307,8 +5189,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5318,6 +5200,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5340,13 +5223,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -5384,7 +5265,6 @@ "ctxt": 0 }, "value": "DivCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5398,8 +5278,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5409,6 +5289,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5431,13 +5312,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -5475,7 +5354,6 @@ "ctxt": 0 }, "value": "ModCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5489,8 +5367,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5500,6 +5378,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5522,13 +5401,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -5566,7 +5443,6 @@ "ctxt": 0 }, "value": "LshCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5580,8 +5456,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5591,6 +5467,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5613,13 +5490,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -5657,7 +5532,6 @@ "ctxt": 0 }, "value": "RshCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5671,8 +5545,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5682,6 +5556,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5704,13 +5579,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -5748,7 +5621,6 @@ "ctxt": 0 }, "value": "Rs2Callback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5762,8 +5634,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5773,6 +5645,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5795,13 +5668,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -5839,7 +5710,6 @@ "ctxt": 0 }, "value": "NotCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5853,8 +5723,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5864,6 +5734,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5886,13 +5757,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -5930,7 +5799,6 @@ "ctxt": 0 }, "value": "LogNotCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5944,8 +5812,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5955,6 +5823,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5977,13 +5846,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -6021,7 +5888,6 @@ "ctxt": 0 }, "value": "IncPreCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6035,8 +5901,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6046,6 +5912,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6068,13 +5935,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -6112,7 +5977,6 @@ "ctxt": 0 }, "value": "DecPreCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6126,8 +5990,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6137,6 +6001,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6159,13 +6024,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -6203,7 +6066,6 @@ "ctxt": 0 }, "value": "IncPostCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6217,8 +6079,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6228,6 +6090,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6250,13 +6113,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -6294,7 +6155,6 @@ "ctxt": 0 }, "value": "DecPostCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6308,8 +6168,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6319,6 +6179,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6341,13 +6202,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -6385,7 +6244,6 @@ "ctxt": 0 }, "value": "TypeAssertionCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6399,8 +6257,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6410,6 +6268,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6432,13 +6291,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -6476,7 +6333,6 @@ "ctxt": 0 }, "value": "FuncDeclCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6490,8 +6346,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6501,6 +6357,7 @@ "ctxt": 0 }, "value": "funcDecl", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6523,13 +6380,11 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -6567,7 +6422,6 @@ "ctxt": 0 }, "value": "MemberCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6581,8 +6435,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6592,6 +6446,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6614,13 +6469,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -6658,7 +6511,6 @@ "ctxt": 0 }, "value": "VarDeclCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6672,8 +6524,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6683,6 +6535,7 @@ "ctxt": 0 }, "value": "varDecl", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6705,13 +6558,11 @@ "ctxt": 0 }, "value": "VarDecl", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -6749,7 +6600,6 @@ "ctxt": 0 }, "value": "ArgDeclCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6763,8 +6613,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6774,6 +6624,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6796,13 +6647,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -6840,7 +6689,6 @@ "ctxt": 0 }, "value": "ReturnCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6854,8 +6702,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6865,6 +6713,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6887,13 +6736,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -6931,7 +6778,6 @@ "ctxt": 0 }, "value": "BreakCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6945,8 +6791,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6956,6 +6802,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6978,13 +6825,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -7022,7 +6867,6 @@ "ctxt": 0 }, "value": "ContinueCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7036,8 +6880,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -7047,6 +6891,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7069,13 +6914,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -7113,7 +6956,6 @@ "ctxt": 0 }, "value": "ThrowCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7127,8 +6969,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -7138,6 +6980,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7160,13 +7003,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -7204,7 +7045,6 @@ "ctxt": 0 }, "value": "ForCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7218,8 +7058,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -7229,6 +7069,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7251,13 +7092,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -7295,7 +7134,6 @@ "ctxt": 0 }, "value": "ForInCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7309,8 +7147,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -7320,6 +7158,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7342,13 +7181,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -7386,7 +7223,6 @@ "ctxt": 0 }, "value": "IfCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7400,8 +7236,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -7411,6 +7247,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7433,13 +7270,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -7477,7 +7312,6 @@ "ctxt": 0 }, "value": "WhileCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7491,8 +7325,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -7502,6 +7336,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7524,13 +7359,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -7568,7 +7401,6 @@ "ctxt": 0 }, "value": "DoWhileCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7582,8 +7414,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -7593,6 +7425,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7615,13 +7448,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -7659,7 +7490,6 @@ "ctxt": 0 }, "value": "BlockCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7673,8 +7503,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -7684,6 +7514,7 @@ "ctxt": 0 }, "value": "block", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7706,13 +7537,11 @@ "ctxt": 0 }, "value": "Block", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -7750,7 +7579,6 @@ "ctxt": 0 }, "value": "CaseCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7764,8 +7592,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -7775,6 +7603,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7797,13 +7626,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -7841,7 +7668,6 @@ "ctxt": 0 }, "value": "SwitchCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7855,8 +7681,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -7866,6 +7692,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7888,13 +7715,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -7932,7 +7757,6 @@ "ctxt": 0 }, "value": "TryCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7946,8 +7770,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -7957,6 +7781,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7979,13 +7804,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -8023,7 +7846,6 @@ "ctxt": 0 }, "value": "TryCatchCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8037,8 +7859,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -8048,6 +7870,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8070,13 +7893,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -8114,7 +7935,6 @@ "ctxt": 0 }, "value": "TryFinallyCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8128,8 +7948,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -8139,6 +7959,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8161,13 +7982,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -8205,7 +8024,6 @@ "ctxt": 0 }, "value": "FinallyCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8219,8 +8037,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -8230,6 +8048,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8252,13 +8071,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -8296,7 +8113,6 @@ "ctxt": 0 }, "value": "CatchCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8310,8 +8126,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -8321,6 +8137,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8343,13 +8160,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -8387,7 +8202,6 @@ "ctxt": 0 }, "value": "ListCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8401,8 +8215,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -8412,6 +8226,7 @@ "ctxt": 0 }, "value": "astList", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8434,13 +8249,11 @@ "ctxt": 0 }, "value": "ASTList", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -8478,7 +8291,6 @@ "ctxt": 0 }, "value": "ScriptCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8492,8 +8304,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -8503,6 +8315,7 @@ "ctxt": 0 }, "value": "script", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8525,13 +8338,11 @@ "ctxt": 0 }, "value": "Script", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -8569,7 +8380,6 @@ "ctxt": 0 }, "value": "ClassDeclarationCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8583,8 +8393,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -8594,6 +8404,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8616,13 +8427,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -8660,7 +8469,6 @@ "ctxt": 0 }, "value": "InterfaceDeclarationCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8674,8 +8482,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -8685,6 +8493,7 @@ "ctxt": 0 }, "value": "interfaceDecl", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8707,13 +8516,11 @@ "ctxt": 0 }, "value": "InterfaceDeclaration", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -8751,7 +8558,6 @@ "ctxt": 0 }, "value": "ModuleDeclarationCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8765,8 +8571,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -8776,6 +8582,7 @@ "ctxt": 0 }, "value": "moduleDecl", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8798,13 +8605,11 @@ "ctxt": 0 }, "value": "ModuleDeclaration", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -8842,7 +8647,6 @@ "ctxt": 0 }, "value": "ImportDeclarationCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8856,8 +8660,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -8867,6 +8671,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8889,13 +8694,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -8933,7 +8736,6 @@ "ctxt": 0 }, "value": "WithCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8947,8 +8749,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -8958,6 +8760,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8980,13 +8783,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -9024,7 +8825,6 @@ "ctxt": 0 }, "value": "LabelCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9038,8 +8838,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -9049,6 +8849,7 @@ "ctxt": 0 }, "value": "labelAST", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9071,13 +8872,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -9115,7 +8914,6 @@ "ctxt": 0 }, "value": "LabeledStatementCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9129,8 +8927,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -9140,6 +8938,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9162,13 +8961,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -9206,7 +9003,6 @@ "ctxt": 0 }, "value": "EBStartCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9220,8 +9016,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -9231,6 +9027,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9253,13 +9050,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -9297,7 +9092,6 @@ "ctxt": 0 }, "value": "GotoEBCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9311,8 +9105,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -9322,6 +9116,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9344,13 +9139,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -9388,7 +9181,6 @@ "ctxt": 0 }, "value": "EndCodeCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9402,8 +9194,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -9413,6 +9205,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9435,13 +9228,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -9479,7 +9270,6 @@ "ctxt": 0 }, "value": "ErrorCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9493,8 +9283,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -9504,6 +9294,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9526,13 +9317,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -9570,7 +9359,6 @@ "ctxt": 0 }, "value": "CommentCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9584,8 +9372,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -9595,6 +9383,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9617,13 +9406,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -9661,7 +9448,6 @@ "ctxt": 0 }, "value": "DebuggerCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9675,8 +9461,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -9686,6 +9472,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9708,13 +9495,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -9752,7 +9537,6 @@ "ctxt": 0 }, "value": "DefaultCallback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9766,8 +9550,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -9777,6 +9561,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9799,13 +9584,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -9848,7 +9631,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9869,6 +9651,7 @@ "ctxt": 0 }, "value": "script", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9891,13 +9674,11 @@ "ctxt": 0 }, "value": "Script", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -9916,6 +9697,7 @@ "ctxt": 0 }, "value": "callback", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9938,13 +9720,11 @@ "ctxt": 0 }, "value": "AstWalkerDetailCallback", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -9987,8 +9767,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -10006,6 +9786,7 @@ "ctxt": 0 }, "value": "cur", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10028,13 +9809,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -10044,6 +9823,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10066,13 +9846,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -10120,7 +9898,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -10131,7 +9908,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10144,7 +9920,6 @@ "ctxt": 0 }, "value": "goChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10164,7 +9939,6 @@ "ctxt": 0 }, "value": "AstWalkerCallback", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -10190,7 +9964,6 @@ "ctxt": 0 }, "value": "cur", - "typeAnnotation": null, "optional": false } }, @@ -10204,7 +9977,6 @@ "ctxt": 0 }, "value": "callback", - "typeAnnotation": null, "optional": false } } @@ -10228,7 +10000,6 @@ "ctxt": 0 }, "value": "cur", - "typeAnnotation": null, "optional": false } } @@ -10268,8 +10039,8 @@ "ctxt": 0 }, "value": "post", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -10287,6 +10058,7 @@ "ctxt": 0 }, "value": "cur", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10309,13 +10081,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -10325,6 +10095,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10347,13 +10118,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -10386,7 +10155,6 @@ "ctxt": 0 }, "value": "AstWalkerCallback", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -10412,7 +10180,6 @@ "ctxt": 0 }, "value": "cur", - "typeAnnotation": null, "optional": false } }, @@ -10426,7 +10193,6 @@ "ctxt": 0 }, "value": "callback", - "typeAnnotation": null, "optional": false } } @@ -10449,7 +10215,6 @@ "ctxt": 0 }, "value": "cur", - "typeAnnotation": null, "optional": false } } @@ -10489,8 +10254,8 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -10528,7 +10293,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -10539,7 +10303,6 @@ "ctxt": 0 }, "value": "getAstWalkerFactory", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10555,7 +10318,6 @@ "ctxt": 0 }, "value": "getWalker", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10571,7 +10333,6 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, "optional": false } }, @@ -10585,7 +10346,6 @@ "ctxt": 0 }, "value": "post", - "typeAnnotation": null, "optional": false } } @@ -10625,7 +10385,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -10636,7 +10395,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10652,7 +10410,6 @@ "ctxt": 0 }, "value": "script", - "typeAnnotation": null, "optional": false } }, @@ -10705,7 +10462,6 @@ "ctxt": 0 }, "value": "AstWalkerCallback", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10726,6 +10482,7 @@ "ctxt": 0 }, "value": "pre", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10742,8 +10499,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -10762,6 +10518,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10784,13 +10541,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -10809,6 +10564,7 @@ "ctxt": 0 }, "value": "callback", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10831,13 +10587,11 @@ "ctxt": 0 }, "value": "AstWalkerDetailCallback", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -10880,8 +10634,8 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -10898,7 +10652,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -10909,7 +10662,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10943,8 +10695,8 @@ "ctxt": 0 }, "value": "callbackString", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -10990,7 +10742,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -11012,7 +10763,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11025,7 +10775,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": true @@ -11071,7 +10820,6 @@ "ctxt": 0 }, "value": "callback", - "typeAnnotation": null, "optional": false }, "property": { @@ -11082,7 +10830,6 @@ "ctxt": 0 }, "value": "callbackString", - "typeAnnotation": null, "optional": false }, "computed": true @@ -11124,7 +10871,6 @@ "ctxt": 0 }, "value": "callback", - "typeAnnotation": null, "optional": false }, "property": { @@ -11135,7 +10881,6 @@ "ctxt": 0 }, "value": "callbackString", - "typeAnnotation": null, "optional": false }, "computed": true @@ -11151,7 +10896,6 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, "optional": false } }, @@ -11165,7 +10909,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } } @@ -11199,7 +10942,6 @@ "ctxt": 0 }, "value": "callback", - "typeAnnotation": null, "optional": false }, "property": { @@ -11210,7 +10952,6 @@ "ctxt": 0 }, "value": "DefaultCallback", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11252,7 +10993,6 @@ "ctxt": 0 }, "value": "callback", - "typeAnnotation": null, "optional": false }, "property": { @@ -11263,7 +11003,6 @@ "ctxt": 0 }, "value": "DefaultCallback", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11279,7 +11018,6 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, "optional": false } }, @@ -11293,7 +11031,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource14/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource14/input.ts.json index 2ccca510ecc8..d7a40cb92cf8 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource14/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource14/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "lastOf", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -72,6 +70,7 @@ "ctxt": 0 }, "value": "items", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +95,7 @@ "kind": "any" } } - }, - "optional": false + } } } ], @@ -160,7 +158,6 @@ "ctxt": 0 }, "value": "items", - "typeAnnotation": null, "optional": false }, "right": { @@ -195,7 +192,6 @@ "ctxt": 0 }, "value": "items", - "typeAnnotation": null, "optional": false }, "property": { @@ -206,7 +202,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -246,7 +241,6 @@ "ctxt": 0 }, "value": "items", - "typeAnnotation": null, "optional": false }, "property": { @@ -272,7 +266,6 @@ "ctxt": 0 }, "value": "items", - "typeAnnotation": null, "optional": false }, "property": { @@ -283,7 +276,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -343,7 +335,6 @@ "ctxt": 0 }, "value": "max", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -364,6 +355,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -380,8 +372,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -400,6 +391,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -416,8 +408,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -465,7 +456,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -476,7 +466,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -488,7 +477,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -499,7 +487,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -545,7 +532,6 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -566,6 +552,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -582,8 +569,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -602,6 +588,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -618,8 +605,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -667,7 +653,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -678,7 +663,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -690,7 +674,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -701,7 +684,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -747,7 +729,6 @@ "ctxt": 0 }, "value": "AstPath", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -773,7 +754,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "value": { @@ -816,7 +796,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -827,7 +806,6 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false } }, @@ -860,7 +838,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "value": { @@ -923,7 +900,6 @@ "ctxt": 0 }, "value": "reverseIndexOf", - "typeAnnotation": null, "optional": false }, "function": { @@ -944,6 +920,7 @@ "ctxt": 0 }, "value": "items", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -968,8 +945,7 @@ "kind": "any" } } - }, - "optional": false + } } }, { @@ -988,6 +964,7 @@ "ctxt": 0 }, "value": "index", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1004,8 +981,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1068,7 +1044,6 @@ "ctxt": 0 }, "value": "items", - "typeAnnotation": null, "optional": false }, "right": { @@ -1103,7 +1078,6 @@ "ctxt": 0 }, "value": "items", - "typeAnnotation": null, "optional": false }, "property": { @@ -1114,7 +1088,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1127,7 +1100,6 @@ "ctxt": 0 }, "value": "index", - "typeAnnotation": null, "optional": false } } @@ -1156,7 +1128,6 @@ "ctxt": 0 }, "value": "items", - "typeAnnotation": null, "optional": false }, "property": { @@ -1190,7 +1161,6 @@ "ctxt": 0 }, "value": "items", - "typeAnnotation": null, "optional": false }, "property": { @@ -1201,7 +1171,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1214,7 +1183,6 @@ "ctxt": 0 }, "value": "index", - "typeAnnotation": null, "optional": false } }, @@ -1276,7 +1244,6 @@ "ctxt": 0 }, "value": "clone", - "typeAnnotation": null, "optional": false }, "function": { @@ -1320,8 +1287,8 @@ "ctxt": 0 }, "value": "clone", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1338,7 +1305,6 @@ "ctxt": 0 }, "value": "AstPath", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1378,7 +1344,6 @@ "ctxt": 0 }, "value": "clone", - "typeAnnotation": null, "optional": false }, "property": { @@ -1389,7 +1354,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1431,7 +1395,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1444,7 +1407,6 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1468,8 +1430,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1495,7 +1457,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -1542,7 +1503,6 @@ "ctxt": 0 }, "value": "clone", - "typeAnnotation": null, "optional": false }, "property": { @@ -1553,7 +1513,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1581,7 +1540,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1603,7 +1561,6 @@ "ctxt": 0 }, "value": "clone", - "typeAnnotation": null, "optional": false } } @@ -1634,7 +1591,6 @@ "ctxt": 0 }, "value": "AstPath", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1662,7 +1618,6 @@ "ctxt": 0 }, "value": "pop", - "typeAnnotation": null, "optional": false }, "function": { @@ -1706,8 +1661,8 @@ "ctxt": 0 }, "value": "head", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1739,7 +1694,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1788,7 +1742,6 @@ "ctxt": 0 }, "value": "up", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1842,7 +1795,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1855,7 +1807,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1890,7 +1841,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1951,7 +1901,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1964,7 +1913,6 @@ "ctxt": 0 }, "value": "pop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1991,7 +1939,6 @@ "ctxt": 0 }, "value": "head", - "typeAnnotation": null, "optional": false } } @@ -2024,7 +1971,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -2035,7 +1981,6 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false } }, @@ -2064,7 +2009,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "function": { @@ -2085,6 +2029,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2109,7 +2054,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -2120,14 +2064,12 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2190,7 +2132,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2203,7 +2144,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2238,7 +2178,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2299,7 +2238,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2312,7 +2250,6 @@ "ctxt": 0 }, "value": "pop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2362,7 +2299,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2397,7 +2333,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2410,7 +2345,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2461,7 +2395,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2474,7 +2407,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2490,7 +2422,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } } @@ -2526,7 +2457,6 @@ "ctxt": 0 }, "value": "up", - "typeAnnotation": null, "optional": false }, "function": { @@ -2583,7 +2513,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2629,7 +2558,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2695,7 +2623,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2730,7 +2657,6 @@ "ctxt": 0 }, "value": "down", - "typeAnnotation": null, "optional": false }, "function": { @@ -2787,7 +2713,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2830,7 +2755,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2843,7 +2767,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2881,7 +2804,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2947,7 +2869,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2982,7 +2903,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "function": { @@ -3046,7 +2966,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3092,7 +3011,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -3103,7 +3021,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3116,7 +3033,6 @@ "ctxt": 0 }, "value": "None", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3168,7 +3084,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3184,7 +3099,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3219,7 +3133,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -3230,7 +3143,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false } }, @@ -3259,7 +3171,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "function": { @@ -3314,7 +3225,6 @@ "ctxt": 0 }, "value": "AstPath", - "typeAnnotation": null, "optional": false }, "property": { @@ -3325,7 +3235,6 @@ "ctxt": 0 }, "value": "reverseIndexOf", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3356,7 +3265,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3402,7 +3310,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3415,7 +3322,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3458,7 +3364,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3496,7 +3401,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -3507,7 +3411,6 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false } }, @@ -3543,7 +3446,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "function": { @@ -3598,7 +3500,6 @@ "ctxt": 0 }, "value": "AstPath", - "typeAnnotation": null, "optional": false }, "property": { @@ -3609,7 +3510,6 @@ "ctxt": 0 }, "value": "reverseIndexOf", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3640,7 +3540,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3686,7 +3585,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3699,7 +3597,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3727,7 +3624,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3754,7 +3650,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -3765,7 +3660,6 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false } }, @@ -3801,7 +3695,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "function": { @@ -3858,7 +3751,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3902,7 +3794,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "function": { @@ -3923,6 +3814,7 @@ "ctxt": 0 }, "value": "index", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3939,8 +3831,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -3995,7 +3886,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4008,7 +3898,6 @@ "ctxt": 0 }, "value": "index", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4043,7 +3932,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -4054,7 +3942,6 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false } }, @@ -4083,7 +3970,6 @@ "ctxt": 0 }, "value": "isNameOfClass", - "typeAnnotation": null, "optional": false }, "function": { @@ -4155,7 +4041,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4210,7 +4095,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4322,7 +4206,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4338,7 +4221,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4365,7 +4247,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -4376,7 +4257,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4389,7 +4269,6 @@ "ctxt": 0 }, "value": "Name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4448,7 +4327,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4464,7 +4342,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4491,7 +4368,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -4502,7 +4378,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4515,7 +4390,6 @@ "ctxt": 0 }, "value": "ClassDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4589,7 +4463,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4614,7 +4487,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -4625,7 +4497,6 @@ "ctxt": 0 }, "value": "InterfaceDeclaration", - "typeAnnotation": null, "optional": false } }, @@ -4641,7 +4512,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4676,7 +4546,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4732,7 +4601,6 @@ "ctxt": 0 }, "value": "isNameOfInterface", - "typeAnnotation": null, "optional": false }, "function": { @@ -4804,7 +4672,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4859,7 +4726,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4971,7 +4837,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4987,7 +4852,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5014,7 +4878,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -5025,7 +4888,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5038,7 +4900,6 @@ "ctxt": 0 }, "value": "Name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5097,7 +4958,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5113,7 +4973,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5140,7 +4999,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -5151,7 +5009,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5164,7 +5021,6 @@ "ctxt": 0 }, "value": "InterfaceDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5238,7 +5094,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5263,7 +5118,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -5274,7 +5128,6 @@ "ctxt": 0 }, "value": "InterfaceDeclaration", - "typeAnnotation": null, "optional": false } }, @@ -5290,7 +5143,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5325,7 +5177,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5381,7 +5232,6 @@ "ctxt": 0 }, "value": "isNameOfArgument", - "typeAnnotation": null, "optional": false }, "function": { @@ -5453,7 +5303,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5508,7 +5357,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5620,7 +5468,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5636,7 +5483,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5663,7 +5509,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -5674,7 +5519,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5687,7 +5531,6 @@ "ctxt": 0 }, "value": "Name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5746,7 +5589,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5762,7 +5604,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5789,7 +5630,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -5800,7 +5640,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5813,7 +5652,6 @@ "ctxt": 0 }, "value": "ArgDecl", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5887,7 +5725,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5912,7 +5749,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -5923,7 +5759,6 @@ "ctxt": 0 }, "value": "ArgDecl", - "typeAnnotation": null, "optional": false } }, @@ -5939,7 +5774,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5974,7 +5808,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6030,7 +5863,6 @@ "ctxt": 0 }, "value": "isNameOfVariable", - "typeAnnotation": null, "optional": false }, "function": { @@ -6102,7 +5934,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6157,7 +5988,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6269,7 +6099,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6285,7 +6114,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6312,7 +6140,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -6323,7 +6150,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6336,7 +6162,6 @@ "ctxt": 0 }, "value": "Name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6395,7 +6220,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6411,7 +6235,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6438,7 +6261,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -6449,7 +6271,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6462,7 +6283,6 @@ "ctxt": 0 }, "value": "VarDecl", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6536,7 +6356,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6561,7 +6380,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -6572,7 +6390,6 @@ "ctxt": 0 }, "value": "VarDecl", - "typeAnnotation": null, "optional": false } }, @@ -6588,7 +6405,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6623,7 +6439,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6679,7 +6494,6 @@ "ctxt": 0 }, "value": "isNameOfModule", - "typeAnnotation": null, "optional": false }, "function": { @@ -6751,7 +6565,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6806,7 +6619,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6918,7 +6730,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6934,7 +6745,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6961,7 +6771,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -6972,7 +6781,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6985,7 +6793,6 @@ "ctxt": 0 }, "value": "Name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7044,7 +6851,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7060,7 +6866,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7087,7 +6892,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -7098,7 +6902,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7111,7 +6914,6 @@ "ctxt": 0 }, "value": "ModuleDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7185,7 +6987,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7210,7 +7011,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -7221,7 +7021,6 @@ "ctxt": 0 }, "value": "ModuleDeclaration", - "typeAnnotation": null, "optional": false } }, @@ -7237,7 +7036,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7272,7 +7070,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7328,7 +7125,6 @@ "ctxt": 0 }, "value": "isNameOfFunction", - "typeAnnotation": null, "optional": false }, "function": { @@ -7400,7 +7196,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7455,7 +7250,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7567,7 +7361,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7583,7 +7376,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7610,7 +7402,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -7621,7 +7412,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7634,7 +7424,6 @@ "ctxt": 0 }, "value": "Name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7693,7 +7482,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7709,7 +7497,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7736,7 +7523,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -7747,7 +7533,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7760,7 +7545,6 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7834,7 +7618,6 @@ "ctxt": 0 }, "value": "parent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7859,7 +7642,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -7870,7 +7652,6 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false } }, @@ -7886,7 +7667,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7921,7 +7701,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7977,7 +7756,6 @@ "ctxt": 0 }, "value": "isChildOfScript", - "typeAnnotation": null, "optional": false }, "function": { @@ -8021,8 +7799,8 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -8039,7 +7817,6 @@ "ctxt": 0 }, "value": "lastOf", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8068,7 +7845,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8150,7 +7926,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8206,7 +7981,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8234,7 +8008,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8249,7 +8022,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } } @@ -8299,7 +8071,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8335,7 +8106,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8360,7 +8130,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8387,7 +8156,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -8398,7 +8166,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8411,7 +8178,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8463,7 +8229,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8499,7 +8264,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8524,7 +8288,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8551,7 +8314,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -8562,7 +8324,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8575,7 +8336,6 @@ "ctxt": 0 }, "value": "Script", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8627,7 +8387,6 @@ "ctxt": 0 }, "value": "isChildOfModule", - "typeAnnotation": null, "optional": false }, "function": { @@ -8671,8 +8430,8 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -8689,7 +8448,6 @@ "ctxt": 0 }, "value": "lastOf", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8718,7 +8476,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8800,7 +8557,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8856,7 +8612,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8884,7 +8639,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8899,7 +8653,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } } @@ -8949,7 +8702,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8985,7 +8737,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9010,7 +8761,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9037,7 +8787,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -9048,7 +8797,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9061,7 +8809,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9113,7 +8860,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9149,7 +8895,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9174,7 +8919,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9201,7 +8945,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -9212,7 +8955,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9225,7 +8967,6 @@ "ctxt": 0 }, "value": "ModuleDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9277,7 +9018,6 @@ "ctxt": 0 }, "value": "isChildOfClass", - "typeAnnotation": null, "optional": false }, "function": { @@ -9321,8 +9061,8 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9339,7 +9079,6 @@ "ctxt": 0 }, "value": "lastOf", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9368,7 +9107,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9450,7 +9188,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9506,7 +9243,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9534,7 +9270,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9549,7 +9284,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } } @@ -9599,7 +9333,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9635,7 +9368,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9660,7 +9392,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9687,7 +9418,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -9698,7 +9428,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9711,7 +9440,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9763,7 +9491,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9799,7 +9526,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9824,7 +9550,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9851,7 +9576,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -9862,7 +9586,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9875,7 +9598,6 @@ "ctxt": 0 }, "value": "ClassDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9927,7 +9649,6 @@ "ctxt": 0 }, "value": "isArgumentOfClassConstructor", - "typeAnnotation": null, "optional": false }, "function": { @@ -9971,8 +9692,8 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9989,7 +9710,6 @@ "ctxt": 0 }, "value": "lastOf", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -10018,7 +9738,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10140,7 +9859,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10196,7 +9914,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10224,7 +9941,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10239,7 +9955,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } } @@ -10289,7 +10004,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10325,7 +10039,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10350,7 +10063,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10377,7 +10089,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -10388,7 +10099,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10401,7 +10111,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10453,7 +10162,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10489,7 +10197,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10514,7 +10221,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10541,7 +10247,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -10552,7 +10257,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10565,7 +10269,6 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10617,7 +10320,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10653,7 +10355,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10678,7 +10379,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10705,7 +10405,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -10716,7 +10415,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10729,7 +10427,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10781,7 +10478,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10817,7 +10513,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10842,7 +10537,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10869,7 +10563,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -10880,7 +10573,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10893,7 +10585,6 @@ "ctxt": 0 }, "value": "ClassDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10958,7 +10649,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10994,7 +10684,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11028,7 +10717,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -11039,7 +10727,6 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false } }, @@ -11055,7 +10742,6 @@ "ctxt": 0 }, "value": "isConstructor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11128,7 +10814,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11164,7 +10849,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11198,7 +10882,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -11209,7 +10892,6 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false } }, @@ -11225,7 +10907,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11260,7 +10941,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11296,7 +10976,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11382,7 +11061,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11418,7 +11096,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11452,7 +11129,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -11463,7 +11139,6 @@ "ctxt": 0 }, "value": "ClassDeclaration", - "typeAnnotation": null, "optional": false } }, @@ -11479,7 +11154,6 @@ "ctxt": 0 }, "value": "constructorDecl", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11514,7 +11188,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11550,7 +11223,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11615,7 +11287,6 @@ "ctxt": 0 }, "value": "isChildOfInterface", - "typeAnnotation": null, "optional": false }, "function": { @@ -11659,8 +11330,8 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -11677,7 +11348,6 @@ "ctxt": 0 }, "value": "lastOf", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -11706,7 +11376,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11788,7 +11457,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11844,7 +11512,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11872,7 +11539,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11887,7 +11553,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } } @@ -11937,7 +11602,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11973,7 +11637,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11998,7 +11661,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12025,7 +11687,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -12036,7 +11697,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12049,7 +11709,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12101,7 +11760,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12137,7 +11795,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12162,7 +11819,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12189,7 +11845,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -12200,7 +11855,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12213,7 +11867,6 @@ "ctxt": 0 }, "value": "InterfaceDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12265,7 +11918,6 @@ "ctxt": 0 }, "value": "isTopLevelImplicitModule", - "typeAnnotation": null, "optional": false }, "function": { @@ -12345,7 +11997,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12408,7 +12059,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12436,7 +12086,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12451,7 +12100,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12478,7 +12126,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -12489,7 +12136,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12502,7 +12148,6 @@ "ctxt": 0 }, "value": "ModuleDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12531,7 +12176,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -12542,7 +12186,6 @@ "ctxt": 0 }, "value": "hasFlag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12601,7 +12244,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12629,7 +12271,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12653,7 +12294,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -12664,7 +12304,6 @@ "ctxt": 0 }, "value": "ModuleDeclaration", - "typeAnnotation": null, "optional": false } }, @@ -12680,7 +12319,6 @@ "ctxt": 0 }, "value": "modFlags", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12710,7 +12348,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -12721,7 +12358,6 @@ "ctxt": 0 }, "value": "ModuleFlags", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12734,7 +12370,6 @@ "ctxt": 0 }, "value": "IsWholeFile", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12773,7 +12408,6 @@ "ctxt": 0 }, "value": "isBodyOfTopLevelImplicitModule", - "typeAnnotation": null, "optional": false }, "function": { @@ -12869,7 +12503,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12932,7 +12565,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12968,7 +12600,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12993,7 +12624,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13020,7 +12650,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -13031,7 +12660,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13044,7 +12672,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13096,7 +12723,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13132,7 +12758,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13157,7 +12782,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13184,7 +12808,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -13195,7 +12818,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13208,7 +12830,6 @@ "ctxt": 0 }, "value": "ModuleDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13274,7 +12895,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13310,7 +12930,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13344,7 +12963,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -13355,7 +12973,6 @@ "ctxt": 0 }, "value": "ModuleDeclaration", - "typeAnnotation": null, "optional": false } }, @@ -13371,7 +12988,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13406,7 +13022,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13442,7 +13057,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13483,7 +13097,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -13494,7 +13107,6 @@ "ctxt": 0 }, "value": "hasFlag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13553,7 +13165,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13589,7 +13200,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13623,7 +13233,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -13634,7 +13243,6 @@ "ctxt": 0 }, "value": "ModuleDeclaration", - "typeAnnotation": null, "optional": false } }, @@ -13650,7 +13258,6 @@ "ctxt": 0 }, "value": "modFlags", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13680,7 +13287,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -13691,7 +13297,6 @@ "ctxt": 0 }, "value": "ModuleFlags", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13704,7 +13309,6 @@ "ctxt": 0 }, "value": "IsWholeFile", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13743,7 +13347,6 @@ "ctxt": 0 }, "value": "isBodyOfScript", - "typeAnnotation": null, "optional": false }, "function": { @@ -13823,7 +13426,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13886,7 +13488,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13922,7 +13523,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13947,7 +13547,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13974,7 +13573,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -13985,7 +13583,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13998,7 +13595,6 @@ "ctxt": 0 }, "value": "Script", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14064,7 +13660,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14100,7 +13695,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14134,7 +13728,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -14145,7 +13738,6 @@ "ctxt": 0 }, "value": "Script", - "typeAnnotation": null, "optional": false } }, @@ -14161,7 +13753,6 @@ "ctxt": 0 }, "value": "bod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14196,7 +13787,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14232,7 +13822,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14296,7 +13885,6 @@ "ctxt": 0 }, "value": "isBodyOfSwitch", - "typeAnnotation": null, "optional": false }, "function": { @@ -14376,7 +13964,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14439,7 +14026,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14475,7 +14061,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14500,7 +14085,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14527,7 +14111,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -14538,7 +14121,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14551,7 +14133,6 @@ "ctxt": 0 }, "value": "Switch", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14617,7 +14198,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14653,7 +14233,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14687,7 +14266,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -14698,7 +14276,6 @@ "ctxt": 0 }, "value": "SwitchStatement", - "typeAnnotation": null, "optional": false } }, @@ -14714,7 +14291,6 @@ "ctxt": 0 }, "value": "caseList", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14749,7 +14325,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14785,7 +14360,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14849,7 +14423,6 @@ "ctxt": 0 }, "value": "isBodyOfModule", - "typeAnnotation": null, "optional": false }, "function": { @@ -14929,7 +14502,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14992,7 +14564,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15028,7 +14599,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15053,7 +14623,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15080,7 +14649,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -15091,7 +14659,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15104,7 +14671,6 @@ "ctxt": 0 }, "value": "ModuleDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15170,7 +14736,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15206,7 +14771,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15240,7 +14804,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -15251,7 +14814,6 @@ "ctxt": 0 }, "value": "ModuleDeclaration", - "typeAnnotation": null, "optional": false } }, @@ -15267,7 +14829,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15302,7 +14863,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15338,7 +14898,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15402,7 +14961,6 @@ "ctxt": 0 }, "value": "isBodyOfClass", - "typeAnnotation": null, "optional": false }, "function": { @@ -15482,7 +15040,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15545,7 +15102,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15581,7 +15137,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15606,7 +15161,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15633,7 +15187,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -15644,7 +15197,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15657,7 +15209,6 @@ "ctxt": 0 }, "value": "ClassDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15723,7 +15274,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15759,7 +15309,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15793,7 +15342,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -15804,7 +15352,6 @@ "ctxt": 0 }, "value": "ClassDeclaration", - "typeAnnotation": null, "optional": false } }, @@ -15820,7 +15367,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15855,7 +15401,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15891,7 +15436,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15955,7 +15499,6 @@ "ctxt": 0 }, "value": "isBodyOfFunction", - "typeAnnotation": null, "optional": false }, "function": { @@ -16035,7 +15578,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16098,7 +15640,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16134,7 +15675,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16159,7 +15699,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16186,7 +15725,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -16197,7 +15735,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16210,7 +15747,6 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16276,7 +15812,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16312,7 +15847,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16346,7 +15880,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -16357,7 +15890,6 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false } }, @@ -16373,7 +15905,6 @@ "ctxt": 0 }, "value": "bod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16408,7 +15939,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16444,7 +15974,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16508,7 +16037,6 @@ "ctxt": 0 }, "value": "isBodyOfInterface", - "typeAnnotation": null, "optional": false }, "function": { @@ -16588,7 +16116,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16651,7 +16178,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16687,7 +16213,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16712,7 +16237,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16739,7 +16263,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -16750,7 +16273,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16763,7 +16285,6 @@ "ctxt": 0 }, "value": "InterfaceDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16829,7 +16350,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16865,7 +16385,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16899,7 +16418,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -16910,7 +16428,6 @@ "ctxt": 0 }, "value": "InterfaceDeclaration", - "typeAnnotation": null, "optional": false } }, @@ -16926,7 +16443,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16961,7 +16477,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16997,7 +16512,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17061,7 +16575,6 @@ "ctxt": 0 }, "value": "isBodyOfBlock", - "typeAnnotation": null, "optional": false }, "function": { @@ -17141,7 +16654,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17204,7 +16716,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17240,7 +16751,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17265,7 +16775,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17292,7 +16801,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -17303,7 +16811,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17316,7 +16823,6 @@ "ctxt": 0 }, "value": "Block", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17382,7 +16888,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17418,7 +16923,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17452,7 +16956,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -17463,7 +16966,6 @@ "ctxt": 0 }, "value": "Block", - "typeAnnotation": null, "optional": false } }, @@ -17479,7 +16981,6 @@ "ctxt": 0 }, "value": "statements", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17514,7 +17015,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17550,7 +17050,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17614,7 +17113,6 @@ "ctxt": 0 }, "value": "isBodyOfFor", - "typeAnnotation": null, "optional": false }, "function": { @@ -17694,7 +17192,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17757,7 +17254,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17793,7 +17289,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17818,7 +17313,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17845,7 +17339,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -17856,7 +17349,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17869,7 +17361,6 @@ "ctxt": 0 }, "value": "For", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17935,7 +17426,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17971,7 +17461,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18005,7 +17494,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -18016,7 +17504,6 @@ "ctxt": 0 }, "value": "ForStatement", - "typeAnnotation": null, "optional": false } }, @@ -18032,7 +17519,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18067,7 +17553,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18103,7 +17588,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18167,7 +17651,6 @@ "ctxt": 0 }, "value": "isBodyOfCase", - "typeAnnotation": null, "optional": false }, "function": { @@ -18247,7 +17730,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18310,7 +17792,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18346,7 +17827,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18371,7 +17851,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18398,7 +17877,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -18409,7 +17887,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18422,7 +17899,6 @@ "ctxt": 0 }, "value": "Case", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18488,7 +17964,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18524,7 +17999,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18558,7 +18032,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -18569,7 +18042,6 @@ "ctxt": 0 }, "value": "CaseStatement", - "typeAnnotation": null, "optional": false } }, @@ -18585,7 +18057,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18620,7 +18091,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18656,7 +18126,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18720,7 +18189,6 @@ "ctxt": 0 }, "value": "isBodyOfTry", - "typeAnnotation": null, "optional": false }, "function": { @@ -18800,7 +18268,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18863,7 +18330,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18899,7 +18365,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18924,7 +18389,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18951,7 +18415,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -18962,7 +18425,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18975,7 +18437,6 @@ "ctxt": 0 }, "value": "Try", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19041,7 +18502,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19077,7 +18537,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19111,7 +18570,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -19122,7 +18580,6 @@ "ctxt": 0 }, "value": "Try", - "typeAnnotation": null, "optional": false } }, @@ -19138,7 +18595,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19173,7 +18629,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19209,7 +18664,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19273,7 +18727,6 @@ "ctxt": 0 }, "value": "isBodyOfCatch", - "typeAnnotation": null, "optional": false }, "function": { @@ -19353,7 +18806,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19416,7 +18868,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19452,7 +18903,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19477,7 +18927,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19504,7 +18953,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -19515,7 +18963,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19528,7 +18975,6 @@ "ctxt": 0 }, "value": "Catch", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19594,7 +19040,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19630,7 +19075,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19664,7 +19108,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -19675,7 +19118,6 @@ "ctxt": 0 }, "value": "Catch", - "typeAnnotation": null, "optional": false } }, @@ -19691,7 +19133,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19726,7 +19167,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19762,7 +19202,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19826,7 +19265,6 @@ "ctxt": 0 }, "value": "isBodyOfDoWhile", - "typeAnnotation": null, "optional": false }, "function": { @@ -19906,7 +19344,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19969,7 +19406,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20005,7 +19441,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20030,7 +19465,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20057,7 +19491,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -20068,7 +19501,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20081,7 +19513,6 @@ "ctxt": 0 }, "value": "DoWhile", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20147,7 +19578,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20183,7 +19613,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20217,7 +19646,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -20228,7 +19656,6 @@ "ctxt": 0 }, "value": "DoWhileStatement", - "typeAnnotation": null, "optional": false } }, @@ -20244,7 +19671,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20279,7 +19705,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20315,7 +19740,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20379,7 +19803,6 @@ "ctxt": 0 }, "value": "isBodyOfWhile", - "typeAnnotation": null, "optional": false }, "function": { @@ -20459,7 +19882,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20522,7 +19944,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20558,7 +19979,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20583,7 +20003,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20610,7 +20029,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -20621,7 +20039,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20634,7 +20051,6 @@ "ctxt": 0 }, "value": "While", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20700,7 +20116,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20736,7 +20151,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20770,7 +20184,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -20781,7 +20194,6 @@ "ctxt": 0 }, "value": "WhileStatement", - "typeAnnotation": null, "optional": false } }, @@ -20797,7 +20209,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20832,7 +20243,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20868,7 +20278,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20932,7 +20341,6 @@ "ctxt": 0 }, "value": "isBodyOfForIn", - "typeAnnotation": null, "optional": false }, "function": { @@ -21012,7 +20420,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21075,7 +20482,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21111,7 +20517,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21136,7 +20541,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21163,7 +20567,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -21174,7 +20577,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21187,7 +20589,6 @@ "ctxt": 0 }, "value": "ForIn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21253,7 +20654,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21289,7 +20689,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21323,7 +20722,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -21334,7 +20732,6 @@ "ctxt": 0 }, "value": "ForInStatement", - "typeAnnotation": null, "optional": false } }, @@ -21350,7 +20747,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21385,7 +20781,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21421,7 +20816,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21485,7 +20879,6 @@ "ctxt": 0 }, "value": "isBodyOfWith", - "typeAnnotation": null, "optional": false }, "function": { @@ -21565,7 +20958,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21628,7 +21020,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21664,7 +21055,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21689,7 +21079,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21716,7 +21105,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -21727,7 +21115,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21740,7 +21127,6 @@ "ctxt": 0 }, "value": "With", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21806,7 +21192,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21842,7 +21227,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21876,7 +21260,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -21887,7 +21270,6 @@ "ctxt": 0 }, "value": "WithStatement", - "typeAnnotation": null, "optional": false } }, @@ -21903,7 +21285,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21938,7 +21319,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21974,7 +21354,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22038,7 +21417,6 @@ "ctxt": 0 }, "value": "isBodyOfFinally", - "typeAnnotation": null, "optional": false }, "function": { @@ -22118,7 +21496,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22181,7 +21558,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22217,7 +21593,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22242,7 +21617,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22269,7 +21643,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -22280,7 +21653,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22293,7 +21665,6 @@ "ctxt": 0 }, "value": "Finally", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22359,7 +21730,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22395,7 +21765,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22429,7 +21798,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -22440,7 +21808,6 @@ "ctxt": 0 }, "value": "Finally", - "typeAnnotation": null, "optional": false } }, @@ -22456,7 +21823,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22491,7 +21857,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22527,7 +21892,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22591,7 +21955,6 @@ "ctxt": 0 }, "value": "isCaseOfSwitch", - "typeAnnotation": null, "optional": false }, "function": { @@ -22679,7 +22042,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22742,7 +22104,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22778,7 +22139,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22803,7 +22163,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22830,7 +22189,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -22841,7 +22199,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22854,7 +22211,6 @@ "ctxt": 0 }, "value": "Switch", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22906,7 +22262,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22942,7 +22297,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22967,7 +22321,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22994,7 +22347,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -23005,7 +22357,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23018,7 +22369,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23084,7 +22434,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23120,7 +22469,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23154,7 +22502,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -23165,7 +22512,6 @@ "ctxt": 0 }, "value": "SwitchStatement", - "typeAnnotation": null, "optional": false } }, @@ -23181,7 +22527,6 @@ "ctxt": 0 }, "value": "caseList", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23216,7 +22561,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23252,7 +22596,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23316,7 +22659,6 @@ "ctxt": 0 }, "value": "isDefaultCaseOfSwitch", - "typeAnnotation": null, "optional": false }, "function": { @@ -23412,7 +22754,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23475,7 +22816,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23511,7 +22851,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23536,7 +22875,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23563,7 +22901,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -23574,7 +22911,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23587,7 +22923,6 @@ "ctxt": 0 }, "value": "Switch", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23639,7 +22974,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23675,7 +23009,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23700,7 +23033,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23727,7 +23059,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -23738,7 +23069,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23751,7 +23081,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23817,7 +23146,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23853,7 +23181,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23887,7 +23214,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -23898,7 +23224,6 @@ "ctxt": 0 }, "value": "SwitchStatement", - "typeAnnotation": null, "optional": false } }, @@ -23914,7 +23239,6 @@ "ctxt": 0 }, "value": "caseList", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23949,7 +23273,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23985,7 +23308,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24063,7 +23385,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24099,7 +23420,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24133,7 +23453,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -24144,7 +23463,6 @@ "ctxt": 0 }, "value": "SwitchStatement", - "typeAnnotation": null, "optional": false } }, @@ -24160,7 +23478,6 @@ "ctxt": 0 }, "value": "defaultCase", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24195,7 +23512,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24231,7 +23547,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24295,7 +23610,6 @@ "ctxt": 0 }, "value": "isListOfObjectLit", - "typeAnnotation": null, "optional": false }, "function": { @@ -24383,7 +23697,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24446,7 +23759,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24482,7 +23794,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24507,7 +23818,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24534,7 +23844,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -24545,7 +23854,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24558,7 +23866,6 @@ "ctxt": 0 }, "value": "ObjectLit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24610,7 +23917,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24646,7 +23952,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24671,7 +23976,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24698,7 +24002,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -24709,7 +24012,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24722,7 +24024,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24788,7 +24089,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24824,7 +24124,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24858,7 +24157,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -24869,7 +24167,6 @@ "ctxt": 0 }, "value": "UnaryExpression", - "typeAnnotation": null, "optional": false } }, @@ -24885,7 +24182,6 @@ "ctxt": 0 }, "value": "operand", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24920,7 +24216,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24956,7 +24251,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25020,7 +24314,6 @@ "ctxt": 0 }, "value": "isBodyOfObjectLit", - "typeAnnotation": null, "optional": false }, "function": { @@ -25076,7 +24369,6 @@ "ctxt": 0 }, "value": "isListOfObjectLit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25129,7 +24421,6 @@ "ctxt": 0 }, "value": "isEmptyListOfObjectLit", - "typeAnnotation": null, "optional": false }, "function": { @@ -25225,7 +24516,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25288,7 +24578,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25324,7 +24613,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25349,7 +24637,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25376,7 +24663,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -25387,7 +24673,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25400,7 +24685,6 @@ "ctxt": 0 }, "value": "ObjectLit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25452,7 +24736,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25488,7 +24771,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25513,7 +24795,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25540,7 +24821,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -25551,7 +24831,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25564,7 +24843,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25630,7 +24908,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25666,7 +24943,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25700,7 +24976,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -25711,7 +24986,6 @@ "ctxt": 0 }, "value": "UnaryExpression", - "typeAnnotation": null, "optional": false } }, @@ -25727,7 +25001,6 @@ "ctxt": 0 }, "value": "operand", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25762,7 +25035,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25798,7 +25070,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25883,7 +25154,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25919,7 +25189,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25953,7 +25222,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -25964,7 +25232,6 @@ "ctxt": 0 }, "value": "ASTList", - "typeAnnotation": null, "optional": false } }, @@ -25980,7 +25247,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "computed": false @@ -25993,7 +25259,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26054,7 +25319,6 @@ "ctxt": 0 }, "value": "isMemberOfObjectLit", - "typeAnnotation": null, "optional": false }, "function": { @@ -26150,7 +25414,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26213,7 +25476,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26249,7 +25511,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26274,7 +25535,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26301,7 +25561,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -26312,7 +25571,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26325,7 +25583,6 @@ "ctxt": 0 }, "value": "ObjectLit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26377,7 +25634,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26413,7 +25669,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26438,7 +25693,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26465,7 +25719,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -26476,7 +25729,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26489,7 +25741,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26541,7 +25792,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26577,7 +25827,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26602,7 +25851,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26629,7 +25877,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -26640,7 +25887,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26653,7 +25899,6 @@ "ctxt": 0 }, "value": "Member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26719,7 +25964,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26755,7 +25999,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26789,7 +26032,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -26800,7 +26042,6 @@ "ctxt": 0 }, "value": "UnaryExpression", - "typeAnnotation": null, "optional": false } }, @@ -26816,7 +26057,6 @@ "ctxt": 0 }, "value": "operand", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26851,7 +26091,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26887,7 +26126,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -26951,7 +26189,6 @@ "ctxt": 0 }, "value": "isNameOfMemberOfObjectLit", - "typeAnnotation": null, "optional": false }, "function": { @@ -27055,7 +26292,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27118,7 +26354,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27154,7 +26389,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27179,7 +26413,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27206,7 +26439,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -27217,7 +26449,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27230,7 +26461,6 @@ "ctxt": 0 }, "value": "ObjectLit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27282,7 +26512,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27318,7 +26547,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27343,7 +26571,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27370,7 +26597,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -27381,7 +26607,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27394,7 +26619,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27446,7 +26670,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27482,7 +26705,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27507,7 +26729,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27534,7 +26755,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -27545,7 +26765,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27558,7 +26777,6 @@ "ctxt": 0 }, "value": "Member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27610,7 +26828,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27646,7 +26863,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27671,7 +26887,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27698,7 +26913,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -27709,7 +26923,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27722,7 +26935,6 @@ "ctxt": 0 }, "value": "Name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27788,7 +27000,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27824,7 +27035,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27858,7 +27068,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -27869,7 +27078,6 @@ "ctxt": 0 }, "value": "UnaryExpression", - "typeAnnotation": null, "optional": false } }, @@ -27885,7 +27093,6 @@ "ctxt": 0 }, "value": "operand", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27920,7 +27127,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -27956,7 +27162,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28020,7 +27225,6 @@ "ctxt": 0 }, "value": "isListOfArrayLit", - "typeAnnotation": null, "optional": false }, "function": { @@ -28108,7 +27312,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28171,7 +27374,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28207,7 +27409,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28232,7 +27433,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28259,7 +27459,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -28270,7 +27469,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28283,7 +27481,6 @@ "ctxt": 0 }, "value": "ArrayLit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28335,7 +27532,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28371,7 +27567,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28396,7 +27591,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28423,7 +27617,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -28434,7 +27627,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28447,7 +27639,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28513,7 +27704,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28549,7 +27739,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28583,7 +27772,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -28594,7 +27782,6 @@ "ctxt": 0 }, "value": "UnaryExpression", - "typeAnnotation": null, "optional": false } }, @@ -28610,7 +27797,6 @@ "ctxt": 0 }, "value": "operand", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28645,7 +27831,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28681,7 +27866,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28745,7 +27929,6 @@ "ctxt": 0 }, "value": "isTargetOfMember", - "typeAnnotation": null, "optional": false }, "function": { @@ -28825,7 +28008,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28888,7 +28070,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28924,7 +28105,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28949,7 +28129,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28976,7 +28155,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -28987,7 +28165,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29000,7 +28177,6 @@ "ctxt": 0 }, "value": "Member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29066,7 +28242,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29102,7 +28277,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29136,7 +28310,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -29147,7 +28320,6 @@ "ctxt": 0 }, "value": "BinaryExpression", - "typeAnnotation": null, "optional": false } }, @@ -29163,7 +28335,6 @@ "ctxt": 0 }, "value": "operand1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29198,7 +28369,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29234,7 +28404,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29298,7 +28467,6 @@ "ctxt": 0 }, "value": "isMemberOfMember", - "typeAnnotation": null, "optional": false }, "function": { @@ -29378,7 +28546,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29441,7 +28608,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29477,7 +28643,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29502,7 +28667,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29529,7 +28693,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -29540,7 +28703,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29553,7 +28715,6 @@ "ctxt": 0 }, "value": "Member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29619,7 +28780,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29655,7 +28815,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29689,7 +28848,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -29700,7 +28858,6 @@ "ctxt": 0 }, "value": "BinaryExpression", - "typeAnnotation": null, "optional": false } }, @@ -29716,7 +28873,6 @@ "ctxt": 0 }, "value": "operand2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29751,7 +28907,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29787,7 +28942,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29851,7 +29005,6 @@ "ctxt": 0 }, "value": "isItemOfList", - "typeAnnotation": null, "optional": false }, "function": { @@ -29923,7 +29076,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29986,7 +29138,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30022,7 +29173,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30047,7 +29197,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30074,7 +29223,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -30085,7 +29233,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30098,7 +29245,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30150,7 +29296,6 @@ "ctxt": 0 }, "value": "isThenOfIf", - "typeAnnotation": null, "optional": false }, "function": { @@ -30230,7 +29375,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30293,7 +29437,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30329,7 +29472,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30354,7 +29496,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30381,7 +29522,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -30392,7 +29532,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30405,7 +29544,6 @@ "ctxt": 0 }, "value": "If", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30471,7 +29609,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30507,7 +29644,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30541,7 +29677,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -30552,7 +29687,6 @@ "ctxt": 0 }, "value": "IfStatement", - "typeAnnotation": null, "optional": false } }, @@ -30568,7 +29702,6 @@ "ctxt": 0 }, "value": "thenBod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30603,7 +29736,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30639,7 +29771,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30703,7 +29834,6 @@ "ctxt": 0 }, "value": "isElseOfIf", - "typeAnnotation": null, "optional": false }, "function": { @@ -30783,7 +29913,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30846,7 +29975,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30882,7 +30010,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30907,7 +30034,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30934,7 +30060,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -30945,7 +30070,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30958,7 +30082,6 @@ "ctxt": 0 }, "value": "If", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31024,7 +30147,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31060,7 +30182,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31094,7 +30215,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -31105,7 +30225,6 @@ "ctxt": 0 }, "value": "IfStatement", - "typeAnnotation": null, "optional": false } }, @@ -31121,7 +30240,6 @@ "ctxt": 0 }, "value": "elseBod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31156,7 +30274,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31192,7 +30309,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31256,7 +30372,6 @@ "ctxt": 0 }, "value": "isBodyOfDefaultCase", - "typeAnnotation": null, "optional": false }, "function": { @@ -31312,7 +30427,6 @@ "ctxt": 0 }, "value": "isBodyOfCase", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31365,7 +30479,6 @@ "ctxt": 0 }, "value": "isSingleStatementList", - "typeAnnotation": null, "optional": false }, "function": { @@ -31445,7 +30558,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31508,7 +30620,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31536,7 +30647,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31551,7 +30661,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31578,7 +30687,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -31589,7 +30697,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31602,7 +30709,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31675,7 +30781,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31703,7 +30808,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31727,7 +30831,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -31738,7 +30841,6 @@ "ctxt": 0 }, "value": "ASTList", - "typeAnnotation": null, "optional": false } }, @@ -31754,7 +30856,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31767,7 +30868,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31828,7 +30928,6 @@ "ctxt": 0 }, "value": "isArgumentListOfFunction", - "typeAnnotation": null, "optional": false }, "function": { @@ -31916,7 +31015,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31979,7 +31077,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32015,7 +31112,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32040,7 +31136,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32067,7 +31162,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -32078,7 +31172,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32091,7 +31184,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32143,7 +31235,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32179,7 +31270,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32204,7 +31294,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32231,7 +31320,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -32242,7 +31330,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32255,7 +31342,6 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32321,7 +31407,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32357,7 +31442,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32391,7 +31475,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -32402,7 +31485,6 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false } }, @@ -32418,7 +31500,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32453,7 +31534,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32489,7 +31569,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32553,7 +31632,6 @@ "ctxt": 0 }, "value": "isArgumentOfFunction", - "typeAnnotation": null, "optional": false }, "function": { @@ -32641,7 +31719,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32704,7 +31781,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32740,7 +31816,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32765,7 +31840,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32792,7 +31866,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -32803,7 +31876,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32816,7 +31888,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32868,7 +31939,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32904,7 +31974,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32929,7 +31998,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32956,7 +32024,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -32967,7 +32034,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -32980,7 +32046,6 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33046,7 +32111,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33082,7 +32146,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33116,7 +32179,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -33127,7 +32189,6 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false } }, @@ -33143,7 +32204,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33178,7 +32238,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33214,7 +32273,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33278,7 +32336,6 @@ "ctxt": 0 }, "value": "isArgumentListOfCall", - "typeAnnotation": null, "optional": false }, "function": { @@ -33366,7 +32423,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33429,7 +32485,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33465,7 +32520,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33490,7 +32544,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33517,7 +32570,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -33528,7 +32580,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33541,7 +32592,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33593,7 +32643,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33629,7 +32678,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33654,7 +32702,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33681,7 +32728,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -33692,7 +32738,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33705,7 +32750,6 @@ "ctxt": 0 }, "value": "Call", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33771,7 +32815,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33807,7 +32850,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33841,7 +32883,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -33852,7 +32893,6 @@ "ctxt": 0 }, "value": "CallExpression", - "typeAnnotation": null, "optional": false } }, @@ -33868,7 +32908,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33903,7 +32942,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33939,7 +32977,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34003,7 +33040,6 @@ "ctxt": 0 }, "value": "isArgumentListOfNew", - "typeAnnotation": null, "optional": false }, "function": { @@ -34091,7 +33127,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34154,7 +33189,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34190,7 +33224,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34215,7 +33248,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34242,7 +33274,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -34253,7 +33284,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34266,7 +33296,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34318,7 +33347,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34354,7 +33382,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34379,7 +33406,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34406,7 +33432,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -34417,7 +33442,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34430,7 +33454,6 @@ "ctxt": 0 }, "value": "New", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34496,7 +33519,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34532,7 +33554,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34566,7 +33587,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -34577,7 +33597,6 @@ "ctxt": 0 }, "value": "CallExpression", - "typeAnnotation": null, "optional": false } }, @@ -34593,7 +33612,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34628,7 +33646,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34664,7 +33681,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34728,7 +33744,6 @@ "ctxt": 0 }, "value": "isSynthesizedBlock", - "typeAnnotation": null, "optional": false }, "function": { @@ -34808,7 +33823,6 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34871,7 +33885,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34907,7 +33920,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34932,7 +33944,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34959,7 +33970,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -34970,7 +33980,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34983,7 +33992,6 @@ "ctxt": 0 }, "value": "Block", - "typeAnnotation": null, "optional": false }, "computed": false @@ -35049,7 +34057,6 @@ "ctxt": 0 }, "value": "asts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -35085,7 +34092,6 @@ "ctxt": 0 }, "value": "top", - "typeAnnotation": null, "optional": false }, "computed": false @@ -35119,7 +34125,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -35130,7 +34135,6 @@ "ctxt": 0 }, "value": "Block", - "typeAnnotation": null, "optional": false } }, @@ -35146,7 +34150,6 @@ "ctxt": 0 }, "value": "isStatementBlock", - "typeAnnotation": null, "optional": false }, "computed": false @@ -35217,7 +34220,6 @@ "ctxt": 0 }, "value": "isValidAstNode", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -35238,6 +34240,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -35262,7 +34265,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -35273,14 +34275,12 @@ "ctxt": 0 }, "value": "ASTSpan", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } } ], @@ -35321,7 +34321,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "right": { @@ -35390,7 +34389,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -35401,7 +34399,6 @@ "ctxt": 0 }, "value": "minChar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -35448,7 +34445,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -35459,7 +34455,6 @@ "ctxt": 0 }, "value": "limChar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -35561,7 +34556,6 @@ "ctxt": 0 }, "value": "AstPathContext", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -35587,7 +34581,6 @@ "ctxt": 0 }, "value": "path", - "typeAnnotation": null, "optional": false }, "value": { @@ -35612,7 +34605,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -35623,7 +34615,6 @@ "ctxt": 0 }, "value": "AstPath", - "typeAnnotation": null, "optional": false }, "computed": false @@ -35674,7 +34665,6 @@ "ctxt": 0 }, "value": "GetAstPathOptions", - "typeAnnotation": null, "optional": false }, "members": [ @@ -35693,7 +34683,6 @@ "ctxt": 0 }, "value": "Default", - "typeAnnotation": null, "optional": false }, "init": { @@ -35721,7 +34710,6 @@ "ctxt": 0 }, "value": "EdgeInclusive", - "typeAnnotation": null, "optional": false }, "init": { @@ -35749,7 +34737,6 @@ "ctxt": 0 }, "value": "DontPruneSearchBasedOnPosition", - "typeAnnotation": null, "optional": false }, "init": { @@ -35800,7 +34787,6 @@ "ctxt": 0 }, "value": "getAstPathToPosition", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -35821,6 +34807,7 @@ "ctxt": 0 }, "value": "script", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -35845,7 +34832,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -35856,14 +34842,12 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } }, { @@ -35882,6 +34866,7 @@ "ctxt": 0 }, "value": "pos", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -35898,8 +34883,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -35925,8 +34909,8 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -35943,7 +34927,6 @@ "ctxt": 0 }, "value": "GetAstPathOptions", - "typeAnnotation": null, "optional": false }, "property": { @@ -35954,7 +34937,6 @@ "ctxt": 0 }, "value": "Default", - "typeAnnotation": null, "optional": false }, "computed": false @@ -36002,8 +34984,8 @@ "ctxt": 0 }, "value": "lookInComments", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -36021,6 +35003,7 @@ "ctxt": 0 }, "value": "comments", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -36052,7 +35035,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -36063,15 +35045,13 @@ "ctxt": 0 }, "value": "Comment", - "typeAnnotation": null, "optional": false } }, "typeParams": null } } - }, - "optional": false + } } ], "body": { @@ -36105,7 +35085,6 @@ "ctxt": 0 }, "value": "comments", - "typeAnnotation": null, "optional": false }, "right": { @@ -36131,7 +35110,6 @@ "ctxt": 0 }, "value": "comments", - "typeAnnotation": null, "optional": false }, "property": { @@ -36142,7 +35120,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -36198,8 +35175,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -36230,7 +35207,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "right": { @@ -36248,7 +35224,6 @@ "ctxt": 0 }, "value": "comments", - "typeAnnotation": null, "optional": false }, "property": { @@ -36259,7 +35234,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -36282,7 +35256,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -36319,8 +35292,8 @@ "ctxt": 0 }, "value": "minChar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -36344,7 +35317,6 @@ "ctxt": 0 }, "value": "comments", - "typeAnnotation": null, "optional": false }, "property": { @@ -36355,7 +35327,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": true @@ -36368,7 +35339,6 @@ "ctxt": 0 }, "value": "minChar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -36402,8 +35372,8 @@ "ctxt": 0 }, "value": "limChar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -36427,7 +35397,6 @@ "ctxt": 0 }, "value": "comments", - "typeAnnotation": null, "optional": false }, "property": { @@ -36438,7 +35407,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": true @@ -36451,7 +35419,6 @@ "ctxt": 0 }, "value": "limChar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -36497,7 +35464,6 @@ "ctxt": 0 }, "value": "comments", - "typeAnnotation": null, "optional": false }, "property": { @@ -36508,7 +35474,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": true @@ -36521,7 +35486,6 @@ "ctxt": 0 }, "value": "isBlockComment", - "typeAnnotation": null, "optional": false }, "computed": false @@ -36559,7 +35523,6 @@ "ctxt": 0 }, "value": "limChar", - "typeAnnotation": null, "optional": false } } @@ -36599,7 +35562,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false }, "right": { @@ -36610,7 +35572,6 @@ "ctxt": 0 }, "value": "minChar", - "typeAnnotation": null, "optional": false } }, @@ -36630,7 +35591,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false }, "right": { @@ -36641,7 +35601,6 @@ "ctxt": 0 }, "value": "limChar", - "typeAnnotation": null, "optional": false } } @@ -36690,7 +35649,6 @@ "ctxt": 0 }, "value": "ctx", - "typeAnnotation": null, "optional": false }, "property": { @@ -36701,7 +35659,6 @@ "ctxt": 0 }, "value": "path", - "typeAnnotation": null, "optional": false }, "computed": false @@ -36714,7 +35671,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -36737,7 +35693,6 @@ "ctxt": 0 }, "value": "comments", - "typeAnnotation": null, "optional": false }, "property": { @@ -36748,7 +35703,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": true @@ -36805,8 +35759,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -36828,6 +35782,7 @@ "ctxt": 0 }, "value": "cur", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -36852,7 +35807,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -36863,14 +35817,12 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } }, { @@ -36889,6 +35841,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -36913,7 +35866,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -36924,14 +35876,12 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } }, { @@ -36950,6 +35900,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -36972,13 +35923,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -37018,7 +35967,6 @@ "ctxt": 0 }, "value": "isValidAstNode", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -37032,7 +35980,6 @@ "ctxt": 0 }, "value": "cur", - "typeAnnotation": null, "optional": false } } @@ -37072,8 +36019,8 @@ "ctxt": 0 }, "value": "inclusive", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -37106,7 +36053,6 @@ "ctxt": 0 }, "value": "hasFlag", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -37120,7 +36066,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false } }, @@ -37141,7 +36086,6 @@ "ctxt": 0 }, "value": "GetAstPathOptions", - "typeAnnotation": null, "optional": false }, "property": { @@ -37152,7 +36096,6 @@ "ctxt": 0 }, "value": "EdgeInclusive", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37184,7 +36127,6 @@ "ctxt": 0 }, "value": "cur", - "typeAnnotation": null, "optional": false }, "property": { @@ -37195,7 +36137,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37222,7 +36163,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -37233,7 +36173,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37246,7 +36185,6 @@ "ctxt": 0 }, "value": "Name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37269,7 +36207,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false }, "right": { @@ -37287,7 +36224,6 @@ "ctxt": 0 }, "value": "script", - "typeAnnotation": null, "optional": false }, "property": { @@ -37298,7 +36234,6 @@ "ctxt": 0 }, "value": "limChar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37334,8 +36269,8 @@ "ctxt": 0 }, "value": "minChar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -37352,7 +36287,6 @@ "ctxt": 0 }, "value": "cur", - "typeAnnotation": null, "optional": false }, "property": { @@ -37363,7 +36297,6 @@ "ctxt": 0 }, "value": "minChar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37397,8 +36330,8 @@ "ctxt": 0 }, "value": "limChar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -37423,7 +36356,6 @@ "ctxt": 0 }, "value": "cur", - "typeAnnotation": null, "optional": false }, "property": { @@ -37434,7 +36366,6 @@ "ctxt": 0 }, "value": "limChar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37461,7 +36392,6 @@ "ctxt": 0 }, "value": "inclusive", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -37520,7 +36450,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false }, "right": { @@ -37531,7 +36460,6 @@ "ctxt": 0 }, "value": "minChar", - "typeAnnotation": null, "optional": false } }, @@ -37551,7 +36479,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false }, "right": { @@ -37562,7 +36489,6 @@ "ctxt": 0 }, "value": "limChar", - "typeAnnotation": null, "optional": false } } @@ -37600,8 +36526,8 @@ "ctxt": 0 }, "value": "previous", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -37632,7 +36558,6 @@ "ctxt": 0 }, "value": "ctx", - "typeAnnotation": null, "optional": false }, "property": { @@ -37643,7 +36568,6 @@ "ctxt": 0 }, "value": "path", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37656,7 +36580,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37699,7 +36622,6 @@ "ctxt": 0 }, "value": "previous", - "typeAnnotation": null, "optional": false }, "right": { @@ -37749,7 +36671,6 @@ "ctxt": 0 }, "value": "cur", - "typeAnnotation": null, "optional": false }, "property": { @@ -37760,7 +36681,6 @@ "ctxt": 0 }, "value": "minChar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37780,7 +36700,6 @@ "ctxt": 0 }, "value": "previous", - "typeAnnotation": null, "optional": false }, "property": { @@ -37791,7 +36710,6 @@ "ctxt": 0 }, "value": "minChar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37820,7 +36738,6 @@ "ctxt": 0 }, "value": "cur", - "typeAnnotation": null, "optional": false }, "property": { @@ -37831,7 +36748,6 @@ "ctxt": 0 }, "value": "limChar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37851,7 +36767,6 @@ "ctxt": 0 }, "value": "previous", - "typeAnnotation": null, "optional": false }, "property": { @@ -37862,7 +36777,6 @@ "ctxt": 0 }, "value": "limChar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37915,7 +36829,6 @@ "ctxt": 0 }, "value": "ctx", - "typeAnnotation": null, "optional": false }, "property": { @@ -37926,7 +36839,6 @@ "ctxt": 0 }, "value": "path", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37939,7 +36851,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -37955,7 +36866,6 @@ "ctxt": 0 }, "value": "cur", - "typeAnnotation": null, "optional": false } } @@ -38002,7 +36912,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false }, "right": { @@ -38013,7 +36922,6 @@ "ctxt": 0 }, "value": "limChar", - "typeAnnotation": null, "optional": false } }, @@ -38047,7 +36955,6 @@ "ctxt": 0 }, "value": "lookInComments", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -38068,7 +36975,6 @@ "ctxt": 0 }, "value": "cur", - "typeAnnotation": null, "optional": false }, "property": { @@ -38079,7 +36985,6 @@ "ctxt": 0 }, "value": "preComments", - "typeAnnotation": null, "optional": false }, "computed": false @@ -38116,7 +37021,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false }, "right": { @@ -38127,7 +37031,6 @@ "ctxt": 0 }, "value": "minChar", - "typeAnnotation": null, "optional": false } }, @@ -38161,7 +37064,6 @@ "ctxt": 0 }, "value": "lookInComments", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -38182,7 +37084,6 @@ "ctxt": 0 }, "value": "cur", - "typeAnnotation": null, "optional": false }, "property": { @@ -38193,7 +37094,6 @@ "ctxt": 0 }, "value": "postComments", - "typeAnnotation": null, "optional": false }, "computed": false @@ -38237,7 +37137,6 @@ "ctxt": 0 }, "value": "hasFlag", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -38251,7 +37150,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false } }, @@ -38272,7 +37170,6 @@ "ctxt": 0 }, "value": "GetAstPathOptions", - "typeAnnotation": null, "optional": false }, "property": { @@ -38283,7 +37180,6 @@ "ctxt": 0 }, "value": "DontPruneSearchBasedOnPosition", - "typeAnnotation": null, "optional": false }, "computed": false @@ -38338,7 +37234,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -38349,7 +37244,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -38362,7 +37256,6 @@ "ctxt": 0 }, "value": "goChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -38398,7 +37291,6 @@ "ctxt": 0 }, "value": "minChar", - "typeAnnotation": null, "optional": false }, "right": { @@ -38409,7 +37301,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false } }, @@ -38429,7 +37320,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false }, "right": { @@ -38440,7 +37330,6 @@ "ctxt": 0 }, "value": "limChar", - "typeAnnotation": null, "optional": false } } @@ -38471,7 +37360,6 @@ "ctxt": 0 }, "value": "cur", - "typeAnnotation": null, "optional": false } } @@ -38511,8 +37399,8 @@ "ctxt": 0 }, "value": "ctx", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -38529,7 +37417,6 @@ "ctxt": 0 }, "value": "AstPathContext", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -38582,7 +37469,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -38593,7 +37479,6 @@ "ctxt": 0 }, "value": "getAstWalkerFactory", - "typeAnnotation": null, "optional": false }, "computed": false @@ -38609,7 +37494,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -38625,7 +37509,6 @@ "ctxt": 0 }, "value": "script", - "typeAnnotation": null, "optional": false } }, @@ -38639,7 +37522,6 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, "optional": false } }, @@ -38675,7 +37557,6 @@ "ctxt": 0 }, "value": "ctx", - "typeAnnotation": null, "optional": false } } @@ -38705,7 +37586,6 @@ "ctxt": 0 }, "value": "ctx", - "typeAnnotation": null, "optional": false }, "property": { @@ -38716,7 +37596,6 @@ "ctxt": 0 }, "value": "path", - "typeAnnotation": null, "optional": false }, "computed": false @@ -38751,7 +37630,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -38762,7 +37640,6 @@ "ctxt": 0 }, "value": "AstPath", - "typeAnnotation": null, "optional": false } }, @@ -38788,7 +37665,6 @@ "ctxt": 0 }, "value": "getTokenizationOffset", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -38809,6 +37685,7 @@ "ctxt": 0 }, "value": "script", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -38833,7 +37710,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -38844,14 +37720,12 @@ "ctxt": 0 }, "value": "Script", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } }, { @@ -38870,6 +37744,7 @@ "ctxt": 0 }, "value": "position", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -38886,8 +37761,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -38930,8 +37804,8 @@ "ctxt": 0 }, "value": "bestOffset", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -38971,8 +37845,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -38990,6 +37864,7 @@ "ctxt": 0 }, "value": "cur", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -39014,7 +37889,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -39025,14 +37899,12 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -39042,6 +37914,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -39066,7 +37939,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -39077,14 +37949,12 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -39094,6 +37964,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -39118,7 +37989,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -39129,14 +37999,12 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -39176,7 +38044,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -39187,7 +38054,6 @@ "ctxt": 0 }, "value": "isValidAstNode", - "typeAnnotation": null, "optional": false }, "computed": false @@ -39203,7 +38069,6 @@ "ctxt": 0 }, "value": "cur", - "typeAnnotation": null, "optional": false } } @@ -39248,7 +38113,6 @@ "ctxt": 0 }, "value": "cur", - "typeAnnotation": null, "optional": false }, "property": { @@ -39259,7 +38123,6 @@ "ctxt": 0 }, "value": "minChar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -39272,7 +38135,6 @@ "ctxt": 0 }, "value": "position", - "typeAnnotation": null, "optional": false } }, @@ -39307,8 +38169,8 @@ "ctxt": 0 }, "value": "bestOffset", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -39325,7 +38187,6 @@ "ctxt": 0 }, "value": "max", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -39339,7 +38200,6 @@ "ctxt": 0 }, "value": "bestOffset", - "typeAnnotation": null, "optional": false } }, @@ -39360,7 +38220,6 @@ "ctxt": 0 }, "value": "cur", - "typeAnnotation": null, "optional": false }, "property": { @@ -39371,7 +38230,6 @@ "ctxt": 0 }, "value": "minChar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -39424,7 +38282,6 @@ "ctxt": 0 }, "value": "cur", - "typeAnnotation": null, "optional": false }, "property": { @@ -39435,7 +38292,6 @@ "ctxt": 0 }, "value": "minChar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -39448,7 +38304,6 @@ "ctxt": 0 }, "value": "position", - "typeAnnotation": null, "optional": false } }, @@ -39475,7 +38330,6 @@ "ctxt": 0 }, "value": "cur", - "typeAnnotation": null, "optional": false }, "property": { @@ -39486,7 +38340,6 @@ "ctxt": 0 }, "value": "limChar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -39499,7 +38352,6 @@ "ctxt": 0 }, "value": "bestOffset", - "typeAnnotation": null, "optional": false } } @@ -39549,7 +38401,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -39560,7 +38411,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -39573,7 +38423,6 @@ "ctxt": 0 }, "value": "goChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -39612,7 +38461,6 @@ "ctxt": 0 }, "value": "cur", - "typeAnnotation": null, "optional": false } } @@ -39645,7 +38493,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -39656,7 +38503,6 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false } }, @@ -39711,7 +38557,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -39722,7 +38567,6 @@ "ctxt": 0 }, "value": "getAstWalkerFactory", - "typeAnnotation": null, "optional": false }, "computed": false @@ -39738,7 +38582,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -39754,7 +38597,6 @@ "ctxt": 0 }, "value": "script", - "typeAnnotation": null, "optional": false } }, @@ -39768,7 +38610,6 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, "optional": false } } @@ -39791,7 +38632,6 @@ "ctxt": 0 }, "value": "bestOffset", - "typeAnnotation": null, "optional": false } } @@ -39836,7 +38676,6 @@ "ctxt": 0 }, "value": "walkAST", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -39857,6 +38696,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -39881,7 +38721,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -39892,14 +38731,12 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } }, { @@ -39918,6 +38755,7 @@ "ctxt": 0 }, "value": "callback", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -39941,6 +38779,7 @@ "ctxt": 0 }, "value": "path", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -39963,13 +38802,11 @@ "ctxt": 0 }, "value": "AstPath", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -39979,6 +38816,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -40003,7 +38841,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -40014,14 +38851,12 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -40043,8 +38878,7 @@ } } } - }, - "optional": false + } } } ], @@ -40087,8 +38921,8 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -40110,6 +38944,7 @@ "ctxt": 0 }, "value": "cur", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -40134,7 +38969,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -40145,14 +38979,12 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } }, { @@ -40171,6 +39003,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -40195,7 +39028,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -40206,14 +39038,12 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } }, { @@ -40232,6 +39062,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -40256,7 +39087,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -40267,14 +39097,12 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } } ], @@ -40317,6 +39145,7 @@ "ctxt": 0 }, "value": "path", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -40341,7 +39170,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -40352,14 +39180,12 @@ "ctxt": 0 }, "value": "AstPath", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -40376,7 +39202,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -40387,7 +39212,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "computed": false @@ -40425,7 +39249,6 @@ "ctxt": 0 }, "value": "path", - "typeAnnotation": null, "optional": false }, "property": { @@ -40436,7 +39259,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -40452,7 +39274,6 @@ "ctxt": 0 }, "value": "cur", - "typeAnnotation": null, "optional": false } } @@ -40482,7 +39303,6 @@ "ctxt": 0 }, "value": "callback", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -40496,7 +39316,6 @@ "ctxt": 0 }, "value": "path", - "typeAnnotation": null, "optional": false } }, @@ -40510,7 +39329,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false } } @@ -40533,7 +39351,6 @@ "ctxt": 0 }, "value": "cur", - "typeAnnotation": null, "optional": false } } @@ -40573,8 +39390,8 @@ "ctxt": 0 }, "value": "post", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -40596,6 +39413,7 @@ "ctxt": 0 }, "value": "cur", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -40620,7 +39438,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -40631,14 +39448,12 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } }, { @@ -40657,6 +39472,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -40681,7 +39497,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -40692,14 +39507,12 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } }, { @@ -40718,6 +39531,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -40742,7 +39556,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -40753,14 +39566,12 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } } ], @@ -40803,6 +39614,7 @@ "ctxt": 0 }, "value": "path", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -40827,7 +39639,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "right": { @@ -40838,14 +39649,12 @@ "ctxt": 0 }, "value": "AstPath", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -40862,7 +39671,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -40873,7 +39681,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "computed": false @@ -40911,7 +39718,6 @@ "ctxt": 0 }, "value": "path", - "typeAnnotation": null, "optional": false }, "property": { @@ -40922,7 +39728,6 @@ "ctxt": 0 }, "value": "pop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -40946,7 +39751,6 @@ "ctxt": 0 }, "value": "cur", - "typeAnnotation": null, "optional": false } } @@ -40986,8 +39790,8 @@ "ctxt": 0 }, "value": "path", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -41004,7 +39808,6 @@ "ctxt": 0 }, "value": "AstPath", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -41057,7 +39860,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -41068,7 +39870,6 @@ "ctxt": 0 }, "value": "getAstWalkerFactory", - "typeAnnotation": null, "optional": false }, "computed": false @@ -41084,7 +39885,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -41100,7 +39900,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } }, @@ -41114,7 +39913,6 @@ "ctxt": 0 }, "value": "pre", - "typeAnnotation": null, "optional": false } }, @@ -41128,7 +39926,6 @@ "ctxt": 0 }, "value": "post", - "typeAnnotation": null, "optional": false } }, @@ -41153,7 +39950,6 @@ "ctxt": 0 }, "value": "path", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource2/input.ts.json index f720b75ab4d0..82f8c61fc1a4 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource2/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "hasFlag", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -72,6 +70,7 @@ "ctxt": 0 }, "value": "val", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -88,8 +87,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -108,6 +106,7 @@ "ctxt": 0 }, "value": "flag", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -124,8 +123,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -181,7 +179,6 @@ "ctxt": 0 }, "value": "val", - "typeAnnotation": null, "optional": false }, "right": { @@ -192,7 +189,6 @@ "ctxt": 0 }, "value": "flag", - "typeAnnotation": null, "optional": false } } @@ -240,7 +236,6 @@ "ctxt": 0 }, "value": "ErrorRecoverySet", - "typeAnnotation": null, "optional": false }, "members": [ @@ -259,7 +254,6 @@ "ctxt": 0 }, "value": "None", - "typeAnnotation": null, "optional": false }, "init": { @@ -287,7 +281,6 @@ "ctxt": 0 }, "value": "Comma", - "typeAnnotation": null, "optional": false }, "init": { @@ -315,7 +308,6 @@ "ctxt": 0 }, "value": "SColon", - "typeAnnotation": null, "optional": false }, "init": { @@ -361,7 +353,6 @@ "ctxt": 0 }, "value": "Asg", - "typeAnnotation": null, "optional": false }, "init": { @@ -407,7 +398,6 @@ "ctxt": 0 }, "value": "BinOp", - "typeAnnotation": null, "optional": false }, "init": { @@ -453,7 +443,6 @@ "ctxt": 0 }, "value": "RBrack", - "typeAnnotation": null, "optional": false }, "init": { @@ -499,7 +488,6 @@ "ctxt": 0 }, "value": "RCurly", - "typeAnnotation": null, "optional": false }, "init": { @@ -545,7 +533,6 @@ "ctxt": 0 }, "value": "RParen", - "typeAnnotation": null, "optional": false }, "init": { @@ -591,7 +578,6 @@ "ctxt": 0 }, "value": "Dot", - "typeAnnotation": null, "optional": false }, "init": { @@ -637,7 +623,6 @@ "ctxt": 0 }, "value": "Colon", - "typeAnnotation": null, "optional": false }, "init": { @@ -683,7 +668,6 @@ "ctxt": 0 }, "value": "PrimType", - "typeAnnotation": null, "optional": false }, "init": { @@ -729,7 +713,6 @@ "ctxt": 0 }, "value": "AddOp", - "typeAnnotation": null, "optional": false }, "init": { @@ -775,7 +758,6 @@ "ctxt": 0 }, "value": "LCurly", - "typeAnnotation": null, "optional": false }, "init": { @@ -821,7 +803,6 @@ "ctxt": 0 }, "value": "PreOp", - "typeAnnotation": null, "optional": false }, "init": { @@ -867,7 +848,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "init": { @@ -913,7 +893,6 @@ "ctxt": 0 }, "value": "LParen", - "typeAnnotation": null, "optional": false }, "init": { @@ -959,7 +938,6 @@ "ctxt": 0 }, "value": "LBrack", - "typeAnnotation": null, "optional": false }, "init": { @@ -1005,7 +983,6 @@ "ctxt": 0 }, "value": "Scope", - "typeAnnotation": null, "optional": false }, "init": { @@ -1051,7 +1028,6 @@ "ctxt": 0 }, "value": "In", - "typeAnnotation": null, "optional": false }, "init": { @@ -1097,7 +1073,6 @@ "ctxt": 0 }, "value": "SCase", - "typeAnnotation": null, "optional": false }, "init": { @@ -1143,7 +1118,6 @@ "ctxt": 0 }, "value": "Else", - "typeAnnotation": null, "optional": false }, "init": { @@ -1189,7 +1163,6 @@ "ctxt": 0 }, "value": "Catch", - "typeAnnotation": null, "optional": false }, "init": { @@ -1235,7 +1208,6 @@ "ctxt": 0 }, "value": "Var", - "typeAnnotation": null, "optional": false }, "init": { @@ -1281,7 +1253,6 @@ "ctxt": 0 }, "value": "Stmt", - "typeAnnotation": null, "optional": false }, "init": { @@ -1327,7 +1298,6 @@ "ctxt": 0 }, "value": "While", - "typeAnnotation": null, "optional": false }, "init": { @@ -1373,7 +1343,6 @@ "ctxt": 0 }, "value": "ID", - "typeAnnotation": null, "optional": false }, "init": { @@ -1419,7 +1388,6 @@ "ctxt": 0 }, "value": "Prefix", - "typeAnnotation": null, "optional": false }, "init": { @@ -1465,7 +1433,6 @@ "ctxt": 0 }, "value": "Literal", - "typeAnnotation": null, "optional": false }, "init": { @@ -1511,7 +1478,6 @@ "ctxt": 0 }, "value": "RLit", - "typeAnnotation": null, "optional": false }, "init": { @@ -1557,7 +1523,6 @@ "ctxt": 0 }, "value": "Func", - "typeAnnotation": null, "optional": false }, "init": { @@ -1603,7 +1568,6 @@ "ctxt": 0 }, "value": "EOF", - "typeAnnotation": null, "optional": false }, "init": { @@ -1649,7 +1613,6 @@ "ctxt": 0 }, "value": "TypeScriptS", - "typeAnnotation": null, "optional": false }, "init": { @@ -1695,7 +1658,6 @@ "ctxt": 0 }, "value": "ExprStart", - "typeAnnotation": null, "optional": false }, "init": { @@ -1794,7 +1756,6 @@ "ctxt": 0 }, "value": "SColon", - "typeAnnotation": null, "optional": false }, "right": { @@ -1805,7 +1766,6 @@ "ctxt": 0 }, "value": "AddOp", - "typeAnnotation": null, "optional": false } }, @@ -1817,7 +1777,6 @@ "ctxt": 0 }, "value": "LCurly", - "typeAnnotation": null, "optional": false } }, @@ -1829,7 +1788,6 @@ "ctxt": 0 }, "value": "PreOp", - "typeAnnotation": null, "optional": false } }, @@ -1841,7 +1799,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false } }, @@ -1853,7 +1810,6 @@ "ctxt": 0 }, "value": "LParen", - "typeAnnotation": null, "optional": false } }, @@ -1865,7 +1821,6 @@ "ctxt": 0 }, "value": "LBrack", - "typeAnnotation": null, "optional": false } }, @@ -1877,7 +1832,6 @@ "ctxt": 0 }, "value": "ID", - "typeAnnotation": null, "optional": false } }, @@ -1889,7 +1843,6 @@ "ctxt": 0 }, "value": "Prefix", - "typeAnnotation": null, "optional": false } }, @@ -1901,7 +1854,6 @@ "ctxt": 0 }, "value": "RLit", - "typeAnnotation": null, "optional": false } }, @@ -1913,7 +1865,6 @@ "ctxt": 0 }, "value": "Func", - "typeAnnotation": null, "optional": false } }, @@ -1925,7 +1876,6 @@ "ctxt": 0 }, "value": "Literal", - "typeAnnotation": null, "optional": false } } @@ -1945,7 +1895,6 @@ "ctxt": 0 }, "value": "StmtStart", - "typeAnnotation": null, "optional": false }, "init": { @@ -1996,7 +1945,6 @@ "ctxt": 0 }, "value": "ExprStart", - "typeAnnotation": null, "optional": false }, "right": { @@ -2007,7 +1955,6 @@ "ctxt": 0 }, "value": "SColon", - "typeAnnotation": null, "optional": false } }, @@ -2019,7 +1966,6 @@ "ctxt": 0 }, "value": "Var", - "typeAnnotation": null, "optional": false } }, @@ -2031,7 +1977,6 @@ "ctxt": 0 }, "value": "Stmt", - "typeAnnotation": null, "optional": false } }, @@ -2043,7 +1988,6 @@ "ctxt": 0 }, "value": "While", - "typeAnnotation": null, "optional": false } }, @@ -2055,7 +1999,6 @@ "ctxt": 0 }, "value": "TypeScriptS", - "typeAnnotation": null, "optional": false } } @@ -2075,7 +2018,6 @@ "ctxt": 0 }, "value": "Postfix", - "typeAnnotation": null, "optional": false }, "init": { @@ -2102,7 +2044,6 @@ "ctxt": 0 }, "value": "Dot", - "typeAnnotation": null, "optional": false }, "right": { @@ -2113,7 +2054,6 @@ "ctxt": 0 }, "value": "LParen", - "typeAnnotation": null, "optional": false } }, @@ -2125,7 +2065,6 @@ "ctxt": 0 }, "value": "LBrack", - "typeAnnotation": null, "optional": false } } @@ -2157,7 +2096,6 @@ "ctxt": 0 }, "value": "AllowedElements", - "typeAnnotation": null, "optional": false }, "members": [ @@ -2176,7 +2114,6 @@ "ctxt": 0 }, "value": "None", - "typeAnnotation": null, "optional": false }, "init": { @@ -2204,7 +2141,6 @@ "ctxt": 0 }, "value": "ModuleDeclarations", - "typeAnnotation": null, "optional": false }, "init": { @@ -2250,7 +2186,6 @@ "ctxt": 0 }, "value": "ClassDeclarations", - "typeAnnotation": null, "optional": false }, "init": { @@ -2296,7 +2231,6 @@ "ctxt": 0 }, "value": "InterfaceDeclarations", - "typeAnnotation": null, "optional": false }, "init": { @@ -2342,7 +2276,6 @@ "ctxt": 0 }, "value": "AmbientDeclarations", - "typeAnnotation": null, "optional": false }, "init": { @@ -2388,7 +2321,6 @@ "ctxt": 0 }, "value": "Properties", - "typeAnnotation": null, "optional": false }, "init": { @@ -2434,7 +2366,6 @@ "ctxt": 0 }, "value": "Global", - "typeAnnotation": null, "optional": false }, "init": { @@ -2469,7 +2400,6 @@ "ctxt": 0 }, "value": "ModuleDeclarations", - "typeAnnotation": null, "optional": false }, "right": { @@ -2480,7 +2410,6 @@ "ctxt": 0 }, "value": "ClassDeclarations", - "typeAnnotation": null, "optional": false } }, @@ -2492,7 +2421,6 @@ "ctxt": 0 }, "value": "InterfaceDeclarations", - "typeAnnotation": null, "optional": false } }, @@ -2504,7 +2432,6 @@ "ctxt": 0 }, "value": "AmbientDeclarations", - "typeAnnotation": null, "optional": false } } @@ -2524,7 +2451,6 @@ "ctxt": 0 }, "value": "QuickParse", - "typeAnnotation": null, "optional": false }, "init": { @@ -2543,7 +2469,6 @@ "ctxt": 0 }, "value": "Global", - "typeAnnotation": null, "optional": false }, "right": { @@ -2554,7 +2479,6 @@ "ctxt": 0 }, "value": "Properties", - "typeAnnotation": null, "optional": false } } @@ -2586,7 +2510,6 @@ "ctxt": 0 }, "value": "Modifiers", - "typeAnnotation": null, "optional": false }, "members": [ @@ -2605,7 +2528,6 @@ "ctxt": 0 }, "value": "None", - "typeAnnotation": null, "optional": false }, "init": { @@ -2633,7 +2555,6 @@ "ctxt": 0 }, "value": "Private", - "typeAnnotation": null, "optional": false }, "init": { @@ -2661,7 +2582,6 @@ "ctxt": 0 }, "value": "Public", - "typeAnnotation": null, "optional": false }, "init": { @@ -2707,7 +2627,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "init": { @@ -2753,7 +2672,6 @@ "ctxt": 0 }, "value": "Ambient", - "typeAnnotation": null, "optional": false }, "init": { @@ -2799,7 +2717,6 @@ "ctxt": 0 }, "value": "Exported", - "typeAnnotation": null, "optional": false }, "init": { @@ -2845,7 +2762,6 @@ "ctxt": 0 }, "value": "Getter", - "typeAnnotation": null, "optional": false }, "init": { @@ -2891,7 +2807,6 @@ "ctxt": 0 }, "value": "Setter", - "typeAnnotation": null, "optional": false }, "init": { @@ -2937,7 +2852,6 @@ "ctxt": 0 }, "value": "Static", - "typeAnnotation": null, "optional": false }, "init": { @@ -2995,7 +2909,6 @@ "ctxt": 0 }, "value": "ASTFlags", - "typeAnnotation": null, "optional": false }, "members": [ @@ -3014,7 +2927,6 @@ "ctxt": 0 }, "value": "None", - "typeAnnotation": null, "optional": false }, "init": { @@ -3042,7 +2954,6 @@ "ctxt": 0 }, "value": "ExplicitSemicolon", - "typeAnnotation": null, "optional": false }, "init": { @@ -3070,7 +2981,6 @@ "ctxt": 0 }, "value": "AutomaticSemicolon", - "typeAnnotation": null, "optional": false }, "init": { @@ -3116,7 +3026,6 @@ "ctxt": 0 }, "value": "Writeable", - "typeAnnotation": null, "optional": false }, "init": { @@ -3162,7 +3071,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "init": { @@ -3208,7 +3116,6 @@ "ctxt": 0 }, "value": "DotLHSPartial", - "typeAnnotation": null, "optional": false }, "init": { @@ -3254,7 +3161,6 @@ "ctxt": 0 }, "value": "DotLHS", - "typeAnnotation": null, "optional": false }, "init": { @@ -3300,7 +3206,6 @@ "ctxt": 0 }, "value": "IsStatement", - "typeAnnotation": null, "optional": false }, "init": { @@ -3346,7 +3251,6 @@ "ctxt": 0 }, "value": "StrictMode", - "typeAnnotation": null, "optional": false }, "init": { @@ -3392,7 +3296,6 @@ "ctxt": 0 }, "value": "PossibleOptionalParameter", - "typeAnnotation": null, "optional": false }, "init": { @@ -3438,7 +3341,6 @@ "ctxt": 0 }, "value": "ClassBaseConstructorCall", - "typeAnnotation": null, "optional": false }, "init": { @@ -3484,7 +3386,6 @@ "ctxt": 0 }, "value": "OptionalName", - "typeAnnotation": null, "optional": false }, "init": { @@ -3530,7 +3431,6 @@ "ctxt": 0 }, "value": "SkipNextRParen", - "typeAnnotation": null, "optional": false }, "init": { @@ -3588,7 +3488,6 @@ "ctxt": 0 }, "value": "DeclFlags", - "typeAnnotation": null, "optional": false }, "members": [ @@ -3607,7 +3506,6 @@ "ctxt": 0 }, "value": "None", - "typeAnnotation": null, "optional": false }, "init": { @@ -3635,7 +3533,6 @@ "ctxt": 0 }, "value": "Exported", - "typeAnnotation": null, "optional": false }, "init": { @@ -3663,7 +3560,6 @@ "ctxt": 0 }, "value": "Private", - "typeAnnotation": null, "optional": false }, "init": { @@ -3709,7 +3605,6 @@ "ctxt": 0 }, "value": "Public", - "typeAnnotation": null, "optional": false }, "init": { @@ -3755,7 +3650,6 @@ "ctxt": 0 }, "value": "Ambient", - "typeAnnotation": null, "optional": false }, "init": { @@ -3801,7 +3695,6 @@ "ctxt": 0 }, "value": "Static", - "typeAnnotation": null, "optional": false }, "init": { @@ -3847,7 +3740,6 @@ "ctxt": 0 }, "value": "LocalStatic", - "typeAnnotation": null, "optional": false }, "init": { @@ -3893,7 +3785,6 @@ "ctxt": 0 }, "value": "GetAccessor", - "typeAnnotation": null, "optional": false }, "init": { @@ -3939,7 +3830,6 @@ "ctxt": 0 }, "value": "SetAccessor", - "typeAnnotation": null, "optional": false }, "init": { @@ -3997,7 +3887,6 @@ "ctxt": 0 }, "value": "ModuleFlags", - "typeAnnotation": null, "optional": false }, "members": [ @@ -4016,7 +3905,6 @@ "ctxt": 0 }, "value": "None", - "typeAnnotation": null, "optional": false }, "init": { @@ -4044,7 +3932,6 @@ "ctxt": 0 }, "value": "Exported", - "typeAnnotation": null, "optional": false }, "init": { @@ -4072,7 +3959,6 @@ "ctxt": 0 }, "value": "Private", - "typeAnnotation": null, "optional": false }, "init": { @@ -4118,7 +4004,6 @@ "ctxt": 0 }, "value": "Public", - "typeAnnotation": null, "optional": false }, "init": { @@ -4164,7 +4049,6 @@ "ctxt": 0 }, "value": "Ambient", - "typeAnnotation": null, "optional": false }, "init": { @@ -4210,7 +4094,6 @@ "ctxt": 0 }, "value": "Static", - "typeAnnotation": null, "optional": false }, "init": { @@ -4256,7 +4139,6 @@ "ctxt": 0 }, "value": "LocalStatic", - "typeAnnotation": null, "optional": false }, "init": { @@ -4302,7 +4184,6 @@ "ctxt": 0 }, "value": "GetAccessor", - "typeAnnotation": null, "optional": false }, "init": { @@ -4348,7 +4229,6 @@ "ctxt": 0 }, "value": "SetAccessor", - "typeAnnotation": null, "optional": false }, "init": { @@ -4394,7 +4274,6 @@ "ctxt": 0 }, "value": "IsEnum", - "typeAnnotation": null, "optional": false }, "init": { @@ -4440,7 +4319,6 @@ "ctxt": 0 }, "value": "ShouldEmitModuleDecl", - "typeAnnotation": null, "optional": false }, "init": { @@ -4486,7 +4364,6 @@ "ctxt": 0 }, "value": "IsWholeFile", - "typeAnnotation": null, "optional": false }, "init": { @@ -4532,7 +4409,6 @@ "ctxt": 0 }, "value": "IsDynamic", - "typeAnnotation": null, "optional": false }, "init": { @@ -4578,7 +4454,6 @@ "ctxt": 0 }, "value": "MustCaptureThis", - "typeAnnotation": null, "optional": false }, "init": { @@ -4636,7 +4511,6 @@ "ctxt": 0 }, "value": "SymbolFlags", - "typeAnnotation": null, "optional": false }, "members": [ @@ -4655,7 +4529,6 @@ "ctxt": 0 }, "value": "None", - "typeAnnotation": null, "optional": false }, "init": { @@ -4683,7 +4556,6 @@ "ctxt": 0 }, "value": "Exported", - "typeAnnotation": null, "optional": false }, "init": { @@ -4711,7 +4583,6 @@ "ctxt": 0 }, "value": "Private", - "typeAnnotation": null, "optional": false }, "init": { @@ -4757,7 +4628,6 @@ "ctxt": 0 }, "value": "Public", - "typeAnnotation": null, "optional": false }, "init": { @@ -4803,7 +4673,6 @@ "ctxt": 0 }, "value": "Ambient", - "typeAnnotation": null, "optional": false }, "init": { @@ -4849,7 +4718,6 @@ "ctxt": 0 }, "value": "Static", - "typeAnnotation": null, "optional": false }, "init": { @@ -4895,7 +4763,6 @@ "ctxt": 0 }, "value": "LocalStatic", - "typeAnnotation": null, "optional": false }, "init": { @@ -4941,7 +4808,6 @@ "ctxt": 0 }, "value": "GetAccessor", - "typeAnnotation": null, "optional": false }, "init": { @@ -4987,7 +4853,6 @@ "ctxt": 0 }, "value": "SetAccessor", - "typeAnnotation": null, "optional": false }, "init": { @@ -5033,7 +4898,6 @@ "ctxt": 0 }, "value": "Property", - "typeAnnotation": null, "optional": false }, "init": { @@ -5079,7 +4943,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "init": { @@ -5125,7 +4988,6 @@ "ctxt": 0 }, "value": "ModuleMember", - "typeAnnotation": null, "optional": false }, "init": { @@ -5171,7 +5033,6 @@ "ctxt": 0 }, "value": "InterfaceMember", - "typeAnnotation": null, "optional": false }, "init": { @@ -5217,7 +5078,6 @@ "ctxt": 0 }, "value": "ClassMember", - "typeAnnotation": null, "optional": false }, "init": { @@ -5263,7 +5123,6 @@ "ctxt": 0 }, "value": "BuiltIn", - "typeAnnotation": null, "optional": false }, "init": { @@ -5309,7 +5168,6 @@ "ctxt": 0 }, "value": "TypeSetDuringScopeAssignment", - "typeAnnotation": null, "optional": false }, "init": { @@ -5355,7 +5213,6 @@ "ctxt": 0 }, "value": "Constant", - "typeAnnotation": null, "optional": false }, "init": { @@ -5401,7 +5258,6 @@ "ctxt": 0 }, "value": "Optional", - "typeAnnotation": null, "optional": false }, "init": { @@ -5447,7 +5303,6 @@ "ctxt": 0 }, "value": "RecursivelyReferenced", - "typeAnnotation": null, "optional": false }, "init": { @@ -5493,7 +5348,6 @@ "ctxt": 0 }, "value": "Bound", - "typeAnnotation": null, "optional": false }, "init": { @@ -5539,7 +5393,6 @@ "ctxt": 0 }, "value": "CompilerGenerated", - "typeAnnotation": null, "optional": false }, "init": { @@ -5597,7 +5450,6 @@ "ctxt": 0 }, "value": "VarFlags", - "typeAnnotation": null, "optional": false }, "members": [ @@ -5616,7 +5468,6 @@ "ctxt": 0 }, "value": "None", - "typeAnnotation": null, "optional": false }, "init": { @@ -5644,7 +5495,6 @@ "ctxt": 0 }, "value": "Exported", - "typeAnnotation": null, "optional": false }, "init": { @@ -5672,7 +5522,6 @@ "ctxt": 0 }, "value": "Private", - "typeAnnotation": null, "optional": false }, "init": { @@ -5718,7 +5567,6 @@ "ctxt": 0 }, "value": "Public", - "typeAnnotation": null, "optional": false }, "init": { @@ -5764,7 +5612,6 @@ "ctxt": 0 }, "value": "Ambient", - "typeAnnotation": null, "optional": false }, "init": { @@ -5810,7 +5657,6 @@ "ctxt": 0 }, "value": "Static", - "typeAnnotation": null, "optional": false }, "init": { @@ -5856,7 +5702,6 @@ "ctxt": 0 }, "value": "LocalStatic", - "typeAnnotation": null, "optional": false }, "init": { @@ -5902,7 +5747,6 @@ "ctxt": 0 }, "value": "GetAccessor", - "typeAnnotation": null, "optional": false }, "init": { @@ -5948,7 +5792,6 @@ "ctxt": 0 }, "value": "SetAccessor", - "typeAnnotation": null, "optional": false }, "init": { @@ -5994,7 +5837,6 @@ "ctxt": 0 }, "value": "AutoInit", - "typeAnnotation": null, "optional": false }, "init": { @@ -6040,7 +5882,6 @@ "ctxt": 0 }, "value": "Property", - "typeAnnotation": null, "optional": false }, "init": { @@ -6086,7 +5927,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "init": { @@ -6132,7 +5972,6 @@ "ctxt": 0 }, "value": "Class", - "typeAnnotation": null, "optional": false }, "init": { @@ -6178,7 +6017,6 @@ "ctxt": 0 }, "value": "ClassProperty", - "typeAnnotation": null, "optional": false }, "init": { @@ -6224,7 +6062,6 @@ "ctxt": 0 }, "value": "ClassBodyProperty", - "typeAnnotation": null, "optional": false }, "init": { @@ -6270,7 +6107,6 @@ "ctxt": 0 }, "value": "ClassConstructorProperty", - "typeAnnotation": null, "optional": false }, "init": { @@ -6316,7 +6152,6 @@ "ctxt": 0 }, "value": "ClassSuperMustBeFirstCallInConstructor", - "typeAnnotation": null, "optional": false }, "init": { @@ -6362,7 +6197,6 @@ "ctxt": 0 }, "value": "Constant", - "typeAnnotation": null, "optional": false }, "init": { @@ -6408,7 +6242,6 @@ "ctxt": 0 }, "value": "MustCaptureThis", - "typeAnnotation": null, "optional": false }, "init": { @@ -6466,7 +6299,6 @@ "ctxt": 0 }, "value": "FncFlags", - "typeAnnotation": null, "optional": false }, "members": [ @@ -6485,7 +6317,6 @@ "ctxt": 0 }, "value": "None", - "typeAnnotation": null, "optional": false }, "init": { @@ -6513,7 +6344,6 @@ "ctxt": 0 }, "value": "Exported", - "typeAnnotation": null, "optional": false }, "init": { @@ -6541,7 +6371,6 @@ "ctxt": 0 }, "value": "Private", - "typeAnnotation": null, "optional": false }, "init": { @@ -6587,7 +6416,6 @@ "ctxt": 0 }, "value": "Public", - "typeAnnotation": null, "optional": false }, "init": { @@ -6633,7 +6461,6 @@ "ctxt": 0 }, "value": "Ambient", - "typeAnnotation": null, "optional": false }, "init": { @@ -6679,7 +6506,6 @@ "ctxt": 0 }, "value": "Static", - "typeAnnotation": null, "optional": false }, "init": { @@ -6725,7 +6551,6 @@ "ctxt": 0 }, "value": "LocalStatic", - "typeAnnotation": null, "optional": false }, "init": { @@ -6771,7 +6596,6 @@ "ctxt": 0 }, "value": "GetAccessor", - "typeAnnotation": null, "optional": false }, "init": { @@ -6817,7 +6641,6 @@ "ctxt": 0 }, "value": "SetAccessor", - "typeAnnotation": null, "optional": false }, "init": { @@ -6863,7 +6686,6 @@ "ctxt": 0 }, "value": "Definition", - "typeAnnotation": null, "optional": false }, "init": { @@ -6909,7 +6731,6 @@ "ctxt": 0 }, "value": "Signature", - "typeAnnotation": null, "optional": false }, "init": { @@ -6955,7 +6776,6 @@ "ctxt": 0 }, "value": "Method", - "typeAnnotation": null, "optional": false }, "init": { @@ -7001,7 +6821,6 @@ "ctxt": 0 }, "value": "HasReturnExpression", - "typeAnnotation": null, "optional": false }, "init": { @@ -7047,7 +6866,6 @@ "ctxt": 0 }, "value": "CallMember", - "typeAnnotation": null, "optional": false }, "init": { @@ -7093,7 +6911,6 @@ "ctxt": 0 }, "value": "ConstructMember", - "typeAnnotation": null, "optional": false }, "init": { @@ -7139,7 +6956,6 @@ "ctxt": 0 }, "value": "HasSelfReference", - "typeAnnotation": null, "optional": false }, "init": { @@ -7185,7 +7001,6 @@ "ctxt": 0 }, "value": "IsFatArrowFunction", - "typeAnnotation": null, "optional": false }, "init": { @@ -7231,7 +7046,6 @@ "ctxt": 0 }, "value": "IndexerMember", - "typeAnnotation": null, "optional": false }, "init": { @@ -7277,7 +7091,6 @@ "ctxt": 0 }, "value": "IsFunctionExpression", - "typeAnnotation": null, "optional": false }, "init": { @@ -7323,7 +7136,6 @@ "ctxt": 0 }, "value": "ClassMethod", - "typeAnnotation": null, "optional": false }, "init": { @@ -7369,7 +7181,6 @@ "ctxt": 0 }, "value": "ClassPropertyMethodExported", - "typeAnnotation": null, "optional": false }, "init": { @@ -7427,7 +7238,6 @@ "ctxt": 0 }, "value": "SignatureFlags", - "typeAnnotation": null, "optional": false }, "members": [ @@ -7446,7 +7256,6 @@ "ctxt": 0 }, "value": "None", - "typeAnnotation": null, "optional": false }, "init": { @@ -7474,7 +7283,6 @@ "ctxt": 0 }, "value": "IsIndexer", - "typeAnnotation": null, "optional": false }, "init": { @@ -7502,7 +7310,6 @@ "ctxt": 0 }, "value": "IsStringIndexer", - "typeAnnotation": null, "optional": false }, "init": { @@ -7548,7 +7355,6 @@ "ctxt": 0 }, "value": "IsNumberIndexer", - "typeAnnotation": null, "optional": false }, "init": { @@ -7599,7 +7405,6 @@ "ctxt": 0 }, "value": "ToDeclFlags", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7620,6 +7425,7 @@ "ctxt": 0 }, "value": "fncFlags", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7642,13 +7448,11 @@ "ctxt": 0 }, "value": "FncFlags", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -7684,7 +7488,6 @@ "ctxt": 0 }, "value": "DeclFlags", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7709,7 +7512,6 @@ "ctxt": 0 }, "value": "ToDeclFlags", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7730,6 +7532,7 @@ "ctxt": 0 }, "value": "varFlags", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7752,13 +7555,11 @@ "ctxt": 0 }, "value": "VarFlags", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -7794,7 +7595,6 @@ "ctxt": 0 }, "value": "DeclFlags", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7819,7 +7619,6 @@ "ctxt": 0 }, "value": "ToDeclFlags", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7840,6 +7639,7 @@ "ctxt": 0 }, "value": "symFlags", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7862,13 +7662,11 @@ "ctxt": 0 }, "value": "SymbolFlags", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -7904,7 +7702,6 @@ "ctxt": 0 }, "value": "DeclFlags", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7929,7 +7726,6 @@ "ctxt": 0 }, "value": "ToDeclFlags", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7950,6 +7746,7 @@ "ctxt": 0 }, "value": "moduleFlags", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7972,13 +7769,11 @@ "ctxt": 0 }, "value": "ModuleFlags", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -8014,7 +7809,6 @@ "ctxt": 0 }, "value": "DeclFlags", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8039,7 +7833,6 @@ "ctxt": 0 }, "value": "ToDeclFlags", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8060,6 +7853,7 @@ "ctxt": 0 }, "value": "fncOrVarOrSymbolOrModuleFlags", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8076,8 +7870,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -8117,7 +7910,6 @@ "ctxt": 0 }, "value": "fncOrVarOrSymbolOrModuleFlags", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -8135,7 +7927,6 @@ "ctxt": 0 }, "value": "DeclFlags", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8174,7 +7965,6 @@ "ctxt": 0 }, "value": "TypeFlags", - "typeAnnotation": null, "optional": false }, "members": [ @@ -8193,7 +7983,6 @@ "ctxt": 0 }, "value": "None", - "typeAnnotation": null, "optional": false }, "init": { @@ -8221,7 +8010,6 @@ "ctxt": 0 }, "value": "HasImplementation", - "typeAnnotation": null, "optional": false }, "init": { @@ -8249,7 +8037,6 @@ "ctxt": 0 }, "value": "HasSelfReference", - "typeAnnotation": null, "optional": false }, "init": { @@ -8295,7 +8082,6 @@ "ctxt": 0 }, "value": "MergeResult", - "typeAnnotation": null, "optional": false }, "init": { @@ -8341,7 +8127,6 @@ "ctxt": 0 }, "value": "IsEnum", - "typeAnnotation": null, "optional": false }, "init": { @@ -8387,7 +8172,6 @@ "ctxt": 0 }, "value": "BuildingName", - "typeAnnotation": null, "optional": false }, "init": { @@ -8433,7 +8217,6 @@ "ctxt": 0 }, "value": "HasBaseType", - "typeAnnotation": null, "optional": false }, "init": { @@ -8479,7 +8262,6 @@ "ctxt": 0 }, "value": "HasBaseTypeOfObject", - "typeAnnotation": null, "optional": false }, "init": { @@ -8525,7 +8307,6 @@ "ctxt": 0 }, "value": "IsClass", - "typeAnnotation": null, "optional": false }, "init": { @@ -8583,7 +8364,6 @@ "ctxt": 0 }, "value": "TypeRelationshipFlags", - "typeAnnotation": null, "optional": false }, "members": [ @@ -8602,7 +8382,6 @@ "ctxt": 0 }, "value": "SuccessfulComparison", - "typeAnnotation": null, "optional": false }, "init": { @@ -8630,7 +8409,6 @@ "ctxt": 0 }, "value": "SourceIsNullTargetIsVoidOrUndefined", - "typeAnnotation": null, "optional": false }, "init": { @@ -8658,7 +8436,6 @@ "ctxt": 0 }, "value": "RequiredPropertyIsMissing", - "typeAnnotation": null, "optional": false }, "init": { @@ -8704,7 +8481,6 @@ "ctxt": 0 }, "value": "IncompatibleSignatures", - "typeAnnotation": null, "optional": false }, "init": { @@ -8750,7 +8526,6 @@ "ctxt": 0 }, "value": "SourceSignatureHasTooManyParameters", - "typeAnnotation": null, "optional": false }, "init": { @@ -8778,7 +8553,6 @@ "ctxt": 0 }, "value": "IncompatibleReturnTypes", - "typeAnnotation": null, "optional": false }, "init": { @@ -8824,7 +8598,6 @@ "ctxt": 0 }, "value": "IncompatiblePropertyTypes", - "typeAnnotation": null, "optional": false }, "init": { @@ -8870,7 +8643,6 @@ "ctxt": 0 }, "value": "IncompatibleParameterTypes", - "typeAnnotation": null, "optional": false }, "init": { @@ -8928,7 +8700,6 @@ "ctxt": 0 }, "value": "CodeGenTarget", - "typeAnnotation": null, "optional": false }, "members": [ @@ -8947,7 +8718,6 @@ "ctxt": 0 }, "value": "ES3", - "typeAnnotation": null, "optional": false }, "init": { @@ -8975,7 +8745,6 @@ "ctxt": 0 }, "value": "ES5", - "typeAnnotation": null, "optional": false }, "init": { @@ -9015,7 +8784,6 @@ "ctxt": 0 }, "value": "ModuleGenTarget", - "typeAnnotation": null, "optional": false }, "members": [ @@ -9034,7 +8802,6 @@ "ctxt": 0 }, "value": "Synchronous", - "typeAnnotation": null, "optional": false }, "init": { @@ -9062,7 +8829,6 @@ "ctxt": 0 }, "value": "Asynchronous", - "typeAnnotation": null, "optional": false }, "init": { @@ -9090,7 +8856,6 @@ "ctxt": 0 }, "value": "Local", - "typeAnnotation": null, "optional": false }, "init": { @@ -9156,6 +8921,7 @@ "ctxt": 0 }, "value": "codeGenTarget", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9178,13 +8944,11 @@ "ctxt": 0 }, "value": "CodeGenTarget", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -9201,7 +8965,6 @@ "ctxt": 0 }, "value": "CodeGenTarget", - "typeAnnotation": null, "optional": false }, "property": { @@ -9212,7 +8975,6 @@ "ctxt": 0 }, "value": "ES3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9254,6 +9016,7 @@ "ctxt": 0 }, "value": "moduleGenTarget", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9276,13 +9039,11 @@ "ctxt": 0 }, "value": "ModuleGenTarget", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -9299,7 +9060,6 @@ "ctxt": 0 }, "value": "ModuleGenTarget", - "typeAnnotation": null, "optional": false }, "property": { @@ -9310,7 +9070,6 @@ "ctxt": 0 }, "value": "Synchronous", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9352,8 +9111,8 @@ "ctxt": 0 }, "value": "optimizeModuleCodeGen", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -9386,7 +9145,6 @@ "ctxt": 0 }, "value": "flagsToString", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9407,8 +9165,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -9427,6 +9185,7 @@ "ctxt": 0 }, "value": "flags", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9443,8 +9202,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -9487,8 +9245,8 @@ "ctxt": 0 }, "value": "builder", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -9540,8 +9298,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -9572,7 +9330,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "right": { @@ -9627,8 +9384,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -9646,7 +9403,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "right": { @@ -9706,7 +9462,6 @@ "ctxt": 0 }, "value": "flags", - "typeAnnotation": null, "optional": false }, "right": { @@ -9717,7 +9472,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -9772,8 +9526,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -9788,7 +9542,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "body": { @@ -9829,7 +9582,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "property": { @@ -9840,7 +9592,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -9853,7 +9604,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -9895,7 +9645,6 @@ "ctxt": 0 }, "value": "builder", - "typeAnnotation": null, "optional": false }, "property": { @@ -9906,7 +9655,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9952,8 +9700,8 @@ "ctxt": 0 }, "value": "builder", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -9998,8 +9746,8 @@ "ctxt": 0 }, "value": "builder", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -10009,7 +9757,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false } } @@ -10052,7 +9799,6 @@ "ctxt": 0 }, "value": "builder", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource3/input.ts.json index bd15ed88b2ca..1fd53a256e8a 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource3/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "body": { @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "members": [ @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "None", - "typeAnnotation": null, "optional": false }, "init": null @@ -97,7 +94,6 @@ "ctxt": 0 }, "value": "Empty", - "typeAnnotation": null, "optional": false }, "init": null @@ -117,7 +113,6 @@ "ctxt": 0 }, "value": "EmptyExpr", - "typeAnnotation": null, "optional": false }, "init": null @@ -137,7 +132,6 @@ "ctxt": 0 }, "value": "True", - "typeAnnotation": null, "optional": false }, "init": null @@ -157,7 +151,6 @@ "ctxt": 0 }, "value": "False", - "typeAnnotation": null, "optional": false }, "init": null @@ -177,7 +170,6 @@ "ctxt": 0 }, "value": "This", - "typeAnnotation": null, "optional": false }, "init": null @@ -197,7 +189,6 @@ "ctxt": 0 }, "value": "Super", - "typeAnnotation": null, "optional": false }, "init": null @@ -217,7 +208,6 @@ "ctxt": 0 }, "value": "QString", - "typeAnnotation": null, "optional": false }, "init": null @@ -237,7 +227,6 @@ "ctxt": 0 }, "value": "Regex", - "typeAnnotation": null, "optional": false }, "init": null @@ -257,7 +246,6 @@ "ctxt": 0 }, "value": "Null", - "typeAnnotation": null, "optional": false }, "init": null @@ -277,7 +265,6 @@ "ctxt": 0 }, "value": "ArrayLit", - "typeAnnotation": null, "optional": false }, "init": null @@ -297,7 +284,6 @@ "ctxt": 0 }, "value": "ObjectLit", - "typeAnnotation": null, "optional": false }, "init": null @@ -317,7 +303,6 @@ "ctxt": 0 }, "value": "Void", - "typeAnnotation": null, "optional": false }, "init": null @@ -337,7 +322,6 @@ "ctxt": 0 }, "value": "Comma", - "typeAnnotation": null, "optional": false }, "init": null @@ -357,7 +341,6 @@ "ctxt": 0 }, "value": "Pos", - "typeAnnotation": null, "optional": false }, "init": null @@ -377,7 +360,6 @@ "ctxt": 0 }, "value": "Neg", - "typeAnnotation": null, "optional": false }, "init": null @@ -397,7 +379,6 @@ "ctxt": 0 }, "value": "Delete", - "typeAnnotation": null, "optional": false }, "init": null @@ -417,7 +398,6 @@ "ctxt": 0 }, "value": "Await", - "typeAnnotation": null, "optional": false }, "init": null @@ -437,7 +417,6 @@ "ctxt": 0 }, "value": "In", - "typeAnnotation": null, "optional": false }, "init": null @@ -457,7 +436,6 @@ "ctxt": 0 }, "value": "Dot", - "typeAnnotation": null, "optional": false }, "init": null @@ -477,7 +455,6 @@ "ctxt": 0 }, "value": "From", - "typeAnnotation": null, "optional": false }, "init": null @@ -497,7 +474,6 @@ "ctxt": 0 }, "value": "Is", - "typeAnnotation": null, "optional": false }, "init": null @@ -517,7 +493,6 @@ "ctxt": 0 }, "value": "InstOf", - "typeAnnotation": null, "optional": false }, "init": null @@ -537,7 +512,6 @@ "ctxt": 0 }, "value": "Typeof", - "typeAnnotation": null, "optional": false }, "init": null @@ -557,7 +531,6 @@ "ctxt": 0 }, "value": "NumberLit", - "typeAnnotation": null, "optional": false }, "init": null @@ -577,7 +550,6 @@ "ctxt": 0 }, "value": "Name", - "typeAnnotation": null, "optional": false }, "init": null @@ -597,7 +569,6 @@ "ctxt": 0 }, "value": "TypeRef", - "typeAnnotation": null, "optional": false }, "init": null @@ -617,7 +588,6 @@ "ctxt": 0 }, "value": "Index", - "typeAnnotation": null, "optional": false }, "init": null @@ -637,7 +607,6 @@ "ctxt": 0 }, "value": "Call", - "typeAnnotation": null, "optional": false }, "init": null @@ -657,7 +626,6 @@ "ctxt": 0 }, "value": "New", - "typeAnnotation": null, "optional": false }, "init": null @@ -677,7 +645,6 @@ "ctxt": 0 }, "value": "Asg", - "typeAnnotation": null, "optional": false }, "init": null @@ -697,7 +664,6 @@ "ctxt": 0 }, "value": "AsgAdd", - "typeAnnotation": null, "optional": false }, "init": null @@ -717,7 +683,6 @@ "ctxt": 0 }, "value": "AsgSub", - "typeAnnotation": null, "optional": false }, "init": null @@ -737,7 +702,6 @@ "ctxt": 0 }, "value": "AsgDiv", - "typeAnnotation": null, "optional": false }, "init": null @@ -757,7 +721,6 @@ "ctxt": 0 }, "value": "AsgMul", - "typeAnnotation": null, "optional": false }, "init": null @@ -777,7 +740,6 @@ "ctxt": 0 }, "value": "AsgMod", - "typeAnnotation": null, "optional": false }, "init": null @@ -797,7 +759,6 @@ "ctxt": 0 }, "value": "AsgAnd", - "typeAnnotation": null, "optional": false }, "init": null @@ -817,7 +778,6 @@ "ctxt": 0 }, "value": "AsgXor", - "typeAnnotation": null, "optional": false }, "init": null @@ -837,7 +797,6 @@ "ctxt": 0 }, "value": "AsgOr", - "typeAnnotation": null, "optional": false }, "init": null @@ -857,7 +816,6 @@ "ctxt": 0 }, "value": "AsgLsh", - "typeAnnotation": null, "optional": false }, "init": null @@ -877,7 +835,6 @@ "ctxt": 0 }, "value": "AsgRsh", - "typeAnnotation": null, "optional": false }, "init": null @@ -897,7 +854,6 @@ "ctxt": 0 }, "value": "AsgRs2", - "typeAnnotation": null, "optional": false }, "init": null @@ -917,7 +873,6 @@ "ctxt": 0 }, "value": "ConditionalExpression", - "typeAnnotation": null, "optional": false }, "init": null @@ -937,7 +892,6 @@ "ctxt": 0 }, "value": "LogOr", - "typeAnnotation": null, "optional": false }, "init": null @@ -957,7 +911,6 @@ "ctxt": 0 }, "value": "LogAnd", - "typeAnnotation": null, "optional": false }, "init": null @@ -977,7 +930,6 @@ "ctxt": 0 }, "value": "Or", - "typeAnnotation": null, "optional": false }, "init": null @@ -997,7 +949,6 @@ "ctxt": 0 }, "value": "Xor", - "typeAnnotation": null, "optional": false }, "init": null @@ -1017,7 +968,6 @@ "ctxt": 0 }, "value": "And", - "typeAnnotation": null, "optional": false }, "init": null @@ -1037,7 +987,6 @@ "ctxt": 0 }, "value": "Eq", - "typeAnnotation": null, "optional": false }, "init": null @@ -1057,7 +1006,6 @@ "ctxt": 0 }, "value": "Ne", - "typeAnnotation": null, "optional": false }, "init": null @@ -1077,7 +1025,6 @@ "ctxt": 0 }, "value": "Eqv", - "typeAnnotation": null, "optional": false }, "init": null @@ -1097,7 +1044,6 @@ "ctxt": 0 }, "value": "NEqv", - "typeAnnotation": null, "optional": false }, "init": null @@ -1117,7 +1063,6 @@ "ctxt": 0 }, "value": "Lt", - "typeAnnotation": null, "optional": false }, "init": null @@ -1137,7 +1082,6 @@ "ctxt": 0 }, "value": "Le", - "typeAnnotation": null, "optional": false }, "init": null @@ -1157,7 +1101,6 @@ "ctxt": 0 }, "value": "Gt", - "typeAnnotation": null, "optional": false }, "init": null @@ -1177,7 +1120,6 @@ "ctxt": 0 }, "value": "Ge", - "typeAnnotation": null, "optional": false }, "init": null @@ -1197,7 +1139,6 @@ "ctxt": 0 }, "value": "Add", - "typeAnnotation": null, "optional": false }, "init": null @@ -1217,7 +1158,6 @@ "ctxt": 0 }, "value": "Sub", - "typeAnnotation": null, "optional": false }, "init": null @@ -1237,7 +1177,6 @@ "ctxt": 0 }, "value": "Mul", - "typeAnnotation": null, "optional": false }, "init": null @@ -1257,7 +1196,6 @@ "ctxt": 0 }, "value": "Div", - "typeAnnotation": null, "optional": false }, "init": null @@ -1277,7 +1215,6 @@ "ctxt": 0 }, "value": "Mod", - "typeAnnotation": null, "optional": false }, "init": null @@ -1297,7 +1234,6 @@ "ctxt": 0 }, "value": "Lsh", - "typeAnnotation": null, "optional": false }, "init": null @@ -1317,7 +1253,6 @@ "ctxt": 0 }, "value": "Rsh", - "typeAnnotation": null, "optional": false }, "init": null @@ -1337,7 +1272,6 @@ "ctxt": 0 }, "value": "Rs2", - "typeAnnotation": null, "optional": false }, "init": null @@ -1357,7 +1291,6 @@ "ctxt": 0 }, "value": "Not", - "typeAnnotation": null, "optional": false }, "init": null @@ -1377,7 +1310,6 @@ "ctxt": 0 }, "value": "LogNot", - "typeAnnotation": null, "optional": false }, "init": null @@ -1397,7 +1329,6 @@ "ctxt": 0 }, "value": "IncPre", - "typeAnnotation": null, "optional": false }, "init": null @@ -1417,7 +1348,6 @@ "ctxt": 0 }, "value": "DecPre", - "typeAnnotation": null, "optional": false }, "init": null @@ -1437,7 +1367,6 @@ "ctxt": 0 }, "value": "IncPost", - "typeAnnotation": null, "optional": false }, "init": null @@ -1457,7 +1386,6 @@ "ctxt": 0 }, "value": "DecPost", - "typeAnnotation": null, "optional": false }, "init": null @@ -1477,7 +1405,6 @@ "ctxt": 0 }, "value": "TypeAssertion", - "typeAnnotation": null, "optional": false }, "init": null @@ -1497,7 +1424,6 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false }, "init": null @@ -1517,7 +1443,6 @@ "ctxt": 0 }, "value": "Member", - "typeAnnotation": null, "optional": false }, "init": null @@ -1537,7 +1462,6 @@ "ctxt": 0 }, "value": "VarDecl", - "typeAnnotation": null, "optional": false }, "init": null @@ -1557,7 +1481,6 @@ "ctxt": 0 }, "value": "ArgDecl", - "typeAnnotation": null, "optional": false }, "init": null @@ -1577,7 +1500,6 @@ "ctxt": 0 }, "value": "Return", - "typeAnnotation": null, "optional": false }, "init": null @@ -1597,7 +1519,6 @@ "ctxt": 0 }, "value": "Break", - "typeAnnotation": null, "optional": false }, "init": null @@ -1617,7 +1538,6 @@ "ctxt": 0 }, "value": "Continue", - "typeAnnotation": null, "optional": false }, "init": null @@ -1637,7 +1557,6 @@ "ctxt": 0 }, "value": "Throw", - "typeAnnotation": null, "optional": false }, "init": null @@ -1657,7 +1576,6 @@ "ctxt": 0 }, "value": "For", - "typeAnnotation": null, "optional": false }, "init": null @@ -1677,7 +1595,6 @@ "ctxt": 0 }, "value": "ForIn", - "typeAnnotation": null, "optional": false }, "init": null @@ -1697,7 +1614,6 @@ "ctxt": 0 }, "value": "If", - "typeAnnotation": null, "optional": false }, "init": null @@ -1717,7 +1633,6 @@ "ctxt": 0 }, "value": "While", - "typeAnnotation": null, "optional": false }, "init": null @@ -1737,7 +1652,6 @@ "ctxt": 0 }, "value": "DoWhile", - "typeAnnotation": null, "optional": false }, "init": null @@ -1757,7 +1671,6 @@ "ctxt": 0 }, "value": "Block", - "typeAnnotation": null, "optional": false }, "init": null @@ -1777,7 +1690,6 @@ "ctxt": 0 }, "value": "Case", - "typeAnnotation": null, "optional": false }, "init": null @@ -1797,7 +1709,6 @@ "ctxt": 0 }, "value": "Switch", - "typeAnnotation": null, "optional": false }, "init": null @@ -1817,7 +1728,6 @@ "ctxt": 0 }, "value": "Try", - "typeAnnotation": null, "optional": false }, "init": null @@ -1837,7 +1747,6 @@ "ctxt": 0 }, "value": "TryCatch", - "typeAnnotation": null, "optional": false }, "init": null @@ -1857,7 +1766,6 @@ "ctxt": 0 }, "value": "TryFinally", - "typeAnnotation": null, "optional": false }, "init": null @@ -1877,7 +1785,6 @@ "ctxt": 0 }, "value": "Finally", - "typeAnnotation": null, "optional": false }, "init": null @@ -1897,7 +1804,6 @@ "ctxt": 0 }, "value": "Catch", - "typeAnnotation": null, "optional": false }, "init": null @@ -1917,7 +1823,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "init": null @@ -1937,7 +1842,6 @@ "ctxt": 0 }, "value": "Script", - "typeAnnotation": null, "optional": false }, "init": null @@ -1957,7 +1861,6 @@ "ctxt": 0 }, "value": "ClassDeclaration", - "typeAnnotation": null, "optional": false }, "init": null @@ -1977,7 +1880,6 @@ "ctxt": 0 }, "value": "InterfaceDeclaration", - "typeAnnotation": null, "optional": false }, "init": null @@ -1997,7 +1899,6 @@ "ctxt": 0 }, "value": "ModuleDeclaration", - "typeAnnotation": null, "optional": false }, "init": null @@ -2017,7 +1918,6 @@ "ctxt": 0 }, "value": "ImportDeclaration", - "typeAnnotation": null, "optional": false }, "init": null @@ -2037,7 +1937,6 @@ "ctxt": 0 }, "value": "With", - "typeAnnotation": null, "optional": false }, "init": null @@ -2057,7 +1956,6 @@ "ctxt": 0 }, "value": "Label", - "typeAnnotation": null, "optional": false }, "init": null @@ -2077,7 +1975,6 @@ "ctxt": 0 }, "value": "LabeledStatement", - "typeAnnotation": null, "optional": false }, "init": null @@ -2097,7 +1994,6 @@ "ctxt": 0 }, "value": "EBStart", - "typeAnnotation": null, "optional": false }, "init": null @@ -2117,7 +2013,6 @@ "ctxt": 0 }, "value": "GotoEB", - "typeAnnotation": null, "optional": false }, "init": null @@ -2137,7 +2032,6 @@ "ctxt": 0 }, "value": "EndCode", - "typeAnnotation": null, "optional": false }, "init": null @@ -2157,7 +2051,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "init": null @@ -2177,7 +2070,6 @@ "ctxt": 0 }, "value": "Comment", - "typeAnnotation": null, "optional": false }, "init": null @@ -2197,7 +2089,6 @@ "ctxt": 0 }, "value": "Debugger", - "typeAnnotation": null, "optional": false }, "init": null @@ -2217,7 +2108,6 @@ "ctxt": 0 }, "value": "GeneralNode", - "typeAnnotation": null, "optional": false }, "init": { @@ -2228,7 +2118,6 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false } }, @@ -2247,7 +2136,6 @@ "ctxt": 0 }, "value": "LastAsg", - "typeAnnotation": null, "optional": false }, "init": { @@ -2258,7 +2146,6 @@ "ctxt": 0 }, "value": "AsgRs2", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource5/input.ts.json index 427a4f502ed2..fa5f9078ee38 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource5/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "PrintContext", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "builder", - "typeAnnotation": null, "optional": false }, "value": { @@ -120,7 +117,6 @@ "ctxt": 0 }, "value": "indent1", - "typeAnnotation": null, "optional": false }, "value": { @@ -163,7 +159,6 @@ "ctxt": 0 }, "value": "indentStrings", - "typeAnnotation": null, "optional": false }, "value": { @@ -225,7 +220,6 @@ "ctxt": 0 }, "value": "indentAmt", - "typeAnnotation": null, "optional": false }, "value": { @@ -263,7 +257,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -285,6 +278,7 @@ "ctxt": 0 }, "value": "outfile", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -307,13 +301,11 @@ "ctxt": 0 }, "value": "ITextWriter", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -334,6 +326,7 @@ "ctxt": 0 }, "value": "parser", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -356,13 +349,11 @@ "ctxt": 0 }, "value": "Parser", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -393,7 +384,6 @@ "ctxt": 0 }, "value": "increaseIndent", - "typeAnnotation": null, "optional": false }, "function": { @@ -451,7 +441,6 @@ "ctxt": 0 }, "value": "indentAmt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -486,7 +475,6 @@ "ctxt": 0 }, "value": "decreaseIndent", - "typeAnnotation": null, "optional": false }, "function": { @@ -544,7 +532,6 @@ "ctxt": 0 }, "value": "indentAmt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -579,7 +566,6 @@ "ctxt": 0 }, "value": "startLine", - "typeAnnotation": null, "optional": false }, "function": { @@ -643,7 +629,6 @@ "ctxt": 0 }, "value": "builder", - "typeAnnotation": null, "optional": false }, "computed": false @@ -656,7 +641,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -708,7 +692,6 @@ "ctxt": 0 }, "value": "CompilerDiagnostics", - "typeAnnotation": null, "optional": false }, "property": { @@ -719,7 +702,6 @@ "ctxt": 0 }, "value": "Alert", - "typeAnnotation": null, "optional": false }, "computed": false @@ -750,7 +732,6 @@ "ctxt": 0 }, "value": "builder", - "typeAnnotation": null, "optional": false }, "computed": false @@ -789,8 +770,8 @@ "ctxt": 0 }, "value": "indentString", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -822,7 +803,6 @@ "ctxt": 0 }, "value": "indentStrings", - "typeAnnotation": null, "optional": false }, "computed": false @@ -850,7 +830,6 @@ "ctxt": 0 }, "value": "indentAmt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -884,7 +863,6 @@ "ctxt": 0 }, "value": "indentString", - "typeAnnotation": null, "optional": false }, "right": { @@ -895,7 +873,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -930,8 +907,8 @@ "ctxt": 0 }, "value": "indentString", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -981,8 +958,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1013,7 +990,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "right": { @@ -1039,7 +1015,6 @@ "ctxt": 0 }, "value": "indentAmt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1062,7 +1037,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -1097,8 +1071,8 @@ "ctxt": 0 }, "value": "indentString", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1123,7 +1097,6 @@ "ctxt": 0 }, "value": "indent1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1178,7 +1151,6 @@ "ctxt": 0 }, "value": "indentStrings", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1206,7 +1178,6 @@ "ctxt": 0 }, "value": "indentAmt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1221,7 +1192,6 @@ "ctxt": 0 }, "value": "indentString", - "typeAnnotation": null, "optional": false } } @@ -1268,7 +1238,6 @@ "ctxt": 0 }, "value": "builder", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1281,7 +1250,6 @@ "ctxt": 0 }, "value": "indentString", - "typeAnnotation": null, "optional": false } } @@ -1314,7 +1282,6 @@ "ctxt": 0 }, "value": "write", - "typeAnnotation": null, "optional": false }, "function": { @@ -1335,8 +1302,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1392,7 +1359,6 @@ "ctxt": 0 }, "value": "builder", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1405,7 +1371,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -1438,7 +1403,6 @@ "ctxt": 0 }, "value": "writeLine", - "typeAnnotation": null, "optional": false }, "function": { @@ -1459,8 +1423,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1516,7 +1480,6 @@ "ctxt": 0 }, "value": "builder", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1529,7 +1492,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -1578,7 +1540,6 @@ "ctxt": 0 }, "value": "outfile", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1591,7 +1552,6 @@ "ctxt": 0 }, "value": "WriteLine", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1622,7 +1582,6 @@ "ctxt": 0 }, "value": "builder", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1670,7 +1629,6 @@ "ctxt": 0 }, "value": "builder", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1729,7 +1687,6 @@ "ctxt": 0 }, "value": "prePrintAST", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1750,6 +1707,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1772,13 +1730,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1797,6 +1753,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1819,13 +1776,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1844,6 +1799,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1866,13 +1822,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1915,6 +1869,7 @@ "ctxt": 0 }, "value": "pc", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1937,13 +1892,11 @@ "ctxt": 0 }, "value": "PrintContext", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "TsTypeAssertion", @@ -1967,7 +1920,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -1978,7 +1930,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1998,7 +1949,6 @@ "ctxt": 0 }, "value": "PrintContext", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2037,7 +1987,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -2048,7 +1997,6 @@ "ctxt": 0 }, "value": "print", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2064,7 +2012,6 @@ "ctxt": 0 }, "value": "pc", - "typeAnnotation": null, "optional": false } } @@ -2101,7 +2048,6 @@ "ctxt": 0 }, "value": "pc", - "typeAnnotation": null, "optional": false }, "property": { @@ -2112,7 +2058,6 @@ "ctxt": 0 }, "value": "increaseIndent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2136,7 +2081,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } } @@ -2165,7 +2109,6 @@ "ctxt": 0 }, "value": "postPrintAST", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2186,6 +2129,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2208,13 +2152,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2233,6 +2175,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2255,13 +2198,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2280,6 +2221,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2302,13 +2244,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2351,6 +2291,7 @@ "ctxt": 0 }, "value": "pc", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2373,13 +2314,11 @@ "ctxt": 0 }, "value": "PrintContext", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "TsTypeAssertion", @@ -2403,7 +2342,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -2414,7 +2352,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2434,7 +2371,6 @@ "ctxt": 0 }, "value": "PrintContext", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2473,7 +2409,6 @@ "ctxt": 0 }, "value": "pc", - "typeAnnotation": null, "optional": false }, "property": { @@ -2484,7 +2419,6 @@ "ctxt": 0 }, "value": "decreaseIndent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2508,7 +2442,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource6/input.ts.json index 5a9b867ad436..483124426ee6 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource6/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "TypeCollectionContext", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "script", - "typeAnnotation": null, "optional": false }, "value": { @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "Script", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -141,7 +137,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -163,6 +158,7 @@ "ctxt": 0 }, "value": "scopeChain", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -185,13 +181,11 @@ "ctxt": 0 }, "value": "ScopeChain", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -212,6 +206,7 @@ "ctxt": 0 }, "value": "checker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -234,13 +229,11 @@ "ctxt": 0 }, "value": "TypeChecker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -281,7 +274,6 @@ "ctxt": 0 }, "value": "MemberScopeContext", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -307,7 +299,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "value": { @@ -340,7 +331,6 @@ "ctxt": 0 }, "value": "Type", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -371,7 +361,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "value": { @@ -404,7 +393,6 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -435,7 +423,6 @@ "ctxt": 0 }, "value": "scope", - "typeAnnotation": null, "optional": false }, "value": null, @@ -461,7 +448,6 @@ "ctxt": 0 }, "value": "SymbolScope", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -492,7 +478,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "value": { @@ -510,7 +495,6 @@ "ctxt": 0 }, "value": "AstWalkOptions", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -542,7 +526,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -564,6 +547,7 @@ "ctxt": 0 }, "value": "flow", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -586,13 +570,11 @@ "ctxt": 0 }, "value": "TypeFlow", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -613,6 +595,7 @@ "ctxt": 0 }, "value": "pos", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -629,8 +612,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -651,6 +633,7 @@ "ctxt": 0 }, "value": "matchFlag", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -673,13 +656,11 @@ "ctxt": 0 }, "value": "ASTFlags", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -720,7 +701,6 @@ "ctxt": 0 }, "value": "EnclosingScopeContext", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -746,7 +726,6 @@ "ctxt": 0 }, "value": "scopeGetter", - "typeAnnotation": null, "optional": false }, "value": { @@ -795,7 +774,6 @@ "ctxt": 0 }, "value": "SymbolScope", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -828,7 +806,6 @@ "ctxt": 0 }, "value": "objectLiteralScopeGetter", - "typeAnnotation": null, "optional": false }, "value": { @@ -877,7 +854,6 @@ "ctxt": 0 }, "value": "SymbolScope", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -910,7 +886,6 @@ "ctxt": 0 }, "value": "scopeStartAST", - "typeAnnotation": null, "optional": false }, "value": { @@ -943,7 +918,6 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -974,7 +948,6 @@ "ctxt": 0 }, "value": "skipNextFuncDeclForClass", - "typeAnnotation": null, "optional": false }, "value": { @@ -1012,7 +985,6 @@ "ctxt": 0 }, "value": "deepestModuleDecl", - "typeAnnotation": null, "optional": false }, "value": { @@ -1045,7 +1017,6 @@ "ctxt": 0 }, "value": "ModuleDeclaration", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1076,7 +1047,6 @@ "ctxt": 0 }, "value": "enclosingClassDecl", - "typeAnnotation": null, "optional": false }, "value": { @@ -1109,7 +1079,6 @@ "ctxt": 0 }, "value": "TypeDeclaration", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1140,7 +1109,6 @@ "ctxt": 0 }, "value": "enclosingObjectLit", - "typeAnnotation": null, "optional": false }, "value": { @@ -1173,7 +1141,6 @@ "ctxt": 0 }, "value": "UnaryExpression", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1204,7 +1171,6 @@ "ctxt": 0 }, "value": "publicsOnly", - "typeAnnotation": null, "optional": false }, "value": { @@ -1242,7 +1208,6 @@ "ctxt": 0 }, "value": "useFullAst", - "typeAnnotation": null, "optional": false }, "value": { @@ -1280,7 +1245,6 @@ "ctxt": 0 }, "value": "scriptFragment", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1306,7 +1270,6 @@ "ctxt": 0 }, "value": "Script", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1337,7 +1300,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1359,6 +1321,7 @@ "ctxt": 0 }, "value": "logger", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1381,13 +1344,11 @@ "ctxt": 0 }, "value": "ILogger", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1408,6 +1369,7 @@ "ctxt": 0 }, "value": "script", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1430,13 +1392,11 @@ "ctxt": 0 }, "value": "Script", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1457,6 +1417,7 @@ "ctxt": 0 }, "value": "text", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1479,13 +1440,11 @@ "ctxt": 0 }, "value": "ISourceText", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1506,6 +1465,7 @@ "ctxt": 0 }, "value": "pos", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1522,8 +1482,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -1544,6 +1503,7 @@ "ctxt": 0 }, "value": "isMemberCompletion", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1560,8 +1520,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -1592,7 +1551,6 @@ "ctxt": 0 }, "value": "getScope", - "typeAnnotation": null, "optional": false }, "function": { @@ -1648,7 +1606,6 @@ "ctxt": 0 }, "value": "scopeGetter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1684,7 +1641,6 @@ "ctxt": 0 }, "value": "SymbolScope", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1712,7 +1668,6 @@ "ctxt": 0 }, "value": "getObjectLiteralScope", - "typeAnnotation": null, "optional": false }, "function": { @@ -1768,7 +1723,6 @@ "ctxt": 0 }, "value": "objectLiteralScopeGetter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1804,7 +1758,6 @@ "ctxt": 0 }, "value": "SymbolScope", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1832,7 +1785,6 @@ "ctxt": 0 }, "value": "getScopeAST", - "typeAnnotation": null, "optional": false }, "function": { @@ -1881,7 +1833,6 @@ "ctxt": 0 }, "value": "scopeStartAST", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1915,7 +1866,6 @@ "ctxt": 0 }, "value": "getScopePosition", - "typeAnnotation": null, "optional": false }, "function": { @@ -1971,7 +1921,6 @@ "ctxt": 0 }, "value": "scopeStartAST", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1984,7 +1933,6 @@ "ctxt": 0 }, "value": "minChar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2018,7 +1966,6 @@ "ctxt": 0 }, "value": "getScriptFragmentStartAST", - "typeAnnotation": null, "optional": false }, "function": { @@ -2067,7 +2014,6 @@ "ctxt": 0 }, "value": "scopeStartAST", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2100,7 +2046,6 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2128,7 +2073,6 @@ "ctxt": 0 }, "value": "getScriptFragmentPosition", - "typeAnnotation": null, "optional": false }, "function": { @@ -2191,7 +2135,6 @@ "ctxt": 0 }, "value": "getScriptFragmentStartAST", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2207,7 +2150,6 @@ "ctxt": 0 }, "value": "minChar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2257,7 +2199,6 @@ "ctxt": 0 }, "value": "getScriptFragment", - "typeAnnotation": null, "optional": false }, "function": { @@ -2314,7 +2255,6 @@ "ctxt": 0 }, "value": "scriptFragment", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2361,8 +2301,8 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2394,7 +2334,6 @@ "ctxt": 0 }, "value": "getScriptFragmentStartAST", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2431,8 +2370,8 @@ "ctxt": 0 }, "value": "minChar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2449,7 +2388,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -2460,7 +2398,6 @@ "ctxt": 0 }, "value": "minChar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2494,8 +2431,8 @@ "ctxt": 0 }, "value": "limChar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -2534,7 +2471,6 @@ "ctxt": 0 }, "value": "isMemberCompletion", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2562,7 +2498,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2598,7 +2533,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2657,7 +2591,6 @@ "ctxt": 0 }, "value": "scriptFragment", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2691,7 +2624,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -2702,7 +2634,6 @@ "ctxt": 0 }, "value": "quickParse", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2733,7 +2664,6 @@ "ctxt": 0 }, "value": "logger", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2749,7 +2679,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } }, @@ -2778,7 +2707,6 @@ "ctxt": 0 }, "value": "text", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2794,7 +2722,6 @@ "ctxt": 0 }, "value": "minChar", - "typeAnnotation": null, "optional": false } }, @@ -2808,7 +2735,6 @@ "ctxt": 0 }, "value": "limChar", - "typeAnnotation": null, "optional": false } }, @@ -2834,7 +2760,6 @@ "ctxt": 0 }, "value": "Script", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2875,7 +2800,6 @@ "ctxt": 0 }, "value": "scriptFragment", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2908,7 +2832,6 @@ "ctxt": 0 }, "value": "Script", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2946,7 +2869,6 @@ "ctxt": 0 }, "value": "preFindMemberScope", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2967,6 +2889,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2989,13 +2912,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3014,6 +2935,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3036,13 +2958,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3061,6 +2981,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3083,13 +3004,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3132,6 +3051,7 @@ "ctxt": 0 }, "value": "memScope", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3154,13 +3074,11 @@ "ctxt": 0 }, "value": "MemberScopeContext", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -3177,7 +3095,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -3188,7 +3105,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3227,7 +3143,6 @@ "ctxt": 0 }, "value": "hasFlag", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3248,7 +3163,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -3259,7 +3173,6 @@ "ctxt": 0 }, "value": "flags", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3282,7 +3195,6 @@ "ctxt": 0 }, "value": "memScope", - "typeAnnotation": null, "optional": false }, "property": { @@ -3293,7 +3205,6 @@ "ctxt": 0 }, "value": "matchFlag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3347,7 +3258,6 @@ "ctxt": 0 }, "value": "memScope", - "typeAnnotation": null, "optional": false }, "property": { @@ -3358,7 +3268,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3404,7 +3313,6 @@ "ctxt": 0 }, "value": "memScope", - "typeAnnotation": null, "optional": false }, "property": { @@ -3415,7 +3323,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3435,7 +3342,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -3446,7 +3352,6 @@ "ctxt": 0 }, "value": "limChar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3494,7 +3399,6 @@ "ctxt": 0 }, "value": "memScope", - "typeAnnotation": null, "optional": false }, "property": { @@ -3505,7 +3409,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3518,7 +3421,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } } @@ -3568,7 +3470,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -3579,7 +3480,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3624,7 +3524,6 @@ "ctxt": 0 }, "value": "memScope", - "typeAnnotation": null, "optional": false }, "property": { @@ -3635,7 +3534,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3696,7 +3594,6 @@ "ctxt": 0 }, "value": "memScope", - "typeAnnotation": null, "optional": false }, "property": { @@ -3707,7 +3604,6 @@ "ctxt": 0 }, "value": "flow", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3720,7 +3616,6 @@ "ctxt": 0 }, "value": "inScopeTypeCheck", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3736,7 +3631,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } }, @@ -3757,7 +3651,6 @@ "ctxt": 0 }, "value": "memScope", - "typeAnnotation": null, "optional": false }, "property": { @@ -3768,7 +3661,6 @@ "ctxt": 0 }, "value": "scope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3812,7 +3704,6 @@ "ctxt": 0 }, "value": "memScope", - "typeAnnotation": null, "optional": false }, "property": { @@ -3823,7 +3714,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3843,7 +3733,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -3854,7 +3743,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3897,7 +3785,6 @@ "ctxt": 0 }, "value": "memScope", - "typeAnnotation": null, "optional": false }, "property": { @@ -3908,7 +3795,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3921,7 +3807,6 @@ "ctxt": 0 }, "value": "stopWalk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3949,7 +3834,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } } @@ -3978,7 +3862,6 @@ "ctxt": 0 }, "value": "pushTypeCollectionScope", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3999,6 +3882,7 @@ "ctxt": 0 }, "value": "container", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4021,13 +3905,11 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4046,6 +3928,7 @@ "ctxt": 0 }, "value": "valueMembers", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4068,13 +3951,11 @@ "ctxt": 0 }, "value": "ScopedMembers", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4093,6 +3974,7 @@ "ctxt": 0 }, "value": "ambientValueMembers", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4115,13 +3997,11 @@ "ctxt": 0 }, "value": "ScopedMembers", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4140,6 +4020,7 @@ "ctxt": 0 }, "value": "enclosedTypes", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4162,13 +4043,11 @@ "ctxt": 0 }, "value": "ScopedMembers", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4187,6 +4066,7 @@ "ctxt": 0 }, "value": "ambientEnclosedTypes", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4209,13 +4089,11 @@ "ctxt": 0 }, "value": "ScopedMembers", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4234,6 +4112,7 @@ "ctxt": 0 }, "value": "context", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4256,13 +4135,11 @@ "ctxt": 0 }, "value": "TypeCollectionContext", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4281,6 +4158,7 @@ "ctxt": 0 }, "value": "thisType", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4303,13 +4181,11 @@ "ctxt": 0 }, "value": "Type", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4328,6 +4204,7 @@ "ctxt": 0 }, "value": "classType", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4350,13 +4227,11 @@ "ctxt": 0 }, "value": "Type", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4375,6 +4250,7 @@ "ctxt": 0 }, "value": "moduleDecl", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4397,13 +4273,11 @@ "ctxt": 0 }, "value": "ModuleDeclaration", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4446,8 +4320,8 @@ "ctxt": 0 }, "value": "builder", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -4464,7 +4338,6 @@ "ctxt": 0 }, "value": "SymbolScopeBuilder", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4478,7 +4351,6 @@ "ctxt": 0 }, "value": "valueMembers", - "typeAnnotation": null, "optional": false } }, @@ -4492,7 +4364,6 @@ "ctxt": 0 }, "value": "ambientValueMembers", - "typeAnnotation": null, "optional": false } }, @@ -4506,7 +4377,6 @@ "ctxt": 0 }, "value": "enclosedTypes", - "typeAnnotation": null, "optional": false } }, @@ -4520,7 +4390,6 @@ "ctxt": 0 }, "value": "ambientEnclosedTypes", - "typeAnnotation": null, "optional": false } }, @@ -4545,7 +4414,6 @@ "ctxt": 0 }, "value": "container", - "typeAnnotation": null, "optional": false } } @@ -4581,6 +4449,7 @@ "ctxt": 0 }, "value": "chain", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4603,13 +4472,11 @@ "ctxt": 0 }, "value": "ScopeChain", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -4626,7 +4493,6 @@ "ctxt": 0 }, "value": "ScopeChain", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4640,7 +4506,6 @@ "ctxt": 0 }, "value": "container", - "typeAnnotation": null, "optional": false } }, @@ -4661,7 +4526,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -4672,7 +4536,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4688,7 +4551,6 @@ "ctxt": 0 }, "value": "builder", - "typeAnnotation": null, "optional": false } } @@ -4729,7 +4591,6 @@ "ctxt": 0 }, "value": "chain", - "typeAnnotation": null, "optional": false }, "property": { @@ -4740,7 +4601,6 @@ "ctxt": 0 }, "value": "thisType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4753,7 +4613,6 @@ "ctxt": 0 }, "value": "thisType", - "typeAnnotation": null, "optional": false } } @@ -4788,7 +4647,6 @@ "ctxt": 0 }, "value": "chain", - "typeAnnotation": null, "optional": false }, "property": { @@ -4799,7 +4657,6 @@ "ctxt": 0 }, "value": "classType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4812,7 +4669,6 @@ "ctxt": 0 }, "value": "classType", - "typeAnnotation": null, "optional": false } } @@ -4847,7 +4703,6 @@ "ctxt": 0 }, "value": "chain", - "typeAnnotation": null, "optional": false }, "property": { @@ -4858,7 +4713,6 @@ "ctxt": 0 }, "value": "moduleDecl", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4871,7 +4725,6 @@ "ctxt": 0 }, "value": "moduleDecl", - "typeAnnotation": null, "optional": false } } @@ -4906,7 +4759,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -4917,7 +4769,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4930,7 +4781,6 @@ "ctxt": 0 }, "value": "chain", - "typeAnnotation": null, "optional": false } } @@ -4960,7 +4810,6 @@ "ctxt": 0 }, "value": "popTypeCollectionScope", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4981,6 +4830,7 @@ "ctxt": 0 }, "value": "context", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5003,13 +4853,11 @@ "ctxt": 0 }, "value": "TypeCollectionContext", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5057,7 +4905,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -5068,7 +4915,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5095,7 +4941,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -5106,7 +4951,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5119,7 +4963,6 @@ "ctxt": 0 }, "value": "previous", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5151,7 +4994,6 @@ "ctxt": 0 }, "value": "preFindEnclosingScope", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5172,6 +5014,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5194,13 +5037,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -5219,6 +5060,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5241,13 +5083,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -5266,6 +5106,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5288,13 +5129,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5337,6 +5176,7 @@ "ctxt": 0 }, "value": "context", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5359,13 +5199,11 @@ "ctxt": 0 }, "value": "EnclosingScopeContext", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -5382,7 +5220,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -5393,7 +5230,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5427,8 +5263,8 @@ "ctxt": 0 }, "value": "minChar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -5445,7 +5281,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -5456,7 +5291,6 @@ "ctxt": 0 }, "value": "minChar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5490,8 +5324,8 @@ "ctxt": 0 }, "value": "limChar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -5508,7 +5342,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -5519,7 +5352,6 @@ "ctxt": 0 }, "value": "limChar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5566,7 +5398,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -5577,7 +5408,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5597,7 +5427,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -5608,7 +5437,6 @@ "ctxt": 0 }, "value": "Script", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5637,7 +5465,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -5648,7 +5475,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5661,7 +5487,6 @@ "ctxt": 0 }, "value": "limChar", - "typeAnnotation": null, "optional": false } } @@ -5689,8 +5514,8 @@ "ctxt": 0 }, "value": "limChar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -5707,7 +5532,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -5718,7 +5542,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5765,7 +5588,6 @@ "ctxt": 0 }, "value": "minChar", - "typeAnnotation": null, "optional": false }, "right": { @@ -5783,7 +5605,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -5794,7 +5615,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5824,7 +5644,6 @@ "ctxt": 0 }, "value": "limChar", - "typeAnnotation": null, "optional": false }, "right": { @@ -5842,7 +5661,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -5853,7 +5671,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5891,7 +5708,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -5902,7 +5718,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5930,7 +5745,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -5941,7 +5755,6 @@ "ctxt": 0 }, "value": "Script", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5972,8 +5785,8 @@ "ctxt": 0 }, "value": "script", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -5990,7 +5803,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -6008,7 +5820,6 @@ "ctxt": 0 }, "value": "Script", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6048,7 +5859,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -6059,7 +5869,6 @@ "ctxt": 0 }, "value": "scopeGetter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6119,7 +5928,6 @@ "ctxt": 0 }, "value": "script", - "typeAnnotation": null, "optional": false }, "property": { @@ -6130,7 +5938,6 @@ "ctxt": 0 }, "value": "bod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6174,7 +5981,6 @@ "ctxt": 0 }, "value": "script", - "typeAnnotation": null, "optional": false }, "property": { @@ -6185,7 +5991,6 @@ "ctxt": 0 }, "value": "bod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6198,7 +6003,6 @@ "ctxt": 0 }, "value": "enclosingScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6244,7 +6048,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -6255,7 +6058,6 @@ "ctxt": 0 }, "value": "scopeStartAST", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6268,7 +6070,6 @@ "ctxt": 0 }, "value": "script", - "typeAnnotation": null, "optional": false } } @@ -6306,7 +6107,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -6317,7 +6117,6 @@ "ctxt": 0 }, "value": "ClassDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6353,7 +6152,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -6364,7 +6162,6 @@ "ctxt": 0 }, "value": "scopeGetter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6439,7 +6236,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -6450,7 +6246,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6501,7 +6296,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -6512,7 +6306,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6525,7 +6318,6 @@ "ctxt": 0 }, "value": "instanceType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6538,7 +6330,6 @@ "ctxt": 0 }, "value": "containedScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6591,7 +6382,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -6602,7 +6392,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6615,7 +6404,6 @@ "ctxt": 0 }, "value": "instanceType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6628,7 +6416,6 @@ "ctxt": 0 }, "value": "containedScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6674,7 +6461,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -6685,7 +6471,6 @@ "ctxt": 0 }, "value": "scopeStartAST", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6698,7 +6483,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } } @@ -6733,7 +6517,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -6744,7 +6527,6 @@ "ctxt": 0 }, "value": "enclosingClassDecl", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6764,7 +6546,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -6782,7 +6563,6 @@ "ctxt": 0 }, "value": "TypeDeclaration", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6823,7 +6603,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -6834,7 +6613,6 @@ "ctxt": 0 }, "value": "ObjectLit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6865,8 +6643,8 @@ "ctxt": 0 }, "value": "objectLit", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -6883,7 +6661,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -6901,7 +6678,6 @@ "ctxt": 0 }, "value": "UnaryExpression", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6933,7 +6709,6 @@ "ctxt": 0 }, "value": "objectLit", - "typeAnnotation": null, "optional": false }, "property": { @@ -6944,7 +6719,6 @@ "ctxt": 0 }, "value": "targetType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6987,7 +6761,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -6998,7 +6771,6 @@ "ctxt": 0 }, "value": "scopeGetter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7050,7 +6822,6 @@ "ctxt": 0 }, "value": "objectLit", - "typeAnnotation": null, "optional": false }, "property": { @@ -7061,7 +6832,6 @@ "ctxt": 0 }, "value": "targetType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7074,7 +6844,6 @@ "ctxt": 0 }, "value": "containedScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7119,7 +6888,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -7130,7 +6898,6 @@ "ctxt": 0 }, "value": "objectLiteralScopeGetter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7182,7 +6949,6 @@ "ctxt": 0 }, "value": "objectLit", - "typeAnnotation": null, "optional": false }, "property": { @@ -7193,7 +6959,6 @@ "ctxt": 0 }, "value": "targetType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7206,7 +6971,6 @@ "ctxt": 0 }, "value": "memberScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7251,7 +7015,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -7262,7 +7025,6 @@ "ctxt": 0 }, "value": "enclosingObjectLit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7275,7 +7037,6 @@ "ctxt": 0 }, "value": "objectLit", - "typeAnnotation": null, "optional": false } } @@ -7317,7 +7078,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -7328,7 +7088,6 @@ "ctxt": 0 }, "value": "ModuleDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7364,7 +7123,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -7375,7 +7133,6 @@ "ctxt": 0 }, "value": "deepestModuleDecl", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7395,7 +7152,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -7413,7 +7169,6 @@ "ctxt": 0 }, "value": "ModuleDeclaration", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7451,7 +7206,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -7462,7 +7216,6 @@ "ctxt": 0 }, "value": "scopeGetter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7522,7 +7275,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -7533,7 +7285,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7577,7 +7328,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -7588,7 +7338,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7601,7 +7350,6 @@ "ctxt": 0 }, "value": "containedScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7647,7 +7395,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -7658,7 +7405,6 @@ "ctxt": 0 }, "value": "scopeStartAST", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7671,7 +7417,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } } @@ -7709,7 +7454,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -7720,7 +7464,6 @@ "ctxt": 0 }, "value": "InterfaceDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7756,7 +7499,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -7767,7 +7509,6 @@ "ctxt": 0 }, "value": "scopeGetter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7834,7 +7575,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -7845,7 +7585,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7890,7 +7629,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -7901,7 +7639,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7914,7 +7651,6 @@ "ctxt": 0 }, "value": "containedScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7960,7 +7696,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -7971,7 +7706,6 @@ "ctxt": 0 }, "value": "scopeStartAST", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7984,7 +7718,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } } @@ -8022,7 +7755,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -8033,7 +7765,6 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8072,8 +7803,8 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -8090,7 +7821,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -8108,7 +7838,6 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8140,7 +7869,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -8151,7 +7879,6 @@ "ctxt": 0 }, "value": "skipNextFuncDeclForClass", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8194,7 +7921,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -8205,7 +7931,6 @@ "ctxt": 0 }, "value": "skipNextFuncDeclForClass", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8261,7 +7986,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -8272,7 +7996,6 @@ "ctxt": 0 }, "value": "scopeGetter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8325,7 +8048,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -8336,7 +8058,6 @@ "ctxt": 0 }, "value": "isConstructor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8356,7 +8077,6 @@ "ctxt": 0 }, "value": "hasFlag", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8377,7 +8097,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -8388,7 +8107,6 @@ "ctxt": 0 }, "value": "fncFlags", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8411,7 +8129,6 @@ "ctxt": 0 }, "value": "FncFlags", - "typeAnnotation": null, "optional": false }, "property": { @@ -8422,7 +8139,6 @@ "ctxt": 0 }, "value": "ClassMethod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8470,7 +8186,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -8481,7 +8196,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8508,7 +8222,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -8519,7 +8232,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8532,7 +8244,6 @@ "ctxt": 0 }, "value": "enclosingType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8582,7 +8293,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -8593,7 +8303,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8606,7 +8315,6 @@ "ctxt": 0 }, "value": "enclosingType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8619,7 +8327,6 @@ "ctxt": 0 }, "value": "constructorScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8655,7 +8362,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -8666,7 +8372,6 @@ "ctxt": 0 }, "value": "scopeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8708,7 +8413,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -8719,7 +8423,6 @@ "ctxt": 0 }, "value": "scopeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8732,7 +8435,6 @@ "ctxt": 0 }, "value": "containedScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8764,7 +8466,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -8775,7 +8476,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8817,7 +8517,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -8828,7 +8527,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8841,7 +8539,6 @@ "ctxt": 0 }, "value": "containedScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8906,7 +8603,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -8917,7 +8613,6 @@ "ctxt": 0 }, "value": "scopeStartAST", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8930,7 +8625,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } } @@ -8990,7 +8684,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -9001,7 +8694,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9014,7 +8706,6 @@ "ctxt": 0 }, "value": "goChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9077,7 +8768,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -9088,7 +8778,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9101,7 +8790,6 @@ "ctxt": 0 }, "value": "goChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9135,7 +8823,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } } @@ -9164,7 +8851,6 @@ "ctxt": 0 }, "value": "findEnclosingScopeAt", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9185,6 +8871,7 @@ "ctxt": 0 }, "value": "logger", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9207,13 +8894,11 @@ "ctxt": 0 }, "value": "ILogger", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -9232,6 +8917,7 @@ "ctxt": 0 }, "value": "script", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9254,13 +8940,11 @@ "ctxt": 0 }, "value": "Script", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -9279,6 +8963,7 @@ "ctxt": 0 }, "value": "text", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9301,13 +8986,11 @@ "ctxt": 0 }, "value": "ISourceText", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -9326,6 +9009,7 @@ "ctxt": 0 }, "value": "pos", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9342,8 +9026,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -9362,6 +9045,7 @@ "ctxt": 0 }, "value": "isMemberCompletion", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9378,8 +9062,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -9422,8 +9105,8 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -9440,7 +9123,6 @@ "ctxt": 0 }, "value": "EnclosingScopeContext", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9454,7 +9136,6 @@ "ctxt": 0 }, "value": "logger", - "typeAnnotation": null, "optional": false } }, @@ -9468,7 +9149,6 @@ "ctxt": 0 }, "value": "script", - "typeAnnotation": null, "optional": false } }, @@ -9482,7 +9162,6 @@ "ctxt": 0 }, "value": "text", - "typeAnnotation": null, "optional": false } }, @@ -9496,7 +9175,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false } }, @@ -9510,7 +9188,6 @@ "ctxt": 0 }, "value": "isMemberCompletion", - "typeAnnotation": null, "optional": false } } @@ -9564,7 +9241,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -9575,7 +9251,6 @@ "ctxt": 0 }, "value": "getAstWalkerFactory", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9591,7 +9266,6 @@ "ctxt": 0 }, "value": "walk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9607,7 +9281,6 @@ "ctxt": 0 }, "value": "script", - "typeAnnotation": null, "optional": false } }, @@ -9621,7 +9294,6 @@ "ctxt": 0 }, "value": "preFindEnclosingScope", - "typeAnnotation": null, "optional": false } }, @@ -9657,7 +9329,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false } } @@ -9695,7 +9366,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -9706,7 +9376,6 @@ "ctxt": 0 }, "value": "scopeStartAST", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9753,7 +9422,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false } } @@ -9784,7 +9452,6 @@ "ctxt": 0 }, "value": "EnclosingScopeContext", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource8/input.ts.json index d12bfe7a21d1..564262b6fd05 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserRealSource8/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "AssignScopeContext", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -99,6 +96,7 @@ "ctxt": 0 }, "value": "scopeChain", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,13 +119,11 @@ "ctxt": 0 }, "value": "ScopeChain", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -148,6 +144,7 @@ "ctxt": 0 }, "value": "typeFlow", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -170,13 +167,11 @@ "ctxt": 0 }, "value": "TypeFlow", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -197,6 +192,7 @@ "ctxt": 0 }, "value": "modDeclChain", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -226,14 +222,12 @@ "ctxt": 0 }, "value": "ModuleDeclaration", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -274,7 +268,6 @@ "ctxt": 0 }, "value": "pushAssignScope", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -295,6 +288,7 @@ "ctxt": 0 }, "value": "scope", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -317,13 +311,11 @@ "ctxt": 0 }, "value": "SymbolScope", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -342,6 +334,7 @@ "ctxt": 0 }, "value": "context", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -364,13 +357,11 @@ "ctxt": 0 }, "value": "AssignScopeContext", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -389,6 +380,7 @@ "ctxt": 0 }, "value": "type", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -411,13 +403,11 @@ "ctxt": 0 }, "value": "Type", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -436,6 +426,7 @@ "ctxt": 0 }, "value": "classType", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -458,13 +449,11 @@ "ctxt": 0 }, "value": "Type", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -483,6 +472,7 @@ "ctxt": 0 }, "value": "fnc", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,13 +495,11 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -554,8 +542,8 @@ "ctxt": 0 }, "value": "chain", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -572,7 +560,6 @@ "ctxt": 0 }, "value": "ScopeChain", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -604,7 +591,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -615,7 +601,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -631,7 +616,6 @@ "ctxt": 0 }, "value": "scope", - "typeAnnotation": null, "optional": false } } @@ -672,7 +656,6 @@ "ctxt": 0 }, "value": "chain", - "typeAnnotation": null, "optional": false }, "property": { @@ -683,7 +666,6 @@ "ctxt": 0 }, "value": "thisType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -696,7 +678,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false } } @@ -731,7 +712,6 @@ "ctxt": 0 }, "value": "chain", - "typeAnnotation": null, "optional": false }, "property": { @@ -742,7 +722,6 @@ "ctxt": 0 }, "value": "classType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -755,7 +734,6 @@ "ctxt": 0 }, "value": "classType", - "typeAnnotation": null, "optional": false } } @@ -790,7 +768,6 @@ "ctxt": 0 }, "value": "chain", - "typeAnnotation": null, "optional": false }, "property": { @@ -801,7 +778,6 @@ "ctxt": 0 }, "value": "fnc", - "typeAnnotation": null, "optional": false }, "computed": false @@ -814,7 +790,6 @@ "ctxt": 0 }, "value": "fnc", - "typeAnnotation": null, "optional": false } } @@ -849,7 +824,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -860,7 +834,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -873,7 +846,6 @@ "ctxt": 0 }, "value": "chain", - "typeAnnotation": null, "optional": false } } @@ -903,7 +875,6 @@ "ctxt": 0 }, "value": "popAssignScope", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -924,6 +895,7 @@ "ctxt": 0 }, "value": "context", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -946,13 +918,11 @@ "ctxt": 0 }, "value": "AssignScopeContext", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1000,7 +970,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -1011,7 +980,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1038,7 +1006,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -1049,7 +1016,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1062,7 +1028,6 @@ "ctxt": 0 }, "value": "previous", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1094,7 +1059,6 @@ "ctxt": 0 }, "value": "instanceCompare", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1115,6 +1079,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1137,13 +1102,11 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1162,6 +1125,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1184,13 +1148,11 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1253,7 +1215,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1303,7 +1264,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1314,7 +1274,6 @@ "ctxt": 0 }, "value": "isInstanceProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1349,7 +1308,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1378,7 +1336,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1410,7 +1367,6 @@ "ctxt": 0 }, "value": "instanceFilterStop", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1431,6 +1387,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1453,13 +1410,11 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1506,7 +1461,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -1517,7 +1471,6 @@ "ctxt": 0 }, "value": "isInstanceProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1551,7 +1504,6 @@ "ctxt": 0 }, "value": "ScopeSearchFilter", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1577,7 +1529,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1599,6 +1550,7 @@ "ctxt": 0 }, "value": "select", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1622,6 +1574,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1644,13 +1597,11 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1660,6 +1611,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1682,13 +1634,11 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1714,15 +1664,13 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -1743,6 +1691,7 @@ "ctxt": 0 }, "value": "stop", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1766,6 +1715,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1788,13 +1738,11 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1816,8 +1764,7 @@ } } } - }, - "optional": false + } } } ], @@ -1848,7 +1795,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "value": { @@ -1881,7 +1827,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1912,7 +1857,6 @@ "ctxt": 0 }, "value": "reset", - "typeAnnotation": null, "optional": false }, "function": { @@ -1969,7 +1913,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2012,7 +1955,6 @@ "ctxt": 0 }, "value": "update", - "typeAnnotation": null, "optional": false }, "function": { @@ -2033,6 +1975,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2055,13 +1998,11 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2117,7 +2058,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2152,7 +2092,6 @@ "ctxt": 0 }, "value": "select", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2183,7 +2122,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2199,7 +2137,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2238,7 +2175,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2288,7 +2224,6 @@ "ctxt": 0 }, "value": "stop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2319,7 +2254,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2428,8 +2362,8 @@ "ctxt": 0 }, "value": "instanceFilter", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2446,7 +2380,6 @@ "ctxt": 0 }, "value": "ScopeSearchFilter", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2460,7 +2393,6 @@ "ctxt": 0 }, "value": "instanceCompare", - "typeAnnotation": null, "optional": false } }, @@ -2474,7 +2406,6 @@ "ctxt": 0 }, "value": "instanceFilterStop", - "typeAnnotation": null, "optional": false } } @@ -2503,7 +2434,6 @@ "ctxt": 0 }, "value": "preAssignModuleScopes", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2524,6 +2454,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2546,13 +2477,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2571,6 +2500,7 @@ "ctxt": 0 }, "value": "context", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2593,13 +2523,11 @@ "ctxt": 0 }, "value": "AssignScopeContext", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2642,8 +2570,8 @@ "ctxt": 0 }, "value": "moduleDecl", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -2660,7 +2588,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -2678,7 +2605,6 @@ "ctxt": 0 }, "value": "ModuleDeclaration", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2713,6 +2639,7 @@ "ctxt": 0 }, "value": "memberScope", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2735,13 +2662,11 @@ "ctxt": 0 }, "value": "SymbolTableScope", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -2780,6 +2705,7 @@ "ctxt": 0 }, "value": "aggScope", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2802,13 +2728,11 @@ "ctxt": 0 }, "value": "SymbolAggregateScope", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -2852,7 +2776,6 @@ "ctxt": 0 }, "value": "moduleDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -2863,7 +2786,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2883,7 +2805,6 @@ "ctxt": 0 }, "value": "moduleDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -2894,7 +2815,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2945,7 +2865,6 @@ "ctxt": 0 }, "value": "moduleDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -2956,7 +2875,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2969,7 +2887,6 @@ "ctxt": 0 }, "value": "sym", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2996,7 +2913,6 @@ "ctxt": 0 }, "value": "moduleDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -3007,7 +2923,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3020,7 +2935,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3056,8 +2970,8 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3074,7 +2988,6 @@ "ctxt": 0 }, "value": "moduleDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -3085,7 +2998,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3117,7 +3029,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false } }, @@ -3165,8 +3076,8 @@ "ctxt": 0 }, "value": "memberScope", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -3183,7 +3094,6 @@ "ctxt": 0 }, "value": "SymbolTableScope", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3204,7 +3114,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -3215,7 +3124,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3238,7 +3146,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -3249,7 +3156,6 @@ "ctxt": 0 }, "value": "ambientMembers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3272,7 +3178,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -3283,7 +3188,6 @@ "ctxt": 0 }, "value": "enclosedTypes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3306,7 +3210,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -3317,7 +3220,6 @@ "ctxt": 0 }, "value": "ambientEnclosedTypes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3340,7 +3242,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -3351,7 +3252,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3392,7 +3292,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -3403,7 +3302,6 @@ "ctxt": 0 }, "value": "memberScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3416,7 +3314,6 @@ "ctxt": 0 }, "value": "memberScope", - "typeAnnotation": null, "optional": false } } @@ -3457,7 +3354,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -3468,7 +3364,6 @@ "ctxt": 0 }, "value": "modDeclChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3481,7 +3376,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3497,7 +3391,6 @@ "ctxt": 0 }, "value": "moduleDecl", - "typeAnnotation": null, "optional": false } } @@ -3549,7 +3442,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -3560,7 +3452,6 @@ "ctxt": 0 }, "value": "typeFlow", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3573,7 +3464,6 @@ "ctxt": 0 }, "value": "checker", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3586,7 +3476,6 @@ "ctxt": 0 }, "value": "currentModDecl", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3599,7 +3488,6 @@ "ctxt": 0 }, "value": "moduleDecl", - "typeAnnotation": null, "optional": false } } @@ -3627,8 +3515,8 @@ "ctxt": 0 }, "value": "aggScope", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -3645,7 +3533,6 @@ "ctxt": 0 }, "value": "SymbolAggregateScope", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3666,7 +3553,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -3677,7 +3563,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3717,7 +3602,6 @@ "ctxt": 0 }, "value": "aggScope", - "typeAnnotation": null, "optional": false }, "property": { @@ -3728,7 +3612,6 @@ "ctxt": 0 }, "value": "addParentScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3744,7 +3627,6 @@ "ctxt": 0 }, "value": "memberScope", - "typeAnnotation": null, "optional": false } } @@ -3781,7 +3663,6 @@ "ctxt": 0 }, "value": "aggScope", - "typeAnnotation": null, "optional": false }, "property": { @@ -3792,7 +3673,6 @@ "ctxt": 0 }, "value": "addParentScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3822,7 +3702,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -3833,7 +3712,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3846,7 +3724,6 @@ "ctxt": 0 }, "value": "scope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3878,7 +3755,6 @@ "ctxt": 0 }, "value": "pushAssignScope", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3892,7 +3768,6 @@ "ctxt": 0 }, "value": "aggScope", - "typeAnnotation": null, "optional": false } }, @@ -3906,7 +3781,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false } }, @@ -3977,7 +3851,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -3988,7 +3861,6 @@ "ctxt": 0 }, "value": "containedScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4001,7 +3873,6 @@ "ctxt": 0 }, "value": "aggScope", - "typeAnnotation": null, "optional": false } } @@ -4028,7 +3899,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -4039,7 +3909,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4088,7 +3957,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -4099,7 +3967,6 @@ "ctxt": 0 }, "value": "typeFlow", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4112,7 +3979,6 @@ "ctxt": 0 }, "value": "addLocalsFromScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4135,7 +4001,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -4146,7 +4011,6 @@ "ctxt": 0 }, "value": "containedScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4169,7 +4033,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -4180,7 +4043,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4203,7 +4065,6 @@ "ctxt": 0 }, "value": "moduleDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -4214,7 +4075,6 @@ "ctxt": 0 }, "value": "vars", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4244,7 +4104,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -4255,7 +4114,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4268,7 +4126,6 @@ "ctxt": 0 }, "value": "privateMembers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4319,7 +4176,6 @@ "ctxt": 0 }, "value": "preAssignClassScopes", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4340,6 +4196,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4362,13 +4219,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4387,6 +4242,7 @@ "ctxt": 0 }, "value": "context", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4409,13 +4265,11 @@ "ctxt": 0 }, "value": "AssignScopeContext", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4458,8 +4312,8 @@ "ctxt": 0 }, "value": "classDecl", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -4476,7 +4330,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -4494,7 +4347,6 @@ "ctxt": 0 }, "value": "InterfaceDeclaration", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4529,6 +4381,7 @@ "ctxt": 0 }, "value": "memberScope", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4551,13 +4404,11 @@ "ctxt": 0 }, "value": "SymbolTableScope", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -4596,6 +4447,7 @@ "ctxt": 0 }, "value": "aggScope", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4618,13 +4470,11 @@ "ctxt": 0 }, "value": "SymbolAggregateScope", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -4668,7 +4518,6 @@ "ctxt": 0 }, "value": "classDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -4679,7 +4528,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4699,7 +4547,6 @@ "ctxt": 0 }, "value": "classDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -4710,7 +4557,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4761,7 +4607,6 @@ "ctxt": 0 }, "value": "classDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -4772,7 +4617,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4785,7 +4629,6 @@ "ctxt": 0 }, "value": "sym", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4812,7 +4655,6 @@ "ctxt": 0 }, "value": "classDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -4823,7 +4665,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4836,7 +4677,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4872,8 +4712,8 @@ "ctxt": 0 }, "value": "classType", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -4890,7 +4730,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -4901,7 +4740,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4925,7 +4763,6 @@ "ctxt": 0 }, "value": "classType", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -4961,8 +4798,8 @@ "ctxt": 0 }, "value": "classSym", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -4979,7 +4816,6 @@ "ctxt": 0 }, "value": "classType", - "typeAnnotation": null, "optional": false }, "property": { @@ -4990,7 +4826,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5022,8 +4857,8 @@ "ctxt": 0 }, "value": "memberScope", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TsTypeAssertion", @@ -5068,7 +4903,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -5079,7 +4913,6 @@ "ctxt": 0 }, "value": "typeFlow", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5092,7 +4925,6 @@ "ctxt": 0 }, "value": "checker", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5105,7 +4937,6 @@ "ctxt": 0 }, "value": "scopeOf", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5121,7 +4952,6 @@ "ctxt": 0 }, "value": "classType", - "typeAnnotation": null, "optional": false } } @@ -5143,7 +4973,6 @@ "ctxt": 0 }, "value": "SymbolTableScope", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5174,8 +5003,8 @@ "ctxt": 0 }, "value": "aggScope", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -5192,7 +5021,6 @@ "ctxt": 0 }, "value": "SymbolAggregateScope", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5213,7 +5041,6 @@ "ctxt": 0 }, "value": "classType", - "typeAnnotation": null, "optional": false }, "property": { @@ -5224,7 +5051,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5264,7 +5090,6 @@ "ctxt": 0 }, "value": "aggScope", - "typeAnnotation": null, "optional": false }, "property": { @@ -5275,7 +5100,6 @@ "ctxt": 0 }, "value": "addParentScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5291,7 +5115,6 @@ "ctxt": 0 }, "value": "memberScope", - "typeAnnotation": null, "optional": false } } @@ -5328,7 +5151,6 @@ "ctxt": 0 }, "value": "aggScope", - "typeAnnotation": null, "optional": false }, "property": { @@ -5339,7 +5161,6 @@ "ctxt": 0 }, "value": "addParentScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5369,7 +5190,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -5380,7 +5200,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5393,7 +5212,6 @@ "ctxt": 0 }, "value": "scope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5433,7 +5251,6 @@ "ctxt": 0 }, "value": "classType", - "typeAnnotation": null, "optional": false }, "property": { @@ -5444,7 +5261,6 @@ "ctxt": 0 }, "value": "containedScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5457,7 +5273,6 @@ "ctxt": 0 }, "value": "aggScope", - "typeAnnotation": null, "optional": false } } @@ -5492,7 +5307,6 @@ "ctxt": 0 }, "value": "classType", - "typeAnnotation": null, "optional": false }, "property": { @@ -5503,7 +5317,6 @@ "ctxt": 0 }, "value": "memberScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5516,7 +5329,6 @@ "ctxt": 0 }, "value": "memberScope", - "typeAnnotation": null, "optional": false } } @@ -5546,8 +5358,8 @@ "ctxt": 0 }, "value": "instanceType", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -5564,7 +5376,6 @@ "ctxt": 0 }, "value": "classType", - "typeAnnotation": null, "optional": false }, "property": { @@ -5575,7 +5386,6 @@ "ctxt": 0 }, "value": "instanceType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5607,8 +5417,8 @@ "ctxt": 0 }, "value": "memberScope", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TsTypeAssertion", @@ -5653,7 +5463,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -5664,7 +5473,6 @@ "ctxt": 0 }, "value": "typeFlow", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5677,7 +5485,6 @@ "ctxt": 0 }, "value": "checker", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5690,7 +5497,6 @@ "ctxt": 0 }, "value": "scopeOf", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5706,7 +5512,6 @@ "ctxt": 0 }, "value": "instanceType", - "typeAnnotation": null, "optional": false } } @@ -5728,7 +5533,6 @@ "ctxt": 0 }, "value": "SymbolTableScope", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5766,7 +5570,6 @@ "ctxt": 0 }, "value": "instanceType", - "typeAnnotation": null, "optional": false }, "property": { @@ -5777,7 +5580,6 @@ "ctxt": 0 }, "value": "memberScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5790,7 +5592,6 @@ "ctxt": 0 }, "value": "memberScope", - "typeAnnotation": null, "optional": false } } @@ -5818,8 +5619,8 @@ "ctxt": 0 }, "value": "aggScope", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -5836,7 +5637,6 @@ "ctxt": 0 }, "value": "SymbolAggregateScope", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5857,7 +5657,6 @@ "ctxt": 0 }, "value": "instanceType", - "typeAnnotation": null, "optional": false }, "property": { @@ -5868,7 +5667,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5908,7 +5706,6 @@ "ctxt": 0 }, "value": "aggScope", - "typeAnnotation": null, "optional": false }, "property": { @@ -5919,7 +5716,6 @@ "ctxt": 0 }, "value": "addParentScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5949,7 +5745,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -5960,7 +5755,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5973,7 +5767,6 @@ "ctxt": 0 }, "value": "scope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6005,7 +5798,6 @@ "ctxt": 0 }, "value": "pushAssignScope", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6019,7 +5811,6 @@ "ctxt": 0 }, "value": "aggScope", - "typeAnnotation": null, "optional": false } }, @@ -6033,7 +5824,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false } }, @@ -6047,7 +5837,6 @@ "ctxt": 0 }, "value": "instanceType", - "typeAnnotation": null, "optional": false } }, @@ -6061,7 +5850,6 @@ "ctxt": 0 }, "value": "classType", - "typeAnnotation": null, "optional": false } }, @@ -6110,7 +5898,6 @@ "ctxt": 0 }, "value": "instanceType", - "typeAnnotation": null, "optional": false }, "property": { @@ -6121,7 +5908,6 @@ "ctxt": 0 }, "value": "containedScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6134,7 +5920,6 @@ "ctxt": 0 }, "value": "aggScope", - "typeAnnotation": null, "optional": false } } @@ -6179,7 +5964,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -6190,7 +5974,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6217,7 +6000,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -6228,7 +6010,6 @@ "ctxt": 0 }, "value": "typeFlow", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6241,7 +6022,6 @@ "ctxt": 0 }, "value": "anyType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6276,7 +6056,6 @@ "ctxt": 0 }, "value": "preAssignInterfaceScopes", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6297,6 +6076,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6319,13 +6099,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -6344,6 +6122,7 @@ "ctxt": 0 }, "value": "context", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6366,13 +6145,11 @@ "ctxt": 0 }, "value": "AssignScopeContext", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6415,8 +6192,8 @@ "ctxt": 0 }, "value": "interfaceDecl", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -6433,7 +6210,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -6451,7 +6227,6 @@ "ctxt": 0 }, "value": "InterfaceDeclaration", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6486,6 +6261,7 @@ "ctxt": 0 }, "value": "memberScope", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6508,13 +6284,11 @@ "ctxt": 0 }, "value": "SymbolTableScope", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -6553,6 +6327,7 @@ "ctxt": 0 }, "value": "aggScope", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6575,13 +6350,11 @@ "ctxt": 0 }, "value": "SymbolAggregateScope", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -6625,7 +6398,6 @@ "ctxt": 0 }, "value": "interfaceDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -6636,7 +6408,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6656,7 +6427,6 @@ "ctxt": 0 }, "value": "interfaceDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -6667,7 +6437,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6718,7 +6487,6 @@ "ctxt": 0 }, "value": "interfaceDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -6729,7 +6497,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6742,7 +6509,6 @@ "ctxt": 0 }, "value": "sym", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6769,7 +6535,6 @@ "ctxt": 0 }, "value": "interfaceDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -6780,7 +6545,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6793,7 +6557,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6829,8 +6592,8 @@ "ctxt": 0 }, "value": "interfaceType", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -6847,7 +6610,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -6858,7 +6620,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6890,8 +6651,8 @@ "ctxt": 0 }, "value": "memberScope", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TsTypeAssertion", @@ -6936,7 +6697,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -6947,7 +6707,6 @@ "ctxt": 0 }, "value": "typeFlow", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6960,7 +6719,6 @@ "ctxt": 0 }, "value": "checker", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6973,7 +6731,6 @@ "ctxt": 0 }, "value": "scopeOf", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6989,7 +6746,6 @@ "ctxt": 0 }, "value": "interfaceType", - "typeAnnotation": null, "optional": false } } @@ -7011,7 +6767,6 @@ "ctxt": 0 }, "value": "SymbolTableScope", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7049,7 +6804,6 @@ "ctxt": 0 }, "value": "interfaceType", - "typeAnnotation": null, "optional": false }, "property": { @@ -7060,7 +6814,6 @@ "ctxt": 0 }, "value": "memberScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7073,7 +6826,6 @@ "ctxt": 0 }, "value": "memberScope", - "typeAnnotation": null, "optional": false } } @@ -7101,8 +6853,8 @@ "ctxt": 0 }, "value": "aggScope", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -7119,7 +6871,6 @@ "ctxt": 0 }, "value": "SymbolAggregateScope", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7140,7 +6891,6 @@ "ctxt": 0 }, "value": "interfaceType", - "typeAnnotation": null, "optional": false }, "property": { @@ -7151,7 +6901,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7191,7 +6940,6 @@ "ctxt": 0 }, "value": "aggScope", - "typeAnnotation": null, "optional": false }, "property": { @@ -7202,7 +6950,6 @@ "ctxt": 0 }, "value": "addParentScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7218,7 +6965,6 @@ "ctxt": 0 }, "value": "memberScope", - "typeAnnotation": null, "optional": false } } @@ -7255,7 +7001,6 @@ "ctxt": 0 }, "value": "aggScope", - "typeAnnotation": null, "optional": false }, "property": { @@ -7266,7 +7011,6 @@ "ctxt": 0 }, "value": "addParentScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7296,7 +7040,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -7307,7 +7050,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7320,7 +7062,6 @@ "ctxt": 0 }, "value": "scope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7352,7 +7093,6 @@ "ctxt": 0 }, "value": "pushAssignScope", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7366,7 +7106,6 @@ "ctxt": 0 }, "value": "aggScope", - "typeAnnotation": null, "optional": false } }, @@ -7380,7 +7119,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false } }, @@ -7451,7 +7189,6 @@ "ctxt": 0 }, "value": "interfaceType", - "typeAnnotation": null, "optional": false }, "property": { @@ -7462,7 +7199,6 @@ "ctxt": 0 }, "value": "containedScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7475,7 +7211,6 @@ "ctxt": 0 }, "value": "aggScope", - "typeAnnotation": null, "optional": false } } @@ -7505,7 +7240,6 @@ "ctxt": 0 }, "value": "preAssignWithScopes", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7526,6 +7260,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7548,13 +7283,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -7573,6 +7306,7 @@ "ctxt": 0 }, "value": "context", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7595,13 +7329,11 @@ "ctxt": 0 }, "value": "AssignScopeContext", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -7644,8 +7376,8 @@ "ctxt": 0 }, "value": "withStmt", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -7662,7 +7394,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -7680,7 +7411,6 @@ "ctxt": 0 }, "value": "WithStatement", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7715,8 +7445,8 @@ "ctxt": 0 }, "value": "withType", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -7733,7 +7463,6 @@ "ctxt": 0 }, "value": "withStmt", - "typeAnnotation": null, "optional": false }, "property": { @@ -7744,7 +7473,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7778,8 +7506,8 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -7796,7 +7524,6 @@ "ctxt": 0 }, "value": "ScopedMembers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7817,7 +7544,6 @@ "ctxt": 0 }, "value": "DualStringHashTable", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7838,7 +7564,6 @@ "ctxt": 0 }, "value": "StringHashTable", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -7862,7 +7587,6 @@ "ctxt": 0 }, "value": "StringHashTable", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -7905,8 +7629,8 @@ "ctxt": 0 }, "value": "ambientMembers", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -7923,7 +7647,6 @@ "ctxt": 0 }, "value": "ScopedMembers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7944,7 +7667,6 @@ "ctxt": 0 }, "value": "DualStringHashTable", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7965,7 +7687,6 @@ "ctxt": 0 }, "value": "StringHashTable", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -7989,7 +7710,6 @@ "ctxt": 0 }, "value": "StringHashTable", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -8032,8 +7752,8 @@ "ctxt": 0 }, "value": "withType", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -8050,7 +7770,6 @@ "ctxt": 0 }, "value": "Type", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -8085,8 +7804,8 @@ "ctxt": 0 }, "value": "withSymbol", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -8103,7 +7822,6 @@ "ctxt": 0 }, "value": "WithSymbol", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8124,7 +7842,6 @@ "ctxt": 0 }, "value": "withStmt", - "typeAnnotation": null, "optional": false }, "property": { @@ -8135,7 +7852,6 @@ "ctxt": 0 }, "value": "minChar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8179,7 +7895,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -8190,7 +7905,6 @@ "ctxt": 0 }, "value": "typeFlow", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8203,7 +7917,6 @@ "ctxt": 0 }, "value": "checker", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8216,7 +7929,6 @@ "ctxt": 0 }, "value": "locationInfo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8229,7 +7941,6 @@ "ctxt": 0 }, "value": "unitIndex", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8245,7 +7956,6 @@ "ctxt": 0 }, "value": "withType", - "typeAnnotation": null, "optional": false } } @@ -8286,7 +7996,6 @@ "ctxt": 0 }, "value": "withType", - "typeAnnotation": null, "optional": false }, "property": { @@ -8297,7 +8006,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8310,7 +8018,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false } } @@ -8345,7 +8052,6 @@ "ctxt": 0 }, "value": "withType", - "typeAnnotation": null, "optional": false }, "property": { @@ -8356,7 +8062,6 @@ "ctxt": 0 }, "value": "ambientMembers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8369,7 +8074,6 @@ "ctxt": 0 }, "value": "ambientMembers", - "typeAnnotation": null, "optional": false } } @@ -8404,7 +8108,6 @@ "ctxt": 0 }, "value": "withType", - "typeAnnotation": null, "optional": false }, "property": { @@ -8415,7 +8118,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8428,7 +8130,6 @@ "ctxt": 0 }, "value": "withSymbol", - "typeAnnotation": null, "optional": false } } @@ -8462,7 +8163,6 @@ "ctxt": 0 }, "value": "withType", - "typeAnnotation": null, "optional": false }, "property": { @@ -8473,7 +8173,6 @@ "ctxt": 0 }, "value": "setHasImplementation", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8512,7 +8211,6 @@ "ctxt": 0 }, "value": "withStmt", - "typeAnnotation": null, "optional": false }, "property": { @@ -8523,7 +8221,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8536,7 +8233,6 @@ "ctxt": 0 }, "value": "withType", - "typeAnnotation": null, "optional": false } } @@ -8566,8 +8262,8 @@ "ctxt": 0 }, "value": "withScope", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -8591,7 +8287,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "property": { @@ -8602,7 +8297,6 @@ "ctxt": 0 }, "value": "SymbolScopeBuilder", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8625,7 +8319,6 @@ "ctxt": 0 }, "value": "withType", - "typeAnnotation": null, "optional": false }, "property": { @@ -8636,7 +8329,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8659,7 +8351,6 @@ "ctxt": 0 }, "value": "withType", - "typeAnnotation": null, "optional": false }, "property": { @@ -8670,7 +8361,6 @@ "ctxt": 0 }, "value": "ambientMembers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8722,7 +8412,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -8733,7 +8422,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8746,7 +8434,6 @@ "ctxt": 0 }, "value": "scope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8769,7 +8456,6 @@ "ctxt": 0 }, "value": "withType", - "typeAnnotation": null, "optional": false }, "property": { @@ -8780,7 +8466,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8815,7 +8500,6 @@ "ctxt": 0 }, "value": "pushAssignScope", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8829,7 +8513,6 @@ "ctxt": 0 }, "value": "withScope", - "typeAnnotation": null, "optional": false } }, @@ -8843,7 +8526,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false } }, @@ -8914,7 +8596,6 @@ "ctxt": 0 }, "value": "withType", - "typeAnnotation": null, "optional": false }, "property": { @@ -8925,7 +8606,6 @@ "ctxt": 0 }, "value": "containedScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8938,7 +8618,6 @@ "ctxt": 0 }, "value": "withScope", - "typeAnnotation": null, "optional": false } } @@ -8968,7 +8647,6 @@ "ctxt": 0 }, "value": "preAssignFuncDeclScopes", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8989,6 +8667,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9011,13 +8690,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -9036,6 +8713,7 @@ "ctxt": 0 }, "value": "context", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9058,13 +8736,11 @@ "ctxt": 0 }, "value": "AssignScopeContext", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -9107,8 +8783,8 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -9125,7 +8801,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -9143,7 +8818,6 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9178,6 +8852,7 @@ "ctxt": 0 }, "value": "container", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9200,13 +8875,11 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -9245,6 +8918,7 @@ "ctxt": 0 }, "value": "localContainer", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9267,13 +8941,11 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -9309,7 +8981,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -9320,7 +8991,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9356,8 +9026,8 @@ "ctxt": 0 }, "value": "localContainer", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -9381,7 +9051,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -9392,7 +9061,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9405,7 +9073,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9441,8 +9108,8 @@ "ctxt": 0 }, "value": "isStatic", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9459,7 +9126,6 @@ "ctxt": 0 }, "value": "hasFlag", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9480,7 +9146,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -9491,7 +9156,6 @@ "ctxt": 0 }, "value": "fncFlags", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9514,7 +9178,6 @@ "ctxt": 0 }, "value": "FncFlags", - "typeAnnotation": null, "optional": false }, "property": { @@ -9525,7 +9188,6 @@ "ctxt": 0 }, "value": "Static", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9563,8 +9225,8 @@ "ctxt": 0 }, "value": "isInnerStatic", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9582,7 +9244,6 @@ "ctxt": 0 }, "value": "isStatic", - "typeAnnotation": null, "optional": false }, "right": { @@ -9615,7 +9276,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -9626,7 +9286,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9639,7 +9298,6 @@ "ctxt": 0 }, "value": "fnc", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9683,8 +9341,8 @@ "ctxt": 0 }, "value": "parentScope", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -9701,7 +9359,6 @@ "ctxt": 0 }, "value": "isInnerStatic", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -9740,7 +9397,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -9751,7 +9407,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9764,7 +9419,6 @@ "ctxt": 0 }, "value": "fnc", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9777,7 +9431,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9790,7 +9443,6 @@ "ctxt": 0 }, "value": "memberScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9817,7 +9469,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -9828,7 +9479,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9841,7 +9491,6 @@ "ctxt": 0 }, "value": "scope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9888,7 +9537,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -9899,7 +9547,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9912,7 +9559,6 @@ "ctxt": 0 }, "value": "thisType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9955,7 +9601,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -9966,7 +9611,6 @@ "ctxt": 0 }, "value": "isConstructor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9987,7 +9631,6 @@ "ctxt": 0 }, "value": "hasFlag", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -10008,7 +9651,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -10019,7 +9661,6 @@ "ctxt": 0 }, "value": "fncFlags", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10042,7 +9683,6 @@ "ctxt": 0 }, "value": "FncFlags", - "typeAnnotation": null, "optional": false }, "property": { @@ -10053,7 +9693,6 @@ "ctxt": 0 }, "value": "ClassMethod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10098,8 +9737,8 @@ "ctxt": 0 }, "value": "instType", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -10123,7 +9762,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -10134,7 +9772,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10147,7 +9784,6 @@ "ctxt": 0 }, "value": "thisType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10209,7 +9845,6 @@ "ctxt": 0 }, "value": "instType", - "typeAnnotation": null, "optional": false }, "property": { @@ -10220,7 +9855,6 @@ "ctxt": 0 }, "value": "typeFlags", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10240,7 +9874,6 @@ "ctxt": 0 }, "value": "TypeFlags", - "typeAnnotation": null, "optional": false }, "property": { @@ -10251,7 +9884,6 @@ "ctxt": 0 }, "value": "IsClass", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10282,7 +9914,6 @@ "ctxt": 0 }, "value": "hasFlag", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -10303,7 +9934,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -10314,7 +9944,6 @@ "ctxt": 0 }, "value": "fncFlags", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10337,7 +9966,6 @@ "ctxt": 0 }, "value": "FncFlags", - "typeAnnotation": null, "optional": false }, "property": { @@ -10348,7 +9976,6 @@ "ctxt": 0 }, "value": "ClassMethod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10412,7 +10039,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -10423,7 +10049,6 @@ "ctxt": 0 }, "value": "isMethod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10440,7 +10065,6 @@ "ctxt": 0 }, "value": "isStatic", - "typeAnnotation": null, "optional": false } }, @@ -10475,8 +10099,8 @@ "ctxt": 0 }, "value": "parentScope", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -10493,7 +10117,6 @@ "ctxt": 0 }, "value": "instType", - "typeAnnotation": null, "optional": false }, "property": { @@ -10504,7 +10127,6 @@ "ctxt": 0 }, "value": "constructorScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10544,8 +10166,8 @@ "ctxt": 0 }, "value": "parentScope", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -10562,7 +10184,6 @@ "ctxt": 0 }, "value": "instType", - "typeAnnotation": null, "optional": false }, "property": { @@ -10573,7 +10194,6 @@ "ctxt": 0 }, "value": "containedScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10660,7 +10280,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -10671,7 +10290,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10684,7 +10302,6 @@ "ctxt": 0 }, "value": "previous", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10697,7 +10314,6 @@ "ctxt": 0 }, "value": "scope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10710,7 +10326,6 @@ "ctxt": 0 }, "value": "container", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10758,7 +10373,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -10769,7 +10383,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10782,7 +10395,6 @@ "ctxt": 0 }, "value": "previous", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10795,7 +10407,6 @@ "ctxt": 0 }, "value": "scope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10808,7 +10419,6 @@ "ctxt": 0 }, "value": "container", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10821,7 +10431,6 @@ "ctxt": 0 }, "value": "declAST", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10885,7 +10494,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -10896,7 +10504,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10909,7 +10516,6 @@ "ctxt": 0 }, "value": "previous", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10922,7 +10528,6 @@ "ctxt": 0 }, "value": "scope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10935,7 +10540,6 @@ "ctxt": 0 }, "value": "container", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10948,7 +10552,6 @@ "ctxt": 0 }, "value": "declAST", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10961,7 +10564,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10981,7 +10583,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -10992,7 +10593,6 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11063,7 +10663,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -11074,7 +10673,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11087,7 +10685,6 @@ "ctxt": 0 }, "value": "previous", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11100,7 +10697,6 @@ "ctxt": 0 }, "value": "scope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11113,7 +10709,6 @@ "ctxt": 0 }, "value": "container", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11126,7 +10721,6 @@ "ctxt": 0 }, "value": "declAST", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11146,7 +10740,6 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11161,7 +10754,6 @@ "ctxt": 0 }, "value": "isConstructor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11198,8 +10790,8 @@ "ctxt": 0 }, "value": "parentScope", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -11216,7 +10808,6 @@ "ctxt": 0 }, "value": "instType", - "typeAnnotation": null, "optional": false }, "property": { @@ -11227,7 +10818,6 @@ "ctxt": 0 }, "value": "constructorScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11259,7 +10849,6 @@ "ctxt": 0 }, "value": "isStatic", - "typeAnnotation": null, "optional": false }, "right": { @@ -11284,7 +10873,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -11295,7 +10883,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11308,7 +10895,6 @@ "ctxt": 0 }, "value": "classType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11345,8 +10931,8 @@ "ctxt": 0 }, "value": "parentScope", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -11377,7 +10963,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -11388,7 +10973,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11401,7 +10985,6 @@ "ctxt": 0 }, "value": "classType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11414,7 +10997,6 @@ "ctxt": 0 }, "value": "containedScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11454,8 +11036,8 @@ "ctxt": 0 }, "value": "parentScope", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -11472,7 +11054,6 @@ "ctxt": 0 }, "value": "instType", - "typeAnnotation": null, "optional": false }, "property": { @@ -11483,7 +11064,6 @@ "ctxt": 0 }, "value": "containedScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11520,8 +11100,8 @@ "ctxt": 0 }, "value": "container", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -11538,7 +11118,6 @@ "ctxt": 0 }, "value": "instType", - "typeAnnotation": null, "optional": false }, "property": { @@ -11549,7 +11128,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11588,7 +11166,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -11599,7 +11176,6 @@ "ctxt": 0 }, "value": "isConstructor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11626,7 +11202,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -11637,7 +11212,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11650,7 +11224,6 @@ "ctxt": 0 }, "value": "thisType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11687,8 +11260,8 @@ "ctxt": 0 }, "value": "container", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -11719,7 +11292,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -11730,7 +11302,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11743,7 +11314,6 @@ "ctxt": 0 }, "value": "thisType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11756,7 +11326,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11806,7 +11375,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -11817,7 +11385,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11846,7 +11413,6 @@ "ctxt": 0 }, "value": "hasFlag", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -11881,7 +11447,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -11892,7 +11457,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11905,7 +11469,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11918,7 +11481,6 @@ "ctxt": 0 }, "value": "flags", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11941,7 +11503,6 @@ "ctxt": 0 }, "value": "SymbolFlags", - "typeAnnotation": null, "optional": false }, "property": { @@ -11952,7 +11513,6 @@ "ctxt": 0 }, "value": "TypeSetDuringScopeAssignment", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12007,7 +11567,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -12018,7 +11577,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12031,7 +11589,6 @@ "ctxt": 0 }, "value": "fnc", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12065,7 +11622,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -12076,7 +11632,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12089,7 +11644,6 @@ "ctxt": 0 }, "value": "fnc", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12102,7 +11656,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12139,8 +11692,8 @@ "ctxt": 0 }, "value": "container", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -12178,7 +11731,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -12189,7 +11741,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12202,7 +11753,6 @@ "ctxt": 0 }, "value": "fnc", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12215,7 +11765,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12228,7 +11777,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12264,8 +11812,8 @@ "ctxt": 0 }, "value": "funcScope", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NullLiteral", @@ -12304,6 +11852,7 @@ "ctxt": 0 }, "value": "outerFnc", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12326,13 +11875,11 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -12356,7 +11903,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -12367,7 +11913,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12380,7 +11925,6 @@ "ctxt": 0 }, "value": "fnc", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12414,8 +11958,8 @@ "ctxt": 0 }, "value": "nameText", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -12439,7 +11983,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -12450,7 +11993,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12477,7 +12019,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -12488,7 +12029,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12501,7 +12041,6 @@ "ctxt": 0 }, "value": "actualText", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12544,6 +12083,7 @@ "ctxt": 0 }, "value": "fgSym", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12566,13 +12106,11 @@ "ctxt": 0 }, "value": "TypeSymbol", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -12601,7 +12139,6 @@ "ctxt": 0 }, "value": "isStatic", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -12657,7 +12194,6 @@ "ctxt": 0 }, "value": "outerFnc", - "typeAnnotation": null, "optional": false }, "property": { @@ -12668,7 +12204,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12681,7 +12216,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12724,7 +12258,6 @@ "ctxt": 0 }, "value": "container", - "typeAnnotation": null, "optional": false }, "property": { @@ -12735,7 +12268,6 @@ "ctxt": 0 }, "value": "getType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12751,7 +12283,6 @@ "ctxt": 0 }, "value": "memberScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12802,7 +12333,6 @@ "ctxt": 0 }, "value": "outerFnc", - "typeAnnotation": null, "optional": false }, "property": { @@ -12813,7 +12343,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12826,7 +12355,6 @@ "ctxt": 0 }, "value": "members", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12888,7 +12416,6 @@ "ctxt": 0 }, "value": "container", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -12906,7 +12433,6 @@ "ctxt": 0 }, "value": "TypeSymbol", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12921,7 +12447,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12934,7 +12459,6 @@ "ctxt": 0 }, "value": "memberScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12954,7 +12478,6 @@ "ctxt": 0 }, "value": "SymbolScopeBuilder", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12969,7 +12492,6 @@ "ctxt": 0 }, "value": "valueMembers", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13003,8 +12525,8 @@ "ctxt": 0 }, "value": "funcScope", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -13042,7 +12564,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -13053,7 +12574,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13066,7 +12586,6 @@ "ctxt": 0 }, "value": "fnc", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13079,7 +12598,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13092,7 +12610,6 @@ "ctxt": 0 }, "value": "memberScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13136,7 +12653,6 @@ "ctxt": 0 }, "value": "outerFnc", - "typeAnnotation": null, "optional": false }, "property": { @@ -13147,7 +12663,6 @@ "ctxt": 0 }, "value": "innerStaticFuncs", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13174,7 +12689,6 @@ "ctxt": 0 }, "value": "outerFnc", - "typeAnnotation": null, "optional": false }, "property": { @@ -13185,7 +12699,6 @@ "ctxt": 0 }, "value": "innerStaticFuncs", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13198,7 +12711,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13213,7 +12725,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false } } @@ -13298,7 +12809,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -13309,7 +12819,6 @@ "ctxt": 0 }, "value": "isConstructor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13323,7 +12832,6 @@ "ctxt": 0 }, "value": "container", - "typeAnnotation": null, "optional": false } }, @@ -13342,7 +12850,6 @@ "ctxt": 0 }, "value": "container", - "typeAnnotation": null, "optional": false }, "property": { @@ -13353,7 +12860,6 @@ "ctxt": 0 }, "value": "declAST", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13389,7 +12895,6 @@ "ctxt": 0 }, "value": "container", - "typeAnnotation": null, "optional": false }, "property": { @@ -13400,7 +12905,6 @@ "ctxt": 0 }, "value": "declAST", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13413,7 +12917,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13433,7 +12936,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -13444,7 +12946,6 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13487,7 +12988,6 @@ "ctxt": 0 }, "value": "container", - "typeAnnotation": null, "optional": false }, "property": { @@ -13498,7 +12998,6 @@ "ctxt": 0 }, "value": "declAST", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13518,7 +13017,6 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13533,7 +13031,6 @@ "ctxt": 0 }, "value": "isConstructor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13569,7 +13066,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -13580,7 +13076,6 @@ "ctxt": 0 }, "value": "isMethod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13621,8 +13116,8 @@ "ctxt": 0 }, "value": "funcScope", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -13653,7 +13148,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -13664,7 +13158,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13677,7 +13170,6 @@ "ctxt": 0 }, "value": "thisType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13690,7 +13182,6 @@ "ctxt": 0 }, "value": "constructorScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13730,8 +13221,8 @@ "ctxt": 0 }, "value": "funcScope", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -13755,7 +13246,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -13766,7 +13256,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13779,7 +13268,6 @@ "ctxt": 0 }, "value": "scope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13823,7 +13311,6 @@ "ctxt": 0 }, "value": "nameText", - "typeAnnotation": null, "optional": false }, "right": { @@ -13842,7 +13329,6 @@ "ctxt": 0 }, "value": "nameText", - "typeAnnotation": null, "optional": false }, "right": { @@ -13891,7 +13377,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -13902,7 +13387,6 @@ "ctxt": 0 }, "value": "isAccessor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -13935,7 +13419,6 @@ "ctxt": 0 }, "value": "isStatic", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -13969,8 +13452,8 @@ "ctxt": 0 }, "value": "fgSym", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -13994,7 +13477,6 @@ "ctxt": 0 }, "value": "funcScope", - "typeAnnotation": null, "optional": false }, "property": { @@ -14005,7 +13487,6 @@ "ctxt": 0 }, "value": "findLocal", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14021,7 +13502,6 @@ "ctxt": 0 }, "value": "nameText", - "typeAnnotation": null, "optional": false } }, @@ -14087,8 +13567,8 @@ "ctxt": 0 }, "value": "fgSym", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -14112,7 +13592,6 @@ "ctxt": 0 }, "value": "funcScope", - "typeAnnotation": null, "optional": false }, "property": { @@ -14123,7 +13602,6 @@ "ctxt": 0 }, "value": "findLocal", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14139,7 +13617,6 @@ "ctxt": 0 }, "value": "nameText", - "typeAnnotation": null, "optional": false } }, @@ -14222,7 +13699,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -14233,7 +13709,6 @@ "ctxt": 0 }, "value": "typeFlow", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14246,7 +13721,6 @@ "ctxt": 0 }, "value": "checker", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14259,7 +13733,6 @@ "ctxt": 0 }, "value": "createFunctionSignature", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14275,7 +13748,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false } }, @@ -14289,7 +13761,6 @@ "ctxt": 0 }, "value": "container", - "typeAnnotation": null, "optional": false } }, @@ -14303,7 +13774,6 @@ "ctxt": 0 }, "value": "funcScope", - "typeAnnotation": null, "optional": false } }, @@ -14317,7 +13787,6 @@ "ctxt": 0 }, "value": "fgSym", - "typeAnnotation": null, "optional": false } }, @@ -14339,7 +13808,6 @@ "ctxt": 0 }, "value": "fgSym", - "typeAnnotation": null, "optional": false }, "right": { @@ -14418,7 +13886,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -14429,7 +13896,6 @@ "ctxt": 0 }, "value": "accessorSymbol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14465,7 +13931,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -14476,7 +13941,6 @@ "ctxt": 0 }, "value": "fncFlags", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14496,7 +13960,6 @@ "ctxt": 0 }, "value": "FncFlags", - "typeAnnotation": null, "optional": false }, "property": { @@ -14507,7 +13970,6 @@ "ctxt": 0 }, "value": "ClassMethod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14523,7 +13985,6 @@ "ctxt": 0 }, "value": "container", - "typeAnnotation": null, "optional": false } }, @@ -14573,7 +14034,6 @@ "ctxt": 0 }, "value": "fgSym", - "typeAnnotation": null, "optional": false } }, @@ -14607,7 +14067,6 @@ "ctxt": 0 }, "value": "fgSym", - "typeAnnotation": null, "optional": false }, "property": { @@ -14618,7 +14077,6 @@ "ctxt": 0 }, "value": "declAST", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14631,7 +14089,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14651,7 +14108,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -14662,7 +14118,6 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14692,7 +14147,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -14703,7 +14157,6 @@ "ctxt": 0 }, "value": "isAccessor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14737,7 +14190,6 @@ "ctxt": 0 }, "value": "fgSym", - "typeAnnotation": null, "optional": false }, "right": { @@ -14762,7 +14214,6 @@ "ctxt": 0 }, "value": "fgSym", - "typeAnnotation": null, "optional": false }, "property": { @@ -14773,7 +14224,6 @@ "ctxt": 0 }, "value": "isAccessor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14822,7 +14272,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -14833,7 +14282,6 @@ "ctxt": 0 }, "value": "accessorSymbol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14874,7 +14322,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -14885,7 +14332,6 @@ "ctxt": 0 }, "value": "typeFlow", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14898,7 +14344,6 @@ "ctxt": 0 }, "value": "checker", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14911,7 +14356,6 @@ "ctxt": 0 }, "value": "createAccessorSymbol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14927,7 +14371,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false } }, @@ -14941,7 +14384,6 @@ "ctxt": 0 }, "value": "fgSym", - "typeAnnotation": null, "optional": false } }, @@ -14969,7 +14411,6 @@ "ctxt": 0 }, "value": "container", - "typeAnnotation": null, "optional": false }, "property": { @@ -14980,7 +14421,6 @@ "ctxt": 0 }, "value": "getType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15028,7 +14468,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -15039,7 +14478,6 @@ "ctxt": 0 }, "value": "isMethod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15055,7 +14493,6 @@ "ctxt": 0 }, "value": "isStatic", - "typeAnnotation": null, "optional": false } } @@ -15083,7 +14520,6 @@ "ctxt": 0 }, "value": "funcScope", - "typeAnnotation": null, "optional": false } }, @@ -15097,7 +14533,6 @@ "ctxt": 0 }, "value": "container", - "typeAnnotation": null, "optional": false } } @@ -15154,7 +14589,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -15165,7 +14599,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15178,7 +14611,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15191,7 +14623,6 @@ "ctxt": 0 }, "value": "flags", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15211,7 +14642,6 @@ "ctxt": 0 }, "value": "SymbolFlags", - "typeAnnotation": null, "optional": false }, "property": { @@ -15222,7 +14652,6 @@ "ctxt": 0 }, "value": "TypeSetDuringScopeAssignment", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15263,7 +14692,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -15274,7 +14702,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15294,7 +14721,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -15305,7 +14731,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15356,7 +14781,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -15367,7 +14791,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15380,7 +14803,6 @@ "ctxt": 0 }, "value": "sym", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15407,7 +14829,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -15418,7 +14839,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15431,7 +14851,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15472,7 +14891,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -15483,7 +14901,6 @@ "ctxt": 0 }, "value": "scopeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15503,7 +14920,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -15514,7 +14930,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15543,7 +14958,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -15554,7 +14968,6 @@ "ctxt": 0 }, "value": "isOverload", - "typeAnnotation": null, "optional": false }, "computed": false @@ -15605,8 +15018,8 @@ "ctxt": 0 }, "value": "funcTable", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -15623,7 +15036,6 @@ "ctxt": 0 }, "value": "StringHashTable", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -15658,8 +15070,8 @@ "ctxt": 0 }, "value": "funcMembers", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -15676,7 +15088,6 @@ "ctxt": 0 }, "value": "ScopedMembers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -15697,7 +15108,6 @@ "ctxt": 0 }, "value": "DualStringHashTable", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -15711,7 +15121,6 @@ "ctxt": 0 }, "value": "funcTable", - "typeAnnotation": null, "optional": false } }, @@ -15732,7 +15141,6 @@ "ctxt": 0 }, "value": "StringHashTable", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -15775,8 +15183,8 @@ "ctxt": 0 }, "value": "ambientFuncTable", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -15793,7 +15201,6 @@ "ctxt": 0 }, "value": "StringHashTable", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -15828,8 +15235,8 @@ "ctxt": 0 }, "value": "ambientFuncMembers", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -15846,7 +15253,6 @@ "ctxt": 0 }, "value": "ScopedMembers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -15867,7 +15273,6 @@ "ctxt": 0 }, "value": "DualStringHashTable", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -15881,7 +15286,6 @@ "ctxt": 0 }, "value": "ambientFuncTable", - "typeAnnotation": null, "optional": false } }, @@ -15902,7 +15306,6 @@ "ctxt": 0 }, "value": "StringHashTable", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -15945,8 +15348,8 @@ "ctxt": 0 }, "value": "funcStaticTable", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -15963,7 +15366,6 @@ "ctxt": 0 }, "value": "StringHashTable", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -15998,8 +15400,8 @@ "ctxt": 0 }, "value": "funcStaticMembers", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -16016,7 +15418,6 @@ "ctxt": 0 }, "value": "ScopedMembers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -16037,7 +15438,6 @@ "ctxt": 0 }, "value": "DualStringHashTable", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -16051,7 +15451,6 @@ "ctxt": 0 }, "value": "funcStaticTable", - "typeAnnotation": null, "optional": false } }, @@ -16072,7 +15471,6 @@ "ctxt": 0 }, "value": "StringHashTable", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -16115,8 +15513,8 @@ "ctxt": 0 }, "value": "ambientFuncStaticTable", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -16133,7 +15531,6 @@ "ctxt": 0 }, "value": "StringHashTable", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -16168,8 +15565,8 @@ "ctxt": 0 }, "value": "ambientFuncStaticMembers", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -16186,7 +15583,6 @@ "ctxt": 0 }, "value": "ScopedMembers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -16207,7 +15603,6 @@ "ctxt": 0 }, "value": "DualStringHashTable", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -16221,7 +15616,6 @@ "ctxt": 0 }, "value": "ambientFuncStaticTable", - "typeAnnotation": null, "optional": false } }, @@ -16242,7 +15636,6 @@ "ctxt": 0 }, "value": "StringHashTable", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -16290,7 +15683,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -16301,7 +15693,6 @@ "ctxt": 0 }, "value": "unitIndex", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16342,7 +15733,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -16353,7 +15743,6 @@ "ctxt": 0 }, "value": "typeFlow", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16366,7 +15755,6 @@ "ctxt": 0 }, "value": "checker", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16379,7 +15767,6 @@ "ctxt": 0 }, "value": "locationInfo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16392,7 +15779,6 @@ "ctxt": 0 }, "value": "unitIndex", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16424,8 +15810,8 @@ "ctxt": 0 }, "value": "locals", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -16442,7 +15828,6 @@ "ctxt": 0 }, "value": "SymbolScopeBuilder", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -16456,7 +15841,6 @@ "ctxt": 0 }, "value": "funcMembers", - "typeAnnotation": null, "optional": false } }, @@ -16470,7 +15854,6 @@ "ctxt": 0 }, "value": "ambientFuncMembers", - "typeAnnotation": null, "optional": false } }, @@ -16506,7 +15889,6 @@ "ctxt": 0 }, "value": "parentScope", - "typeAnnotation": null, "optional": false } }, @@ -16520,7 +15902,6 @@ "ctxt": 0 }, "value": "localContainer", - "typeAnnotation": null, "optional": false } } @@ -16556,8 +15937,8 @@ "ctxt": 0 }, "value": "statics", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -16574,7 +15955,6 @@ "ctxt": 0 }, "value": "SymbolScopeBuilder", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -16588,7 +15968,6 @@ "ctxt": 0 }, "value": "funcStaticMembers", - "typeAnnotation": null, "optional": false } }, @@ -16602,7 +15981,6 @@ "ctxt": 0 }, "value": "ambientFuncStaticMembers", - "typeAnnotation": null, "optional": false } }, @@ -16638,7 +16016,6 @@ "ctxt": 0 }, "value": "parentScope", - "typeAnnotation": null, "optional": false } }, @@ -16690,7 +16067,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -16701,7 +16077,6 @@ "ctxt": 0 }, "value": "isConstructor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16728,7 +16103,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -16739,7 +16113,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16752,7 +16125,6 @@ "ctxt": 0 }, "value": "thisType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16810,7 +16182,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -16821,7 +16192,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16834,7 +16204,6 @@ "ctxt": 0 }, "value": "thisType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16847,7 +16216,6 @@ "ctxt": 0 }, "value": "constructorScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16860,7 +16228,6 @@ "ctxt": 0 }, "value": "locals", - "typeAnnotation": null, "optional": false } } @@ -16899,7 +16266,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -16910,7 +16276,6 @@ "ctxt": 0 }, "value": "symbols", - "typeAnnotation": null, "optional": false }, "computed": false @@ -16923,7 +16288,6 @@ "ctxt": 0 }, "value": "funcTable", - "typeAnnotation": null, "optional": false } } @@ -16965,7 +16329,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -16976,7 +16339,6 @@ "ctxt": 0 }, "value": "isSpecialFn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17018,8 +16380,8 @@ "ctxt": 0 }, "value": "group", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -17036,7 +16398,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -17047,7 +16408,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17081,8 +16441,8 @@ "ctxt": 0 }, "value": "signature", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -17099,7 +16459,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -17110,7 +16469,6 @@ "ctxt": 0 }, "value": "signature", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17149,7 +16507,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -17160,7 +16517,6 @@ "ctxt": 0 }, "value": "isConstructor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17204,7 +16560,6 @@ "ctxt": 0 }, "value": "group", - "typeAnnotation": null, "optional": false }, "property": { @@ -17215,7 +16570,6 @@ "ctxt": 0 }, "value": "containedScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17228,7 +16582,6 @@ "ctxt": 0 }, "value": "locals", - "typeAnnotation": null, "optional": false } } @@ -17263,7 +16616,6 @@ "ctxt": 0 }, "value": "locals", - "typeAnnotation": null, "optional": false }, "property": { @@ -17274,7 +16626,6 @@ "ctxt": 0 }, "value": "container", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17294,7 +16645,6 @@ "ctxt": 0 }, "value": "group", - "typeAnnotation": null, "optional": false }, "property": { @@ -17305,7 +16655,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17342,7 +16691,6 @@ "ctxt": 0 }, "value": "group", - "typeAnnotation": null, "optional": false }, "property": { @@ -17353,7 +16701,6 @@ "ctxt": 0 }, "value": "memberScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17366,7 +16713,6 @@ "ctxt": 0 }, "value": "statics", - "typeAnnotation": null, "optional": false } } @@ -17401,7 +16747,6 @@ "ctxt": 0 }, "value": "statics", - "typeAnnotation": null, "optional": false }, "property": { @@ -17412,7 +16757,6 @@ "ctxt": 0 }, "value": "container", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17432,7 +16776,6 @@ "ctxt": 0 }, "value": "group", - "typeAnnotation": null, "optional": false }, "property": { @@ -17443,7 +16786,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17484,7 +16826,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -17495,7 +16836,6 @@ "ctxt": 0 }, "value": "enclosingFnc", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17522,7 +16862,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -17533,7 +16872,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17546,7 +16884,6 @@ "ctxt": 0 }, "value": "fnc", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17583,7 +16920,6 @@ "ctxt": 0 }, "value": "group", - "typeAnnotation": null, "optional": false }, "property": { @@ -17594,7 +16930,6 @@ "ctxt": 0 }, "value": "enclosingType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17614,7 +16949,6 @@ "ctxt": 0 }, "value": "isStatic", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -17639,7 +16973,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -17650,7 +16983,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17663,7 +16995,6 @@ "ctxt": 0 }, "value": "classType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17690,7 +17021,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -17701,7 +17031,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17714,7 +17043,6 @@ "ctxt": 0 }, "value": "thisType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17747,8 +17075,8 @@ "ctxt": 0 }, "value": "fgSym", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -17779,7 +17107,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -17790,7 +17117,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17803,7 +17129,6 @@ "ctxt": 0 }, "value": "symbol", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17823,7 +17148,6 @@ "ctxt": 0 }, "value": "TypeSymbol", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -17893,7 +17217,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -17904,7 +17227,6 @@ "ctxt": 0 }, "value": "fncFlags", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17924,7 +17246,6 @@ "ctxt": 0 }, "value": "FncFlags", - "typeAnnotation": null, "optional": false }, "property": { @@ -17935,7 +17256,6 @@ "ctxt": 0 }, "value": "Signature", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17957,7 +17277,6 @@ "ctxt": 0 }, "value": "FncFlags", - "typeAnnotation": null, "optional": false }, "property": { @@ -17968,7 +17287,6 @@ "ctxt": 0 }, "value": "None", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17990,7 +17308,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -18001,7 +17318,6 @@ "ctxt": 0 }, "value": "vars", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18051,7 +17367,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -18062,7 +17377,6 @@ "ctxt": 0 }, "value": "typeFlow", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18075,7 +17389,6 @@ "ctxt": 0 }, "value": "addLocalsFromScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18091,7 +17404,6 @@ "ctxt": 0 }, "value": "locals", - "typeAnnotation": null, "optional": false } }, @@ -18105,7 +17417,6 @@ "ctxt": 0 }, "value": "fgSym", - "typeAnnotation": null, "optional": false } }, @@ -18126,7 +17437,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -18137,7 +17447,6 @@ "ctxt": 0 }, "value": "vars", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18153,7 +17462,6 @@ "ctxt": 0 }, "value": "funcTable", - "typeAnnotation": null, "optional": false } }, @@ -18209,7 +17517,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -18220,7 +17527,6 @@ "ctxt": 0 }, "value": "typeFlow", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18233,7 +17539,6 @@ "ctxt": 0 }, "value": "addLocalsFromScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18249,7 +17554,6 @@ "ctxt": 0 }, "value": "statics", - "typeAnnotation": null, "optional": false } }, @@ -18263,7 +17567,6 @@ "ctxt": 0 }, "value": "fgSym", - "typeAnnotation": null, "optional": false } }, @@ -18284,7 +17587,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -18295,7 +17597,6 @@ "ctxt": 0 }, "value": "statics", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18311,7 +17612,6 @@ "ctxt": 0 }, "value": "funcStaticTable", - "typeAnnotation": null, "optional": false } }, @@ -18357,7 +17657,6 @@ "ctxt": 0 }, "value": "signature", - "typeAnnotation": null, "optional": false }, "property": { @@ -18368,7 +17667,6 @@ "ctxt": 0 }, "value": "parameters", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18406,8 +17704,8 @@ "ctxt": 0 }, "value": "len", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -18431,7 +17729,6 @@ "ctxt": 0 }, "value": "signature", - "typeAnnotation": null, "optional": false }, "property": { @@ -18442,7 +17739,6 @@ "ctxt": 0 }, "value": "parameters", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18455,7 +17751,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18496,8 +17791,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -18528,7 +17823,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "right": { @@ -18539,7 +17833,6 @@ "ctxt": 0 }, "value": "len", - "typeAnnotation": null, "optional": false } }, @@ -18560,7 +17853,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -18597,6 +17889,7 @@ "ctxt": 0 }, "value": "paramSym", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -18619,13 +17912,11 @@ "ctxt": 0 }, "value": "ParameterSymbol", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -18649,7 +17940,6 @@ "ctxt": 0 }, "value": "signature", - "typeAnnotation": null, "optional": false }, "property": { @@ -18660,7 +17950,6 @@ "ctxt": 0 }, "value": "parameters", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18673,7 +17962,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": true @@ -18725,7 +18013,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -18736,7 +18023,6 @@ "ctxt": 0 }, "value": "typeFlow", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18749,7 +18035,6 @@ "ctxt": 0 }, "value": "checker", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18762,7 +18047,6 @@ "ctxt": 0 }, "value": "resolveTypeLink", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18778,7 +18062,6 @@ "ctxt": 0 }, "value": "locals", - "typeAnnotation": null, "optional": false } }, @@ -18806,7 +18089,6 @@ "ctxt": 0 }, "value": "paramSym", - "typeAnnotation": null, "optional": false }, "property": { @@ -18817,7 +18099,6 @@ "ctxt": 0 }, "value": "parameter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18830,7 +18111,6 @@ "ctxt": 0 }, "value": "typeLink", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18902,7 +18182,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -18913,7 +18192,6 @@ "ctxt": 0 }, "value": "typeFlow", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18926,7 +18204,6 @@ "ctxt": 0 }, "value": "checker", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18939,7 +18216,6 @@ "ctxt": 0 }, "value": "resolveTypeLink", - "typeAnnotation": null, "optional": false }, "computed": false @@ -18955,7 +18231,6 @@ "ctxt": 0 }, "value": "locals", - "typeAnnotation": null, "optional": false } }, @@ -18976,7 +18251,6 @@ "ctxt": 0 }, "value": "signature", - "typeAnnotation": null, "optional": false }, "property": { @@ -18987,7 +18261,6 @@ "ctxt": 0 }, "value": "returnType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19017,7 +18290,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -19028,7 +18300,6 @@ "ctxt": 0 }, "value": "isSignature", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19083,7 +18354,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -19094,7 +18364,6 @@ "ctxt": 0 }, "value": "isConstructor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19115,7 +18384,6 @@ "ctxt": 0 }, "value": "hasFlag", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -19136,7 +18404,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -19147,7 +18414,6 @@ "ctxt": 0 }, "value": "fncFlags", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19170,7 +18436,6 @@ "ctxt": 0 }, "value": "FncFlags", - "typeAnnotation": null, "optional": false }, "property": { @@ -19181,7 +18446,6 @@ "ctxt": 0 }, "value": "ClassMethod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19224,8 +18488,8 @@ "ctxt": 0 }, "value": "thisType", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -19264,7 +18528,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -19275,7 +18538,6 @@ "ctxt": 0 }, "value": "isConstructor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19295,7 +18557,6 @@ "ctxt": 0 }, "value": "hasFlag", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -19316,7 +18577,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -19327,7 +18587,6 @@ "ctxt": 0 }, "value": "fncFlags", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19350,7 +18609,6 @@ "ctxt": 0 }, "value": "FncFlags", - "typeAnnotation": null, "optional": false }, "property": { @@ -19361,7 +18619,6 @@ "ctxt": 0 }, "value": "ClassMethod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19394,7 +18651,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -19405,7 +18661,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19418,7 +18673,6 @@ "ctxt": 0 }, "value": "thisType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19458,7 +18712,6 @@ "ctxt": 0 }, "value": "pushAssignScope", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -19472,7 +18725,6 @@ "ctxt": 0 }, "value": "locals", - "typeAnnotation": null, "optional": false } }, @@ -19486,7 +18738,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false } }, @@ -19500,7 +18751,6 @@ "ctxt": 0 }, "value": "thisType", - "typeAnnotation": null, "optional": false } }, @@ -19525,7 +18775,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false } } @@ -19562,7 +18811,6 @@ "ctxt": 0 }, "value": "preAssignCatchScopes", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -19583,6 +18831,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -19605,13 +18854,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -19630,6 +18877,7 @@ "ctxt": 0 }, "value": "context", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -19652,13 +18900,11 @@ "ctxt": 0 }, "value": "AssignScopeContext", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -19701,8 +18947,8 @@ "ctxt": 0 }, "value": "catchBlock", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -19719,7 +18965,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -19737,7 +18982,6 @@ "ctxt": 0 }, "value": "Catch", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -19769,7 +19013,6 @@ "ctxt": 0 }, "value": "catchBlock", - "typeAnnotation": null, "optional": false }, "property": { @@ -19780,7 +19023,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "computed": false @@ -19818,8 +19060,8 @@ "ctxt": 0 }, "value": "catchTable", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -19836,7 +19078,6 @@ "ctxt": 0 }, "value": "ScopedMembers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -19857,7 +19098,6 @@ "ctxt": 0 }, "value": "DualStringHashTable", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -19878,7 +19118,6 @@ "ctxt": 0 }, "value": "StringHashTable", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -19902,7 +19141,6 @@ "ctxt": 0 }, "value": "StringHashTable", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -19945,8 +19183,8 @@ "ctxt": 0 }, "value": "catchLocals", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -19963,7 +19201,6 @@ "ctxt": 0 }, "value": "SymbolScopeBuilder", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -19977,7 +19214,6 @@ "ctxt": 0 }, "value": "catchTable", - "typeAnnotation": null, "optional": false } }, @@ -20038,7 +19274,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -20049,7 +19284,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20062,7 +19296,6 @@ "ctxt": 0 }, "value": "scope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20099,7 +19332,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -20110,7 +19342,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20123,7 +19354,6 @@ "ctxt": 0 }, "value": "scope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20136,7 +19366,6 @@ "ctxt": 0 }, "value": "container", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20179,7 +19408,6 @@ "ctxt": 0 }, "value": "catchBlock", - "typeAnnotation": null, "optional": false }, "property": { @@ -20190,7 +19418,6 @@ "ctxt": 0 }, "value": "containedScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20203,7 +19430,6 @@ "ctxt": 0 }, "value": "catchLocals", - "typeAnnotation": null, "optional": false } } @@ -20230,7 +19456,6 @@ "ctxt": 0 }, "value": "pushAssignScope", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -20244,7 +19469,6 @@ "ctxt": 0 }, "value": "catchLocals", - "typeAnnotation": null, "optional": false } }, @@ -20258,7 +19482,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false } }, @@ -20286,7 +19509,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -20297,7 +19519,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20310,7 +19531,6 @@ "ctxt": 0 }, "value": "thisType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20340,7 +19560,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -20351,7 +19570,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20364,7 +19582,6 @@ "ctxt": 0 }, "value": "classType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20394,7 +19611,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -20405,7 +19621,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20418,7 +19633,6 @@ "ctxt": 0 }, "value": "fnc", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20457,7 +19671,6 @@ "ctxt": 0 }, "value": "preAssignScopes", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -20478,6 +19691,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -20500,13 +19714,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -20525,6 +19737,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -20547,13 +19760,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -20572,6 +19783,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -20594,13 +19806,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -20643,6 +19853,7 @@ "ctxt": 0 }, "value": "context", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -20665,13 +19876,11 @@ "ctxt": 0 }, "value": "AssignScopeContext", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -20688,7 +19897,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -20699,7 +19907,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20733,8 +19940,8 @@ "ctxt": 0 }, "value": "go", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -20764,7 +19971,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -20805,7 +20011,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -20816,7 +20021,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20836,7 +20040,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -20847,7 +20050,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20886,8 +20088,8 @@ "ctxt": 0 }, "value": "list", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -20904,7 +20106,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -20922,7 +20123,6 @@ "ctxt": 0 }, "value": "ASTList", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -20962,7 +20162,6 @@ "ctxt": 0 }, "value": "list", - "typeAnnotation": null, "optional": false }, "property": { @@ -20973,7 +20172,6 @@ "ctxt": 0 }, "value": "enclosingScope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21000,7 +20198,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -21011,7 +20208,6 @@ "ctxt": 0 }, "value": "scopeChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21024,7 +20220,6 @@ "ctxt": 0 }, "value": "scope", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21063,7 +20258,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -21074,7 +20268,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21094,7 +20287,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -21105,7 +20297,6 @@ "ctxt": 0 }, "value": "ModuleDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21141,7 +20332,6 @@ "ctxt": 0 }, "value": "preAssignModuleScopes", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -21155,7 +20345,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } }, @@ -21169,7 +20358,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false } } @@ -21209,7 +20397,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -21220,7 +20407,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21240,7 +20426,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -21251,7 +20436,6 @@ "ctxt": 0 }, "value": "ClassDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21287,7 +20471,6 @@ "ctxt": 0 }, "value": "preAssignClassScopes", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -21301,7 +20484,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } }, @@ -21315,7 +20497,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false } } @@ -21355,7 +20536,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -21366,7 +20546,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21386,7 +20565,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -21397,7 +20575,6 @@ "ctxt": 0 }, "value": "InterfaceDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21433,7 +20610,6 @@ "ctxt": 0 }, "value": "preAssignInterfaceScopes", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -21447,7 +20623,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } }, @@ -21461,7 +20636,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false } } @@ -21501,7 +20675,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -21512,7 +20685,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21532,7 +20704,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -21543,7 +20714,6 @@ "ctxt": 0 }, "value": "With", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21579,7 +20749,6 @@ "ctxt": 0 }, "value": "preAssignWithScopes", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -21593,7 +20762,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } }, @@ -21607,7 +20775,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false } } @@ -21647,7 +20814,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -21658,7 +20824,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21678,7 +20843,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -21689,7 +20853,6 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21725,7 +20888,6 @@ "ctxt": 0 }, "value": "preAssignFuncDeclScopes", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -21739,7 +20901,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } }, @@ -21753,7 +20914,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false } } @@ -21793,7 +20953,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -21804,7 +20963,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21824,7 +20982,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -21835,7 +20992,6 @@ "ctxt": 0 }, "value": "Catch", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21871,7 +21027,6 @@ "ctxt": 0 }, "value": "preAssignCatchScopes", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -21885,7 +21040,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } }, @@ -21899,7 +21053,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false } } @@ -21939,7 +21092,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -21950,7 +21102,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21970,7 +21121,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -21981,7 +21131,6 @@ "ctxt": 0 }, "value": "TypeRef", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22018,8 +21167,8 @@ "ctxt": 0 }, "value": "go", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -22084,7 +21233,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -22095,7 +21243,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22108,7 +21255,6 @@ "ctxt": 0 }, "value": "goChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22121,7 +21267,6 @@ "ctxt": 0 }, "value": "go", - "typeAnnotation": null, "optional": false } } @@ -22141,7 +21286,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } } @@ -22170,7 +21314,6 @@ "ctxt": 0 }, "value": "postAssignScopes", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -22191,6 +21334,7 @@ "ctxt": 0 }, "value": "ast", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -22213,13 +21357,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -22238,6 +21380,7 @@ "ctxt": 0 }, "value": "parent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -22260,13 +21403,11 @@ "ctxt": 0 }, "value": "AST", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -22285,6 +21426,7 @@ "ctxt": 0 }, "value": "walker", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -22307,13 +21449,11 @@ "ctxt": 0 }, "value": "IAstWalker", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -22356,6 +21496,7 @@ "ctxt": 0 }, "value": "context", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -22378,13 +21519,11 @@ "ctxt": 0 }, "value": "AssignScopeContext", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -22401,7 +21540,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -22412,7 +21550,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22446,8 +21583,8 @@ "ctxt": 0 }, "value": "go", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -22477,7 +21614,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -22518,7 +21654,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -22529,7 +21664,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22549,7 +21683,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -22560,7 +21693,6 @@ "ctxt": 0 }, "value": "ModuleDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22599,8 +21731,8 @@ "ctxt": 0 }, "value": "prevModDecl", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -22617,7 +21749,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -22635,7 +21766,6 @@ "ctxt": 0 }, "value": "ModuleDeclaration", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -22667,7 +21797,6 @@ "ctxt": 0 }, "value": "popAssignScope", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -22681,7 +21810,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false } } @@ -22725,7 +21853,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -22736,7 +21863,6 @@ "ctxt": 0 }, "value": "modDeclChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22749,7 +21875,6 @@ "ctxt": 0 }, "value": "pop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22795,7 +21920,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -22806,7 +21930,6 @@ "ctxt": 0 }, "value": "modDeclChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22819,7 +21942,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22886,7 +22008,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -22897,7 +22018,6 @@ "ctxt": 0 }, "value": "typeFlow", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22910,7 +22030,6 @@ "ctxt": 0 }, "value": "checker", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22923,7 +22042,6 @@ "ctxt": 0 }, "value": "currentModDecl", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22950,7 +22068,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -22961,7 +22078,6 @@ "ctxt": 0 }, "value": "modDeclChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -22996,7 +22112,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "property": { @@ -23007,7 +22122,6 @@ "ctxt": 0 }, "value": "modDeclChain", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23020,7 +22134,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23075,7 +22188,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -23086,7 +22198,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23106,7 +22217,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -23117,7 +22227,6 @@ "ctxt": 0 }, "value": "ClassDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23153,7 +22262,6 @@ "ctxt": 0 }, "value": "popAssignScope", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -23167,7 +22275,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false } } @@ -23207,7 +22314,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -23218,7 +22324,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23238,7 +22343,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -23249,7 +22353,6 @@ "ctxt": 0 }, "value": "InterfaceDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23285,7 +22388,6 @@ "ctxt": 0 }, "value": "popAssignScope", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -23299,7 +22401,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false } } @@ -23339,7 +22440,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -23350,7 +22450,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23370,7 +22469,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -23381,7 +22479,6 @@ "ctxt": 0 }, "value": "With", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23417,7 +22514,6 @@ "ctxt": 0 }, "value": "popAssignScope", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -23431,7 +22527,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false } } @@ -23471,7 +22566,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -23482,7 +22576,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23502,7 +22595,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -23513,7 +22605,6 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23552,8 +22643,8 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -23570,7 +22661,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -23588,7 +22678,6 @@ "ctxt": 0 }, "value": "FuncDecl", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -23651,7 +22740,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -23662,7 +22750,6 @@ "ctxt": 0 }, "value": "isConstructor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23683,7 +22770,6 @@ "ctxt": 0 }, "value": "hasFlag", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -23704,7 +22790,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -23715,7 +22800,6 @@ "ctxt": 0 }, "value": "fncFlags", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23738,7 +22822,6 @@ "ctxt": 0 }, "value": "FncFlags", - "typeAnnotation": null, "optional": false }, "property": { @@ -23749,7 +22832,6 @@ "ctxt": 0 }, "value": "ClassMethod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23783,7 +22865,6 @@ "ctxt": 0 }, "value": "funcDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -23794,7 +22875,6 @@ "ctxt": 0 }, "value": "isOverload", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23831,7 +22911,6 @@ "ctxt": 0 }, "value": "popAssignScope", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -23845,7 +22924,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false } } @@ -23889,7 +22967,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "property": { @@ -23900,7 +22977,6 @@ "ctxt": 0 }, "value": "nodeType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23920,7 +22996,6 @@ "ctxt": 0 }, "value": "NodeType", - "typeAnnotation": null, "optional": false }, "property": { @@ -23931,7 +23006,6 @@ "ctxt": 0 }, "value": "Catch", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23970,8 +23044,8 @@ "ctxt": 0 }, "value": "catchBlock", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -23988,7 +23062,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -24006,7 +23079,6 @@ "ctxt": 0 }, "value": "Catch", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24038,7 +23110,6 @@ "ctxt": 0 }, "value": "catchBlock", - "typeAnnotation": null, "optional": false }, "property": { @@ -24049,7 +23120,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24084,7 +23154,6 @@ "ctxt": 0 }, "value": "popAssignScope", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -24098,7 +23167,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false } } @@ -24143,8 +23211,8 @@ "ctxt": 0 }, "value": "go", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -24206,7 +23274,6 @@ "ctxt": 0 }, "value": "walker", - "typeAnnotation": null, "optional": false }, "property": { @@ -24217,7 +23284,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24230,7 +23296,6 @@ "ctxt": 0 }, "value": "goChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -24243,7 +23308,6 @@ "ctxt": 0 }, "value": "go", - "typeAnnotation": null, "optional": false } } @@ -24263,7 +23327,6 @@ "ctxt": 0 }, "value": "ast", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserS7.2_A1.5_T2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserS7.2_A1.5_T2/input.ts.json index 3696349fa939..973dffa970df 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserS7.2_A1.5_T2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserS7.2_A1.5_T2/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "eval", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -76,7 +75,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -119,7 +117,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -162,7 +159,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -201,8 +197,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -240,7 +236,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -283,7 +278,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -326,7 +320,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserS7.3_A1.1_T2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserS7.3_A1.1_T2/input.ts.json index b5a31f463a22..78707e2145c2 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserS7.3_A1.1_T2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserS7.3_A1.1_T2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -70,7 +70,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -113,7 +112,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -156,7 +154,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserS7.6_A4.2_T1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserS7.6_A4.2_T1/input.ts.json index 7384b0c86bbc..e4b18df9745a 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserS7.6_A4.2_T1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserS7.6_A4.2_T1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "А", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -70,7 +70,6 @@ "ctxt": 0 }, "value": "А", - "typeAnnotation": null, "optional": false }, "right": { @@ -113,7 +112,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -167,8 +165,8 @@ "ctxt": 0 }, "value": "Б", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -206,7 +204,6 @@ "ctxt": 0 }, "value": "Б", - "typeAnnotation": null, "optional": false }, "right": { @@ -249,7 +246,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -303,8 +299,8 @@ "ctxt": 0 }, "value": "В", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -342,7 +338,6 @@ "ctxt": 0 }, "value": "В", - "typeAnnotation": null, "optional": false }, "right": { @@ -385,7 +380,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -439,8 +433,8 @@ "ctxt": 0 }, "value": "Г", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -478,7 +472,6 @@ "ctxt": 0 }, "value": "Г", - "typeAnnotation": null, "optional": false }, "right": { @@ -521,7 +514,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -575,8 +567,8 @@ "ctxt": 0 }, "value": "Д", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -614,7 +606,6 @@ "ctxt": 0 }, "value": "Д", - "typeAnnotation": null, "optional": false }, "right": { @@ -657,7 +648,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -711,8 +701,8 @@ "ctxt": 0 }, "value": "Е", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -750,7 +740,6 @@ "ctxt": 0 }, "value": "Е", - "typeAnnotation": null, "optional": false }, "right": { @@ -793,7 +782,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -847,8 +835,8 @@ "ctxt": 0 }, "value": "Ж", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -886,7 +874,6 @@ "ctxt": 0 }, "value": "Ж", - "typeAnnotation": null, "optional": false }, "right": { @@ -929,7 +916,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -983,8 +969,8 @@ "ctxt": 0 }, "value": "З", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1022,7 +1008,6 @@ "ctxt": 0 }, "value": "З", - "typeAnnotation": null, "optional": false }, "right": { @@ -1065,7 +1050,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1119,8 +1103,8 @@ "ctxt": 0 }, "value": "И", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1158,7 +1142,6 @@ "ctxt": 0 }, "value": "И", - "typeAnnotation": null, "optional": false }, "right": { @@ -1201,7 +1184,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1255,8 +1237,8 @@ "ctxt": 0 }, "value": "Й", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1294,7 +1276,6 @@ "ctxt": 0 }, "value": "Й", - "typeAnnotation": null, "optional": false }, "right": { @@ -1337,7 +1318,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1391,8 +1371,8 @@ "ctxt": 0 }, "value": "К", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1430,7 +1410,6 @@ "ctxt": 0 }, "value": "К", - "typeAnnotation": null, "optional": false }, "right": { @@ -1473,7 +1452,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1527,8 +1505,8 @@ "ctxt": 0 }, "value": "Л", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1566,7 +1544,6 @@ "ctxt": 0 }, "value": "Л", - "typeAnnotation": null, "optional": false }, "right": { @@ -1609,7 +1586,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1663,8 +1639,8 @@ "ctxt": 0 }, "value": "М", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1702,7 +1678,6 @@ "ctxt": 0 }, "value": "М", - "typeAnnotation": null, "optional": false }, "right": { @@ -1745,7 +1720,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1799,8 +1773,8 @@ "ctxt": 0 }, "value": "Н", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1838,7 +1812,6 @@ "ctxt": 0 }, "value": "Н", - "typeAnnotation": null, "optional": false }, "right": { @@ -1881,7 +1854,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1935,8 +1907,8 @@ "ctxt": 0 }, "value": "О", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1974,7 +1946,6 @@ "ctxt": 0 }, "value": "О", - "typeAnnotation": null, "optional": false }, "right": { @@ -2017,7 +1988,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2071,8 +2041,8 @@ "ctxt": 0 }, "value": "П", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2110,7 +2080,6 @@ "ctxt": 0 }, "value": "П", - "typeAnnotation": null, "optional": false }, "right": { @@ -2153,7 +2122,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2207,8 +2175,8 @@ "ctxt": 0 }, "value": "Р", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2246,7 +2214,6 @@ "ctxt": 0 }, "value": "Р", - "typeAnnotation": null, "optional": false }, "right": { @@ -2289,7 +2256,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2343,8 +2309,8 @@ "ctxt": 0 }, "value": "С", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2382,7 +2348,6 @@ "ctxt": 0 }, "value": "С", - "typeAnnotation": null, "optional": false }, "right": { @@ -2425,7 +2390,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2479,8 +2443,8 @@ "ctxt": 0 }, "value": "Т", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2518,7 +2482,6 @@ "ctxt": 0 }, "value": "Т", - "typeAnnotation": null, "optional": false }, "right": { @@ -2561,7 +2524,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2615,8 +2577,8 @@ "ctxt": 0 }, "value": "У", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2654,7 +2616,6 @@ "ctxt": 0 }, "value": "У", - "typeAnnotation": null, "optional": false }, "right": { @@ -2697,7 +2658,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2751,8 +2711,8 @@ "ctxt": 0 }, "value": "Ф", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2790,7 +2750,6 @@ "ctxt": 0 }, "value": "Ф", - "typeAnnotation": null, "optional": false }, "right": { @@ -2833,7 +2792,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2887,8 +2845,8 @@ "ctxt": 0 }, "value": "Х", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2926,7 +2884,6 @@ "ctxt": 0 }, "value": "Х", - "typeAnnotation": null, "optional": false }, "right": { @@ -2969,7 +2926,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3023,8 +2979,8 @@ "ctxt": 0 }, "value": "Ц", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -3062,7 +3018,6 @@ "ctxt": 0 }, "value": "Ц", - "typeAnnotation": null, "optional": false }, "right": { @@ -3105,7 +3060,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3159,8 +3113,8 @@ "ctxt": 0 }, "value": "Ч", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -3198,7 +3152,6 @@ "ctxt": 0 }, "value": "Ч", - "typeAnnotation": null, "optional": false }, "right": { @@ -3241,7 +3194,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3295,8 +3247,8 @@ "ctxt": 0 }, "value": "Ш", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -3334,7 +3286,6 @@ "ctxt": 0 }, "value": "Ш", - "typeAnnotation": null, "optional": false }, "right": { @@ -3377,7 +3328,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3431,8 +3381,8 @@ "ctxt": 0 }, "value": "Щ", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -3470,7 +3420,6 @@ "ctxt": 0 }, "value": "Щ", - "typeAnnotation": null, "optional": false }, "right": { @@ -3513,7 +3462,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3567,8 +3515,8 @@ "ctxt": 0 }, "value": "Ъ", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -3606,7 +3554,6 @@ "ctxt": 0 }, "value": "Ъ", - "typeAnnotation": null, "optional": false }, "right": { @@ -3649,7 +3596,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3703,8 +3649,8 @@ "ctxt": 0 }, "value": "Ы", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -3742,7 +3688,6 @@ "ctxt": 0 }, "value": "Ы", - "typeAnnotation": null, "optional": false }, "right": { @@ -3785,7 +3730,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3839,8 +3783,8 @@ "ctxt": 0 }, "value": "Ь", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -3878,7 +3822,6 @@ "ctxt": 0 }, "value": "Ь", - "typeAnnotation": null, "optional": false }, "right": { @@ -3921,7 +3864,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3975,8 +3917,8 @@ "ctxt": 0 }, "value": "Э", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -4014,7 +3956,6 @@ "ctxt": 0 }, "value": "Э", - "typeAnnotation": null, "optional": false }, "right": { @@ -4057,7 +3998,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4111,8 +4051,8 @@ "ctxt": 0 }, "value": "Ю", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -4150,7 +4090,6 @@ "ctxt": 0 }, "value": "Ю", - "typeAnnotation": null, "optional": false }, "right": { @@ -4193,7 +4132,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4247,8 +4185,8 @@ "ctxt": 0 }, "value": "Я", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -4286,7 +4224,6 @@ "ctxt": 0 }, "value": "Я", - "typeAnnotation": null, "optional": false }, "right": { @@ -4329,7 +4266,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4383,8 +4319,8 @@ "ctxt": 0 }, "value": "Ё", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -4422,7 +4358,6 @@ "ctxt": 0 }, "value": "Ё", - "typeAnnotation": null, "optional": false }, "right": { @@ -4465,7 +4400,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserUnicode1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserUnicode1/input.ts.json index d9de04cd64c7..c2b1d16aa6ff 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserUnicode1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserUnicode1/input.ts.json @@ -46,8 +46,8 @@ "ctxt": 0 }, "value": "xx", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -85,7 +85,6 @@ "ctxt": 0 }, "value": "xx", - "typeAnnotation": null, "optional": false }, "right": { @@ -128,7 +127,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -171,7 +169,6 @@ "ctxt": 0 }, "value": "xx", - "typeAnnotation": null, "optional": false } } @@ -202,8 +199,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -235,7 +232,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -278,7 +274,6 @@ "ctxt": 0 }, "value": "xx", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserUnicode2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserUnicode2/input.ts.json index f09747bf163a..14cfa9dcd6ee 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserUnicode2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserUnicode2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserUnicode3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserUnicode3/input.ts.json index bbe0df1a0c0c..83eebf5a3b0d 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserUnicode3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserUnicode3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "剩下", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserUnicodeWhitespaceCharacter1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserUnicodeWhitespaceCharacter1/input.ts.json index f469e73ccdfb..f8d27fd14f8c 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserUnicodeWhitespaceCharacter1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserUnicodeWhitespaceCharacter1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserUsingConstructorAsIdentifier/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserUsingConstructorAsIdentifier/input.ts.json index 03e309ca99e8..ee088a03d818 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserUsingConstructorAsIdentifier/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parserUsingConstructorAsIdentifier/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "define", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -57,8 +56,8 @@ "ctxt": 0 }, "value": "instanceMembers", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -77,8 +76,8 @@ "ctxt": 0 }, "value": "staticMembers", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -119,8 +118,8 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -138,7 +137,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "right": { @@ -204,7 +202,6 @@ "ctxt": 0 }, "value": "PluginUtilities", - "typeAnnotation": null, "optional": false }, "property": { @@ -215,7 +212,6 @@ "ctxt": 0 }, "value": "Utilities", - "typeAnnotation": null, "optional": false }, "computed": false @@ -228,7 +224,6 @@ "ctxt": 0 }, "value": "markSupportedForProcessing", - "typeAnnotation": null, "optional": false }, "computed": false @@ -244,7 +239,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false } } @@ -267,7 +261,6 @@ "ctxt": 0 }, "value": "instanceMembers", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -300,7 +293,6 @@ "ctxt": 0 }, "value": "initializeProperties", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -321,7 +313,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "property": { @@ -332,7 +323,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -348,7 +338,6 @@ "ctxt": 0 }, "value": "instanceMembers", - "typeAnnotation": null, "optional": false } } @@ -375,7 +364,6 @@ "ctxt": 0 }, "value": "staticMembers", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -408,7 +396,6 @@ "ctxt": 0 }, "value": "initializeProperties", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -422,7 +409,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false } }, @@ -436,7 +422,6 @@ "ctxt": 0 }, "value": "staticMembers", - "typeAnnotation": null, "optional": false } } @@ -463,7 +448,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false } } @@ -484,7 +468,6 @@ "ctxt": 0 }, "value": "derive", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -505,8 +488,8 @@ "ctxt": 0 }, "value": "baseClass", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -525,8 +508,8 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -545,8 +528,8 @@ "ctxt": 0 }, "value": "instanceMembers", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -565,8 +548,8 @@ "ctxt": 0 }, "value": "staticMembers", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -599,7 +582,6 @@ "ctxt": 0 }, "value": "baseClass", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -633,8 +615,8 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -652,7 +634,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "right": { @@ -707,8 +688,8 @@ "ctxt": 0 }, "value": "basePrototype", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -725,7 +706,6 @@ "ctxt": 0 }, "value": "baseClass", - "typeAnnotation": null, "optional": false }, "property": { @@ -736,7 +716,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -775,7 +754,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "property": { @@ -786,7 +764,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -813,7 +790,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -824,7 +800,6 @@ "ctxt": 0 }, "value": "create", - "typeAnnotation": null, "optional": false }, "computed": false @@ -840,7 +815,6 @@ "ctxt": 0 }, "value": "basePrototype", - "typeAnnotation": null, "optional": false } } @@ -885,7 +859,6 @@ "ctxt": 0 }, "value": "PluginUtilities", - "typeAnnotation": null, "optional": false }, "property": { @@ -896,7 +869,6 @@ "ctxt": 0 }, "value": "Utilities", - "typeAnnotation": null, "optional": false }, "computed": false @@ -909,7 +881,6 @@ "ctxt": 0 }, "value": "markSupportedForProcessing", - "typeAnnotation": null, "optional": false }, "computed": false @@ -925,7 +896,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false } } @@ -962,7 +932,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -973,7 +942,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -996,7 +964,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "property": { @@ -1007,7 +974,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1050,7 +1016,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -1061,7 +1026,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false } }, @@ -1075,7 +1039,6 @@ "ctxt": 0 }, "value": "writable", - "typeAnnotation": null, "optional": false }, "value": { @@ -1098,7 +1061,6 @@ "ctxt": 0 }, "value": "configurable", - "typeAnnotation": null, "optional": false }, "value": { @@ -1121,7 +1083,6 @@ "ctxt": 0 }, "value": "enumerable", - "typeAnnotation": null, "optional": false }, "value": { @@ -1156,7 +1117,6 @@ "ctxt": 0 }, "value": "instanceMembers", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1189,7 +1149,6 @@ "ctxt": 0 }, "value": "initializeProperties", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1210,7 +1169,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "property": { @@ -1221,7 +1179,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1237,7 +1194,6 @@ "ctxt": 0 }, "value": "instanceMembers", - "typeAnnotation": null, "optional": false } } @@ -1264,7 +1220,6 @@ "ctxt": 0 }, "value": "staticMembers", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1297,7 +1252,6 @@ "ctxt": 0 }, "value": "initializeProperties", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1311,7 +1265,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false } }, @@ -1325,7 +1278,6 @@ "ctxt": 0 }, "value": "staticMembers", - "typeAnnotation": null, "optional": false } } @@ -1352,7 +1304,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false } } @@ -1388,7 +1339,6 @@ "ctxt": 0 }, "value": "define", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1402,7 +1352,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false } }, @@ -1416,7 +1365,6 @@ "ctxt": 0 }, "value": "instanceMembers", - "typeAnnotation": null, "optional": false } }, @@ -1430,7 +1378,6 @@ "ctxt": 0 }, "value": "staticMembers", - "typeAnnotation": null, "optional": false } } @@ -1458,7 +1405,6 @@ "ctxt": 0 }, "value": "mix", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1479,8 +1425,8 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1521,8 +1467,8 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1540,7 +1486,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "right": { @@ -1595,8 +1540,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1616,8 +1561,8 @@ "ctxt": 0 }, "value": "len", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1655,8 +1600,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1684,8 +1629,8 @@ "ctxt": 0 }, "value": "len", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1702,7 +1647,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "property": { @@ -1713,7 +1657,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1737,7 +1680,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "right": { @@ -1748,7 +1690,6 @@ "ctxt": 0 }, "value": "len", - "typeAnnotation": null, "optional": false } }, @@ -1769,7 +1710,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -1803,7 +1743,6 @@ "ctxt": 0 }, "value": "initializeProperties", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1824,7 +1763,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "property": { @@ -1835,7 +1773,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1858,7 +1795,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "property": { @@ -1869,7 +1805,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1897,7 +1832,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parservoidInQualifiedName0/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parservoidInQualifiedName0/input.ts.json index 2f25bb88e37d..d0c4c11db52b 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parservoidInQualifiedName0/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parservoidInQualifiedName0/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parservoidInQualifiedName2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parservoidInQualifiedName2/input.ts.json index 294c4ccd4339..a9bc49463e02 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parservoidInQualifiedName2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript5/parservoidInQualifiedName2/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -55,7 +56,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -66,14 +66,12 @@ "ctxt": 0 }, "value": "void", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName12/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName12/input.ts.json index 312cb68a445d..dbbae74e27f7 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName12/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName12/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName17/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName17/input.ts.json index dc98c8a6d3f1..c05a95091ffd 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName17/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName17/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -64,7 +64,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -76,8 +75,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName2/input.ts.json index 038abb59ed65..cfd0e4484440 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -59,7 +59,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName23/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName23/input.ts.json index 24783170f887..21da2a7bee6e 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName23/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName23/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName24/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName24/input.ts.json index aba1182d96cc..63a19740636d 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName24/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName24/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -71,8 +69,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName3/input.ts.json index 4ce261282af7..0187430a63a5 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName3/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -59,7 +59,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName37/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName37/input.ts.json index 2d1c7f285391..06a7cf14d84a 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName37/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName37/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -59,7 +59,6 @@ "ctxt": 0 }, "value": "public", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName4/input.ts.json index f0fd2d32bb6b..207dfa8a7e02 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName4/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -64,7 +64,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName40/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName40/input.ts.json index c8196e51e416..a97d39a98550 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName40/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName40/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "consequent": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName41/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName41/input.ts.json index f2c9b90892ef..6e26a3015fd0 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName41/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName41/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName6/input.ts.json index 766509a9b324..d68ca7457a08 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -59,7 +59,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -98,7 +97,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "right": { @@ -109,7 +107,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement10/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement10/input.ts.json index fa341a66d265..2f051b0c35ed 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement10/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement10/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -55,7 +55,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement11/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement11/input.ts.json index 54fc352bb8d5..88b5b487d073 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement11/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement11/input.ts.json @@ -47,8 +47,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -58,8 +58,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -78,7 +78,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement12/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement12/input.ts.json index 6c186906fb04..e840ff14134e 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement12/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement12/input.ts.json @@ -54,7 +54,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -74,7 +73,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement13/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement13/input.ts.json index 80cca2a965a6..0e2a1938c760 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement13/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement13/input.ts.json @@ -54,7 +54,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -74,7 +73,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement14/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement14/input.ts.json index 447f678f60c7..24e2c7fef9c3 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement14/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement14/input.ts.json @@ -47,8 +47,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -58,8 +58,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -78,7 +78,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement15/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement15/input.ts.json index e68012e31de3..242d1b2bc92c 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement15/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement15/input.ts.json @@ -47,8 +47,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -58,8 +58,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -78,7 +78,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement16/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement16/input.ts.json index ce976483a7ee..1e33bf5dfafa 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement16/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement16/input.ts.json @@ -54,7 +54,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -74,7 +73,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement17/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement17/input.ts.json index bea76c68b03c..6915a5387308 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement17/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement17/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "of", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement18/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement18/input.ts.json index d8d822bdb263..7fc13e51ad4e 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement18/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement18/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "of", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -55,7 +55,6 @@ "ctxt": 0 }, "value": "of", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement19/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement19/input.ts.json index 49664647a114..5fb915ae823c 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement19/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement19/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "of", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -54,7 +54,6 @@ "ctxt": 0 }, "value": "of", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement5/input.ts.json index d1280e6c2297..16f476314845 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement5/input.ts.json @@ -39,6 +39,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -55,8 +56,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -71,7 +71,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement8/input.ts.json index 28446c6ab50b..df6e93185827 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement8/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -55,7 +55,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement9/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement9/input.ts.json index 8b1fad17bd88..88994acb2679 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement9/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Iterators/parserForOfStatement9/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -55,7 +55,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty1/input.ts.json index 4bacdf88fda2..00c9d04c0215 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty1/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty2/input.ts.json index b92f0e674c25..550f2914590e 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "unscopables", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty3/input.ts.json index 01cbf073e844..89624867f4ea 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "unscopables", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty4/input.ts.json index 07338c8ab6bf..359c69de29c5 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -60,7 +58,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty5/input.ts.json index 3fc917e59215..5db33045323f 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -60,7 +58,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty6/input.ts.json index df00370038f9..f606c4eee5e8 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -60,7 +58,6 @@ "ctxt": 0 }, "value": "toStringTag", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty7/input.ts.json index f8293aefc84c..ba9417c6925a 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty7/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "toStringTag", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty8/input.ts.json index 44dab9668e6f..9047e4fe9c62 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty8/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -69,7 +70,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -80,7 +80,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false @@ -109,8 +108,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty9/input.ts.json b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty9/input.ts.json index 268c02c0b951..d0deb63b020c 100644 --- a/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty9/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/parser/ecmascript6/Symbols/parserSymbolProperty9/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -69,7 +70,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -80,7 +80,6 @@ "ctxt": 0 }, "value": "toPrimitive", - "typeAnnotation": null, "optional": false }, "computed": false @@ -110,8 +109,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/pedantic/noUncheckedIndexedAccess/input.ts.json b/ecmascript/parser/tests/typescript/tsc/pedantic/noUncheckedIndexedAccess/input.ts.json index dcd40a3185a6..d7197e405736 100644 --- a/ecmascript/parser/tests/typescript/tsc/pedantic/noUncheckedIndexedAccess/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/pedantic/noUncheckedIndexedAccess/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "CheckBooleanOnly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "T_ERR1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "CheckBooleanOnly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "NumericEnum1", - "typeAnnotation": null, "optional": false }, "members": [ @@ -188,7 +183,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -208,7 +202,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -228,7 +221,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -252,7 +244,6 @@ "ctxt": 0 }, "value": "NumericEnum2", - "typeAnnotation": null, "optional": false }, "members": [ @@ -271,7 +262,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": { @@ -299,7 +289,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": { @@ -327,7 +316,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": { @@ -359,7 +347,6 @@ "ctxt": 0 }, "value": "StringEnum1", - "typeAnnotation": null, "optional": false }, "members": [ @@ -378,7 +365,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": { @@ -411,7 +397,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": { @@ -456,6 +441,7 @@ "ctxt": 0 }, "value": "strMap", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -482,6 +468,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -498,8 +485,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -528,8 +514,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -561,6 +546,7 @@ "ctxt": 0 }, "value": "e1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -577,8 +563,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -595,7 +580,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -643,6 +627,7 @@ "ctxt": 0 }, "value": "e2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -659,8 +644,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -677,7 +661,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -688,7 +671,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -722,6 +704,7 @@ "ctxt": 0 }, "value": "e3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -738,8 +721,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -756,7 +738,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -799,6 +780,7 @@ "ctxt": 0 }, "value": "e4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -815,8 +797,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -833,7 +814,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -912,6 +892,7 @@ "ctxt": 0 }, "value": "e5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -928,8 +909,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -946,7 +926,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -1050,6 +1029,7 @@ "ctxt": 0 }, "value": "e6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1066,8 +1046,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -1084,7 +1063,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -1179,6 +1157,7 @@ "ctxt": 0 }, "value": "e7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1195,8 +1174,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -1213,7 +1191,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -1323,6 +1300,7 @@ "ctxt": 0 }, "value": "e8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1339,8 +1317,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -1357,7 +1334,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -1375,7 +1351,6 @@ "ctxt": 0 }, "value": "NumericEnum1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1386,7 +1361,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1422,6 +1396,7 @@ "ctxt": 0 }, "value": "e9", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1438,8 +1413,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -1456,7 +1430,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -1474,7 +1447,6 @@ "ctxt": 0 }, "value": "NumericEnum2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1485,7 +1457,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1521,6 +1492,7 @@ "ctxt": 0 }, "value": "e10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1537,8 +1509,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -1555,7 +1526,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -1573,7 +1543,6 @@ "ctxt": 0 }, "value": "StringEnum1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1584,7 +1553,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1620,6 +1588,7 @@ "ctxt": 0 }, "value": "e11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1636,8 +1605,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -1654,7 +1622,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -1679,7 +1646,6 @@ "ctxt": 0 }, "value": "StringEnum1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1690,7 +1656,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1710,7 +1675,6 @@ "ctxt": 0 }, "value": "StringEnum1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1747,6 +1711,7 @@ "ctxt": 0 }, "value": "e12", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1763,8 +1728,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -1781,7 +1745,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -1806,7 +1769,6 @@ "ctxt": 0 }, "value": "NumericEnum1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1817,7 +1779,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1837,7 +1798,6 @@ "ctxt": 0 }, "value": "NumericEnum1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1874,6 +1834,7 @@ "ctxt": 0 }, "value": "e13", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1890,8 +1851,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -1908,7 +1868,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -1933,7 +1892,6 @@ "ctxt": 0 }, "value": "NumericEnum2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1944,7 +1902,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1964,7 +1921,6 @@ "ctxt": 0 }, "value": "NumericEnum2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2001,6 +1957,7 @@ "ctxt": 0 }, "value": "e14", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2017,8 +1974,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -2035,7 +1991,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -2094,6 +2049,7 @@ "ctxt": 0 }, "value": "ok1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2129,8 +2085,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -2147,7 +2102,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -2195,6 +2149,7 @@ "ctxt": 0 }, "value": "ok2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2230,8 +2185,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -2248,7 +2202,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -2259,7 +2212,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2284,7 +2236,6 @@ "ctxt": 0 }, "value": "T_OK1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2303,7 +2254,6 @@ "ctxt": 0 }, "value": "CheckBooleanOnly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2344,7 +2294,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false } } @@ -2379,7 +2328,6 @@ "ctxt": 0 }, "value": "T_OK2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2398,7 +2346,6 @@ "ctxt": 0 }, "value": "CheckBooleanOnly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2439,7 +2386,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false } } @@ -2487,7 +2433,6 @@ "ctxt": 0 }, "value": "T_OK3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2506,7 +2451,6 @@ "ctxt": 0 }, "value": "CheckBooleanOnly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2547,7 +2491,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false } } @@ -2627,7 +2570,6 @@ "ctxt": 0 }, "value": "T_OK4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2646,7 +2588,6 @@ "ctxt": 0 }, "value": "CheckBooleanOnly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2687,7 +2628,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false } } @@ -2722,7 +2662,6 @@ "ctxt": 0 }, "value": "T_OK5", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2741,7 +2680,6 @@ "ctxt": 0 }, "value": "CheckBooleanOnly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2782,7 +2720,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false } } @@ -2831,7 +2768,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -2858,7 +2794,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2893,7 +2828,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -2904,7 +2838,6 @@ "ctxt": 0 }, "value": "qua", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2917,7 +2850,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2952,7 +2884,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -2974,7 +2905,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -3009,7 +2939,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -3047,7 +2976,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -3077,6 +3005,7 @@ "ctxt": 0 }, "value": "numMap", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3103,6 +3032,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3119,8 +3049,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3149,8 +3078,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3182,6 +3110,7 @@ "ctxt": 0 }, "value": "num_ok1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3198,8 +3127,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -3216,7 +3144,6 @@ "ctxt": 0 }, "value": "numMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -3259,6 +3186,7 @@ "ctxt": 0 }, "value": "num_ok2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3275,8 +3203,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -3293,7 +3220,6 @@ "ctxt": 0 }, "value": "numMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -3353,6 +3279,7 @@ "ctxt": 0 }, "value": "num_ok3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3369,8 +3296,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -3387,7 +3313,6 @@ "ctxt": 0 }, "value": "numMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -3482,6 +3407,7 @@ "ctxt": 0 }, "value": "num_ok4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3498,8 +3424,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -3516,7 +3441,6 @@ "ctxt": 0 }, "value": "numMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -3534,7 +3458,6 @@ "ctxt": 0 }, "value": "NumericEnum1", - "typeAnnotation": null, "optional": false }, "property": { @@ -3545,7 +3468,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3581,6 +3503,7 @@ "ctxt": 0 }, "value": "num_ok5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3597,8 +3520,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -3615,7 +3537,6 @@ "ctxt": 0 }, "value": "numMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -3633,7 +3554,6 @@ "ctxt": 0 }, "value": "NumericEnum2", - "typeAnnotation": null, "optional": false }, "property": { @@ -3644,7 +3564,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3665,7 +3584,6 @@ "ctxt": 0 }, "value": "generic1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3686,6 +3604,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3708,13 +3627,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3754,7 +3671,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "property": { @@ -3801,7 +3717,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3823,6 +3738,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3839,8 +3755,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3901,7 +3816,6 @@ "ctxt": 0 }, "value": "generic2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3922,6 +3836,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3944,13 +3859,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3997,7 +3910,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "property": { @@ -4045,7 +3957,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4067,6 +3978,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4083,8 +3995,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4145,7 +4056,6 @@ "ctxt": 0 }, "value": "generic3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4166,6 +4076,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4188,13 +4099,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4234,7 +4143,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -4245,7 +4153,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4278,7 +4185,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4337,6 +4243,7 @@ "ctxt": 0 }, "value": "obj1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4368,7 +4275,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4410,7 +4316,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4447,6 +4352,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4463,8 +4369,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4512,8 +4417,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -4542,7 +4446,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -4587,8 +4490,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -4630,7 +4533,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -4641,7 +4543,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4672,8 +4573,8 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -4715,7 +4616,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -4726,7 +4626,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4757,8 +4656,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -4800,7 +4699,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -4811,7 +4709,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4842,6 +4739,7 @@ "ctxt": 0 }, "value": "strMapUnion", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4876,6 +4774,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4892,8 +4791,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4941,6 +4839,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4957,8 +4856,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4989,8 +4887,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -5022,6 +4919,7 @@ "ctxt": 0 }, "value": "f1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5057,8 +4955,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -5075,7 +4972,6 @@ "ctxt": 0 }, "value": "strMapUnion", - "typeAnnotation": null, "optional": false }, "property": { @@ -5123,6 +5019,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5148,8 +5045,7 @@ "kind": "symbol" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5181,6 +5077,7 @@ "ctxt": 0 }, "value": "symbolMap", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5212,7 +5109,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": true, @@ -5240,8 +5136,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -5273,6 +5168,7 @@ "ctxt": 0 }, "value": "e15", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5289,8 +5185,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -5307,7 +5202,6 @@ "ctxt": 0 }, "value": "symbolMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -5318,7 +5212,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": true @@ -5357,7 +5250,6 @@ "ctxt": 0 }, "value": "symbolMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -5368,7 +5260,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": true @@ -5381,7 +5272,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -5411,6 +5301,7 @@ "ctxt": 0 }, "value": "nonEmptyStringArray", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5480,8 +5371,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -5513,6 +5403,7 @@ "ctxt": 0 }, "value": "variadicOk1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5529,8 +5420,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -5547,7 +5437,6 @@ "ctxt": 0 }, "value": "nonEmptyStringArray", - "typeAnnotation": null, "optional": false }, "property": { @@ -5590,6 +5479,7 @@ "ctxt": 0 }, "value": "variadicError1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5606,8 +5496,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -5624,7 +5513,6 @@ "ctxt": 0 }, "value": "nonEmptyStringArray", - "typeAnnotation": null, "optional": false }, "property": { @@ -5667,6 +5555,7 @@ "ctxt": 0 }, "value": "myRecord1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5698,7 +5587,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5740,7 +5628,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5768,8 +5655,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -5801,6 +5687,7 @@ "ctxt": 0 }, "value": "myRecord2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5832,7 +5719,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5874,7 +5760,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5911,6 +5796,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5927,8 +5813,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -5957,8 +5842,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -5990,8 +5874,8 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -6009,6 +5893,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6031,13 +5916,11 @@ "ctxt": 0 }, "value": "Key", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -6055,7 +5938,6 @@ "ctxt": 0 }, "value": "myRecord1", - "typeAnnotation": null, "optional": false }, "property": { @@ -6066,7 +5948,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -6096,7 +5977,6 @@ "ctxt": 0 }, "value": "Key", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6122,7 +6002,6 @@ "ctxt": 0 }, "value": "myRecord1", - "typeAnnotation": null, "optional": false } } @@ -6178,8 +6057,8 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -6197,6 +6076,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6219,13 +6099,11 @@ "ctxt": 0 }, "value": "Key", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -6243,7 +6121,6 @@ "ctxt": 0 }, "value": "myRecord2", - "typeAnnotation": null, "optional": false }, "property": { @@ -6254,7 +6131,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -6284,7 +6160,6 @@ "ctxt": 0 }, "value": "Key", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6310,7 +6185,6 @@ "ctxt": 0 }, "value": "myRecord1", - "typeAnnotation": null, "optional": false } } @@ -6366,8 +6240,8 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -6385,6 +6259,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6407,13 +6282,11 @@ "ctxt": 0 }, "value": "Key", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -6454,7 +6327,6 @@ "ctxt": 0 }, "value": "myRecord2", - "typeAnnotation": null, "optional": false }, "property": { @@ -6465,7 +6337,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -6478,7 +6349,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -6508,6 +6378,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6524,8 +6395,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -6542,7 +6412,6 @@ "ctxt": 0 }, "value": "myRecord2", - "typeAnnotation": null, "optional": false }, "property": { @@ -6553,7 +6422,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -6589,7 +6457,6 @@ "ctxt": 0 }, "value": "Key", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6615,7 +6482,6 @@ "ctxt": 0 }, "value": "myRecord2", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/pedantic/noUncheckedIndexedAccessDestructuring/input.ts.json b/ecmascript/parser/tests/typescript/tsc/pedantic/noUncheckedIndexedAccessDestructuring/input.ts.json index aea0c51ed85e..71089abe80ff 100644 --- a/ecmascript/parser/tests/typescript/tsc/pedantic/noUncheckedIndexedAccessDestructuring/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/pedantic/noUncheckedIndexedAccessDestructuring/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "strArray", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -55,8 +56,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -88,6 +88,7 @@ "ctxt": 0 }, "value": "strStrTuple", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -141,8 +142,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -182,8 +182,8 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -197,7 +197,6 @@ "ctxt": 0 }, "value": "strArray", - "typeAnnotation": null, "optional": false }, "definite": false @@ -233,7 +232,6 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, "optional": false }, "property": { @@ -244,7 +242,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -298,8 +295,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -315,7 +312,6 @@ "ctxt": 0 }, "value": "strArray", - "typeAnnotation": null, "optional": false }, "definite": false @@ -351,7 +347,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false }, "property": { @@ -362,7 +357,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -378,7 +372,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -433,8 +426,8 @@ "ctxt": 0 }, "value": "s3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -450,7 +443,6 @@ "ctxt": 0 }, "value": "strArray", - "typeAnnotation": null, "optional": false }, "definite": false @@ -486,7 +478,6 @@ "ctxt": 0 }, "value": "s3", - "typeAnnotation": null, "optional": false }, "property": { @@ -497,7 +488,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -513,7 +503,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -546,6 +535,7 @@ "ctxt": 0 }, "value": "strMap", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -572,6 +562,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -588,8 +579,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -618,8 +608,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -666,7 +655,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "value": null @@ -683,7 +671,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false }, "definite": false @@ -719,7 +706,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "property": { @@ -730,7 +716,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -784,8 +769,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -801,7 +786,6 @@ "ctxt": 0 }, "value": "strMap", - "typeAnnotation": null, "optional": false }, "definite": false @@ -844,7 +828,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "property": { @@ -855,7 +838,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -868,7 +850,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -902,6 +883,7 @@ "ctxt": 0 }, "value": "numMapPoint", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -941,7 +923,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -983,7 +964,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1030,6 +1010,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1046,8 +1027,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1078,8 +1058,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1134,7 +1113,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -1154,7 +1132,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -1174,7 +1151,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null @@ -1191,7 +1167,6 @@ "ctxt": 0 }, "value": "numMapPoint", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1227,7 +1202,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1238,7 +1212,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1276,7 +1249,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -1287,7 +1259,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1325,7 +1296,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "property": { @@ -1336,7 +1306,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1395,7 +1364,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -1420,8 +1388,8 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1437,7 +1405,6 @@ "ctxt": 0 }, "value": "numMapPoint", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1473,7 +1440,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1484,7 +1450,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1529,7 +1494,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "property": { @@ -1540,7 +1504,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1553,7 +1516,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1598,7 +1560,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "property": { @@ -1609,7 +1570,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1622,7 +1582,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1658,6 +1617,7 @@ "ctxt": 0 }, "value": "target_string", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1674,8 +1634,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1707,6 +1666,7 @@ "ctxt": 0 }, "value": "target_string_undef", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1742,8 +1702,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1775,6 +1734,7 @@ "ctxt": 0 }, "value": "target_string_arr", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1799,8 +1759,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1838,8 +1797,8 @@ "ctxt": 0 }, "value": "target_string", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1853,7 +1812,6 @@ "ctxt": 0 }, "value": "strArray", - "typeAnnotation": null, "optional": false } } @@ -1889,8 +1847,8 @@ "ctxt": 0 }, "value": "target_string_undef", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1904,7 +1862,6 @@ "ctxt": 0 }, "value": "strArray", - "typeAnnotation": null, "optional": false } } @@ -1955,8 +1912,8 @@ "ctxt": 0 }, "value": "target_string_arr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1972,7 +1929,6 @@ "ctxt": 0 }, "value": "strArray", - "typeAnnotation": null, "optional": false } } @@ -2010,6 +1966,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2026,8 +1983,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2047,6 +2003,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2063,8 +2020,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2084,6 +2040,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2119,8 +2076,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2172,7 +2128,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -2192,7 +2147,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -2212,7 +2166,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null @@ -2229,7 +2182,6 @@ "ctxt": 0 }, "value": "numMapPoint", - "typeAnnotation": null, "optional": false } } @@ -2260,6 +2212,7 @@ "ctxt": 0 }, "value": "q", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2276,8 +2229,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2329,7 +2281,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "value": null @@ -2346,7 +2297,6 @@ "ctxt": 0 }, "value": "numMapPoint", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/references/library-reference-1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/references/library-reference-1/input.ts.json index 32073dc5942b..b0566bb00695 100644 --- a/ecmascript/parser/tests/typescript/tsc/references/library-reference-1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/references/library-reference-1/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "$", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -89,8 +89,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -126,7 +125,6 @@ "ctxt": 0 }, "value": "$", - "typeAnnotation": null, "optional": false }, "property": { @@ -137,7 +135,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/references/library-reference-14/input.ts.json b/ecmascript/parser/tests/typescript/tsc/references/library-reference-14/input.ts.json index ed60f2b902ef..ac699af16a32 100644 --- a/ecmascript/parser/tests/typescript/tsc/references/library-reference-14/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/references/library-reference-14/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "$", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -89,8 +89,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -126,7 +125,6 @@ "ctxt": 0 }, "value": "$", - "typeAnnotation": null, "optional": false }, "property": { @@ -137,7 +135,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/references/library-reference-15/input.ts.json b/ecmascript/parser/tests/typescript/tsc/references/library-reference-15/input.ts.json index 1062a17f208a..e83444c870d6 100644 --- a/ecmascript/parser/tests/typescript/tsc/references/library-reference-15/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/references/library-reference-15/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "$", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -89,8 +89,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -122,6 +121,7 @@ "ctxt": 0 }, "value": "$2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -153,7 +153,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -180,8 +179,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -217,7 +215,6 @@ "ctxt": 0 }, "value": "$", - "typeAnnotation": null, "optional": false }, "property": { @@ -228,7 +225,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -266,7 +262,6 @@ "ctxt": 0 }, "value": "$2", - "typeAnnotation": null, "optional": false }, "property": { @@ -277,7 +272,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/references/library-reference-3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/references/library-reference-3/input.ts.json index 88e1ffecc243..3319269f3da5 100644 --- a/ecmascript/parser/tests/typescript/tsc/references/library-reference-3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/references/library-reference-3/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "$", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -89,8 +89,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -126,7 +125,6 @@ "ctxt": 0 }, "value": "$", - "typeAnnotation": null, "optional": false }, "property": { @@ -137,7 +135,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/references/library-reference-4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/references/library-reference-4/input.ts.json index 963274b6fcc3..f40bb1d9bad9 100644 --- a/ecmascript/parser/tests/typescript/tsc/references/library-reference-4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/references/library-reference-4/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "alpha", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "bar", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,6 +178,7 @@ "ctxt": 0 }, "value": "alpha", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -194,8 +195,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/references/library-reference-5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/references/library-reference-5/input.ts.json index 0acd1e25b483..e17274b9c1cc 100644 --- a/ecmascript/parser/tests/typescript/tsc/references/library-reference-5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/references/library-reference-5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "alpha", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "bar", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,6 +178,7 @@ "ctxt": 0 }, "value": "alpha", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -194,8 +195,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/references/library-reference-6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/references/library-reference-6/input.ts.json index b1cfc53fba28..ce0d0f472168 100644 --- a/ecmascript/parser/tests/typescript/tsc/references/library-reference-6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/references/library-reference-6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "alpha", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,8 +90,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -123,6 +122,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -139,8 +139,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -157,7 +156,6 @@ "ctxt": 0 }, "value": "alpha", - "typeAnnotation": null, "optional": false }, "property": { @@ -168,7 +166,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/references/library-reference-7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/references/library-reference-7/input.ts.json index 41759153f5a0..368b573d7727 100644 --- a/ecmascript/parser/tests/typescript/tsc/references/library-reference-7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/references/library-reference-7/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "$", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -89,8 +89,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -126,7 +125,6 @@ "ctxt": 0 }, "value": "$", - "typeAnnotation": null, "optional": false }, "property": { @@ -137,7 +135,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/references/library-reference-8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/references/library-reference-8/input.ts.json index c96056c3ebdd..2bef386c6eb3 100644 --- a/ecmascript/parser/tests/typescript/tsc/references/library-reference-8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/references/library-reference-8/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "alpha", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,8 +90,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -123,6 +122,7 @@ "ctxt": 0 }, "value": "beta", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -154,7 +154,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -182,8 +181,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -215,6 +213,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -231,8 +230,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -257,7 +255,6 @@ "ctxt": 0 }, "value": "alpha", - "typeAnnotation": null, "optional": false }, "property": { @@ -268,7 +265,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -288,7 +284,6 @@ "ctxt": 0 }, "value": "beta", - "typeAnnotation": null, "optional": false }, "property": { @@ -299,7 +294,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/references/library-reference-scoped-packages/input.ts.json b/ecmascript/parser/tests/typescript/tsc/references/library-reference-scoped-packages/input.ts.json index bcec9ef04ea0..1a370227fc90 100644 --- a/ecmascript/parser/tests/typescript/tsc/references/library-reference-scoped-packages/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/references/library-reference-scoped-packages/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/annotatedThisPropertyInitializerDoesntNarrow/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/annotatedThisPropertyInitializerDoesntNarrow/input.ts.json index b511d1ae1d1e..555de0c021c0 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/annotatedThisPropertyInitializerDoesntNarrow/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/annotatedThisPropertyInitializerDoesntNarrow/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "mappy", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -79,7 +78,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -105,7 +103,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -155,7 +152,6 @@ "ctxt": 0 }, "value": "assets", - "typeAnnotation": null, "optional": false }, "computed": false @@ -191,7 +187,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -232,7 +227,6 @@ "ctxt": 0 }, "value": "mappy", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -261,7 +255,6 @@ "ctxt": 0 }, "value": "assets", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/assignmentToVoidZero1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/assignmentToVoidZero1/input.ts.json index 2fa5633dab9a..95cd86eca2c0 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/assignmentToVoidZero1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/assignmentToVoidZero1/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -75,7 +73,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -86,7 +83,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -142,7 +138,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -153,7 +148,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -199,7 +193,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -210,7 +203,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/assignmentToVoidZero2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/assignmentToVoidZero2/input.ts.json index 33e8fb7e7950..7d8803a886b8 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/assignmentToVoidZero2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/assignmentToVoidZero2/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "computed": false @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -104,7 +101,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": false @@ -154,8 +150,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -200,7 +196,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -211,7 +206,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -257,7 +251,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -268,7 +261,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -323,7 +315,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -334,7 +325,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -354,7 +344,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -365,7 +354,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -382,7 +370,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -439,7 +426,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -493,7 +479,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false @@ -550,8 +535,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -568,7 +553,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -608,7 +592,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -619,7 +602,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -639,7 +621,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -650,7 +631,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false @@ -680,7 +660,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "imported": null @@ -700,7 +679,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "imported": null @@ -746,7 +724,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "right": { @@ -757,7 +734,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/binderUninitializedModuleExportsAssignment/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/binderUninitializedModuleExportsAssignment/input.ts.json index dce2e0ae7112..851a577924e1 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/binderUninitializedModuleExportsAssignment/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/binderUninitializedModuleExportsAssignment/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "loop1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -42,7 +42,6 @@ "ctxt": 0 }, "value": "loop2", - "typeAnnotation": null, "optional": false }, "definite": false @@ -74,8 +73,8 @@ "ctxt": 0 }, "value": "loop2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -85,7 +84,6 @@ "ctxt": 0 }, "value": "loop1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -122,7 +120,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -133,7 +130,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "loop2", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/chainedPrototypeAssignment/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/chainedPrototypeAssignment/input.ts.json index 06eed9fbcb71..ba155db34edc 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/chainedPrototypeAssignment/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/chainedPrototypeAssignment/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -111,6 +110,7 @@ "ctxt": 0 }, "value": "exports", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -127,8 +127,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -160,8 +159,8 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -173,7 +172,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "params": [], @@ -229,7 +227,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -281,8 +278,8 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -294,7 +291,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "params": [], @@ -350,7 +346,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -407,7 +402,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -418,7 +412,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -431,7 +424,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } @@ -466,7 +458,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -477,7 +468,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -490,7 +480,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } } @@ -525,7 +514,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -536,7 +524,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -564,7 +551,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "property": { @@ -575,7 +561,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -598,7 +583,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "params": [ @@ -618,8 +602,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -660,7 +644,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -711,8 +694,8 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -729,7 +712,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -782,8 +764,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -807,7 +789,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -818,7 +799,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -855,8 +835,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -880,7 +860,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "property": { @@ -891,7 +870,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -932,7 +910,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -943,7 +920,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -999,7 +975,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1010,7 +985,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/checkSpecialPropertyAssignments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/checkSpecialPropertyAssignments/input.ts.json index 44d767035c01..e8a75d0f8303 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/checkSpecialPropertyAssignments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/checkSpecialPropertyAssignments/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -118,7 +116,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -162,8 +159,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -203,8 +200,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -234,8 +231,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -245,7 +242,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/circularMultipleAssignmentDeclaration/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/circularMultipleAssignmentDeclaration/input.ts.json index e5f7acbdca15..2aa5d059e863 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/circularMultipleAssignmentDeclaration/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/circularMultipleAssignmentDeclaration/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "computed": false @@ -75,7 +73,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -86,7 +83,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "computed": false @@ -109,7 +105,6 @@ "ctxt": 0 }, "value": "shared", - "typeAnnotation": null, "optional": false }, "value": { @@ -171,7 +166,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -182,7 +176,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "computed": false @@ -195,7 +188,6 @@ "ctxt": 0 }, "value": "shared", - "typeAnnotation": null, "optional": false }, "computed": false @@ -208,7 +200,6 @@ "ctxt": 0 }, "value": "mymethod", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/classCanExtendConstructorFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/classCanExtendConstructorFunction/input.ts.json index b1235ef1a267..1afba759e464 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/classCanExtendConstructorFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/classCanExtendConstructorFunction/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Wagon", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "numberOxen", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -94,7 +93,6 @@ "ctxt": 0 }, "value": "numberOxen", - "typeAnnotation": null, "optional": false }, "computed": false @@ -107,7 +105,6 @@ "ctxt": 0 }, "value": "numberOxen", - "typeAnnotation": null, "optional": false } } @@ -149,7 +146,6 @@ "ctxt": 0 }, "value": "Wagon", - "typeAnnotation": null, "optional": false }, "property": { @@ -160,7 +156,6 @@ "ctxt": 0 }, "value": "circle", - "typeAnnotation": null, "optional": false }, "computed": false @@ -185,8 +180,8 @@ "ctxt": 0 }, "value": "wagons", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -226,7 +221,6 @@ "ctxt": 0 }, "value": "wagons", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -244,7 +238,6 @@ "ctxt": 0 }, "value": "wagons", - "typeAnnotation": null, "optional": false }, "property": { @@ -255,7 +248,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -317,7 +309,6 @@ "ctxt": 0 }, "value": "Wagon", - "typeAnnotation": null, "optional": false }, "property": { @@ -328,7 +319,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -341,7 +331,6 @@ "ctxt": 0 }, "value": "load", - "typeAnnotation": null, "optional": false }, "computed": false @@ -366,8 +355,8 @@ "ctxt": 0 }, "value": "supplies", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -430,7 +419,6 @@ "ctxt": 0 }, "value": "Wagon", - "typeAnnotation": null, "optional": false }, "property": { @@ -441,7 +429,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -454,7 +441,6 @@ "ctxt": 0 }, "value": "weight", - "typeAnnotation": null, "optional": false }, "computed": false @@ -475,8 +461,8 @@ "ctxt": 0 }, "value": "supplies", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -494,7 +480,6 @@ "ctxt": 0 }, "value": "supplies", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -512,7 +497,6 @@ "ctxt": 0 }, "value": "supplies", - "typeAnnotation": null, "optional": false }, "property": { @@ -523,7 +507,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -591,7 +574,6 @@ "ctxt": 0 }, "value": "Wagon", - "typeAnnotation": null, "optional": false }, "property": { @@ -602,7 +584,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -615,7 +596,6 @@ "ctxt": 0 }, "value": "speed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -676,7 +656,6 @@ "ctxt": 0 }, "value": "numberOxen", - "typeAnnotation": null, "optional": false }, "computed": false @@ -711,7 +690,6 @@ "ctxt": 0 }, "value": "weight", - "typeAnnotation": null, "optional": false }, "computed": false @@ -740,7 +718,6 @@ "ctxt": 0 }, "value": "Sql", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -766,7 +743,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -842,7 +818,6 @@ "ctxt": 0 }, "value": "foonly", - "typeAnnotation": null, "optional": false }, "computed": false @@ -878,7 +853,6 @@ "ctxt": 0 }, "value": "load", - "typeAnnotation": null, "optional": false }, "function": { @@ -899,8 +873,8 @@ "ctxt": 0 }, "value": "files", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -919,8 +893,8 @@ "ctxt": 0 }, "value": "format", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -961,7 +935,6 @@ "ctxt": 0 }, "value": "format", - "typeAnnotation": null, "optional": false }, "right": { @@ -1009,7 +982,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1081,7 +1053,6 @@ "ctxt": 0 }, "value": "speed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1135,7 +1106,6 @@ "ctxt": 0 }, "value": "weight", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1189,7 +1159,6 @@ "ctxt": 0 }, "value": "Wagon", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1222,8 +1191,8 @@ "ctxt": 0 }, "value": "db", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1240,7 +1209,6 @@ "ctxt": 0 }, "value": "Sql", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1280,7 +1248,6 @@ "ctxt": 0 }, "value": "db", - "typeAnnotation": null, "optional": false }, "property": { @@ -1291,7 +1258,6 @@ "ctxt": 0 }, "value": "numberOxen", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1311,7 +1277,6 @@ "ctxt": 0 }, "value": "db", - "typeAnnotation": null, "optional": false }, "property": { @@ -1322,7 +1287,6 @@ "ctxt": 0 }, "value": "foonly", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1339,7 +1303,6 @@ "ctxt": 0 }, "value": "Drakkhen", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1358,7 +1321,6 @@ "ctxt": 0 }, "value": "Dragon", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1376,7 +1338,6 @@ "ctxt": 0 }, "value": "Dragon", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1397,6 +1358,7 @@ "ctxt": 0 }, "value": "numberEaten", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1413,8 +1375,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1470,7 +1431,6 @@ "ctxt": 0 }, "value": "numberEaten", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1483,7 +1443,6 @@ "ctxt": 0 }, "value": "numberEaten", - "typeAnnotation": null, "optional": false } } @@ -1505,7 +1464,6 @@ "ctxt": 0 }, "value": "Firedrake", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1531,7 +1489,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1583,7 +1540,6 @@ "ctxt": 0 }, "value": "Dragon", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1601,7 +1557,6 @@ "ctxt": 0 }, "value": "Conestoga", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1627,7 +1582,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1649,6 +1603,7 @@ "ctxt": 0 }, "value": "drunkOO", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1673,8 +1628,7 @@ "value": true } } - }, - "optional": false + } } } ], @@ -1750,7 +1704,6 @@ "ctxt": 0 }, "value": "circle", - "typeAnnotation": null, "optional": false }, "function": { @@ -1771,6 +1724,7 @@ "ctxt": 0 }, "value": "others", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1807,14 +1761,12 @@ "ctxt": 0 }, "value": "Wagon", - "typeAnnotation": null, "optional": false } } } } - }, - "optional": false + } } } ], @@ -1854,7 +1806,6 @@ "ctxt": 0 }, "value": "others", - "typeAnnotation": null, "optional": false }, "property": { @@ -1865,7 +1816,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1893,7 +1843,6 @@ "ctxt": 0 }, "value": "Wagon", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1926,8 +1875,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1944,7 +1893,6 @@ "ctxt": 0 }, "value": "Conestoga", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1989,7 +1937,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -2000,7 +1947,6 @@ "ctxt": 0 }, "value": "drunkOO", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2028,7 +1974,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -2039,7 +1984,6 @@ "ctxt": 0 }, "value": "numberOxen", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2055,7 +1999,6 @@ "ctxt": 0 }, "value": "Soup", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2076,8 +2019,8 @@ "ctxt": 0 }, "value": "flavour", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -2133,7 +2076,6 @@ "ctxt": 0 }, "value": "flavour", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2146,7 +2088,6 @@ "ctxt": 0 }, "value": "flavour", - "typeAnnotation": null, "optional": false } } @@ -2168,7 +2109,6 @@ "ctxt": 0 }, "value": "Chowder", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2194,7 +2134,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "function": { @@ -2243,7 +2182,6 @@ "ctxt": 0 }, "value": "flavour", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2271,7 +2209,6 @@ "ctxt": 0 }, "value": "Soup", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2304,8 +2241,8 @@ "ctxt": 0 }, "value": "soup", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2322,7 +2259,6 @@ "ctxt": 0 }, "value": "Soup", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2367,7 +2303,6 @@ "ctxt": 0 }, "value": "soup", - "typeAnnotation": null, "optional": false }, "property": { @@ -2378,7 +2313,6 @@ "ctxt": 0 }, "value": "flavour", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2409,8 +2343,8 @@ "ctxt": 0 }, "value": "chowder", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2427,7 +2361,6 @@ "ctxt": 0 }, "value": "Chowder", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2451,7 +2384,6 @@ "ctxt": 0 }, "value": "claim", - "typeAnnotation": null, "optional": false }, "value": { @@ -2508,7 +2440,6 @@ "ctxt": 0 }, "value": "chowder", - "typeAnnotation": null, "optional": false }, "property": { @@ -2519,7 +2450,6 @@ "ctxt": 0 }, "value": "flavour", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2532,7 +2462,6 @@ "ctxt": 0 }, "value": "claim", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2563,8 +2492,8 @@ "ctxt": 0 }, "value": "errorNoArgs", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2581,7 +2510,6 @@ "ctxt": 0 }, "value": "Chowder", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2616,8 +2544,8 @@ "ctxt": 0 }, "value": "errorArgType", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2634,7 +2562,6 @@ "ctxt": 0 }, "value": "Chowder", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/commonJSImportClassTypeReference/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/commonJSImportClassTypeReference/input.ts.json index 564dcc099846..f725f8ab2a4d 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/commonJSImportClassTypeReference/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/commonJSImportClassTypeReference/input.ts.json @@ -46,7 +46,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "value": null @@ -70,7 +69,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -129,8 +126,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -177,7 +174,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "property": { @@ -188,7 +184,6 @@ "ctxt": 0 }, "value": "values", - "typeAnnotation": null, "optional": false }, "computed": false @@ -214,7 +209,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -240,7 +234,6 @@ "ctxt": 0 }, "value": "values", - "typeAnnotation": null, "optional": false }, "function": { @@ -281,7 +274,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -338,7 +330,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -349,7 +340,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "computed": false @@ -362,7 +352,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/commonJSImportExportedClassExpression/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/commonJSImportExportedClassExpression/input.ts.json index 23debe06b4dd..7db4c7cfb2ac 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/commonJSImportExportedClassExpression/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/commonJSImportExportedClassExpression/input.ts.json @@ -46,7 +46,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "value": null @@ -70,7 +69,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -129,8 +126,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -177,7 +174,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "property": { @@ -188,7 +184,6 @@ "ctxt": 0 }, "value": "values", - "typeAnnotation": null, "optional": false }, "computed": false @@ -234,7 +229,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -245,7 +239,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "computed": false @@ -260,7 +253,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "span": { @@ -285,7 +277,6 @@ "ctxt": 0 }, "value": "values", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/commonJSImportNestedClassTypeReference/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/commonJSImportNestedClassTypeReference/input.ts.json index 688f82d2a7cc..6c8764425f35 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/commonJSImportNestedClassTypeReference/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/commonJSImportNestedClassTypeReference/input.ts.json @@ -46,7 +46,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "value": null @@ -70,7 +69,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -129,8 +126,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -177,7 +174,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "property": { @@ -188,7 +184,6 @@ "ctxt": 0 }, "value": "values", - "typeAnnotation": null, "optional": false }, "computed": false @@ -229,8 +224,8 @@ "ctxt": 0 }, "value": "NS", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -275,7 +270,6 @@ "ctxt": 0 }, "value": "NS", - "typeAnnotation": null, "optional": false }, "property": { @@ -286,7 +280,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "computed": false @@ -316,7 +309,6 @@ "ctxt": 0 }, "value": "values", - "typeAnnotation": null, "optional": false }, "function": { @@ -364,7 +356,6 @@ "ctxt": 0 }, "value": "NS", - "typeAnnotation": null, "optional": false }, "property": { @@ -375,7 +366,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "computed": false @@ -436,7 +426,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -447,7 +436,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "computed": false @@ -467,7 +455,6 @@ "ctxt": 0 }, "value": "NS", - "typeAnnotation": null, "optional": false }, "property": { @@ -478,7 +465,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/commonJSReexport/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/commonJSReexport/input.ts.json index 7d560652d637..04e739976cbe 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/commonJSReexport/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/commonJSReexport/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "hardline", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "value": { @@ -106,7 +105,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -117,7 +115,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -138,7 +135,6 @@ "ctxt": 0 }, "value": "hardline", - "typeAnnotation": null, "optional": false } ] @@ -175,7 +171,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -186,7 +181,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -209,7 +203,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "value": { @@ -227,7 +220,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -296,7 +288,6 @@ "ctxt": 0 }, "value": "hardline", - "typeAnnotation": null, "optional": false }, "value": null @@ -327,7 +318,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -359,7 +349,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "computed": false @@ -383,7 +372,6 @@ "ctxt": 0 }, "value": "hardline", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/conflictingCommonJSES2015Exports/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/conflictingCommonJSES2015Exports/input.ts.json index 0c11f83901a1..a90152c9cacd 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/conflictingCommonJSES2015Exports/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/conflictingCommonJSES2015Exports/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -44,8 +43,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -64,8 +63,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -84,8 +83,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -158,7 +157,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -169,7 +167,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -190,7 +187,6 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, "optional": false } ] @@ -220,7 +216,6 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, "optional": false }, "imported": null @@ -265,7 +260,6 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/constructorFunctionMergeWithClass/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/constructorFunctionMergeWithClass/input.ts.json index dc86eab16ed3..5c3d128b3eb8 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/constructorFunctionMergeWithClass/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/constructorFunctionMergeWithClass/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "SomeClass", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -90,7 +90,6 @@ "ctxt": 0 }, "value": "otherProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -139,7 +138,6 @@ "ctxt": 0 }, "value": "SomeClass", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -156,7 +154,6 @@ "ctxt": 0 }, "value": "SomeClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -203,7 +200,6 @@ "ctxt": 0 }, "value": "SomeClass", - "typeAnnotation": null, "optional": false }, "property": { @@ -214,7 +210,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/constructorFunctions/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/constructorFunctions/input.ts.json index f35236f741ec..e92b7623dfbe 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/constructorFunctions/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/constructorFunctions/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -81,7 +80,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false } } @@ -109,7 +107,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -156,7 +153,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -204,8 +200,8 @@ "ctxt": 0 }, "value": "c1_v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -222,7 +218,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -257,8 +252,8 @@ "ctxt": 0 }, "value": "c1_v2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -275,7 +270,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -310,8 +304,8 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -377,7 +371,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false } } @@ -405,7 +398,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -452,7 +444,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -504,8 +495,8 @@ "ctxt": 0 }, "value": "c2_v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -522,7 +513,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -557,8 +547,8 @@ "ctxt": 0 }, "value": "c2_v2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -575,7 +565,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -595,7 +584,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -660,7 +648,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false } } @@ -688,7 +675,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -737,8 +723,8 @@ "ctxt": 0 }, "value": "c3_v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -755,7 +741,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -790,8 +775,8 @@ "ctxt": 0 }, "value": "c3_v2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -808,7 +793,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -843,8 +827,8 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -910,7 +894,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false } } @@ -938,7 +921,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -983,8 +965,8 @@ "ctxt": 0 }, "value": "c4_v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1001,7 +983,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1036,8 +1017,8 @@ "ctxt": 0 }, "value": "c4_v2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1054,7 +1035,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1089,8 +1069,8 @@ "ctxt": 0 }, "value": "c5_v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1120,8 +1100,8 @@ "ctxt": 0 }, "value": "c5_v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "FunctionExpression", @@ -1133,7 +1113,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1181,7 +1160,6 @@ "ctxt": 0 }, "value": "c5_v1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1213,8 +1191,8 @@ "ctxt": 0 }, "value": "c5_v2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1244,8 +1222,8 @@ "ctxt": 0 }, "value": "c5_v2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ClassExpression", @@ -1287,7 +1265,6 @@ "ctxt": 0 }, "value": "c5_v2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1304,7 +1281,6 @@ "ctxt": 0 }, "value": "C6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1361,7 +1337,6 @@ "ctxt": 0 }, "value": "functions", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1392,8 +1367,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1404,7 +1379,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1431,8 +1405,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1451,7 +1425,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1488,8 +1461,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1508,7 +1481,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1571,8 +1543,8 @@ "ctxt": 0 }, "value": "c6_v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1589,7 +1561,6 @@ "ctxt": 0 }, "value": "C6", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1609,7 +1580,6 @@ "ctxt": 0 }, "value": "C7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1630,8 +1600,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1680,8 +1650,8 @@ "ctxt": 0 }, "value": "c7_v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1698,7 +1668,6 @@ "ctxt": 0 }, "value": "C7", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/constructorFunctions2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/constructorFunctions2/input.ts.json index 8d320355a755..b1bcabde25b4 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/constructorFunctions2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/constructorFunctions2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "id", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -111,6 +110,7 @@ "ctxt": 0 }, "value": "module", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -127,8 +127,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -148,6 +147,7 @@ "ctxt": 0 }, "value": "exports", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -164,8 +164,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -197,8 +196,8 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -215,7 +214,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -268,8 +266,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -293,7 +291,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -307,7 +304,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false @@ -341,8 +337,8 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -400,7 +396,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false @@ -464,7 +459,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "property": { @@ -475,7 +469,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -488,7 +481,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -549,7 +541,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -599,8 +590,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -617,7 +608,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -649,7 +639,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -660,7 +649,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false @@ -688,7 +676,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -699,7 +686,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -715,7 +701,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -772,7 +757,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false @@ -825,7 +809,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -836,7 +819,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -849,7 +831,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/constructorFunctions3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/constructorFunctions3/input.ts.json index ff27d5398b1f..82b9fed610ff 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/constructorFunctions3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/constructorFunctions3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Instance", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": false @@ -126,8 +124,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -144,7 +142,6 @@ "ctxt": 0 }, "value": "Instance", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -169,7 +166,6 @@ "ctxt": 0 }, "value": "Instance", - "typeAnnotation": null, "optional": false } }, @@ -188,7 +184,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -202,7 +197,6 @@ "ctxt": 0 }, "value": "StaticToo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -259,7 +253,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": false @@ -317,7 +310,6 @@ "ctxt": 0 }, "value": "StaticToo", - "typeAnnotation": null, "optional": false }, "property": { @@ -328,7 +320,6 @@ "ctxt": 0 }, "value": "property", - "typeAnnotation": null, "optional": false }, "computed": false @@ -374,8 +365,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -392,7 +383,6 @@ "ctxt": 0 }, "value": "StaticToo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -417,7 +407,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -436,7 +425,6 @@ "ctxt": 0 }, "value": "StaticToo", - "typeAnnotation": null, "optional": false } }, @@ -450,7 +438,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -507,7 +494,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -561,7 +547,6 @@ "ctxt": 0 }, "value": "second", - "typeAnnotation": null, "optional": false }, "computed": false @@ -621,7 +606,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -632,7 +616,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -645,7 +628,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -660,7 +642,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [ @@ -680,8 +661,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -722,7 +703,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -748,7 +728,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -794,7 +773,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -805,7 +783,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -820,7 +797,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "params": [ @@ -840,8 +816,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -882,7 +858,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "right": { @@ -930,8 +905,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -948,7 +923,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -987,7 +961,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -998,7 +971,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1049,7 +1021,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -1060,7 +1031,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1112,7 +1082,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1123,7 +1092,6 @@ "ctxt": 0 }, "value": "second", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/constructorFunctionsStrict/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/constructorFunctionsStrict/input.ts.json index 1c98f30cac50..dac345f8bb2d 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/constructorFunctionsStrict/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/constructorFunctionsStrict/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -94,7 +93,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -107,7 +105,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -156,7 +153,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -167,7 +163,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -180,7 +175,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -241,7 +235,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -291,8 +284,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -309,7 +302,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -362,7 +354,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -373,7 +364,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -386,7 +376,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -421,7 +410,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -432,7 +420,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -445,7 +432,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -460,7 +446,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -481,8 +466,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -546,7 +531,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } @@ -582,7 +566,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -596,7 +579,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -646,7 +628,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -659,7 +640,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -696,8 +676,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -714,7 +694,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -762,8 +741,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -780,7 +759,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -833,7 +811,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "property": { @@ -844,7 +821,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -864,7 +840,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "property": { @@ -875,7 +850,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/contextualTypedSpecialAssignment/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/contextualTypedSpecialAssignment/input.ts.json index a65120946b98..9452170061bd 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/contextualTypedSpecialAssignment/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/contextualTypedSpecialAssignment/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -111,7 +109,6 @@ "ctxt": 0 }, "value": "status", - "typeAnnotation": null, "optional": false }, "value": { @@ -139,7 +136,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "params": [ @@ -159,8 +155,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -218,7 +214,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -229,7 +224,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -252,7 +246,6 @@ "ctxt": 0 }, "value": "status", - "typeAnnotation": null, "optional": false }, "value": { @@ -280,7 +273,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "params": [ @@ -300,8 +292,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -351,7 +343,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -362,7 +353,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -378,7 +368,6 @@ "ctxt": 0 }, "value": "Thing", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -404,7 +393,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -454,7 +442,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -477,7 +464,6 @@ "ctxt": 0 }, "value": "status", - "typeAnnotation": null, "optional": false }, "value": { @@ -505,7 +491,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "params": [ @@ -525,8 +510,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -574,7 +559,6 @@ "ctxt": 0 }, "value": "fail", - "typeAnnotation": null, "optional": false }, "function": { @@ -631,7 +615,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -654,7 +637,6 @@ "ctxt": 0 }, "value": "status", - "typeAnnotation": null, "optional": false }, "value": { @@ -682,7 +664,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "params": [ @@ -702,8 +683,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -781,7 +762,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -792,7 +772,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -815,7 +794,6 @@ "ctxt": 0 }, "value": "status", - "typeAnnotation": null, "optional": false }, "value": { @@ -843,7 +821,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "params": [ @@ -863,8 +840,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -914,7 +891,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -925,7 +901,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -968,7 +943,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -979,7 +953,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -992,7 +965,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1015,7 +987,6 @@ "ctxt": 0 }, "value": "status", - "typeAnnotation": null, "optional": false }, "value": { @@ -1043,7 +1014,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1063,8 +1033,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1121,7 +1091,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1132,7 +1101,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1145,7 +1113,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1188,7 +1155,6 @@ "ctxt": 0 }, "value": "Thing", - "typeAnnotation": null, "optional": false }, "property": { @@ -1199,7 +1165,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1212,7 +1177,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1235,7 +1199,6 @@ "ctxt": 0 }, "value": "status", - "typeAnnotation": null, "optional": false }, "value": { @@ -1263,7 +1226,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1283,8 +1245,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1341,7 +1303,6 @@ "ctxt": 0 }, "value": "Thing", - "typeAnnotation": null, "optional": false }, "property": { @@ -1352,7 +1313,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1365,7 +1325,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1381,7 +1340,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1436,7 +1394,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "property": { @@ -1447,7 +1404,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1470,7 +1426,6 @@ "ctxt": 0 }, "value": "status", - "typeAnnotation": null, "optional": false }, "value": { @@ -1498,7 +1453,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1518,8 +1472,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1577,7 +1531,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1588,7 +1541,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1611,7 +1563,6 @@ "ctxt": 0 }, "value": "status", - "typeAnnotation": null, "optional": false }, "value": { @@ -1639,7 +1590,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1659,8 +1609,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/defaultPropertyAssignedClassWithPrototype/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/defaultPropertyAssignedClassWithPrototype/input.ts.json index 78b564fc46cb..3693e6e094e9 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/defaultPropertyAssignedClassWithPrototype/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/defaultPropertyAssignedClassWithPrototype/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "property": { @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "computed": false @@ -116,7 +114,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "property": { @@ -127,7 +124,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "computed": false @@ -196,7 +192,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "property": { @@ -207,7 +202,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "computed": false @@ -220,7 +214,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -243,7 +236,6 @@ "ctxt": 0 }, "value": "add", - "typeAnnotation": null, "optional": false }, "params": [], @@ -307,7 +299,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "property": { @@ -318,7 +309,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "computed": false @@ -334,7 +324,6 @@ "ctxt": 0 }, "value": "add", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/enumMergeWithExpando/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/enumMergeWithExpando/input.ts.json index 060f1bd84b61..8b4e9a07857b 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/enumMergeWithExpando/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/enumMergeWithExpando/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "lf", - "typeAnnotation": null, "optional": false }, "body": { @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "Order", - "typeAnnotation": null, "optional": false }, "members": [ @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "ASC", - "typeAnnotation": null, "optional": false }, "init": null @@ -97,7 +94,6 @@ "ctxt": 0 }, "value": "DESC", - "typeAnnotation": null, "optional": false }, "init": null @@ -138,7 +134,6 @@ "ctxt": 0 }, "value": "lf", - "typeAnnotation": null, "optional": false }, "property": { @@ -149,7 +144,6 @@ "ctxt": 0 }, "value": "Order", - "typeAnnotation": null, "optional": false }, "computed": false @@ -202,7 +196,6 @@ "ctxt": 0 }, "value": "lf", - "typeAnnotation": null, "optional": false }, "property": { @@ -213,7 +206,6 @@ "ctxt": 0 }, "value": "Order", - "typeAnnotation": null, "optional": false }, "computed": false @@ -226,7 +218,6 @@ "ctxt": 0 }, "value": "DESC", - "typeAnnotation": null, "optional": false }, "computed": false @@ -279,7 +270,6 @@ "ctxt": 0 }, "value": "lf", - "typeAnnotation": null, "optional": false }, "property": { @@ -290,7 +280,6 @@ "ctxt": 0 }, "value": "Order", - "typeAnnotation": null, "optional": false }, "computed": false @@ -303,7 +292,6 @@ "ctxt": 0 }, "value": "ASC", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/expandoOnAlias/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/expandoOnAlias/input.ts.json index d642f5addf2d..ef403c26da73 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/expandoOnAlias/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/expandoOnAlias/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Vue", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -73,8 +72,8 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -94,7 +93,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -137,7 +135,6 @@ "ctxt": 0 }, "value": "Vue", - "typeAnnotation": null, "optional": false }, "imported": null @@ -157,7 +154,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "imported": null @@ -210,7 +206,6 @@ "ctxt": 0 }, "value": "Vue", - "typeAnnotation": null, "optional": false }, "property": { @@ -221,7 +216,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "computed": false @@ -259,7 +253,6 @@ "ctxt": 0 }, "value": "Vue", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -296,7 +289,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -307,7 +299,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -353,7 +344,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -364,7 +354,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -402,7 +391,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -413,7 +401,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -441,7 +428,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -452,7 +438,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/exportNestedNamespaces/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/exportNestedNamespaces/input.ts.json index 1ebd6bc4c3d2..64d081de604f 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/exportNestedNamespaces/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/exportNestedNamespaces/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -100,7 +98,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -111,7 +108,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -124,7 +120,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "computed": false @@ -185,7 +180,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -240,7 +234,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -251,7 +244,6 @@ "ctxt": 0 }, "value": "Classic", - "typeAnnotation": null, "optional": false }, "computed": false @@ -281,7 +273,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -331,7 +322,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -384,7 +374,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -431,8 +420,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -463,7 +452,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -474,7 +462,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -487,7 +474,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "computed": false @@ -521,7 +507,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "property": { @@ -532,7 +517,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -563,8 +547,8 @@ "ctxt": 0 }, "value": "classic", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -588,7 +572,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -599,7 +582,6 @@ "ctxt": 0 }, "value": "Classic", - "typeAnnotation": null, "optional": false }, "computed": false @@ -621,7 +603,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -642,8 +623,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -662,8 +643,8 @@ "ctxt": 0 }, "value": "classic", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -703,7 +684,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -714,7 +694,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -742,7 +721,6 @@ "ctxt": 0 }, "value": "classic", - "typeAnnotation": null, "optional": false }, "property": { @@ -753,7 +731,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/exportNestedNamespaces2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/exportNestedNamespaces2/input.ts.json index d9ae08f2f8e3..2fda7e298412 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/exportNestedNamespaces2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/exportNestedNamespaces2/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "formatters", - "typeAnnotation": null, "optional": false }, "computed": false @@ -86,8 +84,8 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -167,7 +164,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -178,7 +174,6 @@ "ctxt": 0 }, "value": "formatters", - "typeAnnotation": null, "optional": false }, "computed": false @@ -191,7 +186,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "computed": false @@ -216,8 +210,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -250,7 +244,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -286,8 +279,8 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -304,7 +297,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -367,7 +359,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -378,7 +369,6 @@ "ctxt": 0 }, "value": "formatters", - "typeAnnotation": null, "optional": false }, "computed": false @@ -391,7 +381,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "computed": false @@ -416,8 +405,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -450,7 +439,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -486,7 +474,6 @@ "ctxt": 0 }, "value": "debug", - "typeAnnotation": null, "optional": false } } @@ -537,7 +524,6 @@ "ctxt": 0 }, "value": "debug", - "typeAnnotation": null, "optional": false }, "property": { @@ -548,7 +534,6 @@ "ctxt": 0 }, "value": "formatters", - "typeAnnotation": null, "optional": false }, "computed": false @@ -561,7 +546,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "computed": false @@ -592,8 +576,8 @@ "ctxt": 0 }, "value": "one", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -624,7 +608,6 @@ "ctxt": 0 }, "value": "debug", - "typeAnnotation": null, "optional": false }, "property": { @@ -635,7 +618,6 @@ "ctxt": 0 }, "value": "formatters", - "typeAnnotation": null, "optional": false }, "computed": false @@ -648,7 +630,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/exportPropertyAssignmentNameResolution/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/exportPropertyAssignmentNameResolution/input.ts.json index 024a630dd51e..77d80c58a256 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/exportPropertyAssignmentNameResolution/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/exportPropertyAssignmentNameResolution/input.ts.json @@ -43,7 +43,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -54,7 +53,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "computed": false @@ -112,7 +109,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/globalMergeWithCommonJSAssignmentDeclaration/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/globalMergeWithCommonJSAssignmentDeclaration/input.ts.json index 0f0d73cdf4b4..9db986471e1e 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/globalMergeWithCommonJSAssignmentDeclaration/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/globalMergeWithCommonJSAssignmentDeclaration/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "window", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -85,7 +83,6 @@ "ctxt": 0 }, "value": "window", - "typeAnnotation": null, "optional": false }, "property": { @@ -96,7 +93,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "computed": false @@ -132,7 +128,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -143,7 +138,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/importAliasModuleExports/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/importAliasModuleExports/input.ts.json index 271d20a1e2d5..f4dd7947c549 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/importAliasModuleExports/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/importAliasModuleExports/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Alias", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -128,7 +126,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -139,7 +136,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -152,7 +148,6 @@ "ctxt": 0 }, "value": "Alias", - "typeAnnotation": null, "optional": false } } @@ -180,7 +175,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } @@ -239,7 +233,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -250,7 +243,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -263,7 +255,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -316,7 +307,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -327,7 +317,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -340,7 +329,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "computed": false @@ -401,7 +389,6 @@ "ctxt": 0 }, "value": "_func", - "typeAnnotation": null, "optional": false }, "computed": false @@ -455,7 +442,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -466,7 +452,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -489,7 +474,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -500,7 +484,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -543,7 +526,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -592,7 +574,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -606,7 +587,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -641,7 +621,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -655,7 +634,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -697,7 +675,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -711,7 +688,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "computed": false @@ -749,7 +725,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -763,7 +738,6 @@ "ctxt": 0 }, "value": "def", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/inferingFromAny/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/inferingFromAny/input.ts.json index ea589fc4e1fe..d9d4f9f08282 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/inferingFromAny/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/inferingFromAny/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -133,8 +134,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -151,7 +151,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -172,6 +171,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -194,13 +194,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -236,7 +234,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -266,7 +263,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -283,7 +279,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -304,6 +299,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -333,14 +329,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -376,7 +370,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -406,7 +399,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -423,7 +415,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -444,6 +435,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -482,7 +474,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -511,7 +502,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -519,8 +509,7 @@ } ] } - }, - "optional": false + } } } ], @@ -556,7 +545,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -577,7 +565,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -623,7 +610,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -652,7 +638,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -672,7 +657,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -693,6 +677,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -724,7 +709,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -753,7 +737,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -777,7 +760,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -806,7 +788,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -816,8 +797,7 @@ } ] } - }, - "optional": false + } } } ], @@ -853,7 +833,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -883,7 +862,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -900,7 +878,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -921,6 +898,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -944,6 +922,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -966,13 +945,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -994,8 +971,7 @@ } } } - }, - "optional": false + } } } ], @@ -1031,7 +1007,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1061,7 +1036,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1078,7 +1052,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1099,6 +1072,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1122,6 +1096,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1144,13 +1119,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1173,8 +1146,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -1210,7 +1182,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1240,7 +1211,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1257,7 +1227,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1278,6 +1247,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1301,6 +1271,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1317,8 +1288,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "typeParams": null, @@ -1345,7 +1315,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1370,7 +1339,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1379,8 +1347,7 @@ } } } - }, - "optional": false + } } } ], @@ -1416,7 +1383,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1446,7 +1412,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1463,7 +1428,6 @@ "ctxt": 0 }, "value": "f8", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1484,6 +1448,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1522,15 +1487,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -1566,7 +1529,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1596,7 +1558,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1613,7 +1574,6 @@ "ctxt": 0 }, "value": "f9", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1634,6 +1594,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1672,7 +1633,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1680,8 +1640,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -1717,7 +1676,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1747,7 +1705,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1764,7 +1721,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1785,6 +1741,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1811,6 +1768,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1827,8 +1785,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1853,7 +1810,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1868,8 +1824,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1905,7 +1860,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1935,7 +1889,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1952,7 +1905,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1973,6 +1925,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1999,6 +1952,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2015,8 +1969,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2041,7 +1994,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2056,8 +2008,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2093,7 +2044,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2123,7 +2073,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2140,7 +2089,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2161,6 +2109,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2191,7 +2140,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2211,15 +2159,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -2255,7 +2201,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2276,7 +2221,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2322,7 +2266,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2351,7 +2294,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2371,7 +2313,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2392,6 +2333,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2422,7 +2364,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2442,15 +2383,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -2486,7 +2425,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2507,7 +2445,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2553,7 +2490,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2582,7 +2518,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2602,7 +2537,6 @@ "ctxt": 0 }, "value": "f14", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2623,6 +2557,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2654,7 +2589,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2691,7 +2625,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2711,7 +2644,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2737,7 +2669,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2774,7 +2705,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2794,7 +2724,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2806,8 +2735,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2843,7 +2771,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2864,7 +2791,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2910,7 +2836,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2939,7 +2864,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2964,7 +2888,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2991,7 +2914,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3020,7 +2942,6 @@ "ctxt": 0 }, "value": "f15", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3041,6 +2962,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3063,7 +2985,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3089,7 +3010,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3097,8 +3017,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3134,7 +3053,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3164,7 +3082,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3181,7 +3098,6 @@ "ctxt": 0 }, "value": "f16", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3202,6 +3118,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3224,7 +3141,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3250,7 +3166,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3258,8 +3173,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3295,7 +3209,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3325,7 +3238,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3342,7 +3254,6 @@ "ctxt": 0 }, "value": "f17", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3363,6 +3274,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3393,7 +3305,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3419,7 +3330,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3444,14 +3354,12 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -3487,7 +3395,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3508,7 +3415,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3538,7 +3444,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3555,7 +3460,6 @@ "ctxt": 0 }, "value": "f18", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3576,6 +3480,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3606,7 +3511,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3624,7 +3528,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3656,7 +3559,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3676,15 +3578,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -3720,7 +3620,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3741,7 +3640,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3767,7 +3665,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3799,7 +3696,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3816,7 +3712,6 @@ "ctxt": 0 }, "value": "f19", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3837,6 +3732,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3859,13 +3755,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3884,6 +3778,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3914,7 +3809,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3934,14 +3828,12 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -3977,7 +3869,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3998,7 +3889,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4024,7 +3914,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4056,7 +3945,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4088,8 +3976,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4106,7 +3994,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4120,7 +4007,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4156,8 +4042,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4174,7 +4060,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4188,7 +4073,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4224,8 +4108,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4242,7 +4126,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4256,7 +4139,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4292,8 +4174,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4310,7 +4192,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4324,7 +4205,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4360,8 +4240,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4378,7 +4258,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4392,7 +4271,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4428,8 +4306,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4446,7 +4324,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4460,7 +4337,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4496,8 +4372,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4514,7 +4390,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4528,7 +4403,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4564,8 +4438,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4582,7 +4456,6 @@ "ctxt": 0 }, "value": "f8", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4596,7 +4469,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4632,8 +4504,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4650,7 +4522,6 @@ "ctxt": 0 }, "value": "f9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4664,7 +4535,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4700,8 +4570,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4718,7 +4588,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4732,7 +4601,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4768,8 +4636,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4786,7 +4654,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4800,7 +4667,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4836,8 +4702,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4854,7 +4720,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4868,7 +4733,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4904,8 +4768,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4922,7 +4786,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4936,7 +4799,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4972,8 +4834,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4990,7 +4852,6 @@ "ctxt": 0 }, "value": "f14", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5004,7 +4865,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -5040,8 +4900,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5058,7 +4918,6 @@ "ctxt": 0 }, "value": "f15", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5072,7 +4931,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -5108,8 +4966,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5126,7 +4984,6 @@ "ctxt": 0 }, "value": "f16", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5140,7 +4997,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -5176,8 +5032,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5194,7 +5050,6 @@ "ctxt": 0 }, "value": "f17", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5208,7 +5063,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -5244,8 +5098,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5262,7 +5116,6 @@ "ctxt": 0 }, "value": "f18", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5276,7 +5129,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -5312,8 +5164,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5330,7 +5182,6 @@ "ctxt": 0 }, "value": "f19", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5344,7 +5195,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -5358,7 +5208,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments/input.ts.json index 10716b69a15e..f028ff30deb7 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -83,7 +81,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -94,7 +91,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -148,7 +144,6 @@ "ctxt": 0 }, "value": "inConstructor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -212,7 +207,6 @@ "ctxt": 0 }, "value": "inConstructor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -274,7 +268,6 @@ "ctxt": 0 }, "value": "inMultiple", - "typeAnnotation": null, "optional": false }, "computed": false @@ -310,7 +303,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -358,7 +350,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -369,7 +360,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -423,7 +413,6 @@ "ctxt": 0 }, "value": "inMethod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -477,7 +466,6 @@ "ctxt": 0 }, "value": "inMethodNullable", - "typeAnnotation": null, "optional": false }, "computed": false @@ -540,7 +528,6 @@ "ctxt": 0 }, "value": "inMethod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -599,7 +586,6 @@ "ctxt": 0 }, "value": "inMethodNullable", - "typeAnnotation": null, "optional": false }, "computed": false @@ -612,7 +598,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -658,7 +643,6 @@ "ctxt": 0 }, "value": "inMultiple", - "typeAnnotation": null, "optional": false }, "computed": false @@ -717,7 +701,6 @@ "ctxt": 0 }, "value": "inMultipleMethods", - "typeAnnotation": null, "optional": false }, "computed": false @@ -763,8 +746,8 @@ "ctxt": 0 }, "value": "action", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -811,7 +794,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -822,7 +804,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -876,7 +857,6 @@ "ctxt": 0 }, "value": "inNestedArrowFunction", - "typeAnnotation": null, "optional": false }, "computed": false @@ -940,7 +920,6 @@ "ctxt": 0 }, "value": "inNestedArrowFunction", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1003,7 +982,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "function": { @@ -1051,7 +1029,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -1062,7 +1039,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1116,7 +1092,6 @@ "ctxt": 0 }, "value": "inGetter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1180,7 +1155,6 @@ "ctxt": 0 }, "value": "inGetter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1242,7 +1216,6 @@ "ctxt": 0 }, "value": "inMultiple", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1296,7 +1269,6 @@ "ctxt": 0 }, "value": "inMultipleMethods", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1340,7 +1312,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "function": { @@ -1388,7 +1359,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -1399,7 +1369,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1453,7 +1422,6 @@ "ctxt": 0 }, "value": "inSetter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1517,7 +1485,6 @@ "ctxt": 0 }, "value": "inSetter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1569,7 +1536,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": { @@ -1617,7 +1583,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -1628,7 +1593,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1682,7 +1646,6 @@ "ctxt": 0 }, "value": "inPropertyDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1746,7 +1709,6 @@ "ctxt": 0 }, "value": "inPropertyDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1803,7 +1765,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -1851,7 +1812,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -1862,7 +1822,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1916,7 +1875,6 @@ "ctxt": 0 }, "value": "inStaticMethod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1980,7 +1938,6 @@ "ctxt": 0 }, "value": "inStaticMethod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2029,8 +1986,8 @@ "ctxt": 0 }, "value": "action", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -2077,7 +2034,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -2088,7 +2044,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2142,7 +2097,6 @@ "ctxt": 0 }, "value": "inStaticNestedArrowFunction", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2206,7 +2160,6 @@ "ctxt": 0 }, "value": "inStaticNestedArrowFunction", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2269,7 +2222,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "function": { @@ -2317,7 +2269,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -2328,7 +2279,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2382,7 +2332,6 @@ "ctxt": 0 }, "value": "inStaticGetter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2446,7 +2395,6 @@ "ctxt": 0 }, "value": "inStaticGetter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2498,7 +2446,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "function": { @@ -2546,7 +2493,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -2557,7 +2503,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2611,7 +2556,6 @@ "ctxt": 0 }, "value": "inStaticSetter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2675,7 +2619,6 @@ "ctxt": 0 }, "value": "inStaticSetter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2727,7 +2670,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": { @@ -2775,7 +2717,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -2786,7 +2727,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2840,7 +2780,6 @@ "ctxt": 0 }, "value": "inStaticPropertyDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2904,7 +2843,6 @@ "ctxt": 0 }, "value": "inStaticPropertyDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2978,8 +2916,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2996,7 +2934,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3031,6 +2968,7 @@ "ctxt": 0 }, "value": "stringOrNumber", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3066,8 +3004,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3099,8 +3036,8 @@ "ctxt": 0 }, "value": "stringOrNumber", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3117,7 +3054,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3128,7 +3064,6 @@ "ctxt": 0 }, "value": "inConstructor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3162,6 +3097,7 @@ "ctxt": 0 }, "value": "stringOrNumberOrUndefined", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3206,8 +3142,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3239,8 +3174,8 @@ "ctxt": 0 }, "value": "stringOrNumberOrUndefined", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3257,7 +3192,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3268,7 +3202,6 @@ "ctxt": 0 }, "value": "inMethod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3302,8 +3235,8 @@ "ctxt": 0 }, "value": "stringOrNumberOrUndefined", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3320,7 +3253,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3331,7 +3263,6 @@ "ctxt": 0 }, "value": "inGetter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3365,8 +3296,8 @@ "ctxt": 0 }, "value": "stringOrNumberOrUndefined", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3383,7 +3314,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3394,7 +3324,6 @@ "ctxt": 0 }, "value": "inSetter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3428,8 +3357,8 @@ "ctxt": 0 }, "value": "stringOrNumberOrUndefined", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3446,7 +3375,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3457,7 +3385,6 @@ "ctxt": 0 }, "value": "inPropertyDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3491,8 +3418,8 @@ "ctxt": 0 }, "value": "stringOrNumberOrUndefined", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3509,7 +3436,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3520,7 +3446,6 @@ "ctxt": 0 }, "value": "inNestedArrowFunction", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3554,6 +3479,7 @@ "ctxt": 0 }, "value": "stringOrNumberOrBoolean", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3598,8 +3524,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3631,6 +3556,7 @@ "ctxt": 0 }, "value": "number", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3647,8 +3573,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -3680,8 +3605,8 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3698,7 +3623,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3709,7 +3633,6 @@ "ctxt": 0 }, "value": "inMultiple", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3743,6 +3666,7 @@ "ctxt": 0 }, "value": "stringOrBooleanOrUndefined", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3787,8 +3711,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3820,8 +3743,8 @@ "ctxt": 0 }, "value": "stringOrBooleanOrUndefined", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3838,7 +3761,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3849,7 +3771,6 @@ "ctxt": 0 }, "value": "inMultipleMethods", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3883,6 +3804,7 @@ "ctxt": 0 }, "value": "any", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3899,8 +3821,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -3932,8 +3853,8 @@ "ctxt": 0 }, "value": "any", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3950,7 +3871,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3961,7 +3881,6 @@ "ctxt": 0 }, "value": "inMethodNullable", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3995,8 +3914,8 @@ "ctxt": 0 }, "value": "stringOrNumberOrUndefined", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -4013,7 +3932,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -4024,7 +3942,6 @@ "ctxt": 0 }, "value": "inStaticMethod", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4058,8 +3975,8 @@ "ctxt": 0 }, "value": "stringOrNumberOrUndefined", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -4076,7 +3993,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -4087,7 +4003,6 @@ "ctxt": 0 }, "value": "inStaticGetter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4121,8 +4036,8 @@ "ctxt": 0 }, "value": "stringOrNumberOrUndefined", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -4139,7 +4054,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -4150,7 +4064,6 @@ "ctxt": 0 }, "value": "inStaticSetter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4184,8 +4097,8 @@ "ctxt": 0 }, "value": "stringOrNumberOrUndefined", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -4202,7 +4115,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -4213,7 +4125,6 @@ "ctxt": 0 }, "value": "inStaticPropertyDeclaration", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4247,8 +4158,8 @@ "ctxt": 0 }, "value": "stringOrNumberOrUndefined", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -4265,7 +4176,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -4276,7 +4186,6 @@ "ctxt": 0 }, "value": "inStaticNestedArrowFunction", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments2/input.ts.json index fbec6e6b67f1..cb1ff4a6bb6e 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments2/input.ts.json @@ -43,7 +43,6 @@ "ctxt": 0 }, "value": "OOOrder", - "typeAnnotation": null, "optional": false }, "property": { @@ -54,7 +53,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -163,7 +159,6 @@ "ctxt": 0 }, "value": "OOOrder", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -220,7 +215,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments3/input.ts.json index 732d86767492..305022d6afe1 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -130,7 +127,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -213,7 +208,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -251,7 +245,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments4/input.ts.json index ce7bf87a0f2a..9c45ed2f2db0 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -99,7 +97,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -145,7 +142,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -171,7 +167,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -228,7 +223,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -266,7 +260,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments5/input.ts.json index 66ef0aa1e34c..253e37d6aec9 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -99,7 +97,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -145,7 +142,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -171,7 +167,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -247,7 +242,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -283,7 +277,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "function": { @@ -332,7 +325,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -360,7 +352,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments6/input.ts.json index d0aca86c0eea..bfe492a712b3 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foonly", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -105,7 +104,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "property": { @@ -116,7 +114,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -162,7 +159,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "property": { @@ -173,7 +169,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -225,7 +220,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -236,7 +230,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -259,7 +252,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "property": { @@ -270,7 +262,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -333,7 +324,6 @@ "ctxt": 0 }, "value": "Foonly", - "typeAnnotation": null, "optional": false }, "property": { @@ -344,7 +334,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -357,7 +346,6 @@ "ctxt": 0 }, "value": "mreal", - "typeAnnotation": null, "optional": false }, "computed": false @@ -405,8 +393,8 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -450,7 +438,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "property": { @@ -461,7 +448,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -511,8 +497,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -529,7 +515,6 @@ "ctxt": 0 }, "value": "Foonly", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -561,7 +546,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -572,7 +556,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -600,7 +583,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -611,7 +593,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -646,7 +627,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -657,7 +637,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments7/input.ts.json index 42f1fb579775..f324352c2f95 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments7/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -79,8 +77,8 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -124,7 +122,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "property": { @@ -135,7 +132,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -181,7 +177,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "property": { @@ -192,7 +187,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -244,7 +238,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -255,7 +248,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -278,7 +270,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "property": { @@ -289,7 +280,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -328,7 +318,6 @@ "ctxt": 0 }, "value": "mreal", - "typeAnnotation": null, "optional": false }, "function": { @@ -372,8 +361,8 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -417,7 +406,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "property": { @@ -428,7 +416,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -489,8 +476,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -507,7 +494,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -539,7 +525,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -550,7 +535,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -578,7 +562,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -589,7 +572,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -624,7 +606,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -635,7 +616,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments8/input.ts.json index 5c399e2a127c..e62e9b89fc10 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassMembersFromAssignments8/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -77,8 +77,8 @@ "ctxt": 0 }, "value": "_this", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -122,7 +122,6 @@ "ctxt": 0 }, "value": "_this", - "typeAnnotation": null, "optional": false }, "property": { @@ -133,7 +132,6 @@ "ctxt": 0 }, "value": "swap", - "typeAnnotation": null, "optional": false }, "computed": false @@ -200,8 +198,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -218,7 +216,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -243,7 +240,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassStaticMembersFromAssignments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassStaticMembersFromAssignments/input.ts.json index 9cae3062f8a5..9ecb2fa0a8b5 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassStaticMembersFromAssignments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/inferringClassStaticMembersFromAssignments/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "property": { @@ -82,7 +80,6 @@ "ctxt": 0 }, "value": "staticProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -115,7 +112,6 @@ "ctxt": 0 }, "value": "F1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -171,7 +167,6 @@ "ctxt": 0 }, "value": "F1", - "typeAnnotation": null, "optional": false }, "property": { @@ -182,7 +177,6 @@ "ctxt": 0 }, "value": "staticProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -230,8 +224,8 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ClassExpression", @@ -284,7 +278,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "property": { @@ -295,7 +288,6 @@ "ctxt": 0 }, "value": "staticProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -343,8 +335,8 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -405,7 +397,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "property": { @@ -416,7 +407,6 @@ "ctxt": 0 }, "value": "staticProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -442,7 +432,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -489,7 +478,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "property": { @@ -500,7 +488,6 @@ "ctxt": 0 }, "value": "staticProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -526,7 +513,6 @@ "ctxt": 0 }, "value": "F3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -581,7 +567,6 @@ "ctxt": 0 }, "value": "F3", - "typeAnnotation": null, "optional": false }, "property": { @@ -592,7 +577,6 @@ "ctxt": 0 }, "value": "staticProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -633,8 +617,8 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ClassExpression", @@ -686,7 +670,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "property": { @@ -697,7 +680,6 @@ "ctxt": 0 }, "value": "staticProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -738,8 +720,8 @@ "ctxt": 0 }, "value": "F4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -799,7 +781,6 @@ "ctxt": 0 }, "value": "F4", - "typeAnnotation": null, "optional": false }, "property": { @@ -810,7 +791,6 @@ "ctxt": 0 }, "value": "staticProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -849,7 +829,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -896,6 +875,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -912,8 +892,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -945,8 +924,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -970,7 +949,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -981,7 +959,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -994,7 +971,6 @@ "ctxt": 0 }, "value": "staticProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1028,8 +1004,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1053,7 +1029,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1064,7 +1039,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1077,7 +1051,6 @@ "ctxt": 0 }, "value": "staticProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1111,8 +1084,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1136,7 +1109,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1147,7 +1119,6 @@ "ctxt": 0 }, "value": "F1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1160,7 +1131,6 @@ "ctxt": 0 }, "value": "staticProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1194,8 +1164,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1219,7 +1189,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1230,7 +1199,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1243,7 +1211,6 @@ "ctxt": 0 }, "value": "staticProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1277,8 +1244,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1295,7 +1262,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1306,7 +1272,6 @@ "ctxt": 0 }, "value": "staticProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1340,8 +1305,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1358,7 +1323,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "property": { @@ -1369,7 +1333,6 @@ "ctxt": 0 }, "value": "staticProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1403,8 +1366,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1421,7 +1384,6 @@ "ctxt": 0 }, "value": "F3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1432,7 +1394,6 @@ "ctxt": 0 }, "value": "staticProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1466,8 +1427,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1484,7 +1445,6 @@ "ctxt": 0 }, "value": "F4", - "typeAnnotation": null, "optional": false }, "property": { @@ -1495,7 +1455,6 @@ "ctxt": 0 }, "value": "staticProp", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/jsContainerMergeJsContainer/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/jsContainerMergeJsContainer/input.ts.json index 1c5e79f60dd1..f2bbc7cb0e2a 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/jsContainerMergeJsContainer/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/jsContainerMergeJsContainer/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -156,7 +154,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -167,7 +164,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -180,7 +176,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/jsContainerMergeTsDeclaration/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/jsContainerMergeTsDeclaration/input.ts.json index e98a6d092c0e..7bd1e255c745 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/jsContainerMergeTsDeclaration/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/jsContainerMergeTsDeclaration/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -44,7 +44,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [], @@ -102,7 +101,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -113,7 +111,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "params": [], @@ -179,8 +175,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/jsContainerMergeTsDeclaration2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/jsContainerMergeTsDeclaration2/input.ts.json index ecfa78f3d727..bfb55c7fce8e 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/jsContainerMergeTsDeclaration2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/jsContainerMergeTsDeclaration2/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -110,7 +108,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -121,7 +118,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -167,7 +163,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -178,7 +173,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/jsContainerMergeTsDeclaration3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/jsContainerMergeTsDeclaration3/input.ts.json index 5bc2e3f48301..ee390c6d8fd4 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/jsContainerMergeTsDeclaration3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/jsContainerMergeTsDeclaration3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -58,8 +57,8 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -104,7 +103,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -115,7 +113,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/jsObjectsMarkedAsOpenEnded/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/jsObjectsMarkedAsOpenEnded/input.ts.json index f3d49e23539d..cda13325d8ed 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/jsObjectsMarkedAsOpenEnded/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/jsObjectsMarkedAsOpenEnded/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "variable", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "variable", - "typeAnnotation": null, "optional": false }, "property": { @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -114,7 +112,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -140,7 +137,6 @@ "ctxt": 0 }, "value": "initializedMember", - "typeAnnotation": null, "optional": false }, "value": { @@ -178,7 +174,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -228,7 +223,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -289,7 +283,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -302,7 +295,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -355,8 +347,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -376,7 +368,6 @@ "ctxt": 0 }, "value": "property", - "typeAnnotation": null, "optional": false }, "value": { @@ -432,7 +423,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -443,7 +433,6 @@ "ctxt": 0 }, "value": "property", - "typeAnnotation": null, "optional": false }, "computed": false @@ -456,7 +445,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -497,8 +485,8 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -536,7 +524,6 @@ "ctxt": 0 }, "value": "getObj", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -609,7 +596,6 @@ "ctxt": 0 }, "value": "variable", - "typeAnnotation": null, "optional": false }, "property": { @@ -620,7 +606,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -687,7 +672,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -702,7 +686,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -715,7 +698,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -782,7 +764,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -797,7 +778,6 @@ "ctxt": 0 }, "value": "initializedMember", - "typeAnnotation": null, "optional": false }, "computed": false @@ -810,7 +790,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -863,7 +842,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -874,7 +852,6 @@ "ctxt": 0 }, "value": "property", - "typeAnnotation": null, "optional": false }, "computed": false @@ -887,7 +864,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -940,7 +916,6 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, "optional": false }, "property": { @@ -962,7 +937,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1015,7 +989,6 @@ "ctxt": 0 }, "value": "getObj", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1029,7 +1002,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/jsdocConstructorFunctionTypeReference/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/jsdocConstructorFunctionTypeReference/input.ts.json index 327752ac6d15..5578690ea1c6 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/jsdocConstructorFunctionTypeReference/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/jsdocConstructorFunctionTypeReference/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "Validator", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -44,7 +44,6 @@ "ctxt": 0 }, "value": "VFunc", - "typeAnnotation": null, "optional": false }, "params": [], @@ -100,7 +99,6 @@ "ctxt": 0 }, "value": "flags", - "typeAnnotation": null, "optional": false }, "computed": false @@ -169,7 +167,6 @@ "ctxt": 0 }, "value": "Validator", - "typeAnnotation": null, "optional": false }, "property": { @@ -180,7 +177,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -193,7 +189,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false }, "computed": false @@ -234,8 +229,8 @@ "ctxt": 0 }, "value": "validateRegExpFlags", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -257,8 +252,8 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -298,7 +293,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "property": { @@ -309,7 +303,6 @@ "ctxt": 0 }, "value": "flags", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport1/input.ts.json index afea6250aa79..a15b5dbb336e 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -84,8 +83,8 @@ "ctxt": 0 }, "value": "_str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -135,7 +134,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -146,7 +144,6 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, "optional": false }, "computed": true @@ -197,7 +194,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -208,7 +204,6 @@ "ctxt": 0 }, "value": "_str", - "typeAnnotation": null, "optional": false }, "computed": true @@ -259,7 +254,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -270,7 +264,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "computed": false @@ -283,7 +276,6 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, "optional": false } } @@ -313,8 +305,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -331,7 +323,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -384,8 +375,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -402,7 +393,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -450,8 +440,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -468,7 +458,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -486,7 +475,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -497,7 +485,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport2/input.ts.json index d5ee9b7dafc2..b2c0501cba13 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -84,8 +83,8 @@ "ctxt": 0 }, "value": "_str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -142,7 +141,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -153,7 +151,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -166,7 +163,6 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, "optional": false }, "computed": true @@ -224,7 +220,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -235,7 +230,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -248,7 +242,6 @@ "ctxt": 0 }, "value": "_str", - "typeAnnotation": null, "optional": false }, "computed": true @@ -306,7 +299,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -317,7 +309,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -330,7 +321,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "computed": false @@ -343,7 +333,6 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, "optional": false } } @@ -373,8 +362,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -391,7 +380,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -444,8 +432,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -462,7 +450,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -510,8 +497,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -528,7 +515,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -546,7 +532,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -557,7 +542,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport3/input.ts.json index c8c020e74c1c..6cd2cd67290c 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport3/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -84,8 +83,8 @@ "ctxt": 0 }, "value": "_str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -134,7 +133,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -145,7 +143,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -168,7 +165,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -179,7 +175,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -195,7 +190,6 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, "optional": false } }, @@ -219,7 +213,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -273,7 +266,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -284,7 +276,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -307,7 +298,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -318,7 +308,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -334,7 +323,6 @@ "ctxt": 0 }, "value": "_str", - "typeAnnotation": null, "optional": false } }, @@ -358,7 +346,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -420,7 +407,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -431,7 +417,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -444,7 +429,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "computed": false @@ -457,7 +441,6 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, "optional": false } } @@ -487,8 +470,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -505,7 +488,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -558,8 +540,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -576,7 +558,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -624,8 +605,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -642,7 +623,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -660,7 +640,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -671,7 +650,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport4/input.ts.json index 3fa50a567e36..cac4c7782bff 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport4/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -84,8 +83,8 @@ "ctxt": 0 }, "value": "_str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -115,7 +114,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -177,7 +175,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "property": { @@ -188,7 +185,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -201,7 +197,6 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, "optional": false }, "computed": true @@ -259,7 +254,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "property": { @@ -270,7 +264,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -283,7 +276,6 @@ "ctxt": 0 }, "value": "_str", - "typeAnnotation": null, "optional": false }, "computed": true @@ -329,8 +321,8 @@ "ctxt": 0 }, "value": "inst", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -347,7 +339,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -382,8 +373,8 @@ "ctxt": 0 }, "value": "_y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -400,7 +391,6 @@ "ctxt": 0 }, "value": "inst", - "typeAnnotation": null, "optional": false }, "property": { @@ -411,7 +401,6 @@ "ctxt": 0 }, "value": "_str", - "typeAnnotation": null, "optional": false }, "computed": true @@ -445,8 +434,8 @@ "ctxt": 0 }, "value": "_z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -463,7 +452,6 @@ "ctxt": 0 }, "value": "inst", - "typeAnnotation": null, "optional": false }, "property": { @@ -474,7 +462,6 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, "optional": false }, "computed": true @@ -520,7 +507,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -531,7 +517,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -544,7 +529,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "computed": false @@ -557,7 +541,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false } } @@ -599,7 +582,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -610,7 +592,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -623,7 +604,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "computed": false @@ -636,7 +616,6 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, "optional": false } } @@ -666,8 +645,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -684,7 +663,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -737,8 +715,8 @@ "ctxt": 0 }, "value": "inst", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -762,7 +740,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -773,7 +750,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "computed": false @@ -810,8 +786,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -828,7 +804,6 @@ "ctxt": 0 }, "value": "inst", - "typeAnnotation": null, "optional": false }, "property": { @@ -876,8 +851,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -894,7 +869,6 @@ "ctxt": 0 }, "value": "inst", - "typeAnnotation": null, "optional": false }, "property": { @@ -912,7 +886,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -923,7 +896,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport5/input.ts.json index bd0722d65e70..ec00d9529091 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -84,8 +83,8 @@ "ctxt": 0 }, "value": "_str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -115,7 +114,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -170,7 +168,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "property": { @@ -181,7 +178,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -211,7 +207,6 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, "optional": false } }, @@ -247,7 +242,6 @@ "ctxt": 0 }, "value": "_str", - "typeAnnotation": null, "optional": false } }, @@ -295,8 +289,8 @@ "ctxt": 0 }, "value": "inst", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -313,7 +307,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -348,8 +341,8 @@ "ctxt": 0 }, "value": "_y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -366,7 +359,6 @@ "ctxt": 0 }, "value": "inst", - "typeAnnotation": null, "optional": false }, "property": { @@ -377,7 +369,6 @@ "ctxt": 0 }, "value": "_str", - "typeAnnotation": null, "optional": false }, "computed": true @@ -411,8 +402,8 @@ "ctxt": 0 }, "value": "_z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -429,7 +420,6 @@ "ctxt": 0 }, "value": "inst", - "typeAnnotation": null, "optional": false }, "property": { @@ -440,7 +430,6 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, "optional": false }, "computed": true @@ -486,7 +475,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -497,7 +485,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -510,7 +497,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "computed": false @@ -523,7 +509,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false } } @@ -565,7 +550,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -576,7 +560,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -589,7 +572,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "computed": false @@ -602,7 +584,6 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, "optional": false } } @@ -632,8 +613,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -650,7 +631,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -703,8 +683,8 @@ "ctxt": 0 }, "value": "inst", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -728,7 +708,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -739,7 +718,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "computed": false @@ -776,8 +754,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -794,7 +772,6 @@ "ctxt": 0 }, "value": "inst", - "typeAnnotation": null, "optional": false }, "property": { @@ -842,8 +819,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -860,7 +837,6 @@ "ctxt": 0 }, "value": "inst", - "typeAnnotation": null, "optional": false }, "property": { @@ -878,7 +854,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -889,7 +864,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport6/input.ts.json index 4f5dc7033c32..b656c3aa7ad1 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport6/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -84,8 +83,8 @@ "ctxt": 0 }, "value": "_str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -115,7 +114,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -177,7 +175,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "property": { @@ -188,7 +185,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -201,7 +197,6 @@ "ctxt": 0 }, "value": "defsAClass", - "typeAnnotation": null, "optional": false }, "computed": false @@ -246,7 +241,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -257,7 +251,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -280,7 +273,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "property": { @@ -291,7 +283,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -307,7 +298,6 @@ "ctxt": 0 }, "value": "_str", - "typeAnnotation": null, "optional": false } }, @@ -331,7 +321,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -385,7 +374,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -396,7 +384,6 @@ "ctxt": 0 }, "value": "defineProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -419,7 +406,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "property": { @@ -430,7 +416,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -446,7 +431,6 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, "optional": false } }, @@ -470,7 +454,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -520,8 +503,8 @@ "ctxt": 0 }, "value": "inst", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -538,7 +521,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -573,8 +555,8 @@ "ctxt": 0 }, "value": "_y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -591,7 +573,6 @@ "ctxt": 0 }, "value": "inst", - "typeAnnotation": null, "optional": false }, "property": { @@ -602,7 +583,6 @@ "ctxt": 0 }, "value": "_str", - "typeAnnotation": null, "optional": false }, "computed": true @@ -636,8 +616,8 @@ "ctxt": 0 }, "value": "_z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -654,7 +634,6 @@ "ctxt": 0 }, "value": "inst", - "typeAnnotation": null, "optional": false }, "property": { @@ -665,7 +644,6 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, "optional": false }, "computed": true @@ -711,7 +689,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -722,7 +699,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -735,7 +711,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "computed": false @@ -748,7 +723,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false } } @@ -790,7 +764,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -801,7 +774,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -814,7 +786,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "computed": false @@ -827,7 +798,6 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, "optional": false } } @@ -857,8 +827,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -875,7 +845,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -928,8 +897,8 @@ "ctxt": 0 }, "value": "inst", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -953,7 +922,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -964,7 +932,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1001,8 +968,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1019,7 +986,6 @@ "ctxt": 0 }, "value": "inst", - "typeAnnotation": null, "optional": false }, "property": { @@ -1067,8 +1033,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1085,7 +1051,6 @@ "ctxt": 0 }, "value": "inst", - "typeAnnotation": null, "optional": false }, "property": { @@ -1103,7 +1068,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1114,7 +1078,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport7/input.ts.json index 39b68d3b91a3..989d0f673830 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundAssignmentDeclarationSupport7/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -84,8 +83,8 @@ "ctxt": 0 }, "value": "_str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -115,7 +114,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -170,7 +168,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "property": { @@ -181,7 +178,6 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, "optional": false }, "computed": true @@ -232,7 +228,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "property": { @@ -243,7 +238,6 @@ "ctxt": 0 }, "value": "_str", - "typeAnnotation": null, "optional": false }, "computed": true @@ -301,7 +295,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -312,7 +305,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -325,7 +317,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "computed": false @@ -338,7 +329,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false } } @@ -380,7 +370,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -391,7 +380,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -404,7 +392,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "computed": false @@ -417,7 +404,6 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, "optional": false } } @@ -447,8 +433,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -465,7 +451,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -518,8 +503,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -543,7 +528,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -554,7 +538,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "computed": false @@ -604,8 +587,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -629,7 +612,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -640,7 +622,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "computed": false @@ -660,7 +641,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -671,7 +651,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundClassMemberAssignmentJS/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundClassMemberAssignmentJS/input.ts.json index c6fbc589f2f9..7b9a601343ea 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundClassMemberAssignmentJS/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundClassMemberAssignmentJS/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -94,7 +93,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -120,7 +118,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -170,7 +167,6 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, "optional": false }, "computed": true @@ -211,7 +207,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -268,7 +263,6 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, "optional": false }, "computed": true @@ -314,8 +308,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -340,7 +334,6 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, "optional": false }, "computed": true diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundClassMemberAssignmentJS2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundClassMemberAssignmentJS2/input.ts.json index eeec4e5544a4..0834a88e3ad7 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundClassMemberAssignmentJS2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundClassMemberAssignmentJS2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -69,7 +69,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -95,7 +94,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -145,7 +143,6 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, "optional": false }, "computed": true @@ -186,7 +183,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -243,7 +239,6 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, "optional": false }, "computed": true @@ -289,8 +284,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -315,7 +310,6 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, "optional": false }, "computed": true diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundClassMemberAssignmentJS3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundClassMemberAssignmentJS3/input.ts.json index 86096e7a1756..83028ec4d09d 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundClassMemberAssignmentJS3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/lateBoundClassMemberAssignmentJS3/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -94,7 +93,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -120,7 +118,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -157,8 +154,8 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -202,7 +199,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "property": { @@ -213,7 +209,6 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, "optional": false }, "computed": true @@ -254,7 +249,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -298,8 +292,8 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -343,7 +337,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "property": { @@ -354,7 +347,6 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, "optional": false }, "computed": true @@ -400,8 +392,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -418,7 +410,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "property": { @@ -429,7 +420,6 @@ "ctxt": 0 }, "value": "_sym", - "typeAnnotation": null, "optional": false }, "computed": true diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/malformedTags/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/malformedTags/input.ts.json index 5531653adb3a..79054e276969 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/malformedTags/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/malformedTags/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "isArray", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "property": { @@ -60,7 +59,6 @@ "ctxt": 0 }, "value": "isArray", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/methodsReturningThis/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/methodsReturningThis/input.ts.json index 02ad3c37c7e9..a0d4cadf0815 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/methodsReturningThis/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/methodsReturningThis/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Class", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -78,7 +77,6 @@ "ctxt": 0 }, "value": "Class", - "typeAnnotation": null, "optional": false }, "property": { @@ -89,7 +87,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -102,7 +99,6 @@ "ctxt": 0 }, "value": "containsError", - "typeAnnotation": null, "optional": false }, "computed": false @@ -155,7 +151,6 @@ "ctxt": 0 }, "value": "notPresent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -207,7 +202,6 @@ "ctxt": 0 }, "value": "Class", - "typeAnnotation": null, "optional": false }, "property": { @@ -218,7 +212,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -231,7 +224,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -256,8 +248,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -276,8 +268,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -296,8 +288,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -316,8 +308,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -336,8 +328,8 @@ "ctxt": 0 }, "value": "tx", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -356,8 +348,8 @@ "ctxt": 0 }, "value": "ty", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -437,7 +429,6 @@ "ctxt": 0 }, "value": "Class", - "typeAnnotation": null, "optional": false }, "property": { @@ -448,7 +439,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -461,7 +451,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -486,8 +475,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -506,8 +495,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -587,7 +576,6 @@ "ctxt": 0 }, "value": "Class", - "typeAnnotation": null, "optional": false }, "property": { @@ -598,7 +586,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -611,7 +598,6 @@ "ctxt": 0 }, "value": "m3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -636,8 +622,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -656,8 +642,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -737,7 +723,6 @@ "ctxt": 0 }, "value": "Class", - "typeAnnotation": null, "optional": false }, "property": { @@ -748,7 +733,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -761,7 +745,6 @@ "ctxt": 0 }, "value": "m4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -786,8 +769,8 @@ "ctxt": 0 }, "value": "angle", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -867,7 +850,6 @@ "ctxt": 0 }, "value": "Class", - "typeAnnotation": null, "optional": false }, "property": { @@ -878,7 +860,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -891,7 +872,6 @@ "ctxt": 0 }, "value": "m5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -916,8 +896,8 @@ "ctxt": 0 }, "value": "matrix", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -997,7 +977,6 @@ "ctxt": 0 }, "value": "Class", - "typeAnnotation": null, "optional": false }, "property": { @@ -1008,7 +987,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1021,7 +999,6 @@ "ctxt": 0 }, "value": "m6", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1046,8 +1023,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1066,8 +1043,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1086,8 +1063,8 @@ "ctxt": 0 }, "value": "pivotX", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1106,8 +1083,8 @@ "ctxt": 0 }, "value": "pivotY", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1126,8 +1103,8 @@ "ctxt": 0 }, "value": "scaleX", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1146,8 +1123,8 @@ "ctxt": 0 }, "value": "scaleY", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1166,8 +1143,8 @@ "ctxt": 0 }, "value": "rotation", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1186,8 +1163,8 @@ "ctxt": 0 }, "value": "skewX", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1206,8 +1183,8 @@ "ctxt": 0 }, "value": "skewY", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1287,7 +1264,6 @@ "ctxt": 0 }, "value": "Class", - "typeAnnotation": null, "optional": false }, "property": { @@ -1298,7 +1274,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1311,7 +1286,6 @@ "ctxt": 0 }, "value": "m7", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1336,8 +1310,8 @@ "ctxt": 0 }, "value": "matrix", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1417,7 +1391,6 @@ "ctxt": 0 }, "value": "Class", - "typeAnnotation": null, "optional": false }, "property": { @@ -1428,7 +1401,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1441,7 +1413,6 @@ "ctxt": 0 }, "value": "m8", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1526,7 +1497,6 @@ "ctxt": 0 }, "value": "Class", - "typeAnnotation": null, "optional": false }, "property": { @@ -1537,7 +1507,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1550,7 +1519,6 @@ "ctxt": 0 }, "value": "m9", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/mixedPropertyElementAccessAssignmentDeclaration/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/mixedPropertyElementAccessAssignmentDeclaration/input.ts.json index 4325cba123ee..4c8921dbb598 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/mixedPropertyElementAccessAssignmentDeclaration/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/mixedPropertyElementAccessAssignmentDeclaration/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -91,7 +91,6 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, "optional": false }, "property": { @@ -113,7 +112,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAlias/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAlias/input.ts.json index 28a9e7d794da..cce8b40b11d2 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAlias/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAlias/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -82,7 +80,6 @@ "ctxt": 0 }, "value": "func1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -121,7 +117,6 @@ "ctxt": 0 }, "value": "func2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -149,7 +144,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -160,7 +154,6 @@ "ctxt": 0 }, "value": "func3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -188,7 +181,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -199,7 +191,6 @@ "ctxt": 0 }, "value": "func4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -227,7 +218,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -238,7 +228,6 @@ "ctxt": 0 }, "value": "func5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -266,7 +255,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -277,7 +265,6 @@ "ctxt": 0 }, "value": "func6", - "typeAnnotation": null, "optional": false }, "computed": false @@ -305,7 +292,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -316,7 +302,6 @@ "ctxt": 0 }, "value": "func7", - "typeAnnotation": null, "optional": false }, "computed": false @@ -344,7 +329,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -355,7 +339,6 @@ "ctxt": 0 }, "value": "func8", - "typeAnnotation": null, "optional": false }, "computed": false @@ -383,7 +366,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -394,7 +376,6 @@ "ctxt": 0 }, "value": "func9", - "typeAnnotation": null, "optional": false }, "computed": false @@ -422,7 +403,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -433,7 +413,6 @@ "ctxt": 0 }, "value": "func10", - "typeAnnotation": null, "optional": false }, "computed": false @@ -461,7 +440,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -472,7 +450,6 @@ "ctxt": 0 }, "value": "func11", - "typeAnnotation": null, "optional": false }, "computed": false @@ -500,7 +477,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -511,7 +487,6 @@ "ctxt": 0 }, "value": "func12", - "typeAnnotation": null, "optional": false }, "computed": false @@ -539,7 +514,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -550,7 +524,6 @@ "ctxt": 0 }, "value": "func13", - "typeAnnotation": null, "optional": false }, "computed": false @@ -578,7 +551,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -589,7 +561,6 @@ "ctxt": 0 }, "value": "func14", - "typeAnnotation": null, "optional": false }, "computed": false @@ -617,7 +588,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -628,7 +598,6 @@ "ctxt": 0 }, "value": "func15", - "typeAnnotation": null, "optional": false }, "computed": false @@ -656,7 +625,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -667,7 +635,6 @@ "ctxt": 0 }, "value": "func16", - "typeAnnotation": null, "optional": false }, "computed": false @@ -695,7 +662,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -706,7 +672,6 @@ "ctxt": 0 }, "value": "func17", - "typeAnnotation": null, "optional": false }, "computed": false @@ -734,7 +699,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -745,7 +709,6 @@ "ctxt": 0 }, "value": "func18", - "typeAnnotation": null, "optional": false }, "computed": false @@ -773,7 +736,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -784,7 +746,6 @@ "ctxt": 0 }, "value": "func19", - "typeAnnotation": null, "optional": false }, "computed": false @@ -812,7 +773,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -823,7 +783,6 @@ "ctxt": 0 }, "value": "func20", - "typeAnnotation": null, "optional": false }, "computed": false @@ -854,8 +813,8 @@ "ctxt": 0 }, "value": "exportsAlias", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -865,7 +824,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "definite": false @@ -902,7 +860,6 @@ "ctxt": 0 }, "value": "exportsAlias", - "typeAnnotation": null, "optional": false }, "property": { @@ -913,7 +870,6 @@ "ctxt": 0 }, "value": "func1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -974,7 +930,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -985,7 +940,6 @@ "ctxt": 0 }, "value": "func2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1041,8 +995,8 @@ "ctxt": 0 }, "value": "moduleExportsAlias", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1059,7 +1013,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1070,7 +1023,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1109,7 +1061,6 @@ "ctxt": 0 }, "value": "moduleExportsAlias", - "typeAnnotation": null, "optional": false }, "property": { @@ -1120,7 +1071,6 @@ "ctxt": 0 }, "value": "func3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1188,7 +1138,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1199,7 +1148,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1212,7 +1160,6 @@ "ctxt": 0 }, "value": "func4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1268,8 +1215,8 @@ "ctxt": 0 }, "value": "multipleDeclarationAlias1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AssignmentExpression", @@ -1287,8 +1234,8 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1305,7 +1252,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1316,7 +1262,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1356,7 +1301,6 @@ "ctxt": 0 }, "value": "multipleDeclarationAlias1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1367,7 +1311,6 @@ "ctxt": 0 }, "value": "func5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1423,8 +1366,8 @@ "ctxt": 0 }, "value": "multipleDeclarationAlias2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AssignmentExpression", @@ -1449,7 +1392,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1460,7 +1402,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1473,7 +1414,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false } }, @@ -1511,7 +1451,6 @@ "ctxt": 0 }, "value": "multipleDeclarationAlias2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1522,7 +1461,6 @@ "ctxt": 0 }, "value": "func6", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1578,8 +1516,8 @@ "ctxt": 0 }, "value": "someOtherVariable", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1611,8 +1549,8 @@ "ctxt": 0 }, "value": "multipleDeclarationAlias3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AssignmentExpression", @@ -1630,8 +1568,8 @@ "ctxt": 0 }, "value": "someOtherVariable", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1641,7 +1579,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false } }, @@ -1679,7 +1616,6 @@ "ctxt": 0 }, "value": "multipleDeclarationAlias3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1690,7 +1626,6 @@ "ctxt": 0 }, "value": "func7", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1746,8 +1681,8 @@ "ctxt": 0 }, "value": "multipleDeclarationAlias4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AssignmentExpression", @@ -1765,8 +1700,8 @@ "ctxt": 0 }, "value": "someOtherVariable", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1783,7 +1718,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1794,7 +1728,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1834,7 +1767,6 @@ "ctxt": 0 }, "value": "multipleDeclarationAlias4", - "typeAnnotation": null, "optional": false }, "property": { @@ -1845,7 +1777,6 @@ "ctxt": 0 }, "value": "func8", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1901,8 +1832,8 @@ "ctxt": 0 }, "value": "multipleDeclarationAlias5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AssignmentExpression", @@ -1927,7 +1858,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -1938,7 +1868,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1959,8 +1888,8 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -2007,7 +1936,6 @@ "ctxt": 0 }, "value": "multipleDeclarationAlias5", - "typeAnnotation": null, "optional": false }, "property": { @@ -2018,7 +1946,6 @@ "ctxt": 0 }, "value": "func9", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2074,8 +2001,8 @@ "ctxt": 0 }, "value": "multipleDeclarationAlias6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AssignmentExpression", @@ -2093,8 +2020,8 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -2119,7 +2046,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -2130,7 +2056,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2180,7 +2105,6 @@ "ctxt": 0 }, "value": "multipleDeclarationAlias6", - "typeAnnotation": null, "optional": false }, "property": { @@ -2191,7 +2115,6 @@ "ctxt": 0 }, "value": "func10", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2245,8 +2168,8 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -2271,7 +2194,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -2282,7 +2204,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2303,8 +2224,8 @@ "ctxt": 0 }, "value": "someOtherVariable", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -2349,7 +2270,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2360,7 +2280,6 @@ "ctxt": 0 }, "value": "func11", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2428,7 +2347,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -2439,7 +2357,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2452,7 +2369,6 @@ "ctxt": 0 }, "value": "func12", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2506,8 +2422,8 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -2532,7 +2448,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -2543,7 +2458,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2564,8 +2478,8 @@ "ctxt": 0 }, "value": "someOtherVariable", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -2610,7 +2524,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2621,7 +2534,6 @@ "ctxt": 0 }, "value": "func11", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2689,7 +2601,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -2700,7 +2611,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2713,7 +2623,6 @@ "ctxt": 0 }, "value": "func12", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2767,8 +2676,8 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -2793,7 +2702,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -2804,7 +2712,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2851,7 +2758,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -2862,7 +2768,6 @@ "ctxt": 0 }, "value": "func13", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2930,7 +2835,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -2941,7 +2845,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2954,7 +2857,6 @@ "ctxt": 0 }, "value": "func14", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3008,8 +2910,8 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -3034,7 +2936,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -3045,7 +2946,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3092,7 +2992,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -3103,7 +3002,6 @@ "ctxt": 0 }, "value": "func15", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3171,7 +3069,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -3182,7 +3079,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3195,7 +3091,6 @@ "ctxt": 0 }, "value": "func16", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3256,7 +3151,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -3267,7 +3161,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3288,8 +3181,8 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -3333,7 +3226,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -3344,7 +3236,6 @@ "ctxt": 0 }, "value": "func17", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3412,7 +3303,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -3423,7 +3313,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3436,7 +3325,6 @@ "ctxt": 0 }, "value": "func18", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3497,7 +3385,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -3508,7 +3395,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3554,7 +3440,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -3565,7 +3450,6 @@ "ctxt": 0 }, "value": "func19", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3633,7 +3517,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -3644,7 +3527,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3657,7 +3539,6 @@ "ctxt": 0 }, "value": "func20", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAlias2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAlias2/input.ts.json index 9211f57f4786..6cab3cfc58e2 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAlias2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAlias2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -111,6 +110,7 @@ "ctxt": 0 }, "value": "exports", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -127,8 +127,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -160,6 +159,7 @@ "ctxt": 0 }, "value": "module", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -191,7 +191,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -219,8 +218,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -250,8 +248,8 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -276,7 +274,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -287,7 +284,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -300,7 +296,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } @@ -336,7 +331,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -347,7 +341,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -368,8 +361,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -388,7 +381,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -418,7 +410,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -475,7 +466,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -523,8 +513,8 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -541,7 +531,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -594,8 +583,8 @@ "ctxt": 0 }, "value": "two", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -619,7 +608,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -630,7 +618,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -680,8 +667,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -698,7 +685,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAlias3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAlias3/input.ts.json index 6e3b3397074b..d57569edc1db 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAlias3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAlias3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -63,7 +62,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -95,7 +92,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAlias4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAlias4/input.ts.json index bcbfd03eb30c..6636e989cb7d 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAlias4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAlias4/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "wat", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -107,7 +106,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -118,7 +116,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -133,7 +130,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "span": { @@ -188,7 +184,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -199,7 +194,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -212,7 +206,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "computed": false @@ -227,7 +220,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAlias5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAlias5/input.ts.json index 82b98c5fed3e..7101fb7795c0 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAlias5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAlias5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "webpack", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -85,8 +85,8 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -111,7 +111,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -122,7 +121,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -135,7 +133,6 @@ "ctxt": 0 }, "value": "webpack", - "typeAnnotation": null, "optional": false } } @@ -171,7 +168,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "version", - "typeAnnotation": null, "optional": false }, "computed": false @@ -228,7 +223,6 @@ "ctxt": 0 }, "value": "webpack", - "typeAnnotation": null, "optional": false }, "property": { @@ -239,7 +233,6 @@ "ctxt": 0 }, "value": "WebpackOptionsDefaulter", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAliasElementAccessExpression/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAliasElementAccessExpression/input.ts.json index 06abce9d7fe1..e8a489352ec8 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAliasElementAccessExpression/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAliasElementAccessExpression/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -98,7 +96,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false } } @@ -133,7 +130,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -160,7 +156,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAliasExports/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAliasExports/input.ts.json index 0cb876a09afc..a50c1856c7c9 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAliasExports/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAliasExports/input.ts.json @@ -75,7 +75,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -86,7 +85,6 @@ "ctxt": 0 }, "value": "bigOak", - "typeAnnotation": null, "optional": false }, "computed": false @@ -132,7 +130,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -143,7 +140,6 @@ "ctxt": 0 }, "value": "everywhere", - "typeAnnotation": null, "optional": false }, "computed": false @@ -189,7 +185,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -200,7 +195,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -213,7 +207,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAliasImported/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAliasImported/input.ts.json index caab0ab5951d..152b8d8f131a 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAliasImported/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAliasImported/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "version", - "typeAnnotation": null, "optional": false }, "computed": false @@ -73,7 +71,6 @@ "ctxt": 0 }, "value": "alias", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -139,7 +135,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -152,7 +147,6 @@ "ctxt": 0 }, "value": "alias", - "typeAnnotation": null, "optional": false } } @@ -179,7 +173,6 @@ "ctxt": 0 }, "value": "import", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAliasUnknown/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAliasUnknown/input.ts.json index 2f4742a08ef9..50e039808834 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAliasUnknown/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAliasUnknown/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "window", - "typeAnnotation": null, "optional": false }, "property": { @@ -78,7 +75,6 @@ "ctxt": 0 }, "value": "nonprop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -115,7 +111,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -126,7 +121,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -139,7 +133,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAssignment/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAssignment/input.ts.json index 78466a670808..7bbc7b7b84c2 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAssignment/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAssignment/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "EE", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "on", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,8 +61,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -126,8 +124,8 @@ "ctxt": 0 }, "value": "npmlog", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AssignmentExpression", @@ -152,7 +150,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -163,7 +160,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -183,7 +179,6 @@ "ctxt": 0 }, "value": "EE", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -223,7 +218,6 @@ "ctxt": 0 }, "value": "npmlog", - "typeAnnotation": null, "optional": false }, "property": { @@ -234,7 +228,6 @@ "ctxt": 0 }, "value": "on", - "typeAnnotation": null, "optional": false }, "computed": false @@ -297,7 +290,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -308,7 +300,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -321,7 +312,6 @@ "ctxt": 0 }, "value": "on", - "typeAnnotation": null, "optional": false }, "computed": false @@ -378,7 +368,6 @@ "ctxt": 0 }, "value": "npmlog", - "typeAnnotation": null, "optional": false }, "property": { @@ -389,7 +378,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -442,7 +430,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -453,7 +440,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -466,7 +452,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -504,7 +489,6 @@ "ctxt": 0 }, "value": "npmlog", - "typeAnnotation": null, "optional": false }, "property": { @@ -515,7 +499,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -550,7 +533,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -561,7 +543,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -574,7 +555,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -605,8 +585,8 @@ "ctxt": 0 }, "value": "npmlog", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -623,7 +603,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -673,7 +652,6 @@ "ctxt": 0 }, "value": "npmlog", - "typeAnnotation": null, "optional": false }, "property": { @@ -684,7 +662,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -712,7 +689,6 @@ "ctxt": 0 }, "value": "npmlog", - "typeAnnotation": null, "optional": false }, "property": { @@ -723,7 +699,6 @@ "ctxt": 0 }, "value": "on", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAssignment2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAssignment2/input.ts.json index cd6547f8b01a..16f5ccabf3ce 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAssignment2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAssignment2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "npm", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AssignmentExpression", @@ -57,7 +57,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -68,7 +67,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -93,8 +91,8 @@ "ctxt": 0 }, "value": "tree", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -160,7 +158,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -171,7 +168,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -184,7 +180,6 @@ "ctxt": 0 }, "value": "asReadInstalled", - "typeAnnotation": null, "optional": false }, "computed": false @@ -209,8 +204,8 @@ "ctxt": 0 }, "value": "tree", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -250,7 +245,6 @@ "ctxt": 0 }, "value": "npm", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -264,7 +258,6 @@ "ctxt": 0 }, "value": "tree", - "typeAnnotation": null, "optional": false } } @@ -301,7 +294,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -312,7 +304,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -328,7 +319,6 @@ "ctxt": 0 }, "value": "tree", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAssignment3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAssignment3/input.ts.json index 0ab291b05717..9e6b55c93c20 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAssignment3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAssignment3/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "params": [], @@ -117,7 +114,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -128,7 +124,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -162,8 +157,8 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -180,7 +175,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -230,7 +224,6 @@ "ctxt": 0 }, "value": "mod", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAssignment4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAssignment4/input.ts.json index 9b3da45b30c3..1e2508a95f53 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAssignment4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAssignment4/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "computed": false @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": { @@ -93,7 +90,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -140,7 +136,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -151,7 +146,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -171,7 +165,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAssignment5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAssignment5/input.ts.json index 418146b58566..dbb5f538026a 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAssignment5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAssignment5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Axios", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -73,7 +71,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -136,8 +133,8 @@ "ctxt": 0 }, "value": "axios", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -154,7 +151,6 @@ "ctxt": 0 }, "value": "Axios", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -193,7 +189,6 @@ "ctxt": 0 }, "value": "axios", - "typeAnnotation": null, "optional": false }, "property": { @@ -204,7 +199,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -243,7 +237,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -254,7 +247,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -267,7 +259,6 @@ "ctxt": 0 }, "value": "axios", - "typeAnnotation": null, "optional": false } } @@ -309,7 +300,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -320,7 +310,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -333,7 +322,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "computed": false @@ -346,7 +334,6 @@ "ctxt": 0 }, "value": "axios", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAssignment6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAssignment6/input.ts.json index 593d8e426d6a..f135be75089d 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAssignment6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportAssignment6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,8 +60,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -113,7 +111,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -126,7 +123,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -192,7 +187,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -220,7 +214,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -241,8 +234,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -298,7 +291,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -311,7 +303,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -346,7 +337,6 @@ "ctxt": 0 }, "value": "exec", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -390,8 +380,8 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -408,7 +398,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -453,7 +442,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -464,7 +452,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -487,7 +474,6 @@ "ctxt": 0 }, "value": "tricky", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -531,8 +517,8 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -549,7 +535,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -617,7 +602,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -628,7 +612,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportDuplicateAlias/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportDuplicateAlias/input.ts.json index e4b3666f8524..da8beef9427e 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportDuplicateAlias/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportDuplicateAlias/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -60,7 +58,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -75,7 +72,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -141,7 +136,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -154,7 +148,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportNestedNamespaces/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportNestedNamespaces/input.ts.json index ead7aaba4e45..9972aeb27220 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportNestedNamespaces/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportNestedNamespaces/input.ts.json @@ -43,7 +43,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -54,7 +53,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -127,7 +124,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -138,7 +134,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -151,7 +146,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -164,7 +158,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "computed": false @@ -179,7 +172,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "params": [], @@ -235,7 +227,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -297,7 +288,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -308,7 +298,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -321,7 +310,6 @@ "ctxt": 0 }, "value": "Classic", - "typeAnnotation": null, "optional": false }, "computed": false @@ -351,7 +339,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -401,7 +388,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -454,7 +440,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -501,8 +486,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -533,7 +518,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -544,7 +528,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -557,7 +540,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "computed": false @@ -591,7 +573,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "property": { @@ -602,7 +583,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -633,8 +613,8 @@ "ctxt": 0 }, "value": "classic", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -658,7 +638,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -669,7 +648,6 @@ "ctxt": 0 }, "value": "Classic", - "typeAnnotation": null, "optional": false }, "computed": false @@ -691,7 +669,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -712,8 +689,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -732,8 +709,8 @@ "ctxt": 0 }, "value": "classic", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -773,7 +750,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -784,7 +760,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -812,7 +787,6 @@ "ctxt": 0 }, "value": "classic", - "typeAnnotation": null, "optional": false }, "property": { @@ -823,7 +797,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportPropertyAssignmentDefault/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportPropertyAssignmentDefault/input.ts.json index e62f7fceff00..7b977d9bdab4 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportPropertyAssignmentDefault/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportPropertyAssignmentDefault/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "axios", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -101,7 +99,6 @@ "ctxt": 0 }, "value": "axios", - "typeAnnotation": null, "optional": false } } @@ -143,7 +140,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -154,7 +150,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -167,7 +162,6 @@ "ctxt": 0 }, "value": "default", - "typeAnnotation": null, "optional": false }, "computed": false @@ -180,7 +174,6 @@ "ctxt": 0 }, "value": "axios", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportWithExportPropertyAssignment/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportWithExportPropertyAssignment/input.ts.json index 4c932ee7c2ef..ed8f94e69c8e 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportWithExportPropertyAssignment/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportWithExportPropertyAssignment/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "module", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,8 +90,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -108,7 +107,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -129,6 +127,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +144,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -208,7 +206,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -219,7 +216,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -287,7 +283,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -298,7 +293,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -311,7 +305,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -336,8 +329,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -388,8 +381,8 @@ "ctxt": 0 }, "value": "mod1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -406,7 +399,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -456,7 +448,6 @@ "ctxt": 0 }, "value": "mod1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -492,7 +483,6 @@ "ctxt": 0 }, "value": "mod1", - "typeAnnotation": null, "optional": false }, "property": { @@ -503,7 +493,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportWithExportPropertyAssignment2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportWithExportPropertyAssignment2/input.ts.json index 3bcf6a72eda0..befaf2f9670c 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportWithExportPropertyAssignment2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportWithExportPropertyAssignment2/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "module", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,8 +90,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -108,7 +107,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -129,6 +127,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +144,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -208,7 +206,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -219,7 +216,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -272,7 +268,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -283,7 +278,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -296,7 +290,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -352,8 +345,8 @@ "ctxt": 0 }, "value": "mod1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -370,7 +363,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -427,7 +419,6 @@ "ctxt": 0 }, "value": "mod1", - "typeAnnotation": null, "optional": false }, "property": { @@ -438,7 +429,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -489,7 +479,6 @@ "ctxt": 0 }, "value": "mod1", - "typeAnnotation": null, "optional": false }, "property": { @@ -500,7 +489,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportWithExportPropertyAssignment3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportWithExportPropertyAssignment3/input.ts.json index 182eded53ab3..b664a9e42204 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportWithExportPropertyAssignment3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportWithExportPropertyAssignment3/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "module", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,8 +90,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -108,7 +107,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -129,6 +127,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +144,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -215,7 +213,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -226,7 +223,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -239,7 +235,6 @@ "ctxt": 0 }, "value": "bothBefore", - "typeAnnotation": null, "optional": false }, "computed": false @@ -290,7 +285,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -301,7 +295,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -324,7 +317,6 @@ "ctxt": 0 }, "value": "justExport", - "typeAnnotation": null, "optional": false }, "value": { @@ -347,7 +339,6 @@ "ctxt": 0 }, "value": "bothBefore", - "typeAnnotation": null, "optional": false }, "value": { @@ -370,7 +361,6 @@ "ctxt": 0 }, "value": "bothAfter", - "typeAnnotation": null, "optional": false }, "value": { @@ -424,7 +414,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -435,7 +424,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -448,7 +436,6 @@ "ctxt": 0 }, "value": "bothAfter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -506,7 +493,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -517,7 +503,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -530,7 +515,6 @@ "ctxt": 0 }, "value": "justProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -576,8 +560,8 @@ "ctxt": 0 }, "value": "mod1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -594,7 +578,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -658,7 +641,6 @@ "ctxt": 0 }, "value": "mod1", - "typeAnnotation": null, "optional": false }, "property": { @@ -669,7 +651,6 @@ "ctxt": 0 }, "value": "justExport", - "typeAnnotation": null, "optional": false }, "computed": false @@ -682,7 +663,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -727,7 +707,6 @@ "ctxt": 0 }, "value": "mod1", - "typeAnnotation": null, "optional": false }, "property": { @@ -738,7 +717,6 @@ "ctxt": 0 }, "value": "bothBefore", - "typeAnnotation": null, "optional": false }, "computed": false @@ -751,7 +729,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -796,7 +773,6 @@ "ctxt": 0 }, "value": "mod1", - "typeAnnotation": null, "optional": false }, "property": { @@ -807,7 +783,6 @@ "ctxt": 0 }, "value": "bothAfter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -820,7 +795,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -858,7 +832,6 @@ "ctxt": 0 }, "value": "mod1", - "typeAnnotation": null, "optional": false }, "property": { @@ -869,7 +842,6 @@ "ctxt": 0 }, "value": "justProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -882,7 +854,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportWithExportPropertyAssignment4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportWithExportPropertyAssignment4/input.ts.json index ec95e69f5b57..6527398d0811 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportWithExportPropertyAssignment4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/moduleExportWithExportPropertyAssignment4/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "module", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,8 +90,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -108,7 +107,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -129,6 +127,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +144,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -215,7 +213,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -226,7 +223,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -239,7 +235,6 @@ "ctxt": 0 }, "value": "bothBefore", - "typeAnnotation": null, "optional": false }, "computed": false @@ -290,7 +285,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -301,7 +295,6 @@ "ctxt": 0 }, "value": "justExport", - "typeAnnotation": null, "optional": false }, "computed": false @@ -347,7 +340,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -358,7 +350,6 @@ "ctxt": 0 }, "value": "bothBefore", - "typeAnnotation": null, "optional": false }, "computed": false @@ -404,7 +395,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "property": { @@ -415,7 +405,6 @@ "ctxt": 0 }, "value": "bothAfter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -461,7 +450,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -472,7 +460,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -485,7 +472,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } @@ -500,7 +486,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -557,7 +542,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -617,7 +601,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -628,7 +611,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -641,7 +623,6 @@ "ctxt": 0 }, "value": "bothAfter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -699,7 +680,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -710,7 +690,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -723,7 +702,6 @@ "ctxt": 0 }, "value": "justProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -769,8 +747,8 @@ "ctxt": 0 }, "value": "mod1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -787,7 +765,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -851,7 +828,6 @@ "ctxt": 0 }, "value": "mod1", - "typeAnnotation": null, "optional": false }, "property": { @@ -862,7 +838,6 @@ "ctxt": 0 }, "value": "justExport", - "typeAnnotation": null, "optional": false }, "computed": false @@ -875,7 +850,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -920,7 +894,6 @@ "ctxt": 0 }, "value": "mod1", - "typeAnnotation": null, "optional": false }, "property": { @@ -931,7 +904,6 @@ "ctxt": 0 }, "value": "bothBefore", - "typeAnnotation": null, "optional": false }, "computed": false @@ -944,7 +916,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -989,7 +960,6 @@ "ctxt": 0 }, "value": "mod1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1000,7 +970,6 @@ "ctxt": 0 }, "value": "bothAfter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1013,7 +982,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1051,7 +1019,6 @@ "ctxt": 0 }, "value": "mod1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1062,7 +1029,6 @@ "ctxt": 0 }, "value": "justProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1075,7 +1041,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/multipleDeclarations/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/multipleDeclarations/input.ts.json index 915f4364391e..521dfbabb34a 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/multipleDeclarations/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/multipleDeclarations/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -132,7 +130,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -143,7 +140,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -216,7 +211,6 @@ "ctxt": 0 }, "value": "nothing", - "typeAnnotation": null, "optional": false }, "computed": false @@ -244,7 +238,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -270,7 +263,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -320,7 +312,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -362,7 +353,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -375,7 +365,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -435,7 +424,6 @@ "ctxt": 0 }, "value": "mistake", - "typeAnnotation": null, "optional": false }, "computed": false @@ -476,7 +464,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -522,7 +509,6 @@ "ctxt": 0 }, "value": "mistake", - "typeAnnotation": null, "optional": false }, "function": { @@ -585,8 +571,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -603,7 +589,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -650,7 +635,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "property": { @@ -661,7 +645,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -674,7 +657,6 @@ "ctxt": 0 }, "value": "mistake", - "typeAnnotation": null, "optional": false }, "computed": false @@ -719,7 +701,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -730,7 +711,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -761,7 +741,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -772,7 +751,6 @@ "ctxt": 0 }, "value": "mistake", - "typeAnnotation": null, "optional": false }, "computed": false @@ -788,7 +766,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -814,7 +791,6 @@ "ctxt": 0 }, "value": "mistake", - "typeAnnotation": null, "optional": false }, "function": { @@ -860,7 +836,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -906,7 +881,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -956,7 +930,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -998,7 +971,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1011,7 +983,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1071,7 +1042,6 @@ "ctxt": 0 }, "value": "mistake", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1141,7 +1111,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "property": { @@ -1152,7 +1121,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1165,7 +1133,6 @@ "ctxt": 0 }, "value": "mistake", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1206,8 +1173,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1224,7 +1191,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1263,7 +1229,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -1274,7 +1239,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1312,7 +1276,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -1323,7 +1286,6 @@ "ctxt": 0 }, "value": "mistake", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/namespaceAssignmentToRequireAlias/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/namespaceAssignmentToRequireAlias/input.ts.json index c3be5400dcb0..83b4ebbac3a5 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/namespaceAssignmentToRequireAlias/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/namespaceAssignmentToRequireAlias/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -88,8 +86,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -106,7 +104,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -171,7 +168,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "property": { @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "assignment", - "typeAnnotation": null, "optional": false }, "computed": false @@ -195,7 +190,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "computed": false @@ -240,7 +234,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "property": { @@ -251,7 +244,6 @@ "ctxt": 0 }, "value": "noError", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/nestedDestructuringOfRequire/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/nestedDestructuringOfRequire/input.ts.json index c96b9e043576..5bbeb362710f 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/nestedDestructuringOfRequire/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/nestedDestructuringOfRequire/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "chalk", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "grey", - "typeAnnotation": null, "optional": false }, "value": { @@ -108,7 +107,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -119,7 +117,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -132,7 +129,6 @@ "ctxt": 0 }, "value": "chalk", - "typeAnnotation": null, "optional": false }, "computed": false @@ -145,7 +141,6 @@ "ctxt": 0 }, "value": "chalk", - "typeAnnotation": null, "optional": false } } @@ -185,7 +180,6 @@ "ctxt": 0 }, "value": "chalk", - "typeAnnotation": null, "optional": false }, "value": { @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "grey", - "typeAnnotation": null, "optional": false }, "value": null @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -283,7 +275,6 @@ "ctxt": 0 }, "value": "grey", - "typeAnnotation": null, "optional": false } }, @@ -302,7 +293,6 @@ "ctxt": 0 }, "value": "chalk", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/nestedPrototypeAssignment/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/nestedPrototypeAssignment/input.ts.json index 10e8bbf66b72..4271029334ae 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/nestedPrototypeAssignment/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/nestedPrototypeAssignment/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -107,7 +105,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -118,7 +115,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -144,7 +139,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/privateConstructorFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/privateConstructorFunction/input.ts.json index 47bbe7fb36a8..6667fe64b764 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/privateConstructorFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/privateConstructorFunction/input.ts.json @@ -24,7 +24,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -81,7 +80,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -126,7 +124,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/privateIdentifierExpando/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/privateIdentifierExpando/input.ts.json index 8a275160dfa2..41ea0ddd38fc 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/privateIdentifierExpando/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/privateIdentifierExpando/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -84,7 +84,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -102,7 +101,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false } }, @@ -116,7 +114,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/propertiesOfGenericConstructorFunctions/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/propertiesOfGenericConstructorFunctions/input.ts.json index 2ec81d485ae9..d20a5d3d7756 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/propertiesOfGenericConstructorFunctions/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/propertiesOfGenericConstructorFunctions/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Multimap", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "ik", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -57,8 +56,8 @@ "ctxt": 0 }, "value": "iv", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -114,7 +113,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -168,7 +166,6 @@ "ctxt": 0 }, "value": "_map2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -198,7 +195,6 @@ "ctxt": 0 }, "value": "ik", - "typeAnnotation": null, "optional": false } }, @@ -210,7 +206,6 @@ "ctxt": 0 }, "value": "iv", - "typeAnnotation": null, "optional": false } } @@ -258,8 +253,8 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -276,7 +271,6 @@ "ctxt": 0 }, "value": "Multimap", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -341,8 +335,8 @@ "ctxt": 0 }, "value": "map2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -359,7 +353,6 @@ "ctxt": 0 }, "value": "Multimap", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -424,8 +417,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -449,7 +442,6 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, "optional": false }, "property": { @@ -460,7 +452,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -510,8 +501,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -535,7 +526,6 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, "optional": false }, "property": { @@ -546,7 +536,6 @@ "ctxt": 0 }, "value": "_map2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -596,8 +585,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -621,7 +610,6 @@ "ctxt": 0 }, "value": "map2", - "typeAnnotation": null, "optional": false }, "property": { @@ -632,7 +620,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -682,8 +669,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -707,7 +694,6 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, "optional": false }, "property": { @@ -718,7 +704,6 @@ "ctxt": 0 }, "value": "_map2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -753,7 +738,6 @@ "ctxt": 0 }, "value": "Cp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -774,8 +758,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -831,7 +815,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -885,7 +868,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -898,7 +880,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -940,7 +921,6 @@ "ctxt": 0 }, "value": "Cp", - "typeAnnotation": null, "optional": false }, "property": { @@ -951,7 +931,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -974,7 +953,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1022,7 +1000,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1045,7 +1022,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1101,7 +1077,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1137,7 +1112,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1184,7 +1158,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1226,8 +1199,8 @@ "ctxt": 0 }, "value": "cp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1244,7 +1217,6 @@ "ctxt": 0 }, "value": "Cp", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1292,8 +1264,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1310,7 +1282,6 @@ "ctxt": 0 }, "value": "cp", - "typeAnnotation": null, "optional": false }, "property": { @@ -1321,7 +1292,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1355,8 +1325,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1373,7 +1343,6 @@ "ctxt": 0 }, "value": "cp", - "typeAnnotation": null, "optional": false }, "property": { @@ -1384,7 +1353,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1418,8 +1386,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1443,7 +1411,6 @@ "ctxt": 0 }, "value": "cp", - "typeAnnotation": null, "optional": false }, "property": { @@ -1454,7 +1421,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1491,8 +1457,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1516,7 +1482,6 @@ "ctxt": 0 }, "value": "cp", - "typeAnnotation": null, "optional": false }, "property": { @@ -1527,7 +1492,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/propertyAssignmentOnImportedSymbol/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/propertyAssignmentOnImportedSymbol/input.ts.json index a1a52394dab7..45ec9daf6d36 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/propertyAssignmentOnImportedSymbol/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/propertyAssignmentOnImportedSymbol/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "hurk", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -78,7 +78,6 @@ "ctxt": 0 }, "value": "hurk", - "typeAnnotation": null, "optional": false }, "imported": null @@ -131,7 +130,6 @@ "ctxt": 0 }, "value": "hurk", - "typeAnnotation": null, "optional": false }, "property": { @@ -142,7 +140,6 @@ "ctxt": 0 }, "value": "expando", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/propertyAssignmentOnParenthesizedNumber/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/propertyAssignmentOnParenthesizedNumber/input.ts.json index f313161f1050..18541c77d826 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/propertyAssignmentOnParenthesizedNumber/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/propertyAssignmentOnParenthesizedNumber/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/propertyAssignmentOnUnresolvedImportedSymbol/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/propertyAssignmentOnUnresolvedImportedSymbol/input.ts.json index 7e1c3e324c33..a2b2f407b071 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/propertyAssignmentOnUnresolvedImportedSymbol/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/propertyAssignmentOnUnresolvedImportedSymbol/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -89,7 +88,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -100,7 +98,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/propertyAssignmentUseParentType1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/propertyAssignmentUseParentType1/input.ts.json index 35c3b14677f1..37d2c0bd18bd 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/propertyAssignmentUseParentType1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/propertyAssignmentUseParentType1/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -78,7 +77,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -147,6 +145,7 @@ "ctxt": 0 }, "value": "interfaced", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -169,13 +168,11 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -234,7 +231,6 @@ "ctxt": 0 }, "value": "interfaced", - "typeAnnotation": null, "optional": false }, "property": { @@ -245,7 +241,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false }, "computed": false @@ -293,6 +288,7 @@ "ctxt": 0 }, "value": "inlined", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -351,7 +347,6 @@ "ctxt": 0 }, "value": "nun", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -387,8 +382,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -447,7 +441,6 @@ "ctxt": 0 }, "value": "inlined", - "typeAnnotation": null, "optional": false }, "property": { @@ -458,7 +451,6 @@ "ctxt": 0 }, "value": "nun", - "typeAnnotation": null, "optional": false }, "computed": false @@ -506,8 +498,8 @@ "ctxt": 0 }, "value": "ignoreJsdoc", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -566,7 +558,6 @@ "ctxt": 0 }, "value": "ignoreJsdoc", - "typeAnnotation": null, "optional": false }, "property": { @@ -577,7 +568,6 @@ "ctxt": 0 }, "value": "extra", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/propertyAssignmentUseParentType2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/propertyAssignmentUseParentType2/input.ts.json index b71197c6e0fd..028a6ea09ecb 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/propertyAssignmentUseParentType2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/propertyAssignmentUseParentType2/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "inlined", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -98,7 +98,6 @@ "ctxt": 0 }, "value": "inlined", - "typeAnnotation": null, "optional": false }, "property": { @@ -109,7 +108,6 @@ "ctxt": 0 }, "value": "nuo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -157,8 +155,8 @@ "ctxt": 0 }, "value": "duplicated", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -217,7 +215,6 @@ "ctxt": 0 }, "value": "duplicated", - "typeAnnotation": null, "optional": false }, "property": { @@ -228,7 +225,6 @@ "ctxt": 0 }, "value": "nuo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -276,8 +272,8 @@ "ctxt": 0 }, "value": "conflictingDuplicated", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -336,7 +332,6 @@ "ctxt": 0 }, "value": "conflictingDuplicated", - "typeAnnotation": null, "optional": false }, "property": { @@ -347,7 +342,6 @@ "ctxt": 0 }, "value": "nuo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/propertyAssignmentUseParentType3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/propertyAssignmentUseParentType3/input.ts.json index 83a18e8ceef2..8daa457dcc39 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/propertyAssignmentUseParentType3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/propertyAssignmentUseParentType3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -105,7 +104,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "property": { @@ -116,7 +114,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -147,7 +144,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -244,7 +240,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "property": { @@ -255,7 +250,6 @@ "ctxt": 0 }, "value": "join", - "typeAnnotation": null, "optional": false }, "computed": false @@ -286,7 +280,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -380,7 +373,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "property": { @@ -391,7 +383,6 @@ "ctxt": 0 }, "value": "trim", - "typeAnnotation": null, "optional": false }, "computed": false @@ -422,7 +413,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -466,7 +456,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -525,7 +514,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -586,7 +574,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "property": { @@ -597,7 +584,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/prototypePropertyAssignmentMergeAcrossFiles/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/prototypePropertyAssignmentMergeAcrossFiles/input.ts.json index 083e54b4a28b..4a1d6a4282e9 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/prototypePropertyAssignmentMergeAcrossFiles/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/prototypePropertyAssignmentMergeAcrossFiles/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -133,7 +131,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -157,7 +153,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -210,7 +205,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/prototypePropertyAssignmentMergeAcrossFiles2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/prototypePropertyAssignmentMergeAcrossFiles2/input.ts.json index d07b90fba02e..1a46f1255bbb 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/prototypePropertyAssignmentMergeAcrossFiles2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/prototypePropertyAssignmentMergeAcrossFiles2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "Ns", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "Ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "One", - "typeAnnotation": null, "optional": false }, "computed": false @@ -149,7 +147,6 @@ "ctxt": 0 }, "value": "Ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -160,7 +157,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "computed": false @@ -228,7 +224,6 @@ "ctxt": 0 }, "value": "Ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -239,7 +234,6 @@ "ctxt": 0 }, "value": "One", - "typeAnnotation": null, "optional": false }, "computed": false @@ -252,7 +246,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -275,7 +268,6 @@ "ctxt": 0 }, "value": "ok", - "typeAnnotation": null, "optional": false }, "params": [], @@ -340,7 +332,6 @@ "ctxt": 0 }, "value": "Ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -351,7 +342,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "computed": false @@ -364,7 +354,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -405,8 +394,8 @@ "ctxt": 0 }, "value": "one", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -435,7 +424,6 @@ "ctxt": 0 }, "value": "one", - "typeAnnotation": null, "optional": false }, "property": { @@ -446,7 +434,6 @@ "ctxt": 0 }, "value": "wat", - "typeAnnotation": null, "optional": false }, "computed": false @@ -477,8 +464,8 @@ "ctxt": 0 }, "value": "two", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -507,7 +494,6 @@ "ctxt": 0 }, "value": "two", - "typeAnnotation": null, "optional": false }, "property": { @@ -518,7 +504,6 @@ "ctxt": 0 }, "value": "wat", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/prototypePropertyAssignmentMergeWithInterfaceMethod/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/prototypePropertyAssignmentMergeWithInterfaceMethod/input.ts.json index 862e891fed8e..6bb9756f7691 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/prototypePropertyAssignmentMergeWithInterfaceMethod/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/prototypePropertyAssignmentMergeWithInterfaceMethod/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "lf", - "typeAnnotation": null, "optional": false }, "body": { @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Transaction", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "attach", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -100,6 +97,7 @@ "ctxt": 0 }, "value": "query", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -124,7 +122,6 @@ "ctxt": 0 }, "value": "query", - "typeAnnotation": null, "optional": false }, "right": { @@ -135,14 +132,12 @@ "ctxt": 0 }, "value": "Builder", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -167,7 +162,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -193,7 +187,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -219,7 +212,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -249,7 +241,6 @@ "ctxt": 0 }, "value": "begin", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -263,6 +254,7 @@ "ctxt": 0 }, "value": "scope", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -285,7 +277,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -313,7 +304,6 @@ "ctxt": 0 }, "value": "schema", - "typeAnnotation": null, "optional": false }, "right": { @@ -324,7 +314,6 @@ "ctxt": 0 }, "value": "Table", - "typeAnnotation": null, "optional": false } }, @@ -333,8 +322,7 @@ ] } } - }, - "optional": false + } } ], "typeAnn": { @@ -359,7 +347,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -401,7 +388,6 @@ "ctxt": 0 }, "value": "commit", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -429,7 +415,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -471,7 +456,6 @@ "ctxt": 0 }, "value": "exec", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -485,6 +469,7 @@ "ctxt": 0 }, "value": "queries", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -507,7 +492,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -535,7 +519,6 @@ "ctxt": 0 }, "value": "query", - "typeAnnotation": null, "optional": false }, "right": { @@ -546,7 +529,6 @@ "ctxt": 0 }, "value": "Builder", - "typeAnnotation": null, "optional": false } }, @@ -555,8 +537,7 @@ ] } } - }, - "optional": false + } } ], "typeAnn": { @@ -581,7 +562,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -607,7 +587,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -633,7 +612,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -659,7 +637,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -692,7 +669,6 @@ "ctxt": 0 }, "value": "rollback", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -720,7 +696,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -762,7 +737,6 @@ "ctxt": 0 }, "value": "stats", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -790,7 +764,6 @@ "ctxt": 0 }, "value": "TransactionStats", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -835,7 +808,6 @@ "ctxt": 0 }, "value": "lf", - "typeAnnotation": null, "optional": false }, "property": { @@ -846,7 +818,6 @@ "ctxt": 0 }, "value": "Transaction", - "typeAnnotation": null, "optional": false }, "computed": false @@ -921,7 +892,6 @@ "ctxt": 0 }, "value": "lf", - "typeAnnotation": null, "optional": false }, "property": { @@ -932,7 +902,6 @@ "ctxt": 0 }, "value": "Transaction", - "typeAnnotation": null, "optional": false }, "computed": false @@ -945,7 +914,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -958,7 +926,6 @@ "ctxt": 0 }, "value": "begin", - "typeAnnotation": null, "optional": false }, "computed": false @@ -983,8 +950,8 @@ "ctxt": 0 }, "value": "scope", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/prototypePropertyAssignmentMergedTypeReference/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/prototypePropertyAssignmentMergedTypeReference/input.ts.json index 9f59a0a79957..6230cafa96f5 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/prototypePropertyAssignmentMergedTypeReference/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/prototypePropertyAssignmentMergedTypeReference/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -117,7 +117,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { @@ -128,7 +127,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -141,7 +139,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -187,8 +184,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -198,7 +195,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/requireOfESWithPropertyAccess/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/requireOfESWithPropertyAccess/input.ts.json index 60ded88d7dd4..693ce3cfd023 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/requireOfESWithPropertyAccess/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/requireOfESWithPropertyAccess/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -56,7 +56,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -112,7 +110,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -138,7 +135,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -149,7 +145,6 @@ "ctxt": 0 }, "value": "grey", - "typeAnnotation": null, "optional": false }, "computed": false @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -195,7 +189,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -208,7 +201,6 @@ "ctxt": 0 }, "value": "grey", - "typeAnnotation": null, "optional": false }, "computed": false @@ -239,8 +231,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -260,7 +252,6 @@ "ctxt": 0 }, "value": "grey", - "typeAnnotation": null, "optional": false }, "value": { @@ -302,7 +293,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "exported": null diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/requireTwoPropertyAccesses/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/requireTwoPropertyAccesses/input.ts.json index a44b50b51854..e70b62280c81 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/requireTwoPropertyAccesses/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/requireTwoPropertyAccesses/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -91,7 +88,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -141,8 +137,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -173,7 +169,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -205,7 +200,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -218,7 +212,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -256,7 +249,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -267,7 +259,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -283,7 +274,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/thisPropertyAssignment/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/thisPropertyAssignment/input.ts.json index e9097d87628b..69c10318db92 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/thisPropertyAssignment/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/thisPropertyAssignment/input.ts.json @@ -44,7 +44,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -105,7 +104,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -118,7 +116,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -281,7 +278,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -338,7 +334,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -399,7 +394,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -412,7 +406,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -597,8 +590,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -615,7 +608,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -647,7 +639,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { @@ -658,7 +649,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -686,7 +676,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { @@ -697,7 +686,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/thisPropertyAssignmentCircular/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/thisPropertyAssignmentCircular/input.ts.json index 71ec866e55da..098fd8f151a8 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/thisPropertyAssignmentCircular/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/thisPropertyAssignmentCircular/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -99,7 +97,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -140,7 +137,6 @@ "ctxt": 0 }, "value": "slicey", - "typeAnnotation": null, "optional": false }, "function": { @@ -197,7 +193,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -239,7 +234,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -252,7 +246,6 @@ "ctxt": 0 }, "value": "slice", - "typeAnnotation": null, "optional": false }, "computed": false @@ -290,7 +283,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -339,7 +331,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -376,7 +367,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -433,7 +423,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -487,7 +476,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -554,7 +542,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -567,7 +554,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/thisTypeOfConstructorFunctions/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/thisTypeOfConstructorFunctions/input.ts.json index 53a962ca6ee5..c1a50602191e 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/thisTypeOfConstructorFunctions/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/thisTypeOfConstructorFunctions/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Cp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -94,7 +93,6 @@ "ctxt": 0 }, "value": "dit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -147,7 +145,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -160,7 +157,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -203,7 +199,6 @@ "ctxt": 0 }, "value": "m3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -268,7 +263,6 @@ "ctxt": 0 }, "value": "Cp", - "typeAnnotation": null, "optional": false }, "property": { @@ -279,7 +273,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -302,7 +295,6 @@ "ctxt": 0 }, "value": "m4", - "typeAnnotation": null, "optional": false }, "params": [], @@ -358,7 +350,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -386,7 +377,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -430,7 +420,6 @@ "ctxt": 0 }, "value": "Cpp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -451,8 +440,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -508,7 +497,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -521,7 +509,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -570,7 +557,6 @@ "ctxt": 0 }, "value": "Cpp", - "typeAnnotation": null, "optional": false }, "property": { @@ -581,7 +567,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -594,7 +579,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -655,7 +639,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -683,7 +666,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -740,8 +722,8 @@ "ctxt": 0 }, "value": "cp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -758,7 +740,6 @@ "ctxt": 0 }, "value": "Cp", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -806,8 +787,8 @@ "ctxt": 0 }, "value": "cpp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -824,7 +805,6 @@ "ctxt": 0 }, "value": "Cpp", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -869,7 +849,6 @@ "ctxt": 0 }, "value": "cp", - "typeAnnotation": null, "optional": false }, "property": { @@ -880,7 +859,6 @@ "ctxt": 0 }, "value": "dit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -911,8 +889,8 @@ "ctxt": 0 }, "value": "cppn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -936,7 +914,6 @@ "ctxt": 0 }, "value": "cpp", - "typeAnnotation": null, "optional": false }, "property": { @@ -947,7 +924,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -984,8 +960,8 @@ "ctxt": 0 }, "value": "cpn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1009,7 +985,6 @@ "ctxt": 0 }, "value": "cp", - "typeAnnotation": null, "optional": false }, "property": { @@ -1020,7 +995,6 @@ "ctxt": 0 }, "value": "m3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1057,8 +1031,8 @@ "ctxt": 0 }, "value": "cpn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1082,7 +1056,6 @@ "ctxt": 0 }, "value": "cp", - "typeAnnotation": null, "optional": false }, "property": { @@ -1093,7 +1066,6 @@ "ctxt": 0 }, "value": "m4", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/topLevelThisAssignment/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/topLevelThisAssignment/input.ts.json index 0a5133394d45..97250f210565 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/topLevelThisAssignment/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/topLevelThisAssignment/input.ts.json @@ -44,7 +44,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -90,7 +89,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -111,7 +109,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -145,7 +142,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -166,7 +162,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromContextualThisType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromContextualThisType/input.ts.json index 33b76b29f441..3216f36f0a9a 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromContextualThisType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromContextualThisType/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "o1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "params": [], @@ -108,7 +107,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -129,8 +127,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -141,7 +139,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -189,8 +186,8 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -210,7 +207,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "params": [], @@ -266,7 +262,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false @@ -302,7 +297,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -323,8 +317,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -358,7 +352,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -371,7 +364,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromJSConstructor/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromJSConstructor/input.ts.json index bd4f4d46730d..8a0497c621ea 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromJSConstructor/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromJSConstructor/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Installer", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "computed": false @@ -127,7 +125,6 @@ "ctxt": 0 }, "value": "unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -180,7 +177,6 @@ "ctxt": 0 }, "value": "twice", - "typeAnnotation": null, "optional": false }, "computed": false @@ -193,7 +189,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -236,7 +231,6 @@ "ctxt": 0 }, "value": "twice", - "typeAnnotation": null, "optional": false }, "computed": false @@ -295,7 +289,6 @@ "ctxt": 0 }, "value": "twices", - "typeAnnotation": null, "optional": false }, "computed": false @@ -349,7 +342,6 @@ "ctxt": 0 }, "value": "twices", - "typeAnnotation": null, "optional": false }, "computed": false @@ -408,7 +400,6 @@ "ctxt": 0 }, "value": "Installer", - "typeAnnotation": null, "optional": false }, "property": { @@ -419,7 +410,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -432,7 +422,6 @@ "ctxt": 0 }, "value": "first", - "typeAnnotation": null, "optional": false }, "computed": false @@ -493,7 +482,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "computed": false @@ -552,7 +540,6 @@ "ctxt": 0 }, "value": "unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -611,7 +598,6 @@ "ctxt": 0 }, "value": "newProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -665,7 +651,6 @@ "ctxt": 0 }, "value": "twice", - "typeAnnotation": null, "optional": false }, "computed": false @@ -678,7 +663,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -721,7 +705,6 @@ "ctxt": 0 }, "value": "twice", - "typeAnnotation": null, "optional": false }, "computed": false @@ -788,7 +771,6 @@ "ctxt": 0 }, "value": "Installer", - "typeAnnotation": null, "optional": false }, "property": { @@ -799,7 +781,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -812,7 +793,6 @@ "ctxt": 0 }, "value": "second", - "typeAnnotation": null, "optional": false }, "computed": false @@ -873,7 +853,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "computed": false @@ -927,7 +906,6 @@ "ctxt": 0 }, "value": "unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -981,7 +959,6 @@ "ctxt": 0 }, "value": "newProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1035,7 +1012,6 @@ "ctxt": 0 }, "value": "twice", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1088,7 +1064,6 @@ "ctxt": 0 }, "value": "twice", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1148,7 +1123,6 @@ "ctxt": 0 }, "value": "twices", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1161,7 +1135,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1221,7 +1194,6 @@ "ctxt": 0 }, "value": "twices", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1287,7 +1259,6 @@ "ctxt": 0 }, "value": "twices", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1300,7 +1271,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromJSInitializer/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromJSInitializer/input.ts.json index dc8e2a8be7e7..ff7ed736eaf6 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromJSInitializer/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromJSInitializer/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -126,7 +124,6 @@ "ctxt": 0 }, "value": "unknowable", - "typeAnnotation": null, "optional": false }, "computed": false @@ -139,7 +136,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "empty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -230,8 +225,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -248,7 +243,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -288,7 +282,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -299,7 +292,6 @@ "ctxt": 0 }, "value": "unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -345,7 +337,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -356,7 +347,6 @@ "ctxt": 0 }, "value": "unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -402,7 +392,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -413,7 +402,6 @@ "ctxt": 0 }, "value": "unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -459,7 +447,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -470,7 +457,6 @@ "ctxt": 0 }, "value": "unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -521,7 +507,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -532,7 +517,6 @@ "ctxt": 0 }, "value": "unknowable", - "typeAnnotation": null, "optional": false }, "computed": false @@ -578,7 +562,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -589,7 +572,6 @@ "ctxt": 0 }, "value": "unknowable", - "typeAnnotation": null, "optional": false }, "computed": false @@ -635,7 +617,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -646,7 +627,6 @@ "ctxt": 0 }, "value": "unknowable", - "typeAnnotation": null, "optional": false }, "computed": false @@ -692,7 +672,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -703,7 +682,6 @@ "ctxt": 0 }, "value": "unknowable", - "typeAnnotation": null, "optional": false }, "computed": false @@ -760,7 +738,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -771,7 +748,6 @@ "ctxt": 0 }, "value": "empty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -784,7 +760,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -842,7 +817,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -853,7 +827,6 @@ "ctxt": 0 }, "value": "empty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -866,7 +839,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -924,7 +896,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -935,7 +906,6 @@ "ctxt": 0 }, "value": "empty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -948,7 +918,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1006,7 +975,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1017,7 +985,6 @@ "ctxt": 0 }, "value": "empty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1030,7 +997,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1082,8 +1048,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1100,7 +1066,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1128,8 +1093,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -1165,8 +1130,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1176,7 +1141,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1205,8 +1169,8 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -1258,8 +1222,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1269,7 +1233,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1297,8 +1260,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -1333,8 +1296,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1370,8 +1333,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -1407,8 +1370,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1444,8 +1407,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -1486,8 +1449,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1523,8 +1486,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1534,7 +1497,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1562,8 +1524,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -1610,7 +1572,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "property": { @@ -1621,7 +1582,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1672,7 +1632,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "property": { @@ -1683,7 +1642,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1742,8 +1700,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1753,7 +1711,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1785,8 +1742,8 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1824,8 +1781,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1835,7 +1792,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1863,8 +1819,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1900,8 +1856,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -1937,8 +1893,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1974,8 +1930,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -2022,7 +1978,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "property": { @@ -2033,7 +1988,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromParamTagForFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromParamTagForFunction/input.ts.json index 522f8de4bd8e..f3b18469e4f6 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromParamTagForFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromParamTagForFunction/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "id", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -111,6 +110,7 @@ "ctxt": 0 }, "value": "module", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -127,8 +127,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -148,6 +147,7 @@ "ctxt": 0 }, "value": "exports", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -164,8 +164,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -202,7 +201,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -213,7 +211,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -274,7 +271,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -339,7 +335,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "value": null @@ -363,7 +358,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -401,7 +395,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -422,8 +415,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -463,7 +456,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -474,7 +466,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -517,7 +508,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "property": { @@ -528,7 +518,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -558,7 +547,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -608,7 +596,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -678,7 +665,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "value": null @@ -702,7 +688,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -740,7 +725,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -761,8 +745,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -802,7 +786,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -813,7 +796,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -843,7 +825,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -900,7 +881,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -964,7 +944,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "value": null @@ -988,7 +967,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1026,7 +1004,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1047,8 +1024,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1088,7 +1065,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -1099,7 +1075,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1144,8 +1119,8 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -1203,7 +1178,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1271,7 +1245,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "value": null @@ -1295,7 +1268,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1333,7 +1305,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1354,8 +1325,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1395,7 +1366,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -1406,7 +1376,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1436,7 +1405,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1462,7 +1430,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1512,7 +1479,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1581,7 +1547,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "value": null @@ -1605,7 +1570,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1643,7 +1607,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1664,8 +1627,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1705,7 +1668,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -1716,7 +1678,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1754,8 +1715,8 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -1813,7 +1774,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1850,7 +1810,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1871,8 +1830,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1912,7 +1871,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -1923,7 +1881,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1946,7 +1903,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2003,7 +1959,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2036,7 +1991,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2057,8 +2011,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -2098,7 +2052,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -2109,7 +2062,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2132,7 +2084,6 @@ "ctxt": 0 }, "value": "H", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2158,7 +2109,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -2208,7 +2158,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2246,7 +2195,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2267,8 +2215,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -2308,7 +2256,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -2319,7 +2266,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment/input.ts.json index 5f3813b00afb..ae254e942e3f 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ClassExpression", @@ -44,7 +44,6 @@ "ctxt": 0 }, "value": "O", - "typeAnnotation": null, "optional": false }, "span": { @@ -69,7 +68,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -90,8 +88,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -110,8 +108,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -182,7 +180,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -193,7 +190,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -208,7 +204,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "span": { @@ -233,7 +228,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "function": { @@ -254,8 +248,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -274,8 +268,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -339,8 +333,8 @@ "ctxt": 0 }, "value": "si", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -369,7 +363,6 @@ "ctxt": 0 }, "value": "si", - "typeAnnotation": null, "optional": false }, "property": { @@ -380,7 +373,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -411,8 +403,8 @@ "ctxt": 0 }, "value": "oi", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -441,7 +433,6 @@ "ctxt": 0 }, "value": "oi", - "typeAnnotation": null, "optional": false }, "property": { @@ -452,7 +443,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment10/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment10/input.ts.json index ba461c88aa75..700ecd661092 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment10/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment10/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -50,7 +50,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "right": { @@ -97,7 +96,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -147,7 +143,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -201,7 +196,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -212,7 +206,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -225,7 +218,6 @@ "ctxt": 0 }, "value": "SomeView", - "typeAnnotation": null, "optional": false }, "computed": false @@ -287,8 +279,8 @@ "ctxt": 0 }, "value": "SomeView", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -333,8 +325,8 @@ "ctxt": 0 }, "value": "me", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -374,7 +366,6 @@ "ctxt": 0 }, "value": "SomeView", - "typeAnnotation": null, "optional": false } } @@ -428,7 +419,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -439,7 +429,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -452,7 +441,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -482,7 +470,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -532,7 +519,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -587,8 +573,8 @@ "ctxt": 0 }, "value": "example", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -619,7 +605,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -630,7 +615,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -643,7 +627,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -677,7 +660,6 @@ "ctxt": 0 }, "value": "example", - "typeAnnotation": null, "optional": false }, "property": { @@ -688,7 +670,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -731,7 +712,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -742,7 +722,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -755,7 +734,6 @@ "ctxt": 0 }, "value": "statische", - "typeAnnotation": null, "optional": false }, "computed": false @@ -780,8 +758,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -822,7 +800,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "right": { @@ -833,7 +810,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false } } @@ -884,7 +860,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -895,7 +870,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -908,7 +882,6 @@ "ctxt": 0 }, "value": "Application", - "typeAnnotation": null, "optional": false }, "computed": false @@ -970,8 +943,8 @@ "ctxt": 0 }, "value": "Application", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -1016,8 +989,8 @@ "ctxt": 0 }, "value": "me", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -1061,7 +1034,6 @@ "ctxt": 0 }, "value": "me", - "typeAnnotation": null, "optional": false }, "property": { @@ -1072,7 +1044,6 @@ "ctxt": 0 }, "value": "view", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1106,7 +1077,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -1117,7 +1087,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1130,7 +1099,6 @@ "ctxt": 0 }, "value": "SomeView", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1166,7 +1134,6 @@ "ctxt": 0 }, "value": "Application", - "typeAnnotation": null, "optional": false } } @@ -1208,8 +1175,8 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1240,7 +1207,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -1251,7 +1217,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1264,7 +1229,6 @@ "ctxt": 0 }, "value": "Application", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1301,8 +1265,8 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1333,7 +1297,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -1344,7 +1307,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1357,7 +1319,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1391,7 +1352,6 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, "optional": false }, "property": { @@ -1402,7 +1362,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1433,8 +1392,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1463,7 +1422,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1474,7 +1432,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1516,7 +1473,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -1527,7 +1483,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1540,7 +1495,6 @@ "ctxt": 0 }, "value": "statische", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment10_1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment10_1/input.ts.json index 3e6f699cf586..23f7af2bc2c7 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment10_1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment10_1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -50,7 +50,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "right": { @@ -97,7 +96,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -147,7 +143,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -201,7 +196,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -212,7 +206,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -225,7 +218,6 @@ "ctxt": 0 }, "value": "SomeView", - "typeAnnotation": null, "optional": false }, "computed": false @@ -287,8 +279,8 @@ "ctxt": 0 }, "value": "SomeView", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -333,8 +325,8 @@ "ctxt": 0 }, "value": "me", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -374,7 +366,6 @@ "ctxt": 0 }, "value": "SomeView", - "typeAnnotation": null, "optional": false } } @@ -428,7 +419,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -439,7 +429,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -452,7 +441,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -482,7 +470,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -532,7 +519,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -587,8 +573,8 @@ "ctxt": 0 }, "value": "example", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -619,7 +605,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -630,7 +615,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -643,7 +627,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -677,7 +660,6 @@ "ctxt": 0 }, "value": "example", - "typeAnnotation": null, "optional": false }, "property": { @@ -688,7 +670,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -731,7 +712,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -742,7 +722,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -755,7 +734,6 @@ "ctxt": 0 }, "value": "statische", - "typeAnnotation": null, "optional": false }, "computed": false @@ -780,8 +758,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -822,7 +800,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "right": { @@ -833,7 +810,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false } } @@ -884,7 +860,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -895,7 +870,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -908,7 +882,6 @@ "ctxt": 0 }, "value": "Application", - "typeAnnotation": null, "optional": false }, "computed": false @@ -970,8 +943,8 @@ "ctxt": 0 }, "value": "Application", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -1016,8 +989,8 @@ "ctxt": 0 }, "value": "me", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -1061,7 +1034,6 @@ "ctxt": 0 }, "value": "me", - "typeAnnotation": null, "optional": false }, "property": { @@ -1072,7 +1044,6 @@ "ctxt": 0 }, "value": "view", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1106,7 +1077,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -1117,7 +1087,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1130,7 +1099,6 @@ "ctxt": 0 }, "value": "SomeView", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1166,7 +1134,6 @@ "ctxt": 0 }, "value": "Application", - "typeAnnotation": null, "optional": false } } @@ -1208,8 +1175,8 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1240,7 +1207,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -1251,7 +1217,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1264,7 +1229,6 @@ "ctxt": 0 }, "value": "Application", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1301,8 +1265,8 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1333,7 +1297,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -1344,7 +1307,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1357,7 +1319,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1391,7 +1352,6 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, "optional": false }, "property": { @@ -1402,7 +1362,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1433,8 +1392,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1463,7 +1422,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1474,7 +1432,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1516,7 +1473,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -1527,7 +1483,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1540,7 +1495,6 @@ "ctxt": 0 }, "value": "statische", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment11/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment11/input.ts.json index 1acb5cd6d7f6..85d6d347eb3e 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment11/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment11/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -92,7 +92,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "property": { @@ -103,7 +102,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -126,7 +124,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "params": [], @@ -160,7 +157,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "value": { @@ -214,7 +210,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "property": { @@ -225,7 +220,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -238,7 +232,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "computed": false @@ -283,7 +276,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "property": { @@ -294,7 +286,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -307,7 +298,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": false @@ -338,8 +328,8 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -356,7 +346,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -395,7 +384,6 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, "optional": false }, "property": { @@ -406,7 +394,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -437,7 +424,6 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, "optional": false }, "property": { @@ -448,7 +434,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": false @@ -476,7 +461,6 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, "optional": false }, "property": { @@ -487,7 +471,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "computed": false @@ -515,7 +498,6 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, "optional": false }, "property": { @@ -526,7 +508,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment12/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment12/input.ts.json index 372bafe6f7cd..bd8dfad0a2fb 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment12/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment12/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -54,8 +54,8 @@ "ctxt": 0 }, "value": "element", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -74,8 +74,8 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -133,7 +133,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -144,7 +143,6 @@ "ctxt": 0 }, "value": "Pos", - "typeAnnotation": null, "optional": false }, "computed": false @@ -169,8 +167,8 @@ "ctxt": 0 }, "value": "line", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -189,8 +187,8 @@ "ctxt": 0 }, "value": "ch", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -252,7 +250,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -263,7 +260,6 @@ "ctxt": 0 }, "value": "Pos", - "typeAnnotation": null, "optional": false }, "computed": false @@ -276,7 +272,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -289,7 +284,6 @@ "ctxt": 0 }, "value": "line", - "typeAnnotation": null, "optional": false }, "computed": false @@ -320,8 +314,8 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -345,7 +339,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -356,7 +349,6 @@ "ctxt": 0 }, "value": "Pos", - "typeAnnotation": null, "optional": false }, "computed": false @@ -420,7 +412,6 @@ "ctxt": 0 }, "value": "pos", - "typeAnnotation": null, "optional": false }, "property": { @@ -431,7 +422,6 @@ "ctxt": 0 }, "value": "line", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment13/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment13/input.ts.json index 30fd1ed99566..32cc22312cc3 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment13/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment13/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -156,7 +154,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -167,7 +164,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -180,7 +176,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -203,7 +198,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "params": [], @@ -237,7 +231,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "value": { @@ -298,7 +291,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -309,7 +301,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -322,7 +313,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -335,7 +325,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "computed": false @@ -387,7 +376,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -398,7 +386,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -411,7 +398,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -424,7 +410,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": false @@ -455,8 +440,8 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -480,7 +465,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -491,7 +475,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -532,7 +515,6 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, "optional": false }, "property": { @@ -543,7 +525,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -574,7 +555,6 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, "optional": false }, "property": { @@ -585,7 +565,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": false @@ -613,7 +592,6 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, "optional": false }, "property": { @@ -624,7 +602,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "computed": false @@ -652,7 +629,6 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, "optional": false }, "property": { @@ -663,7 +639,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment14/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment14/input.ts.json index 02f609780c80..cea7c9548d36 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment14/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment14/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -156,7 +154,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -167,7 +164,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -180,7 +176,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -203,7 +198,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -226,7 +220,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "params": [], @@ -279,8 +272,8 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -309,7 +302,6 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, "optional": false }, "property": { @@ -320,7 +312,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -355,7 +346,6 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, "optional": false }, "property": { @@ -366,7 +356,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -400,8 +389,8 @@ "ctxt": 0 }, "value": "inno", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -425,7 +414,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -436,7 +424,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -470,7 +457,6 @@ "ctxt": 0 }, "value": "inno", - "typeAnnotation": null, "optional": false }, "property": { @@ -481,7 +467,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -516,7 +501,6 @@ "ctxt": 0 }, "value": "inno", - "typeAnnotation": null, "optional": false }, "property": { @@ -527,7 +511,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment15/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment15/input.ts.json index d1fd37f8ee09..913e89b79617 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment15/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment15/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -118,7 +116,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -168,7 +165,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -204,7 +200,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -269,8 +264,8 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -299,7 +294,6 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, "optional": false }, "property": { @@ -310,7 +304,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -345,7 +338,6 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, "optional": false }, "property": { @@ -356,7 +348,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -390,8 +381,8 @@ "ctxt": 0 }, "value": "inno", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -415,7 +406,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -426,7 +416,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -460,7 +449,6 @@ "ctxt": 0 }, "value": "inno", - "typeAnnotation": null, "optional": false }, "property": { @@ -471,7 +459,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -506,7 +493,6 @@ "ctxt": 0 }, "value": "inno", - "typeAnnotation": null, "optional": false }, "property": { @@ -517,7 +503,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment16/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment16/input.ts.json index ff3c9aeea4a4..1e30aee3a06f 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment16/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment16/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -156,7 +154,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -167,7 +164,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -180,7 +176,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -203,7 +198,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -226,7 +220,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "params": [], @@ -279,8 +272,8 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -309,7 +302,6 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, "optional": false }, "property": { @@ -320,7 +312,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -355,7 +346,6 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, "optional": false }, "property": { @@ -366,7 +356,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -400,8 +389,8 @@ "ctxt": 0 }, "value": "inno", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -425,7 +414,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -436,7 +424,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -470,7 +457,6 @@ "ctxt": 0 }, "value": "inno", - "typeAnnotation": null, "optional": false }, "property": { @@ -481,7 +467,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -516,7 +501,6 @@ "ctxt": 0 }, "value": "inno", - "typeAnnotation": null, "optional": false }, "property": { @@ -527,7 +511,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment17/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment17/input.ts.json index 2ba9612b14de..60ceb10d1ece 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment17/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment17/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "require", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "module", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -134,7 +134,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -145,7 +144,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -158,7 +156,6 @@ "ctxt": 0 }, "value": "minimatch", - "typeAnnotation": null, "optional": false } } @@ -193,7 +190,6 @@ "ctxt": 0 }, "value": "minimatch", - "typeAnnotation": null, "optional": false }, "property": { @@ -204,7 +200,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "computed": false @@ -217,7 +212,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } } @@ -252,7 +246,6 @@ "ctxt": 0 }, "value": "minimatch", - "typeAnnotation": null, "optional": false }, "property": { @@ -263,7 +256,6 @@ "ctxt": 0 }, "value": "filter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -276,7 +268,6 @@ "ctxt": 0 }, "value": "filter", - "typeAnnotation": null, "optional": false } } @@ -291,7 +282,6 @@ "ctxt": 0 }, "value": "filter", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -332,7 +322,6 @@ "ctxt": 0 }, "value": "minimatch", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -356,7 +345,6 @@ "ctxt": 0 }, "value": "minimatch", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -411,7 +399,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -422,7 +409,6 @@ "ctxt": 0 }, "value": "defaults", - "typeAnnotation": null, "optional": false }, "computed": false @@ -447,8 +433,8 @@ "ctxt": 0 }, "value": "def", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -481,7 +467,6 @@ "ctxt": 0 }, "value": "def", - "typeAnnotation": null, "optional": false } } @@ -531,7 +516,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -542,7 +526,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -555,7 +538,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -596,7 +578,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -646,8 +627,8 @@ "ctxt": 0 }, "value": "mini", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -664,7 +645,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -728,7 +708,6 @@ "ctxt": 0 }, "value": "mini", - "typeAnnotation": null, "optional": false }, "property": { @@ -739,7 +718,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "computed": false @@ -752,7 +730,6 @@ "ctxt": 0 }, "value": "defaults", - "typeAnnotation": null, "optional": false }, "computed": false @@ -786,8 +763,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -811,7 +788,6 @@ "ctxt": 0 }, "value": "mini", - "typeAnnotation": null, "optional": false }, "property": { @@ -822,7 +798,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "computed": false @@ -863,7 +838,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -874,7 +848,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -912,7 +885,6 @@ "ctxt": 0 }, "value": "mini", - "typeAnnotation": null, "optional": false }, "property": { @@ -923,7 +895,6 @@ "ctxt": 0 }, "value": "filter", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment18/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment18/input.ts.json index 0d070d4c4f76..001a027e41d9 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment18/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment18/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "GLOBSTAR", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AssignmentExpression", @@ -57,7 +57,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -68,7 +67,6 @@ "ctxt": 0 }, "value": "GLOBSTAR", - "typeAnnotation": null, "optional": false }, "computed": false @@ -97,7 +95,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -152,7 +149,6 @@ "ctxt": 0 }, "value": "GLOBSTAR", - "typeAnnotation": null, "optional": false }, "property": { @@ -163,7 +159,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -216,7 +211,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -227,7 +221,6 @@ "ctxt": 0 }, "value": "GLOBSTAR", - "typeAnnotation": null, "optional": false }, "computed": false @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false @@ -278,7 +270,6 @@ "ctxt": 0 }, "value": "GLOBSTAR", - "typeAnnotation": null, "optional": false }, "property": { @@ -289,7 +280,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -317,7 +307,6 @@ "ctxt": 0 }, "value": "GLOBSTAR", - "typeAnnotation": null, "optional": false }, "property": { @@ -328,7 +317,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false @@ -363,7 +351,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -374,7 +361,6 @@ "ctxt": 0 }, "value": "GLOBSTAR", - "typeAnnotation": null, "optional": false }, "computed": false @@ -387,7 +373,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -422,7 +407,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -433,7 +417,6 @@ "ctxt": 0 }, "value": "GLOBSTAR", - "typeAnnotation": null, "optional": false }, "computed": false @@ -446,7 +429,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment19/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment19/input.ts.json index 87308533251e..35f4e2f27d97 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment19/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment19/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "require", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "module", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -127,8 +127,8 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -153,7 +153,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -164,7 +163,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -177,7 +175,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } @@ -213,7 +210,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -224,7 +220,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -245,8 +240,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -265,7 +260,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -295,7 +289,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -352,7 +345,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -400,8 +392,8 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -418,7 +410,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -471,8 +462,8 @@ "ctxt": 0 }, "value": "two", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -496,7 +487,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -507,7 +497,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment2/input.ts.json index f21ee578c1c6..4ab421976928 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -126,7 +124,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -137,7 +134,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -152,7 +148,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "span": { @@ -177,7 +172,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -227,7 +221,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -282,8 +275,8 @@ "ctxt": 0 }, "value": "ok", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -312,7 +305,6 @@ "ctxt": 0 }, "value": "ok", - "typeAnnotation": null, "optional": false }, "property": { @@ -323,7 +315,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -354,8 +345,8 @@ "ctxt": 0 }, "value": "oc", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -384,7 +375,6 @@ "ctxt": 0 }, "value": "oc", - "typeAnnotation": null, "optional": false }, "property": { @@ -395,7 +385,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment20/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment20/input.ts.json index 97eea8704b5b..1ff66daca345 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment20/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment20/input.ts.json @@ -38,7 +38,6 @@ "ctxt": 0 }, "value": "outer", - "typeAnnotation": null, "optional": false }, "params": [ @@ -58,8 +57,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -92,7 +91,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -116,7 +114,6 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, "optional": false }, "params": [], @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "Async", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -201,7 +197,6 @@ "ctxt": 0 }, "value": "_trampolineEnabled", - "typeAnnotation": null, "optional": false }, "computed": false @@ -261,7 +256,6 @@ "ctxt": 0 }, "value": "Async", - "typeAnnotation": null, "optional": false }, "property": { @@ -272,7 +266,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -285,7 +278,6 @@ "ctxt": 0 }, "value": "disableTrampolineIfNecessary", - "typeAnnotation": null, "optional": false }, "computed": false @@ -300,7 +292,6 @@ "ctxt": 0 }, "value": "dtin", - "typeAnnotation": null, "optional": false }, "params": [ @@ -320,8 +311,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -354,7 +345,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -403,7 +393,6 @@ "ctxt": 0 }, "value": "_trampolineEnabled", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment21/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment21/input.ts.json index fc23849464fa..2fb4e619d53b 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment21/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment21/input.ts.json @@ -43,7 +43,6 @@ "ctxt": 0 }, "value": "Event", - "typeAnnotation": null, "optional": false }, "property": { @@ -54,7 +53,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "removeChildren", - "typeAnnotation": null, "optional": false }, "computed": false @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "textContent", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment22/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment22/input.ts.json index 04fe41cd59f4..e4f8bdef48bd 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment22/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment22/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Installer", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, "optional": false }, "computed": false @@ -133,7 +131,6 @@ "ctxt": 0 }, "value": "Installer", - "typeAnnotation": null, "optional": false }, "property": { @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -157,7 +153,6 @@ "ctxt": 0 }, "value": "loadArgMetadata", - "typeAnnotation": null, "optional": false }, "computed": false @@ -182,8 +177,8 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -224,8 +219,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -274,7 +269,6 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, "optional": false }, "computed": false @@ -333,7 +327,6 @@ "ctxt": 0 }, "value": "newProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -391,8 +384,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -409,7 +402,6 @@ "ctxt": 0 }, "value": "Installer", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -449,7 +441,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -460,7 +451,6 @@ "ctxt": 0 }, "value": "newProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -480,7 +470,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -491,7 +480,6 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment23/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment23/input.ts.json index 34e00c6bf067..afe60e99a3b1 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment23/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment23/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -176,7 +172,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -195,7 +190,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -240,7 +234,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -251,7 +244,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -264,7 +256,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -305,7 +296,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -324,7 +314,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -369,7 +358,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "property": { @@ -380,7 +368,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -393,7 +380,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -452,7 +438,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -492,7 +477,6 @@ "ctxt": 0 }, "value": "Module", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -546,7 +530,6 @@ "ctxt": 0 }, "value": "Module", - "typeAnnotation": null, "optional": false }, "property": { @@ -557,7 +540,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -570,7 +552,6 @@ "ctxt": 0 }, "value": "identifier", - "typeAnnotation": null, "optional": false }, "computed": false @@ -583,7 +564,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -625,7 +605,6 @@ "ctxt": 0 }, "value": "Module", - "typeAnnotation": null, "optional": false }, "property": { @@ -636,7 +615,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -649,7 +627,6 @@ "ctxt": 0 }, "value": "size", - "typeAnnotation": null, "optional": false }, "computed": false @@ -674,7 +651,6 @@ "ctxt": 0 }, "value": "NormalModule", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -700,7 +676,6 @@ "ctxt": 0 }, "value": "identifier", - "typeAnnotation": null, "optional": false }, "function": { @@ -769,7 +744,6 @@ "ctxt": 0 }, "value": "size", - "typeAnnotation": null, "optional": false }, "function": { @@ -827,7 +801,6 @@ "ctxt": 0 }, "value": "Module", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment24/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment24/input.ts.json index 89c1a3a87c28..d643fe30de3e 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment24/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment24/input.ts.json @@ -43,7 +43,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -54,7 +53,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -67,7 +65,6 @@ "ctxt": 0 }, "value": "Message", - "typeAnnotation": null, "optional": false }, "computed": false @@ -123,8 +120,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -148,7 +145,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -159,7 +155,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -193,7 +188,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -204,7 +198,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -235,8 +228,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -265,7 +258,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -276,7 +268,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -307,8 +298,8 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -353,7 +344,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -364,7 +354,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -394,7 +383,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment25/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment25/input.ts.json index 446d003e6e5e..b3d93965486a 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment25/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment25/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "Common", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "Common", - "typeAnnotation": null, "optional": false }, "property": { @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "computed": false @@ -118,7 +116,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -168,7 +165,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": false @@ -228,7 +224,6 @@ "ctxt": 0 }, "value": "Common", - "typeAnnotation": null, "optional": false }, "property": { @@ -239,7 +234,6 @@ "ctxt": 0 }, "value": "O", - "typeAnnotation": null, "optional": false }, "computed": false @@ -269,7 +263,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -345,7 +338,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "computed": false @@ -382,7 +374,6 @@ "ctxt": 0 }, "value": "Common", - "typeAnnotation": null, "optional": false }, "property": { @@ -393,7 +384,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "computed": false @@ -430,8 +420,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -455,7 +445,6 @@ "ctxt": 0 }, "value": "Common", - "typeAnnotation": null, "optional": false }, "property": { @@ -466,7 +455,6 @@ "ctxt": 0 }, "value": "O", - "typeAnnotation": null, "optional": false }, "computed": false @@ -503,8 +491,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -528,7 +516,6 @@ "ctxt": 0 }, "value": "Common", - "typeAnnotation": null, "optional": false }, "property": { @@ -539,7 +526,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "computed": false @@ -573,7 +559,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -584,7 +569,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": false @@ -612,7 +596,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -623,7 +606,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "computed": false @@ -651,7 +633,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -662,7 +643,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment26/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment26/input.ts.json index cfa88d99d163..21965ab4974c 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment26/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment26/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "UI", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "UI", - "typeAnnotation": null, "optional": false }, "property": { @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "TreeElement", - "typeAnnotation": null, "optional": false }, "computed": false @@ -118,7 +116,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -168,7 +165,6 @@ "ctxt": 0 }, "value": "treeOutline", - "typeAnnotation": null, "optional": false }, "computed": false @@ -228,7 +224,6 @@ "ctxt": 0 }, "value": "UI", - "typeAnnotation": null, "optional": false }, "property": { @@ -239,7 +234,6 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, "optional": false }, "computed": false @@ -266,7 +260,6 @@ "ctxt": 0 }, "value": "UI", - "typeAnnotation": null, "optional": false }, "property": { @@ -277,7 +270,6 @@ "ctxt": 0 }, "value": "TreeElement", - "typeAnnotation": null, "optional": false }, "computed": false @@ -297,7 +289,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -323,7 +314,6 @@ "ctxt": 0 }, "value": "onpopulate", - "typeAnnotation": null, "optional": false }, "function": { @@ -372,7 +362,6 @@ "ctxt": 0 }, "value": "doesNotExist", - "typeAnnotation": null, "optional": false }, "computed": false @@ -422,7 +411,6 @@ "ctxt": 0 }, "value": "treeOutline", - "typeAnnotation": null, "optional": false }, "computed": false @@ -435,7 +423,6 @@ "ctxt": 0 }, "value": "doesntExistEither", - "typeAnnotation": null, "optional": false }, "computed": false @@ -473,7 +460,6 @@ "ctxt": 0 }, "value": "UI", - "typeAnnotation": null, "optional": false }, "property": { @@ -484,7 +470,6 @@ "ctxt": 0 }, "value": "TreeElement", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment27/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment27/input.ts.json index 60c2c6753a2e..b1eb1c19d134 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment27/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment27/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -126,7 +124,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -137,7 +134,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -160,7 +156,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "value": { @@ -202,8 +197,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -220,7 +215,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -252,7 +246,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -263,7 +256,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -291,7 +283,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -302,7 +293,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment28/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment28/input.ts.json index 40beeb8c92cd..76917f089c3e 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment28/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment28/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -150,7 +147,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -161,7 +157,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "value": { @@ -226,8 +220,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -244,7 +238,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -276,7 +269,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -287,7 +279,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -315,7 +306,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -326,7 +316,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment29/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment29/input.ts.json index 2b38f7ecaf0b..5e822423abf6 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment29/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment29/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "ExpandoDecl", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -101,7 +100,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -112,7 +110,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -158,7 +155,6 @@ "ctxt": 0 }, "value": "ExpandoDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -215,7 +210,6 @@ "ctxt": 0 }, "value": "ExpandoDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -226,7 +220,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -251,6 +244,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -267,8 +261,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -309,7 +302,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -357,8 +349,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -391,7 +383,6 @@ "ctxt": 0 }, "value": "ExpandoDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -402,7 +393,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -429,7 +419,6 @@ "ctxt": 0 }, "value": "ExpandoDecl", - "typeAnnotation": null, "optional": false }, "property": { @@ -440,7 +429,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -484,7 +472,6 @@ "ctxt": 0 }, "value": "ExpandoDecl", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -511,7 +498,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -546,8 +532,8 @@ "ctxt": 0 }, "value": "ExpandoExpr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -569,6 +555,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -585,8 +572,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -633,7 +619,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -644,7 +629,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -694,7 +678,6 @@ "ctxt": 0 }, "value": "ExpandoExpr", - "typeAnnotation": null, "optional": false }, "property": { @@ -705,7 +688,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -728,7 +710,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -775,7 +756,6 @@ "ctxt": 0 }, "value": "ExpandoExpr", - "typeAnnotation": null, "optional": false }, "property": { @@ -786,7 +766,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -809,7 +788,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -861,7 +839,6 @@ "ctxt": 0 }, "value": "ExpandoExpr", - "typeAnnotation": null, "optional": false }, "property": { @@ -872,7 +849,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -897,6 +873,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -913,8 +890,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -955,7 +931,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -1003,8 +978,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1059,7 +1034,6 @@ "ctxt": 0 }, "value": "ExpandoExpr", - "typeAnnotation": null, "optional": false }, "property": { @@ -1070,7 +1044,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1083,7 +1056,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1121,7 +1093,6 @@ "ctxt": 0 }, "value": "ExpandoExpr", - "typeAnnotation": null, "optional": false }, "property": { @@ -1132,7 +1103,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1176,7 +1146,6 @@ "ctxt": 0 }, "value": "ExpandoExpr", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1203,7 +1172,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1238,8 +1206,8 @@ "ctxt": 0 }, "value": "ExpandoArrow", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1257,6 +1225,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1273,8 +1242,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1299,7 +1267,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -1310,7 +1277,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1357,7 +1323,6 @@ "ctxt": 0 }, "value": "ExpandoArrow", - "typeAnnotation": null, "optional": false }, "property": { @@ -1368,7 +1333,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1414,7 +1378,6 @@ "ctxt": 0 }, "value": "ExpandoArrow", - "typeAnnotation": null, "optional": false }, "property": { @@ -1425,7 +1388,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1450,6 +1412,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1466,8 +1429,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1508,7 +1470,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -1541,7 +1502,6 @@ "ctxt": 0 }, "value": "ExpandoNested", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1562,6 +1522,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1578,8 +1539,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1622,8 +1582,8 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -1645,6 +1605,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1661,8 +1622,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1703,7 +1663,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -1714,7 +1673,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -1760,7 +1718,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "property": { @@ -1771,7 +1728,6 @@ "ctxt": 0 }, "value": "total", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1792,7 +1748,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -1822,7 +1777,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false } } @@ -1863,7 +1817,6 @@ "ctxt": 0 }, "value": "ExpandoNested", - "typeAnnotation": null, "optional": false }, "property": { @@ -1874,7 +1827,6 @@ "ctxt": 0 }, "value": "also", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1909,7 +1861,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1930,6 +1881,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1946,8 +1898,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1988,7 +1939,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -2039,7 +1989,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -2050,7 +1999,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2083,7 +2031,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "body": { @@ -2126,8 +2073,8 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2163,7 +2110,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "body": { @@ -2206,8 +2152,8 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2251,8 +2197,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2293,7 +2239,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -2304,7 +2249,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2324,7 +2268,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -2335,7 +2278,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2356,7 +2298,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -2367,7 +2308,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2388,7 +2328,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2429,7 +2368,6 @@ "ctxt": 0 }, "value": "Ns", - "typeAnnotation": null, "optional": false }, "body": { @@ -2450,7 +2388,6 @@ "ctxt": 0 }, "value": "ExpandoNamespace", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2521,7 +2458,6 @@ "ctxt": 0 }, "value": "ExpandoNamespace", - "typeAnnotation": null, "optional": false }, "property": { @@ -2532,7 +2468,6 @@ "ctxt": 0 }, "value": "p6", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2565,7 +2500,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2599,7 +2533,6 @@ "ctxt": 0 }, "value": "ExpandoNamespace", - "typeAnnotation": null, "optional": false } } @@ -2639,8 +2572,8 @@ "ctxt": 0 }, "value": "ExpandoExpr2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -2662,6 +2595,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2678,8 +2612,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -2726,7 +2659,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -2737,7 +2669,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2787,7 +2718,6 @@ "ctxt": 0 }, "value": "ExpandoExpr2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2798,7 +2728,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2844,7 +2773,6 @@ "ctxt": 0 }, "value": "ExpandoExpr2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2855,7 +2783,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2880,6 +2807,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2896,8 +2824,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -2938,7 +2865,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -2986,8 +2912,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3020,7 +2946,6 @@ "ctxt": 0 }, "value": "ExpandoExpr2", - "typeAnnotation": null, "optional": false }, "property": { @@ -3031,7 +2956,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3058,7 +2982,6 @@ "ctxt": 0 }, "value": "ExpandoExpr2", - "typeAnnotation": null, "optional": false }, "property": { @@ -3069,7 +2992,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3113,7 +3035,6 @@ "ctxt": 0 }, "value": "ExpandoExpr2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3140,7 +3061,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3160,7 +3080,6 @@ "ctxt": 0 }, "value": "ExpandoClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3186,7 +3105,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -3246,7 +3164,6 @@ "ctxt": 0 }, "value": "ExpandoClass", - "typeAnnotation": null, "optional": false }, "property": { @@ -3257,7 +3174,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3303,7 +3219,6 @@ "ctxt": 0 }, "value": "ExpandoClass", - "typeAnnotation": null, "optional": false }, "property": { @@ -3314,7 +3229,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3339,6 +3253,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3355,8 +3270,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -3397,7 +3311,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -3445,8 +3358,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3479,7 +3392,6 @@ "ctxt": 0 }, "value": "ExpandoClass", - "typeAnnotation": null, "optional": false }, "property": { @@ -3490,7 +3402,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3517,7 +3428,6 @@ "ctxt": 0 }, "value": "ExpandoClass", - "typeAnnotation": null, "optional": false }, "property": { @@ -3528,7 +3438,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3572,7 +3481,6 @@ "ctxt": 0 }, "value": "ExpandoClass", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3586,7 +3494,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3621,8 +3528,8 @@ "ctxt": 0 }, "value": "ExpandoExpr3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ClassExpression", @@ -3649,7 +3556,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -3713,7 +3619,6 @@ "ctxt": 0 }, "value": "ExpandoExpr3", - "typeAnnotation": null, "optional": false }, "property": { @@ -3724,7 +3629,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3770,7 +3674,6 @@ "ctxt": 0 }, "value": "ExpandoExpr3", - "typeAnnotation": null, "optional": false }, "property": { @@ -3781,7 +3684,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3806,6 +3708,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3822,8 +3725,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -3864,7 +3766,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -3912,8 +3813,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3946,7 +3847,6 @@ "ctxt": 0 }, "value": "ExpandoExpr3", - "typeAnnotation": null, "optional": false }, "property": { @@ -3957,7 +3857,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3984,7 +3883,6 @@ "ctxt": 0 }, "value": "ExpandoExpr3", - "typeAnnotation": null, "optional": false }, "property": { @@ -3995,7 +3893,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4039,7 +3936,6 @@ "ctxt": 0 }, "value": "ExpandoExpr3", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4053,7 +3949,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment3/input.ts.json index f4ea498d96c0..8ec548260d6a 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment3/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -44,7 +44,6 @@ "ctxt": 0 }, "value": "O", - "typeAnnotation": null, "optional": false }, "params": [], @@ -100,7 +99,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -157,7 +155,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -168,7 +165,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -183,7 +179,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "span": { @@ -208,7 +203,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -258,7 +252,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -313,8 +306,8 @@ "ctxt": 0 }, "value": "ja", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -343,7 +336,6 @@ "ctxt": 0 }, "value": "ja", - "typeAnnotation": null, "optional": false }, "property": { @@ -354,7 +346,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -385,8 +376,8 @@ "ctxt": 0 }, "value": "da", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -415,7 +406,6 @@ "ctxt": 0 }, "value": "da", - "typeAnnotation": null, "optional": false }, "property": { @@ -426,7 +416,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment30/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment30/input.ts.json index 3e6d583b0ab7..119ac7d78a33 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment30/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment30/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Combo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -78,7 +77,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -111,6 +109,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -127,8 +126,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -188,6 +186,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -210,13 +209,11 @@ "ctxt": 0 }, "value": "Combo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -274,7 +271,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -285,7 +281,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment31/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment31/input.ts.json index a2b7b53cb95b..dbcb01fd4dd4 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment31/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment31/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -87,7 +86,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -128,7 +126,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -139,7 +136,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -185,7 +181,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -196,7 +191,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -221,6 +215,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -237,8 +232,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -279,7 +273,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -319,7 +312,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "body": { @@ -362,8 +354,8 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -412,7 +404,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -423,7 +414,6 @@ "ctxt": 0 }, "value": "p4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -469,7 +459,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -480,7 +469,6 @@ "ctxt": 0 }, "value": "p6", - "typeAnnotation": null, "optional": false }, "computed": false @@ -526,7 +514,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -537,7 +524,6 @@ "ctxt": 0 }, "value": "p8", - "typeAnnotation": null, "optional": false }, "computed": false @@ -570,7 +556,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "body": { @@ -613,8 +598,8 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -662,8 +647,8 @@ "ctxt": 0 }, "value": "p4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -711,8 +696,8 @@ "ctxt": 0 }, "value": "p5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -760,8 +745,8 @@ "ctxt": 0 }, "value": "p6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -809,8 +794,8 @@ "ctxt": 0 }, "value": "p7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -858,8 +843,8 @@ "ctxt": 0 }, "value": "p8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -907,8 +892,8 @@ "ctxt": 0 }, "value": "p9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -957,7 +942,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -968,7 +952,6 @@ "ctxt": 0 }, "value": "p5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1014,7 +997,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -1025,7 +1007,6 @@ "ctxt": 0 }, "value": "p7", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1071,7 +1052,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -1082,7 +1062,6 @@ "ctxt": 0 }, "value": "p9", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1123,8 +1102,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1221,7 +1200,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -1232,7 +1210,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1252,7 +1229,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -1263,7 +1239,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1284,7 +1259,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -1295,7 +1269,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1316,7 +1289,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -1327,7 +1299,6 @@ "ctxt": 0 }, "value": "p4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1348,7 +1319,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -1359,7 +1329,6 @@ "ctxt": 0 }, "value": "p5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1380,7 +1349,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -1391,7 +1359,6 @@ "ctxt": 0 }, "value": "p6", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1412,7 +1379,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -1423,7 +1389,6 @@ "ctxt": 0 }, "value": "p7", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1444,7 +1409,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -1455,7 +1419,6 @@ "ctxt": 0 }, "value": "p8", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1476,7 +1439,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -1487,7 +1449,6 @@ "ctxt": 0 }, "value": "p9", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1515,7 +1476,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -1526,7 +1486,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1563,7 +1522,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment32/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment32/input.ts.json index 7d7a50c46599..17cf909dad14 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment32/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment32/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -87,7 +86,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -128,7 +126,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -139,7 +136,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -185,7 +181,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -196,7 +191,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -221,6 +215,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -237,8 +232,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -279,7 +273,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -332,7 +325,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -343,7 +335,6 @@ "ctxt": 0 }, "value": "p4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -389,7 +380,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -400,7 +390,6 @@ "ctxt": 0 }, "value": "p5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -446,7 +435,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -457,7 +445,6 @@ "ctxt": 0 }, "value": "p6", - "typeAnnotation": null, "optional": false }, "computed": false @@ -503,7 +490,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -514,7 +500,6 @@ "ctxt": 0 }, "value": "p7", - "typeAnnotation": null, "optional": false }, "computed": false @@ -560,7 +545,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -571,7 +555,6 @@ "ctxt": 0 }, "value": "p8", - "typeAnnotation": null, "optional": false }, "computed": false @@ -617,7 +600,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -628,7 +610,6 @@ "ctxt": 0 }, "value": "p9", - "typeAnnotation": null, "optional": false }, "computed": false @@ -669,8 +650,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -767,7 +748,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -778,7 +758,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -798,7 +777,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -809,7 +787,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -830,7 +807,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -841,7 +817,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -862,7 +837,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -873,7 +847,6 @@ "ctxt": 0 }, "value": "p4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -894,7 +867,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -905,7 +877,6 @@ "ctxt": 0 }, "value": "p5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -926,7 +897,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -937,7 +907,6 @@ "ctxt": 0 }, "value": "p6", - "typeAnnotation": null, "optional": false }, "computed": false @@ -958,7 +927,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -969,7 +937,6 @@ "ctxt": 0 }, "value": "p7", - "typeAnnotation": null, "optional": false }, "computed": false @@ -990,7 +957,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -1001,7 +967,6 @@ "ctxt": 0 }, "value": "p8", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1022,7 +987,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -1033,7 +997,6 @@ "ctxt": 0 }, "value": "p9", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1061,7 +1024,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -1072,7 +1034,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1109,7 +1070,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1150,7 +1110,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "body": { @@ -1193,8 +1152,8 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1242,8 +1201,8 @@ "ctxt": 0 }, "value": "p4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1291,8 +1250,8 @@ "ctxt": 0 }, "value": "p5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1340,8 +1299,8 @@ "ctxt": 0 }, "value": "p6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1389,8 +1348,8 @@ "ctxt": 0 }, "value": "p7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1438,8 +1397,8 @@ "ctxt": 0 }, "value": "p8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1487,8 +1446,8 @@ "ctxt": 0 }, "value": "p9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1524,7 +1483,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "body": { @@ -1567,8 +1525,8 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment33/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment33/input.ts.json index 4114d1fe7bcf..a8a185b910b9 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment33/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment33/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "body": { @@ -66,8 +65,8 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -115,8 +114,8 @@ "ctxt": 0 }, "value": "p4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -164,8 +163,8 @@ "ctxt": 0 }, "value": "p5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -213,8 +212,8 @@ "ctxt": 0 }, "value": "p6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -262,8 +261,8 @@ "ctxt": 0 }, "value": "p7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -311,8 +310,8 @@ "ctxt": 0 }, "value": "p8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -360,8 +359,8 @@ "ctxt": 0 }, "value": "p9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -397,7 +396,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "body": { @@ -440,8 +438,8 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -470,7 +468,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -491,6 +488,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -507,8 +505,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -541,7 +538,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -582,7 +578,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -593,7 +588,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -639,7 +633,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -650,7 +643,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -675,6 +667,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -691,8 +684,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -733,7 +725,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -786,7 +777,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -797,7 +787,6 @@ "ctxt": 0 }, "value": "p4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -843,7 +832,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -854,7 +842,6 @@ "ctxt": 0 }, "value": "p5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -900,7 +887,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -911,7 +897,6 @@ "ctxt": 0 }, "value": "p6", - "typeAnnotation": null, "optional": false }, "computed": false @@ -957,7 +942,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -968,7 +952,6 @@ "ctxt": 0 }, "value": "p7", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1014,7 +997,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -1025,7 +1007,6 @@ "ctxt": 0 }, "value": "p8", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1071,7 +1052,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -1082,7 +1062,6 @@ "ctxt": 0 }, "value": "p9", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1123,8 +1102,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1221,7 +1200,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -1232,7 +1210,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1252,7 +1229,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -1263,7 +1239,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1284,7 +1259,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -1295,7 +1269,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1316,7 +1289,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -1327,7 +1299,6 @@ "ctxt": 0 }, "value": "p4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1348,7 +1319,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -1359,7 +1329,6 @@ "ctxt": 0 }, "value": "p5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1380,7 +1349,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -1391,7 +1359,6 @@ "ctxt": 0 }, "value": "p6", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1412,7 +1379,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -1423,7 +1389,6 @@ "ctxt": 0 }, "value": "p7", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1444,7 +1409,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -1455,7 +1419,6 @@ "ctxt": 0 }, "value": "p8", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1476,7 +1439,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -1487,7 +1449,6 @@ "ctxt": 0 }, "value": "p9", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1515,7 +1476,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "property": { @@ -1526,7 +1486,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1563,7 +1522,6 @@ "ctxt": 0 }, "value": "ExpandoMerge", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment34/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment34/input.ts.json index 3e73aad85785..021ce64f87d7 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment34/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment34/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "commands", - "typeAnnotation": null, "optional": false }, "computed": false @@ -141,7 +139,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -152,7 +149,6 @@ "ctxt": 0 }, "value": "commands", - "typeAnnotation": null, "optional": false }, "computed": false @@ -165,7 +161,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -218,7 +213,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -229,7 +223,6 @@ "ctxt": 0 }, "value": "commands", - "typeAnnotation": null, "optional": false }, "computed": false @@ -242,7 +235,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment35/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment35/input.ts.json index fc378ad3466e..1f1f969fbe24 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment35/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment35/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "ollKorrect", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -78,7 +77,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -89,7 +87,6 @@ "ctxt": 0 }, "value": "_model", - "typeAnnotation": null, "optional": false }, "computed": false @@ -120,8 +117,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -145,7 +142,6 @@ "ctxt": 0 }, "value": "Emu", - "typeAnnotation": null, "optional": false }, "property": { @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "computed": false @@ -193,8 +188,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -218,7 +213,6 @@ "ctxt": 0 }, "value": "Emu", - "typeAnnotation": null, "optional": false }, "property": { @@ -229,7 +223,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "computed": false @@ -242,7 +235,6 @@ "ctxt": 0 }, "value": "_wrapperInstance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -288,7 +280,6 @@ "ctxt": 0 }, "value": "Emu", - "typeAnnotation": null, "optional": false }, "property": { @@ -299,7 +290,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "computed": false @@ -329,7 +319,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -379,7 +368,6 @@ "ctxt": 0 }, "value": "_model", - "typeAnnotation": null, "optional": false }, "computed": false @@ -434,8 +422,8 @@ "ctxt": 0 }, "value": "Emu", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -479,7 +467,6 @@ "ctxt": 0 }, "value": "Emu", - "typeAnnotation": null, "optional": false }, "property": { @@ -490,7 +477,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "computed": false @@ -503,7 +489,6 @@ "ctxt": 0 }, "value": "_wrapperInstance", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment36/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment36/input.ts.json index 35e75c6535ae..e4a9b25bced6 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment36/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment36/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -82,7 +81,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -137,7 +135,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -148,7 +145,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false @@ -186,7 +182,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -197,7 +192,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false @@ -218,7 +212,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -259,7 +252,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -270,7 +262,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false @@ -312,7 +303,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -323,7 +313,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false @@ -344,7 +333,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -385,7 +373,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -396,7 +383,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false @@ -452,7 +438,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -463,7 +448,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false @@ -504,7 +488,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -515,7 +498,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false @@ -536,7 +518,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -577,7 +558,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -588,7 +568,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "computed": false @@ -644,7 +623,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -655,7 +633,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "computed": false @@ -696,7 +673,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -707,7 +683,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "computed": false @@ -728,7 +703,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -769,7 +743,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -780,7 +753,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -820,7 +792,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -856,8 +827,8 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -881,7 +852,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -908,7 +878,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -927,7 +896,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -982,7 +950,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -993,7 +960,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1031,7 +997,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -1042,7 +1007,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1120,7 +1084,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -1131,7 +1094,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1173,7 +1135,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -1184,7 +1145,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1262,7 +1222,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -1273,7 +1232,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1329,7 +1287,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -1340,7 +1297,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1381,7 +1337,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -1392,7 +1347,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1470,7 +1424,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -1481,7 +1434,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1537,7 +1489,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -1548,7 +1499,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1589,7 +1539,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -1600,7 +1549,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1631,8 +1579,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -1734,7 +1682,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "property": { @@ -1745,7 +1692,6 @@ "ctxt": 0 }, "value": "expando", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1787,7 +1733,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "property": { @@ -1798,7 +1743,6 @@ "ctxt": 0 }, "value": "expando", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1876,7 +1820,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "property": { @@ -1887,7 +1830,6 @@ "ctxt": 0 }, "value": "both", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1948,7 +1890,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "property": { @@ -1959,7 +1900,6 @@ "ctxt": 0 }, "value": "both", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2000,7 +1940,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "property": { @@ -2011,7 +1950,6 @@ "ctxt": 0 }, "value": "both", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment37/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment37/input.ts.json index a85fb20b2e32..9f5195bd5d12 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment37/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment37/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "util", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AssignmentExpression", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -76,7 +76,6 @@ "ctxt": 0 }, "value": "module", - "typeAnnotation": null, "optional": false }, "property": { @@ -87,7 +86,6 @@ "ctxt": 0 }, "value": "exports", - "typeAnnotation": null, "optional": false }, "computed": false @@ -179,7 +177,6 @@ "ctxt": 0 }, "value": "util", - "typeAnnotation": null, "optional": false }, "property": { @@ -190,7 +187,6 @@ "ctxt": 0 }, "value": "existy", - "typeAnnotation": null, "optional": false }, "computed": false @@ -250,8 +246,8 @@ "ctxt": 0 }, "value": "util", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -268,7 +264,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -306,7 +301,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -347,7 +341,6 @@ "ctxt": 0 }, "value": "util", - "typeAnnotation": null, "optional": false }, "property": { @@ -358,7 +351,6 @@ "ctxt": 0 }, "value": "existy", - "typeAnnotation": null, "optional": false }, "computed": false @@ -393,7 +385,6 @@ "ctxt": 0 }, "value": "util", - "typeAnnotation": null, "optional": false }, "property": { @@ -404,7 +395,6 @@ "ctxt": 0 }, "value": "existy", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment38/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment38/input.ts.json index 34f0c71d3993..c84c65c4fd85 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment38/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment38/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "property": { @@ -126,8 +124,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -187,7 +185,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment39/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment39/input.ts.json index eb58192d0ccb..1603ee0fa9fe 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment39/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment39/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -144,7 +143,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment4/input.ts.json index d4cf0a4d3d5b..3cfc0c448320 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment4/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -118,7 +116,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -168,7 +165,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -223,8 +219,8 @@ "ctxt": 0 }, "value": "local", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -253,7 +249,6 @@ "ctxt": 0 }, "value": "local", - "typeAnnotation": null, "optional": false }, "property": { @@ -264,7 +259,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -295,8 +289,8 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -320,7 +314,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -331,7 +324,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -365,7 +357,6 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, "optional": false }, "property": { @@ -376,7 +367,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -407,8 +397,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -437,7 +427,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -448,7 +437,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -479,8 +467,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -504,7 +492,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -515,7 +502,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -549,7 +535,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "property": { @@ -560,7 +545,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment40/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment40/input.ts.json index 1fc55ff9bb7c..f28674f496cd 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment40/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment40/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -105,7 +104,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "property": { @@ -116,7 +114,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -164,8 +161,8 @@ "ctxt": 0 }, "value": "ok", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -194,7 +191,6 @@ "ctxt": 0 }, "value": "ok", - "typeAnnotation": null, "optional": false }, "property": { @@ -205,7 +201,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment5/input.ts.json index 340421e296c3..0d078b14b087 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment5/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "params": [], @@ -78,7 +77,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "property": { @@ -89,7 +87,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -104,7 +101,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "span": { @@ -144,7 +140,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "property": { @@ -155,7 +150,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -184,7 +178,6 @@ "ctxt": 0 }, "value": "MC", - "typeAnnotation": null, "optional": false } } @@ -228,7 +221,6 @@ "ctxt": 0 }, "value": "MC", - "typeAnnotation": null, "optional": false }, "property": { @@ -239,7 +231,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -270,8 +261,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment6/input.ts.json index f3706c56a70f..bb28c4bc79a6 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -63,7 +62,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "Inner", - "typeAnnotation": null, "optional": false }, "computed": false @@ -89,7 +86,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "span": { @@ -114,7 +110,6 @@ "ctxt": 0 }, "value": "messages", - "typeAnnotation": null, "optional": false }, "function": { @@ -194,7 +189,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -205,7 +199,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": false @@ -236,8 +229,8 @@ "ctxt": 0 }, "value": "msgs", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -268,7 +261,6 @@ "ctxt": 0 }, "value": "Outer", - "typeAnnotation": null, "optional": false }, "property": { @@ -279,7 +271,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": false @@ -292,7 +283,6 @@ "ctxt": 0 }, "value": "messages", - "typeAnnotation": null, "optional": false }, "computed": false @@ -314,7 +304,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -335,8 +324,8 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment7/input.ts.json index de402e25962b..4929ac987771 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment7/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -77,7 +77,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false @@ -113,8 +111,8 @@ "ctxt": 0 }, "value": "hunch", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -183,8 +181,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -208,7 +206,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -219,7 +216,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment8/input.ts.json index f7ec2210db12..62269edf8005 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment8/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -50,7 +50,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "right": { @@ -97,7 +96,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -147,7 +143,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -201,7 +196,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -212,7 +206,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -225,7 +218,6 @@ "ctxt": 0 }, "value": "Application", - "typeAnnotation": null, "optional": false }, "computed": false @@ -287,8 +279,8 @@ "ctxt": 0 }, "value": "Application", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -333,7 +325,6 @@ "ctxt": 0 }, "value": "Application", - "typeAnnotation": null, "optional": false } } @@ -386,7 +377,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -397,7 +387,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -410,7 +399,6 @@ "ctxt": 0 }, "value": "Application", - "typeAnnotation": null, "optional": false }, "computed": false @@ -444,8 +432,8 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -470,7 +458,6 @@ "ctxt": 0 }, "value": "window", - "typeAnnotation": null, "optional": false }, "property": { @@ -481,7 +468,6 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, "optional": false }, "computed": false @@ -530,7 +516,6 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, "optional": false }, "property": { @@ -541,7 +526,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -569,7 +553,6 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, "optional": false }, "property": { @@ -580,7 +563,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -634,7 +616,6 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, "optional": false }, "property": { @@ -645,7 +626,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -658,7 +638,6 @@ "ctxt": 0 }, "value": "Application", - "typeAnnotation": null, "optional": false }, "computed": false @@ -720,8 +699,8 @@ "ctxt": 0 }, "value": "Application", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -766,7 +745,6 @@ "ctxt": 0 }, "value": "Application", - "typeAnnotation": null, "optional": false } } @@ -819,7 +797,6 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, "optional": false }, "property": { @@ -830,7 +807,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -843,7 +819,6 @@ "ctxt": 0 }, "value": "Application", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment8_1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment8_1/input.ts.json index 347f37576b36..4a8a6b8059e3 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment8_1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment8_1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -50,7 +50,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "right": { @@ -97,7 +96,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -147,7 +143,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -201,7 +196,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -212,7 +206,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -225,7 +218,6 @@ "ctxt": 0 }, "value": "Application", - "typeAnnotation": null, "optional": false }, "computed": false @@ -287,8 +279,8 @@ "ctxt": 0 }, "value": "Application", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -333,7 +325,6 @@ "ctxt": 0 }, "value": "Application", - "typeAnnotation": null, "optional": false } } @@ -386,7 +377,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -397,7 +387,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -410,7 +399,6 @@ "ctxt": 0 }, "value": "Application", - "typeAnnotation": null, "optional": false }, "computed": false @@ -444,8 +432,8 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -470,7 +458,6 @@ "ctxt": 0 }, "value": "window", - "typeAnnotation": null, "optional": false }, "property": { @@ -481,7 +468,6 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, "optional": false }, "computed": false @@ -530,7 +516,6 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, "optional": false }, "property": { @@ -541,7 +526,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -569,7 +553,6 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, "optional": false }, "property": { @@ -580,7 +563,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -634,7 +616,6 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, "optional": false }, "property": { @@ -645,7 +626,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -658,7 +638,6 @@ "ctxt": 0 }, "value": "Application", - "typeAnnotation": null, "optional": false }, "computed": false @@ -720,8 +699,8 @@ "ctxt": 0 }, "value": "Application", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -766,7 +745,6 @@ "ctxt": 0 }, "value": "Application", - "typeAnnotation": null, "optional": false } } @@ -819,7 +797,6 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, "optional": false }, "property": { @@ -830,7 +807,6 @@ "ctxt": 0 }, "value": "app", - "typeAnnotation": null, "optional": false }, "computed": false @@ -843,7 +819,6 @@ "ctxt": 0 }, "value": "Application", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment9/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment9/input.ts.json index 017032dae3e8..d5d958a5ecde 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment9/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment9/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -50,7 +50,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "right": { @@ -97,7 +96,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false @@ -133,8 +130,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -175,7 +172,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -228,7 +224,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -239,7 +234,6 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, "optional": false }, "computed": false @@ -285,7 +279,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -296,7 +289,6 @@ "ctxt": 0 }, "value": "object", - "typeAnnotation": null, "optional": false }, "computed": false @@ -342,7 +334,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -353,7 +344,6 @@ "ctxt": 0 }, "value": "predicate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -381,7 +371,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -392,7 +381,6 @@ "ctxt": 0 }, "value": "predicate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -446,7 +434,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -457,7 +444,6 @@ "ctxt": 0 }, "value": "predicate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -470,7 +456,6 @@ "ctxt": 0 }, "value": "query", - "typeAnnotation": null, "optional": false }, "computed": false @@ -518,8 +503,8 @@ "ctxt": 0 }, "value": "me", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -563,7 +548,6 @@ "ctxt": 0 }, "value": "me", - "typeAnnotation": null, "optional": false }, "property": { @@ -574,7 +558,6 @@ "ctxt": 0 }, "value": "property", - "typeAnnotation": null, "optional": false }, "computed": false @@ -624,8 +607,8 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -656,7 +639,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -667,7 +649,6 @@ "ctxt": 0 }, "value": "predicate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -680,7 +661,6 @@ "ctxt": 0 }, "value": "query", - "typeAnnotation": null, "optional": false }, "computed": false @@ -736,7 +716,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -747,7 +726,6 @@ "ctxt": 0 }, "value": "predicate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -760,7 +738,6 @@ "ctxt": 0 }, "value": "query", - "typeAnnotation": null, "optional": false }, "computed": false @@ -773,7 +750,6 @@ "ctxt": 0 }, "value": "another", - "typeAnnotation": null, "optional": false }, "computed": false @@ -866,7 +842,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -877,7 +852,6 @@ "ctxt": 0 }, "value": "predicate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -890,7 +864,6 @@ "ctxt": 0 }, "value": "query", - "typeAnnotation": null, "optional": false }, "computed": false @@ -903,7 +876,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "computed": false @@ -961,7 +933,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -972,7 +943,6 @@ "ctxt": 0 }, "value": "predicate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -985,7 +955,6 @@ "ctxt": 0 }, "value": "sort", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1020,7 +989,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -1031,7 +999,6 @@ "ctxt": 0 }, "value": "predicate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1044,7 +1011,6 @@ "ctxt": 0 }, "value": "sort", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1069,8 +1035,8 @@ "ctxt": 0 }, "value": "first", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1089,8 +1055,8 @@ "ctxt": 0 }, "value": "second", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1138,7 +1104,6 @@ "ctxt": 0 }, "value": "first", - "typeAnnotation": null, "optional": false }, "right": { @@ -1149,7 +1114,6 @@ "ctxt": 0 }, "value": "second", - "typeAnnotation": null, "optional": false } }, @@ -1161,7 +1125,6 @@ "ctxt": 0 }, "value": "first", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1172,7 +1135,6 @@ "ctxt": 0 }, "value": "second", - "typeAnnotation": null, "optional": false } } @@ -1224,7 +1186,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -1235,7 +1196,6 @@ "ctxt": 0 }, "value": "predicate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1248,7 +1208,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1278,7 +1237,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -1361,8 +1319,8 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1387,7 +1345,6 @@ "ctxt": 0 }, "value": "window", - "typeAnnotation": null, "optional": false }, "property": { @@ -1398,7 +1355,6 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1447,7 +1403,6 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, "optional": false }, "property": { @@ -1458,7 +1413,6 @@ "ctxt": 0 }, "value": "nest", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1501,7 +1455,6 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1514,7 +1467,6 @@ "ctxt": 0 }, "value": "nest", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1583,7 +1535,6 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, "optional": false }, "property": { @@ -1594,7 +1545,6 @@ "ctxt": 0 }, "value": "nest", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1607,7 +1557,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1649,7 +1598,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "property": { @@ -1660,7 +1608,6 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1673,7 +1620,6 @@ "ctxt": 0 }, "value": "nest", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1686,7 +1632,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1740,7 +1685,6 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, "optional": false }, "property": { @@ -1751,7 +1695,6 @@ "ctxt": 0 }, "value": "property", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1786,7 +1729,6 @@ "ctxt": 0 }, "value": "global", - "typeAnnotation": null, "optional": false }, "property": { @@ -1797,7 +1739,6 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1810,7 +1751,6 @@ "ctxt": 0 }, "value": "property", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment9_1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment9_1/input.ts.json index c3ea6d04a1a7..c025b9e10ae3 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment9_1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignment9_1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -50,7 +50,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "right": { @@ -97,7 +96,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false @@ -133,8 +130,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -175,7 +172,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -228,7 +224,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -239,7 +234,6 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, "optional": false }, "computed": false @@ -285,7 +279,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -296,7 +289,6 @@ "ctxt": 0 }, "value": "object", - "typeAnnotation": null, "optional": false }, "computed": false @@ -342,7 +334,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -353,7 +344,6 @@ "ctxt": 0 }, "value": "predicate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -381,7 +371,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -392,7 +381,6 @@ "ctxt": 0 }, "value": "predicate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -446,7 +434,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -457,7 +444,6 @@ "ctxt": 0 }, "value": "predicate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -470,7 +456,6 @@ "ctxt": 0 }, "value": "query", - "typeAnnotation": null, "optional": false }, "computed": false @@ -518,8 +503,8 @@ "ctxt": 0 }, "value": "me", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -563,7 +548,6 @@ "ctxt": 0 }, "value": "me", - "typeAnnotation": null, "optional": false }, "property": { @@ -574,7 +558,6 @@ "ctxt": 0 }, "value": "property", - "typeAnnotation": null, "optional": false }, "computed": false @@ -624,8 +607,8 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -656,7 +639,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -667,7 +649,6 @@ "ctxt": 0 }, "value": "predicate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -680,7 +661,6 @@ "ctxt": 0 }, "value": "query", - "typeAnnotation": null, "optional": false }, "computed": false @@ -736,7 +716,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -747,7 +726,6 @@ "ctxt": 0 }, "value": "predicate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -760,7 +738,6 @@ "ctxt": 0 }, "value": "query", - "typeAnnotation": null, "optional": false }, "computed": false @@ -773,7 +750,6 @@ "ctxt": 0 }, "value": "another", - "typeAnnotation": null, "optional": false }, "computed": false @@ -866,7 +842,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -877,7 +852,6 @@ "ctxt": 0 }, "value": "predicate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -890,7 +864,6 @@ "ctxt": 0 }, "value": "query", - "typeAnnotation": null, "optional": false }, "computed": false @@ -903,7 +876,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "computed": false @@ -961,7 +933,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -972,7 +943,6 @@ "ctxt": 0 }, "value": "predicate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -985,7 +955,6 @@ "ctxt": 0 }, "value": "sort", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1020,7 +989,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -1031,7 +999,6 @@ "ctxt": 0 }, "value": "predicate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1044,7 +1011,6 @@ "ctxt": 0 }, "value": "sort", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1069,8 +1035,8 @@ "ctxt": 0 }, "value": "first", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1089,8 +1055,8 @@ "ctxt": 0 }, "value": "second", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1138,7 +1104,6 @@ "ctxt": 0 }, "value": "first", - "typeAnnotation": null, "optional": false }, "right": { @@ -1149,7 +1114,6 @@ "ctxt": 0 }, "value": "second", - "typeAnnotation": null, "optional": false } }, @@ -1161,7 +1125,6 @@ "ctxt": 0 }, "value": "first", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1172,7 +1135,6 @@ "ctxt": 0 }, "value": "second", - "typeAnnotation": null, "optional": false } } @@ -1224,7 +1186,6 @@ "ctxt": 0 }, "value": "my", - "typeAnnotation": null, "optional": false }, "property": { @@ -1235,7 +1196,6 @@ "ctxt": 0 }, "value": "predicate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1248,7 +1208,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1278,7 +1237,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -1361,8 +1319,8 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1387,7 +1345,6 @@ "ctxt": 0 }, "value": "window", - "typeAnnotation": null, "optional": false }, "property": { @@ -1398,7 +1355,6 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1447,7 +1403,6 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, "optional": false }, "property": { @@ -1458,7 +1413,6 @@ "ctxt": 0 }, "value": "nest", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1501,7 +1455,6 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1514,7 +1467,6 @@ "ctxt": 0 }, "value": "nest", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1583,7 +1535,6 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, "optional": false }, "property": { @@ -1594,7 +1545,6 @@ "ctxt": 0 }, "value": "nest", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1607,7 +1557,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1649,7 +1598,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "property": { @@ -1660,7 +1608,6 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1673,7 +1620,6 @@ "ctxt": 0 }, "value": "nest", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1686,7 +1632,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1740,7 +1685,6 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, "optional": false }, "property": { @@ -1751,7 +1695,6 @@ "ctxt": 0 }, "value": "property", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1786,7 +1729,6 @@ "ctxt": 0 }, "value": "global", - "typeAnnotation": null, "optional": false }, "property": { @@ -1797,7 +1739,6 @@ "ctxt": 0 }, "value": "min", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1810,7 +1751,6 @@ "ctxt": 0 }, "value": "property", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignmentOutOfOrder/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignmentOutOfOrder/input.ts.json index 9cfecded4691..f3064eddd879 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignmentOutOfOrder/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignmentOutOfOrder/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "First", - "typeAnnotation": null, "optional": false }, "property": { @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "computed": false @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "span": { @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "Common", - "typeAnnotation": null, "optional": false }, "property": { @@ -121,7 +117,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "computed": false @@ -151,7 +146,6 @@ "ctxt": 0 }, "value": "First", - "typeAnnotation": null, "optional": false }, "property": { @@ -162,7 +156,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "computed": false @@ -204,7 +197,6 @@ "ctxt": 0 }, "value": "Workspace", - "typeAnnotation": null, "optional": false }, "property": { @@ -215,7 +207,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "computed": false @@ -245,7 +236,6 @@ "ctxt": 0 }, "value": "Common", - "typeAnnotation": null, "optional": false }, "property": { @@ -256,7 +246,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "computed": false @@ -293,8 +282,8 @@ "ctxt": 0 }, "value": "am", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -326,8 +315,8 @@ "ctxt": 0 }, "value": "First", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -367,8 +356,8 @@ "ctxt": 0 }, "value": "Common", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -408,8 +397,8 @@ "ctxt": 0 }, "value": "Workspace", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignmentWithExport/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignmentWithExport/input.ts.json index 8b0ff53c48d2..ce5fffcc0530 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignmentWithExport/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPropertyAssignmentWithExport/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "Adapter", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -85,7 +85,6 @@ "ctxt": 0 }, "value": "Adapter", - "typeAnnotation": null, "optional": false }, "property": { @@ -96,7 +95,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -142,7 +140,6 @@ "ctxt": 0 }, "value": "Adapter", - "typeAnnotation": null, "optional": false }, "property": { @@ -153,7 +150,6 @@ "ctxt": 0 }, "value": "asyncMethod", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPrototypeAssignment/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPrototypeAssignment/input.ts.json index 83264f9380ba..8a3539b6ebf8 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPrototypeAssignment/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPrototypeAssignment/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "Multimap", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -90,7 +90,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -136,7 +135,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -172,7 +170,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "computed": false @@ -208,7 +205,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -244,7 +240,6 @@ "ctxt": 0 }, "value": "addon", - "typeAnnotation": null, "optional": false }, "computed": false @@ -291,7 +286,6 @@ "ctxt": 0 }, "value": "Multimap", - "typeAnnotation": null, "optional": false }, "property": { @@ -302,7 +296,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -325,7 +318,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "value": { @@ -376,7 +368,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -412,7 +403,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "computed": false @@ -448,7 +438,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -484,7 +473,6 @@ "ctxt": 0 }, "value": "addon", - "typeAnnotation": null, "optional": false }, "computed": false @@ -508,7 +496,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "params": [], @@ -556,7 +543,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -592,7 +578,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "computed": false @@ -628,7 +613,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -664,7 +648,6 @@ "ctxt": 0 }, "value": "addon", - "typeAnnotation": null, "optional": false }, "computed": false @@ -718,7 +701,6 @@ "ctxt": 0 }, "value": "Multimap", - "typeAnnotation": null, "optional": false }, "property": { @@ -729,7 +711,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -742,7 +723,6 @@ "ctxt": 0 }, "value": "addon", - "typeAnnotation": null, "optional": false }, "computed": false @@ -795,7 +775,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -831,7 +810,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "computed": false @@ -867,7 +845,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -903,7 +880,6 @@ "ctxt": 0 }, "value": "addon", - "typeAnnotation": null, "optional": false }, "computed": false @@ -943,8 +919,8 @@ "ctxt": 0 }, "value": "mm", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -961,7 +937,6 @@ "ctxt": 0 }, "value": "Multimap", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -993,7 +968,6 @@ "ctxt": 0 }, "value": "mm", - "typeAnnotation": null, "optional": false }, "property": { @@ -1004,7 +978,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1032,7 +1005,6 @@ "ctxt": 0 }, "value": "mm", - "typeAnnotation": null, "optional": false }, "property": { @@ -1043,7 +1015,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1071,7 +1042,6 @@ "ctxt": 0 }, "value": "mm", - "typeAnnotation": null, "optional": false }, "property": { @@ -1082,7 +1052,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1110,7 +1079,6 @@ "ctxt": 0 }, "value": "mm", - "typeAnnotation": null, "optional": false }, "property": { @@ -1121,7 +1089,6 @@ "ctxt": 0 }, "value": "addon", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPrototypeAssignment2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPrototypeAssignment2/input.ts.json index c09ee2228bb9..c492a7d743e0 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPrototypeAssignment2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPrototypeAssignment2/input.ts.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "container", - "typeAnnotation": null, "optional": false }, "params": [], @@ -73,8 +72,8 @@ "ctxt": 0 }, "value": "Multimap", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -132,7 +131,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -178,7 +176,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -214,7 +211,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "computed": false @@ -250,7 +246,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -286,7 +281,6 @@ "ctxt": 0 }, "value": "addon", - "typeAnnotation": null, "optional": false }, "computed": false @@ -333,7 +327,6 @@ "ctxt": 0 }, "value": "Multimap", - "typeAnnotation": null, "optional": false }, "property": { @@ -344,7 +337,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -367,7 +359,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "value": { @@ -418,7 +409,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -454,7 +444,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "computed": false @@ -490,7 +479,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -526,7 +514,6 @@ "ctxt": 0 }, "value": "addon", - "typeAnnotation": null, "optional": false }, "computed": false @@ -550,7 +537,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "params": [], @@ -598,7 +584,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -634,7 +619,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "computed": false @@ -670,7 +654,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -706,7 +689,6 @@ "ctxt": 0 }, "value": "addon", - "typeAnnotation": null, "optional": false }, "computed": false @@ -760,7 +742,6 @@ "ctxt": 0 }, "value": "Multimap", - "typeAnnotation": null, "optional": false }, "property": { @@ -771,7 +752,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -784,7 +764,6 @@ "ctxt": 0 }, "value": "addon", - "typeAnnotation": null, "optional": false }, "computed": false @@ -837,7 +816,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -873,7 +851,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "computed": false @@ -909,7 +886,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -945,7 +921,6 @@ "ctxt": 0 }, "value": "addon", - "typeAnnotation": null, "optional": false }, "computed": false @@ -985,8 +960,8 @@ "ctxt": 0 }, "value": "mm", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1003,7 +978,6 @@ "ctxt": 0 }, "value": "Multimap", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1035,7 +1009,6 @@ "ctxt": 0 }, "value": "mm", - "typeAnnotation": null, "optional": false }, "property": { @@ -1046,7 +1019,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1074,7 +1046,6 @@ "ctxt": 0 }, "value": "mm", - "typeAnnotation": null, "optional": false }, "property": { @@ -1085,7 +1056,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1113,7 +1083,6 @@ "ctxt": 0 }, "value": "mm", - "typeAnnotation": null, "optional": false }, "property": { @@ -1124,7 +1093,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1152,7 +1120,6 @@ "ctxt": 0 }, "value": "mm", - "typeAnnotation": null, "optional": false }, "property": { @@ -1163,7 +1130,6 @@ "ctxt": 0 }, "value": "addon", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPrototypeAssignment3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPrototypeAssignment3/input.ts.json index e5ae981ab681..5653b1440e07 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPrototypeAssignment3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPrototypeAssignment3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Multimap3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -134,7 +132,6 @@ "ctxt": 0 }, "value": "Multimap3", - "typeAnnotation": null, "optional": false }, "property": { @@ -145,7 +142,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -168,7 +164,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "params": [ @@ -188,8 +183,8 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -244,7 +239,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -265,7 +259,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "right": { @@ -322,8 +315,8 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -340,7 +333,6 @@ "ctxt": 0 }, "value": "Multimap3", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -375,8 +367,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -400,7 +392,6 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, "optional": false }, "property": { @@ -411,7 +402,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPrototypeAssignment4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPrototypeAssignment4/input.ts.json index cfe165bb5004..b8819f051c21 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPrototypeAssignment4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeFromPrototypeAssignment4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Multimap4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -134,7 +132,6 @@ "ctxt": 0 }, "value": "Multimap4", - "typeAnnotation": null, "optional": false }, "property": { @@ -171,7 +168,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "params": [ @@ -191,8 +187,8 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -247,7 +243,6 @@ "ctxt": 0 }, "value": "_map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -268,7 +263,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "right": { @@ -337,7 +331,6 @@ "ctxt": 0 }, "value": "Multimap4", - "typeAnnotation": null, "optional": false }, "property": { @@ -435,7 +428,6 @@ "ctxt": 0 }, "value": "Multimap4", - "typeAnnotation": null, "optional": false }, "property": { @@ -533,7 +525,6 @@ "ctxt": 0 }, "value": "Multimap4", - "typeAnnotation": null, "optional": false }, "property": { @@ -619,8 +610,8 @@ "ctxt": 0 }, "value": "map4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -637,7 +628,6 @@ "ctxt": 0 }, "value": "Multimap4", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -676,7 +666,6 @@ "ctxt": 0 }, "value": "map4", - "typeAnnotation": null, "optional": false }, "property": { @@ -687,7 +676,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -743,7 +731,6 @@ "ctxt": 0 }, "value": "map4", - "typeAnnotation": null, "optional": false }, "property": { @@ -795,7 +782,6 @@ "ctxt": 0 }, "value": "map4", - "typeAnnotation": null, "optional": false }, "property": { @@ -806,7 +792,6 @@ "ctxt": 0 }, "value": "addon", - "typeAnnotation": null, "optional": false }, "computed": false @@ -844,7 +829,6 @@ "ctxt": 0 }, "value": "map4", - "typeAnnotation": null, "optional": false }, "property": { @@ -855,7 +839,6 @@ "ctxt": 0 }, "value": "__underscores__", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/typeLookupInIIFE/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/typeLookupInIIFE/input.ts.json index f932d9d369a4..fc09a952188c 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/typeLookupInIIFE/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/typeLookupInIIFE/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -105,8 +105,8 @@ "ctxt": 0 }, "value": "crash", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/unannotatedParametersAreOptional/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/unannotatedParametersAreOptional/input.ts.json index 14c4ef9b0f70..0fd88fc23dbf 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/unannotatedParametersAreOptional/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/unannotatedParametersAreOptional/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -84,7 +83,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -101,7 +99,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -127,7 +124,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -148,8 +144,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -194,7 +190,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -213,8 +208,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -257,7 +252,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -278,8 +272,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -345,7 +339,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -356,7 +349,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -401,7 +393,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -415,7 +406,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -460,7 +450,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -474,7 +463,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -508,8 +496,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -529,7 +517,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "params": [ @@ -549,8 +536,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -584,7 +571,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -603,8 +589,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -657,7 +643,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -668,7 +653,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -706,7 +690,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -717,7 +700,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/varRequireFromJavascript/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/varRequireFromJavascript/input.ts.json index 80577b4d1b56..191a9537a0ad 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/varRequireFromJavascript/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/varRequireFromJavascript/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Crunch", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -69,8 +67,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -120,7 +118,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -133,7 +130,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -158,7 +154,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -207,7 +202,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -259,8 +253,8 @@ "ctxt": 0 }, "value": "ex", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -277,7 +271,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -330,8 +323,8 @@ "ctxt": 0 }, "value": "crunch", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -355,7 +348,6 @@ "ctxt": 0 }, "value": "ex", - "typeAnnotation": null, "optional": false }, "property": { @@ -366,7 +358,6 @@ "ctxt": 0 }, "value": "Crunch", - "typeAnnotation": null, "optional": false }, "computed": false @@ -413,7 +404,6 @@ "ctxt": 0 }, "value": "crunch", - "typeAnnotation": null, "optional": false }, "property": { @@ -424,7 +414,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -440,7 +429,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -461,8 +449,8 @@ "ctxt": 0 }, "value": "wrap", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -502,7 +490,6 @@ "ctxt": 0 }, "value": "wrap", - "typeAnnotation": null, "optional": false }, "property": { @@ -513,7 +500,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/salsa/varRequireFromTypescript/input.ts.json b/ecmascript/parser/tests/typescript/tsc/salsa/varRequireFromTypescript/input.ts.json index 967e11452c22..ed69ddfbf63d 100644 --- a/ecmascript/parser/tests/typescript/tsc/salsa/varRequireFromTypescript/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/salsa/varRequireFromTypescript/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "Greatest", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -57,7 +56,6 @@ "ctxt": 0 }, "value": "day", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -112,7 +110,6 @@ "ctxt": 0 }, "value": "Crunch", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -138,7 +135,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": null, @@ -184,7 +180,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -238,7 +233,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -258,6 +252,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -274,8 +269,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -316,8 +310,8 @@ "ctxt": 0 }, "value": "ex", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -334,7 +328,6 @@ "ctxt": 0 }, "value": "require", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -387,8 +380,8 @@ "ctxt": 0 }, "value": "crunch", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -412,7 +405,6 @@ "ctxt": 0 }, "value": "ex", - "typeAnnotation": null, "optional": false }, "property": { @@ -423,7 +415,6 @@ "ctxt": 0 }, "value": "Crunch", - "typeAnnotation": null, "optional": false }, "computed": false @@ -470,7 +461,6 @@ "ctxt": 0 }, "value": "crunch", - "typeAnnotation": null, "optional": false }, "property": { @@ -481,7 +471,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -497,7 +486,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -518,8 +506,8 @@ "ctxt": 0 }, "value": "greatest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -538,8 +526,8 @@ "ctxt": 0 }, "value": "wrap", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -579,7 +567,6 @@ "ctxt": 0 }, "value": "greatest", - "typeAnnotation": null, "optional": false }, "property": { @@ -590,7 +577,6 @@ "ctxt": 0 }, "value": "day", - "typeAnnotation": null, "optional": false }, "computed": false @@ -618,7 +604,6 @@ "ctxt": 0 }, "value": "wrap", - "typeAnnotation": null, "optional": false }, "property": { @@ -629,7 +614,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerAdditiveExpression1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerAdditiveExpression1/input.ts.json index 12f93ea2e86f..efc10dec7250 100644 --- a/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerAdditiveExpression1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerAdditiveExpression1/input.ts.json @@ -44,7 +44,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -55,7 +54,6 @@ "ctxt": 0 }, "value": "index", - "typeAnnotation": null, "optional": false }, "computed": false @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -114,7 +111,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerClass2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerClass2/input.ts.json index c7ded15d0533..0cda25410c6d 100644 --- a/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerClass2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerClass2/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "LoggerAdapter", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -71,6 +69,7 @@ "ctxt": 0 }, "value": "logger", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -93,13 +92,11 @@ "ctxt": 0 }, "value": "ILogger", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -149,7 +146,6 @@ "ctxt": 0 }, "value": "_information", - "typeAnnotation": null, "optional": false }, "computed": false @@ -191,7 +187,6 @@ "ctxt": 0 }, "value": "logger", - "typeAnnotation": null, "optional": false }, "computed": false @@ -204,7 +199,6 @@ "ctxt": 0 }, "value": "information", - "typeAnnotation": null, "optional": false }, "computed": false @@ -240,7 +234,6 @@ "ctxt": 0 }, "value": "ILogger", - "typeAnnotation": null, "optional": false }, "typeArguments": null diff --git a/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerEnum1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerEnum1/input.ts.json index d289b0bc3422..ea5cfce61154 100644 --- a/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerEnum1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerEnum1/input.ts.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "CodeGenTarget", - "typeAnnotation": null, "optional": false }, "members": [ @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "ES3", - "typeAnnotation": null, "optional": false }, "init": { @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "ES5", - "typeAnnotation": null, "optional": false }, "init": { diff --git a/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerImportDeclaration1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerImportDeclaration1/input.ts.json index 8f979f2b1805..96653bb87582 100644 --- a/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerImportDeclaration1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerImportDeclaration1/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -36,7 +35,6 @@ "ctxt": 0 }, "value": "TypeScriptServices", - "typeAnnotation": null, "optional": false }, "right": { @@ -47,7 +45,6 @@ "ctxt": 0 }, "value": "TypeScript", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerS7.2_A1.5_T2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerS7.2_A1.5_T2/input.ts.json index 3696349fa939..973dffa970df 100644 --- a/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerS7.2_A1.5_T2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerS7.2_A1.5_T2/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "eval", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -76,7 +75,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -119,7 +117,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -162,7 +159,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -201,8 +197,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -240,7 +236,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -283,7 +278,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -326,7 +320,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerS7.3_A1.1_T2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerS7.3_A1.1_T2/input.ts.json index b5a31f463a22..78707e2145c2 100644 --- a/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerS7.3_A1.1_T2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerS7.3_A1.1_T2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -70,7 +70,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -113,7 +112,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -156,7 +154,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerS7.6_A4.2_T1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerS7.6_A4.2_T1/input.ts.json index 7384b0c86bbc..e4b18df9745a 100644 --- a/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerS7.6_A4.2_T1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannerS7.6_A4.2_T1/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "А", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -70,7 +70,6 @@ "ctxt": 0 }, "value": "А", - "typeAnnotation": null, "optional": false }, "right": { @@ -113,7 +112,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -167,8 +165,8 @@ "ctxt": 0 }, "value": "Б", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -206,7 +204,6 @@ "ctxt": 0 }, "value": "Б", - "typeAnnotation": null, "optional": false }, "right": { @@ -249,7 +246,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -303,8 +299,8 @@ "ctxt": 0 }, "value": "В", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -342,7 +338,6 @@ "ctxt": 0 }, "value": "В", - "typeAnnotation": null, "optional": false }, "right": { @@ -385,7 +380,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -439,8 +433,8 @@ "ctxt": 0 }, "value": "Г", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -478,7 +472,6 @@ "ctxt": 0 }, "value": "Г", - "typeAnnotation": null, "optional": false }, "right": { @@ -521,7 +514,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -575,8 +567,8 @@ "ctxt": 0 }, "value": "Д", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -614,7 +606,6 @@ "ctxt": 0 }, "value": "Д", - "typeAnnotation": null, "optional": false }, "right": { @@ -657,7 +648,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -711,8 +701,8 @@ "ctxt": 0 }, "value": "Е", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -750,7 +740,6 @@ "ctxt": 0 }, "value": "Е", - "typeAnnotation": null, "optional": false }, "right": { @@ -793,7 +782,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -847,8 +835,8 @@ "ctxt": 0 }, "value": "Ж", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -886,7 +874,6 @@ "ctxt": 0 }, "value": "Ж", - "typeAnnotation": null, "optional": false }, "right": { @@ -929,7 +916,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -983,8 +969,8 @@ "ctxt": 0 }, "value": "З", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1022,7 +1008,6 @@ "ctxt": 0 }, "value": "З", - "typeAnnotation": null, "optional": false }, "right": { @@ -1065,7 +1050,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1119,8 +1103,8 @@ "ctxt": 0 }, "value": "И", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1158,7 +1142,6 @@ "ctxt": 0 }, "value": "И", - "typeAnnotation": null, "optional": false }, "right": { @@ -1201,7 +1184,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1255,8 +1237,8 @@ "ctxt": 0 }, "value": "Й", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1294,7 +1276,6 @@ "ctxt": 0 }, "value": "Й", - "typeAnnotation": null, "optional": false }, "right": { @@ -1337,7 +1318,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1391,8 +1371,8 @@ "ctxt": 0 }, "value": "К", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1430,7 +1410,6 @@ "ctxt": 0 }, "value": "К", - "typeAnnotation": null, "optional": false }, "right": { @@ -1473,7 +1452,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1527,8 +1505,8 @@ "ctxt": 0 }, "value": "Л", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1566,7 +1544,6 @@ "ctxt": 0 }, "value": "Л", - "typeAnnotation": null, "optional": false }, "right": { @@ -1609,7 +1586,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1663,8 +1639,8 @@ "ctxt": 0 }, "value": "М", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1702,7 +1678,6 @@ "ctxt": 0 }, "value": "М", - "typeAnnotation": null, "optional": false }, "right": { @@ -1745,7 +1720,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1799,8 +1773,8 @@ "ctxt": 0 }, "value": "Н", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1838,7 +1812,6 @@ "ctxt": 0 }, "value": "Н", - "typeAnnotation": null, "optional": false }, "right": { @@ -1881,7 +1854,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1935,8 +1907,8 @@ "ctxt": 0 }, "value": "О", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1974,7 +1946,6 @@ "ctxt": 0 }, "value": "О", - "typeAnnotation": null, "optional": false }, "right": { @@ -2017,7 +1988,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2071,8 +2041,8 @@ "ctxt": 0 }, "value": "П", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2110,7 +2080,6 @@ "ctxt": 0 }, "value": "П", - "typeAnnotation": null, "optional": false }, "right": { @@ -2153,7 +2122,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2207,8 +2175,8 @@ "ctxt": 0 }, "value": "Р", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2246,7 +2214,6 @@ "ctxt": 0 }, "value": "Р", - "typeAnnotation": null, "optional": false }, "right": { @@ -2289,7 +2256,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2343,8 +2309,8 @@ "ctxt": 0 }, "value": "С", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2382,7 +2348,6 @@ "ctxt": 0 }, "value": "С", - "typeAnnotation": null, "optional": false }, "right": { @@ -2425,7 +2390,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2479,8 +2443,8 @@ "ctxt": 0 }, "value": "Т", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2518,7 +2482,6 @@ "ctxt": 0 }, "value": "Т", - "typeAnnotation": null, "optional": false }, "right": { @@ -2561,7 +2524,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2615,8 +2577,8 @@ "ctxt": 0 }, "value": "У", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2654,7 +2616,6 @@ "ctxt": 0 }, "value": "У", - "typeAnnotation": null, "optional": false }, "right": { @@ -2697,7 +2658,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2751,8 +2711,8 @@ "ctxt": 0 }, "value": "Ф", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2790,7 +2750,6 @@ "ctxt": 0 }, "value": "Ф", - "typeAnnotation": null, "optional": false }, "right": { @@ -2833,7 +2792,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2887,8 +2845,8 @@ "ctxt": 0 }, "value": "Х", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2926,7 +2884,6 @@ "ctxt": 0 }, "value": "Х", - "typeAnnotation": null, "optional": false }, "right": { @@ -2969,7 +2926,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3023,8 +2979,8 @@ "ctxt": 0 }, "value": "Ц", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -3062,7 +3018,6 @@ "ctxt": 0 }, "value": "Ц", - "typeAnnotation": null, "optional": false }, "right": { @@ -3105,7 +3060,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3159,8 +3113,8 @@ "ctxt": 0 }, "value": "Ч", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -3198,7 +3152,6 @@ "ctxt": 0 }, "value": "Ч", - "typeAnnotation": null, "optional": false }, "right": { @@ -3241,7 +3194,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3295,8 +3247,8 @@ "ctxt": 0 }, "value": "Ш", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -3334,7 +3286,6 @@ "ctxt": 0 }, "value": "Ш", - "typeAnnotation": null, "optional": false }, "right": { @@ -3377,7 +3328,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3431,8 +3381,8 @@ "ctxt": 0 }, "value": "Щ", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -3470,7 +3420,6 @@ "ctxt": 0 }, "value": "Щ", - "typeAnnotation": null, "optional": false }, "right": { @@ -3513,7 +3462,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3567,8 +3515,8 @@ "ctxt": 0 }, "value": "Ъ", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -3606,7 +3554,6 @@ "ctxt": 0 }, "value": "Ъ", - "typeAnnotation": null, "optional": false }, "right": { @@ -3649,7 +3596,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3703,8 +3649,8 @@ "ctxt": 0 }, "value": "Ы", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -3742,7 +3688,6 @@ "ctxt": 0 }, "value": "Ы", - "typeAnnotation": null, "optional": false }, "right": { @@ -3785,7 +3730,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3839,8 +3783,8 @@ "ctxt": 0 }, "value": "Ь", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -3878,7 +3822,6 @@ "ctxt": 0 }, "value": "Ь", - "typeAnnotation": null, "optional": false }, "right": { @@ -3921,7 +3864,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3975,8 +3917,8 @@ "ctxt": 0 }, "value": "Э", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -4014,7 +3956,6 @@ "ctxt": 0 }, "value": "Э", - "typeAnnotation": null, "optional": false }, "right": { @@ -4057,7 +3998,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4111,8 +4051,8 @@ "ctxt": 0 }, "value": "Ю", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -4150,7 +4090,6 @@ "ctxt": 0 }, "value": "Ю", - "typeAnnotation": null, "optional": false }, "right": { @@ -4193,7 +4132,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4247,8 +4185,8 @@ "ctxt": 0 }, "value": "Я", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -4286,7 +4224,6 @@ "ctxt": 0 }, "value": "Я", - "typeAnnotation": null, "optional": false }, "right": { @@ -4329,7 +4266,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4383,8 +4319,8 @@ "ctxt": 0 }, "value": "Ё", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -4422,7 +4358,6 @@ "ctxt": 0 }, "value": "Ё", - "typeAnnotation": null, "optional": false }, "right": { @@ -4465,7 +4400,6 @@ "ctxt": 0 }, "value": "$ERROR", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannertest1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannertest1/input.ts.json index c9590a1c33c4..71564318a568 100644 --- a/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannertest1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/scanner/ecmascript5/scannertest1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "CharacterInfo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "isDecimalDigit", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -79,8 +78,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -129,7 +127,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -147,7 +144,6 @@ "ctxt": 0 }, "value": "CharacterCodes", - "typeAnnotation": null, "optional": false }, "property": { @@ -158,7 +154,6 @@ "ctxt": 0 }, "value": "_0", - "typeAnnotation": null, "optional": false }, "computed": false @@ -180,7 +175,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -198,7 +192,6 @@ "ctxt": 0 }, "value": "CharacterCodes", - "typeAnnotation": null, "optional": false }, "property": { @@ -209,7 +202,6 @@ "ctxt": 0 }, "value": "_9", - "typeAnnotation": null, "optional": false }, "computed": false @@ -261,7 +253,6 @@ "ctxt": 0 }, "value": "isHexDigit", - "typeAnnotation": null, "optional": false }, "function": { @@ -282,6 +273,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -298,8 +290,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -355,7 +346,6 @@ "ctxt": 0 }, "value": "isDecimalDigit", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -369,7 +359,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -407,7 +396,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -425,7 +413,6 @@ "ctxt": 0 }, "value": "CharacterCodes", - "typeAnnotation": null, "optional": false }, "property": { @@ -436,7 +423,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -458,7 +444,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -476,7 +461,6 @@ "ctxt": 0 }, "value": "CharacterCodes", - "typeAnnotation": null, "optional": false }, "property": { @@ -487,7 +471,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "computed": false @@ -527,7 +510,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -545,7 +527,6 @@ "ctxt": 0 }, "value": "CharacterCodes", - "typeAnnotation": null, "optional": false }, "property": { @@ -556,7 +537,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -578,7 +558,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -596,7 +575,6 @@ "ctxt": 0 }, "value": "CharacterCodes", - "typeAnnotation": null, "optional": false }, "property": { @@ -607,7 +585,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -661,7 +638,6 @@ "ctxt": 0 }, "value": "hexValue", - "typeAnnotation": null, "optional": false }, "function": { @@ -682,6 +658,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -698,8 +675,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -746,7 +722,6 @@ "ctxt": 0 }, "value": "Debug", - "typeAnnotation": null, "optional": false }, "property": { @@ -757,7 +732,6 @@ "ctxt": 0 }, "value": "assert", - "typeAnnotation": null, "optional": false }, "computed": false @@ -780,7 +754,6 @@ "ctxt": 0 }, "value": "isHexDigit", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -794,7 +767,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -835,7 +807,6 @@ "ctxt": 0 }, "value": "isDecimalDigit", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -849,7 +820,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -879,7 +849,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -897,7 +866,6 @@ "ctxt": 0 }, "value": "CharacterCodes", - "typeAnnotation": null, "optional": false }, "property": { @@ -908,7 +876,6 @@ "ctxt": 0 }, "value": "_0", - "typeAnnotation": null, "optional": false }, "computed": false @@ -953,7 +920,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -971,7 +937,6 @@ "ctxt": 0 }, "value": "CharacterCodes", - "typeAnnotation": null, "optional": false }, "property": { @@ -982,7 +947,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1004,7 +968,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1022,7 +985,6 @@ "ctxt": 0 }, "value": "CharacterCodes", - "typeAnnotation": null, "optional": false }, "property": { @@ -1033,7 +995,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1065,7 +1026,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1083,7 +1043,6 @@ "ctxt": 0 }, "value": "CharacterCodes", - "typeAnnotation": null, "optional": false }, "property": { @@ -1094,7 +1053,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1134,7 +1092,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1152,7 +1109,6 @@ "ctxt": 0 }, "value": "CharacterCodes", - "typeAnnotation": null, "optional": false }, "property": { @@ -1163,7 +1119,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/scanner/jsdocInvalidTokens/input.ts.json b/ecmascript/parser/tests/typescript/tsc/scanner/jsdocInvalidTokens/input.ts.json index f9db0d45576c..05db0cc7d14d 100644 --- a/ecmascript/parser/tests/typescript/tsc/scanner/jsdocInvalidTokens/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/scanner/jsdocInvalidTokens/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "hi", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/statements/VariableStatements/everyTypeWithAnnotationAndInitializer/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/VariableStatements/everyTypeWithAnnotationAndInitializer/input.ts.json index 97ca99a9ebb0..118e80ae0e2e 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/VariableStatements/everyTypeWithAnnotationAndInitializer/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/VariableStatements/everyTypeWithAnnotationAndInitializer/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -168,7 +164,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -185,7 +180,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "source", - "typeAnnotation": null, "optional": false }, "value": null, @@ -237,7 +230,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -268,7 +260,6 @@ "ctxt": 0 }, "value": "recurse", - "typeAnnotation": null, "optional": false }, "value": null, @@ -294,7 +285,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -320,7 +310,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -354,7 +343,6 @@ "ctxt": 0 }, "value": "wrapped", - "typeAnnotation": null, "optional": false }, "value": null, @@ -380,7 +368,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -406,7 +393,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -432,7 +418,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -480,7 +465,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -501,7 +485,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -522,6 +505,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -538,8 +522,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -614,7 +597,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -642,7 +624,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -668,7 +649,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -724,7 +704,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -745,6 +724,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -761,8 +741,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -809,7 +788,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -820,7 +798,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -881,6 +858,7 @@ "ctxt": 0 }, "value": "aNumber", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -897,8 +875,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -938,6 +915,7 @@ "ctxt": 0 }, "value": "aString", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -954,8 +932,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -1000,6 +977,7 @@ "ctxt": 0 }, "value": "aDate", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1022,13 +1000,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -1045,7 +1021,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1093,6 +1068,7 @@ "ctxt": 0 }, "value": "anObject", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1115,13 +1091,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -1138,7 +1112,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1173,6 +1146,7 @@ "ctxt": 0 }, "value": "anAny", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1189,8 +1163,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -1229,6 +1202,7 @@ "ctxt": 0 }, "value": "aSecondAny", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1245,8 +1219,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1256,7 +1229,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1288,6 +1260,7 @@ "ctxt": 0 }, "value": "aVoid", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1304,8 +1277,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1315,7 +1287,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1347,6 +1318,7 @@ "ctxt": 0 }, "value": "anInterface", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1369,13 +1341,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -1392,7 +1362,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1427,6 +1396,7 @@ "ctxt": 0 }, "value": "aClass", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1449,13 +1419,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -1472,7 +1440,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1507,6 +1474,7 @@ "ctxt": 0 }, "value": "aGenericClass", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1529,7 +1497,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1552,8 +1519,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -1570,7 +1536,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1623,6 +1588,7 @@ "ctxt": 0 }, "value": "anObjectLiteral", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1645,13 +1611,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1671,7 +1635,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": { @@ -1715,6 +1678,7 @@ "ctxt": 0 }, "value": "anOtherObjectLiteral", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1746,7 +1710,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1774,8 +1737,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -1792,7 +1754,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1827,6 +1788,7 @@ "ctxt": 0 }, "value": "aFunction", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1849,12 +1811,10 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1864,7 +1824,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1896,6 +1855,7 @@ "ctxt": 0 }, "value": "anOtherFunction", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1919,6 +1879,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1935,8 +1896,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -1958,8 +1918,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1969,7 +1928,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2001,6 +1959,7 @@ "ctxt": 0 }, "value": "aLambda", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2023,12 +1982,10 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -2046,8 +2003,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2093,6 +2050,7 @@ "ctxt": 0 }, "value": "aModule", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2115,12 +2073,10 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2130,7 +2086,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2162,6 +2117,7 @@ "ctxt": 0 }, "value": "aClassInModule", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2186,7 +2142,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "right": { @@ -2197,14 +2152,12 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -2228,7 +2181,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2239,7 +2191,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2276,6 +2227,7 @@ "ctxt": 0 }, "value": "aFunctionInModule", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2300,7 +2252,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "right": { @@ -2311,13 +2262,11 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -2335,8 +2284,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer/input.ts.json index f80748626b17..12c50199970f 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -168,7 +164,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -185,7 +180,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "source", - "typeAnnotation": null, "optional": false }, "value": null, @@ -237,7 +230,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -268,7 +260,6 @@ "ctxt": 0 }, "value": "recurse", - "typeAnnotation": null, "optional": false }, "value": null, @@ -294,7 +285,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -320,7 +310,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -354,7 +343,6 @@ "ctxt": 0 }, "value": "wrapped", - "typeAnnotation": null, "optional": false }, "value": null, @@ -380,7 +368,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -406,7 +393,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -432,7 +418,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -480,7 +465,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -501,7 +485,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -522,6 +505,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -538,8 +522,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -607,7 +590,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -628,6 +610,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -644,8 +627,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -686,7 +668,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -740,7 +721,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -768,7 +748,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -794,7 +773,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -850,7 +828,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -871,6 +848,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -887,8 +865,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -935,7 +912,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -946,7 +922,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -999,7 +974,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { @@ -1027,7 +1001,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1053,7 +1026,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1109,7 +1081,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1130,6 +1101,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1146,8 +1118,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1194,7 +1165,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1205,7 +1175,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1266,6 +1235,7 @@ "ctxt": 0 }, "value": "aNumber", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1282,8 +1252,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -1328,6 +1297,7 @@ "ctxt": 0 }, "value": "aString", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1344,8 +1314,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -1385,6 +1354,7 @@ "ctxt": 0 }, "value": "aDate", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1407,13 +1377,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -1453,6 +1421,7 @@ "ctxt": 0 }, "value": "aVoid", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1469,8 +1438,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -1510,6 +1478,7 @@ "ctxt": 0 }, "value": "anInterface", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1532,13 +1501,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -1555,7 +1522,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1590,6 +1556,7 @@ "ctxt": 0 }, "value": "aClass", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1612,13 +1579,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -1635,7 +1600,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1670,6 +1634,7 @@ "ctxt": 0 }, "value": "aGenericClass", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1692,7 +1657,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1715,8 +1679,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -1733,7 +1696,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1768,6 +1730,7 @@ "ctxt": 0 }, "value": "anObjectLiteral", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1790,13 +1753,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1816,7 +1777,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": { @@ -1865,6 +1825,7 @@ "ctxt": 0 }, "value": "anOtherObjectLiteral", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1896,7 +1857,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1924,8 +1884,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -1942,7 +1901,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1977,6 +1935,7 @@ "ctxt": 0 }, "value": "aFunction", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1999,12 +1958,10 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2014,7 +1971,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2046,6 +2002,7 @@ "ctxt": 0 }, "value": "anOtherFunction", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2069,6 +2026,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2085,8 +2043,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -2108,8 +2065,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2119,7 +2075,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2151,6 +2106,7 @@ "ctxt": 0 }, "value": "aLambda", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2173,12 +2129,10 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -2196,8 +2150,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2248,6 +2202,7 @@ "ctxt": 0 }, "value": "aModule", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2270,12 +2225,10 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2285,7 +2238,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2317,6 +2269,7 @@ "ctxt": 0 }, "value": "aClassInModule", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2341,7 +2294,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "right": { @@ -2352,14 +2304,12 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -2383,7 +2333,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -2394,7 +2343,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2431,6 +2379,7 @@ "ctxt": 0 }, "value": "aFunctionInModule", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2455,7 +2404,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "right": { @@ -2466,13 +2414,11 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2482,7 +2428,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/statements/VariableStatements/everyTypeWithInitializer/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/VariableStatements/everyTypeWithInitializer/input.ts.json index 9d56c716be48..507773be007c 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/VariableStatements/everyTypeWithInitializer/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/VariableStatements/everyTypeWithInitializer/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -168,7 +164,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -185,7 +180,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "source", - "typeAnnotation": null, "optional": false }, "value": null, @@ -237,7 +230,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -268,7 +260,6 @@ "ctxt": 0 }, "value": "recurse", - "typeAnnotation": null, "optional": false }, "value": null, @@ -294,7 +285,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -320,7 +310,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -354,7 +343,6 @@ "ctxt": 0 }, "value": "wrapped", - "typeAnnotation": null, "optional": false }, "value": null, @@ -380,7 +368,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -406,7 +393,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -432,7 +418,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -480,7 +465,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -501,7 +485,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -522,6 +505,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -538,8 +522,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -614,7 +597,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -642,7 +624,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -668,7 +649,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -724,7 +704,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -745,6 +724,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -761,8 +741,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -809,7 +788,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -820,7 +798,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -881,8 +858,8 @@ "ctxt": 0 }, "value": "aNumber", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -922,8 +899,8 @@ "ctxt": 0 }, "value": "aString", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -968,8 +945,8 @@ "ctxt": 0 }, "value": "aDate", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -986,7 +963,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1034,8 +1010,8 @@ "ctxt": 0 }, "value": "anObject", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1052,7 +1028,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1087,8 +1062,8 @@ "ctxt": 0 }, "value": "anAny", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NullLiteral", @@ -1127,8 +1102,8 @@ "ctxt": 0 }, "value": "anOtherAny", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -1152,7 +1127,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1197,8 +1171,8 @@ "ctxt": 0 }, "value": "anUndefined", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1208,7 +1182,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1240,8 +1213,8 @@ "ctxt": 0 }, "value": "aClass", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1258,7 +1231,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1293,8 +1265,8 @@ "ctxt": 0 }, "value": "aGenericClass", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1311,7 +1283,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1364,8 +1335,8 @@ "ctxt": 0 }, "value": "anObjectLiteral", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1385,7 +1356,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": { @@ -1429,8 +1399,8 @@ "ctxt": 0 }, "value": "aFunction", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1440,7 +1410,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1472,8 +1441,8 @@ "ctxt": 0 }, "value": "aLambda", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1491,8 +1460,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1538,8 +1507,8 @@ "ctxt": 0 }, "value": "aModule", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1549,7 +1518,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1581,8 +1549,8 @@ "ctxt": 0 }, "value": "aClassInModule", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1606,7 +1574,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1617,7 +1584,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1654,8 +1620,8 @@ "ctxt": 0 }, "value": "aFunctionInModule", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1672,7 +1638,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1683,7 +1648,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1717,8 +1681,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/statements/VariableStatements/invalidMultipleVariableDeclarations/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/VariableStatements/invalidMultipleVariableDeclarations/input.ts.json index 7354cd9d5e47..75c5a0c3e146 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/VariableStatements/invalidMultipleVariableDeclarations/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/VariableStatements/invalidMultipleVariableDeclarations/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +158,6 @@ "ctxt": 0 }, "value": "valid", - "typeAnnotation": null, "optional": false }, "value": null, @@ -214,7 +209,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -231,7 +225,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -257,7 +250,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -297,7 +289,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -315,7 +306,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -341,7 +331,6 @@ "ctxt": 0 }, "value": "source", - "typeAnnotation": null, "optional": false }, "value": null, @@ -367,7 +356,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -398,7 +386,6 @@ "ctxt": 0 }, "value": "recurse", - "typeAnnotation": null, "optional": false }, "value": null, @@ -424,7 +411,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -450,7 +436,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -484,7 +469,6 @@ "ctxt": 0 }, "value": "wrapped", - "typeAnnotation": null, "optional": false }, "value": null, @@ -510,7 +494,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -536,7 +519,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -562,7 +544,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -610,7 +591,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -631,7 +611,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -652,6 +631,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -668,8 +648,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -744,7 +723,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -772,7 +750,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -798,7 +775,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -854,7 +830,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -875,6 +850,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -891,8 +867,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -939,7 +914,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -950,7 +924,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1011,6 +984,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1027,8 +1001,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1060,8 +1033,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1101,8 +1074,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -1147,8 +1120,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1165,7 +1138,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1200,8 +1172,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1218,7 +1190,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1271,8 +1242,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1282,7 +1253,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1314,6 +1284,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1336,13 +1307,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1374,8 +1343,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1392,7 +1361,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1427,8 +1395,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1445,7 +1413,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1480,8 +1447,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1491,7 +1458,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1523,8 +1489,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1542,6 +1508,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1558,8 +1525,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1610,6 +1576,7 @@ "ctxt": 0 }, "value": "arr", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1634,8 +1601,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1667,8 +1633,8 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1757,8 +1723,8 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1785,7 +1751,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1809,7 +1774,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1833,7 +1797,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1889,8 +1852,8 @@ "ctxt": 0 }, "value": "arr2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1917,7 +1880,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1973,8 +1935,8 @@ "ctxt": 0 }, "value": "arr2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1991,7 +1953,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2018,7 +1979,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2073,6 +2033,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2095,12 +2056,10 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2132,8 +2091,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2150,7 +2109,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2161,7 +2119,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/statements/VariableStatements/recursiveInitializer/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/VariableStatements/recursiveInitializer/input.ts.json index 06b9cb4b00a8..e4d82918f67d 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/VariableStatements/recursiveInitializer/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/VariableStatements/recursiveInitializer/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "n1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -51,7 +51,6 @@ "ctxt": 0 }, "value": "n1", - "typeAnnotation": null, "optional": false } }, @@ -84,6 +83,7 @@ "ctxt": 0 }, "value": "n2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -100,8 +100,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -119,7 +118,6 @@ "ctxt": 0 }, "value": "n2", - "typeAnnotation": null, "optional": false }, "right": { @@ -130,7 +128,6 @@ "ctxt": 0 }, "value": "n2", - "typeAnnotation": null, "optional": false } }, @@ -163,8 +160,8 @@ "ctxt": 0 }, "value": "n3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -182,7 +179,6 @@ "ctxt": 0 }, "value": "n3", - "typeAnnotation": null, "optional": false }, "right": { @@ -193,7 +189,6 @@ "ctxt": 0 }, "value": "n3", - "typeAnnotation": null, "optional": false } }, @@ -226,8 +221,8 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -245,7 +240,6 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, "optional": false }, "right": { @@ -292,8 +286,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -311,7 +305,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false }, "right": { @@ -322,7 +315,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } }, @@ -355,6 +347,7 @@ "ctxt": 0 }, "value": "s3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +364,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -390,7 +382,6 @@ "ctxt": 0 }, "value": "s3", - "typeAnnotation": null, "optional": false }, "right": { @@ -401,7 +392,6 @@ "ctxt": 0 }, "value": "s3", - "typeAnnotation": null, "optional": false } }, @@ -434,8 +424,8 @@ "ctxt": 0 }, "value": "s4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -467,7 +457,6 @@ "ctxt": 0 }, "value": "s4", - "typeAnnotation": null, "optional": false } }, @@ -500,8 +489,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -519,7 +508,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } }, @@ -552,8 +540,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -579,7 +567,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -613,8 +600,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -640,7 +627,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -652,7 +638,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } }, @@ -685,8 +670,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -719,7 +704,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } } @@ -732,7 +716,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } }, @@ -765,8 +748,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -784,6 +767,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -800,8 +784,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -819,7 +802,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -833,7 +815,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/VariableStatements/validMultipleVariableDeclarations/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/VariableStatements/validMultipleVariableDeclarations/input.ts.json index 2db796fe4df2..31404fc63293 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/VariableStatements/validMultipleVariableDeclarations/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/VariableStatements/validMultipleVariableDeclarations/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,8 +80,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -145,8 +145,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -193,8 +193,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -250,8 +250,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -268,7 +268,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -295,7 +294,6 @@ "ctxt": 0 }, "value": "declSpace", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -339,8 +337,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -382,7 +380,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -412,7 +409,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -454,7 +450,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -508,6 +503,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -530,13 +526,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -568,8 +562,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -589,7 +583,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -612,7 +605,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -656,6 +648,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -678,13 +671,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -704,7 +695,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -727,7 +717,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -738,7 +727,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -773,8 +761,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -794,7 +782,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -817,7 +804,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -835,7 +821,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -880,6 +865,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -911,7 +897,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -953,7 +938,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -981,8 +965,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1002,7 +985,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1025,7 +1007,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1069,8 +1050,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -1097,7 +1078,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1120,7 +1100,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1131,7 +1110,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1161,7 +1139,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1203,7 +1180,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1261,6 +1237,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1283,12 +1260,10 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1320,8 +1295,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -1343,6 +1318,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1359,8 +1335,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1431,8 +1406,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1450,6 +1425,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1466,8 +1442,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -1513,6 +1488,7 @@ "ctxt": 0 }, "value": "fn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1536,6 +1512,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1552,8 +1529,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -1575,8 +1551,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1608,6 +1583,7 @@ "ctxt": 0 }, "value": "fn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1639,6 +1615,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1655,8 +1632,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1680,8 +1656,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1713,8 +1688,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -1747,6 +1722,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1763,8 +1739,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -1816,6 +1791,7 @@ "ctxt": 0 }, "value": "fn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1838,12 +1814,10 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1875,6 +1849,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1899,8 +1874,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1932,8 +1906,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -2008,8 +1982,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -2074,6 +2048,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2098,8 +2073,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -2139,8 +2113,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2157,7 +2131,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2210,6 +2183,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2232,12 +2206,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/statements/breakStatements/doWhileBreakStatements/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/breakStatements/doWhileBreakStatements/input.ts.json index 750659383f75..94048b0288fa 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/breakStatements/doWhileBreakStatements/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/breakStatements/doWhileBreakStatements/input.ts.json @@ -57,7 +57,6 @@ "ctxt": 0 }, "value": "ONE", - "typeAnnotation": null, "optional": false }, "body": { @@ -99,7 +98,6 @@ "ctxt": 0 }, "value": "ONE", - "typeAnnotation": null, "optional": false } } @@ -122,7 +120,6 @@ "ctxt": 0 }, "value": "TWO", - "typeAnnotation": null, "optional": false }, "body": { @@ -140,7 +137,6 @@ "ctxt": 0 }, "value": "THREE", - "typeAnnotation": null, "optional": false }, "body": { @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "THREE", - "typeAnnotation": null, "optional": false } } @@ -206,7 +201,6 @@ "ctxt": 0 }, "value": "FOUR", - "typeAnnotation": null, "optional": false }, "body": { @@ -248,7 +242,6 @@ "ctxt": 0 }, "value": "FIVE", - "typeAnnotation": null, "optional": false }, "body": { @@ -290,7 +283,6 @@ "ctxt": 0 }, "value": "FOUR", - "typeAnnotation": null, "optional": false } } @@ -341,7 +333,6 @@ "ctxt": 0 }, "value": "SIX", - "typeAnnotation": null, "optional": false }, "body": { @@ -375,7 +366,6 @@ "ctxt": 0 }, "value": "SIX", - "typeAnnotation": null, "optional": false } } @@ -399,7 +389,6 @@ "ctxt": 0 }, "value": "SEVEN", - "typeAnnotation": null, "optional": false }, "body": { @@ -465,7 +454,6 @@ "ctxt": 0 }, "value": "SEVEN", - "typeAnnotation": null, "optional": false } } @@ -488,7 +476,6 @@ "ctxt": 0 }, "value": "EIGHT", - "typeAnnotation": null, "optional": false }, "body": { @@ -540,8 +527,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -586,7 +573,6 @@ "ctxt": 0 }, "value": "EIGHT", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/breakStatements/forBreakStatements/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/breakStatements/forBreakStatements/input.ts.json index 6d285b705beb..86f4ce73b92f 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/breakStatements/forBreakStatements/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/breakStatements/forBreakStatements/input.ts.json @@ -51,7 +51,6 @@ "ctxt": 0 }, "value": "ONE", - "typeAnnotation": null, "optional": false }, "body": { @@ -87,7 +86,6 @@ "ctxt": 0 }, "value": "ONE", - "typeAnnotation": null, "optional": false } } @@ -110,7 +108,6 @@ "ctxt": 0 }, "value": "TWO", - "typeAnnotation": null, "optional": false }, "body": { @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "THREE", - "typeAnnotation": null, "optional": false }, "body": { @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "THREE", - "typeAnnotation": null, "optional": false } } @@ -188,7 +183,6 @@ "ctxt": 0 }, "value": "FOUR", - "typeAnnotation": null, "optional": false }, "body": { @@ -224,7 +218,6 @@ "ctxt": 0 }, "value": "FIVE", - "typeAnnotation": null, "optional": false }, "body": { @@ -260,7 +253,6 @@ "ctxt": 0 }, "value": "FOUR", - "typeAnnotation": null, "optional": false } } @@ -305,7 +297,6 @@ "ctxt": 0 }, "value": "SIX", - "typeAnnotation": null, "optional": false }, "body": { @@ -333,7 +324,6 @@ "ctxt": 0 }, "value": "SIX", - "typeAnnotation": null, "optional": false } } @@ -357,7 +347,6 @@ "ctxt": 0 }, "value": "SEVEN", - "typeAnnotation": null, "optional": false }, "body": { @@ -405,7 +394,6 @@ "ctxt": 0 }, "value": "SEVEN", - "typeAnnotation": null, "optional": false } } @@ -428,7 +416,6 @@ "ctxt": 0 }, "value": "EIGHT", - "typeAnnotation": null, "optional": false }, "body": { @@ -474,8 +461,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -520,7 +507,6 @@ "ctxt": 0 }, "value": "EIGHT", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/breakStatements/forInBreakStatements/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/breakStatements/forInBreakStatements/input.ts.json index d0e8bde475cf..083a061c2f96 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/breakStatements/forInBreakStatements/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/breakStatements/forInBreakStatements/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -90,7 +90,6 @@ "ctxt": 0 }, "value": "ONE", - "typeAnnotation": null, "optional": false }, "body": { @@ -125,8 +124,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -165,7 +164,6 @@ "ctxt": 0 }, "value": "ONE", - "typeAnnotation": null, "optional": false } } @@ -188,7 +186,6 @@ "ctxt": 0 }, "value": "TWO", - "typeAnnotation": null, "optional": false }, "body": { @@ -206,7 +203,6 @@ "ctxt": 0 }, "value": "THREE", - "typeAnnotation": null, "optional": false }, "body": { @@ -241,8 +237,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -281,7 +277,6 @@ "ctxt": 0 }, "value": "THREE", - "typeAnnotation": null, "optional": false } } @@ -305,7 +300,6 @@ "ctxt": 0 }, "value": "FOUR", - "typeAnnotation": null, "optional": false }, "body": { @@ -340,8 +334,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -380,7 +374,6 @@ "ctxt": 0 }, "value": "FIVE", - "typeAnnotation": null, "optional": false }, "body": { @@ -415,8 +408,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -455,7 +448,6 @@ "ctxt": 0 }, "value": "FOUR", - "typeAnnotation": null, "optional": false } } @@ -499,8 +491,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -539,7 +531,6 @@ "ctxt": 0 }, "value": "SIX", - "typeAnnotation": null, "optional": false }, "body": { @@ -574,8 +565,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -606,7 +597,6 @@ "ctxt": 0 }, "value": "SIX", - "typeAnnotation": null, "optional": false } } @@ -630,7 +620,6 @@ "ctxt": 0 }, "value": "SEVEN", - "typeAnnotation": null, "optional": false }, "body": { @@ -665,8 +654,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -714,8 +703,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -763,8 +752,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -795,7 +784,6 @@ "ctxt": 0 }, "value": "SEVEN", - "typeAnnotation": null, "optional": false } } @@ -818,7 +806,6 @@ "ctxt": 0 }, "value": "EIGHT", - "typeAnnotation": null, "optional": false }, "body": { @@ -853,8 +840,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -903,8 +890,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -949,7 +936,6 @@ "ctxt": 0 }, "value": "EIGHT", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/breakStatements/switchBreakStatements/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/breakStatements/switchBreakStatements/input.ts.json index 5d7ed89fb76a..788ccbb6e876 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/breakStatements/switchBreakStatements/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/breakStatements/switchBreakStatements/input.ts.json @@ -78,7 +78,6 @@ "ctxt": 0 }, "value": "ONE", - "typeAnnotation": null, "optional": false }, "body": { @@ -140,7 +139,6 @@ "ctxt": 0 }, "value": "ONE", - "typeAnnotation": null, "optional": false } } @@ -164,7 +162,6 @@ "ctxt": 0 }, "value": "TWO", - "typeAnnotation": null, "optional": false }, "body": { @@ -182,7 +179,6 @@ "ctxt": 0 }, "value": "THREE", - "typeAnnotation": null, "optional": false }, "body": { @@ -244,7 +240,6 @@ "ctxt": 0 }, "value": "THREE", - "typeAnnotation": null, "optional": false } } @@ -269,7 +264,6 @@ "ctxt": 0 }, "value": "FOUR", - "typeAnnotation": null, "optional": false }, "body": { @@ -331,7 +325,6 @@ "ctxt": 0 }, "value": "FIVE", - "typeAnnotation": null, "optional": false }, "body": { @@ -393,7 +386,6 @@ "ctxt": 0 }, "value": "FOUR", - "typeAnnotation": null, "optional": false } } @@ -466,7 +458,6 @@ "ctxt": 0 }, "value": "SIX", - "typeAnnotation": null, "optional": false }, "body": { @@ -528,7 +519,6 @@ "ctxt": 0 }, "value": "SIX", - "typeAnnotation": null, "optional": false } } @@ -556,7 +546,6 @@ "ctxt": 0 }, "value": "SEVEN", - "typeAnnotation": null, "optional": false }, "body": { @@ -706,7 +695,6 @@ "ctxt": 0 }, "value": "SEVEN", - "typeAnnotation": null, "optional": false } }, @@ -725,7 +713,6 @@ "ctxt": 0 }, "value": "EIGHT", - "typeAnnotation": null, "optional": false }, "body": { @@ -797,8 +784,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -843,7 +830,6 @@ "ctxt": 0 }, "value": "EIGHT", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/breakStatements/whileBreakStatements/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/breakStatements/whileBreakStatements/input.ts.json index 3e445b856fe6..0cc7cd6fca71 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/breakStatements/whileBreakStatements/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/breakStatements/whileBreakStatements/input.ts.json @@ -57,7 +57,6 @@ "ctxt": 0 }, "value": "ONE", - "typeAnnotation": null, "optional": false }, "body": { @@ -99,7 +98,6 @@ "ctxt": 0 }, "value": "ONE", - "typeAnnotation": null, "optional": false } } @@ -122,7 +120,6 @@ "ctxt": 0 }, "value": "TWO", - "typeAnnotation": null, "optional": false }, "body": { @@ -140,7 +137,6 @@ "ctxt": 0 }, "value": "THREE", - "typeAnnotation": null, "optional": false }, "body": { @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "THREE", - "typeAnnotation": null, "optional": false } } @@ -206,7 +201,6 @@ "ctxt": 0 }, "value": "FOUR", - "typeAnnotation": null, "optional": false }, "body": { @@ -248,7 +242,6 @@ "ctxt": 0 }, "value": "FIVE", - "typeAnnotation": null, "optional": false }, "body": { @@ -290,7 +283,6 @@ "ctxt": 0 }, "value": "FOUR", - "typeAnnotation": null, "optional": false } } @@ -341,7 +333,6 @@ "ctxt": 0 }, "value": "SIX", - "typeAnnotation": null, "optional": false }, "body": { @@ -375,7 +366,6 @@ "ctxt": 0 }, "value": "SIX", - "typeAnnotation": null, "optional": false } } @@ -399,7 +389,6 @@ "ctxt": 0 }, "value": "SEVEN", - "typeAnnotation": null, "optional": false }, "body": { @@ -465,7 +454,6 @@ "ctxt": 0 }, "value": "SEVEN", - "typeAnnotation": null, "optional": false } } @@ -488,7 +476,6 @@ "ctxt": 0 }, "value": "EIGHT", - "typeAnnotation": null, "optional": false }, "body": { @@ -540,8 +527,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -586,7 +573,6 @@ "ctxt": 0 }, "value": "EIGHT", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/continueStatements/doWhileContinueStatements/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/continueStatements/doWhileContinueStatements/input.ts.json index 78e01b21d87b..2d6f7fb000dc 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/continueStatements/doWhileContinueStatements/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/continueStatements/doWhileContinueStatements/input.ts.json @@ -57,7 +57,6 @@ "ctxt": 0 }, "value": "ONE", - "typeAnnotation": null, "optional": false }, "body": { @@ -99,7 +98,6 @@ "ctxt": 0 }, "value": "ONE", - "typeAnnotation": null, "optional": false } } @@ -122,7 +120,6 @@ "ctxt": 0 }, "value": "TWO", - "typeAnnotation": null, "optional": false }, "body": { @@ -140,7 +137,6 @@ "ctxt": 0 }, "value": "THREE", - "typeAnnotation": null, "optional": false }, "body": { @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "THREE", - "typeAnnotation": null, "optional": false } } @@ -206,7 +201,6 @@ "ctxt": 0 }, "value": "FOUR", - "typeAnnotation": null, "optional": false }, "body": { @@ -248,7 +242,6 @@ "ctxt": 0 }, "value": "FIVE", - "typeAnnotation": null, "optional": false }, "body": { @@ -290,7 +283,6 @@ "ctxt": 0 }, "value": "FOUR", - "typeAnnotation": null, "optional": false } } @@ -341,7 +333,6 @@ "ctxt": 0 }, "value": "SIX", - "typeAnnotation": null, "optional": false }, "body": { @@ -375,7 +366,6 @@ "ctxt": 0 }, "value": "SIX", - "typeAnnotation": null, "optional": false } } @@ -399,7 +389,6 @@ "ctxt": 0 }, "value": "SEVEN", - "typeAnnotation": null, "optional": false }, "body": { @@ -465,7 +454,6 @@ "ctxt": 0 }, "value": "SEVEN", - "typeAnnotation": null, "optional": false } } @@ -488,7 +476,6 @@ "ctxt": 0 }, "value": "EIGHT", - "typeAnnotation": null, "optional": false }, "body": { @@ -540,8 +527,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -586,7 +573,6 @@ "ctxt": 0 }, "value": "EIGHT", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/continueStatements/forContinueStatements/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/continueStatements/forContinueStatements/input.ts.json index ecbbffddff5e..34604f7d6523 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/continueStatements/forContinueStatements/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/continueStatements/forContinueStatements/input.ts.json @@ -51,7 +51,6 @@ "ctxt": 0 }, "value": "ONE", - "typeAnnotation": null, "optional": false }, "body": { @@ -87,7 +86,6 @@ "ctxt": 0 }, "value": "ONE", - "typeAnnotation": null, "optional": false } } @@ -110,7 +108,6 @@ "ctxt": 0 }, "value": "TWO", - "typeAnnotation": null, "optional": false }, "body": { @@ -128,7 +125,6 @@ "ctxt": 0 }, "value": "THREE", - "typeAnnotation": null, "optional": false }, "body": { @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "THREE", - "typeAnnotation": null, "optional": false } } @@ -188,7 +183,6 @@ "ctxt": 0 }, "value": "FOUR", - "typeAnnotation": null, "optional": false }, "body": { @@ -224,7 +218,6 @@ "ctxt": 0 }, "value": "FIVE", - "typeAnnotation": null, "optional": false }, "body": { @@ -260,7 +253,6 @@ "ctxt": 0 }, "value": "FOUR", - "typeAnnotation": null, "optional": false } } @@ -305,7 +297,6 @@ "ctxt": 0 }, "value": "SIX", - "typeAnnotation": null, "optional": false }, "body": { @@ -333,7 +324,6 @@ "ctxt": 0 }, "value": "SIX", - "typeAnnotation": null, "optional": false } } @@ -357,7 +347,6 @@ "ctxt": 0 }, "value": "SEVEN", - "typeAnnotation": null, "optional": false }, "body": { @@ -405,7 +394,6 @@ "ctxt": 0 }, "value": "SEVEN", - "typeAnnotation": null, "optional": false } } @@ -428,7 +416,6 @@ "ctxt": 0 }, "value": "EIGHT", - "typeAnnotation": null, "optional": false }, "body": { @@ -474,8 +461,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -520,7 +507,6 @@ "ctxt": 0 }, "value": "EIGHT", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/continueStatements/forInContinueStatements/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/continueStatements/forInContinueStatements/input.ts.json index 50f30247818b..b71123dfcd7b 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/continueStatements/forInContinueStatements/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/continueStatements/forInContinueStatements/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -90,7 +90,6 @@ "ctxt": 0 }, "value": "ONE", - "typeAnnotation": null, "optional": false }, "body": { @@ -125,8 +124,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -165,7 +164,6 @@ "ctxt": 0 }, "value": "ONE", - "typeAnnotation": null, "optional": false } } @@ -188,7 +186,6 @@ "ctxt": 0 }, "value": "TWO", - "typeAnnotation": null, "optional": false }, "body": { @@ -206,7 +203,6 @@ "ctxt": 0 }, "value": "THREE", - "typeAnnotation": null, "optional": false }, "body": { @@ -241,8 +237,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -281,7 +277,6 @@ "ctxt": 0 }, "value": "THREE", - "typeAnnotation": null, "optional": false } } @@ -305,7 +300,6 @@ "ctxt": 0 }, "value": "FOUR", - "typeAnnotation": null, "optional": false }, "body": { @@ -340,8 +334,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -380,7 +374,6 @@ "ctxt": 0 }, "value": "FIVE", - "typeAnnotation": null, "optional": false }, "body": { @@ -415,8 +408,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -455,7 +448,6 @@ "ctxt": 0 }, "value": "FOUR", - "typeAnnotation": null, "optional": false } } @@ -499,8 +491,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -539,7 +531,6 @@ "ctxt": 0 }, "value": "SIX", - "typeAnnotation": null, "optional": false }, "body": { @@ -574,8 +565,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -606,7 +597,6 @@ "ctxt": 0 }, "value": "SIX", - "typeAnnotation": null, "optional": false } } @@ -630,7 +620,6 @@ "ctxt": 0 }, "value": "SEVEN", - "typeAnnotation": null, "optional": false }, "body": { @@ -665,8 +654,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -714,8 +703,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -763,8 +752,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -795,7 +784,6 @@ "ctxt": 0 }, "value": "SEVEN", - "typeAnnotation": null, "optional": false } } @@ -818,7 +806,6 @@ "ctxt": 0 }, "value": "EIGHT", - "typeAnnotation": null, "optional": false }, "body": { @@ -853,8 +840,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -903,8 +890,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -949,7 +936,6 @@ "ctxt": 0 }, "value": "EIGHT", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/continueStatements/whileContinueStatements/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/continueStatements/whileContinueStatements/input.ts.json index e2f289f0dbc6..528692c3f307 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/continueStatements/whileContinueStatements/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/continueStatements/whileContinueStatements/input.ts.json @@ -121,7 +121,6 @@ "ctxt": 0 }, "value": "ONE", - "typeAnnotation": null, "optional": false }, "body": { @@ -163,7 +162,6 @@ "ctxt": 0 }, "value": "ONE", - "typeAnnotation": null, "optional": false } } @@ -186,7 +184,6 @@ "ctxt": 0 }, "value": "TWO", - "typeAnnotation": null, "optional": false }, "body": { @@ -204,7 +201,6 @@ "ctxt": 0 }, "value": "THREE", - "typeAnnotation": null, "optional": false }, "body": { @@ -246,7 +242,6 @@ "ctxt": 0 }, "value": "THREE", - "typeAnnotation": null, "optional": false } } @@ -270,7 +265,6 @@ "ctxt": 0 }, "value": "FOUR", - "typeAnnotation": null, "optional": false }, "body": { @@ -312,7 +306,6 @@ "ctxt": 0 }, "value": "FIVE", - "typeAnnotation": null, "optional": false }, "body": { @@ -354,7 +347,6 @@ "ctxt": 0 }, "value": "FOUR", - "typeAnnotation": null, "optional": false } } @@ -405,7 +397,6 @@ "ctxt": 0 }, "value": "SIX", - "typeAnnotation": null, "optional": false }, "body": { @@ -439,7 +430,6 @@ "ctxt": 0 }, "value": "SIX", - "typeAnnotation": null, "optional": false } } @@ -463,7 +453,6 @@ "ctxt": 0 }, "value": "SEVEN", - "typeAnnotation": null, "optional": false }, "body": { @@ -529,7 +518,6 @@ "ctxt": 0 }, "value": "SEVEN", - "typeAnnotation": null, "optional": false } } @@ -552,7 +540,6 @@ "ctxt": 0 }, "value": "EIGHT", - "typeAnnotation": null, "optional": false }, "body": { @@ -604,8 +591,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -650,7 +637,6 @@ "ctxt": 0 }, "value": "EIGHT", - "typeAnnotation": null, "optional": false } } @@ -673,7 +659,6 @@ "ctxt": 0 }, "value": "NINE", - "typeAnnotation": null, "optional": false }, "body": { @@ -739,7 +724,6 @@ "ctxt": 0 }, "value": "NINE", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-await-ofStatements/emitter.forAwait/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-await-ofStatements/emitter.forAwait/input.ts.json index 65197fb97716..6c6abc567eb1 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-await-ofStatements/emitter.forAwait/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-await-ofStatements/emitter.forAwait/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,6 +59,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -76,8 +76,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -121,8 +120,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -137,7 +136,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "body": { @@ -167,7 +165,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,6 +208,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -227,8 +225,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -248,6 +245,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -264,8 +262,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -292,8 +289,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -303,7 +300,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "body": { @@ -333,7 +329,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -377,6 +372,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -393,8 +389,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -438,8 +433,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -454,7 +449,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "body": { @@ -484,7 +478,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -528,6 +521,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -544,8 +538,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -565,6 +558,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -581,8 +575,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -609,8 +602,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -620,7 +613,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "body": { @@ -650,7 +642,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -694,6 +685,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -710,8 +702,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -733,7 +724,6 @@ "ctxt": 0 }, "value": "outer", - "typeAnnotation": null, "optional": false }, "body": { @@ -773,8 +763,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -789,7 +779,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "body": { @@ -815,7 +804,6 @@ "ctxt": 0 }, "value": "outer", - "typeAnnotation": null, "optional": false } } @@ -840,7 +828,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -884,6 +871,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -900,8 +888,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -923,7 +910,6 @@ "ctxt": 0 }, "value": "outer", - "typeAnnotation": null, "optional": false }, "body": { @@ -963,8 +949,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -979,7 +965,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "body": { @@ -1005,7 +990,6 @@ "ctxt": 0 }, "value": "outer", - "typeAnnotation": null, "optional": false } } @@ -1030,7 +1014,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1074,6 +1057,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1090,8 +1074,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1153,8 +1136,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1169,7 +1152,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatements/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatements/input.ts.json index c74ebc129227..242d6fbf09fd 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatements/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatements/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "aString", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -70,8 +70,8 @@ "ctxt": 0 }, "value": "aString", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -117,6 +117,7 @@ "ctxt": 0 }, "value": "anAny", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -133,8 +134,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -156,8 +156,8 @@ "ctxt": 0 }, "value": "anAny", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -210,8 +210,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -269,8 +269,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -328,8 +328,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -426,7 +426,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -499,8 +498,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -522,7 +521,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -570,8 +568,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -630,8 +628,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -653,7 +651,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -694,6 +691,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -710,8 +708,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -731,6 +728,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -747,8 +745,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -768,6 +765,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -784,8 +782,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -824,8 +821,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -848,7 +845,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -859,7 +855,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -905,8 +900,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -928,7 +923,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -939,7 +933,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -950,7 +943,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -996,8 +988,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1028,7 +1020,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1039,7 +1030,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -1085,8 +1075,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1122,7 +1112,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1133,7 +1122,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -1179,8 +1167,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1218,7 +1206,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -1229,7 +1216,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1249,7 +1235,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1260,7 +1245,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1308,8 +1292,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1331,7 +1315,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1342,7 +1325,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1389,8 +1371,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1420,6 +1402,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1442,13 +1425,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1459,7 +1440,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1487,7 +1467,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1540,8 +1519,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1568,6 +1547,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1584,8 +1564,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -1604,6 +1583,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1620,8 +1600,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1662,7 +1641,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1673,7 +1651,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1705,7 +1682,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1731,7 +1707,6 @@ "ctxt": 0 }, "value": "biz", - "typeAnnotation": null, "optional": false }, "function": { @@ -1782,8 +1757,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1820,7 +1795,6 @@ "ctxt": 0 }, "value": "biz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1870,8 +1844,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1901,7 +1875,6 @@ "ctxt": 0 }, "value": "biz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1948,8 +1921,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -2018,7 +1991,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -2069,8 +2041,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -2127,8 +2099,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -2158,7 +2130,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2205,8 +2176,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -2243,7 +2214,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2307,7 +2277,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2333,7 +2302,6 @@ "ctxt": 0 }, "value": "boz", - "typeAnnotation": null, "optional": false }, "function": { @@ -2384,8 +2352,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -2422,7 +2390,6 @@ "ctxt": 0 }, "value": "biz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2472,8 +2439,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -2503,7 +2470,6 @@ "ctxt": 0 }, "value": "biz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2550,8 +2516,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -2608,8 +2574,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -2639,7 +2605,6 @@ "ctxt": 0 }, "value": "biz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2686,8 +2651,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -2724,7 +2689,6 @@ "ctxt": 0 }, "value": "biz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2780,7 +2744,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2803,7 +2766,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2833,7 +2795,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2870,6 +2831,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2886,8 +2848,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2912,7 +2873,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2953,6 +2913,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2975,13 +2936,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3020,8 +2979,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -3043,7 +3002,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -3084,7 +3042,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -3112,7 +3069,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3138,7 +3094,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3195,7 +3150,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3242,8 +3196,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -3258,7 +3212,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -3303,8 +3256,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -3326,7 +3279,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -3337,7 +3289,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3369,7 +3320,6 @@ "ctxt": 0 }, "value": "Color", - "typeAnnotation": null, "optional": false }, "members": [ @@ -3388,7 +3338,6 @@ "ctxt": 0 }, "value": "Red", - "typeAnnotation": null, "optional": false }, "init": null @@ -3408,7 +3357,6 @@ "ctxt": 0 }, "value": "Blue", - "typeAnnotation": null, "optional": false }, "init": null @@ -3447,8 +3395,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -3463,7 +3411,6 @@ "ctxt": 0 }, "value": "Color", - "typeAnnotation": null, "optional": false }, "body": { @@ -3508,8 +3455,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -3531,7 +3478,6 @@ "ctxt": 0 }, "value": "Color", - "typeAnnotation": null, "optional": false }, "property": { @@ -3542,7 +3488,6 @@ "ctxt": 0 }, "value": "Blue", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsArray/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsArray/input.ts.json index e2fdd4813112..4a422dae13a1 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsArray/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsArray/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,14 +61,12 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -99,6 +98,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -123,8 +123,7 @@ "kind": "boolean" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -163,8 +162,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -179,7 +178,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "body": { @@ -215,8 +213,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -233,7 +231,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -244,7 +241,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": true @@ -278,8 +274,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -296,7 +292,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -314,7 +309,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -349,8 +343,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -367,7 +361,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -386,7 +379,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -421,8 +413,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -439,7 +431,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -450,7 +441,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": true @@ -484,8 +474,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -502,7 +492,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -520,7 +509,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -555,8 +543,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -573,7 +561,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -592,7 +579,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -637,8 +623,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -653,7 +639,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "body": { @@ -696,8 +681,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -712,7 +697,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "body": { @@ -755,8 +739,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -771,7 +755,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "body": { @@ -807,8 +790,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -825,7 +808,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -836,7 +818,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": true @@ -870,8 +851,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -888,7 +869,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -899,7 +879,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": true @@ -933,8 +912,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -951,7 +930,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -962,7 +940,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1005,6 +982,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1021,8 +999,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1054,6 +1031,7 @@ "ctxt": 0 }, "value": "j", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1070,8 +1048,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1093,8 +1070,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1104,7 +1081,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "body": { @@ -1130,8 +1106,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1141,7 +1117,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "body": { @@ -1177,8 +1152,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1195,7 +1170,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1206,7 +1180,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1240,8 +1213,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1258,7 +1231,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1269,7 +1241,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1309,6 +1280,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1325,8 +1297,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1365,8 +1336,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1381,7 +1352,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "body": { @@ -1417,8 +1387,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1435,7 +1405,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1446,7 +1415,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1473,8 +1441,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1484,7 +1452,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "body": { @@ -1520,8 +1487,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1538,7 +1505,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1549,7 +1515,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": true diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsArrayErrors/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsArrayErrors/input.ts.json index 80d4c24ea5b0..8054cbe40919 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsArrayErrors/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsArrayErrors/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,14 +61,12 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -106,8 +105,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -122,7 +121,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "body": { @@ -158,8 +156,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -176,7 +174,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -195,7 +192,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -239,8 +235,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -257,7 +253,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -276,7 +271,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -318,7 +312,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -367,8 +360,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -385,7 +378,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -396,7 +388,6 @@ "ctxt": 0 }, "value": "unknownProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -433,6 +424,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -449,8 +441,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -489,8 +480,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -505,7 +496,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "body": { @@ -543,6 +533,7 @@ "ctxt": 0 }, "value": "j", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -559,8 +550,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -599,8 +589,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -615,7 +605,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsDestructuring/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsDestructuring/input.ts.json index 9f6a3cf6b9ee..d23c1ca6d8bf 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsDestructuring/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsDestructuring/input.ts.json @@ -46,8 +46,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -57,8 +57,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsDestructuring2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsDestructuring2/input.ts.json index 47d677b442eb..fd25de44ae73 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsDestructuring2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsDestructuring2/input.ts.json @@ -53,7 +53,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -73,7 +72,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsDestructuring3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsDestructuring3/input.ts.json index 5d1c2e9ddc3b..f2835decda26 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsDestructuring3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsDestructuring3/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -52,8 +52,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -83,8 +83,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -94,8 +94,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsDestructuring4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsDestructuring4/input.ts.json index b0873d1e1b19..a8851cc536e9 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsDestructuring4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsDestructuring4/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -52,8 +52,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -90,7 +90,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -110,7 +109,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsInvalid/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsInvalid/input.ts.json index f71da77492c7..16704dc82fa1 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsInvalid/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-inStatements/for-inStatementsInvalid/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "aNumber", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -70,8 +70,8 @@ "ctxt": 0 }, "value": "aNumber", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -117,6 +117,7 @@ "ctxt": 0 }, "value": "aBoolean", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -133,8 +134,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -156,8 +156,8 @@ "ctxt": 0 }, "value": "aBoolean", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -203,6 +203,7 @@ "ctxt": 0 }, "value": "aRegExp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -225,13 +226,11 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -253,8 +252,8 @@ "ctxt": 0 }, "value": "aRegExp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -307,6 +306,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -323,8 +323,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -360,7 +359,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -433,8 +431,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -456,7 +454,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -497,6 +494,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -513,8 +511,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -534,6 +531,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -550,8 +548,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -571,8 +568,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -611,8 +608,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -635,7 +632,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -646,7 +642,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -692,8 +687,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -715,7 +710,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -726,7 +720,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -737,7 +730,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -783,8 +775,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -815,7 +807,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -826,7 +817,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -872,8 +862,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -909,7 +899,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -920,7 +909,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -966,8 +954,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1005,7 +993,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -1016,7 +1003,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1036,7 +1022,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1047,7 +1032,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1095,8 +1079,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1118,7 +1102,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1174,8 +1157,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1205,6 +1188,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1227,13 +1211,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1244,7 +1226,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1272,7 +1253,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1325,8 +1305,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1353,6 +1333,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1369,8 +1350,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -1389,6 +1369,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1405,8 +1386,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1447,7 +1427,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1458,7 +1437,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1490,7 +1468,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1516,7 +1493,6 @@ "ctxt": 0 }, "value": "biz", - "typeAnnotation": null, "optional": false }, "function": { @@ -1567,8 +1543,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1605,7 +1581,6 @@ "ctxt": 0 }, "value": "biz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1655,8 +1630,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1686,7 +1661,6 @@ "ctxt": 0 }, "value": "biz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1733,8 +1707,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1819,7 +1793,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -1870,8 +1843,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1928,8 +1901,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1959,7 +1932,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2006,8 +1978,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -2044,7 +2016,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2124,7 +2095,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2150,7 +2120,6 @@ "ctxt": 0 }, "value": "boz", - "typeAnnotation": null, "optional": false }, "function": { @@ -2201,8 +2170,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -2239,7 +2208,6 @@ "ctxt": 0 }, "value": "biz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2289,8 +2257,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -2320,7 +2288,6 @@ "ctxt": 0 }, "value": "biz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2367,8 +2334,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -2425,8 +2392,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -2456,7 +2423,6 @@ "ctxt": 0 }, "value": "biz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2503,8 +2469,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -2541,7 +2507,6 @@ "ctxt": 0 }, "value": "biz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2597,7 +2562,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2620,7 +2584,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2650,7 +2613,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2687,6 +2649,7 @@ "ctxt": 0 }, "value": "idx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2703,8 +2666,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2759,6 +2721,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2781,13 +2744,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2826,8 +2787,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -2849,7 +2810,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES3For-ofTypeCheck1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES3For-ofTypeCheck1/input.ts.json index 5ac85503241a..abceed85a0cb 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES3For-ofTypeCheck1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES3For-ofTypeCheck1/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES3For-ofTypeCheck2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES3For-ofTypeCheck2/input.ts.json index f34f04266e77..eeb8d34bd975 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES3For-ofTypeCheck2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES3For-ofTypeCheck2/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES3For-ofTypeCheck4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES3For-ofTypeCheck4/input.ts.json index 98ca1b774354..f16022738f2b 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES3For-ofTypeCheck4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES3For-ofTypeCheck4/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "union", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -74,8 +75,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -115,8 +115,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -131,7 +131,6 @@ "ctxt": 0 }, "value": "union", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES3For-ofTypeCheck6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES3For-ofTypeCheck6/input.ts.json index bca42f683df6..5c97a460c251 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES3For-ofTypeCheck6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES3For-ofTypeCheck6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "union", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -82,8 +83,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -123,8 +123,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -139,7 +139,6 @@ "ctxt": 0 }, "value": "union", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of1/input.ts.json index 61fc9553b819..994022e7cfd0 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of1/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -145,7 +145,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -156,7 +155,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -172,7 +170,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of10/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of10/input.ts.json index 52dc3d72a23d..2b048b5ba070 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of10/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of10/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,7 +59,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -113,7 +111,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -127,7 +124,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -179,7 +175,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -193,7 +188,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -232,8 +226,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -257,7 +251,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -271,7 +264,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of11/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of11/input.ts.json index fb38d25703d2..bc8ff31b124b 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of11/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of11/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -55,8 +55,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of13/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of13/input.ts.json index f5e0097ab04a..ea62f48f0157 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of13/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of13/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -141,8 +141,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -152,7 +152,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of14/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of14/input.ts.json index 55c5d8082e28..766a8cc8a1eb 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of14/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of14/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -89,8 +89,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -100,7 +100,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of15/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of15/input.ts.json index b71abe8713a1..f315497048a3 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of15/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of15/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -79,7 +79,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -116,8 +115,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -166,8 +165,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -177,7 +176,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of16/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of16/input.ts.json index 295605b9e6cb..eabcdff1c250 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of16/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of16/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -79,7 +79,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -116,8 +115,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -166,8 +165,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -177,7 +176,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "definite": false @@ -208,7 +206,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of17/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of17/input.ts.json index 7ed0a903e8c5..dd03f414420a 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of17/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of17/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -79,7 +79,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -116,8 +115,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -142,7 +141,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -181,8 +179,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -192,7 +190,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "definite": false @@ -223,7 +220,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of18/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of18/input.ts.json index 4baa2b0754b1..de6f8261b2d7 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of18/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of18/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -79,7 +79,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -119,8 +118,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -159,7 +158,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of19/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of19/input.ts.json index efa9fdeca22d..c15e84ceb003 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of19/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of19/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -79,7 +79,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -93,7 +92,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -145,8 +143,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -185,7 +183,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of2/input.ts.json index 3c31cdf33364..13c20e063419 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of2/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -89,8 +89,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -100,7 +100,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of21/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of21/input.ts.json index d42a1f361f30..9938837cc246 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of21/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of21/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -97,8 +97,8 @@ "ctxt": 0 }, "value": "_i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of22/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of22/input.ts.json index 7e89c996141c..65ac7dcac852 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of22/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of22/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -126,8 +126,8 @@ "ctxt": 0 }, "value": "_a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -171,7 +171,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -182,7 +181,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -198,7 +196,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of23/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of23/input.ts.json index caa3b12ff0c0..deefab437df5 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of23/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of23/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -126,8 +126,8 @@ "ctxt": 0 }, "value": "_a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -171,7 +171,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -182,7 +181,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -198,7 +196,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of24/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of24/input.ts.json index 8dafc667bb41..b2d02419457e 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of24/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of24/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -117,8 +117,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -133,7 +133,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "body": { @@ -169,8 +168,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of25/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of25/input.ts.json index 9fcfc16b44b7..3765fb98dfbf 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of25/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of25/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -117,8 +117,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -133,7 +133,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "body": { @@ -159,7 +158,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -178,7 +176,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of26/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of26/input.ts.json index 3fc34c45bed8..81a39c1b9452 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of26/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of26/input.ts.json @@ -54,8 +54,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -83,8 +83,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -163,7 +163,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -182,7 +181,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of27/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of27/input.ts.json index d73939d733fc..5f4e9a669c0e 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of27/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of27/input.ts.json @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -67,8 +66,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -92,7 +91,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -110,8 +108,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -191,7 +189,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -210,7 +207,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of28/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of28/input.ts.json index c66fa6406734..eeaa66fe2e36 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of28/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of28/input.ts.json @@ -54,8 +54,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -83,8 +83,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -163,7 +163,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -182,7 +181,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of29/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of29/input.ts.json index 1adaf2c28ae1..17f465ee7914 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of29/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of29/input.ts.json @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -67,8 +66,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -92,7 +91,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -110,8 +108,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -191,7 +189,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -210,7 +207,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of3/input.ts.json index 3f74e51c7cab..408ab72605f5 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of3/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -133,8 +133,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -144,7 +144,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of30/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of30/input.ts.json index 3a2f1114bf2a..3fc31d244209 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of30/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of30/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -68,6 +68,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,8 +85,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -117,6 +117,7 @@ "ctxt": 0 }, "value": "tuple", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -170,8 +171,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -247,8 +247,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -276,8 +276,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -307,7 +307,6 @@ "ctxt": 0 }, "value": "tuple", - "typeAnnotation": null, "optional": false }, "body": { @@ -333,7 +332,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -352,7 +350,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of31/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of31/input.ts.json index f7f390ddd5bc..0f7939783864 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of31/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of31/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -68,6 +68,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,8 +85,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -118,7 +118,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -136,8 +135,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -161,7 +160,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -179,8 +177,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -235,7 +233,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -254,7 +251,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of33/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of33/input.ts.json index 4e4367372adb..d725ab3e4dc7 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of33/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of33/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -145,7 +145,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -156,7 +155,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -172,7 +170,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of34/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of34/input.ts.json index efd642bf94eb..9fcb8d5989e3 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of34/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of34/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,7 +59,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -113,7 +111,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -127,7 +124,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -226,8 +222,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -251,7 +247,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -265,7 +260,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of35/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of35/input.ts.json index 3b0daa0b417e..90380b0f977c 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of35/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of35/input.ts.json @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -67,8 +66,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -92,7 +91,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -110,8 +108,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -191,7 +189,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -210,7 +207,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of36/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of36/input.ts.json index c246533dd8d6..6c4dfdcf47f4 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of36/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of36/input.ts.json @@ -54,8 +54,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -83,8 +83,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -163,7 +163,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -182,7 +181,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of37/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of37/input.ts.json index 2e7f264868b4..5ee9fb1e1d36 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of37/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of37/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -173,8 +173,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -258,7 +258,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "right": { @@ -301,7 +300,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -362,7 +360,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -373,7 +370,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -389,7 +385,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -414,8 +409,8 @@ "ctxt": 0 }, "value": "err", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -454,7 +449,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -465,7 +459,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -498,7 +491,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -512,7 +504,6 @@ "ctxt": 0 }, "value": "err", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of4/input.ts.json index 20c2cfb1b159..334e80c5d9f1 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of4/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -81,8 +81,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -92,7 +92,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "definite": false @@ -125,8 +124,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -136,7 +135,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of5/input.ts.json index 7281e1963e68..32d62150f55a 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of5/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "_a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -89,8 +89,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -100,7 +100,6 @@ "ctxt": 0 }, "value": "_a", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of6/input.ts.json index 44cec0295ec6..c6f0fcf1cc2b 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of6/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -97,8 +97,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -147,8 +147,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -168,7 +168,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false } }, @@ -182,7 +181,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of7/input.ts.json index 7ab6b8e317b3..b161fbdb78a2 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of7/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -89,8 +89,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -100,7 +100,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false }, "definite": false @@ -143,8 +142,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -193,8 +192,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -214,7 +213,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false } }, @@ -228,7 +226,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of8/input.ts.json index a05d124fec7c..eef31266a2fe 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of8/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,7 +59,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -113,7 +111,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -127,7 +124,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -226,8 +222,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -251,7 +247,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -265,7 +260,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of9/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of9/input.ts.json index 34c237c14cf9..c08beaef6de3 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of9/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-of9/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,7 +59,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -113,7 +111,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -127,7 +124,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -179,7 +175,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -193,7 +188,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -240,8 +234,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -265,7 +259,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -279,7 +272,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck1/input.ts.json index 5ac85503241a..abceed85a0cb 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck1/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck10/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck10/input.ts.json index d1ede3255a63..a22fb958e681 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck10/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck10/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "value": { @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -172,7 +168,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -183,7 +178,6 @@ "ctxt": 0 }, "value": "iterator", - "typeAnnotation": null, "optional": false }, "computed": false @@ -274,8 +268,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -297,7 +291,6 @@ "ctxt": 0 }, "value": "StringIterator", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck11/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck11/input.ts.json index 02fc8a69a157..566f79aa7de2 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck11/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck11/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "union", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -74,8 +75,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -107,6 +107,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -123,8 +124,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -147,8 +147,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -158,7 +158,6 @@ "ctxt": 0 }, "value": "union", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck12/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck12/input.ts.json index e2ff7c6fedc6..f76b8ea2f06f 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck12/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck12/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck13/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck13/input.ts.json index c95825db6b59..ac4fadc88ded 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck13/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck13/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "strSet", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,7 +54,6 @@ "ctxt": 0 }, "value": "Set", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -76,8 +76,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -94,7 +93,6 @@ "ctxt": 0 }, "value": "Set", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -133,7 +131,6 @@ "ctxt": 0 }, "value": "strSet", - "typeAnnotation": null, "optional": false }, "property": { @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "add", - "typeAnnotation": null, "optional": false }, "computed": false @@ -200,7 +196,6 @@ "ctxt": 0 }, "value": "strSet", - "typeAnnotation": null, "optional": false }, "property": { @@ -211,7 +206,6 @@ "ctxt": 0 }, "value": "add", - "typeAnnotation": null, "optional": false }, "computed": false @@ -271,8 +265,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -287,7 +281,6 @@ "ctxt": 0 }, "value": "strSet", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck14/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck14/input.ts.json index 0de5b97b3e2e..b83854cc40de 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck14/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck14/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "union", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -70,7 +71,6 @@ "ctxt": 0 }, "value": "Set", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -95,8 +95,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -136,8 +135,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -152,7 +151,6 @@ "ctxt": 0 }, "value": "union", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck2/input.ts.json index f34f04266e77..eeb8d34bd975 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck2/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck3/input.ts.json index 570ef70aa14e..bdb4bc9b4c1a 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck3/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "tuple", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,8 +85,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -163,8 +163,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -179,7 +179,6 @@ "ctxt": 0 }, "value": "tuple", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck4/input.ts.json index 98ca1b774354..f16022738f2b 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck4/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "union", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -74,8 +75,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -115,8 +115,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -131,7 +131,6 @@ "ctxt": 0 }, "value": "union", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck5/input.ts.json index c563e15bcc42..8237fd87d5a4 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck5/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "union", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -74,8 +75,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -115,8 +115,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -131,7 +131,6 @@ "ctxt": 0 }, "value": "union", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck6/input.ts.json index bca42f683df6..5c97a460c251 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck6/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "union", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -82,8 +83,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -123,8 +123,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -139,7 +139,6 @@ "ctxt": 0 }, "value": "union", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck7/input.ts.json index 69ed648a579a..cb4d224459cc 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck7/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "union", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -107,8 +107,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -123,7 +123,6 @@ "ctxt": 0 }, "value": "union", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck8/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck8/input.ts.json index 35ec7d780812..fd579ddd9172 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck8/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck8/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "union", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -108,8 +109,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -141,6 +141,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -157,8 +158,7 @@ }, "kind": "symbol" } - }, - "optional": false + } }, "init": null, "definite": false @@ -181,8 +181,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -192,7 +192,6 @@ "ctxt": 0 }, "value": "union", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck9/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck9/input.ts.json index b1c0ecf0218c..5222eddac312 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck9/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5For-ofTypeCheck9/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "union", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -92,8 +93,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -133,8 +133,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -149,7 +149,6 @@ "ctxt": 0 }, "value": "union", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5for-of32/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5for-of32/input.ts.json index 18ef9a946dfd..9b0c094715de 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5for-of32/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/for-ofStatements/ES5for-of32/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -109,8 +109,8 @@ "ctxt": 0 }, "value": "sum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -158,8 +158,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -174,7 +174,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false }, "body": { @@ -208,7 +207,6 @@ "ctxt": 0 }, "value": "sum", - "typeAnnotation": null, "optional": false }, "right": { @@ -252,8 +250,8 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -330,8 +328,8 @@ "ctxt": 0 }, "value": "sum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -341,7 +339,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/statements/forStatements/forStatements/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/forStatements/forStatements/input.ts.json index 699163662640..badfed779a5f 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/forStatements/forStatements/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/forStatements/forStatements/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -168,7 +164,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -185,7 +180,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "source", - "typeAnnotation": null, "optional": false }, "value": null, @@ -237,7 +230,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -268,7 +260,6 @@ "ctxt": 0 }, "value": "recurse", - "typeAnnotation": null, "optional": false }, "value": null, @@ -294,7 +285,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -320,7 +310,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -354,7 +343,6 @@ "ctxt": 0 }, "value": "wrapped", - "typeAnnotation": null, "optional": false }, "value": null, @@ -380,7 +368,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -406,7 +393,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -432,7 +418,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -480,7 +465,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -501,7 +485,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -522,6 +505,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -538,8 +522,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -614,7 +597,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -642,7 +624,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -668,7 +649,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -724,7 +704,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -745,6 +724,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -761,8 +741,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -809,7 +788,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -820,7 +798,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -888,6 +865,7 @@ "ctxt": 0 }, "value": "aNumber", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -904,8 +882,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -964,6 +941,7 @@ "ctxt": 0 }, "value": "aString", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -980,8 +958,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -1045,6 +1022,7 @@ "ctxt": 0 }, "value": "aDate", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1067,13 +1045,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -1090,7 +1066,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1157,6 +1132,7 @@ "ctxt": 0 }, "value": "anObject", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1179,13 +1155,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -1202,7 +1176,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1256,6 +1229,7 @@ "ctxt": 0 }, "value": "anAny", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1272,8 +1246,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -1331,6 +1304,7 @@ "ctxt": 0 }, "value": "aSecondAny", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1347,8 +1321,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1358,7 +1331,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1409,6 +1381,7 @@ "ctxt": 0 }, "value": "aVoid", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1425,8 +1398,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1436,7 +1408,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1487,6 +1458,7 @@ "ctxt": 0 }, "value": "anInterface", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1509,13 +1481,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -1532,7 +1502,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1586,6 +1555,7 @@ "ctxt": 0 }, "value": "aClass", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1608,13 +1578,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -1631,7 +1599,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1685,6 +1652,7 @@ "ctxt": 0 }, "value": "aGenericClass", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1707,7 +1675,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1730,8 +1697,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -1748,7 +1714,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1820,6 +1785,7 @@ "ctxt": 0 }, "value": "anObjectLiteral", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1842,13 +1808,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1868,7 +1832,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": { @@ -1931,6 +1894,7 @@ "ctxt": 0 }, "value": "anOtherObjectLiteral", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1962,7 +1926,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1990,8 +1953,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -2008,7 +1970,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2062,6 +2023,7 @@ "ctxt": 0 }, "value": "aFunction", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2084,12 +2046,10 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2099,7 +2059,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2150,6 +2109,7 @@ "ctxt": 0 }, "value": "anOtherFunction", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2173,6 +2133,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2189,8 +2150,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -2212,8 +2172,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2223,7 +2182,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2274,6 +2232,7 @@ "ctxt": 0 }, "value": "aLambda", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2296,12 +2255,10 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -2319,8 +2276,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2385,6 +2342,7 @@ "ctxt": 0 }, "value": "aModule", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2407,12 +2365,10 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2422,7 +2378,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2473,6 +2428,7 @@ "ctxt": 0 }, "value": "aClassInModule", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2497,7 +2453,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "right": { @@ -2508,14 +2463,12 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -2539,7 +2492,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2550,7 +2502,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2606,6 +2557,7 @@ "ctxt": 0 }, "value": "aFunctionInModule", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2630,7 +2582,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "right": { @@ -2641,13 +2592,11 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -2665,8 +2614,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/statements/forStatements/forStatementsMultipleInvalidDecl/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/forStatements/forStatementsMultipleInvalidDecl/input.ts.json index 5e9cd81b8f24..21a2c83d12e1 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/forStatements/forStatementsMultipleInvalidDecl/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/forStatements/forStatementsMultipleInvalidDecl/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +158,6 @@ "ctxt": 0 }, "value": "valid", - "typeAnnotation": null, "optional": false }, "value": null, @@ -214,7 +209,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -231,7 +225,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -257,7 +250,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -297,7 +289,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -315,7 +306,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -341,7 +331,6 @@ "ctxt": 0 }, "value": "source", - "typeAnnotation": null, "optional": false }, "value": null, @@ -367,7 +356,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -398,7 +386,6 @@ "ctxt": 0 }, "value": "recurse", - "typeAnnotation": null, "optional": false }, "value": null, @@ -424,7 +411,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -450,7 +436,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -484,7 +469,6 @@ "ctxt": 0 }, "value": "wrapped", - "typeAnnotation": null, "optional": false }, "value": null, @@ -510,7 +494,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -536,7 +519,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -562,7 +544,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -610,7 +591,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -631,7 +611,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -652,6 +631,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -668,8 +648,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -744,7 +723,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -772,7 +750,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -798,7 +775,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -854,7 +830,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -875,6 +850,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -891,8 +867,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -939,7 +914,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -950,7 +924,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1018,6 +991,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1034,8 +1008,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1086,8 +1059,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1146,8 +1119,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -1211,8 +1184,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1229,7 +1202,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1283,8 +1255,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1301,7 +1273,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1373,8 +1344,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1384,7 +1355,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1435,6 +1405,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1457,13 +1428,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1514,8 +1483,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1532,7 +1501,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1586,8 +1554,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1604,7 +1572,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1658,8 +1625,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1669,7 +1636,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1720,8 +1686,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1739,6 +1705,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1755,8 +1722,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1826,6 +1792,7 @@ "ctxt": 0 }, "value": "arr", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1850,8 +1817,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1902,8 +1868,8 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -2011,8 +1977,8 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -2039,7 +2005,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2063,7 +2028,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2087,7 +2051,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2162,8 +2125,8 @@ "ctxt": 0 }, "value": "arr2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -2190,7 +2153,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2265,8 +2227,8 @@ "ctxt": 0 }, "value": "arr2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2283,7 +2245,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2310,7 +2271,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2384,6 +2344,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2406,12 +2367,10 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2462,8 +2421,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2480,7 +2439,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2491,7 +2449,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/statements/forStatements/forStatementsMultipleValidDecl/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/forStatements/forStatementsMultipleValidDecl/input.ts.json index 6bc5bb9f9524..901f1ed95541 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/forStatements/forStatementsMultipleValidDecl/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/forStatements/forStatementsMultipleValidDecl/input.ts.json @@ -38,6 +38,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,8 +55,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -106,8 +106,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -166,8 +166,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -184,7 +184,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -223,7 +222,6 @@ "ctxt": 0 }, "value": "declSpace", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -274,8 +272,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -329,7 +327,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -359,7 +356,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -401,7 +397,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -462,6 +457,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -484,13 +480,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -541,8 +535,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -562,7 +556,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -585,7 +578,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -648,6 +640,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -670,13 +663,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -696,7 +687,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -719,7 +709,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -730,7 +719,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -784,8 +772,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -805,7 +793,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -828,7 +815,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -846,7 +832,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -910,6 +895,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -941,7 +927,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -983,7 +968,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1011,8 +995,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1032,7 +1015,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1055,7 +1037,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1118,8 +1099,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -1146,7 +1127,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1169,7 +1149,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1180,7 +1159,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1210,7 +1188,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1252,7 +1229,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1329,6 +1305,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1351,12 +1328,10 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1407,8 +1382,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -1430,6 +1405,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1446,8 +1422,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1537,8 +1512,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1556,6 +1531,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1572,8 +1548,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -1638,6 +1613,7 @@ "ctxt": 0 }, "value": "fn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1661,6 +1637,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1677,8 +1654,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -1700,8 +1676,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1752,6 +1727,7 @@ "ctxt": 0 }, "value": "fn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1783,6 +1759,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1799,8 +1776,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1824,8 +1800,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1876,8 +1851,8 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -1910,6 +1885,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1926,8 +1902,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -1998,6 +1973,7 @@ "ctxt": 0 }, "value": "fn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2020,12 +1996,10 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2076,6 +2050,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2100,8 +2075,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2152,8 +2126,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -2247,8 +2221,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -2332,6 +2306,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2356,8 +2331,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -2416,8 +2390,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2434,7 +2408,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2506,6 +2479,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2528,12 +2502,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/statements/ifDoWhileStatements/ifDoWhileStatements/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/ifDoWhileStatements/ifDoWhileStatements/input.ts.json index 053dd05f4447..0162c57607c2 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/ifDoWhileStatements/ifDoWhileStatements/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/ifDoWhileStatements/ifDoWhileStatements/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +158,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -214,7 +209,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -231,7 +225,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -257,7 +250,6 @@ "ctxt": 0 }, "value": "valid", - "typeAnnotation": null, "optional": false }, "value": null, @@ -297,7 +289,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -315,7 +306,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -341,7 +331,6 @@ "ctxt": 0 }, "value": "source", - "typeAnnotation": null, "optional": false }, "value": null, @@ -367,7 +356,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -398,7 +386,6 @@ "ctxt": 0 }, "value": "recurse", - "typeAnnotation": null, "optional": false }, "value": null, @@ -424,7 +411,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -450,7 +436,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -484,7 +469,6 @@ "ctxt": 0 }, "value": "wrapped", - "typeAnnotation": null, "optional": false }, "value": null, @@ -510,7 +494,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -536,7 +519,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -562,7 +544,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -610,7 +591,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -631,7 +611,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -652,6 +631,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -668,8 +648,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -737,7 +716,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -758,6 +736,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -774,8 +753,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -816,7 +794,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -870,7 +847,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -898,7 +874,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -924,7 +899,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -980,7 +954,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1001,6 +974,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1017,8 +991,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1065,7 +1038,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1076,7 +1048,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1129,7 +1100,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { @@ -1157,7 +1127,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1183,7 +1152,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1239,7 +1207,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1260,6 +1227,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1276,8 +1244,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1324,7 +1291,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1335,7 +1301,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1541,7 +1506,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1570,7 +1534,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "body": { @@ -1598,7 +1561,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "body": { @@ -2297,7 +2259,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -2320,7 +2281,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2376,7 +2336,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -2399,7 +2358,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2454,7 +2412,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -2477,7 +2434,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2647,7 +2603,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2686,7 +2641,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2724,7 +2678,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2762,7 +2715,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2789,7 +2741,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2830,7 +2781,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2857,7 +2807,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2897,7 +2846,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2924,7 +2872,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2967,8 +2914,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -2998,7 +2945,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -3027,7 +2973,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "body": { @@ -3055,7 +3000,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "body": { @@ -3093,8 +3037,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NullLiteral", @@ -3123,7 +3067,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -3152,7 +3095,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "body": { @@ -3180,7 +3122,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "body": { @@ -3218,8 +3159,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -3229,7 +3170,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3251,7 +3191,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -3280,7 +3219,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "body": { @@ -3308,7 +3246,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "body": { @@ -3346,8 +3283,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -3377,7 +3314,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -3406,7 +3342,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "body": { @@ -3434,7 +3369,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "body": { @@ -3472,8 +3406,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -3508,7 +3442,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -3537,7 +3470,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "body": { @@ -3565,7 +3497,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "body": { @@ -3603,8 +3534,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -3639,7 +3570,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -3668,7 +3598,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "body": { @@ -3696,7 +3625,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "body": { @@ -3734,8 +3662,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "RegExpLiteral", @@ -3766,7 +3694,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -3795,7 +3722,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "body": { @@ -3823,7 +3749,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "body": { @@ -3861,8 +3786,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -3892,7 +3817,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -3921,7 +3845,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "body": { @@ -3949,7 +3872,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "body": { @@ -3987,8 +3909,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -4043,7 +3965,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -4072,7 +3993,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "body": { @@ -4100,7 +4020,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "body": { @@ -4138,8 +4057,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -4169,7 +4088,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -4198,7 +4116,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "body": { @@ -4226,7 +4143,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "body": { @@ -4264,8 +4180,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -4285,7 +4201,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -4308,7 +4223,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -4347,7 +4261,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -4376,7 +4289,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "body": { @@ -4404,7 +4316,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "body": { @@ -4427,7 +4338,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4448,6 +4358,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4464,8 +4375,7 @@ }, "kind": "string" } - }, - "optional": true + } } } ], @@ -4526,7 +4436,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4555,7 +4464,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4594,7 +4502,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4632,7 +4539,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4663,7 +4569,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -4692,7 +4597,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "body": { @@ -4720,7 +4624,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/statements/returnStatements/invalidReturnStatements/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/returnStatements/invalidReturnStatements/input.ts.json index 11ea405e7fc6..4f5947023f76 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/returnStatements/invalidReturnStatements/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/returnStatements/invalidReturnStatements/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -67,7 +66,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -118,7 +116,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -169,7 +166,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -214,7 +210,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -231,7 +226,6 @@ "ctxt": 0 }, "value": "fn7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -287,7 +281,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -317,7 +310,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -356,7 +348,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -382,7 +373,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -428,7 +418,6 @@ "ctxt": 0 }, "value": "dispose", - "typeAnnotation": null, "optional": false }, "function": { @@ -480,7 +469,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -497,7 +485,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -523,7 +510,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -563,7 +549,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -581,7 +566,6 @@ "ctxt": 0 }, "value": "fn10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -625,7 +609,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": { @@ -668,7 +651,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -685,7 +667,6 @@ "ctxt": 0 }, "value": "fn11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -726,7 +707,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -760,7 +740,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/statements/returnStatements/returnStatements/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/returnStatements/returnStatements/input.ts.json index fd676ea4aaa8..f803eae3761a 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/returnStatements/returnStatements/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/returnStatements/returnStatements/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -85,7 +84,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -159,7 +157,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -193,7 +190,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -230,7 +226,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -291,7 +286,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -360,7 +354,6 @@ "ctxt": 0 }, "value": "fn6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -401,7 +394,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -448,7 +440,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -465,7 +456,6 @@ "ctxt": 0 }, "value": "fn7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -533,7 +523,6 @@ "ctxt": 0 }, "value": "fn8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -599,7 +588,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -629,7 +617,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -668,7 +655,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -694,7 +680,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -740,7 +725,6 @@ "ctxt": 0 }, "value": "dispose", - "typeAnnotation": null, "optional": false }, "function": { @@ -792,7 +776,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -809,7 +792,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -835,7 +817,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -875,7 +856,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -893,7 +873,6 @@ "ctxt": 0 }, "value": "fn10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -937,7 +916,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": { @@ -980,7 +958,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -997,7 +974,6 @@ "ctxt": 0 }, "value": "fn11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1038,7 +1014,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1072,7 +1047,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1089,7 +1063,6 @@ "ctxt": 0 }, "value": "fn12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1130,7 +1103,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1164,7 +1136,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1181,7 +1152,6 @@ "ctxt": 0 }, "value": "fn13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1243,7 +1213,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/statements/switchStatements/switchStatements/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/switchStatements/switchStatements/input.ts.json index 6b7ed80879b1..b4b2403c6b83 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/switchStatements/switchStatements/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/switchStatements/switchStatements/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -72,6 +70,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -88,8 +87,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -165,6 +163,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -181,8 +180,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -204,7 +202,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -299,7 +296,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "consequent": [] @@ -326,7 +322,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -369,7 +364,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -457,7 +451,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": { @@ -533,7 +526,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -562,7 +554,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } }, @@ -597,7 +588,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -608,7 +598,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "computed": false @@ -654,6 +643,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -670,8 +660,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -713,7 +702,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -762,6 +750,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -778,8 +767,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -821,7 +809,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -872,7 +859,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -898,7 +884,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -946,7 +931,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -972,7 +956,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1012,7 +995,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1042,7 +1024,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1071,7 +1052,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1104,7 +1084,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": { @@ -1127,7 +1106,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -1171,7 +1149,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1272,7 +1249,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "cases": [] @@ -1299,7 +1275,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1342,7 +1317,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1430,7 +1404,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": { @@ -1506,6 +1479,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1522,8 +1496,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1565,7 +1538,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1614,6 +1586,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1636,13 +1609,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1684,7 +1655,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/statements/throwStatements/throwInEnclosingStatements/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/throwStatements/throwInEnclosingStatements/input.ts.json index e73513f38a86..81ffd8329fa0 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/throwStatements/throwInEnclosingStatements/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/throwStatements/throwInEnclosingStatements/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -105,6 +103,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -127,13 +126,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -159,7 +156,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -190,7 +186,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -226,6 +221,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -242,8 +238,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -265,7 +260,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -306,7 +300,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -336,7 +329,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -369,8 +361,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -408,7 +400,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "right": { @@ -444,7 +435,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -483,8 +473,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -524,7 +514,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -563,8 +552,8 @@ "ctxt": 0 }, "value": "idx", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -603,7 +592,6 @@ "ctxt": 0 }, "value": "idx", - "typeAnnotation": null, "optional": false } } @@ -678,8 +666,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -717,7 +705,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "right": { @@ -753,7 +740,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false } } @@ -770,7 +756,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -796,7 +781,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": null, @@ -822,7 +806,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -853,7 +836,6 @@ "ctxt": 0 }, "value": "biz", - "typeAnnotation": null, "optional": false }, "function": { @@ -902,7 +884,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false @@ -936,7 +917,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -995,7 +975,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1031,8 +1010,8 @@ "ctxt": 0 }, "value": "aa", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1052,7 +1031,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": { @@ -1075,7 +1053,6 @@ "ctxt": 0 }, "value": "biz", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/statements/throwStatements/throwStatements/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/throwStatements/throwStatements/input.ts.json index 22f37d6510ec..db729589241c 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/throwStatements/throwStatements/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/throwStatements/throwStatements/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": null, @@ -168,7 +164,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -185,7 +180,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "source", - "typeAnnotation": null, "optional": false }, "value": null, @@ -237,7 +230,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -268,7 +260,6 @@ "ctxt": 0 }, "value": "recurse", - "typeAnnotation": null, "optional": false }, "value": null, @@ -294,7 +285,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -320,7 +310,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -354,7 +343,6 @@ "ctxt": 0 }, "value": "wrapped", - "typeAnnotation": null, "optional": false }, "value": null, @@ -380,7 +368,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -406,7 +393,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -432,7 +418,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -480,7 +465,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -501,7 +485,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -522,6 +505,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -538,8 +522,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -614,7 +597,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -642,7 +624,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -668,7 +649,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -724,7 +704,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -745,6 +724,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -761,8 +741,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -809,7 +788,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -820,7 +798,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -881,8 +858,8 @@ "ctxt": 0 }, "value": "aNumber", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -912,7 +889,6 @@ "ctxt": 0 }, "value": "aNumber", - "typeAnnotation": null, "optional": false } }, @@ -941,8 +917,8 @@ "ctxt": 0 }, "value": "aString", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -977,7 +953,6 @@ "ctxt": 0 }, "value": "aString", - "typeAnnotation": null, "optional": false } }, @@ -1006,8 +981,8 @@ "ctxt": 0 }, "value": "aDate", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1024,7 +999,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1062,7 +1036,6 @@ "ctxt": 0 }, "value": "aDate", - "typeAnnotation": null, "optional": false } }, @@ -1091,8 +1064,8 @@ "ctxt": 0 }, "value": "anObject", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1109,7 +1082,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1134,7 +1106,6 @@ "ctxt": 0 }, "value": "anObject", - "typeAnnotation": null, "optional": false } }, @@ -1163,8 +1134,8 @@ "ctxt": 0 }, "value": "anAny", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NullLiteral", @@ -1193,7 +1164,6 @@ "ctxt": 0 }, "value": "anAny", - "typeAnnotation": null, "optional": false } }, @@ -1222,8 +1192,8 @@ "ctxt": 0 }, "value": "anOtherAny", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -1247,7 +1217,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1282,7 +1251,6 @@ "ctxt": 0 }, "value": "anOtherAny", - "typeAnnotation": null, "optional": false } }, @@ -1311,8 +1279,8 @@ "ctxt": 0 }, "value": "anUndefined", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1322,7 +1290,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1344,7 +1311,6 @@ "ctxt": 0 }, "value": "anUndefined", - "typeAnnotation": null, "optional": false } }, @@ -1373,8 +1339,8 @@ "ctxt": 0 }, "value": "aClass", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1391,7 +1357,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1416,7 +1381,6 @@ "ctxt": 0 }, "value": "aClass", - "typeAnnotation": null, "optional": false } }, @@ -1445,8 +1409,8 @@ "ctxt": 0 }, "value": "aGenericClass", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1463,7 +1427,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1506,7 +1469,6 @@ "ctxt": 0 }, "value": "aGenericClass", - "typeAnnotation": null, "optional": false } }, @@ -1535,8 +1497,8 @@ "ctxt": 0 }, "value": "anObjectLiteral", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1556,7 +1518,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": { @@ -1590,7 +1551,6 @@ "ctxt": 0 }, "value": "anObjectLiteral", - "typeAnnotation": null, "optional": false } }, @@ -1619,8 +1579,8 @@ "ctxt": 0 }, "value": "aFunction", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1630,7 +1590,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1652,7 +1611,6 @@ "ctxt": 0 }, "value": "aFunction", - "typeAnnotation": null, "optional": false } }, @@ -1678,7 +1636,6 @@ "ctxt": 0 }, "value": "aFunction", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1728,8 +1685,8 @@ "ctxt": 0 }, "value": "aLambda", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1747,8 +1704,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1784,7 +1741,6 @@ "ctxt": 0 }, "value": "aLambda", - "typeAnnotation": null, "optional": false } }, @@ -1810,7 +1766,6 @@ "ctxt": 0 }, "value": "aLambda", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1855,8 +1810,8 @@ "ctxt": 0 }, "value": "aModule", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1866,7 +1821,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1888,7 +1842,6 @@ "ctxt": 0 }, "value": "aModule", - "typeAnnotation": null, "optional": false } }, @@ -1915,7 +1868,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } } @@ -1945,8 +1897,8 @@ "ctxt": 0 }, "value": "aClassInModule", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1970,7 +1922,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -1981,7 +1932,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2008,7 +1958,6 @@ "ctxt": 0 }, "value": "aClassInModule", - "typeAnnotation": null, "optional": false } }, @@ -2037,8 +1986,8 @@ "ctxt": 0 }, "value": "aFunctionInModule", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2055,7 +2004,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "property": { @@ -2066,7 +2014,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2090,7 +2037,6 @@ "ctxt": 0 }, "value": "aFunctionInModule", - "typeAnnotation": null, "optional": false } }, @@ -2119,8 +2065,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -2142,7 +2088,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2211,7 +2156,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2315,6 +2259,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2337,13 +2282,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2380,7 +2323,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2416,7 +2358,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -2439,7 +2380,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2577,7 +2517,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2606,7 +2545,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2635,7 +2573,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2664,7 +2601,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/statements/tryStatements/tryStatements/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/tryStatements/tryStatements/input.ts.json index 1b0eb0ecef7f..c969049ad5b7 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/tryStatements/tryStatements/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/tryStatements/tryStatements/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -248,8 +247,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -284,6 +283,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -300,8 +300,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -415,8 +414,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", diff --git a/ecmascript/parser/tests/typescript/tsc/statements/withStatements/withStatements/input.ts.json b/ecmascript/parser/tests/typescript/tsc/statements/withStatements/withStatements/input.ts.json index dcf887e7b38a..18f39c453011 100644 --- a/ecmascript/parser/tests/typescript/tsc/statements/withStatements/withStatements/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/statements/withStatements/withStatements/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -62,7 +62,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "body": { @@ -96,8 +95,8 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -138,8 +137,8 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/types/any/anyAsConstructor/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/any/anyAsConstructor/input.ts.json index 8650b787f4a7..22d3c533c691 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/any/anyAsConstructor/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/any/anyAsConstructor/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,8 +80,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -98,7 +98,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -133,8 +132,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -151,7 +150,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -204,8 +202,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -222,7 +220,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -236,7 +233,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -272,8 +268,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -290,7 +286,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -304,7 +299,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/any/anyAsFunctionCall/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/any/anyAsFunctionCall/input.ts.json index c3cc4b1abc72..7cc3a5606f08 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/any/anyAsFunctionCall/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/any/anyAsFunctionCall/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,8 +80,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -98,7 +98,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -133,8 +132,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -151,7 +150,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -204,8 +202,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -222,7 +220,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -236,7 +233,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/any/anyAsGenericFunctionCall/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/any/anyAsGenericFunctionCall/input.ts.json index 894cff2c0626..188e22173138 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/any/anyAsGenericFunctionCall/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/any/anyAsGenericFunctionCall/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,8 +80,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -98,7 +98,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -151,8 +150,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -169,7 +168,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -225,7 +223,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -251,7 +248,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -314,8 +310,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -332,7 +328,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -346,7 +341,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -374,7 +368,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -411,8 +404,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -429,7 +422,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -443,7 +435,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/any/anyPropertyAccess/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/any/anyPropertyAccess/input.ts.json index 51ee04d19ff6..5b57e0e2a1cf 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/any/anyPropertyAccess/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/any/anyPropertyAccess/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,8 +80,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -98,7 +98,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -109,7 +108,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -143,8 +141,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -161,7 +159,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -209,8 +206,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -234,7 +231,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -285,8 +281,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -310,7 +306,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -321,7 +316,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -334,7 +328,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -368,8 +361,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -393,7 +386,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -415,7 +407,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -449,8 +440,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -474,7 +465,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -501,7 +491,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/any/assignAnyToEveryType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/any/assignAnyToEveryType/input.ts.json index ee9e3aef451f..17401c31f720 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/any/assignAnyToEveryType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/any/assignAnyToEveryType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -107,7 +107,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -139,6 +138,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -155,8 +155,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -166,7 +165,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -198,6 +196,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -214,8 +213,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -225,7 +223,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -257,6 +254,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -273,8 +271,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -284,7 +281,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -316,8 +312,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NullLiteral", @@ -354,8 +350,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -365,7 +361,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -395,8 +390,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -406,7 +401,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -436,8 +430,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -447,7 +441,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -469,7 +462,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -488,7 +480,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -520,6 +511,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -542,13 +534,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -558,7 +548,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -590,8 +579,8 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -608,7 +597,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -619,7 +607,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -651,8 +638,8 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -662,7 +649,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -677,7 +663,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -703,7 +688,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -766,6 +750,7 @@ "ctxt": 0 }, "value": "h", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -788,13 +773,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -804,7 +787,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -826,7 +808,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -856,7 +837,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -910,6 +890,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -932,13 +913,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -948,7 +927,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -980,6 +958,7 @@ "ctxt": 0 }, "value": "j", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1024,8 +1003,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1035,7 +1013,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1067,6 +1044,7 @@ "ctxt": 0 }, "value": "j2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1098,6 +1076,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1120,13 +1099,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1169,7 +1146,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1180,8 +1156,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1191,7 +1166,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1215,7 +1189,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -1258,8 +1231,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1301,8 +1274,8 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1312,7 +1285,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1327,7 +1299,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1348,6 +1319,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1370,13 +1342,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1417,8 +1387,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1428,7 +1398,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1460,7 +1429,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/any/assignEveryTypeToAny/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/any/assignEveryTypeToAny/input.ts.json index 3638480efa49..340da2e5e204 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/any/assignEveryTypeToAny/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/any/assignEveryTypeToAny/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -78,8 +78,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -117,8 +117,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -156,8 +156,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -167,7 +167,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -195,8 +194,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -234,8 +233,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -273,8 +272,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -284,7 +283,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -312,8 +310,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -356,8 +354,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -400,8 +398,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -411,7 +409,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -441,6 +438,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -457,8 +455,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -488,8 +485,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -499,7 +496,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -529,8 +525,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -540,7 +536,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -570,8 +565,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -581,7 +576,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -611,6 +605,7 @@ "ctxt": 0 }, "value": "e2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -633,12 +628,10 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -668,8 +661,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -679,7 +672,6 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, "optional": false } } @@ -701,7 +693,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -720,7 +711,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -750,8 +740,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -768,7 +758,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -779,7 +768,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -811,8 +799,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -829,7 +817,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -840,7 +827,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -872,8 +858,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -883,7 +869,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -903,7 +888,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -933,7 +917,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -987,6 +970,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1009,13 +993,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1045,8 +1027,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1056,7 +1038,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } } @@ -1071,7 +1052,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1097,7 +1077,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1160,6 +1139,7 @@ "ctxt": 0 }, "value": "h", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1182,13 +1162,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1218,8 +1196,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1229,7 +1207,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false } } @@ -1259,6 +1236,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1303,8 +1281,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1334,8 +1311,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1345,7 +1322,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -1373,8 +1349,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1394,7 +1370,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1463,8 +1438,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1484,7 +1459,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1504,6 +1478,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1526,13 +1501,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1565,7 +1538,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1596,7 +1568,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1620,7 +1591,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1641,6 +1611,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1663,13 +1634,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1710,8 +1679,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1721,7 +1690,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1753,7 +1721,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/any/narrowExceptionVariableInCatchClause/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/any/narrowExceptionVariableInCatchClause/input.ts.json index 0481c66f75f0..4de72318953a 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/any/narrowExceptionVariableInCatchClause/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/any/narrowExceptionVariableInCatchClause/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "isFooError", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -91,7 +90,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -125,7 +123,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -180,7 +177,6 @@ "ctxt": 0 }, "value": "dontPanic", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -205,7 +201,6 @@ "ctxt": 0 }, "value": "tryCatch", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -255,8 +250,8 @@ "ctxt": 0 }, "value": "err", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -288,7 +283,6 @@ "ctxt": 0 }, "value": "isFooError", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -302,7 +296,6 @@ "ctxt": 0 }, "value": "err", - "typeAnnotation": null, "optional": false } } @@ -346,7 +339,6 @@ "ctxt": 0 }, "value": "err", - "typeAnnotation": null, "optional": false }, "property": { @@ -357,7 +349,6 @@ "ctxt": 0 }, "value": "dontPanic", - "typeAnnotation": null, "optional": false }, "computed": false @@ -395,7 +386,6 @@ "ctxt": 0 }, "value": "err", - "typeAnnotation": null, "optional": false }, "property": { @@ -406,7 +396,6 @@ "ctxt": 0 }, "value": "doPanic", - "typeAnnotation": null, "optional": false }, "computed": false @@ -440,7 +429,6 @@ "ctxt": 0 }, "value": "err", - "typeAnnotation": null, "optional": false }, "right": { @@ -451,7 +439,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false } }, @@ -485,7 +472,6 @@ "ctxt": 0 }, "value": "err", - "typeAnnotation": null, "optional": false }, "property": { @@ -496,7 +482,6 @@ "ctxt": 0 }, "value": "message", - "typeAnnotation": null, "optional": false }, "computed": false @@ -524,7 +509,6 @@ "ctxt": 0 }, "value": "err", - "typeAnnotation": null, "optional": false }, "property": { @@ -535,7 +519,6 @@ "ctxt": 0 }, "value": "massage", - "typeAnnotation": null, "optional": false }, "computed": false @@ -566,7 +549,6 @@ "ctxt": 0 }, "value": "err", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/any/narrowFromAnyWithInstanceof/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/any/narrowFromAnyWithInstanceof/input.ts.json index 9c2674989b03..e892210b025e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/any/narrowFromAnyWithInstanceof/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/any/narrowFromAnyWithInstanceof/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -78,7 +78,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -89,7 +88,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false } }, @@ -123,7 +121,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -152,7 +149,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -218,7 +214,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -265,7 +260,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -276,7 +270,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -309,7 +302,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -320,7 +312,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false } }, @@ -361,7 +352,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -372,7 +362,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false @@ -403,7 +392,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -437,7 +425,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -448,7 +435,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false } }, @@ -482,7 +468,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -493,7 +478,6 @@ "ctxt": 0 }, "value": "message", - "typeAnnotation": null, "optional": false }, "computed": false @@ -521,7 +505,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -532,7 +515,6 @@ "ctxt": 0 }, "value": "mesage", - "typeAnnotation": null, "optional": false }, "computed": false @@ -565,7 +547,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -576,7 +557,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false } }, @@ -617,7 +597,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -628,7 +607,6 @@ "ctxt": 0 }, "value": "getDate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -666,7 +644,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -677,7 +654,6 @@ "ctxt": 0 }, "value": "getHuors", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/any/narrowFromAnyWithTypePredicate/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/any/narrowFromAnyWithTypePredicate/input.ts.json index 835fe888f358..6ef25c2579c3 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/any/narrowFromAnyWithTypePredicate/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/any/narrowFromAnyWithTypePredicate/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -65,7 +65,6 @@ "ctxt": 0 }, "value": "isFunction", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -86,8 +85,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -124,7 +123,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -149,7 +147,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -168,7 +165,6 @@ "ctxt": 0 }, "value": "isObject", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -189,8 +185,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -227,7 +223,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -252,7 +247,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -271,7 +265,6 @@ "ctxt": 0 }, "value": "isAnything", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -292,8 +285,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -330,7 +323,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -363,7 +355,6 @@ "ctxt": 0 }, "value": "isError", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -384,8 +375,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -422,7 +413,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -447,7 +437,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -466,7 +455,6 @@ "ctxt": 0 }, "value": "isDate", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -487,8 +475,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -525,7 +513,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -550,7 +537,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -581,7 +567,6 @@ "ctxt": 0 }, "value": "isFunction", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -595,7 +580,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -632,7 +616,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -661,7 +644,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -727,7 +709,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -774,7 +755,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -785,7 +765,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -817,7 +796,6 @@ "ctxt": 0 }, "value": "isObject", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -831,7 +809,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -875,7 +852,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -886,7 +862,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false @@ -917,7 +892,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -950,7 +924,6 @@ "ctxt": 0 }, "value": "isAnything", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -964,7 +937,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1008,7 +980,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1019,7 +990,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1050,7 +1020,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1083,7 +1052,6 @@ "ctxt": 0 }, "value": "isError", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1097,7 +1065,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1134,7 +1101,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1145,7 +1111,6 @@ "ctxt": 0 }, "value": "message", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1173,7 +1138,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1184,7 +1148,6 @@ "ctxt": 0 }, "value": "mesage", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1216,7 +1179,6 @@ "ctxt": 0 }, "value": "isDate", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1230,7 +1192,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1274,7 +1235,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1285,7 +1245,6 @@ "ctxt": 0 }, "value": "getDate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1323,7 +1282,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1334,7 +1292,6 @@ "ctxt": 0 }, "value": "getHuors", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/asyncGenerators/types.asyncGenerators.es2018.1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/asyncGenerators/types.asyncGenerators.es2018.1/input.ts.json index c6b16a702885..ba34b41cb11d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/asyncGenerators/types.asyncGenerators.es2018.1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/asyncGenerators/types.asyncGenerators.es2018.1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "inferReturnType1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "inferReturnType2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -105,7 +103,6 @@ "ctxt": 0 }, "value": "inferReturnType3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -167,7 +164,6 @@ "ctxt": 0 }, "value": "inferReturnType4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -222,7 +218,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "property": { @@ -233,7 +228,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "computed": false @@ -274,7 +268,6 @@ "ctxt": 0 }, "value": "inferReturnType5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -355,7 +348,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "property": { @@ -366,7 +358,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "computed": false @@ -407,7 +398,6 @@ "ctxt": 0 }, "value": "inferReturnType6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -494,7 +484,6 @@ "ctxt": 0 }, "value": "inferReturnType7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -559,7 +548,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "property": { @@ -570,7 +558,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "computed": false @@ -614,7 +601,6 @@ "ctxt": 0 }, "value": "inferReturnType8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -751,6 +737,7 @@ "ctxt": 0 }, "value": "assignability1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -789,7 +776,6 @@ "ctxt": 0 }, "value": "AsyncIterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -814,8 +800,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -897,6 +882,7 @@ "ctxt": 0 }, "value": "assignability2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -935,7 +921,6 @@ "ctxt": 0 }, "value": "AsyncIterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -960,8 +945,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -1017,7 +1001,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "property": { @@ -1028,7 +1011,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1088,6 +1070,7 @@ "ctxt": 0 }, "value": "assignability3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1126,7 +1109,6 @@ "ctxt": 0 }, "value": "AsyncIterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1151,8 +1133,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -1259,6 +1240,7 @@ "ctxt": 0 }, "value": "assignability4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1297,7 +1279,6 @@ "ctxt": 0 }, "value": "AsyncIterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1322,8 +1303,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -1389,7 +1369,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "property": { @@ -1400,7 +1379,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1463,6 +1441,7 @@ "ctxt": 0 }, "value": "assignability5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1501,7 +1480,6 @@ "ctxt": 0 }, "value": "AsyncIterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1526,8 +1504,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -1669,6 +1646,7 @@ "ctxt": 0 }, "value": "assignability6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1707,7 +1685,6 @@ "ctxt": 0 }, "value": "AsyncIterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1732,8 +1709,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -1815,6 +1791,7 @@ "ctxt": 0 }, "value": "assignability7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1853,7 +1830,6 @@ "ctxt": 0 }, "value": "AsyncIterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1878,8 +1854,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -1935,7 +1910,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "property": { @@ -1946,7 +1920,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2006,6 +1979,7 @@ "ctxt": 0 }, "value": "assignability8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2044,7 +2018,6 @@ "ctxt": 0 }, "value": "AsyncIterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2069,8 +2042,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -2177,6 +2149,7 @@ "ctxt": 0 }, "value": "assignability9", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2215,7 +2188,6 @@ "ctxt": 0 }, "value": "AsyncIterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2240,8 +2212,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -2307,7 +2278,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "property": { @@ -2318,7 +2288,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2381,6 +2350,7 @@ "ctxt": 0 }, "value": "assignability10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2419,7 +2389,6 @@ "ctxt": 0 }, "value": "AsyncIterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2444,8 +2413,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -2587,6 +2555,7 @@ "ctxt": 0 }, "value": "assignability11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2625,7 +2594,6 @@ "ctxt": 0 }, "value": "AsyncIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2650,8 +2618,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -2733,6 +2700,7 @@ "ctxt": 0 }, "value": "assignability12", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2771,7 +2739,6 @@ "ctxt": 0 }, "value": "AsyncIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2796,8 +2763,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -2853,7 +2819,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "property": { @@ -2864,7 +2829,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2924,6 +2888,7 @@ "ctxt": 0 }, "value": "assignability13", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2962,7 +2927,6 @@ "ctxt": 0 }, "value": "AsyncIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2987,8 +2951,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -3095,6 +3058,7 @@ "ctxt": 0 }, "value": "assignability14", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3133,7 +3097,6 @@ "ctxt": 0 }, "value": "AsyncIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3158,8 +3121,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -3225,7 +3187,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "property": { @@ -3236,7 +3197,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3299,6 +3259,7 @@ "ctxt": 0 }, "value": "assignability15", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3337,7 +3298,6 @@ "ctxt": 0 }, "value": "AsyncIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3362,8 +3322,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -3490,7 +3449,6 @@ "ctxt": 0 }, "value": "explicitReturnType1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3562,7 +3520,6 @@ "ctxt": 0 }, "value": "AsyncIterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3597,7 +3554,6 @@ "ctxt": 0 }, "value": "explicitReturnType2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3652,7 +3608,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "property": { @@ -3663,7 +3618,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3714,7 +3668,6 @@ "ctxt": 0 }, "value": "AsyncIterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3749,7 +3702,6 @@ "ctxt": 0 }, "value": "explicitReturnType3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3846,7 +3798,6 @@ "ctxt": 0 }, "value": "AsyncIterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3881,7 +3832,6 @@ "ctxt": 0 }, "value": "explicitReturnType4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3946,7 +3896,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "property": { @@ -3957,7 +3906,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4011,7 +3959,6 @@ "ctxt": 0 }, "value": "AsyncIterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4046,7 +3993,6 @@ "ctxt": 0 }, "value": "explicitReturnType5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4178,7 +4124,6 @@ "ctxt": 0 }, "value": "AsyncIterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4213,7 +4158,6 @@ "ctxt": 0 }, "value": "explicitReturnType6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4285,7 +4229,6 @@ "ctxt": 0 }, "value": "AsyncIterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4320,7 +4263,6 @@ "ctxt": 0 }, "value": "explicitReturnType7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4375,7 +4317,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "property": { @@ -4386,7 +4327,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4437,7 +4377,6 @@ "ctxt": 0 }, "value": "AsyncIterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4472,7 +4411,6 @@ "ctxt": 0 }, "value": "explicitReturnType8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4569,7 +4507,6 @@ "ctxt": 0 }, "value": "AsyncIterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4604,7 +4541,6 @@ "ctxt": 0 }, "value": "explicitReturnType9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4669,7 +4605,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "property": { @@ -4680,7 +4615,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4734,7 +4668,6 @@ "ctxt": 0 }, "value": "AsyncIterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4769,7 +4702,6 @@ "ctxt": 0 }, "value": "explicitReturnType10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4901,7 +4833,6 @@ "ctxt": 0 }, "value": "AsyncIterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4936,7 +4867,6 @@ "ctxt": 0 }, "value": "explicitReturnType11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5008,7 +4938,6 @@ "ctxt": 0 }, "value": "AsyncIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5043,7 +4972,6 @@ "ctxt": 0 }, "value": "explicitReturnType12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5098,7 +5026,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "property": { @@ -5109,7 +5036,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5160,7 +5086,6 @@ "ctxt": 0 }, "value": "AsyncIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5195,7 +5120,6 @@ "ctxt": 0 }, "value": "explicitReturnType13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5292,7 +5216,6 @@ "ctxt": 0 }, "value": "AsyncIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5327,7 +5250,6 @@ "ctxt": 0 }, "value": "explicitReturnType14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5392,7 +5314,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "property": { @@ -5403,7 +5324,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5457,7 +5377,6 @@ "ctxt": 0 }, "value": "AsyncIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5492,7 +5411,6 @@ "ctxt": 0 }, "value": "explicitReturnType15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5624,7 +5542,6 @@ "ctxt": 0 }, "value": "AsyncIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5659,7 +5576,6 @@ "ctxt": 0 }, "value": "explicitReturnType16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5737,7 +5653,6 @@ "ctxt": 0 }, "value": "awaitedType1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5781,8 +5696,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -5822,7 +5737,6 @@ "ctxt": 0 }, "value": "awaitedType2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5866,8 +5780,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -5898,7 +5812,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "property": { @@ -5909,7 +5822,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5952,7 +5864,6 @@ "ctxt": 0 }, "value": "nextType1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5996,8 +5907,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "YieldExpression", @@ -6049,7 +5960,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6075,8 +5985,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -6150,7 +6060,6 @@ "ctxt": 0 }, "value": "PromiseLike", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/asyncGenerators/types.asyncGenerators.es2018.2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/asyncGenerators/types.asyncGenerators.es2018.2/input.ts.json index d0dca5a5ab3e..f37f6b0a0ef5 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/asyncGenerators/types.asyncGenerators.es2018.2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/asyncGenerators/types.asyncGenerators.es2018.2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "inferReturnType1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -78,7 +77,6 @@ "ctxt": 0 }, "value": "inferReturnType2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -126,7 +124,6 @@ "ctxt": 0 }, "value": "inferReturnType2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -152,7 +149,6 @@ "ctxt": 0 }, "value": "inferReturnType3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -207,7 +203,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "property": { @@ -218,7 +213,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "computed": false @@ -299,6 +293,7 @@ "ctxt": 0 }, "value": "assignability1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -337,7 +332,6 @@ "ctxt": 0 }, "value": "AsyncIterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -362,8 +356,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -450,6 +443,7 @@ "ctxt": 0 }, "value": "assignability2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -488,7 +482,6 @@ "ctxt": 0 }, "value": "AsyncIterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -513,8 +506,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -631,6 +623,7 @@ "ctxt": 0 }, "value": "assignability3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -669,7 +662,6 @@ "ctxt": 0 }, "value": "AsyncIterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -694,8 +686,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -842,6 +833,7 @@ "ctxt": 0 }, "value": "assignability4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -880,7 +872,6 @@ "ctxt": 0 }, "value": "AsyncIterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -905,8 +896,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -993,6 +983,7 @@ "ctxt": 0 }, "value": "assignability5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1031,7 +1022,6 @@ "ctxt": 0 }, "value": "AsyncIterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1056,8 +1046,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -1174,6 +1163,7 @@ "ctxt": 0 }, "value": "assignability6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1212,7 +1202,6 @@ "ctxt": 0 }, "value": "AsyncIterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1237,8 +1226,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -1385,6 +1373,7 @@ "ctxt": 0 }, "value": "assignability7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1423,7 +1412,6 @@ "ctxt": 0 }, "value": "AsyncIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1448,8 +1436,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -1536,6 +1523,7 @@ "ctxt": 0 }, "value": "assignability8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1574,7 +1562,6 @@ "ctxt": 0 }, "value": "AsyncIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1599,8 +1586,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -1717,6 +1703,7 @@ "ctxt": 0 }, "value": "assignability9", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1755,7 +1742,6 @@ "ctxt": 0 }, "value": "AsyncIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1780,8 +1766,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -1913,7 +1898,6 @@ "ctxt": 0 }, "value": "explicitReturnType1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1990,7 +1974,6 @@ "ctxt": 0 }, "value": "AsyncIterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2025,7 +2008,6 @@ "ctxt": 0 }, "value": "explicitReturnType2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2132,7 +2114,6 @@ "ctxt": 0 }, "value": "AsyncIterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2167,7 +2148,6 @@ "ctxt": 0 }, "value": "explicitReturnType3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2304,7 +2284,6 @@ "ctxt": 0 }, "value": "AsyncIterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2339,7 +2318,6 @@ "ctxt": 0 }, "value": "explicitReturnType4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2416,7 +2394,6 @@ "ctxt": 0 }, "value": "AsyncIterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2451,7 +2428,6 @@ "ctxt": 0 }, "value": "explicitReturnType5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2558,7 +2534,6 @@ "ctxt": 0 }, "value": "AsyncIterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2593,7 +2568,6 @@ "ctxt": 0 }, "value": "explicitReturnType6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2730,7 +2704,6 @@ "ctxt": 0 }, "value": "AsyncIterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2765,7 +2738,6 @@ "ctxt": 0 }, "value": "explicitReturnType7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2842,7 +2814,6 @@ "ctxt": 0 }, "value": "AsyncIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2877,7 +2848,6 @@ "ctxt": 0 }, "value": "explicitReturnType8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2984,7 +2954,6 @@ "ctxt": 0 }, "value": "AsyncIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3019,7 +2988,6 @@ "ctxt": 0 }, "value": "explicitReturnType9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3156,7 +3124,6 @@ "ctxt": 0 }, "value": "AsyncIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3191,7 +3158,6 @@ "ctxt": 0 }, "value": "explicitReturnType10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3263,7 +3229,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3298,7 +3263,6 @@ "ctxt": 0 }, "value": "explicitReturnType11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3370,7 +3334,6 @@ "ctxt": 0 }, "value": "Iterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3405,7 +3368,6 @@ "ctxt": 0 }, "value": "explicitReturnType12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3477,7 +3439,6 @@ "ctxt": 0 }, "value": "Iterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3512,7 +3473,6 @@ "ctxt": 0 }, "value": "yieldStar", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/conditional/conditionalTypes1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/conditional/conditionalTypes1/input.ts.json index 72e535e0439c..0e71d1d0dc7f 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/conditional/conditionalTypes1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/conditional/conditionalTypes1/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "T00", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -41,7 +40,6 @@ "ctxt": 0 }, "value": "Exclude", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -246,7 +244,6 @@ "ctxt": 0 }, "value": "T01", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -265,7 +262,6 @@ "ctxt": 0 }, "value": "Extract", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -470,7 +466,6 @@ "ctxt": 0 }, "value": "T02", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -489,7 +484,6 @@ "ctxt": 0 }, "value": "Exclude", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -578,7 +572,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -603,7 +596,6 @@ "ctxt": 0 }, "value": "T03", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -622,7 +614,6 @@ "ctxt": 0 }, "value": "Extract", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -711,7 +702,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -736,7 +726,6 @@ "ctxt": 0 }, "value": "T04", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -755,7 +744,6 @@ "ctxt": 0 }, "value": "NonNullable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -823,7 +811,6 @@ "ctxt": 0 }, "value": "T05", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -842,7 +829,6 @@ "ctxt": 0 }, "value": "NonNullable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -947,7 +933,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -968,6 +953,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -990,13 +976,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1015,6 +999,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1037,7 +1022,6 @@ "ctxt": 0 }, "value": "NonNullable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1063,7 +1047,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1071,8 +1054,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1113,8 +1095,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1124,7 +1106,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1152,8 +1133,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1163,7 +1144,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1195,7 +1175,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1215,7 +1194,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1236,6 +1214,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1258,13 +1237,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1283,6 +1260,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1305,7 +1283,6 @@ "ctxt": 0 }, "value": "NonNullable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1331,7 +1308,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1339,8 +1315,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1381,8 +1356,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1392,7 +1367,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1420,8 +1394,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1431,7 +1405,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1461,6 +1434,7 @@ "ctxt": 0 }, "value": "s1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1477,8 +1451,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1488,7 +1461,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1520,6 +1492,7 @@ "ctxt": 0 }, "value": "s2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1536,8 +1509,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1547,7 +1519,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1581,7 +1552,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1628,7 +1598,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1649,6 +1618,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1679,7 +1649,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1705,7 +1674,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1736,15 +1704,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -1763,6 +1729,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1785,7 +1752,6 @@ "ctxt": 0 }, "value": "NonNullable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1819,7 +1785,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1845,7 +1810,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1876,7 +1840,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1886,8 +1849,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1928,8 +1890,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1939,7 +1901,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1967,8 +1928,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1978,7 +1939,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2010,7 +1970,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2030,7 +1989,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2051,6 +2009,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2081,7 +2040,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2109,8 +2067,7 @@ } } } - }, - "optional": false + } } }, { @@ -2129,6 +2086,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2151,7 +2109,6 @@ "ctxt": 0 }, "value": "NonNullable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2185,7 +2142,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2216,8 +2172,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2258,8 +2213,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2269,7 +2224,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -2297,8 +2251,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2308,7 +2262,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2338,6 +2291,7 @@ "ctxt": 0 }, "value": "s1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2354,8 +2308,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2365,7 +2318,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2397,6 +2349,7 @@ "ctxt": 0 }, "value": "s2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2413,8 +2366,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2424,7 +2376,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2458,7 +2409,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2485,7 +2435,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2554,7 +2503,6 @@ "ctxt": 0 }, "value": "Options", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2590,7 +2538,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2645,7 +2592,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2697,7 +2643,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2752,7 +2697,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2804,7 +2748,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2859,7 +2802,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2906,7 +2848,6 @@ "ctxt": 0 }, "value": "T10", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2925,7 +2866,6 @@ "ctxt": 0 }, "value": "Exclude", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2951,7 +2891,6 @@ "ctxt": 0 }, "value": "Options", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2980,7 +2919,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3073,7 +3011,6 @@ "ctxt": 0 }, "value": "T11", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3092,7 +3029,6 @@ "ctxt": 0 }, "value": "Extract", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3118,7 +3054,6 @@ "ctxt": 0 }, "value": "Options", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3147,7 +3082,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3240,7 +3174,6 @@ "ctxt": 0 }, "value": "T12", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3259,7 +3192,6 @@ "ctxt": 0 }, "value": "Exclude", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3285,7 +3217,6 @@ "ctxt": 0 }, "value": "Options", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3322,7 +3253,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3387,7 +3317,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3450,7 +3379,6 @@ "ctxt": 0 }, "value": "T13", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3469,7 +3397,6 @@ "ctxt": 0 }, "value": "Extract", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3495,7 +3422,6 @@ "ctxt": 0 }, "value": "Options", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3532,7 +3458,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3597,7 +3522,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3660,7 +3584,6 @@ "ctxt": 0 }, "value": "T14", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3679,7 +3602,6 @@ "ctxt": 0 }, "value": "Exclude", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3705,7 +3627,6 @@ "ctxt": 0 }, "value": "Options", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3734,7 +3655,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3795,7 +3715,6 @@ "ctxt": 0 }, "value": "T15", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3814,7 +3733,6 @@ "ctxt": 0 }, "value": "Extract", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3840,7 +3758,6 @@ "ctxt": 0 }, "value": "Options", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3869,7 +3786,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3924,7 +3840,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3945,6 +3860,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3967,13 +3883,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4009,7 +3923,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4027,7 +3940,6 @@ "ctxt": 0 }, "value": "Options", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4049,7 +3961,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4087,7 +3998,6 @@ "ctxt": 0 }, "value": "Extract", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4113,7 +4023,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4142,7 +4051,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4171,7 +4079,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4211,8 +4118,8 @@ "ctxt": 0 }, "value": "x0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4229,7 +4136,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4273,7 +4179,6 @@ "ctxt": 0 }, "value": "OptionsOfKind", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4299,7 +4204,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4325,7 +4229,6 @@ "ctxt": 0 }, "value": "Options", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4372,7 +4275,6 @@ "ctxt": 0 }, "value": "Extract", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4398,7 +4300,6 @@ "ctxt": 0 }, "value": "Options", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4427,7 +4328,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4456,7 +4356,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4486,7 +4385,6 @@ "ctxt": 0 }, "value": "T16", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -4505,7 +4403,6 @@ "ctxt": 0 }, "value": "OptionsOfKind", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4590,7 +4487,6 @@ "ctxt": 0 }, "value": "Select", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4616,7 +4512,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4637,7 +4532,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4663,7 +4557,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4686,7 +4579,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4712,7 +4604,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4732,7 +4623,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4757,7 +4647,6 @@ "ctxt": 0 }, "value": "Extract", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4783,7 +4672,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4811,7 +4699,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4829,7 +4716,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4853,7 +4739,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4879,7 +4764,6 @@ "ctxt": 0 }, "value": "T17", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -4898,7 +4782,6 @@ "ctxt": 0 }, "value": "Select", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4924,7 +4807,6 @@ "ctxt": 0 }, "value": "Options", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5025,7 +4907,6 @@ "ctxt": 0 }, "value": "TypeName", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5051,7 +4932,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5081,7 +4961,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5139,7 +5018,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5197,7 +5075,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5255,7 +5132,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5313,7 +5189,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5333,7 +5208,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5404,7 +5278,6 @@ "ctxt": 0 }, "value": "T20", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -5423,7 +5296,6 @@ "ctxt": 0 }, "value": "TypeName", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5508,7 +5380,6 @@ "ctxt": 0 }, "value": "T21", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -5527,7 +5398,6 @@ "ctxt": 0 }, "value": "TypeName", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5567,7 +5437,6 @@ "ctxt": 0 }, "value": "T22", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -5586,7 +5455,6 @@ "ctxt": 0 }, "value": "TypeName", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5626,7 +5494,6 @@ "ctxt": 0 }, "value": "T23", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -5645,7 +5512,6 @@ "ctxt": 0 }, "value": "TypeName", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5685,7 +5551,6 @@ "ctxt": 0 }, "value": "KnockoutObservable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5711,7 +5576,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5743,7 +5607,6 @@ "ctxt": 0 }, "value": "object", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5772,7 +5635,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5799,7 +5661,6 @@ "ctxt": 0 }, "value": "KnockoutObservableArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5825,7 +5686,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5857,7 +5717,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5886,7 +5745,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5913,7 +5771,6 @@ "ctxt": 0 }, "value": "KnockedOut", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5939,7 +5796,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5969,7 +5825,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6006,7 +5861,6 @@ "ctxt": 0 }, "value": "KnockoutObservableArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6040,7 +5894,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6073,7 +5926,6 @@ "ctxt": 0 }, "value": "KnockoutObservable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6099,7 +5951,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6125,7 +5976,6 @@ "ctxt": 0 }, "value": "KnockedOutObj", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6151,7 +6001,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6182,7 +6031,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6208,7 +6056,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6233,7 +6080,6 @@ "ctxt": 0 }, "value": "KnockedOut", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6267,7 +6113,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6287,7 +6132,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6313,7 +6157,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6343,7 +6186,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6385,7 +6227,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6427,7 +6268,6 @@ "ctxt": 0 }, "value": "subitems", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6480,7 +6320,6 @@ "ctxt": 0 }, "value": "KOItem", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -6499,7 +6338,6 @@ "ctxt": 0 }, "value": "KnockedOutObj", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6525,7 +6363,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6549,7 +6386,6 @@ "ctxt": 0 }, "value": "Part", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6579,7 +6415,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6621,7 +6456,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6663,7 +6497,6 @@ "ctxt": 0 }, "value": "subparts", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6699,7 +6532,6 @@ "ctxt": 0 }, "value": "Part", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6724,7 +6556,6 @@ "ctxt": 0 }, "value": "updatePart", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6738,6 +6569,7 @@ "ctxt": 0 }, "value": "newName", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6754,8 +6586,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -6796,7 +6627,6 @@ "ctxt": 0 }, "value": "FunctionPropertyNames", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6822,7 +6652,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6861,7 +6690,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6887,7 +6715,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6927,7 +6754,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6947,7 +6773,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6968,7 +6793,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6988,7 +6812,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7027,7 +6850,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7051,7 +6873,6 @@ "ctxt": 0 }, "value": "FunctionProperties", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7077,7 +6898,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7100,7 +6920,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7126,7 +6945,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7146,7 +6964,6 @@ "ctxt": 0 }, "value": "FunctionPropertyNames", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7172,7 +6989,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7200,7 +7016,6 @@ "ctxt": 0 }, "value": "NonFunctionPropertyNames", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7226,7 +7041,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7265,7 +7079,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7291,7 +7104,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7331,7 +7143,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7351,7 +7162,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7372,7 +7182,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7401,7 +7210,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7431,7 +7239,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7455,7 +7262,6 @@ "ctxt": 0 }, "value": "NonFunctionProperties", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7481,7 +7287,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7504,7 +7309,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7530,7 +7334,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7550,7 +7353,6 @@ "ctxt": 0 }, "value": "NonFunctionPropertyNames", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7576,7 +7378,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7604,7 +7405,6 @@ "ctxt": 0 }, "value": "T30", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -7623,7 +7423,6 @@ "ctxt": 0 }, "value": "FunctionProperties", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7649,7 +7448,6 @@ "ctxt": 0 }, "value": "Part", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7674,7 +7472,6 @@ "ctxt": 0 }, "value": "T31", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -7693,7 +7490,6 @@ "ctxt": 0 }, "value": "NonFunctionProperties", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7719,7 +7515,6 @@ "ctxt": 0 }, "value": "Part", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7738,7 +7533,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7759,6 +7553,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7781,13 +7576,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -7806,6 +7599,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7828,7 +7622,6 @@ "ctxt": 0 }, "value": "FunctionProperties", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7854,7 +7647,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7862,8 +7654,7 @@ ] } } - }, - "optional": false + } } }, { @@ -7882,6 +7673,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7904,7 +7696,6 @@ "ctxt": 0 }, "value": "NonFunctionProperties", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7930,7 +7721,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7938,8 +7728,7 @@ ] } } - }, - "optional": false + } } } ], @@ -7980,8 +7769,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -7991,7 +7780,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -8019,8 +7807,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -8030,7 +7818,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -8058,8 +7845,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -8069,7 +7856,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -8097,8 +7883,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -8108,7 +7894,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -8136,8 +7921,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -8147,7 +7932,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -8175,8 +7959,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -8186,7 +7970,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -8218,7 +8001,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8238,7 +8020,6 @@ "ctxt": 0 }, "value": "f8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8259,6 +8040,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8289,14 +8071,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } }, { @@ -8315,6 +8095,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8337,7 +8118,6 @@ "ctxt": 0 }, "value": "FunctionPropertyNames", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8363,7 +8143,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8371,8 +8150,7 @@ ] } } - }, - "optional": false + } } }, { @@ -8391,6 +8169,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8413,7 +8192,6 @@ "ctxt": 0 }, "value": "NonFunctionPropertyNames", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8439,7 +8217,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8447,8 +8224,7 @@ ] } } - }, - "optional": false + } } } ], @@ -8489,8 +8265,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -8500,7 +8276,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -8528,8 +8303,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -8539,7 +8314,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -8567,8 +8341,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -8578,7 +8352,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -8606,8 +8379,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -8617,7 +8390,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -8645,8 +8417,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -8656,7 +8428,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -8684,8 +8455,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -8695,7 +8466,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -8727,7 +8497,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8753,7 +8522,6 @@ "ctxt": 0 }, "value": "DeepReadonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8779,7 +8547,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8809,7 +8576,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8846,7 +8612,6 @@ "ctxt": 0 }, "value": "DeepReadonlyArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8880,7 +8645,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8920,7 +8684,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8949,7 +8712,6 @@ "ctxt": 0 }, "value": "DeepReadonlyObject", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8975,7 +8737,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8998,7 +8759,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9021,7 +8781,6 @@ "ctxt": 0 }, "value": "DeepReadonlyArray", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9048,7 +8807,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9072,7 +8830,6 @@ "ctxt": 0 }, "value": "ReadonlyArray", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -9098,7 +8855,6 @@ "ctxt": 0 }, "value": "DeepReadonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9124,7 +8880,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9162,7 +8917,6 @@ "ctxt": 0 }, "value": "DeepReadonlyObject", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9188,7 +8942,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9219,7 +8972,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9237,7 +8989,6 @@ "ctxt": 0 }, "value": "NonFunctionPropertyNames", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9263,7 +9014,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9290,7 +9040,6 @@ "ctxt": 0 }, "value": "DeepReadonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9324,7 +9073,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9344,7 +9092,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9365,7 +9112,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9386,6 +9132,7 @@ "ctxt": 0 }, "value": "part", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9408,7 +9155,6 @@ "ctxt": 0 }, "value": "DeepReadonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9434,7 +9180,6 @@ "ctxt": 0 }, "value": "Part", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9442,8 +9187,7 @@ ] } } - }, - "optional": false + } } } ], @@ -9486,6 +9230,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9502,8 +9247,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -9520,7 +9264,6 @@ "ctxt": 0 }, "value": "part", - "typeAnnotation": null, "optional": false }, "property": { @@ -9531,7 +9274,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9565,6 +9307,7 @@ "ctxt": 0 }, "value": "id", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9581,8 +9324,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -9613,7 +9355,6 @@ "ctxt": 0 }, "value": "part", - "typeAnnotation": null, "optional": false }, "property": { @@ -9624,7 +9365,6 @@ "ctxt": 0 }, "value": "subparts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9648,7 +9388,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9687,7 +9426,6 @@ "ctxt": 0 }, "value": "part", - "typeAnnotation": null, "optional": false }, "property": { @@ -9698,7 +9436,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9718,7 +9455,6 @@ "ctxt": 0 }, "value": "part", - "typeAnnotation": null, "optional": false }, "property": { @@ -9729,7 +9465,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9773,7 +9508,6 @@ "ctxt": 0 }, "value": "part", - "typeAnnotation": null, "optional": false }, "property": { @@ -9784,7 +9518,6 @@ "ctxt": 0 }, "value": "subparts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9822,7 +9555,6 @@ "ctxt": 0 }, "value": "part", - "typeAnnotation": null, "optional": false }, "property": { @@ -9833,7 +9565,6 @@ "ctxt": 0 }, "value": "subparts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9895,7 +9626,6 @@ "ctxt": 0 }, "value": "part", - "typeAnnotation": null, "optional": false }, "property": { @@ -9906,7 +9636,6 @@ "ctxt": 0 }, "value": "subparts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9930,7 +9659,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9964,7 +9692,6 @@ "ctxt": 0 }, "value": "part", - "typeAnnotation": null, "optional": false }, "property": { @@ -9975,7 +9702,6 @@ "ctxt": 0 }, "value": "subparts", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9999,7 +9725,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10035,7 +9760,6 @@ "ctxt": 0 }, "value": "part", - "typeAnnotation": null, "optional": false }, "property": { @@ -10046,7 +9770,6 @@ "ctxt": 0 }, "value": "updatePart", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10096,7 +9819,6 @@ "ctxt": 0 }, "value": "ZeroOf", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10122,7 +9844,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10188,7 +9909,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10241,7 +9961,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10307,7 +10026,6 @@ "ctxt": 0 }, "value": "zeroOf", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10328,6 +10046,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10350,13 +10069,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -10426,7 +10143,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } }, @@ -10485,7 +10201,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } }, @@ -10545,7 +10260,6 @@ "ctxt": 0 }, "value": "ZeroOf", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10571,7 +10285,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10608,7 +10321,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10664,7 +10376,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10685,6 +10396,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10701,8 +10413,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -10721,6 +10432,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10737,8 +10449,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -10757,6 +10468,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10792,8 +10504,7 @@ } ] } - }, - "optional": false + } } }, { @@ -10812,6 +10523,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10834,13 +10546,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -10880,7 +10590,6 @@ "ctxt": 0 }, "value": "zeroOf", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -10922,7 +10631,6 @@ "ctxt": 0 }, "value": "zeroOf", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -10969,7 +10677,6 @@ "ctxt": 0 }, "value": "zeroOf", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -11011,7 +10718,6 @@ "ctxt": 0 }, "value": "zeroOf", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -11025,7 +10731,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -11055,7 +10760,6 @@ "ctxt": 0 }, "value": "zeroOf", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -11069,7 +10773,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -11099,7 +10802,6 @@ "ctxt": 0 }, "value": "zeroOf", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -11113,7 +10815,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -11143,7 +10844,6 @@ "ctxt": 0 }, "value": "zeroOf", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -11157,7 +10857,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -11192,7 +10891,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -11220,7 +10918,6 @@ "ctxt": 0 }, "value": "f21", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -11241,6 +10938,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11263,13 +10961,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -11288,6 +10984,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11310,7 +11007,6 @@ "ctxt": 0 }, "value": "ZeroOf", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -11336,7 +11032,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11344,8 +11039,7 @@ ] } } - }, - "optional": false + } } } ], @@ -11388,6 +11082,7 @@ "ctxt": 0 }, "value": "z1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11423,8 +11118,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -11434,7 +11128,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -11466,6 +11159,7 @@ "ctxt": 0 }, "value": "z2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11522,8 +11216,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -11533,7 +11226,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -11563,8 +11255,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -11574,7 +11266,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -11602,8 +11293,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -11613,7 +11304,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -11645,7 +11335,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -11698,7 +11387,6 @@ "ctxt": 0 }, "value": "T35", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -11724,7 +11412,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -11751,7 +11438,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -11793,7 +11479,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -11847,7 +11532,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11870,7 +11554,6 @@ "ctxt": 0 }, "value": "T36", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -11896,7 +11579,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -11926,7 +11608,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11955,7 +11636,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -12005,7 +11685,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12034,7 +11713,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -12077,7 +11755,6 @@ "ctxt": 0 }, "value": "T35", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -12103,7 +11780,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12148,7 +11824,6 @@ "ctxt": 0 }, "value": "T37", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -12174,7 +11849,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -12204,7 +11878,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12233,7 +11906,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -12283,7 +11955,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12312,7 +11983,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -12355,7 +12025,6 @@ "ctxt": 0 }, "value": "T35", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -12381,7 +12050,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12426,7 +12094,6 @@ "ctxt": 0 }, "value": "T38", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -12452,7 +12119,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -12498,7 +12164,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12546,7 +12211,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -12615,7 +12279,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12663,7 +12326,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -12709,7 +12371,6 @@ "ctxt": 0 }, "value": "T35", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -12735,7 +12396,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12780,7 +12440,6 @@ "ctxt": 0 }, "value": "Extends", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -12806,7 +12465,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -12827,7 +12485,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -12857,7 +12514,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12877,7 +12533,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12934,7 +12589,6 @@ "ctxt": 0 }, "value": "If", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -12960,7 +12614,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -12989,7 +12642,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -13010,7 +12662,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -13040,7 +12691,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13077,7 +12727,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13097,7 +12746,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13120,7 +12768,6 @@ "ctxt": 0 }, "value": "Not", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13146,7 +12793,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -13177,7 +12823,6 @@ "ctxt": 0 }, "value": "If", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13203,7 +12848,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13262,7 +12906,6 @@ "ctxt": 0 }, "value": "And", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13288,7 +12931,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -13317,7 +12959,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -13348,7 +12989,6 @@ "ctxt": 0 }, "value": "If", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13374,7 +13014,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13394,7 +13033,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13436,7 +13074,6 @@ "ctxt": 0 }, "value": "Or", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13462,7 +13099,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -13491,7 +13127,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -13522,7 +13157,6 @@ "ctxt": 0 }, "value": "If", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13548,7 +13182,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13585,7 +13218,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13610,7 +13242,6 @@ "ctxt": 0 }, "value": "IsString", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13636,7 +13267,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -13659,7 +13289,6 @@ "ctxt": 0 }, "value": "Extends", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13685,7 +13314,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13719,7 +13347,6 @@ "ctxt": 0 }, "value": "Q1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -13738,7 +13365,6 @@ "ctxt": 0 }, "value": "IsString", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13778,7 +13404,6 @@ "ctxt": 0 }, "value": "Q2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -13797,7 +13422,6 @@ "ctxt": 0 }, "value": "IsString", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13850,7 +13474,6 @@ "ctxt": 0 }, "value": "Q3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -13869,7 +13492,6 @@ "ctxt": 0 }, "value": "IsString", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13909,7 +13531,6 @@ "ctxt": 0 }, "value": "Q4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -13928,7 +13549,6 @@ "ctxt": 0 }, "value": "IsString", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13968,7 +13588,6 @@ "ctxt": 0 }, "value": "N1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -13987,7 +13606,6 @@ "ctxt": 0 }, "value": "Not", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14035,7 +13653,6 @@ "ctxt": 0 }, "value": "N2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -14054,7 +13671,6 @@ "ctxt": 0 }, "value": "Not", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14102,7 +13718,6 @@ "ctxt": 0 }, "value": "N3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -14121,7 +13736,6 @@ "ctxt": 0 }, "value": "Not", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14161,7 +13775,6 @@ "ctxt": 0 }, "value": "A1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -14180,7 +13793,6 @@ "ctxt": 0 }, "value": "And", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14245,7 +13857,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -14264,7 +13875,6 @@ "ctxt": 0 }, "value": "And", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14329,7 +13939,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -14348,7 +13957,6 @@ "ctxt": 0 }, "value": "And", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14413,7 +14021,6 @@ "ctxt": 0 }, "value": "A4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -14432,7 +14039,6 @@ "ctxt": 0 }, "value": "And", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14497,7 +14103,6 @@ "ctxt": 0 }, "value": "A5", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -14516,7 +14121,6 @@ "ctxt": 0 }, "value": "And", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14573,7 +14177,6 @@ "ctxt": 0 }, "value": "A6", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -14592,7 +14195,6 @@ "ctxt": 0 }, "value": "And", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14649,7 +14251,6 @@ "ctxt": 0 }, "value": "A7", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -14668,7 +14269,6 @@ "ctxt": 0 }, "value": "And", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14725,7 +14325,6 @@ "ctxt": 0 }, "value": "A8", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -14744,7 +14343,6 @@ "ctxt": 0 }, "value": "And", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14801,7 +14399,6 @@ "ctxt": 0 }, "value": "A9", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -14820,7 +14417,6 @@ "ctxt": 0 }, "value": "And", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14869,7 +14465,6 @@ "ctxt": 0 }, "value": "O1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -14888,7 +14483,6 @@ "ctxt": 0 }, "value": "Or", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14953,7 +14547,6 @@ "ctxt": 0 }, "value": "O2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -14972,7 +14565,6 @@ "ctxt": 0 }, "value": "Or", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -15037,7 +14629,6 @@ "ctxt": 0 }, "value": "O3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -15056,7 +14647,6 @@ "ctxt": 0 }, "value": "Or", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -15121,7 +14711,6 @@ "ctxt": 0 }, "value": "O4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -15140,7 +14729,6 @@ "ctxt": 0 }, "value": "Or", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -15205,7 +14793,6 @@ "ctxt": 0 }, "value": "O5", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -15224,7 +14811,6 @@ "ctxt": 0 }, "value": "Or", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -15281,7 +14867,6 @@ "ctxt": 0 }, "value": "O6", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -15300,7 +14885,6 @@ "ctxt": 0 }, "value": "Or", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -15357,7 +14941,6 @@ "ctxt": 0 }, "value": "O7", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -15376,7 +14959,6 @@ "ctxt": 0 }, "value": "Or", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -15433,7 +15015,6 @@ "ctxt": 0 }, "value": "O8", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -15452,7 +15033,6 @@ "ctxt": 0 }, "value": "Or", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -15509,7 +15089,6 @@ "ctxt": 0 }, "value": "O9", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -15528,7 +15107,6 @@ "ctxt": 0 }, "value": "Or", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -15577,7 +15155,6 @@ "ctxt": 0 }, "value": "T40", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -15658,7 +15235,6 @@ "ctxt": 0 }, "value": "T41", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -15739,7 +15315,6 @@ "ctxt": 0 }, "value": "T42", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -15820,7 +15395,6 @@ "ctxt": 0 }, "value": "IsNever", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -15846,7 +15420,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -15892,7 +15465,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -15980,7 +15552,6 @@ "ctxt": 0 }, "value": "T50", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -15999,7 +15570,6 @@ "ctxt": 0 }, "value": "IsNever", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -16039,7 +15609,6 @@ "ctxt": 0 }, "value": "T51", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -16058,7 +15627,6 @@ "ctxt": 0 }, "value": "IsNever", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -16098,7 +15666,6 @@ "ctxt": 0 }, "value": "T52", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -16117,7 +15684,6 @@ "ctxt": 0 }, "value": "IsNever", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -16151,7 +15717,6 @@ "ctxt": 0 }, "value": "f22", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -16172,6 +15737,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -16201,7 +15767,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -16242,7 +15807,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -16273,7 +15837,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -16289,8 +15852,7 @@ "kind": "never" } } - }, - "optional": false + } } } ], @@ -16333,8 +15895,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -16351,7 +15913,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -16396,7 +15957,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -16416,7 +15976,6 @@ "ctxt": 0 }, "value": "f23", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -16437,6 +15996,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -16466,7 +16026,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -16507,7 +16066,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -16538,7 +16096,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -16554,8 +16111,7 @@ "kind": "never" } } - }, - "optional": false + } } } ], @@ -16598,8 +16154,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -16616,7 +16172,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -16661,7 +16216,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -16703,7 +16257,6 @@ "ctxt": 0 }, "value": "Eq", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -16729,7 +16282,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -16750,7 +16302,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -16780,7 +16331,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -16800,7 +16350,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -16827,7 +16376,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -16847,7 +16395,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -16922,7 +16469,6 @@ "ctxt": 0 }, "value": "T60", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -16941,7 +16487,6 @@ "ctxt": 0 }, "value": "Eq", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -17006,7 +16551,6 @@ "ctxt": 0 }, "value": "T61", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -17025,7 +16569,6 @@ "ctxt": 0 }, "value": "Eq", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -17090,7 +16633,6 @@ "ctxt": 0 }, "value": "T62", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -17109,7 +16651,6 @@ "ctxt": 0 }, "value": "Eq", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -17174,7 +16715,6 @@ "ctxt": 0 }, "value": "T63", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -17193,7 +16733,6 @@ "ctxt": 0 }, "value": "Eq", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -17258,7 +16797,6 @@ "ctxt": 0 }, "value": "Eq1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -17284,7 +16822,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -17305,7 +16842,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -17335,7 +16871,6 @@ "ctxt": 0 }, "value": "Eq", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -17361,7 +16896,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -17381,7 +16915,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -17458,7 +16991,6 @@ "ctxt": 0 }, "value": "T70", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -17477,7 +17009,6 @@ "ctxt": 0 }, "value": "Eq1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -17542,7 +17073,6 @@ "ctxt": 0 }, "value": "T71", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -17561,7 +17091,6 @@ "ctxt": 0 }, "value": "Eq1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -17626,7 +17155,6 @@ "ctxt": 0 }, "value": "T72", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -17645,7 +17173,6 @@ "ctxt": 0 }, "value": "Eq1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -17710,7 +17237,6 @@ "ctxt": 0 }, "value": "T73", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -17729,7 +17255,6 @@ "ctxt": 0 }, "value": "Eq1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -17794,7 +17319,6 @@ "ctxt": 0 }, "value": "Eq2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -17820,7 +17344,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -17841,7 +17364,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -17871,7 +17393,6 @@ "ctxt": 0 }, "value": "Eq", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -17897,7 +17418,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -17917,7 +17437,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -17994,7 +17513,6 @@ "ctxt": 0 }, "value": "T80", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -18013,7 +17531,6 @@ "ctxt": 0 }, "value": "Eq2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -18078,7 +17595,6 @@ "ctxt": 0 }, "value": "T81", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -18097,7 +17613,6 @@ "ctxt": 0 }, "value": "Eq2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -18162,7 +17677,6 @@ "ctxt": 0 }, "value": "T82", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -18181,7 +17695,6 @@ "ctxt": 0 }, "value": "Eq2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -18246,7 +17759,6 @@ "ctxt": 0 }, "value": "T83", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -18265,7 +17777,6 @@ "ctxt": 0 }, "value": "Eq2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -18330,7 +17841,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -18356,7 +17866,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -18386,7 +17895,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -18436,7 +17944,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -18462,7 +17969,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -18492,7 +17998,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -18551,8 +18056,8 @@ "ctxt": 0 }, "value": "convert", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -18570,6 +18075,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -18592,7 +18098,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -18618,7 +18123,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -18626,8 +18130,7 @@ ] } } - }, - "optional": false + } } ], "body": { @@ -18638,7 +18141,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "async": false, @@ -18666,7 +18168,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -18696,7 +18197,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -18722,7 +18222,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -18752,7 +18251,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -18778,7 +18276,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -18801,7 +18298,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -18827,7 +18323,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -18861,8 +18356,8 @@ "ctxt": 0 }, "value": "convert2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -18880,6 +18375,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -18902,7 +18398,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -18928,7 +18423,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -18936,8 +18430,7 @@ ] } } - }, - "optional": false + } } ], "body": { @@ -18948,7 +18441,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "async": false, @@ -18976,7 +18468,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -19006,7 +18497,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -19032,7 +18522,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -19056,7 +18545,6 @@ "ctxt": 0 }, "value": "f31", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -19091,7 +18579,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -19117,7 +18604,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -19167,7 +18653,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -19193,7 +18678,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -19252,6 +18736,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -19274,13 +18759,11 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -19312,6 +18795,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -19334,13 +18818,11 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -19374,7 +18856,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -19394,7 +18875,6 @@ "ctxt": 0 }, "value": "f32", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -19429,7 +18909,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -19463,7 +18942,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -19483,7 +18961,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -19535,7 +19012,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -19554,7 +19030,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -19588,7 +19063,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -19608,7 +19082,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -19644,6 +19117,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -19666,13 +19140,11 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -19704,6 +19176,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -19726,13 +19199,11 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -19766,7 +19237,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -19787,7 +19257,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -19807,7 +19276,6 @@ "ctxt": 0 }, "value": "f33", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -19842,7 +19310,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -19861,7 +19328,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -19895,7 +19361,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -19915,7 +19380,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -19942,7 +19406,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -19961,7 +19424,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -19995,7 +19457,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -20015,7 +19476,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -20051,6 +19511,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -20073,13 +19534,11 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -20111,6 +19570,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -20133,13 +19593,11 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -20173,7 +19631,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -20194,7 +19651,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -20220,7 +19676,6 @@ "ctxt": 0 }, "value": "T90", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -20246,7 +19701,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -20276,7 +19730,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -20368,7 +19821,6 @@ "ctxt": 0 }, "value": "T91", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -20394,7 +19846,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -20424,7 +19875,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -20525,8 +19975,8 @@ "ctxt": 0 }, "value": "f40", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -20544,6 +19994,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -20566,7 +20017,6 @@ "ctxt": 0 }, "value": "T90", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -20592,7 +20042,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -20600,8 +20049,7 @@ ] } } - }, - "optional": false + } } ], "body": { @@ -20612,7 +20060,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -20640,7 +20087,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -20670,7 +20116,6 @@ "ctxt": 0 }, "value": "T91", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -20696,7 +20141,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -20735,8 +20179,8 @@ "ctxt": 0 }, "value": "f41", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -20754,6 +20198,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -20776,7 +20221,6 @@ "ctxt": 0 }, "value": "T91", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -20802,7 +20246,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -20810,8 +20253,7 @@ ] } } - }, - "optional": false + } } ], "body": { @@ -20822,7 +20264,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -20850,7 +20291,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -20880,7 +20320,6 @@ "ctxt": 0 }, "value": "T90", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -20906,7 +20345,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -20936,7 +20374,6 @@ "ctxt": 0 }, "value": "T92", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -20962,7 +20399,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -20992,7 +20428,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -21120,7 +20555,6 @@ "ctxt": 0 }, "value": "T93", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -21146,7 +20580,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -21176,7 +20609,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -21313,8 +20745,8 @@ "ctxt": 0 }, "value": "f42", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -21332,6 +20764,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -21354,7 +20787,6 @@ "ctxt": 0 }, "value": "T92", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -21380,7 +20812,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -21388,8 +20819,7 @@ ] } } - }, - "optional": false + } } ], "body": { @@ -21400,7 +20830,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -21428,7 +20857,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -21458,7 +20886,6 @@ "ctxt": 0 }, "value": "T93", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -21484,7 +20911,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -21523,8 +20949,8 @@ "ctxt": 0 }, "value": "f43", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -21542,6 +20968,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -21564,7 +20991,6 @@ "ctxt": 0 }, "value": "T93", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -21590,7 +21016,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -21598,8 +21023,7 @@ ] } } - }, - "optional": false + } } ], "body": { @@ -21610,7 +21034,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -21638,7 +21061,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -21668,7 +21090,6 @@ "ctxt": 0 }, "value": "T92", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -21694,7 +21115,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -21724,7 +21144,6 @@ "ctxt": 0 }, "value": "T94", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -21750,7 +21169,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -21780,7 +21198,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -21846,7 +21263,6 @@ "ctxt": 0 }, "value": "T95", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -21872,7 +21288,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -21902,7 +21317,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -21961,8 +21375,8 @@ "ctxt": 0 }, "value": "f44", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -21980,6 +21394,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -22002,7 +21417,6 @@ "ctxt": 0 }, "value": "T94", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -22028,7 +21442,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -22036,8 +21449,7 @@ ] } } - }, - "optional": false + } } ], "body": { @@ -22048,7 +21460,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "async": false, @@ -22076,7 +21487,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -22106,7 +21516,6 @@ "ctxt": 0 }, "value": "T95", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -22132,7 +21541,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -22171,8 +21579,8 @@ "ctxt": 0 }, "value": "f45", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -22190,6 +21598,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -22212,7 +21621,6 @@ "ctxt": 0 }, "value": "T95", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -22238,7 +21646,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -22246,8 +21653,7 @@ ] } } - }, - "optional": false + } } ], "body": { @@ -22258,7 +21664,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "async": false, @@ -22286,7 +21691,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -22316,7 +21720,6 @@ "ctxt": 0 }, "value": "T94", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -22342,7 +21745,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -22366,7 +21768,6 @@ "ctxt": 0 }, "value": "f50", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -22401,7 +21802,6 @@ "ctxt": 0 }, "value": "Eq", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -22427,7 +21827,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -22448,7 +21847,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -22478,7 +21876,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -22498,7 +21895,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -22525,7 +21921,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -22545,7 +21940,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -22620,7 +22014,6 @@ "ctxt": 0 }, "value": "If", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -22646,7 +22039,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -22667,7 +22059,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -22688,7 +22079,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -22718,7 +22108,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -22755,7 +22144,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -22775,7 +22163,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -22798,7 +22185,6 @@ "ctxt": 0 }, "value": "Omit", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -22824,7 +22210,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -22871,7 +22256,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -22897,7 +22281,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -22922,7 +22305,6 @@ "ctxt": 0 }, "value": "If", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -22948,7 +22330,6 @@ "ctxt": 0 }, "value": "Eq", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -22982,7 +22363,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -23002,7 +22382,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -23044,7 +22423,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -23076,7 +22454,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -23100,7 +22477,6 @@ "ctxt": 0 }, "value": "Omit2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -23126,7 +22502,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -23155,7 +22530,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -23202,7 +22576,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -23228,7 +22601,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -23253,7 +22625,6 @@ "ctxt": 0 }, "value": "If", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -23279,7 +22650,6 @@ "ctxt": 0 }, "value": "Eq", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -23313,7 +22683,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -23333,7 +22702,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -23354,7 +22722,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -23386,7 +22753,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -23418,7 +22784,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -23442,7 +22807,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -23461,7 +22825,6 @@ "ctxt": 0 }, "value": "Omit", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -23496,7 +22859,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -23538,7 +22900,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -23586,7 +22947,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -23605,7 +22965,6 @@ "ctxt": 0 }, "value": "Omit2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -23640,7 +22999,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -23682,7 +23040,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -23737,7 +23094,6 @@ "ctxt": 0 }, "value": "OldDiff", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -23763,7 +23119,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -23801,7 +23156,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -23872,7 +23226,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -23890,7 +23243,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -23914,7 +23266,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -23943,7 +23294,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -23961,7 +23311,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -23999,6 +23348,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -24015,8 +23365,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -24063,7 +23412,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24086,7 +23434,6 @@ "ctxt": 0 }, "value": "NewDiff", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -24112,7 +23459,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -24133,7 +23479,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -24163,7 +23508,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24183,7 +23527,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24212,7 +23555,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24234,7 +23576,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -24264,7 +23605,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -24321,7 +23661,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -24342,7 +23681,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -24372,7 +23710,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -24427,7 +23764,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -24456,7 +23792,6 @@ "ctxt": 0 }, "value": "OldDiff", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -24507,7 +23842,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24537,7 +23871,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -24558,7 +23891,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -24588,7 +23920,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -24643,7 +23974,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -24672,7 +24002,6 @@ "ctxt": 0 }, "value": "NewDiff", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -24723,7 +24052,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24754,7 +24082,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -24781,7 +24108,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24826,7 +24152,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -24853,7 +24178,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24898,7 +24222,6 @@ "ctxt": 0 }, "value": "NonFooKeys1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -24924,7 +24247,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -24955,7 +24277,6 @@ "ctxt": 0 }, "value": "OldDiff", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -24989,7 +24310,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -25037,7 +24357,6 @@ "ctxt": 0 }, "value": "NonFooKeys2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -25063,7 +24382,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -25094,7 +24412,6 @@ "ctxt": 0 }, "value": "Exclude", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -25128,7 +24445,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -25176,7 +24492,6 @@ "ctxt": 0 }, "value": "Test1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -25195,7 +24510,6 @@ "ctxt": 0 }, "value": "NonFooKeys1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -25230,7 +24544,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -25280,7 +24593,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -25330,7 +24642,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -25386,7 +24697,6 @@ "ctxt": 0 }, "value": "Test2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -25405,7 +24715,6 @@ "ctxt": 0 }, "value": "NonFooKeys2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -25440,7 +24749,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -25490,7 +24798,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -25540,7 +24847,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -25595,7 +24901,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -25625,7 +24930,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -25669,7 +24973,6 @@ "ctxt": 0 }, "value": "Bar2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -25699,7 +25002,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -25744,7 +25046,6 @@ "ctxt": 0 }, "value": "FooBar", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -25771,7 +25072,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -25791,7 +25091,6 @@ "ctxt": 0 }, "value": "Bar2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -25814,7 +25113,6 @@ "ctxt": 0 }, "value": "ExtractFooBar", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -25841,7 +25139,6 @@ "ctxt": 0 }, "value": "FB", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -25859,7 +25156,6 @@ "ctxt": 0 }, "value": "FooBar", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -25895,7 +25191,6 @@ "ctxt": 0 }, "value": "Extracted", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -25921,7 +25216,6 @@ "ctxt": 0 }, "value": "Struct", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -25952,7 +25246,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -25978,7 +25271,6 @@ "ctxt": 0 }, "value": "Struct", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26018,7 +25310,6 @@ "ctxt": 0 }, "value": "Struct", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26038,7 +25329,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26059,7 +25349,6 @@ "ctxt": 0 }, "value": "FooBar", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26079,7 +25368,6 @@ "ctxt": 0 }, "value": "ExtractFooBar", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -26113,7 +25401,6 @@ "ctxt": 0 }, "value": "Struct", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26133,7 +25420,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26165,7 +25451,6 @@ "ctxt": 0 }, "value": "Struct", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26185,7 +25470,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26210,7 +25494,6 @@ "ctxt": 0 }, "value": "RecursivePartial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -26236,7 +25519,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -26267,7 +25549,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -26293,7 +25574,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26333,7 +25613,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26353,7 +25632,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26374,7 +25652,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -26416,6 +25693,7 @@ "ctxt": 0 }, "value": "index", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -26432,8 +25710,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -26458,7 +25735,6 @@ "ctxt": 0 }, "value": "RecursivePartial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -26500,7 +25776,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26520,7 +25795,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26587,7 +25861,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26607,7 +25880,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26637,7 +25909,6 @@ "ctxt": 0 }, "value": "RecursivePartial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -26671,7 +25942,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26691,7 +25961,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26723,7 +25992,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26743,7 +26011,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26763,7 +26030,6 @@ "ctxt": 0 }, "value": "assign", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -26784,6 +26050,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -26806,13 +26073,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -26831,6 +26096,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -26853,7 +26119,6 @@ "ctxt": 0 }, "value": "RecursivePartial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -26879,7 +26144,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26887,8 +26151,7 @@ ] } } - }, - "optional": false + } } } ], @@ -26924,7 +26187,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -26975,8 +26237,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -26996,7 +26258,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "value": { @@ -27019,7 +26280,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -27042,7 +26302,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -27073,7 +26332,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -27096,7 +26354,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -27148,7 +26405,6 @@ "ctxt": 0 }, "value": "assign", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -27162,7 +26418,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -27186,7 +26441,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "value": { @@ -27209,7 +26463,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -27249,7 +26502,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -27272,7 +26524,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -27319,7 +26570,6 @@ "ctxt": 0 }, "value": "Weird1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -27353,6 +26603,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -27375,13 +26626,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -27407,7 +26656,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -27465,6 +26713,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -27487,13 +26736,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -27519,7 +26766,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -27598,7 +26844,6 @@ "ctxt": 0 }, "value": "Weird2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -27632,6 +26877,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -27654,13 +26900,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -27686,7 +26930,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -27724,7 +26967,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -27755,6 +26997,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -27777,13 +27020,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -27809,7 +27050,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -27862,7 +27102,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -27887,7 +27126,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/conditional/conditionalTypes2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/conditional/conditionalTypes2/input.ts.json index 68fa882f2a32..286580bc4bd3 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/conditional/conditionalTypes2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/conditional/conditionalTypes2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Covariant", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -117,7 +114,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -182,7 +177,6 @@ "ctxt": 0 }, "value": "Contravariant", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -209,7 +203,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -242,7 +235,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -278,7 +270,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -315,7 +306,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -352,7 +342,6 @@ "ctxt": 0 }, "value": "Invariant", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -379,7 +368,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -412,7 +400,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -448,7 +435,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -485,7 +471,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -506,7 +491,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -528,7 +512,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -549,6 +532,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -571,7 +555,6 @@ "ctxt": 0 }, "value": "Covariant", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -597,7 +580,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -605,8 +587,7 @@ ] } } - }, - "optional": false + } } }, { @@ -625,6 +606,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -647,7 +629,6 @@ "ctxt": 0 }, "value": "Covariant", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -673,7 +654,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -681,8 +661,7 @@ ] } } - }, - "optional": false + } } } ], @@ -723,8 +702,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -734,7 +713,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -762,8 +740,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -773,7 +751,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -805,7 +782,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -826,7 +802,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -844,7 +819,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -865,7 +839,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -886,6 +859,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -908,7 +882,6 @@ "ctxt": 0 }, "value": "Contravariant", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -934,7 +907,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -942,8 +914,7 @@ ] } } - }, - "optional": false + } } }, { @@ -962,6 +933,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -984,7 +956,6 @@ "ctxt": 0 }, "value": "Contravariant", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1010,7 +981,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1018,8 +988,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1060,8 +1029,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1071,7 +1040,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1099,8 +1067,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1110,7 +1078,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1142,7 +1109,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1163,7 +1129,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1181,7 +1146,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1202,7 +1166,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1223,6 +1186,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1245,7 +1209,6 @@ "ctxt": 0 }, "value": "Invariant", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1271,7 +1234,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1279,8 +1241,7 @@ ] } } - }, - "optional": false + } } }, { @@ -1299,6 +1260,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1321,7 +1283,6 @@ "ctxt": 0 }, "value": "Invariant", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1347,7 +1308,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1355,8 +1315,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1397,8 +1356,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1408,7 +1367,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1436,8 +1394,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1447,7 +1405,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1479,7 +1436,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1500,7 +1456,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1518,7 +1473,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1539,7 +1493,6 @@ "ctxt": 0 }, "value": "isFunction", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1560,6 +1513,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1582,13 +1536,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1637,7 +1589,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } }, @@ -1684,7 +1635,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1715,7 +1665,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1740,7 +1689,6 @@ "ctxt": 0 }, "value": "Extract", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1766,7 +1714,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1786,7 +1733,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1808,7 +1754,6 @@ "ctxt": 0 }, "value": "getFunction", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1829,6 +1774,7 @@ "ctxt": 0 }, "value": "item", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1851,13 +1797,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1897,7 +1841,6 @@ "ctxt": 0 }, "value": "isFunction", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1911,7 +1854,6 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, "optional": false } } @@ -1941,7 +1883,6 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, "optional": false } } @@ -1971,7 +1912,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2005,7 +1945,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2025,7 +1964,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2046,6 +1984,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2068,13 +2007,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2114,7 +2051,6 @@ "ctxt": 0 }, "value": "isFunction", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2128,7 +2064,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2168,6 +2103,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2190,13 +2126,11 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2206,7 +2140,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2238,6 +2171,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2260,13 +2194,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2276,7 +2208,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2314,7 +2245,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2334,7 +2264,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2355,6 +2284,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2425,8 +2355,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2466,7 +2395,6 @@ "ctxt": 0 }, "value": "isFunction", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2480,7 +2408,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2517,7 +2444,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2545,7 +2471,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2566,6 +2491,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2636,8 +2562,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2680,8 +2605,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2698,7 +2623,6 @@ "ctxt": 0 }, "value": "getFunction", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2712,7 +2636,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2745,7 +2668,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2775,7 +2697,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2803,7 +2724,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2848,7 +2768,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2876,7 +2795,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2915,7 +2833,6 @@ "ctxt": 0 }, "value": "fooBar", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2936,6 +2853,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2967,7 +2885,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3009,7 +2926,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3037,8 +2953,7 @@ } ] } - }, - "optional": false + } } } ], @@ -3080,7 +2995,6 @@ "ctxt": 0 }, "value": "fooBat", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3101,6 +3015,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3132,7 +3047,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3174,7 +3088,6 @@ "ctxt": 0 }, "value": "bat", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3202,8 +3115,7 @@ } ] } - }, - "optional": false + } } } ], @@ -3251,7 +3163,6 @@ "ctxt": 0 }, "value": "Extract2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3277,7 +3188,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3298,7 +3208,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3319,7 +3228,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3349,7 +3257,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3369,7 +3276,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3396,7 +3302,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3416,7 +3321,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3436,7 +3340,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3472,7 +3375,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3493,6 +3395,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3515,7 +3418,6 @@ "ctxt": 0 }, "value": "Extract", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3541,7 +3443,6 @@ "ctxt": 0 }, "value": "Extract", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3567,7 +3468,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3587,7 +3487,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3610,7 +3509,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3618,8 +3516,7 @@ ] } } - }, - "optional": false + } } }, { @@ -3638,6 +3535,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3660,7 +3558,6 @@ "ctxt": 0 }, "value": "Extract", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3686,7 +3583,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3714,7 +3610,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3734,7 +3629,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3744,8 +3638,7 @@ ] } } - }, - "optional": false + } } }, { @@ -3764,6 +3657,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3786,7 +3680,6 @@ "ctxt": 0 }, "value": "Extract2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3812,7 +3705,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3832,7 +3724,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3852,7 +3743,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3860,8 +3750,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3901,7 +3790,6 @@ "ctxt": 0 }, "value": "fooBar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3915,7 +3803,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3945,7 +3832,6 @@ "ctxt": 0 }, "value": "fooBar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3959,7 +3845,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -3989,7 +3874,6 @@ "ctxt": 0 }, "value": "fooBar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4003,7 +3887,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -4038,7 +3921,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4058,7 +3940,6 @@ "ctxt": 0 }, "value": "f21", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4079,6 +3960,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4101,7 +3983,6 @@ "ctxt": 0 }, "value": "Extract", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4127,7 +4008,6 @@ "ctxt": 0 }, "value": "Extract", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4153,7 +4033,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4173,7 +4052,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4196,7 +4074,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4204,8 +4081,7 @@ ] } } - }, - "optional": false + } } }, { @@ -4224,6 +4100,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4246,7 +4123,6 @@ "ctxt": 0 }, "value": "Extract", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4272,7 +4148,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4300,7 +4175,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4320,7 +4194,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4330,8 +4203,7 @@ ] } } - }, - "optional": false + } } }, { @@ -4350,6 +4222,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4372,7 +4245,6 @@ "ctxt": 0 }, "value": "Extract2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4398,7 +4270,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4418,7 +4289,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4438,7 +4308,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4446,8 +4315,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4487,7 +4355,6 @@ "ctxt": 0 }, "value": "fooBat", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4501,7 +4368,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4531,7 +4397,6 @@ "ctxt": 0 }, "value": "fooBat", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4545,7 +4410,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -4575,7 +4439,6 @@ "ctxt": 0 }, "value": "fooBat", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4589,7 +4452,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -4624,7 +4486,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4644,7 +4505,6 @@ "ctxt": 0 }, "value": "Opt", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4670,7 +4530,6 @@ "ctxt": 0 }, "value": "toVector", - "typeAnnotation": null, "optional": false }, "function": { @@ -4711,7 +4570,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -4752,7 +4610,6 @@ "ctxt": 0 }, "value": "Vector", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4778,7 +4635,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4820,7 +4676,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4846,7 +4701,6 @@ "ctxt": 0 }, "value": "Seq", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4873,7 +4727,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4906,7 +4759,6 @@ "ctxt": 0 }, "value": "tail", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4934,7 +4786,6 @@ "ctxt": 0 }, "value": "Opt", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4960,7 +4811,6 @@ "ctxt": 0 }, "value": "Seq", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4986,7 +4836,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5013,7 +4862,6 @@ "ctxt": 0 }, "value": "Vector", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5039,7 +4887,6 @@ "ctxt": 0 }, "value": "tail", - "typeAnnotation": null, "optional": false }, "function": { @@ -5080,7 +4927,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -5121,7 +4967,6 @@ "ctxt": 0 }, "value": "Opt", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5147,7 +4992,6 @@ "ctxt": 0 }, "value": "Vector", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5173,7 +5017,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5207,7 +5050,6 @@ "ctxt": 0 }, "value": "partition2", - "typeAnnotation": null, "optional": false }, "function": { @@ -5228,6 +5070,7 @@ "ctxt": 0 }, "value": "predicate", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5251,6 +5094,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5273,13 +5117,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5306,7 +5148,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -5331,7 +5172,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5340,8 +5180,7 @@ } } } - }, - "optional": false + } } } ], @@ -5377,7 +5216,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5395,7 +5233,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5442,7 +5279,6 @@ "ctxt": 0 }, "value": "Vector", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5468,7 +5304,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5500,7 +5335,6 @@ "ctxt": 0 }, "value": "Vector", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5526,7 +5360,6 @@ "ctxt": 0 }, "value": "Exclude", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5552,7 +5385,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5572,7 +5404,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5609,7 +5440,6 @@ "ctxt": 0 }, "value": "partition2", - "typeAnnotation": null, "optional": false }, "function": { @@ -5630,6 +5460,7 @@ "ctxt": 0 }, "value": "predicate", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5653,6 +5484,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5675,13 +5507,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5703,8 +5533,7 @@ } } } - }, - "optional": false + } } } ], @@ -5756,7 +5585,6 @@ "ctxt": 0 }, "value": "Vector", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5782,7 +5610,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5814,7 +5641,6 @@ "ctxt": 0 }, "value": "Vector", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5840,7 +5666,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5874,7 +5699,6 @@ "ctxt": 0 }, "value": "partition2", - "typeAnnotation": null, "optional": false }, "function": { @@ -5895,6 +5719,7 @@ "ctxt": 0 }, "value": "predicate", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5918,6 +5743,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5940,13 +5766,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5968,8 +5792,7 @@ } } } - }, - "optional": false + } } } ], @@ -6009,7 +5832,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -6050,7 +5872,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6068,7 +5889,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6115,7 +5935,6 @@ "ctxt": 0 }, "value": "Vector", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6141,7 +5960,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6173,7 +5991,6 @@ "ctxt": 0 }, "value": "Vector", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6233,7 +6050,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6258,7 +6074,6 @@ "ctxt": 0 }, "value": "Seq", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -6284,7 +6099,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6309,7 +6123,6 @@ "ctxt": 0 }, "value": "A1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6336,7 +6149,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6369,7 +6181,6 @@ "ctxt": 0 }, "value": "bat", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6398,7 +6209,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6424,7 +6234,6 @@ "ctxt": 0 }, "value": "A1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6450,7 +6259,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6482,7 +6290,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6509,7 +6316,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6533,7 +6339,6 @@ "ctxt": 0 }, "value": "A1", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -6559,7 +6364,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6592,7 +6396,6 @@ "ctxt": 0 }, "value": "bat", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6621,7 +6424,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6647,7 +6449,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6673,7 +6474,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6703,7 +6503,6 @@ "ctxt": 0 }, "value": "boom", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6739,7 +6538,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6804,7 +6602,6 @@ "ctxt": 0 }, "value": "toString1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -6825,6 +6622,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6864,15 +6662,13 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -6914,7 +6710,6 @@ "ctxt": 0 }, "value": "toString2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -6935,6 +6730,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6957,13 +6753,11 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -7005,7 +6799,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7026,6 +6819,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7048,13 +6842,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -7094,7 +6886,6 @@ "ctxt": 0 }, "value": "isFunction", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7108,7 +6899,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -7145,7 +6935,6 @@ "ctxt": 0 }, "value": "toString1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7159,7 +6948,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -7189,7 +6977,6 @@ "ctxt": 0 }, "value": "toString2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7203,7 +6990,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -7242,7 +7028,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7268,7 +7053,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7294,7 +7078,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7315,7 +7098,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7336,7 +7118,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7366,7 +7147,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7403,7 +7183,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7437,7 +7216,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7463,7 +7241,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7503,7 +7280,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7523,7 +7299,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7544,7 +7319,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7564,7 +7338,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7584,7 +7357,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7614,7 +7386,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7640,7 +7411,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7674,7 +7444,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7694,7 +7463,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7715,7 +7483,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7735,7 +7502,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7766,7 +7532,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7786,7 +7551,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7806,7 +7570,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7839,7 +7602,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7865,7 +7627,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7886,7 +7647,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7916,7 +7676,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7953,7 +7712,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7987,7 +7745,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8013,7 +7770,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8053,7 +7809,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8073,7 +7828,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8094,7 +7848,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8114,7 +7867,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8134,7 +7886,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8164,7 +7915,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8190,7 +7940,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8224,7 +7973,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8244,7 +7992,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8265,7 +8012,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8296,7 +8042,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8316,7 +8061,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8336,7 +8080,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8369,7 +8112,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8395,7 +8137,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8416,7 +8157,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8437,7 +8177,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8468,7 +8207,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8502,7 +8240,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8528,7 +8265,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8568,7 +8304,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8588,7 +8323,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8609,7 +8343,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8629,7 +8362,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8649,7 +8381,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8679,7 +8410,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8705,7 +8435,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8739,7 +8468,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8759,7 +8487,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8780,7 +8507,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8800,7 +8526,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8826,7 +8551,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8852,7 +8576,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8873,7 +8596,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8894,7 +8616,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8924,7 +8645,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8960,7 +8680,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8997,7 +8716,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9025,7 +8743,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9051,7 +8768,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9076,7 +8792,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9110,7 +8825,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9130,7 +8844,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9151,7 +8864,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9171,7 +8883,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9196,7 +8907,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9219,7 +8929,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9245,7 +8954,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9266,7 +8974,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9296,7 +9003,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9332,7 +9038,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9369,7 +9074,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9397,7 +9101,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9423,7 +9126,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9448,7 +9150,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9482,7 +9183,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9502,7 +9202,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9523,7 +9222,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9548,7 +9246,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9571,7 +9268,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9597,7 +9293,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9618,7 +9313,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9639,7 +9333,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9669,7 +9362,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9706,7 +9398,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9732,7 +9423,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9757,7 +9447,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9791,7 +9480,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9811,7 +9499,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9832,7 +9519,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9852,7 +9538,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9876,7 +9561,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9899,7 +9583,6 @@ "ctxt": 0 }, "value": "MaybeTrue", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9925,7 +9608,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9952,7 +9634,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -10031,7 +9712,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10121,7 +9801,6 @@ "ctxt": 0 }, "value": "T0", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -10140,7 +9819,6 @@ "ctxt": 0 }, "value": "MaybeTrue", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10175,7 +9853,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -10223,7 +9900,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -10242,7 +9918,6 @@ "ctxt": 0 }, "value": "MaybeTrue", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10277,7 +9952,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -10333,7 +10007,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -10352,7 +10025,6 @@ "ctxt": 0 }, "value": "MaybeTrue", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10387,7 +10059,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -10443,7 +10114,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -10462,7 +10132,6 @@ "ctxt": 0 }, "value": "MaybeTrue", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10497,7 +10166,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -10545,7 +10213,6 @@ "ctxt": 0 }, "value": "Union", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -10620,7 +10287,6 @@ "ctxt": 0 }, "value": "Product", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10646,7 +10312,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10664,7 +10329,6 @@ "ctxt": 0 }, "value": "Union", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10686,7 +10350,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10718,7 +10381,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -10747,7 +10409,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10771,7 +10432,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -10800,7 +10460,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10827,7 +10486,6 @@ "ctxt": 0 }, "value": "ProductUnion", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -10854,7 +10512,6 @@ "ctxt": 0 }, "value": "Product", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10922,7 +10579,6 @@ "ctxt": 0 }, "value": "Product", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10994,7 +10650,6 @@ "ctxt": 0 }, "value": "UnionComplement", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -11021,7 +10676,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -11039,7 +10693,6 @@ "ctxt": 0 }, "value": "Union", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11063,7 +10716,6 @@ "ctxt": 0 }, "value": "Exclude", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -11089,7 +10741,6 @@ "ctxt": 0 }, "value": "Union", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11109,7 +10760,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11135,7 +10785,6 @@ "ctxt": 0 }, "value": "UCA", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -11162,7 +10811,6 @@ "ctxt": 0 }, "value": "UnionComplement", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11207,7 +10855,6 @@ "ctxt": 0 }, "value": "UCB", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -11234,7 +10881,6 @@ "ctxt": 0 }, "value": "UnionComplement", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11279,7 +10925,6 @@ "ctxt": 0 }, "value": "UnionComplementComplement", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -11306,7 +10951,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -11324,7 +10968,6 @@ "ctxt": 0 }, "value": "Union", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11348,7 +10991,6 @@ "ctxt": 0 }, "value": "Exclude", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -11374,7 +11016,6 @@ "ctxt": 0 }, "value": "Union", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11394,7 +11035,6 @@ "ctxt": 0 }, "value": "Exclude", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -11420,7 +11060,6 @@ "ctxt": 0 }, "value": "Union", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11440,7 +11079,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11469,7 +11107,6 @@ "ctxt": 0 }, "value": "UCCA", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -11496,7 +11133,6 @@ "ctxt": 0 }, "value": "UnionComplementComplement", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11541,7 +11177,6 @@ "ctxt": 0 }, "value": "UCCB", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -11568,7 +11203,6 @@ "ctxt": 0 }, "value": "UnionComplementComplement", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11613,7 +11247,6 @@ "ctxt": 0 }, "value": "ProductComplement", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -11640,7 +11273,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -11658,7 +11290,6 @@ "ctxt": 0 }, "value": "Union", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11682,7 +11313,6 @@ "ctxt": 0 }, "value": "Exclude", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -11708,7 +11338,6 @@ "ctxt": 0 }, "value": "ProductUnion", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11737,7 +11366,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -11766,7 +11394,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11797,7 +11424,6 @@ "ctxt": 0 }, "value": "PCA", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -11824,7 +11450,6 @@ "ctxt": 0 }, "value": "ProductComplement", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11869,7 +11494,6 @@ "ctxt": 0 }, "value": "PCB", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -11896,7 +11520,6 @@ "ctxt": 0 }, "value": "ProductComplement", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11941,7 +11564,6 @@ "ctxt": 0 }, "value": "ProductComplementComplement", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -11968,7 +11590,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -11986,7 +11607,6 @@ "ctxt": 0 }, "value": "Union", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12010,7 +11630,6 @@ "ctxt": 0 }, "value": "Exclude", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -12036,7 +11655,6 @@ "ctxt": 0 }, "value": "ProductUnion", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12056,7 +11674,6 @@ "ctxt": 0 }, "value": "Exclude", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -12082,7 +11699,6 @@ "ctxt": 0 }, "value": "ProductUnion", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12111,7 +11727,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -12140,7 +11755,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12174,7 +11788,6 @@ "ctxt": 0 }, "value": "PCCA", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -12201,7 +11814,6 @@ "ctxt": 0 }, "value": "ProductComplementComplement", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12246,7 +11858,6 @@ "ctxt": 0 }, "value": "PCCB", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -12273,7 +11884,6 @@ "ctxt": 0 }, "value": "ProductComplementComplement", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12318,7 +11928,6 @@ "ctxt": 0 }, "value": "Hmm", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -12344,7 +11953,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -12365,7 +11973,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -12383,7 +11990,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12414,7 +12020,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12434,7 +12039,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12462,7 +12066,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -12488,7 +12091,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12535,7 +12137,6 @@ "ctxt": 0 }, "value": "What", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -12554,7 +12155,6 @@ "ctxt": 0 }, "value": "Hmm", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -12598,7 +12198,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -12655,6 +12254,7 @@ "ctxt": 0 }, "value": "w", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12677,13 +12277,11 @@ "ctxt": 0 }, "value": "What", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -12703,7 +12301,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -12732,7 +12329,6 @@ "ctxt": 0 }, "value": "save", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -12753,6 +12349,7 @@ "ctxt": 0 }, "value": "_response", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12775,7 +12372,6 @@ "ctxt": 0 }, "value": "IRootResponse", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -12798,8 +12394,7 @@ ] } } - }, - "optional": false + } } } ], @@ -12853,7 +12448,6 @@ "ctxt": 0 }, "value": "exportCommand", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -12867,7 +12461,6 @@ "ctxt": 0 }, "value": "save", - "typeAnnotation": null, "optional": false } } @@ -12885,7 +12478,6 @@ "ctxt": 0 }, "value": "exportCommand", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -12906,6 +12498,7 @@ "ctxt": 0 }, "value": "functionToCall", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12928,7 +12521,6 @@ "ctxt": 0 }, "value": "IExportCallback", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -12954,7 +12546,6 @@ "ctxt": 0 }, "value": "TResponse", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12962,8 +12553,7 @@ ] } } - }, - "optional": false + } } } ], @@ -12999,7 +12589,6 @@ "ctxt": 0 }, "value": "TResponse", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -13040,7 +12629,6 @@ "ctxt": 0 }, "value": "IExportCallback", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -13067,7 +12655,6 @@ "ctxt": 0 }, "value": "TResponse", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -13100,6 +12687,7 @@ "ctxt": 0 }, "value": "response", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13122,7 +12710,6 @@ "ctxt": 0 }, "value": "IRootResponse", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13148,7 +12735,6 @@ "ctxt": 0 }, "value": "TResponse", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13156,8 +12742,7 @@ ] } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -13198,7 +12783,6 @@ "ctxt": 0 }, "value": "IRootResponse", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13224,7 +12808,6 @@ "ctxt": 0 }, "value": "TResponse", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -13254,7 +12837,6 @@ "ctxt": 0 }, "value": "TResponse", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13274,7 +12856,6 @@ "ctxt": 0 }, "value": "IRecord", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13294,7 +12875,6 @@ "ctxt": 0 }, "value": "IRecordResponse", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13320,7 +12900,6 @@ "ctxt": 0 }, "value": "TResponse", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13343,7 +12922,6 @@ "ctxt": 0 }, "value": "IResponse", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13369,7 +12947,6 @@ "ctxt": 0 }, "value": "TResponse", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13394,7 +12971,6 @@ "ctxt": 0 }, "value": "IRecord", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -13424,7 +13000,6 @@ "ctxt": 0 }, "value": "Id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -13469,7 +13044,6 @@ "ctxt": 0 }, "value": "IRecordResponse", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13495,7 +13069,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -13513,7 +13086,6 @@ "ctxt": 0 }, "value": "IRecord", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13545,7 +13117,6 @@ "ctxt": 0 }, "value": "IResponse", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13571,7 +13142,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13603,7 +13173,6 @@ "ctxt": 0 }, "value": "sendRecord", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -13649,7 +13218,6 @@ "ctxt": 0 }, "value": "IResponse", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13675,7 +13243,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -13707,7 +13274,6 @@ "ctxt": 0 }, "value": "sendValue", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -13721,6 +13287,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13751,7 +13318,6 @@ "ctxt": 0 }, "value": "GetAllPropertiesOfType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13777,7 +13343,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13795,8 +13360,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": { @@ -13837,7 +13401,6 @@ "ctxt": 0 }, "value": "GetPropertyNamesOfType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13863,7 +13426,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -13884,7 +13446,6 @@ "ctxt": 0 }, "value": "RestrictToType", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -13923,7 +13484,6 @@ "ctxt": 0 }, "value": "PropertyName", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -13941,7 +13501,6 @@ "ctxt": 0 }, "value": "Extract", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13975,7 +13534,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14027,7 +13585,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14047,7 +13604,6 @@ "ctxt": 0 }, "value": "PropertyName", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14068,7 +13624,6 @@ "ctxt": 0 }, "value": "RestrictToType", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14088,7 +13643,6 @@ "ctxt": 0 }, "value": "PropertyName", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14119,7 +13673,6 @@ "ctxt": 0 }, "value": "Extract", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14153,7 +13706,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14189,7 +13741,6 @@ "ctxt": 0 }, "value": "GetAllPropertiesOfType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14215,7 +13766,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -14236,7 +13786,6 @@ "ctxt": 0 }, "value": "RestrictToType", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -14259,7 +13808,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14285,7 +13833,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14305,7 +13852,6 @@ "ctxt": 0 }, "value": "GetPropertyNamesOfType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14331,7 +13877,6 @@ "ctxt": 0 }, "value": "Required", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14357,7 +13902,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14380,7 +13924,6 @@ "ctxt": 0 }, "value": "RestrictToType", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14402,7 +13945,6 @@ "ctxt": 0 }, "value": "ff", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -14423,6 +13965,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -14445,7 +13988,6 @@ "ctxt": 0 }, "value": "Foo3", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14468,8 +14010,7 @@ ] } } - }, - "optional": false + } } } ], @@ -14511,7 +14052,6 @@ "ctxt": 0 }, "value": "gg", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -14532,6 +14072,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -14555,6 +14096,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -14577,7 +14119,6 @@ "ctxt": 0 }, "value": "Foo3", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14603,7 +14144,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14611,8 +14151,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -14634,8 +14173,7 @@ } } } - }, - "optional": false + } } } ], @@ -14671,7 +14209,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -14713,7 +14250,6 @@ "ctxt": 0 }, "value": "Foo3", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14739,7 +14275,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -14769,7 +14304,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14807,7 +14341,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -14836,7 +14369,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14870,7 +14402,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -14899,7 +14430,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14933,7 +14463,6 @@ "ctxt": 0 }, "value": "gg", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -14947,7 +14476,6 @@ "ctxt": 0 }, "value": "ff", - "typeAnnotation": null, "optional": false } } @@ -14971,7 +14499,6 @@ "ctxt": 0 }, "value": "Wat", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14997,7 +14524,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -15044,7 +14570,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -15082,7 +14607,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -15132,7 +14656,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -15197,7 +14720,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -15234,7 +14756,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -15252,7 +14773,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -15336,7 +14856,6 @@ "ctxt": 0 }, "value": "Huh", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -15355,7 +14874,6 @@ "ctxt": 0 }, "value": "Wat", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/conditional/conditionalTypesExcessProperties/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/conditional/conditionalTypesExcessProperties/input.ts.json index 05f9867803dc..1ad57a0982ff 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/conditional/conditionalTypesExcessProperties/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/conditional/conditionalTypesExcessProperties/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "Something", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -145,7 +142,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -183,7 +179,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -212,7 +207,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -246,7 +240,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -289,7 +282,6 @@ "ctxt": 0 }, "value": "testFunc2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -310,6 +302,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -332,13 +325,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -357,6 +348,7 @@ "ctxt": 0 }, "value": "sa", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -379,7 +371,6 @@ "ctxt": 0 }, "value": "Something", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -405,7 +396,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -413,8 +403,7 @@ ] } } - }, - "optional": false + } } } ], @@ -455,8 +444,8 @@ "ctxt": 0 }, "value": "sa", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -476,7 +465,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "value": { @@ -504,7 +492,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "value": { @@ -515,7 +502,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -546,8 +532,8 @@ "ctxt": 0 }, "value": "sa", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -567,7 +553,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "value": { @@ -595,7 +580,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "value": { @@ -606,7 +590,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -620,7 +603,6 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, "optional": false }, "value": { @@ -631,7 +613,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -666,7 +647,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/conditional/inferTypes2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/conditional/inferTypes2/input.ts.json index 8b3d01a2e8d4..56a53c3a19ac 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/conditional/inferTypes2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/conditional/inferTypes2/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -44,6 +43,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,13 +66,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -145,7 +142,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -188,7 +184,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -212,7 +207,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -247,7 +241,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -268,6 +261,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -290,13 +284,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -336,7 +328,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -350,7 +341,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -385,7 +375,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -419,7 +408,6 @@ "ctxt": 0 }, "value": "BadNested", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -445,7 +433,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -477,7 +464,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -513,7 +499,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -542,7 +527,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -581,7 +565,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -602,6 +585,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -624,13 +608,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -666,7 +648,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -703,7 +684,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -731,7 +711,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -757,7 +736,6 @@ "ctxt": 0 }, "value": "BadNested", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -790,7 +768,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -828,7 +805,6 @@ "ctxt": 0 }, "value": "BadNested", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -861,7 +837,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -886,7 +861,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -908,7 +882,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -943,7 +916,6 @@ "ctxt": 0 }, "value": "bar2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -964,6 +936,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -986,13 +959,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1032,7 +1003,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1046,7 +1016,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -1081,7 +1050,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1108,7 +1076,6 @@ "ctxt": 0 }, "value": "Weird", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1150,7 +1117,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1172,7 +1138,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1204,7 +1169,6 @@ "ctxt": 0 }, "value": "AlsoWeird", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1246,7 +1210,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1268,7 +1231,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1309,6 +1271,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1331,13 +1294,11 @@ "ctxt": 0 }, "value": "Weird", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -1376,6 +1337,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1392,8 +1354,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1403,7 +1364,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/conditional/variance/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/conditional/variance/input.ts.json index 5407c17e6d36..f402d7ba26d2 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/conditional/variance/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/conditional/variance/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -117,7 +114,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -197,8 +193,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsConstAssertion", @@ -225,7 +221,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": { @@ -270,6 +265,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -292,7 +288,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -323,8 +318,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -334,7 +328,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "definite": false @@ -366,6 +359,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -388,7 +382,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -411,8 +404,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -422,7 +414,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "definite": false @@ -454,6 +445,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -476,7 +468,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -499,8 +490,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -510,7 +500,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -527,7 +516,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -553,7 +541,6 @@ "ctxt": 0 }, "value": "instance", - "typeAnnotation": null, "optional": false }, "value": null, @@ -586,7 +573,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -636,7 +622,6 @@ "ctxt": 0 }, "value": "cast", - "typeAnnotation": null, "optional": false }, "function": { @@ -657,6 +642,7 @@ "ctxt": 0 }, "value": "_name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -709,7 +695,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -765,8 +750,7 @@ } } } - }, - "optional": false + } } } ], @@ -811,7 +795,6 @@ "ctxt": 0 }, "value": "pushThis", - "typeAnnotation": null, "optional": false }, "function": { @@ -866,7 +849,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "property": { @@ -877,7 +859,6 @@ "ctxt": 0 }, "value": "instance", - "typeAnnotation": null, "optional": false }, "computed": false @@ -890,7 +871,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -950,7 +930,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/asyncFunctions/contextuallyTypeAsyncFunctionAwaitOperand/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/asyncFunctions/contextuallyTypeAsyncFunctionAwaitOperand/input.ts.json index 10609014becf..92d11365770b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/asyncFunctions/contextuallyTypeAsyncFunctionAwaitOperand/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/asyncFunctions/contextuallyTypeAsyncFunctionAwaitOperand/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Obj", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -103,7 +101,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -147,6 +144,7 @@ "ctxt": 0 }, "value": "obj1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -169,13 +167,11 @@ "ctxt": 0 }, "value": "Obj", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "AwaitExpression", @@ -202,7 +198,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "value": { @@ -252,6 +247,7 @@ "ctxt": 0 }, "value": "obj2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -274,13 +270,11 @@ "ctxt": 0 }, "value": "Obj", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "AwaitExpression", @@ -304,7 +298,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -326,8 +319,8 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -345,7 +338,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -369,7 +361,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "value": { @@ -439,7 +430,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "value": { @@ -488,7 +478,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -514,7 +503,6 @@ "ctxt": 0 }, "value": "Obj", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/asyncFunctions/contextuallyTypeAsyncFunctionReturnType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/asyncFunctions/contextuallyTypeAsyncFunctionReturnType/input.ts.json index e548f1de5afb..99391f5eab6b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/asyncFunctions/contextuallyTypeAsyncFunctionReturnType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/asyncFunctions/contextuallyTypeAsyncFunctionReturnType/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Obj", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -103,7 +101,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -147,7 +144,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "value": { @@ -195,7 +191,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -221,7 +216,6 @@ "ctxt": 0 }, "value": "Obj", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -241,7 +235,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -282,7 +275,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -304,8 +296,8 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -338,7 +330,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -362,7 +353,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "value": { @@ -426,7 +416,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -452,7 +441,6 @@ "ctxt": 0 }, "value": "Obj", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -472,7 +460,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -523,7 +510,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "value": { @@ -572,7 +558,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -598,7 +583,6 @@ "ctxt": 0 }, "value": "Obj", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -618,7 +602,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -666,7 +649,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -688,8 +670,8 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -722,7 +704,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -746,7 +727,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "value": { @@ -811,7 +791,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -837,7 +816,6 @@ "ctxt": 0 }, "value": "Obj", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/commaOperator/contextuallyTypeCommaOperator01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/commaOperator/contextuallyTypeCommaOperator01/input.ts.json index c984f913f072..deb823551421 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/commaOperator/contextuallyTypeCommaOperator01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/commaOperator/contextuallyTypeCommaOperator01/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,6 +55,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -70,8 +72,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -93,8 +94,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -124,8 +124,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -167,8 +167,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -179,7 +179,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/commaOperator/contextuallyTypeCommaOperator02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/commaOperator/contextuallyTypeCommaOperator02/input.ts.json index 534bb842855e..20f04662d27c 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/commaOperator/contextuallyTypeCommaOperator02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/commaOperator/contextuallyTypeCommaOperator02/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,6 +55,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -70,8 +72,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -93,8 +94,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -124,8 +124,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -167,8 +167,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -204,6 +204,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -220,8 +221,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -231,7 +231,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -253,7 +252,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/commaOperator/contextuallyTypeCommaOperator03/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/commaOperator/contextuallyTypeCommaOperator03/input.ts.json index 5ab62397b941..64778ae1e5a6 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/commaOperator/contextuallyTypeCommaOperator03/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/commaOperator/contextuallyTypeCommaOperator03/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,6 +55,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -70,8 +72,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -93,8 +94,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -124,8 +124,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ParenthesisExpression", @@ -158,8 +158,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -170,7 +170,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -194,8 +193,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -206,7 +205,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/jsdoc/contextualTypeFromJSDoc/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/jsdoc/contextualTypeFromJSDoc/input.ts.json index cafe0e735f48..5a69d5dd3d2b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/jsdoc/contextualTypeFromJSDoc/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/jsdoc/contextualTypeFromJSDoc/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -89,7 +89,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -155,7 +154,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -190,7 +188,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -271,7 +268,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -337,7 +333,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -376,7 +371,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -402,7 +396,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -423,8 +416,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -469,7 +462,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -550,7 +542,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -616,7 +607,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes01x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes01x/input.tsx.json index b5888ca2179a..986f6c9ec275 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes01x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes01x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "body": { @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "IntrinsicElements", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -138,7 +135,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -168,7 +164,6 @@ "ctxt": 0 }, "value": "something", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -226,8 +221,8 @@ "ctxt": 0 }, "value": "FooComponent", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -245,6 +240,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -276,7 +272,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -371,8 +366,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -392,7 +386,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false }, "span": { @@ -427,7 +420,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "property": { @@ -438,7 +430,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -460,7 +451,6 @@ "ctxt": 0 }, "value": "span", - "typeAnnotation": null, "optional": false } } @@ -498,7 +488,6 @@ "ctxt": 0 }, "value": "FooComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -522,7 +511,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -580,7 +568,6 @@ "ctxt": 0 }, "value": "FooComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -604,7 +591,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -654,7 +640,6 @@ "ctxt": 0 }, "value": "FooComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -678,7 +663,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -736,7 +720,6 @@ "ctxt": 0 }, "value": "FooComponent", - "typeAnnotation": null, "optional": false }, "span": { @@ -760,7 +743,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes02x/input.tsx.json b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes02x/input.tsx.json index 6b80d82d5f51..acf7620bdc4c 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes02x/input.tsx.json +++ b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes02x/input.tsx.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "React", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "ClickableProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -101,7 +99,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -143,7 +140,6 @@ "ctxt": 0 }, "value": "className", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -195,7 +191,6 @@ "ctxt": 0 }, "value": "ButtonProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -216,7 +211,6 @@ "ctxt": 0 }, "value": "ClickableProps", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -246,7 +240,6 @@ "ctxt": 0 }, "value": "onClick", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -276,6 +269,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -337,8 +331,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -389,7 +382,6 @@ "ctxt": 0 }, "value": "LinkProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -410,7 +402,6 @@ "ctxt": 0 }, "value": "ClickableProps", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -440,7 +431,6 @@ "ctxt": 0 }, "value": "goTo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -532,7 +522,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -553,6 +542,7 @@ "ctxt": 0 }, "value": "buttonProps", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -575,13 +565,11 @@ "ctxt": 0 }, "value": "ButtonProps", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -619,7 +607,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -630,7 +617,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -656,7 +642,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -677,6 +662,7 @@ "ctxt": 0 }, "value": "linkProps", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -699,13 +685,11 @@ "ctxt": 0 }, "value": "LinkProps", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -743,7 +727,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -754,7 +737,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -780,7 +762,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -801,6 +782,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -831,7 +813,6 @@ "ctxt": 0 }, "value": "ButtonProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -851,15 +832,13 @@ "ctxt": 0 }, "value": "LinkProps", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -902,8 +881,8 @@ "ctxt": 0 }, "value": "linkProps", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -920,7 +899,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -938,7 +916,6 @@ "ctxt": 0 }, "value": "LinkProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -970,7 +947,6 @@ "ctxt": 0 }, "value": "linkProps", - "typeAnnotation": null, "optional": false }, "property": { @@ -981,7 +957,6 @@ "ctxt": 0 }, "value": "goTo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1031,7 +1006,6 @@ "ctxt": 0 }, "value": "_buildMainLink", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1047,7 +1021,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } } @@ -1096,7 +1069,6 @@ "ctxt": 0 }, "value": "_buildMainButton", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1112,7 +1084,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } } @@ -1149,7 +1120,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -1160,7 +1130,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -1194,8 +1163,8 @@ "ctxt": 0 }, "value": "b0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1214,7 +1183,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -1248,7 +1216,6 @@ "ctxt": 0 }, "value": "onClick", - "typeAnnotation": null, "optional": false }, "value": { @@ -1267,8 +1234,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1308,7 +1275,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -1319,7 +1285,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1335,7 +1300,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false } } @@ -1369,7 +1333,6 @@ "ctxt": 0 }, "value": "extra", - "typeAnnotation": null, "optional": false }, "value": null @@ -1410,8 +1373,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1430,7 +1393,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -1454,7 +1416,6 @@ "ctxt": 0 }, "value": "onClick", - "typeAnnotation": null, "optional": false }, "value": { @@ -1480,8 +1441,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1521,7 +1482,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -1532,7 +1492,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1548,7 +1507,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false } } @@ -1580,7 +1538,6 @@ "ctxt": 0 }, "value": "extra", - "typeAnnotation": null, "optional": false }, "value": null @@ -1621,8 +1578,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1641,7 +1598,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -1675,7 +1631,6 @@ "ctxt": 0 }, "value": "goTo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1711,7 +1666,6 @@ "ctxt": 0 }, "value": "extra", - "typeAnnotation": null, "optional": false }, "value": null @@ -1752,8 +1706,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -1772,7 +1726,6 @@ "ctxt": 0 }, "value": "MainButton", - "typeAnnotation": null, "optional": false }, "span": { @@ -1796,7 +1749,6 @@ "ctxt": 0 }, "value": "goTo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1829,7 +1781,6 @@ "ctxt": 0 }, "value": "extra", - "typeAnnotation": null, "optional": false }, "value": null @@ -1862,7 +1813,6 @@ "ctxt": 0 }, "value": "NoOverload", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1883,6 +1833,7 @@ "ctxt": 0 }, "value": "buttonProps", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1905,13 +1856,11 @@ "ctxt": 0 }, "value": "ButtonProps", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1944,7 +1893,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1977,7 +1925,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -1988,7 +1935,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -2022,8 +1968,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2042,7 +1988,6 @@ "ctxt": 0 }, "value": "NoOverload", - "typeAnnotation": null, "optional": false }, "span": { @@ -2076,7 +2021,6 @@ "ctxt": 0 }, "value": "onClick", - "typeAnnotation": null, "optional": false }, "value": { @@ -2095,8 +2039,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2136,7 +2080,6 @@ "ctxt": 0 }, "value": "console", - "typeAnnotation": null, "optional": false }, "property": { @@ -2147,7 +2090,6 @@ "ctxt": 0 }, "value": "log", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2163,7 +2105,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false } } @@ -2197,7 +2138,6 @@ "ctxt": 0 }, "value": "extra", - "typeAnnotation": null, "optional": false }, "value": null @@ -2230,7 +2170,6 @@ "ctxt": 0 }, "value": "NoOverload1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2251,6 +2190,7 @@ "ctxt": 0 }, "value": "linkProps", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2273,13 +2213,11 @@ "ctxt": 0 }, "value": "LinkProps", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2312,7 +2250,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2345,7 +2282,6 @@ "ctxt": 0 }, "value": "JSX", - "typeAnnotation": null, "optional": false }, "right": { @@ -2356,7 +2292,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false } }, @@ -2390,8 +2325,8 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "JSXElement", @@ -2410,7 +2345,6 @@ "ctxt": 0 }, "value": "NoOverload1", - "typeAnnotation": null, "optional": false }, "span": { @@ -2444,7 +2378,6 @@ "ctxt": 0 }, "value": "goTo", - "typeAnnotation": null, "optional": false }, "value": { @@ -2480,7 +2413,6 @@ "ctxt": 0 }, "value": "extra", - "typeAnnotation": null, "optional": false }, "value": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/logicalAnd/contextuallyTypeLogicalAnd01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/logicalAnd/contextuallyTypeLogicalAnd01/input.ts.json index e76cda391bd4..0be0cdb36779 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/logicalAnd/contextuallyTypeLogicalAnd01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/logicalAnd/contextuallyTypeLogicalAnd01/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,6 +55,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -70,8 +72,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -93,8 +94,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -126,8 +126,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -165,8 +165,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -184,7 +184,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -210,8 +209,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -222,7 +221,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/logicalAnd/contextuallyTypeLogicalAnd02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/logicalAnd/contextuallyTypeLogicalAnd02/input.ts.json index bad99aebba52..bfbe4f67b899 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/logicalAnd/contextuallyTypeLogicalAnd02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/logicalAnd/contextuallyTypeLogicalAnd02/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,6 +55,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -70,8 +72,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -93,8 +94,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -126,8 +126,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -165,8 +165,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -184,7 +184,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -210,8 +209,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -247,6 +246,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -263,8 +263,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -274,7 +273,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -296,7 +294,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/logicalAnd/contextuallyTypeLogicalAnd03/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/logicalAnd/contextuallyTypeLogicalAnd03/input.ts.json index 28739d342a7e..6d506e420449 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/logicalAnd/contextuallyTypeLogicalAnd03/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/logicalAnd/contextuallyTypeLogicalAnd03/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,6 +55,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -70,8 +72,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -93,8 +94,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -126,8 +126,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -165,8 +165,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -199,8 +199,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -211,7 +211,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -243,8 +242,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -255,7 +254,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializer/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializer/input.ts.json index 6054be469df5..674b9c24eeff 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializer/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializer/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Show", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "show", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -81,6 +79,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -97,8 +96,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -136,7 +134,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -172,7 +169,6 @@ "ctxt": 0 }, "value": "show", - "typeAnnotation": null, "optional": false }, "value": { @@ -191,8 +187,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -217,7 +213,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -228,7 +223,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -266,7 +260,6 @@ "ctxt": 0 }, "value": "Show", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -305,7 +298,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -357,8 +349,8 @@ "ctxt": 0 }, "value": "showRename", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -376,8 +368,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -402,7 +394,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -413,7 +404,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -453,7 +443,6 @@ "ctxt": 0 }, "value": "Show", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -492,7 +481,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -552,8 +540,8 @@ "ctxt": 0 }, "value": "showRename", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -571,8 +559,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -597,7 +585,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -608,7 +595,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -648,7 +634,6 @@ "ctxt": 0 }, "value": "Show", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -692,7 +677,6 @@ "ctxt": 0 }, "value": "Nested", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -722,7 +706,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -751,7 +734,6 @@ "ctxt": 0 }, "value": "Show", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -772,7 +754,6 @@ "ctxt": 0 }, "value": "ff", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -808,7 +789,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "value": { @@ -829,7 +809,6 @@ "ctxt": 0 }, "value": "show", - "typeAnnotation": null, "optional": false }, "value": { @@ -848,8 +827,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -874,7 +853,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -885,7 +863,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -926,7 +903,6 @@ "ctxt": 0 }, "value": "Nested", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -970,7 +946,6 @@ "ctxt": 0 }, "value": "Tuples", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1000,7 +975,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1076,7 +1050,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1112,7 +1085,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": { @@ -1179,7 +1151,6 @@ "ctxt": 0 }, "value": "Tuples", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1223,7 +1194,6 @@ "ctxt": 0 }, "value": "StringUnion", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1253,7 +1223,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1337,7 +1306,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1373,7 +1341,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": { @@ -1415,7 +1382,6 @@ "ctxt": 0 }, "value": "StringUnion", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1459,7 +1425,6 @@ "ctxt": 0 }, "value": "StringIdentity", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1489,7 +1454,6 @@ "ctxt": 0 }, "value": "stringIdentity", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1503,6 +1467,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1519,8 +1484,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -1580,7 +1544,6 @@ "ctxt": 0 }, "value": "stringIdentity", - "typeAnnotation": null, "optional": false }, "value": { @@ -1598,8 +1561,8 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1617,8 +1580,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1629,7 +1592,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1664,7 +1626,6 @@ "ctxt": 0 }, "value": "StringIdentity", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1689,7 +1650,6 @@ "ctxt": 0 }, "value": "stringIdentity", - "typeAnnotation": null, "optional": false }, "value": { @@ -1708,8 +1668,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1720,7 +1680,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative/input.ts.json index 48176d56ccd6..9f080d70f8f0 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Show", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "show", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -81,6 +79,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -97,8 +96,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -136,7 +134,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -167,7 +164,6 @@ "ctxt": 0 }, "value": "show", - "typeAnnotation": null, "optional": false }, "value": { @@ -185,8 +181,8 @@ "ctxt": 0 }, "value": "showRename", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -204,8 +200,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -216,7 +212,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "async": false, @@ -251,7 +246,6 @@ "ctxt": 0 }, "value": "Show", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -290,7 +284,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -342,8 +335,8 @@ "ctxt": 0 }, "value": "showRename", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -361,8 +354,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -373,7 +366,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "async": false, @@ -408,7 +400,6 @@ "ctxt": 0 }, "value": "Show", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -447,7 +438,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -507,8 +497,8 @@ "ctxt": 0 }, "value": "showRename", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -526,8 +516,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -538,7 +528,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "async": false, @@ -573,7 +562,6 @@ "ctxt": 0 }, "value": "Show", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -617,7 +605,6 @@ "ctxt": 0 }, "value": "Nested", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -647,7 +634,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -676,7 +662,6 @@ "ctxt": 0 }, "value": "Show", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -697,7 +682,6 @@ "ctxt": 0 }, "value": "ff", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -728,7 +712,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "value": { @@ -746,8 +729,8 @@ "ctxt": 0 }, "value": "nestedRename", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -767,7 +750,6 @@ "ctxt": 0 }, "value": "show", - "typeAnnotation": null, "optional": false }, "value": { @@ -786,8 +768,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -798,7 +780,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "async": false, @@ -836,7 +817,6 @@ "ctxt": 0 }, "value": "Nested", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -880,7 +860,6 @@ "ctxt": 0 }, "value": "StringIdentity", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -910,7 +889,6 @@ "ctxt": 0 }, "value": "stringIdentity", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -924,6 +902,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -940,8 +919,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -1001,7 +979,6 @@ "ctxt": 0 }, "value": "stringIdentity", - "typeAnnotation": null, "optional": false }, "value": { @@ -1019,8 +996,8 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1038,8 +1015,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1057,7 +1034,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "property": { @@ -1068,7 +1044,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1105,7 +1080,6 @@ "ctxt": 0 }, "value": "StringIdentity", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1130,7 +1104,6 @@ "ctxt": 0 }, "value": "stringIdentity", - "typeAnnotation": null, "optional": false }, "value": { @@ -1149,8 +1122,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1161,7 +1134,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1191,7 +1163,6 @@ "ctxt": 0 }, "value": "Tuples", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1221,7 +1192,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1297,7 +1267,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1333,7 +1302,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": { @@ -1395,7 +1363,6 @@ "ctxt": 0 }, "value": "Tuples", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1439,7 +1406,6 @@ "ctxt": 0 }, "value": "StringUnion", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1469,7 +1435,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1553,7 +1518,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1589,7 +1553,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": { @@ -1631,7 +1594,6 @@ "ctxt": 0 }, "value": "StringUnion", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/methodDeclarations/contextuallyTypedClassExpressionMethodDeclaration01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/methodDeclarations/contextuallyTypedClassExpressionMethodDeclaration01/input.ts.json index 2aeafb569fd6..684750bc89b6 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/methodDeclarations/contextuallyTypedClassExpressionMethodDeclaration01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/methodDeclarations/contextuallyTypedClassExpressionMethodDeclaration01/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "numProp", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -125,7 +122,6 @@ "ctxt": 0 }, "value": "strProp", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -199,7 +194,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -213,6 +207,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -235,13 +230,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -279,7 +272,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -293,6 +285,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -315,13 +308,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -356,7 +347,6 @@ "ctxt": 0 }, "value": "getFoo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -407,7 +397,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "function": { @@ -428,8 +417,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -477,7 +466,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "property": { @@ -488,7 +476,6 @@ "ctxt": 0 }, "value": "numProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -532,7 +519,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "function": { @@ -553,8 +539,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -602,7 +588,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "property": { @@ -613,7 +598,6 @@ "ctxt": 0 }, "value": "strProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -682,7 +666,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -699,7 +682,6 @@ "ctxt": 0 }, "value": "getFoo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -750,7 +732,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "value": { @@ -769,8 +750,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -811,7 +792,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "property": { @@ -822,7 +802,6 @@ "ctxt": 0 }, "value": "numProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -871,7 +850,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "value": { @@ -890,8 +868,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -932,7 +910,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "property": { @@ -943,7 +920,6 @@ "ctxt": 0 }, "value": "strProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1017,7 +993,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1034,7 +1009,6 @@ "ctxt": 0 }, "value": "getFoo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1085,7 +1059,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "value": { @@ -1108,8 +1081,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1157,7 +1130,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "property": { @@ -1168,7 +1140,6 @@ "ctxt": 0 }, "value": "numProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1217,7 +1188,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "value": { @@ -1240,8 +1210,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1289,7 +1259,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "property": { @@ -1300,7 +1269,6 @@ "ctxt": 0 }, "value": "strProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1374,7 +1342,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/methodDeclarations/contextuallyTypedClassExpressionMethodDeclaration02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/methodDeclarations/contextuallyTypedClassExpressionMethodDeclaration02/input.ts.json index cb82cf6e3555..d93f9fab8c0e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/methodDeclarations/contextuallyTypedClassExpressionMethodDeclaration02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/methodDeclarations/contextuallyTypedClassExpressionMethodDeclaration02/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "numProp", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -125,7 +122,6 @@ "ctxt": 0 }, "value": "strProp", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -213,7 +208,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -239,7 +233,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -269,7 +262,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -283,6 +275,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -305,13 +298,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -349,7 +340,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -363,6 +353,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -385,13 +376,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -426,7 +415,6 @@ "ctxt": 0 }, "value": "getFoo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -477,7 +465,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "function": { @@ -498,8 +485,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -547,7 +534,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "property": { @@ -558,7 +544,6 @@ "ctxt": 0 }, "value": "numProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -602,7 +587,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "function": { @@ -623,8 +607,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -672,7 +656,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "property": { @@ -683,7 +666,6 @@ "ctxt": 0 }, "value": "strProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -752,7 +734,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -769,7 +750,6 @@ "ctxt": 0 }, "value": "getFoo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -820,7 +800,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "value": { @@ -839,8 +818,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -881,7 +860,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "property": { @@ -892,7 +870,6 @@ "ctxt": 0 }, "value": "numProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -941,7 +918,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "value": { @@ -960,8 +936,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1002,7 +978,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "property": { @@ -1013,7 +988,6 @@ "ctxt": 0 }, "value": "strProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1087,7 +1061,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1104,7 +1077,6 @@ "ctxt": 0 }, "value": "getFoo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1155,7 +1127,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "value": { @@ -1178,8 +1149,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1227,7 +1198,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "property": { @@ -1238,7 +1208,6 @@ "ctxt": 0 }, "value": "numProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1287,7 +1256,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "value": { @@ -1310,8 +1278,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1359,7 +1327,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "property": { @@ -1370,7 +1337,6 @@ "ctxt": 0 }, "value": "strProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1444,7 +1410,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/methodDeclarations/contextuallyTypedObjectLiteralMethodDeclaration01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/methodDeclarations/contextuallyTypedObjectLiteralMethodDeclaration01/input.ts.json index d8ed65e62069..62959af6318b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/methodDeclarations/contextuallyTypedObjectLiteralMethodDeclaration01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/methodDeclarations/contextuallyTypedObjectLiteralMethodDeclaration01/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "numProp", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -125,7 +122,6 @@ "ctxt": 0 }, "value": "strProp", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -199,7 +194,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -213,6 +207,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -235,13 +230,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -279,7 +272,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -293,6 +285,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -315,13 +308,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -356,7 +347,6 @@ "ctxt": 0 }, "value": "getFoo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -400,7 +390,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "params": [ @@ -420,8 +409,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -469,7 +458,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "property": { @@ -480,7 +468,6 @@ "ctxt": 0 }, "value": "numProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -513,7 +500,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "params": [ @@ -533,8 +519,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -582,7 +568,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "property": { @@ -593,7 +578,6 @@ "ctxt": 0 }, "value": "strProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -651,7 +635,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -668,7 +651,6 @@ "ctxt": 0 }, "value": "getFoo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -712,7 +694,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "value": { @@ -731,8 +712,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -773,7 +754,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "property": { @@ -784,7 +764,6 @@ "ctxt": 0 }, "value": "numProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -818,7 +797,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "value": { @@ -837,8 +815,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -879,7 +857,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "property": { @@ -890,7 +867,6 @@ "ctxt": 0 }, "value": "strProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -949,7 +925,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -966,7 +941,6 @@ "ctxt": 0 }, "value": "getFoo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1010,7 +984,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "value": { @@ -1033,8 +1006,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1082,7 +1055,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "property": { @@ -1093,7 +1065,6 @@ "ctxt": 0 }, "value": "numProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1127,7 +1098,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "value": { @@ -1150,8 +1120,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1199,7 +1169,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "property": { @@ -1210,7 +1179,6 @@ "ctxt": 0 }, "value": "strProp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1269,7 +1237,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/partiallyAnnotatedFunction/partiallyAnnotatedFunctionInferenceError/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/partiallyAnnotatedFunction/partiallyAnnotatedFunctionInferenceError/input.ts.json index 767216a276e3..d20a753e18cf 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/partiallyAnnotatedFunction/partiallyAnnotatedFunctionInferenceError/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/partiallyAnnotatedFunction/partiallyAnnotatedFunctionInferenceError/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "test2", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "testError", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -195,6 +189,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -218,6 +213,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -240,13 +236,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -256,6 +250,7 @@ "ctxt": 0 }, "value": "t1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -278,13 +273,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -306,8 +299,7 @@ } } } - }, - "optional": false + } } } ], @@ -343,7 +335,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -361,7 +352,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -392,7 +382,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -421,7 +410,6 @@ "ctxt": 0 }, "value": "testError", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -443,6 +431,7 @@ "ctxt": 0 }, "value": "t1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -465,13 +454,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -481,8 +468,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -492,8 +479,8 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -537,7 +524,6 @@ "ctxt": 0 }, "value": "testError", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -559,8 +545,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -570,6 +556,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -592,13 +579,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -608,8 +593,8 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -653,7 +638,6 @@ "ctxt": 0 }, "value": "testError", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -675,8 +659,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -686,8 +670,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -697,6 +681,7 @@ "ctxt": 0 }, "value": "t3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -719,13 +704,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/partiallyAnnotatedFunction/partiallyAnnotatedFunctionInferenceWithTypeParameter/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/partiallyAnnotatedFunction/partiallyAnnotatedFunctionInferenceWithTypeParameter/input.ts.json index 1d3b1d7d7ec8..6934caf5ccfd 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/partiallyAnnotatedFunction/partiallyAnnotatedFunctionInferenceWithTypeParameter/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/partiallyAnnotatedFunction/partiallyAnnotatedFunctionInferenceWithTypeParameter/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "test2", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -195,6 +189,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -218,6 +213,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -240,13 +236,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -256,6 +250,7 @@ "ctxt": 0 }, "value": "t1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -278,13 +273,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -306,8 +299,7 @@ } } } - }, - "optional": false + } } } ], @@ -343,7 +335,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -361,7 +352,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -392,7 +382,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -409,7 +398,6 @@ "ctxt": 0 }, "value": "testRest", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -430,6 +418,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -453,6 +442,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -475,13 +465,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -491,6 +479,7 @@ "ctxt": 0 }, "value": "t1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -513,13 +502,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "RestElement", @@ -541,8 +528,8 @@ "ctxt": 0 }, "value": "ts", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -573,7 +560,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -601,8 +587,7 @@ } } } - }, - "optional": false + } } } ], @@ -638,7 +623,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -656,7 +640,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -687,7 +670,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -716,7 +698,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -738,6 +719,7 @@ "ctxt": 0 }, "value": "t1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -760,13 +742,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -776,8 +756,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -810,7 +790,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "property": { @@ -821,7 +800,6 @@ "ctxt": 0 }, "value": "test2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -861,7 +839,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -883,8 +860,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -894,6 +871,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -916,13 +894,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -955,7 +931,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "property": { @@ -966,7 +941,6 @@ "ctxt": 0 }, "value": "test2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1006,7 +980,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1061,7 +1034,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1083,6 +1055,7 @@ "ctxt": 0 }, "value": "t1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1105,13 +1078,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1155,7 +1126,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1189,8 +1159,8 @@ "ctxt": 0 }, "value": "ts", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1221,7 +1191,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1271,7 +1240,6 @@ "ctxt": 0 }, "value": "testRest", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1293,6 +1261,7 @@ "ctxt": 0 }, "value": "t1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1315,13 +1284,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1365,7 +1332,6 @@ "ctxt": 0 }, "value": "testRest", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1387,8 +1353,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1398,8 +1364,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1409,8 +1375,8 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1454,7 +1420,6 @@ "ctxt": 0 }, "value": "testRest", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1476,6 +1441,7 @@ "ctxt": 0 }, "value": "t1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1498,13 +1464,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1514,8 +1478,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1525,8 +1489,8 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1570,7 +1534,6 @@ "ctxt": 0 }, "value": "testRest", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1592,8 +1555,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1603,6 +1566,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1625,13 +1589,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1641,8 +1603,8 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1686,7 +1648,6 @@ "ctxt": 0 }, "value": "testRest", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1708,6 +1669,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1730,13 +1692,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "RestElement", @@ -1758,8 +1718,8 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1805,7 +1765,6 @@ "ctxt": 0 }, "value": "testRest", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1827,8 +1786,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -1850,8 +1809,8 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1882,7 +1841,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/partiallyAnnotatedFunction/partiallyAnnotatedFunctionWitoutTypeParameter/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/partiallyAnnotatedFunction/partiallyAnnotatedFunctionWitoutTypeParameter/input.ts.json index ca74cf057f5a..ba02c8d44191 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/partiallyAnnotatedFunction/partiallyAnnotatedFunctionWitoutTypeParameter/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/contextualTypes/partiallyAnnotatedFunction/partiallyAnnotatedFunctionWitoutTypeParameter/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "simple", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,6 +60,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -76,8 +77,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -87,6 +87,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -103,8 +104,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -126,8 +126,7 @@ } } } - }, - "optional": false + } } } ], @@ -181,7 +180,6 @@ "ctxt": 0 }, "value": "simple", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -203,6 +201,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -219,8 +218,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -230,8 +228,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -275,7 +273,6 @@ "ctxt": 0 }, "value": "simple", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -297,8 +294,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -308,6 +305,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -324,8 +322,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/forAwait/types.forAwait.es2018.1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/forAwait/types.forAwait.es2018.1/input.ts.json index 8e4b3758a1e8..7a093177d389 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/forAwait/types.forAwait.es2018.1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/forAwait/types.forAwait.es2018.1/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "asyncIterable", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,7 +54,6 @@ "ctxt": 0 }, "value": "AsyncIterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -76,8 +76,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -109,6 +108,7 @@ "ctxt": 0 }, "value": "iterable", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -131,7 +131,6 @@ "ctxt": 0 }, "value": "Iterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -154,8 +153,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -187,6 +185,7 @@ "ctxt": 0 }, "value": "iterableOfPromise", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -209,7 +208,6 @@ "ctxt": 0 }, "value": "Iterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -235,7 +233,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -261,8 +258,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -279,7 +275,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -323,6 +318,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -339,8 +335,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -384,8 +379,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -400,7 +395,6 @@ "ctxt": 0 }, "value": "asyncIterable", - "typeAnnotation": null, "optional": false }, "body": { @@ -450,8 +444,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -466,7 +460,6 @@ "ctxt": 0 }, "value": "iterable", - "typeAnnotation": null, "optional": false }, "body": { @@ -516,8 +509,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -532,7 +525,6 @@ "ctxt": 0 }, "value": "iterableOfPromise", - "typeAnnotation": null, "optional": false }, "body": { @@ -565,8 +557,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -576,7 +568,6 @@ "ctxt": 0 }, "value": "asyncIterable", - "typeAnnotation": null, "optional": false }, "body": { @@ -609,8 +600,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -620,7 +611,6 @@ "ctxt": 0 }, "value": "iterable", - "typeAnnotation": null, "optional": false }, "body": { @@ -653,8 +643,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -664,7 +654,6 @@ "ctxt": 0 }, "value": "iterableOfPromise", - "typeAnnotation": null, "optional": false }, "body": { @@ -694,7 +683,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -738,6 +726,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -754,8 +743,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -799,8 +787,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -815,7 +803,6 @@ "ctxt": 0 }, "value": "asyncIterable", - "typeAnnotation": null, "optional": false }, "body": { @@ -865,8 +852,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -881,7 +868,6 @@ "ctxt": 0 }, "value": "iterable", - "typeAnnotation": null, "optional": false }, "body": { @@ -931,8 +917,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -947,7 +933,6 @@ "ctxt": 0 }, "value": "iterableOfPromise", - "typeAnnotation": null, "optional": false }, "body": { @@ -980,8 +965,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -991,7 +976,6 @@ "ctxt": 0 }, "value": "asyncIterable", - "typeAnnotation": null, "optional": false }, "body": { @@ -1024,8 +1008,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1035,7 +1019,6 @@ "ctxt": 0 }, "value": "iterable", - "typeAnnotation": null, "optional": false }, "body": { @@ -1068,8 +1051,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1079,7 +1062,6 @@ "ctxt": 0 }, "value": "iterableOfPromise", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/forAwait/types.forAwait.es2018.2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/forAwait/types.forAwait.es2018.2/input.ts.json index 580c665776d3..9ba0f551e413 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/forAwait/types.forAwait.es2018.2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/forAwait/types.forAwait.es2018.2/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "asyncIterable", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,7 +54,6 @@ "ctxt": 0 }, "value": "AsyncIterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -76,8 +76,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -109,6 +108,7 @@ "ctxt": 0 }, "value": "iterable", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -131,7 +131,6 @@ "ctxt": 0 }, "value": "Iterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -154,8 +153,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -172,7 +170,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -216,6 +213,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -232,8 +230,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -265,6 +262,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -281,8 +279,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -326,8 +323,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -373,8 +370,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -415,8 +412,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -426,7 +423,6 @@ "ctxt": 0 }, "value": "asyncIterable", - "typeAnnotation": null, "optional": false }, "body": { @@ -459,8 +455,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -470,7 +466,6 @@ "ctxt": 0 }, "value": "iterable", - "typeAnnotation": null, "optional": false }, "body": { @@ -516,8 +511,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -532,7 +527,6 @@ "ctxt": 0 }, "value": "asyncIterable", - "typeAnnotation": null, "optional": false }, "body": { @@ -561,8 +555,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -572,7 +566,6 @@ "ctxt": 0 }, "value": "asyncIterable", - "typeAnnotation": null, "optional": false }, "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/forAwait/types.forAwait.es2018.3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/forAwait/types.forAwait.es2018.3/input.ts.json index 557a59b596ea..5979669c79ea 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/forAwait/types.forAwait.es2018.3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/forAwait/types.forAwait.es2018.3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,6 +59,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -76,8 +76,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -121,8 +120,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -168,8 +167,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -207,7 +206,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -251,6 +249,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -267,8 +266,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -312,8 +310,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -359,8 +357,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/types/import/importTypeAmbient/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/import/importTypeAmbient/input.ts.json index b1be7629192e..4941d5fba9be 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/import/importTypeAmbient/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/import/importTypeAmbient/input.ts.json @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -82,7 +81,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -124,7 +122,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -168,7 +165,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } } @@ -200,6 +196,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -231,8 +228,7 @@ "qualifier": null, "typeArguments": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -252,7 +248,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -275,7 +270,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -342,7 +336,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "body": { @@ -368,7 +361,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -398,7 +390,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -440,7 +431,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -489,7 +479,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "body": { @@ -515,7 +504,6 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -545,7 +533,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -587,7 +574,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -629,7 +615,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -655,7 +640,6 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, "optional": false }, "value": null, @@ -683,7 +667,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "right": { @@ -694,7 +677,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false } }, @@ -726,7 +708,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -746,6 +727,7 @@ "ctxt": 0 }, "value": "input", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -770,7 +752,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "right": { @@ -781,14 +762,12 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } } ], @@ -831,6 +810,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -869,7 +849,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "right": { @@ -880,14 +859,12 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false } }, "typeArguments": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -907,7 +884,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -935,7 +911,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -964,7 +939,6 @@ "ctxt": 0 }, "value": "Bar2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -990,7 +964,6 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1025,7 +998,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1067,7 +1039,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1109,7 +1080,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1163,7 +1133,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1183,6 +1152,7 @@ "ctxt": 0 }, "value": "input", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1199,8 +1169,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -1248,6 +1217,7 @@ "ctxt": 0 }, "value": "shim", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1287,8 +1257,7 @@ "typeArguments": null } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1308,7 +1277,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -1319,7 +1287,6 @@ "ctxt": 0 }, "value": "Bar2", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/import/importTypeAmbientMissing/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/import/importTypeAmbientMissing/input.ts.json index 994304397fb1..25e496604d05 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/import/importTypeAmbientMissing/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/import/importTypeAmbientMissing/input.ts.json @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -82,7 +81,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -124,7 +122,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -168,7 +165,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } } @@ -200,6 +196,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -231,8 +228,7 @@ "qualifier": null, "typeArguments": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -252,7 +248,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -275,7 +270,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/import/importTypeAmdBundleRewrite/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/import/importTypeAmdBundleRewrite/input.ts.json index 617db4baa1c8..2ab8eb64f0a7 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/import/importTypeAmdBundleRewrite/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/import/importTypeAmdBundleRewrite/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -121,6 +119,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -157,13 +156,11 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeArguments": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -183,7 +180,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -225,7 +221,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "exported": null @@ -260,6 +255,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -330,8 +326,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -351,7 +346,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -393,7 +387,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "exported": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/import/importTypeGenericTypes/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/import/importTypeGenericTypes/input.ts.json index 715650234c4f..9df7dde2cc69 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/import/importTypeGenericTypes/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/import/importTypeGenericTypes/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -123,7 +120,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -165,7 +161,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -194,7 +189,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -220,7 +214,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, @@ -241,7 +234,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "body": { @@ -274,7 +266,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -301,7 +292,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -334,7 +324,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -376,7 +365,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -418,7 +406,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -447,7 +434,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -486,7 +472,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "body": { @@ -519,7 +504,6 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -546,7 +530,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -579,7 +562,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -621,7 +603,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -663,7 +644,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -692,7 +672,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -718,7 +697,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -744,7 +722,6 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, "optional": false }, "value": null, @@ -772,7 +749,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "right": { @@ -783,7 +759,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false } }, @@ -810,7 +785,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -844,7 +818,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -864,6 +837,7 @@ "ctxt": 0 }, "value": "input", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -888,7 +862,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "right": { @@ -899,7 +872,6 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false } }, @@ -926,7 +898,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -934,8 +905,7 @@ ] } } - }, - "optional": false + } } } ], @@ -977,7 +947,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1011,7 +980,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "exported": null @@ -1053,6 +1021,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1114,7 +1083,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1145,8 +1113,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1166,7 +1133,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1189,7 +1155,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1212,7 +1177,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "value": { @@ -1233,7 +1197,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1288,6 +1251,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1326,7 +1290,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "right": { @@ -1337,7 +1300,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false } }, @@ -1373,7 +1335,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1404,8 +1365,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1425,7 +1385,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1453,7 +1412,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1476,7 +1434,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "value": { @@ -1497,7 +1454,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1537,7 +1493,6 @@ "ctxt": 0 }, "value": "Bar2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1563,7 +1518,6 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1598,7 +1552,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1640,7 +1593,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1682,7 +1634,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1724,7 +1675,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1753,7 +1703,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1789,7 +1738,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1809,6 +1757,7 @@ "ctxt": 0 }, "value": "input", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1825,8 +1774,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -1868,7 +1816,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1912,6 +1859,7 @@ "ctxt": 0 }, "value": "shim", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1951,8 +1899,7 @@ "typeArguments": null } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1972,7 +1919,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -1983,7 +1929,6 @@ "ctxt": 0 }, "value": "Bar2", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/import/importTypeInJSDoc/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/import/importTypeInJSDoc/input.ts.json index dfcef69fd01a..45a1db1eb0a3 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/import/importTypeInJSDoc/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/import/importTypeInJSDoc/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "body": { @@ -56,7 +55,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "doer", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -116,6 +113,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -132,8 +130,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -175,7 +172,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -201,7 +197,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false }, "value": null, @@ -247,7 +242,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -274,6 +268,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -290,8 +285,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -301,6 +295,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -317,8 +312,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -366,7 +360,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -386,6 +379,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -410,7 +404,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "right": { @@ -421,14 +414,12 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } } ], @@ -460,7 +451,6 @@ "ctxt": 0 }, "value": "global", - "typeAnnotation": null, "optional": false }, "body": { @@ -496,6 +486,7 @@ "ctxt": 0 }, "value": "Foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -518,12 +509,10 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -548,7 +537,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false } }, @@ -577,8 +565,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -602,7 +590,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -634,8 +621,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -652,7 +639,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -676,7 +662,6 @@ "ctxt": 0 }, "value": "doer", - "typeAnnotation": null, "optional": false }, "value": { @@ -694,7 +679,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -705,7 +689,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -744,8 +727,8 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -772,7 +755,6 @@ "ctxt": 0 }, "value": "doer", - "typeAnnotation": null, "optional": false }, "value": { @@ -791,8 +773,8 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -803,7 +785,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "async": false, @@ -844,8 +825,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -870,8 +851,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -882,7 +863,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/import/importTypeLocal/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/import/importTypeLocal/input.ts.json index e27a7ddba669..e73115555841 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/import/importTypeLocal/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/import/importTypeLocal/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -137,7 +134,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, @@ -158,7 +154,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "body": { @@ -191,7 +186,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -221,7 +215,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -263,7 +256,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -320,7 +312,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "body": { @@ -353,7 +344,6 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -383,7 +373,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -425,7 +414,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -469,7 +457,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -495,7 +482,6 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, "optional": false }, "value": null, @@ -523,7 +509,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "right": { @@ -534,7 +519,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false } }, @@ -566,7 +550,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -586,6 +569,7 @@ "ctxt": 0 }, "value": "input", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,7 +594,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "right": { @@ -621,14 +604,12 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } } ], @@ -674,7 +655,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "exported": null @@ -716,6 +696,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -747,8 +728,7 @@ "qualifier": null, "typeArguments": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -768,7 +748,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -791,7 +770,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -843,6 +821,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -881,7 +860,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "right": { @@ -892,14 +870,12 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false } }, "typeArguments": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -919,7 +895,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -947,7 +922,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -984,7 +958,6 @@ "ctxt": 0 }, "value": "Bar2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1010,7 +983,6 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1045,7 +1017,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1087,7 +1058,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1129,7 +1099,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1183,7 +1152,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1203,6 +1171,7 @@ "ctxt": 0 }, "value": "input", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1219,8 +1188,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -1276,6 +1244,7 @@ "ctxt": 0 }, "value": "shim", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1315,8 +1284,7 @@ "typeArguments": null } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1336,7 +1304,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -1347,7 +1314,6 @@ "ctxt": 0 }, "value": "Bar2", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/import/importTypeLocalMissing/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/import/importTypeLocalMissing/input.ts.json index 6ad545b57fbd..880c0326fed0 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/import/importTypeLocalMissing/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/import/importTypeLocalMissing/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -137,7 +134,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false } }, @@ -158,7 +154,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "body": { @@ -191,7 +186,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -221,7 +215,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -263,7 +256,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -320,7 +312,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "body": { @@ -353,7 +344,6 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -383,7 +373,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -425,7 +414,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -469,7 +457,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -495,7 +482,6 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, "optional": false }, "value": null, @@ -523,7 +509,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "right": { @@ -534,7 +519,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false } }, @@ -566,7 +550,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -586,6 +569,7 @@ "ctxt": 0 }, "value": "input", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,7 +594,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "right": { @@ -621,14 +604,12 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } } ], @@ -674,7 +655,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "exported": null @@ -716,6 +696,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -747,8 +728,7 @@ "qualifier": null, "typeArguments": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -768,7 +748,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -791,7 +770,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -843,6 +821,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -881,7 +860,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "right": { @@ -892,14 +870,12 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false } }, "typeArguments": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -919,7 +895,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -947,7 +922,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -999,6 +973,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1037,7 +1012,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "right": { @@ -1048,14 +1022,12 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false } }, "typeArguments": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1075,7 +1047,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1103,7 +1074,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1140,7 +1110,6 @@ "ctxt": 0 }, "value": "Bar2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1166,7 +1135,6 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1201,7 +1169,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1243,7 +1210,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1285,7 +1251,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1339,7 +1304,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1359,6 +1323,7 @@ "ctxt": 0 }, "value": "input", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1375,8 +1340,7 @@ }, "kind": "any" } - }, - "optional": true + } } } ], @@ -1432,6 +1396,7 @@ "ctxt": 0 }, "value": "shim", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1471,8 +1436,7 @@ "typeArguments": null } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1492,7 +1456,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -1503,7 +1466,6 @@ "ctxt": 0 }, "value": "Bar2", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/intersection/commonTypeIntersection/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/intersection/commonTypeIntersection/input.ts.json index 406675952255..4a02efa33a98 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/intersection/commonTypeIntersection/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/intersection/commonTypeIntersection/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -70,7 +71,6 @@ "ctxt": 0 }, "value": "__typename", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -135,7 +135,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -165,8 +164,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -198,6 +196,7 @@ "ctxt": 0 }, "value": "y1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -237,7 +236,6 @@ "ctxt": 0 }, "value": "__typename", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -302,7 +300,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -332,8 +329,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -343,7 +339,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -375,6 +370,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -414,7 +410,6 @@ "ctxt": 0 }, "value": "__typename", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -466,8 +461,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -499,6 +493,7 @@ "ctxt": 0 }, "value": "y2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -538,7 +533,6 @@ "ctxt": 0 }, "value": "__typename", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -590,8 +584,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -601,7 +594,6 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/intersection/contextualIntersectionType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/intersection/contextualIntersectionType/input.ts.json index 39079aadd9cb..8f9d25d085f6 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/intersection/contextualIntersectionType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/intersection/contextualIntersectionType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -70,7 +71,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -100,6 +100,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -116,8 +117,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -168,7 +168,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -198,6 +197,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -214,8 +214,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -244,8 +243,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -275,8 +273,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -296,7 +294,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -315,8 +312,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -327,7 +324,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "async": false, @@ -346,7 +342,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -365,8 +360,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -377,7 +372,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionAndUnionTypes/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionAndUnionTypes/input.ts.json index 2bf6e2bf45e7..19addad0eb38 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionAndUnionTypes/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionAndUnionTypes/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -125,7 +122,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -199,7 +194,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -243,7 +237,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -273,7 +266,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -327,6 +319,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -349,13 +342,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -387,6 +378,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -409,13 +401,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -447,6 +437,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -469,13 +460,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -507,6 +496,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -529,13 +519,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -567,6 +555,7 @@ "ctxt": 0 }, "value": "anb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -597,7 +586,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -617,15 +605,13 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -657,6 +643,7 @@ "ctxt": 0 }, "value": "aob", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -687,7 +674,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -707,15 +693,13 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -747,6 +731,7 @@ "ctxt": 0 }, "value": "cnd", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -777,7 +762,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -797,15 +781,13 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -837,6 +819,7 @@ "ctxt": 0 }, "value": "cod", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -867,7 +850,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -887,15 +869,13 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -927,6 +907,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -965,7 +946,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -985,7 +965,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1015,7 +994,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1035,7 +1013,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1044,8 +1021,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1077,6 +1053,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1122,7 +1099,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1142,7 +1118,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1180,7 +1155,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1200,7 +1174,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1210,8 +1183,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1241,8 +1213,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1252,7 +1224,6 @@ "ctxt": 0 }, "value": "anb", - "typeAnnotation": null, "optional": false } } @@ -1280,8 +1251,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1291,7 +1262,6 @@ "ctxt": 0 }, "value": "anb", - "typeAnnotation": null, "optional": false } } @@ -1319,8 +1289,8 @@ "ctxt": 0 }, "value": "anb", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1330,7 +1300,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1358,8 +1327,8 @@ "ctxt": 0 }, "value": "anb", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1369,7 +1338,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1397,8 +1365,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1408,7 +1376,6 @@ "ctxt": 0 }, "value": "anb", - "typeAnnotation": null, "optional": false } } @@ -1436,8 +1403,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1447,7 +1414,6 @@ "ctxt": 0 }, "value": "aob", - "typeAnnotation": null, "optional": false } } @@ -1475,8 +1441,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1486,7 +1452,6 @@ "ctxt": 0 }, "value": "cnd", - "typeAnnotation": null, "optional": false } } @@ -1514,8 +1479,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1525,7 +1490,6 @@ "ctxt": 0 }, "value": "cod", - "typeAnnotation": null, "optional": false } } @@ -1553,8 +1517,8 @@ "ctxt": 0 }, "value": "anb", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1564,7 +1528,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1592,8 +1555,8 @@ "ctxt": 0 }, "value": "aob", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1603,7 +1566,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1631,8 +1593,8 @@ "ctxt": 0 }, "value": "cnd", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1642,7 +1604,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1670,8 +1631,8 @@ "ctxt": 0 }, "value": "cod", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1681,7 +1642,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1709,8 +1669,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1720,7 +1680,6 @@ "ctxt": 0 }, "value": "anb", - "typeAnnotation": null, "optional": false } } @@ -1748,8 +1707,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1759,7 +1718,6 @@ "ctxt": 0 }, "value": "aob", - "typeAnnotation": null, "optional": false } } @@ -1787,8 +1745,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1798,7 +1756,6 @@ "ctxt": 0 }, "value": "cnd", - "typeAnnotation": null, "optional": false } } @@ -1826,8 +1783,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1837,7 +1794,6 @@ "ctxt": 0 }, "value": "cod", - "typeAnnotation": null, "optional": false } } @@ -1865,8 +1821,8 @@ "ctxt": 0 }, "value": "anb", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1876,7 +1832,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1904,8 +1859,8 @@ "ctxt": 0 }, "value": "aob", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1915,7 +1870,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1943,8 +1897,8 @@ "ctxt": 0 }, "value": "cnd", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1954,7 +1908,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1982,8 +1935,8 @@ "ctxt": 0 }, "value": "cod", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1993,7 +1946,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionAsWeakTypeSource/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionAsWeakTypeSource/input.ts.json index da9349961272..21c6ce513349 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionAsWeakTypeSource/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionAsWeakTypeSource/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -125,7 +122,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -199,7 +194,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -244,7 +238,6 @@ "ctxt": 0 }, "value": "XY", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -271,7 +264,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -291,7 +283,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -324,6 +315,7 @@ "ctxt": 0 }, "value": "xy", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -346,13 +338,11 @@ "ctxt": 0 }, "value": "XY", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -372,7 +362,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -400,7 +389,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -444,6 +432,7 @@ "ctxt": 0 }, "value": "z1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -466,13 +455,11 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -482,7 +469,6 @@ "ctxt": 0 }, "value": "xy", - "typeAnnotation": null, "optional": false }, "definite": false @@ -504,7 +490,6 @@ "ctxt": 0 }, "value": "ViewStyle", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -534,7 +519,6 @@ "ctxt": 0 }, "value": "view", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -576,7 +560,6 @@ "ctxt": 0 }, "value": "styleMedia", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -621,7 +604,6 @@ "ctxt": 0 }, "value": "Brand", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -647,7 +629,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -696,7 +677,6 @@ "ctxt": 0 }, "value": "__brand", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -725,7 +705,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -748,7 +727,6 @@ "ctxt": 0 }, "value": "create", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -769,6 +747,7 @@ "ctxt": 0 }, "value": "styles", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -791,13 +770,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -833,7 +810,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -855,6 +831,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -871,8 +848,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -897,7 +873,6 @@ "ctxt": 0 }, "value": "ViewStyle", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -946,7 +921,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -972,7 +946,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -997,7 +970,6 @@ "ctxt": 0 }, "value": "Brand", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1031,7 +1003,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1051,7 +1022,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1088,8 +1058,8 @@ "ctxt": 0 }, "value": "wrapped", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1106,7 +1076,6 @@ "ctxt": 0 }, "value": "create", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1130,7 +1099,6 @@ "ctxt": 0 }, "value": "first", - "typeAnnotation": null, "optional": false }, "value": { @@ -1151,7 +1119,6 @@ "ctxt": 0 }, "value": "view", - "typeAnnotation": null, "optional": false }, "value": { @@ -1174,7 +1141,6 @@ "ctxt": 0 }, "value": "styleMedia", - "typeAnnotation": null, "optional": false }, "value": { @@ -1230,6 +1196,7 @@ "ctxt": 0 }, "value": "vs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1252,13 +1219,11 @@ "ctxt": 0 }, "value": "ViewStyle", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -1275,7 +1240,6 @@ "ctxt": 0 }, "value": "wrapped", - "typeAnnotation": null, "optional": false }, "property": { @@ -1286,7 +1250,6 @@ "ctxt": 0 }, "value": "first", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionMemberOfUnionNarrowsCorrectly/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionMemberOfUnionNarrowsCorrectly/input.ts.json index 6444dfc15eac..4f997742528b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionMemberOfUnionNarrowsCorrectly/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionMemberOfUnionNarrowsCorrectly/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -65,7 +64,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -120,7 +118,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -180,7 +177,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -245,7 +241,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -295,7 +290,6 @@ "ctxt": 0 }, "value": "Ex", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -321,7 +315,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -342,7 +335,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -372,7 +364,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -392,7 +383,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -412,7 +402,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -453,6 +442,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -475,7 +465,6 @@ "ctxt": 0 }, "value": "Ex", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -501,7 +490,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -530,7 +518,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -574,8 +561,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -604,7 +590,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -615,7 +600,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionOfUnionOfUnitTypes/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionOfUnionOfUnitTypes/input.ts.json index 4a32f710b848..07af2380ff9f 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionOfUnionOfUnitTypes/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionOfUnionOfUnitTypes/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -82,7 +79,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -102,7 +98,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "init": null @@ -122,7 +117,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "init": null @@ -142,7 +136,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "init": null @@ -174,6 +167,7 @@ "ctxt": 0 }, "value": "x0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -359,8 +353,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -392,6 +385,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -577,8 +571,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -610,6 +603,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -795,8 +789,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -828,6 +821,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1013,8 +1007,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1046,6 +1039,7 @@ "ctxt": 0 }, "value": "x4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1315,8 +1309,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1348,6 +1341,7 @@ "ctxt": 0 }, "value": "x5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1701,8 +1695,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1734,6 +1727,7 @@ "ctxt": 0 }, "value": "y0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1889,8 +1883,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1922,6 +1915,7 @@ "ctxt": 0 }, "value": "y1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2077,8 +2071,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2110,6 +2103,7 @@ "ctxt": 0 }, "value": "y2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2265,8 +2259,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2298,6 +2291,7 @@ "ctxt": 0 }, "value": "y3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2453,8 +2447,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2486,6 +2479,7 @@ "ctxt": 0 }, "value": "y4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2710,8 +2704,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2743,6 +2736,7 @@ "ctxt": 0 }, "value": "y5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3036,8 +3030,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3069,6 +3062,7 @@ "ctxt": 0 }, "value": "z0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3116,7 +3110,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -3127,7 +3120,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -3150,7 +3142,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -3161,7 +3152,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -3184,7 +3174,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -3195,7 +3184,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -3236,7 +3224,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -3247,7 +3234,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -3270,7 +3256,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -3281,7 +3266,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -3304,7 +3288,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -3315,7 +3298,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -3326,8 +3308,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3359,6 +3340,7 @@ "ctxt": 0 }, "value": "z1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3406,7 +3388,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -3417,7 +3398,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -3440,7 +3420,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -3451,7 +3430,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -3474,7 +3452,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -3485,7 +3462,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -3526,7 +3502,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -3537,7 +3512,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -3560,7 +3534,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -3571,7 +3544,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -3594,7 +3566,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -3605,7 +3576,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false } }, @@ -3616,8 +3586,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3649,6 +3618,7 @@ "ctxt": 0 }, "value": "z2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3696,7 +3666,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -3707,7 +3676,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -3730,7 +3698,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -3741,7 +3708,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -3764,7 +3730,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -3775,7 +3740,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -3816,7 +3780,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -3827,7 +3790,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -3850,7 +3812,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -3861,7 +3822,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false } }, @@ -3884,7 +3844,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -3895,7 +3854,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false } }, @@ -3906,8 +3864,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3939,6 +3896,7 @@ "ctxt": 0 }, "value": "z3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3986,7 +3944,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -3997,7 +3954,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -4020,7 +3976,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -4031,7 +3986,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -4054,7 +4008,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -4065,7 +4018,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -4106,7 +4058,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -4117,7 +4068,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false } }, @@ -4140,7 +4090,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -4151,7 +4100,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false } }, @@ -4174,7 +4122,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -4185,7 +4132,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false } }, @@ -4196,8 +4142,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -4229,6 +4174,7 @@ "ctxt": 0 }, "value": "z4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4276,7 +4222,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -4287,7 +4232,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -4310,7 +4254,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -4321,7 +4264,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -4344,7 +4286,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -4355,7 +4296,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -4396,7 +4336,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -4407,7 +4346,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -4430,7 +4368,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -4441,7 +4378,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -4464,7 +4400,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -4475,7 +4410,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false } }, @@ -4516,7 +4450,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -4527,7 +4460,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -4550,7 +4482,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -4561,7 +4492,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false } }, @@ -4584,7 +4514,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -4595,7 +4524,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false } }, @@ -4606,8 +4534,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -4639,6 +4566,7 @@ "ctxt": 0 }, "value": "z5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4686,7 +4614,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -4697,7 +4624,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -4720,7 +4646,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -4731,7 +4656,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -4754,7 +4678,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -4765,7 +4688,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -4806,7 +4728,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -4817,7 +4738,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -4840,7 +4760,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -4851,7 +4770,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -4874,7 +4792,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -4885,7 +4802,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false } }, @@ -4926,7 +4842,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -4937,7 +4852,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -4960,7 +4874,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -4971,7 +4884,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false } }, @@ -4994,7 +4906,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -5005,7 +4916,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false } }, @@ -5046,7 +4956,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -5057,7 +4966,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false } }, @@ -5080,7 +4988,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -5091,7 +4998,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false } }, @@ -5114,7 +5020,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -5125,7 +5030,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false } }, @@ -5136,8 +5040,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionReduction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionReduction/input.ts.json index 6094a2910a88..8241918de6de 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionReduction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionReduction/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "sym1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -56,8 +57,7 @@ "kind": "symbol" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -89,6 +89,7 @@ "ctxt": 0 }, "value": "sym2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -114,8 +115,7 @@ "kind": "symbol" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -138,7 +138,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -200,7 +199,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -284,7 +282,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -341,7 +338,6 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -415,7 +411,6 @@ "ctxt": 0 }, "value": "T5", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -451,7 +446,6 @@ "ctxt": 0 }, "value": "sym1", - "typeAnnotation": null, "optional": false } } @@ -474,7 +468,6 @@ "ctxt": 0 }, "value": "T6", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -501,7 +494,6 @@ "ctxt": 0 }, "value": "sym1", - "typeAnnotation": null, "optional": false } }, @@ -529,7 +521,6 @@ "ctxt": 0 }, "value": "sym2", - "typeAnnotation": null, "optional": false } } @@ -552,7 +543,6 @@ "ctxt": 0 }, "value": "T7", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -645,7 +635,6 @@ "ctxt": 0 }, "value": "sym1", - "typeAnnotation": null, "optional": false } } @@ -668,7 +657,6 @@ "ctxt": 0 }, "value": "T10", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -770,7 +758,6 @@ "ctxt": 0 }, "value": "T11", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -894,7 +881,6 @@ "ctxt": 0 }, "value": "N1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -969,7 +955,6 @@ "ctxt": 0 }, "value": "N2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1005,7 +990,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1061,7 +1045,6 @@ "ctxt": 0 }, "value": "N3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1097,7 +1080,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1153,7 +1135,6 @@ "ctxt": 0 }, "value": "N4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1202,7 +1183,6 @@ "ctxt": 0 }, "value": "N5", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1251,7 +1231,6 @@ "ctxt": 0 }, "value": "N6", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1300,7 +1279,6 @@ "ctxt": 0 }, "value": "N7", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1349,7 +1327,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1377,7 +1354,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1422,7 +1398,6 @@ "ctxt": 0 }, "value": "X1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1449,7 +1424,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1527,7 +1501,6 @@ "ctxt": 0 }, "value": "X2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1554,7 +1527,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1591,7 +1563,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1649,7 +1620,6 @@ "ctxt": 0 }, "value": "X3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1676,7 +1646,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1713,7 +1682,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1771,7 +1739,6 @@ "ctxt": 0 }, "value": "X4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1798,7 +1765,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1850,7 +1816,6 @@ "ctxt": 0 }, "value": "X5", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1877,7 +1842,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1929,7 +1893,6 @@ "ctxt": 0 }, "value": "X6", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1956,7 +1919,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2008,7 +1970,6 @@ "ctxt": 0 }, "value": "X7", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2035,7 +1996,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2087,7 +2047,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2115,7 +2074,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2170,7 +2128,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2215,7 +2172,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2243,7 +2199,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2298,7 +2253,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2343,7 +2297,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2371,7 +2324,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2426,7 +2378,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2480,6 +2431,7 @@ "ctxt": 0 }, "value": "ab", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2510,7 +2462,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2530,15 +2481,13 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2567,7 +2516,6 @@ "ctxt": 0 }, "value": "ab", - "typeAnnotation": null, "optional": false }, "property": { @@ -2578,7 +2526,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2609,6 +2556,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2639,7 +2587,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2674,7 +2621,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2694,7 +2640,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2704,8 +2649,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2737,6 +2681,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2759,13 +2704,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2775,7 +2718,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2798,7 +2740,6 @@ "ctxt": 0 }, "value": "AB", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2825,7 +2766,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2845,7 +2785,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2869,7 +2808,6 @@ "ctxt": 0 }, "value": "BC", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2896,7 +2834,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2916,7 +2853,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2940,7 +2876,6 @@ "ctxt": 0 }, "value": "U1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2959,7 +2894,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2993,7 +2927,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3013,7 +2946,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3040,7 +2972,6 @@ "ctxt": 0 }, "value": "U2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3059,7 +2990,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3093,7 +3023,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3113,7 +3042,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3140,7 +3068,6 @@ "ctxt": 0 }, "value": "U3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3182,7 +3109,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3202,7 +3128,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3250,7 +3175,6 @@ "ctxt": 0 }, "value": "U4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3285,7 +3209,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3305,7 +3228,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3335,7 +3257,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3355,7 +3276,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3381,7 +3301,6 @@ "ctxt": 0 }, "value": "U5", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3408,7 +3327,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3436,7 +3354,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3456,7 +3373,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3482,7 +3398,6 @@ "ctxt": 0 }, "value": "K1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3524,7 +3439,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3544,7 +3458,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3570,7 +3483,6 @@ "ctxt": 0 }, "value": "K2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3605,7 +3517,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3634,7 +3545,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3659,7 +3569,6 @@ "ctxt": 0 }, "value": "Merge1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3685,7 +3594,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3706,7 +3614,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3737,7 +3644,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3778,7 +3684,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3798,7 +3703,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3833,7 +3737,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3861,7 +3764,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3890,7 +3792,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3910,7 +3811,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3939,7 +3839,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3967,7 +3866,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3995,7 +3893,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4023,7 +3920,6 @@ "ctxt": 0 }, "value": "Merge2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4049,7 +3945,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4070,7 +3965,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4101,7 +3995,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4135,7 +4028,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4164,7 +4056,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4198,7 +4089,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4226,7 +4116,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4255,7 +4144,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4275,7 +4163,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4304,7 +4191,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4332,7 +4218,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4360,7 +4245,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4388,7 +4272,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -4424,7 +4307,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4474,7 +4356,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4534,7 +4415,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4584,7 +4464,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4639,7 +4518,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -4658,7 +4536,6 @@ "ctxt": 0 }, "value": "Merge1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4693,7 +4570,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4743,7 +4619,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4803,7 +4678,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4853,7 +4727,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4909,7 +4782,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -4928,7 +4800,6 @@ "ctxt": 0 }, "value": "Merge2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4963,7 +4834,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5013,7 +4883,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5073,7 +4942,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5123,7 +4991,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5179,7 +5046,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -5207,7 +5073,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5262,7 +5127,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5307,7 +5171,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -5335,7 +5198,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5390,7 +5252,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5429,7 +5290,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5450,6 +5310,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5481,7 +5342,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5510,7 +5370,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5520,8 +5379,7 @@ } ] } - }, - "optional": false + } } } ], @@ -5557,7 +5415,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5587,7 +5444,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5619,6 +5475,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5649,7 +5506,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5669,15 +5525,13 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -5709,6 +5563,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5739,7 +5594,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5767,7 +5621,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5787,7 +5640,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5796,8 +5648,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -5829,8 +5680,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5847,7 +5698,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5861,7 +5711,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } } @@ -5897,8 +5746,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5915,7 +5764,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5929,7 +5777,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -5965,8 +5812,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -5986,7 +5833,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -6014,7 +5860,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -6058,8 +5903,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -6079,7 +5924,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -6107,7 +5951,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -6151,6 +5994,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6212,8 +6056,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -6250,7 +6093,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false }, "property": { @@ -6261,7 +6103,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -6329,7 +6170,6 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, "optional": false }, "property": { @@ -6340,7 +6180,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -6395,7 +6234,6 @@ "ctxt": 0 }, "value": "Tag1", - "typeAnnotation": null, "optional": false }, "members": [] @@ -6417,7 +6255,6 @@ "ctxt": 0 }, "value": "Tag2", - "typeAnnotation": null, "optional": false }, "members": [] @@ -6447,6 +6284,7 @@ "ctxt": 0 }, "value": "s1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6486,15 +6324,13 @@ "ctxt": 0 }, "value": "Tag1", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -6526,6 +6362,7 @@ "ctxt": 0 }, "value": "s2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6565,15 +6402,13 @@ "ctxt": 0 }, "value": "Tag2", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -6605,6 +6440,7 @@ "ctxt": 0 }, "value": "t1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6652,7 +6488,6 @@ "ctxt": 0 }, "value": "Tag1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6670,8 +6505,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -6703,6 +6537,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6750,7 +6585,6 @@ "ctxt": 0 }, "value": "Tag2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6768,8 +6602,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -6799,8 +6632,8 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6810,7 +6643,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -6838,8 +6670,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6849,7 +6681,6 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, "optional": false } } @@ -6877,8 +6708,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6888,7 +6719,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -6916,8 +6746,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6927,7 +6757,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -6957,8 +6786,8 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -6976,6 +6805,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7077,8 +6907,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -7089,7 +6918,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "async": false, @@ -7146,7 +6974,6 @@ "ctxt": 0 }, "value": "Container", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7172,7 +6999,6 @@ "ctxt": 0 }, "value": "Type", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7212,7 +7038,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7241,7 +7066,6 @@ "ctxt": 0 }, "value": "Type", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7277,8 +7101,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -7296,6 +7120,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7326,7 +7151,6 @@ "ctxt": 0 }, "value": "Container", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7392,7 +7216,6 @@ "ctxt": 0 }, "value": "Container", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7443,7 +7266,6 @@ "ctxt": 0 }, "value": "Container", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7484,8 +7306,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -7496,7 +7317,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "async": false, @@ -7524,7 +7344,6 @@ "ctxt": 0 }, "value": "Container", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7591,8 +7410,8 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -7610,6 +7429,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7640,7 +7460,6 @@ "ctxt": 0 }, "value": "Container", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7706,7 +7525,6 @@ "ctxt": 0 }, "value": "Container", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7766,7 +7584,6 @@ "ctxt": 0 }, "value": "dataB", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7809,7 +7626,6 @@ "ctxt": 0 }, "value": "Container", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7850,8 +7666,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -7862,7 +7677,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "async": false, @@ -7890,7 +7704,6 @@ "ctxt": 0 }, "value": "Container", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7957,8 +7770,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -7976,6 +7789,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8030,7 +7844,6 @@ "ctxt": 0 }, "value": "Container", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8090,7 +7903,6 @@ "ctxt": 0 }, "value": "dataB", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8133,7 +7945,6 @@ "ctxt": 0 }, "value": "Container", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8174,8 +7985,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -8186,7 +7996,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "async": false, @@ -8229,7 +8038,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8259,7 +8067,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8314,7 +8121,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8358,7 +8164,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8388,7 +8193,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8443,7 +8247,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8497,6 +8300,7 @@ "ctxt": 0 }, "value": "shouldBeB", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8542,7 +8346,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8562,7 +8365,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8585,15 +8387,13 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -8625,6 +8425,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8647,13 +8448,11 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -8663,7 +8462,6 @@ "ctxt": 0 }, "value": "shouldBeB", - "typeAnnotation": null, "optional": false }, "definite": false @@ -8680,7 +8478,6 @@ "ctxt": 0 }, "value": "inGeneric", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8701,6 +8498,7 @@ "ctxt": 0 }, "value": "alsoShouldBeB", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8731,7 +8529,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8751,15 +8548,13 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -8802,6 +8597,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8824,13 +8620,11 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -8840,7 +8634,6 @@ "ctxt": 0 }, "value": "alsoShouldBeB", - "typeAnnotation": null, "optional": false }, "definite": false @@ -8874,7 +8667,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8900,7 +8692,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8920,7 +8711,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8948,7 +8738,6 @@ "ctxt": 0 }, "value": "ABI", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8978,7 +8767,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9062,7 +8850,6 @@ "ctxt": 0 }, "value": "CA", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -9088,7 +8875,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "value": null, @@ -9147,7 +8933,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -9193,7 +8978,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -9249,7 +9033,6 @@ "ctxt": 0 }, "value": "CB", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -9275,7 +9058,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "value": null, @@ -9334,7 +9116,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -9380,7 +9161,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -9436,7 +9216,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9457,6 +9236,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9487,7 +9267,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9507,15 +9286,13 @@ "ctxt": 0 }, "value": "CA", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -9558,6 +9335,7 @@ "ctxt": 0 }, "value": "ab", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9580,13 +9358,11 @@ "ctxt": 0 }, "value": "ABI", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -9596,7 +9372,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -9630,7 +9405,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9656,7 +9430,6 @@ "ctxt": 0 }, "value": "CA", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9676,7 +9449,6 @@ "ctxt": 0 }, "value": "CB", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionReductionStrict/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionReductionStrict/input.ts.json index 6d924882982c..2d6b209d2423 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionReductionStrict/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionReductionStrict/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "sym1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -56,8 +57,7 @@ "kind": "symbol" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -89,6 +89,7 @@ "ctxt": 0 }, "value": "sym2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -114,8 +115,7 @@ "kind": "symbol" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -138,7 +138,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -200,7 +199,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -284,7 +282,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -341,7 +338,6 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -415,7 +411,6 @@ "ctxt": 0 }, "value": "T5", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -451,7 +446,6 @@ "ctxt": 0 }, "value": "sym1", - "typeAnnotation": null, "optional": false } } @@ -474,7 +468,6 @@ "ctxt": 0 }, "value": "T6", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -501,7 +494,6 @@ "ctxt": 0 }, "value": "sym1", - "typeAnnotation": null, "optional": false } }, @@ -529,7 +521,6 @@ "ctxt": 0 }, "value": "sym2", - "typeAnnotation": null, "optional": false } } @@ -552,7 +543,6 @@ "ctxt": 0 }, "value": "T7", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -645,7 +635,6 @@ "ctxt": 0 }, "value": "sym1", - "typeAnnotation": null, "optional": false } } @@ -668,7 +657,6 @@ "ctxt": 0 }, "value": "T10", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -770,7 +758,6 @@ "ctxt": 0 }, "value": "T11", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -894,7 +881,6 @@ "ctxt": 0 }, "value": "N1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -969,7 +955,6 @@ "ctxt": 0 }, "value": "N2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1005,7 +990,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1061,7 +1045,6 @@ "ctxt": 0 }, "value": "N3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1097,7 +1080,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1153,7 +1135,6 @@ "ctxt": 0 }, "value": "N4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1202,7 +1183,6 @@ "ctxt": 0 }, "value": "N5", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1251,7 +1231,6 @@ "ctxt": 0 }, "value": "N6", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1300,7 +1279,6 @@ "ctxt": 0 }, "value": "N7", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1349,7 +1327,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1377,7 +1354,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1422,7 +1398,6 @@ "ctxt": 0 }, "value": "X1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1449,7 +1424,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1527,7 +1501,6 @@ "ctxt": 0 }, "value": "X2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1554,7 +1527,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1591,7 +1563,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1649,7 +1620,6 @@ "ctxt": 0 }, "value": "X3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1676,7 +1646,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1713,7 +1682,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1771,7 +1739,6 @@ "ctxt": 0 }, "value": "X4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1798,7 +1765,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1850,7 +1816,6 @@ "ctxt": 0 }, "value": "X5", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1877,7 +1842,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1929,7 +1893,6 @@ "ctxt": 0 }, "value": "X6", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1956,7 +1919,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2008,7 +1970,6 @@ "ctxt": 0 }, "value": "X7", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2035,7 +1996,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2087,7 +2047,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2115,7 +2074,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2170,7 +2128,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2215,7 +2172,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2243,7 +2199,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2298,7 +2253,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2343,7 +2297,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2371,7 +2324,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2426,7 +2378,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2480,6 +2431,7 @@ "ctxt": 0 }, "value": "ab", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2510,7 +2462,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2530,15 +2481,13 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2567,7 +2516,6 @@ "ctxt": 0 }, "value": "ab", - "typeAnnotation": null, "optional": false }, "property": { @@ -2578,7 +2526,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2609,6 +2556,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2639,7 +2587,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2674,7 +2621,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2694,7 +2640,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2704,8 +2649,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2737,6 +2681,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2759,13 +2704,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2775,7 +2718,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2798,7 +2740,6 @@ "ctxt": 0 }, "value": "AB", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2825,7 +2766,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2845,7 +2785,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2869,7 +2808,6 @@ "ctxt": 0 }, "value": "BC", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2896,7 +2834,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2916,7 +2853,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2940,7 +2876,6 @@ "ctxt": 0 }, "value": "U1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2959,7 +2894,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2993,7 +2927,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3013,7 +2946,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3040,7 +2972,6 @@ "ctxt": 0 }, "value": "U2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3059,7 +2990,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3093,7 +3023,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3113,7 +3042,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3140,7 +3068,6 @@ "ctxt": 0 }, "value": "U3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3182,7 +3109,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3202,7 +3128,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3250,7 +3175,6 @@ "ctxt": 0 }, "value": "U4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3285,7 +3209,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3305,7 +3228,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3335,7 +3257,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3355,7 +3276,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3381,7 +3301,6 @@ "ctxt": 0 }, "value": "U5", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3408,7 +3327,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3436,7 +3354,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3456,7 +3373,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3482,7 +3398,6 @@ "ctxt": 0 }, "value": "K1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3524,7 +3439,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3544,7 +3458,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3570,7 +3483,6 @@ "ctxt": 0 }, "value": "K2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3605,7 +3517,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3634,7 +3545,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3659,7 +3569,6 @@ "ctxt": 0 }, "value": "Merge1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3685,7 +3594,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3706,7 +3614,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3737,7 +3644,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3778,7 +3684,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3798,7 +3703,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3833,7 +3737,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3861,7 +3764,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3890,7 +3792,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3910,7 +3811,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3939,7 +3839,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3967,7 +3866,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3995,7 +3893,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4023,7 +3920,6 @@ "ctxt": 0 }, "value": "Merge2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4049,7 +3945,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4070,7 +3965,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4101,7 +3995,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4135,7 +4028,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4164,7 +4056,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4198,7 +4089,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4226,7 +4116,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4255,7 +4144,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4275,7 +4163,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4304,7 +4191,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4332,7 +4218,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4360,7 +4245,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4388,7 +4272,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -4424,7 +4307,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4474,7 +4356,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4534,7 +4415,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4584,7 +4464,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4639,7 +4518,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -4658,7 +4536,6 @@ "ctxt": 0 }, "value": "Merge1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4693,7 +4570,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4743,7 +4619,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4803,7 +4678,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4853,7 +4727,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4909,7 +4782,6 @@ "ctxt": 0 }, "value": "M3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -4928,7 +4800,6 @@ "ctxt": 0 }, "value": "Merge2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4963,7 +4834,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5013,7 +4883,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5073,7 +4942,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5123,7 +4991,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5188,8 +5055,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -5209,7 +5076,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -5237,7 +5103,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -5281,8 +5146,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -5302,7 +5167,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -5330,7 +5194,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -5374,6 +5237,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5435,8 +5299,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -5473,7 +5336,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false }, "property": { @@ -5484,7 +5346,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -5552,7 +5413,6 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, "optional": false }, "property": { @@ -5563,7 +5423,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -5618,7 +5477,6 @@ "ctxt": 0 }, "value": "Tag1", - "typeAnnotation": null, "optional": false }, "members": [] @@ -5640,7 +5498,6 @@ "ctxt": 0 }, "value": "Tag2", - "typeAnnotation": null, "optional": false }, "members": [] @@ -5670,6 +5527,7 @@ "ctxt": 0 }, "value": "s1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5709,15 +5567,13 @@ "ctxt": 0 }, "value": "Tag1", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -5749,6 +5605,7 @@ "ctxt": 0 }, "value": "s2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5788,15 +5645,13 @@ "ctxt": 0 }, "value": "Tag2", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -5828,6 +5683,7 @@ "ctxt": 0 }, "value": "t1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5875,7 +5731,6 @@ "ctxt": 0 }, "value": "Tag1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5893,8 +5748,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -5926,6 +5780,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5973,7 +5828,6 @@ "ctxt": 0 }, "value": "Tag2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5991,8 +5845,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -6022,8 +5875,8 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6033,7 +5886,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -6061,8 +5913,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6072,7 +5924,6 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, "optional": false } } @@ -6100,8 +5951,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6111,7 +5962,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -6139,8 +5989,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6150,7 +6000,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -6180,8 +6029,8 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -6199,6 +6048,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6300,8 +6150,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -6312,7 +6161,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "async": false, @@ -6369,7 +6217,6 @@ "ctxt": 0 }, "value": "Container", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6395,7 +6242,6 @@ "ctxt": 0 }, "value": "Type", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6435,7 +6281,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6464,7 +6309,6 @@ "ctxt": 0 }, "value": "Type", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6500,8 +6344,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -6519,6 +6363,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6549,7 +6394,6 @@ "ctxt": 0 }, "value": "Container", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6615,7 +6459,6 @@ "ctxt": 0 }, "value": "Container", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6666,7 +6509,6 @@ "ctxt": 0 }, "value": "Container", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6707,8 +6549,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -6719,7 +6560,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "async": false, @@ -6747,7 +6587,6 @@ "ctxt": 0 }, "value": "Container", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6814,8 +6653,8 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -6833,6 +6672,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6863,7 +6703,6 @@ "ctxt": 0 }, "value": "Container", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6929,7 +6768,6 @@ "ctxt": 0 }, "value": "Container", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6989,7 +6827,6 @@ "ctxt": 0 }, "value": "dataB", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7032,7 +6869,6 @@ "ctxt": 0 }, "value": "Container", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7073,8 +6909,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -7085,7 +6920,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "async": false, @@ -7113,7 +6947,6 @@ "ctxt": 0 }, "value": "Container", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7180,8 +7013,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -7199,6 +7032,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7253,7 +7087,6 @@ "ctxt": 0 }, "value": "Container", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7313,7 +7146,6 @@ "ctxt": 0 }, "value": "dataB", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7356,7 +7188,6 @@ "ctxt": 0 }, "value": "Container", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7397,8 +7228,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -7409,7 +7239,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionThisTypes/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionThisTypes/input.ts.json index ad50020bbe7e..e24e88c0af8e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionThisTypes/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionThisTypes/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Thing1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -135,7 +132,6 @@ "ctxt": 0 }, "value": "Thing2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -165,7 +161,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -207,7 +202,6 @@ "ctxt": 0 }, "value": "me", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -250,7 +244,6 @@ "ctxt": 0 }, "value": "Thing3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -277,7 +270,6 @@ "ctxt": 0 }, "value": "Thing1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -297,7 +289,6 @@ "ctxt": 0 }, "value": "Thing2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -321,7 +312,6 @@ "ctxt": 0 }, "value": "Thing4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -348,7 +338,6 @@ "ctxt": 0 }, "value": "Thing3", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -383,7 +372,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -404,6 +392,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -426,13 +415,11 @@ "ctxt": 0 }, "value": "Thing3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -473,8 +460,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -498,7 +485,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -509,7 +495,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "computed": false @@ -542,8 +527,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -595,7 +580,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -606,7 +590,6 @@ "ctxt": 0 }, "value": "me", - "typeAnnotation": null, "optional": false }, "computed": false @@ -622,7 +605,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "computed": false @@ -638,7 +620,6 @@ "ctxt": 0 }, "value": "me", - "typeAnnotation": null, "optional": false }, "computed": false @@ -670,7 +651,6 @@ "ctxt": 0 }, "value": "Thing5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -691,7 +671,6 @@ "ctxt": 0 }, "value": "Thing4", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -721,7 +700,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -760,7 +738,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -781,6 +758,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -803,13 +781,11 @@ "ctxt": 0 }, "value": "Thing5", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -850,8 +826,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -875,7 +851,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -886,7 +861,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "computed": false @@ -919,8 +893,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -972,7 +946,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -983,7 +956,6 @@ "ctxt": 0 }, "value": "me", - "typeAnnotation": null, "optional": false }, "computed": false @@ -999,7 +971,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1015,7 +986,6 @@ "ctxt": 0 }, "value": "me", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1047,7 +1017,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1077,7 +1046,6 @@ "ctxt": 0 }, "value": "extend", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1091,6 +1059,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1113,13 +1082,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1160,7 +1127,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1191,7 +1157,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1218,7 +1183,6 @@ "ctxt": 0 }, "value": "Label", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1239,7 +1203,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1269,7 +1232,6 @@ "ctxt": 0 }, "value": "title", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1308,7 +1270,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1329,6 +1290,7 @@ "ctxt": 0 }, "value": "label", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1351,13 +1313,11 @@ "ctxt": 0 }, "value": "Label", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1400,8 +1360,8 @@ "ctxt": 0 }, "value": "extended", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1439,7 +1399,6 @@ "ctxt": 0 }, "value": "label", - "typeAnnotation": null, "optional": false }, "property": { @@ -1450,7 +1409,6 @@ "ctxt": 0 }, "value": "extend", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1476,7 +1434,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": { @@ -1503,7 +1460,6 @@ "ctxt": 0 }, "value": "extend", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1529,7 +1485,6 @@ "ctxt": 0 }, "value": "tag", - "typeAnnotation": null, "optional": false }, "value": { @@ -1579,7 +1534,6 @@ "ctxt": 0 }, "value": "extended", - "typeAnnotation": null, "optional": false }, "property": { @@ -1590,7 +1544,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1618,7 +1571,6 @@ "ctxt": 0 }, "value": "extended", - "typeAnnotation": null, "optional": false }, "property": { @@ -1629,7 +1581,6 @@ "ctxt": 0 }, "value": "tag", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeAssignment/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeAssignment/input.ts.json index d35874bb4451..b85feb3d4357 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeAssignment/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeAssignment/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,8 +90,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -123,6 +122,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -154,7 +154,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -182,8 +181,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -215,6 +213,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -246,7 +245,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -288,7 +286,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -316,8 +313,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -349,6 +345,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -388,7 +385,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -440,7 +436,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -470,8 +465,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -501,8 +495,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -512,7 +506,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -540,8 +533,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -551,7 +544,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -579,8 +571,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -590,7 +582,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -618,8 +609,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -629,7 +620,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -657,8 +647,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -668,7 +658,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -696,8 +685,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -707,7 +696,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -735,8 +723,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -746,7 +734,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -774,8 +761,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -785,7 +772,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -813,8 +799,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -824,7 +810,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -852,8 +837,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -863,7 +848,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeEquivalence/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeEquivalence/input.ts.json index f795b16ccb12..f87da5c281fd 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeEquivalence/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeEquivalence/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -125,7 +122,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -199,7 +194,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -253,6 +247,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -283,7 +278,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -303,15 +297,13 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -343,6 +335,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -373,7 +366,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -393,15 +385,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -433,6 +423,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -463,7 +454,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -483,7 +473,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -503,15 +492,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -543,6 +530,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -588,7 +576,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -608,7 +595,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -631,15 +617,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,6 +655,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -701,7 +686,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -736,7 +720,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -756,7 +739,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -766,8 +748,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -799,6 +780,7 @@ "ctxt": 0 }, "value": "ab", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -829,7 +811,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -849,15 +830,13 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -889,6 +868,7 @@ "ctxt": 0 }, "value": "bc", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -919,7 +899,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -939,15 +918,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -979,6 +956,7 @@ "ctxt": 0 }, "value": "z1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1009,7 +987,6 @@ "ctxt": 0 }, "value": "ab", - "typeAnnotation": null, "optional": false } }, @@ -1028,15 +1005,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1068,6 +1043,7 @@ "ctxt": 0 }, "value": "z1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1098,7 +1074,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1118,14 +1093,12 @@ "ctxt": 0 }, "value": "bc", - "typeAnnotation": null, "optional": false } } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeInference/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeInference/input.ts.json index a0d87ef93654..dcabe89adf95 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeInference/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeInference/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "extend", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "obj1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "obj2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -106,13 +105,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -155,6 +152,7 @@ "ctxt": 0 }, "value": "result", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -185,7 +183,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -205,15 +202,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -243,8 +238,8 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -254,7 +249,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false } } @@ -282,8 +276,8 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -293,7 +287,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false } } @@ -321,8 +314,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -332,7 +325,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false } } @@ -360,8 +352,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -371,7 +363,6 @@ "ctxt": 0 }, "value": "obj2", - "typeAnnotation": null, "optional": false } } @@ -391,7 +382,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false } } @@ -422,7 +412,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -443,7 +432,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -481,7 +469,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -501,7 +488,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -535,8 +521,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -553,7 +539,6 @@ "ctxt": 0 }, "value": "extend", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -577,7 +562,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -618,7 +602,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -666,8 +649,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -684,7 +667,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -695,7 +677,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -729,8 +710,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -747,7 +728,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -758,7 +738,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -782,7 +761,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -809,7 +787,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -842,7 +819,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -871,7 +847,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -897,7 +872,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -924,7 +898,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -957,7 +930,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -986,7 +958,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1007,7 +978,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1028,6 +998,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1058,7 +1029,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1084,7 +1054,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1107,7 +1076,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1133,7 +1101,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1143,8 +1110,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1177,7 +1143,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1208,7 +1173,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1229,7 +1193,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1267,7 +1230,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1287,7 +1249,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1321,8 +1282,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1339,7 +1300,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1363,7 +1323,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1391,7 +1350,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1439,6 +1397,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1474,8 +1433,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeInference2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeInference2/input.ts.json index 56820cd05d24..5643ea7209f4 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeInference2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeInference2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -68,7 +68,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -97,7 +96,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -107,8 +105,7 @@ } ] } - }, - "optional": false + } } } ], @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -174,7 +170,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -206,6 +201,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -245,7 +241,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -297,7 +292,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -327,8 +321,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -360,6 +353,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -391,7 +385,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -438,8 +431,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -468,7 +460,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -482,7 +473,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -512,7 +502,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -526,7 +515,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -544,7 +532,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -565,6 +552,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -595,7 +583,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -621,7 +608,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -654,7 +640,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -674,15 +659,13 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -701,6 +684,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -723,13 +707,11 @@ "ctxt": 0 }, "value": "Key", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -765,7 +747,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -786,7 +767,6 @@ "ctxt": 0 }, "value": "Key", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -812,7 +792,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -852,7 +831,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -872,7 +850,6 @@ "ctxt": 0 }, "value": "Key", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -905,6 +882,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -944,7 +922,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -996,7 +973,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1026,8 +1002,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1056,7 +1031,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1070,7 +1044,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } }, @@ -1117,7 +1090,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1131,7 +1103,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeInference3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeInference3/input.ts.json index e2fdaec74ed4..3799ae777646 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeInference3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeInference3/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "Nominal", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -77,7 +75,6 @@ "ctxt": 0 }, "value": "Type", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -108,7 +105,6 @@ "ctxt": 0 }, "value": "Type", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -144,7 +140,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "property": { @@ -155,7 +150,6 @@ "ctxt": 0 }, "value": "species", - "typeAnnotation": null, "optional": false }, "computed": false @@ -186,7 +180,6 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -215,7 +208,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -234,7 +226,6 @@ "ctxt": 0 }, "value": "Nominal", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -305,6 +296,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -327,7 +319,6 @@ "ctxt": 0 }, "value": "Set", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -353,7 +344,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -361,8 +351,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -394,6 +383,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -416,7 +406,6 @@ "ctxt": 0 }, "value": "Set", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -442,7 +431,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -450,8 +438,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,8 +470,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -522,7 +509,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "property": { @@ -533,7 +519,6 @@ "ctxt": 0 }, "value": "from", - "typeAnnotation": null, "optional": false }, "computed": false @@ -549,7 +534,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -564,7 +548,6 @@ "ctxt": 0 }, "value": "concat", - "typeAnnotation": null, "optional": false }, "computed": false @@ -594,7 +577,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "property": { @@ -605,7 +587,6 @@ "ctxt": 0 }, "value": "from", - "typeAnnotation": null, "optional": false }, "computed": false @@ -621,7 +602,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -646,7 +626,6 @@ "ctxt": 0 }, "value": "from", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -683,7 +662,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -720,7 +698,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -753,6 +730,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -775,7 +753,6 @@ "ctxt": 0 }, "value": "ReadonlyArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -801,7 +778,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -809,8 +785,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -827,7 +802,6 @@ "ctxt": 0 }, "value": "from", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeMembers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeMembers/input.ts.json index b0c19342e70b..027708e5d70f 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeMembers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeMembers/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -125,7 +122,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -199,7 +194,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -253,6 +247,7 @@ "ctxt": 0 }, "value": "abc", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -283,7 +278,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -303,7 +297,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -323,15 +316,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -368,7 +359,6 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, "optional": false }, "property": { @@ -379,7 +369,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -430,7 +419,6 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, "optional": false }, "property": { @@ -441,7 +429,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -492,7 +479,6 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, "optional": false }, "property": { @@ -503,7 +489,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -539,7 +524,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -569,7 +553,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -598,7 +581,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -624,7 +606,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -654,7 +635,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -683,7 +663,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -709,7 +688,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -739,7 +717,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -768,7 +745,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -804,6 +780,7 @@ "ctxt": 0 }, "value": "xyz", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -834,7 +811,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -854,7 +830,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -874,15 +849,13 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -926,7 +899,6 @@ "ctxt": 0 }, "value": "xyz", - "typeAnnotation": null, "optional": false }, "property": { @@ -937,7 +909,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -950,7 +921,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1008,7 +978,6 @@ "ctxt": 0 }, "value": "xyz", - "typeAnnotation": null, "optional": false }, "property": { @@ -1019,7 +988,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1032,7 +1000,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1090,7 +1057,6 @@ "ctxt": 0 }, "value": "xyz", - "typeAnnotation": null, "optional": false }, "property": { @@ -1101,7 +1067,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1114,7 +1079,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1151,7 +1115,6 @@ "ctxt": 0 }, "value": "F1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1171,6 +1134,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1187,8 +1151,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -1227,7 +1190,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1247,6 +1209,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1263,8 +1226,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1312,6 +1274,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1342,7 +1305,6 @@ "ctxt": 0 }, "value": "F1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1362,15 +1324,13 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1402,8 +1362,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1420,7 +1380,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1473,8 +1432,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1491,7 +1450,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1529,7 +1487,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1559,7 +1516,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1597,7 +1553,6 @@ "ctxt": 0 }, "value": "doublyNested", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1635,7 +1590,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1682,7 +1636,6 @@ "ctxt": 0 }, "value": "different", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1720,7 +1673,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1774,7 +1726,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1804,7 +1755,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1842,7 +1792,6 @@ "ctxt": 0 }, "value": "doublyNested", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1880,7 +1829,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1927,7 +1875,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1965,7 +1912,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2029,6 +1975,7 @@ "ctxt": 0 }, "value": "de", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2059,7 +2006,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2079,15 +2025,13 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -2107,7 +2051,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "value": { @@ -2128,7 +2071,6 @@ "ctxt": 0 }, "value": "doublyNested", - "typeAnnotation": null, "optional": false }, "value": { @@ -2149,7 +2091,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -2177,7 +2118,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -2208,7 +2148,6 @@ "ctxt": 0 }, "value": "different", - "typeAnnotation": null, "optional": false }, "value": { @@ -2229,7 +2168,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": { @@ -2255,7 +2193,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "value": { @@ -2276,7 +2213,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "value": { @@ -2316,7 +2252,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2346,7 +2281,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2384,7 +2318,6 @@ "ctxt": 0 }, "value": "doublyNested", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2422,7 +2355,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2476,7 +2408,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2506,7 +2437,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2544,7 +2474,6 @@ "ctxt": 0 }, "value": "doublyNested", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2582,7 +2511,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2646,6 +2574,7 @@ "ctxt": 0 }, "value": "defg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2676,7 +2605,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2696,7 +2624,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2716,7 +2643,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2736,15 +2662,13 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -2764,7 +2688,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "value": { @@ -2785,7 +2708,6 @@ "ctxt": 0 }, "value": "doublyNested", - "typeAnnotation": null, "optional": false }, "value": { @@ -2806,7 +2728,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -2834,7 +2755,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -2862,7 +2782,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "value": { @@ -2890,7 +2809,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "value": { @@ -2921,7 +2839,6 @@ "ctxt": 0 }, "value": "different", - "typeAnnotation": null, "optional": false }, "value": { @@ -2942,7 +2859,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": { @@ -2968,7 +2884,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "value": { @@ -2989,7 +2904,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeOverloading/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeOverloading/input.ts.json index a58e9b3b392c..f63cc0b704b3 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeOverloading/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeOverloading/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -42,6 +41,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -58,8 +58,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -98,7 +97,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -118,6 +116,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -134,8 +133,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "typeParams": null, @@ -183,6 +181,7 @@ "ctxt": 0 }, "value": "fg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -213,7 +212,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -233,15 +231,13 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -273,6 +269,7 @@ "ctxt": 0 }, "value": "gf", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -303,7 +300,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -323,15 +319,13 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -363,8 +357,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -381,7 +375,6 @@ "ctxt": 0 }, "value": "fg", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -434,6 +427,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -450,8 +444,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -483,8 +476,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -501,7 +494,6 @@ "ctxt": 0 }, "value": "gf", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -554,6 +546,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -570,8 +563,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeReadonly/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeReadonly/input.ts.json index 43ca8839ccca..79965623c935 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeReadonly/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionTypeReadonly/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Identical", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -125,7 +122,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "Mutable", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -199,7 +194,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -243,7 +237,6 @@ "ctxt": 0 }, "value": "DifferentType", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -273,7 +266,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -317,7 +309,6 @@ "ctxt": 0 }, "value": "DifferentName", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -347,7 +338,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -401,6 +391,7 @@ "ctxt": 0 }, "value": "base", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -423,13 +414,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -466,7 +455,6 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, "optional": false }, "property": { @@ -477,7 +465,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false @@ -518,6 +505,7 @@ "ctxt": 0 }, "value": "identical", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -548,7 +536,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -568,15 +555,13 @@ "ctxt": 0 }, "value": "Identical", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -613,7 +598,6 @@ "ctxt": 0 }, "value": "identical", - "typeAnnotation": null, "optional": false }, "property": { @@ -624,7 +608,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false @@ -665,6 +648,7 @@ "ctxt": 0 }, "value": "mutable", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -695,7 +679,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -715,15 +698,13 @@ "ctxt": 0 }, "value": "Mutable", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -760,7 +741,6 @@ "ctxt": 0 }, "value": "mutable", - "typeAnnotation": null, "optional": false }, "property": { @@ -771,7 +751,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false @@ -812,6 +791,7 @@ "ctxt": 0 }, "value": "differentType", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -842,7 +822,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -862,15 +841,13 @@ "ctxt": 0 }, "value": "DifferentType", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -907,7 +884,6 @@ "ctxt": 0 }, "value": "differentType", - "typeAnnotation": null, "optional": false }, "property": { @@ -918,7 +894,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false @@ -959,6 +934,7 @@ "ctxt": 0 }, "value": "differentName", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -989,7 +965,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1009,15 +984,13 @@ "ctxt": 0 }, "value": "DifferentName", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1054,7 +1027,6 @@ "ctxt": 0 }, "value": "differentName", - "typeAnnotation": null, "optional": false }, "property": { @@ -1065,7 +1037,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionWithIndexSignatures/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionWithIndexSignatures/input.ts.json index d80fcf49fb07..3295fc78fb13 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionWithIndexSignatures/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionWithIndexSignatures/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -123,7 +120,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -177,6 +173,7 @@ "ctxt": 0 }, "value": "sa1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -208,7 +205,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -245,7 +241,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -265,7 +260,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -277,8 +271,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -310,6 +303,7 @@ "ctxt": 0 }, "value": "sa2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -349,7 +343,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -378,7 +371,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -412,7 +404,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -441,7 +432,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -453,8 +443,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -486,6 +475,7 @@ "ctxt": 0 }, "value": "ta1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -512,6 +502,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -528,8 +519,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -562,7 +552,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -582,7 +571,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -599,8 +587,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -632,6 +619,7 @@ "ctxt": 0 }, "value": "ta2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -666,6 +654,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -682,8 +671,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -708,7 +696,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -742,6 +729,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,8 +746,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -784,7 +771,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -801,8 +787,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -832,8 +817,8 @@ "ctxt": 0 }, "value": "ta1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -843,7 +828,6 @@ "ctxt": 0 }, "value": "sa1", - "typeAnnotation": null, "optional": false } } @@ -871,8 +855,8 @@ "ctxt": 0 }, "value": "ta1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -882,7 +866,6 @@ "ctxt": 0 }, "value": "sa2", - "typeAnnotation": null, "optional": false } } @@ -910,8 +893,8 @@ "ctxt": 0 }, "value": "ta2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -921,7 +904,6 @@ "ctxt": 0 }, "value": "sa1", - "typeAnnotation": null, "optional": false } } @@ -949,8 +931,8 @@ "ctxt": 0 }, "value": "ta2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -960,7 +942,6 @@ "ctxt": 0 }, "value": "sa2", - "typeAnnotation": null, "optional": false } } @@ -990,6 +971,7 @@ "ctxt": 0 }, "value": "sb1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1029,7 +1011,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1058,7 +1039,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1092,7 +1072,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1121,7 +1100,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1133,8 +1111,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1166,6 +1143,7 @@ "ctxt": 0 }, "value": "tb1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1192,6 +1170,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1208,8 +1187,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1234,7 +1212,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1249,8 +1226,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1280,8 +1256,8 @@ "ctxt": 0 }, "value": "tb1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1291,7 +1267,6 @@ "ctxt": 0 }, "value": "sb1", - "typeAnnotation": null, "optional": false } } @@ -1312,7 +1287,6 @@ "ctxt": 0 }, "value": "constr", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1338,7 +1312,6 @@ "ctxt": 0 }, "value": "Source", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1359,7 +1332,6 @@ "ctxt": 0 }, "value": "Tgt", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1398,7 +1370,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1424,7 +1395,6 @@ "ctxt": 0 }, "value": "Source", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1459,7 +1429,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1485,7 +1454,6 @@ "ctxt": 0 }, "value": "Tgt", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1505,7 +1473,6 @@ "ctxt": 0 }, "value": "Exclude", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1539,7 +1506,6 @@ "ctxt": 0 }, "value": "Tgt", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1568,7 +1534,6 @@ "ctxt": 0 }, "value": "Source", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1599,7 +1564,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1618,7 +1582,6 @@ "ctxt": 0 }, "value": "constr", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1657,6 +1620,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1673,8 +1637,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1708,7 +1671,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1775,6 +1737,7 @@ "ctxt": 0 }, "value": "q", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1797,13 +1760,11 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1853,7 +1814,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "property": { @@ -1880,7 +1840,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1893,7 +1852,6 @@ "ctxt": 0 }, "value": "substr", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1944,7 +1902,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "property": { @@ -1971,7 +1928,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2002,6 +1958,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2028,6 +1985,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2044,8 +2002,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2079,7 +2036,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2121,7 +2077,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2159,8 +2114,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2170,7 +2124,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2202,6 +2155,7 @@ "ctxt": 0 }, "value": "ss", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2241,7 +2195,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2293,7 +2246,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2323,8 +2275,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2356,6 +2307,7 @@ "ctxt": 0 }, "value": "tt", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2382,6 +2334,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2398,8 +2351,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2428,8 +2380,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2459,8 +2410,8 @@ "ctxt": 0 }, "value": "tt", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2470,7 +2421,6 @@ "ctxt": 0 }, "value": "ss", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionWithUnionConstraint/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionWithUnionConstraint/input.ts.json index 3a4491d35a09..c0b320b4dd3a 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionWithUnionConstraint/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionWithUnionConstraint/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -67,7 +67,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -87,15 +86,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -138,6 +135,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -173,8 +171,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -184,7 +181,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -218,7 +214,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -266,7 +261,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -313,7 +307,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -334,6 +327,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -364,7 +358,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -384,15 +377,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -435,6 +426,7 @@ "ctxt": 0 }, "value": "y1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -470,8 +462,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -481,7 +472,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -513,6 +503,7 @@ "ctxt": 0 }, "value": "y2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -548,8 +539,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -559,7 +549,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -591,6 +580,7 @@ "ctxt": 0 }, "value": "y3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -626,8 +616,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -637,7 +626,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -669,6 +657,7 @@ "ctxt": 0 }, "value": "y4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -704,8 +693,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -715,7 +703,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -747,6 +734,7 @@ "ctxt": 0 }, "value": "y5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -782,8 +770,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -793,7 +780,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -825,6 +811,7 @@ "ctxt": 0 }, "value": "y6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -860,8 +847,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -871,7 +857,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -905,7 +890,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -962,7 +946,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1024,7 +1007,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1139,7 +1121,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1160,6 +1141,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1190,7 +1172,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1242,8 +1223,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1286,6 +1266,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1321,8 +1302,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1332,7 +1312,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1366,7 +1345,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1422,7 +1400,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1443,6 +1420,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1473,7 +1451,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1516,8 +1493,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1560,6 +1536,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1576,8 +1553,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1587,7 +1563,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1621,7 +1596,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1668,7 +1642,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1689,6 +1662,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1727,7 +1701,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1748,15 +1721,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -1799,6 +1770,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1824,8 +1796,7 @@ "kind": "any" } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1835,7 +1806,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1869,7 +1839,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1890,7 +1859,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1916,7 +1884,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1944,7 +1911,6 @@ "ctxt": 0 }, "value": "Example", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1970,7 +1936,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1991,7 +1956,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2022,7 +1986,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2048,7 +2011,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2080,7 +2042,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2108,7 +2069,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2129,7 +2089,6 @@ "ctxt": 0 }, "value": "UnexpectedError", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2155,7 +2114,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2178,7 +2136,6 @@ "ctxt": 0 }, "value": "NoErrorHere", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2204,7 +2161,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2231,7 +2187,6 @@ "ctxt": 0 }, "value": "UnexpectedError", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2257,7 +2212,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2275,7 +2229,6 @@ "ctxt": 0 }, "value": "PropertyKey", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2299,7 +2252,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2321,7 +2273,6 @@ "ctxt": 0 }, "value": "NoErrorHere", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2347,7 +2298,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2365,7 +2315,6 @@ "ctxt": 0 }, "value": "PropertyKey", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2389,7 +2338,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2411,7 +2359,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2437,7 +2384,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2467,7 +2413,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2487,7 +2432,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2520,7 +2464,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2545,7 +2488,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2577,7 +2519,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2603,7 +2544,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2634,7 +2574,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2660,7 +2599,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2686,7 +2624,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2717,7 +2654,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionsAndEmptyObjects/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionsAndEmptyObjects/input.ts.json index e1969c94b747..3e169a69e5bf 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionsAndEmptyObjects/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/intersection/intersectionsAndEmptyObjects/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -123,7 +120,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -168,7 +164,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -207,6 +202,7 @@ "ctxt": 0 }, "value": "x01", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -237,7 +233,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -257,15 +252,13 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -297,6 +290,7 @@ "ctxt": 0 }, "value": "x02", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -327,7 +321,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -347,15 +340,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -387,6 +378,7 @@ "ctxt": 0 }, "value": "x03", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -417,7 +409,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -437,15 +428,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -477,6 +466,7 @@ "ctxt": 0 }, "value": "x04", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -507,7 +497,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -527,7 +516,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -547,15 +535,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -587,6 +573,7 @@ "ctxt": 0 }, "value": "x05", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -626,15 +613,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -666,6 +651,7 @@ "ctxt": 0 }, "value": "x06", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -696,7 +682,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -712,8 +697,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -745,6 +729,7 @@ "ctxt": 0 }, "value": "x07", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -767,13 +752,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -805,6 +788,7 @@ "ctxt": 0 }, "value": "x08", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -835,7 +819,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -851,8 +834,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -884,6 +866,7 @@ "ctxt": 0 }, "value": "x09", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -923,7 +906,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -952,7 +934,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -981,7 +962,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -997,8 +977,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1020,7 +999,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1051,7 +1029,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1092,6 +1069,7 @@ "ctxt": 0 }, "value": "x10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1122,7 +1100,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1142,15 +1119,13 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1182,6 +1157,7 @@ "ctxt": 0 }, "value": "x11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1212,7 +1188,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1232,15 +1207,13 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1272,6 +1245,7 @@ "ctxt": 0 }, "value": "x12", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1302,7 +1276,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1322,7 +1295,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1342,7 +1314,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1362,15 +1333,13 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1402,6 +1371,7 @@ "ctxt": 0 }, "value": "x13", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1432,7 +1402,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1452,15 +1421,13 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1492,6 +1459,7 @@ "ctxt": 0 }, "value": "x14", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1522,7 +1490,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1542,7 +1509,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1562,7 +1528,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1582,7 +1547,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1602,15 +1566,13 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1633,7 +1595,6 @@ "ctxt": 0 }, "value": "Dictionary", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1656,6 +1617,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1672,8 +1634,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1728,8 +1689,8 @@ "ctxt": 0 }, "value": "intersectDictionaries", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1747,6 +1708,7 @@ "ctxt": 0 }, "value": "d1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1769,13 +1731,11 @@ "ctxt": 0 }, "value": "F1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1785,6 +1745,7 @@ "ctxt": 0 }, "value": "d2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1807,13 +1768,11 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1838,7 +1797,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -1849,7 +1807,6 @@ "ctxt": 0 }, "value": "assign", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1877,7 +1834,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -1891,7 +1847,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -1923,7 +1878,6 @@ "ctxt": 0 }, "value": "F1", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1941,7 +1895,6 @@ "ctxt": 0 }, "value": "Dictionary", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1963,7 +1916,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1981,7 +1933,6 @@ "ctxt": 0 }, "value": "Dictionary", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2020,7 +1971,6 @@ "ctxt": 0 }, "value": "F1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2040,7 +1990,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2078,8 +2027,8 @@ "ctxt": 0 }, "value": "testDictionary", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -2097,6 +2046,7 @@ "ctxt": 0 }, "value": "_value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2119,13 +2069,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2162,7 +2110,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2180,7 +2127,6 @@ "ctxt": 0 }, "value": "Dictionary", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2220,8 +2166,8 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -2258,7 +2204,6 @@ "ctxt": 0 }, "value": "testDictionary", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2272,7 +2217,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } } @@ -2305,8 +2249,8 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2323,7 +2267,6 @@ "ctxt": 0 }, "value": "intersectDictionaries", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2337,7 +2280,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -2351,7 +2293,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } } @@ -2384,7 +2325,6 @@ "ctxt": 0 }, "value": "testDictionary", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2398,7 +2338,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -2431,8 +2370,8 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -2452,7 +2391,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": { @@ -2498,7 +2436,6 @@ "ctxt": 0 }, "value": "testDictionary", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2512,7 +2449,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false } } @@ -2545,8 +2481,8 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2563,7 +2499,6 @@ "ctxt": 0 }, "value": "intersectDictionaries", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2577,7 +2512,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -2591,7 +2525,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false } } @@ -2624,7 +2557,6 @@ "ctxt": 0 }, "value": "testDictionary", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2638,7 +2570,6 @@ "ctxt": 0 }, "value": "d4", - "typeAnnotation": null, "optional": false } } @@ -2671,8 +2602,8 @@ "ctxt": 0 }, "value": "d5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2689,7 +2620,6 @@ "ctxt": 0 }, "value": "intersectDictionaries", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2703,7 +2633,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false } }, @@ -2717,7 +2646,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } } @@ -2750,7 +2678,6 @@ "ctxt": 0 }, "value": "testDictionary", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2764,7 +2691,6 @@ "ctxt": 0 }, "value": "d5", - "typeAnnotation": null, "optional": false } } @@ -2797,8 +2723,8 @@ "ctxt": 0 }, "value": "d6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2815,7 +2741,6 @@ "ctxt": 0 }, "value": "intersectDictionaries", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2829,7 +2754,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false } }, @@ -2843,7 +2767,6 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, "optional": false } } @@ -2876,7 +2799,6 @@ "ctxt": 0 }, "value": "testDictionary", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2890,7 +2812,6 @@ "ctxt": 0 }, "value": "d6", - "typeAnnotation": null, "optional": false } } @@ -2914,7 +2835,6 @@ "ctxt": 0 }, "value": "choices", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2940,7 +2860,6 @@ "ctxt": 0 }, "value": "IChoiceList", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2962,6 +2881,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2978,8 +2898,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3035,7 +2954,6 @@ "ctxt": 0 }, "value": "IChoiceList", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3064,7 +2982,6 @@ "ctxt": 0 }, "value": "shoes", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3106,7 +3023,6 @@ "ctxt": 0 }, "value": "food", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3153,7 +3069,6 @@ "ctxt": 0 }, "value": "IMyChoiceList", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3181,7 +3096,6 @@ "ctxt": 0 }, "value": "car", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3234,7 +3148,6 @@ "ctxt": 0 }, "value": "IUnknownChoiceList", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3273,6 +3186,7 @@ "ctxt": 0 }, "value": "defaultChoices", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3295,7 +3209,6 @@ "ctxt": 0 }, "value": "choices", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3318,8 +3231,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3351,6 +3263,7 @@ "ctxt": 0 }, "value": "defaultChoicesAndEmpty", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3373,7 +3286,6 @@ "ctxt": 0 }, "value": "choices", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3415,8 +3327,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3448,6 +3359,7 @@ "ctxt": 0 }, "value": "myChoices", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3470,7 +3382,6 @@ "ctxt": 0 }, "value": "choices", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3496,7 +3407,6 @@ "ctxt": 0 }, "value": "IMyChoiceList", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3504,8 +3414,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3537,6 +3446,7 @@ "ctxt": 0 }, "value": "myChoicesAndEmpty", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3559,7 +3469,6 @@ "ctxt": 0 }, "value": "choices", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3593,7 +3502,6 @@ "ctxt": 0 }, "value": "IMyChoiceList", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3612,8 +3520,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3645,6 +3552,7 @@ "ctxt": 0 }, "value": "unknownChoices", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3667,7 +3575,6 @@ "ctxt": 0 }, "value": "choices", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3693,7 +3600,6 @@ "ctxt": 0 }, "value": "IUnknownChoiceList", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3701,8 +3607,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3734,6 +3639,7 @@ "ctxt": 0 }, "value": "unknownChoicesAndEmpty", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3756,7 +3662,6 @@ "ctxt": 0 }, "value": "choices", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3790,7 +3695,6 @@ "ctxt": 0 }, "value": "IUnknownChoiceList", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3809,8 +3713,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3833,7 +3736,6 @@ "ctxt": 0 }, "value": "Foo1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3869,7 +3771,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3916,6 +3817,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3932,8 +3834,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3958,7 +3859,6 @@ "ctxt": 0 }, "value": "Foo1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3992,7 +3892,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -4028,7 +3927,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4079,7 +3977,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4110,7 +4007,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4129,7 +4025,6 @@ "ctxt": 0 }, "value": "mock", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4150,6 +4045,7 @@ "ctxt": 0 }, "value": "_", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4172,7 +4068,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4198,7 +4093,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4206,8 +4100,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4243,7 +4136,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4290,7 +4182,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4321,7 +4212,6 @@ "ctxt": 0 }, "value": "mock", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4342,7 +4232,6 @@ "ctxt": 0 }, "value": "import", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/types/intersection/operatorsAndIntersectionTypes/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/intersection/operatorsAndIntersectionTypes/input.ts.json index e719b04d7f37..30eaccbcf460 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/intersection/operatorsAndIntersectionTypes/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/intersection/operatorsAndIntersectionTypes/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "Guid", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -67,7 +66,6 @@ "ctxt": 0 }, "value": "$Guid", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -98,7 +96,6 @@ "ctxt": 0 }, "value": "SerialNo", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -143,7 +140,6 @@ "ctxt": 0 }, "value": "$SerialNo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -168,7 +164,6 @@ "ctxt": 0 }, "value": "createGuid", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -230,7 +225,6 @@ "ctxt": 0 }, "value": "Guid", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -254,7 +248,6 @@ "ctxt": 0 }, "value": "createSerialNo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -311,7 +304,6 @@ "ctxt": 0 }, "value": "SerialNo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -350,6 +342,7 @@ "ctxt": 0 }, "value": "map1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -376,6 +369,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -392,8 +386,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -422,8 +415,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -463,8 +455,8 @@ "ctxt": 0 }, "value": "guid", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -481,7 +473,6 @@ "ctxt": 0 }, "value": "createGuid", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -521,7 +512,6 @@ "ctxt": 0 }, "value": "map1", - "typeAnnotation": null, "optional": false }, "property": { @@ -532,7 +522,6 @@ "ctxt": 0 }, "value": "guid", - "typeAnnotation": null, "optional": false }, "computed": true @@ -573,6 +562,7 @@ "ctxt": 0 }, "value": "map2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -599,6 +589,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -615,8 +606,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -645,8 +635,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -686,8 +675,8 @@ "ctxt": 0 }, "value": "serialNo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -704,7 +693,6 @@ "ctxt": 0 }, "value": "createSerialNo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -744,7 +732,6 @@ "ctxt": 0 }, "value": "map2", - "typeAnnotation": null, "optional": false }, "property": { @@ -755,7 +742,6 @@ "ctxt": 0 }, "value": "serialNo", - "typeAnnotation": null, "optional": false }, "computed": true @@ -801,8 +787,8 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -842,7 +828,6 @@ "ctxt": 0 }, "value": "guid", - "typeAnnotation": null, "optional": false } }, @@ -890,8 +875,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -915,7 +900,6 @@ "ctxt": 0 }, "value": "guid", - "typeAnnotation": null, "optional": false }, "property": { @@ -926,7 +910,6 @@ "ctxt": 0 }, "value": "toLowerCase", - "typeAnnotation": null, "optional": false }, "computed": false @@ -963,8 +946,8 @@ "ctxt": 0 }, "value": "s3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -982,7 +965,6 @@ "ctxt": 0 }, "value": "guid", - "typeAnnotation": null, "optional": false }, "right": { @@ -993,7 +975,6 @@ "ctxt": 0 }, "value": "guid", - "typeAnnotation": null, "optional": false } }, @@ -1026,8 +1007,8 @@ "ctxt": 0 }, "value": "s4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1045,7 +1026,6 @@ "ctxt": 0 }, "value": "guid", - "typeAnnotation": null, "optional": false }, "right": { @@ -1056,7 +1036,6 @@ "ctxt": 0 }, "value": "serialNo", - "typeAnnotation": null, "optional": false } }, @@ -1089,8 +1068,8 @@ "ctxt": 0 }, "value": "s5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1114,7 +1093,6 @@ "ctxt": 0 }, "value": "serialNo", - "typeAnnotation": null, "optional": false }, "property": { @@ -1125,7 +1103,6 @@ "ctxt": 0 }, "value": "toPrecision", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1175,8 +1152,8 @@ "ctxt": 0 }, "value": "n1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1194,7 +1171,6 @@ "ctxt": 0 }, "value": "serialNo", - "typeAnnotation": null, "optional": false }, "right": { @@ -1236,8 +1212,8 @@ "ctxt": 0 }, "value": "n2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1255,7 +1231,6 @@ "ctxt": 0 }, "value": "serialNo", - "typeAnnotation": null, "optional": false }, "right": { @@ -1266,7 +1241,6 @@ "ctxt": 0 }, "value": "serialNo", - "typeAnnotation": null, "optional": false } }, @@ -1299,8 +1273,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1318,7 +1292,6 @@ "ctxt": 0 }, "value": "guid", - "typeAnnotation": null, "optional": false }, "right": { @@ -1365,8 +1338,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1384,7 +1357,6 @@ "ctxt": 0 }, "value": "guid", - "typeAnnotation": null, "optional": false }, "right": { @@ -1395,7 +1367,6 @@ "ctxt": 0 }, "value": "guid", - "typeAnnotation": null, "optional": false } }, @@ -1428,8 +1399,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1447,7 +1418,6 @@ "ctxt": 0 }, "value": "serialNo", - "typeAnnotation": null, "optional": false }, "right": { @@ -1489,8 +1459,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1508,7 +1478,6 @@ "ctxt": 0 }, "value": "serialNo", - "typeAnnotation": null, "optional": false }, "right": { @@ -1519,7 +1488,6 @@ "ctxt": 0 }, "value": "serialNo", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/types/intersection/recursiveIntersectionTypes/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/intersection/recursiveIntersectionTypes/input.ts.json index 14d2631f197b..2598feff47d1 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/intersection/recursiveIntersectionTypes/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/intersection/recursiveIntersectionTypes/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "LinkedList", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -108,7 +105,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -137,7 +133,6 @@ "ctxt": 0 }, "value": "LinkedList", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -163,7 +158,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -194,7 +188,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -224,7 +217,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -268,7 +260,6 @@ "ctxt": 0 }, "value": "Product", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -289,7 +280,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -319,7 +309,6 @@ "ctxt": 0 }, "value": "price", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -373,6 +362,7 @@ "ctxt": 0 }, "value": "entityList", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -395,7 +385,6 @@ "ctxt": 0 }, "value": "LinkedList", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -421,7 +410,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -429,8 +417,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -462,8 +449,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -480,7 +467,6 @@ "ctxt": 0 }, "value": "entityList", - "typeAnnotation": null, "optional": false }, "property": { @@ -491,7 +477,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -525,8 +510,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -550,7 +535,6 @@ "ctxt": 0 }, "value": "entityList", - "typeAnnotation": null, "optional": false }, "property": { @@ -561,7 +545,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "computed": false @@ -574,7 +557,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -608,8 +590,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -640,7 +622,6 @@ "ctxt": 0 }, "value": "entityList", - "typeAnnotation": null, "optional": false }, "property": { @@ -651,7 +632,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "computed": false @@ -664,7 +644,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "computed": false @@ -677,7 +656,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -711,8 +689,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -750,7 +728,6 @@ "ctxt": 0 }, "value": "entityList", - "typeAnnotation": null, "optional": false }, "property": { @@ -761,7 +738,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "computed": false @@ -774,7 +750,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "computed": false @@ -787,7 +762,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "computed": false @@ -800,7 +774,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -834,6 +807,7 @@ "ctxt": 0 }, "value": "productList", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -856,7 +830,6 @@ "ctxt": 0 }, "value": "LinkedList", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -882,7 +855,6 @@ "ctxt": 0 }, "value": "Product", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -890,8 +862,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -921,8 +892,8 @@ "ctxt": 0 }, "value": "entityList", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -932,7 +903,6 @@ "ctxt": 0 }, "value": "productList", - "typeAnnotation": null, "optional": false } } @@ -960,8 +930,8 @@ "ctxt": 0 }, "value": "productList", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -971,7 +941,6 @@ "ctxt": 0 }, "value": "entityList", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/keyof/circularIndexedAccessErrors/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/keyof/circularIndexedAccessErrors/input.ts.json index 744eda337fb6..6c8fe6439cf8 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/keyof/circularIndexedAccessErrors/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/keyof/circularIndexedAccessErrors/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -87,7 +85,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -137,7 +134,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -163,7 +159,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -248,7 +243,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -285,7 +279,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -311,7 +304,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -334,7 +326,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -359,7 +350,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -413,6 +403,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -435,7 +426,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -471,8 +461,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -504,8 +493,8 @@ "ctxt": 0 }, "value": "x2x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -522,7 +511,6 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, "optional": false }, "property": { @@ -533,7 +521,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -557,7 +544,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -584,7 +570,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -602,7 +587,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -628,7 +612,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -665,7 +648,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -702,7 +684,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -751,7 +732,6 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -778,7 +758,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -796,7 +775,6 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -822,7 +800,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -859,7 +836,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -896,7 +872,6 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -922,7 +897,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -969,7 +943,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -995,7 +968,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1029,7 +1001,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1085,7 +1056,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1111,7 +1081,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1187,7 +1156,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1263,7 +1231,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1346,7 +1313,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1376,7 +1342,6 @@ "ctxt": 0 }, "value": "hello", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1415,7 +1380,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1460,7 +1424,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1486,7 +1449,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1514,7 +1476,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/keyof/keyofAndForIn/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/keyof/keyofAndForIn/input.ts.json index ce472f2afffc..294ce415cc45 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/keyof/keyofAndForIn/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/keyof/keyofAndForIn/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -67,7 +67,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -85,7 +84,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -109,14 +107,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } }, { @@ -135,6 +131,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -157,13 +154,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -206,8 +201,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -225,7 +220,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "right": { @@ -236,7 +230,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } }, @@ -269,6 +262,7 @@ "ctxt": 0 }, "value": "k1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -291,13 +285,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -319,8 +311,8 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -330,7 +322,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "body": { @@ -366,8 +357,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -384,7 +375,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -395,7 +385,6 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, "optional": false }, "computed": true @@ -439,8 +428,8 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -455,7 +444,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "body": { @@ -491,8 +479,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -509,7 +497,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -520,7 +507,6 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, "optional": false }, "computed": true @@ -559,7 +545,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -588,7 +573,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -608,7 +592,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -629,6 +612,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -659,7 +643,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -685,7 +668,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -718,7 +700,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -738,15 +719,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -765,6 +744,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -795,14 +775,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -845,8 +823,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -864,7 +842,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "right": { @@ -875,7 +852,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } }, @@ -908,6 +884,7 @@ "ctxt": 0 }, "value": "k1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -938,14 +915,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -967,8 +942,8 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -978,7 +953,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "body": { @@ -1014,8 +988,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1032,7 +1006,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1043,7 +1016,6 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1087,8 +1059,8 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1103,7 +1075,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "body": { @@ -1139,8 +1110,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1157,7 +1128,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1168,7 +1138,6 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1207,7 +1176,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1227,7 +1195,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1248,6 +1215,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1278,7 +1246,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1296,7 +1263,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1328,7 +1294,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1348,15 +1313,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -1375,6 +1338,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1397,13 +1361,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1446,8 +1408,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1465,7 +1427,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "right": { @@ -1476,7 +1437,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } }, @@ -1509,6 +1469,7 @@ "ctxt": 0 }, "value": "k1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1531,13 +1492,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1559,8 +1518,8 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1570,7 +1529,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "body": { @@ -1606,8 +1564,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1624,7 +1582,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1635,7 +1592,6 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1679,8 +1635,8 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1695,7 +1651,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "body": { @@ -1731,8 +1686,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1749,7 +1704,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1760,7 +1714,6 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1799,7 +1752,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1820,7 +1772,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1846,7 +1797,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/keyof/keyofAndIndexedAccess/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/keyof/keyofAndIndexedAccess/input.ts.json index 2e2de35befc2..aef3c84f76b4 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/keyof/keyofAndIndexedAccess/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/keyof/keyofAndIndexedAccess/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "width", - "typeAnnotation": null, "optional": false }, "value": null, @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "height", - "typeAnnotation": null, "optional": false }, "value": null, @@ -180,7 +176,6 @@ "ctxt": 0 }, "value": "visible", - "typeAnnotation": null, "optional": false }, "value": null, @@ -228,7 +223,6 @@ "ctxt": 0 }, "value": "TaggedShape", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -254,7 +248,6 @@ "ctxt": 0 }, "value": "tag", - "typeAnnotation": null, "optional": false }, "value": null, @@ -294,7 +287,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -312,7 +304,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -338,7 +329,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -384,7 +374,6 @@ "ctxt": 0 }, "value": "price", - "typeAnnotation": null, "optional": false }, "value": null, @@ -432,7 +421,6 @@ "ctxt": 0 }, "value": "Options", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -458,7 +446,6 @@ "ctxt": 0 }, "value": "visible", - "typeAnnotation": null, "optional": false }, "value": null, @@ -557,7 +544,6 @@ "ctxt": 0 }, "value": "Dictionary", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -583,7 +569,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -610,6 +595,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -626,8 +612,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -652,7 +637,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -684,7 +668,6 @@ "ctxt": 0 }, "value": "NumericallyIndexed", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -710,7 +693,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -737,6 +719,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -753,8 +736,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -779,7 +761,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -812,7 +793,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -831,7 +811,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -851,7 +830,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -871,7 +849,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -894,7 +871,6 @@ "ctxt": 0 }, "value": "K00", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -933,7 +909,6 @@ "ctxt": 0 }, "value": "K01", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -972,7 +947,6 @@ "ctxt": 0 }, "value": "K02", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1011,7 +985,6 @@ "ctxt": 0 }, "value": "K03", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1050,7 +1023,6 @@ "ctxt": 0 }, "value": "K04", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1089,7 +1061,6 @@ "ctxt": 0 }, "value": "K05", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1128,7 +1099,6 @@ "ctxt": 0 }, "value": "K06", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1167,7 +1137,6 @@ "ctxt": 0 }, "value": "K07", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1206,7 +1175,6 @@ "ctxt": 0 }, "value": "K08", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1245,7 +1213,6 @@ "ctxt": 0 }, "value": "K10", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1272,7 +1239,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1295,7 +1261,6 @@ "ctxt": 0 }, "value": "K11", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1329,7 +1294,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1353,7 +1317,6 @@ "ctxt": 0 }, "value": "K12", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1380,7 +1343,6 @@ "ctxt": 0 }, "value": "Dictionary", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1406,7 +1368,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1432,7 +1393,6 @@ "ctxt": 0 }, "value": "K13", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1471,7 +1431,6 @@ "ctxt": 0 }, "value": "K14", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1498,7 +1457,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1521,7 +1479,6 @@ "ctxt": 0 }, "value": "K15", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1548,7 +1505,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1571,7 +1527,6 @@ "ctxt": 0 }, "value": "K16", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1647,7 +1602,6 @@ "ctxt": 0 }, "value": "K17", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1689,7 +1643,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1709,7 +1662,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1735,7 +1687,6 @@ "ctxt": 0 }, "value": "K18", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1777,7 +1728,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1797,7 +1747,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1823,7 +1772,6 @@ "ctxt": 0 }, "value": "K19", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1850,7 +1798,6 @@ "ctxt": 0 }, "value": "NumericallyIndexed", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1876,7 +1823,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1902,7 +1848,6 @@ "ctxt": 0 }, "value": "KeyOf", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1928,7 +1873,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1959,7 +1903,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1982,7 +1925,6 @@ "ctxt": 0 }, "value": "K20", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2001,7 +1943,6 @@ "ctxt": 0 }, "value": "KeyOf", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2027,7 +1968,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2052,7 +1992,6 @@ "ctxt": 0 }, "value": "K21", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2071,7 +2010,6 @@ "ctxt": 0 }, "value": "KeyOf", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2097,7 +2035,6 @@ "ctxt": 0 }, "value": "Dictionary", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2123,7 +2060,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2151,7 +2087,6 @@ "ctxt": 0 }, "value": "NAME", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2194,7 +2129,6 @@ "ctxt": 0 }, "value": "WIDTH_OR_HEIGHT", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2269,7 +2203,6 @@ "ctxt": 0 }, "value": "Q10", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2296,7 +2229,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2341,7 +2273,6 @@ "ctxt": 0 }, "value": "Q11", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2368,7 +2299,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2445,7 +2375,6 @@ "ctxt": 0 }, "value": "Q12", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2472,7 +2401,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2549,7 +2477,6 @@ "ctxt": 0 }, "value": "Q20", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2576,7 +2503,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2596,7 +2522,6 @@ "ctxt": 0 }, "value": "NAME", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2619,7 +2544,6 @@ "ctxt": 0 }, "value": "Q21", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2646,7 +2570,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2666,7 +2589,6 @@ "ctxt": 0 }, "value": "WIDTH_OR_HEIGHT", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2689,7 +2611,6 @@ "ctxt": 0 }, "value": "Q30", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2782,7 +2703,6 @@ "ctxt": 0 }, "value": "Q31", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2875,7 +2795,6 @@ "ctxt": 0 }, "value": "Q32", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2960,7 +2879,6 @@ "ctxt": 0 }, "value": "Q33", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3035,7 +2953,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -3046,7 +2963,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -3070,7 +2986,6 @@ "ctxt": 0 }, "value": "Q34", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3145,7 +3060,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -3156,7 +3070,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -3180,7 +3093,6 @@ "ctxt": 0 }, "value": "Q35", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3278,7 +3190,6 @@ "ctxt": 0 }, "value": "Q36", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3376,7 +3287,6 @@ "ctxt": 0 }, "value": "Q40", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3418,7 +3328,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3438,7 +3347,6 @@ "ctxt": 0 }, "value": "Options", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3486,7 +3394,6 @@ "ctxt": 0 }, "value": "Q41", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3528,7 +3435,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3548,7 +3454,6 @@ "ctxt": 0 }, "value": "Options", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3596,7 +3501,6 @@ "ctxt": 0 }, "value": "Q50", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3623,7 +3527,6 @@ "ctxt": 0 }, "value": "Dictionary", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3649,7 +3552,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3697,7 +3599,6 @@ "ctxt": 0 }, "value": "Q51", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3724,7 +3625,6 @@ "ctxt": 0 }, "value": "Dictionary", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3750,7 +3650,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3793,7 +3692,6 @@ "ctxt": 0 }, "value": "Q52", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3820,7 +3718,6 @@ "ctxt": 0 }, "value": "Dictionary", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3846,7 +3743,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3871,7 +3767,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -3882,7 +3777,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -3915,6 +3809,7 @@ "ctxt": 0 }, "value": "cond", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3931,8 +3826,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -3949,7 +3843,6 @@ "ctxt": 0 }, "value": "getProperty", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3970,6 +3863,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3992,13 +3886,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4017,6 +3909,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4039,13 +3932,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4085,7 +3976,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -4096,7 +3986,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4129,7 +4018,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4150,7 +4038,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4176,7 +4063,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4198,7 +4084,6 @@ "ctxt": 0 }, "value": "setProperty", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4219,6 +4104,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4241,13 +4127,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4266,6 +4150,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4288,13 +4173,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4313,6 +4196,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4343,7 +4227,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4363,14 +4246,12 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -4418,7 +4299,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -4429,7 +4309,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4442,7 +4321,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -4474,7 +4352,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4495,7 +4372,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4521,7 +4397,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4543,7 +4418,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4564,6 +4438,7 @@ "ctxt": 0 }, "value": "shape", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4586,13 +4461,11 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4635,8 +4508,8 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4653,7 +4526,6 @@ "ctxt": 0 }, "value": "getProperty", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4667,7 +4539,6 @@ "ctxt": 0 }, "value": "shape", - "typeAnnotation": null, "optional": false } }, @@ -4720,8 +4591,8 @@ "ctxt": 0 }, "value": "widthOrHeight", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4738,7 +4609,6 @@ "ctxt": 0 }, "value": "getProperty", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4752,7 +4622,6 @@ "ctxt": 0 }, "value": "shape", - "typeAnnotation": null, "optional": false } }, @@ -4773,7 +4642,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -4838,8 +4706,8 @@ "ctxt": 0 }, "value": "nameOrVisible", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4856,7 +4724,6 @@ "ctxt": 0 }, "value": "getProperty", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4870,7 +4737,6 @@ "ctxt": 0 }, "value": "shape", - "typeAnnotation": null, "optional": false } }, @@ -4891,7 +4757,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -4953,7 +4818,6 @@ "ctxt": 0 }, "value": "setProperty", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4967,7 +4831,6 @@ "ctxt": 0 }, "value": "shape", - "typeAnnotation": null, "optional": false } }, @@ -5031,7 +4894,6 @@ "ctxt": 0 }, "value": "setProperty", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5045,7 +4907,6 @@ "ctxt": 0 }, "value": "shape", - "typeAnnotation": null, "optional": false } }, @@ -5066,7 +4927,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -5137,7 +4997,6 @@ "ctxt": 0 }, "value": "setProperty", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5151,7 +5010,6 @@ "ctxt": 0 }, "value": "shape", - "typeAnnotation": null, "optional": false } }, @@ -5172,7 +5030,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -5238,7 +5095,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5259,6 +5115,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5288,14 +5145,12 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -5338,8 +5193,8 @@ "ctxt": 0 }, "value": "len", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5356,7 +5211,6 @@ "ctxt": 0 }, "value": "getProperty", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5370,7 +5224,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -5420,7 +5273,6 @@ "ctxt": 0 }, "value": "setProperty", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5434,7 +5286,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -5465,7 +5316,6 @@ "ctxt": 0 }, "value": "len", - "typeAnnotation": null, "optional": false } } @@ -5490,7 +5340,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5511,6 +5360,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5549,7 +5399,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5575,8 +5424,7 @@ } ] } - }, - "optional": false + } } } ], @@ -5619,8 +5467,8 @@ "ctxt": 0 }, "value": "len", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5637,7 +5485,6 @@ "ctxt": 0 }, "value": "getProperty", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5651,7 +5498,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -5704,8 +5550,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5722,7 +5568,6 @@ "ctxt": 0 }, "value": "getProperty", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5736,7 +5581,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -5789,8 +5633,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5807,7 +5651,6 @@ "ctxt": 0 }, "value": "getProperty", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5821,7 +5664,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -5866,7 +5708,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5887,6 +5728,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5903,8 +5745,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -5923,6 +5764,7 @@ "ctxt": 0 }, "value": "bar", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5939,8 +5781,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5983,8 +5824,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6001,7 +5842,6 @@ "ctxt": 0 }, "value": "getProperty", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6015,7 +5855,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -6068,8 +5907,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6086,7 +5925,6 @@ "ctxt": 0 }, "value": "getProperty", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6100,7 +5938,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -6153,8 +5990,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6171,7 +6008,6 @@ "ctxt": 0 }, "value": "getProperty", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6185,7 +6021,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -6199,7 +6034,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false } } @@ -6227,7 +6061,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6253,7 +6086,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "value": null, @@ -6279,7 +6111,6 @@ "ctxt": 0 }, "value": "PropType", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6310,7 +6141,6 @@ "ctxt": 0 }, "value": "getProperty", - "typeAnnotation": null, "optional": false }, "function": { @@ -6331,6 +6161,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6353,13 +6184,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6414,7 +6243,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6427,7 +6255,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -6460,7 +6287,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6486,7 +6312,6 @@ "ctxt": 0 }, "value": "PropType", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6519,7 +6344,6 @@ "ctxt": 0 }, "value": "setProperty", - "typeAnnotation": null, "optional": false }, "function": { @@ -6540,6 +6364,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6562,13 +6387,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -6587,6 +6410,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6617,7 +6441,6 @@ "ctxt": 0 }, "value": "PropType", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6637,14 +6460,12 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -6707,7 +6528,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6720,7 +6540,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -6733,7 +6552,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -6765,7 +6583,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6791,7 +6608,6 @@ "ctxt": 0 }, "value": "PropType", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6835,7 +6651,6 @@ "ctxt": 0 }, "value": "PropType", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6856,7 +6671,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6877,6 +6691,7 @@ "ctxt": 0 }, "value": "component", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6899,7 +6714,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6925,7 +6739,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6933,8 +6746,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6977,8 +6789,8 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7002,7 +6814,6 @@ "ctxt": 0 }, "value": "component", - "typeAnnotation": null, "optional": false }, "property": { @@ -7013,7 +6824,6 @@ "ctxt": 0 }, "value": "getProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7068,8 +6878,8 @@ "ctxt": 0 }, "value": "widthOrHeight", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7093,7 +6903,6 @@ "ctxt": 0 }, "value": "component", - "typeAnnotation": null, "optional": false }, "property": { @@ -7104,7 +6913,6 @@ "ctxt": 0 }, "value": "getProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7127,7 +6935,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -7192,8 +6999,8 @@ "ctxt": 0 }, "value": "nameOrVisible", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7217,7 +7024,6 @@ "ctxt": 0 }, "value": "component", - "typeAnnotation": null, "optional": false }, "property": { @@ -7228,7 +7034,6 @@ "ctxt": 0 }, "value": "getProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7251,7 +7056,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -7320,7 +7124,6 @@ "ctxt": 0 }, "value": "component", - "typeAnnotation": null, "optional": false }, "property": { @@ -7331,7 +7134,6 @@ "ctxt": 0 }, "value": "setProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7404,7 +7206,6 @@ "ctxt": 0 }, "value": "component", - "typeAnnotation": null, "optional": false }, "property": { @@ -7415,7 +7216,6 @@ "ctxt": 0 }, "value": "setProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7438,7 +7238,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -7516,7 +7315,6 @@ "ctxt": 0 }, "value": "component", - "typeAnnotation": null, "optional": false }, "property": { @@ -7527,7 +7325,6 @@ "ctxt": 0 }, "value": "setProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7550,7 +7347,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -7616,7 +7412,6 @@ "ctxt": 0 }, "value": "pluck", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7637,6 +7432,7 @@ "ctxt": 0 }, "value": "array", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7666,14 +7462,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } }, { @@ -7692,6 +7486,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7714,13 +7509,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -7767,7 +7560,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false }, "property": { @@ -7778,7 +7570,6 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7802,8 +7593,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -7821,7 +7612,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -7832,7 +7622,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -7874,7 +7663,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7895,7 +7683,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7921,7 +7708,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7943,7 +7729,6 @@ "ctxt": 0 }, "value": "f30", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7964,6 +7749,7 @@ "ctxt": 0 }, "value": "shapes", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7993,14 +7779,12 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -8043,8 +7827,8 @@ "ctxt": 0 }, "value": "names", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -8061,7 +7845,6 @@ "ctxt": 0 }, "value": "pluck", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8075,7 +7858,6 @@ "ctxt": 0 }, "value": "shapes", - "typeAnnotation": null, "optional": false } }, @@ -8128,8 +7910,8 @@ "ctxt": 0 }, "value": "widths", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -8146,7 +7928,6 @@ "ctxt": 0 }, "value": "pluck", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8160,7 +7941,6 @@ "ctxt": 0 }, "value": "shapes", - "typeAnnotation": null, "optional": false } }, @@ -8213,8 +7993,8 @@ "ctxt": 0 }, "value": "nameOrVisibles", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -8231,7 +8011,6 @@ "ctxt": 0 }, "value": "pluck", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8245,7 +8024,6 @@ "ctxt": 0 }, "value": "shapes", - "typeAnnotation": null, "optional": false } }, @@ -8266,7 +8044,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -8323,7 +8100,6 @@ "ctxt": 0 }, "value": "f31", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8344,6 +8120,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8366,13 +8143,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -8415,6 +8190,7 @@ "ctxt": 0 }, "value": "shape", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8437,13 +8213,11 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -8463,7 +8237,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -8491,7 +8264,6 @@ "ctxt": 0 }, "value": "width", - "typeAnnotation": null, "optional": false }, "value": { @@ -8514,7 +8286,6 @@ "ctxt": 0 }, "value": "height", - "typeAnnotation": null, "optional": false }, "value": { @@ -8537,7 +8308,6 @@ "ctxt": 0 }, "value": "visible", - "typeAnnotation": null, "optional": false }, "value": { @@ -8578,7 +8348,6 @@ "ctxt": 0 }, "value": "shape", - "typeAnnotation": null, "optional": false }, "property": { @@ -8589,7 +8358,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -8622,7 +8390,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8648,7 +8415,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8670,7 +8436,6 @@ "ctxt": 0 }, "value": "f32", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8691,6 +8456,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8713,13 +8479,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -8762,6 +8526,7 @@ "ctxt": 0 }, "value": "shape", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8784,13 +8549,11 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -8810,7 +8573,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -8838,7 +8600,6 @@ "ctxt": 0 }, "value": "width", - "typeAnnotation": null, "optional": false }, "value": { @@ -8861,7 +8622,6 @@ "ctxt": 0 }, "value": "height", - "typeAnnotation": null, "optional": false }, "value": { @@ -8884,7 +8644,6 @@ "ctxt": 0 }, "value": "visible", - "typeAnnotation": null, "optional": false }, "value": { @@ -8925,7 +8684,6 @@ "ctxt": 0 }, "value": "shape", - "typeAnnotation": null, "optional": false }, "property": { @@ -8936,7 +8694,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -8969,7 +8726,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9042,7 +8798,6 @@ "ctxt": 0 }, "value": "f33", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9063,6 +8818,7 @@ "ctxt": 0 }, "value": "shape", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9085,13 +8841,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -9110,6 +8864,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9132,13 +8887,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -9181,8 +8934,8 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9199,7 +8952,6 @@ "ctxt": 0 }, "value": "getProperty", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9213,7 +8965,6 @@ "ctxt": 0 }, "value": "shape", - "typeAnnotation": null, "optional": false } }, @@ -9266,8 +9017,8 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9284,7 +9035,6 @@ "ctxt": 0 }, "value": "getProperty", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9298,7 +9048,6 @@ "ctxt": 0 }, "value": "shape", - "typeAnnotation": null, "optional": false } }, @@ -9312,7 +9061,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false } } @@ -9338,7 +9086,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false } } @@ -9369,7 +9116,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9387,7 +9133,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9409,7 +9154,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9435,7 +9179,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9457,7 +9200,6 @@ "ctxt": 0 }, "value": "f34", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9478,6 +9220,7 @@ "ctxt": 0 }, "value": "ts", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9500,13 +9243,11 @@ "ctxt": 0 }, "value": "TaggedShape", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -9549,8 +9290,8 @@ "ctxt": 0 }, "value": "tag1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9567,7 +9308,6 @@ "ctxt": 0 }, "value": "f33", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9581,7 +9321,6 @@ "ctxt": 0 }, "value": "ts", - "typeAnnotation": null, "optional": false } }, @@ -9634,8 +9373,8 @@ "ctxt": 0 }, "value": "tag2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9652,7 +9391,6 @@ "ctxt": 0 }, "value": "getProperty", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9666,7 +9404,6 @@ "ctxt": 0 }, "value": "ts", - "typeAnnotation": null, "optional": false } }, @@ -9711,7 +9448,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9737,7 +9473,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -9783,7 +9518,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -9829,7 +9563,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -9877,7 +9610,6 @@ "ctxt": 0 }, "value": "f40", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9898,6 +9630,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9920,13 +9653,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -9960,7 +9691,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -9987,7 +9717,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10032,7 +9761,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -10059,7 +9787,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10104,7 +9831,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -10131,7 +9857,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10185,6 +9910,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10207,13 +9933,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -10230,7 +9954,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -10278,6 +10001,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10300,13 +10024,11 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -10323,7 +10045,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -10371,6 +10092,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10393,13 +10115,11 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -10416,7 +10136,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -10456,7 +10175,6 @@ "ctxt": 0 }, "value": "f50", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10477,6 +10195,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10507,14 +10226,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } }, { @@ -10533,6 +10250,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10549,8 +10267,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -10593,8 +10310,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -10611,7 +10328,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -10637,7 +10353,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10673,8 +10388,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -10691,7 +10406,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -10735,7 +10449,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10755,7 +10468,6 @@ "ctxt": 0 }, "value": "f51", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10776,6 +10488,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10798,13 +10511,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -10823,6 +10534,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10839,8 +10551,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -10883,8 +10594,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -10901,7 +10612,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -10927,7 +10637,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10963,8 +10672,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -10981,7 +10690,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -11025,7 +10733,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -11046,7 +10753,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -11072,7 +10778,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11094,7 +10799,6 @@ "ctxt": 0 }, "value": "f52", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -11115,6 +10819,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11141,6 +10846,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11157,8 +10863,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -11187,8 +10892,7 @@ } ] } - }, - "optional": false + } } }, { @@ -11207,6 +10911,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11229,7 +10934,6 @@ "ctxt": 0 }, "value": "Exclude", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -11263,7 +10967,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11281,8 +10984,7 @@ ] } } - }, - "optional": false + } } }, { @@ -11301,6 +11003,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11317,8 +11020,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -11337,6 +11039,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11353,8 +11056,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -11397,8 +11099,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -11415,7 +11117,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -11426,7 +11127,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": true @@ -11460,8 +11160,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -11478,7 +11178,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -11489,7 +11188,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": true @@ -11523,8 +11221,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -11541,7 +11239,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -11552,7 +11249,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -11588,7 +11284,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -11608,7 +11303,6 @@ "ctxt": 0 }, "value": "f53", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -11629,6 +11323,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11655,6 +11350,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11671,8 +11367,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -11701,8 +11396,7 @@ } ] } - }, - "optional": false + } } }, { @@ -11721,6 +11415,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11743,13 +11438,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -11768,6 +11461,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11784,8 +11478,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -11804,6 +11497,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11820,8 +11514,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -11864,8 +11557,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -11882,7 +11575,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -11893,7 +11585,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": true @@ -11927,8 +11618,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -11945,7 +11636,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -11956,7 +11646,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": true @@ -11990,8 +11679,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -12008,7 +11697,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -12019,7 +11707,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -12055,7 +11742,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -12076,7 +11762,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -12094,7 +11779,6 @@ "ctxt": 0 }, "value": "Exclude", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -12128,7 +11812,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12162,7 +11845,6 @@ "ctxt": 0 }, "value": "f54", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -12183,6 +11865,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12205,13 +11888,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -12230,6 +11911,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12260,14 +11942,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -12317,8 +11997,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -12340,7 +12020,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -12351,7 +12030,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -12391,8 +12069,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12431,7 +12109,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -12442,7 +12119,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -12479,7 +12155,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -12499,7 +12174,6 @@ "ctxt": 0 }, "value": "f55", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -12520,6 +12194,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12542,13 +12217,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -12567,6 +12240,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12589,13 +12263,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -12645,8 +12317,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -12668,7 +12340,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -12679,7 +12350,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -12719,8 +12389,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -12759,7 +12429,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -12770,7 +12439,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -12807,7 +12475,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -12828,7 +12495,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -12854,7 +12520,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12876,7 +12541,6 @@ "ctxt": 0 }, "value": "f60", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -12897,6 +12561,7 @@ "ctxt": 0 }, "value": "source", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12919,13 +12584,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -12944,6 +12607,7 @@ "ctxt": 0 }, "value": "target", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12966,13 +12630,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -13022,8 +12684,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -13038,7 +12700,6 @@ "ctxt": 0 }, "value": "source", - "typeAnnotation": null, "optional": false }, "body": { @@ -13079,7 +12740,6 @@ "ctxt": 0 }, "value": "target", - "typeAnnotation": null, "optional": false }, "property": { @@ -13090,7 +12750,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -13110,7 +12769,6 @@ "ctxt": 0 }, "value": "source", - "typeAnnotation": null, "optional": false }, "property": { @@ -13121,7 +12779,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -13158,7 +12815,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -13178,7 +12834,6 @@ "ctxt": 0 }, "value": "f70", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -13199,6 +12854,7 @@ "ctxt": 0 }, "value": "func", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13222,6 +12878,7 @@ "ctxt": 0 }, "value": "k1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13267,7 +12924,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13287,7 +12943,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13296,8 +12951,7 @@ } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -13307,6 +12961,7 @@ "ctxt": 0 }, "value": "k2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13352,7 +13007,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13372,7 +13026,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13381,8 +13034,7 @@ } } } - }, - "optional": false + } } ], "typeParams": { @@ -13408,7 +13060,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -13429,7 +13080,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -13455,8 +13105,7 @@ } } } - }, - "optional": false + } } } ], @@ -13496,7 +13145,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -13567,7 +13215,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -13609,7 +13256,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -13661,7 +13307,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -13703,7 +13348,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -13757,7 +13401,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -13828,7 +13471,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -13870,7 +13512,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -13922,7 +13563,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -13964,7 +13604,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -14018,7 +13657,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -14089,7 +13727,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -14131,7 +13768,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -14183,7 +13819,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -14225,7 +13860,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -14274,7 +13908,6 @@ "ctxt": 0 }, "value": "f71", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -14295,6 +13928,7 @@ "ctxt": 0 }, "value": "func", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -14318,6 +13952,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -14340,13 +13975,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -14356,6 +13989,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -14378,13 +14012,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -14410,7 +14042,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -14431,7 +14062,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -14461,7 +14091,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14495,7 +14124,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14515,7 +14143,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14527,8 +14154,7 @@ } } } - }, - "optional": false + } } } ], @@ -14571,8 +14197,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -14589,7 +14215,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -14613,7 +14238,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -14636,7 +14260,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -14677,7 +14300,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -14722,7 +14344,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -14733,7 +14354,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14761,7 +14381,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -14772,7 +14391,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14800,7 +14418,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -14811,7 +14428,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14834,7 +14450,6 @@ "ctxt": 0 }, "value": "f72", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -14855,6 +14470,7 @@ "ctxt": 0 }, "value": "func", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -14878,6 +14494,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -14900,13 +14517,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -14916,6 +14531,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -14938,13 +14554,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -14954,6 +14568,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -14976,13 +14591,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -15008,7 +14621,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -15029,7 +14641,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -15050,7 +14661,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -15084,7 +14694,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -15113,7 +14722,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -15170,7 +14778,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -15190,7 +14797,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -15213,7 +14819,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -15221,8 +14826,7 @@ } } } - }, - "optional": false + } } } ], @@ -15265,8 +14869,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -15283,7 +14887,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -15307,7 +14910,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -15330,7 +14932,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -15371,7 +14972,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -15436,8 +15036,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -15454,7 +15054,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -15478,7 +15077,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -15501,7 +15099,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -15542,7 +15139,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -15607,8 +15203,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -15625,7 +15221,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -15649,7 +15244,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -15672,7 +15266,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -15713,7 +15306,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -15770,7 +15362,6 @@ "ctxt": 0 }, "value": "f73", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -15791,6 +15382,7 @@ "ctxt": 0 }, "value": "func", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -15814,6 +15406,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -15836,13 +15429,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -15852,6 +15443,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -15874,13 +15466,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -15890,6 +15480,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -15912,13 +15503,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -15944,7 +15533,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -15965,7 +15553,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -15986,7 +15573,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -16027,7 +15613,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -16047,7 +15632,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -16105,7 +15689,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -16125,7 +15708,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -16148,7 +15730,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -16156,8 +15737,7 @@ } } } - }, - "optional": false + } } } ], @@ -16200,8 +15780,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -16218,7 +15798,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -16242,7 +15821,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -16265,7 +15843,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -16306,7 +15883,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -16371,8 +15947,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -16389,7 +15965,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -16413,7 +15988,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -16436,7 +16010,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -16477,7 +16050,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -16542,8 +16114,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -16560,7 +16132,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -16584,7 +16155,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -16607,7 +16177,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -16648,7 +16217,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -16705,7 +16273,6 @@ "ctxt": 0 }, "value": "f74", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -16726,6 +16293,7 @@ "ctxt": 0 }, "value": "func", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -16749,6 +16317,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -16771,13 +16340,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -16787,6 +16354,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -16809,13 +16377,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -16825,6 +16391,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -16847,13 +16414,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -16879,7 +16444,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -16900,7 +16464,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -16921,7 +16484,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -16962,7 +16524,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -16982,7 +16543,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -17040,7 +16600,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -17060,7 +16619,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -17083,7 +16641,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -17091,8 +16648,7 @@ } } } - }, - "optional": false + } } } ], @@ -17135,8 +16691,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -17153,7 +16709,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -17177,7 +16732,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -17200,7 +16754,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -17241,7 +16794,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -17264,7 +16816,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -17329,8 +16880,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -17347,7 +16898,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -17371,7 +16921,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -17394,7 +16943,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -17435,7 +16983,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -17458,7 +17005,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -17515,7 +17061,6 @@ "ctxt": 0 }, "value": "f80", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -17536,6 +17081,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -17558,13 +17104,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -17607,8 +17151,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -17625,7 +17169,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -17636,7 +17179,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17670,8 +17212,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -17688,7 +17230,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -17736,8 +17277,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -17761,7 +17302,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -17803,7 +17343,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -17861,8 +17400,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -17886,7 +17425,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -17897,7 +17435,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17910,7 +17447,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -17944,8 +17480,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -17969,7 +17505,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -18033,8 +17568,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -18065,7 +17600,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -18131,7 +17665,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -18214,7 +17747,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -18241,7 +17773,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -18279,7 +17810,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -18328,7 +17858,6 @@ "ctxt": 0 }, "value": "f81", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -18349,6 +17878,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -18371,13 +17901,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -18431,7 +17959,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -18497,7 +18024,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -18577,7 +18103,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -18604,7 +18129,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -18642,7 +18166,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -18691,7 +18214,6 @@ "ctxt": 0 }, "value": "f82", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -18735,8 +18257,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -18753,7 +18275,6 @@ "ctxt": 0 }, "value": "f81", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -18777,7 +18298,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -18798,7 +18318,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -18854,8 +18373,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -18872,7 +18391,6 @@ "ctxt": 0 }, "value": "f81", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -18896,7 +18414,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -18917,7 +18434,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -18960,7 +18476,6 @@ "ctxt": 0 }, "value": "f83", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -18981,6 +18496,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -19003,13 +18519,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -19028,6 +18542,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -19050,13 +18565,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -19110,7 +18623,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -19121,7 +18633,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -19173,7 +18684,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -19193,7 +18703,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -19251,7 +18760,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -19273,6 +18781,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -19289,8 +18798,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -19324,7 +18832,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -19379,7 +18886,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -19405,7 +18911,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -19427,7 +18932,6 @@ "ctxt": 0 }, "value": "f84", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -19471,8 +18975,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -19489,7 +18993,6 @@ "ctxt": 0 }, "value": "f83", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -19513,7 +19016,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -19534,7 +19036,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -19607,8 +19108,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -19625,7 +19126,6 @@ "ctxt": 0 }, "value": "f83", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -19649,7 +19149,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -19670,7 +19169,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -19730,7 +19228,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -19756,7 +19253,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -19802,7 +19298,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "function": { @@ -19823,6 +19318,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -19845,13 +19341,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -19899,7 +19393,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -19932,7 +19425,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -19979,7 +19471,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "function": { @@ -20000,6 +19491,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -20022,13 +19514,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -20047,6 +19537,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -20085,14 +19576,12 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -20148,7 +19637,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -20161,7 +19649,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -20193,7 +19680,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -20240,7 +19726,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -20284,8 +19769,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -20310,7 +19795,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20344,8 +19828,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -20407,8 +19891,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -20440,7 +19924,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20495,8 +19978,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -20513,7 +19996,6 @@ "ctxt": 0 }, "value": "getProperty", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -20590,7 +20072,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20700,7 +20181,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "computed": false @@ -20761,7 +20241,6 @@ "ctxt": 0 }, "value": "setProperty", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -20845,7 +20324,6 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -20873,7 +20351,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -20915,7 +20392,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -20954,7 +20430,6 @@ "ctxt": 0 }, "value": "f90", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -20975,6 +20450,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -21005,7 +20481,6 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -21033,15 +20508,13 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -21060,6 +20533,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -21090,7 +20564,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -21118,15 +20591,13 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -21145,6 +20616,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -21175,7 +20647,6 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -21195,14 +20666,12 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -21243,8 +20712,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -21254,7 +20723,6 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, "optional": false } } @@ -21282,8 +20750,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -21293,7 +20761,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false } } @@ -21321,8 +20788,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -21332,7 +20799,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false } } @@ -21360,8 +20826,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -21371,7 +20837,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false } } @@ -21399,8 +20864,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -21410,7 +20875,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false } } @@ -21438,8 +20902,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -21449,7 +20913,6 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, "optional": false } } @@ -21476,7 +20939,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false }, "property": { @@ -21487,7 +20949,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21515,7 +20976,6 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, "optional": false }, "property": { @@ -21526,7 +20986,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21554,7 +21013,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, "property": { @@ -21565,7 +21023,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -21598,7 +21055,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -21616,7 +21072,6 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -21638,7 +21093,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -21664,7 +21118,6 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -21686,7 +21139,6 @@ "ctxt": 0 }, "value": "f91", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -21707,6 +21159,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -21729,13 +21182,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -21754,6 +21205,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -21784,7 +21236,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -21812,15 +21263,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -21839,6 +21288,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -21869,7 +21319,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -21889,14 +21338,12 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -21939,6 +21386,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -21955,8 +21403,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -21986,8 +21433,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -21997,7 +21444,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -22025,8 +21471,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -22036,7 +21482,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -22064,8 +21509,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -22075,7 +21520,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -22107,7 +21551,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -22128,7 +21571,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -22154,7 +21596,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -22176,7 +21617,6 @@ "ctxt": 0 }, "value": "f92", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -22197,6 +21637,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -22219,13 +21660,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -22244,6 +21683,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -22274,7 +21714,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -22302,15 +21741,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -22329,6 +21766,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -22359,7 +21797,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -22379,14 +21816,12 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -22429,6 +21864,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -22473,8 +21909,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -22504,8 +21939,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -22515,7 +21950,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -22543,8 +21977,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -22554,7 +21988,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -22582,8 +22015,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -22593,7 +22026,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -22625,7 +22057,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -22646,7 +22077,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -22672,7 +22102,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -22694,7 +22123,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -22720,7 +22148,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "function": { @@ -22741,6 +22168,7 @@ "ctxt": 0 }, "value": "prop", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -22763,13 +22191,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -22817,7 +22243,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": true @@ -22850,7 +22275,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -22897,7 +22321,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "function": { @@ -22918,6 +22341,7 @@ "ctxt": 0 }, "value": "prop", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -22940,13 +22364,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -22965,6 +22387,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -23003,14 +22426,12 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -23066,7 +22487,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": true @@ -23079,7 +22499,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -23111,7 +22530,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -23160,7 +22578,6 @@ "ctxt": 0 }, "value": "Person", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -23186,7 +22603,6 @@ "ctxt": 0 }, "value": "parts", - "typeAnnotation": null, "optional": false }, "value": null, @@ -23232,7 +22648,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -23252,6 +22667,7 @@ "ctxt": 0 }, "value": "parts", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -23268,8 +22684,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -23344,7 +22759,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23377,7 +22791,6 @@ "ctxt": 0 }, "value": "parts", - "typeAnnotation": null, "optional": false } } @@ -23405,7 +22818,6 @@ "ctxt": 0 }, "value": "getParts", - "typeAnnotation": null, "optional": false }, "function": { @@ -23461,7 +22873,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -23510,7 +22921,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -23528,7 +22938,6 @@ "ctxt": 0 }, "value": "OtherPerson", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -23554,7 +22963,6 @@ "ctxt": 0 }, "value": "parts", - "typeAnnotation": null, "optional": false }, "value": null, @@ -23600,7 +23008,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -23620,6 +23027,7 @@ "ctxt": 0 }, "value": "parts", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -23636,8 +23044,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -23671,7 +23078,6 @@ "ctxt": 0 }, "value": "setProperty", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -23713,7 +23119,6 @@ "ctxt": 0 }, "value": "parts", - "typeAnnotation": null, "optional": false } } @@ -23741,7 +23146,6 @@ "ctxt": 0 }, "value": "getParts", - "typeAnnotation": null, "optional": false }, "function": { @@ -23782,7 +23186,6 @@ "ctxt": 0 }, "value": "getProperty", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -23848,7 +23251,6 @@ "ctxt": 0 }, "value": "path", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -23869,6 +23271,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -23891,13 +23294,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -23916,6 +23317,7 @@ "ctxt": 0 }, "value": "key1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -23938,13 +23340,11 @@ "ctxt": 0 }, "value": "K1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -23980,7 +23380,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -24001,7 +23400,6 @@ "ctxt": 0 }, "value": "K1", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -24027,7 +23425,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24067,7 +23464,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24087,7 +23483,6 @@ "ctxt": 0 }, "value": "K1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24105,7 +23500,6 @@ "ctxt": 0 }, "value": "path", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -24126,6 +23520,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -24148,13 +23543,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -24173,6 +23566,7 @@ "ctxt": 0 }, "value": "key1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -24195,13 +23589,11 @@ "ctxt": 0 }, "value": "K1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -24220,6 +23612,7 @@ "ctxt": 0 }, "value": "key2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -24242,13 +23635,11 @@ "ctxt": 0 }, "value": "K2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -24284,7 +23675,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -24305,7 +23695,6 @@ "ctxt": 0 }, "value": "K1", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -24331,7 +23720,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24354,7 +23742,6 @@ "ctxt": 0 }, "value": "K2", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -24388,7 +23775,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24408,7 +23794,6 @@ "ctxt": 0 }, "value": "K1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24457,7 +23842,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24477,7 +23861,6 @@ "ctxt": 0 }, "value": "K1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24498,7 +23881,6 @@ "ctxt": 0 }, "value": "K2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24516,7 +23898,6 @@ "ctxt": 0 }, "value": "path", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -24537,6 +23918,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -24559,13 +23941,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -24584,6 +23964,7 @@ "ctxt": 0 }, "value": "key1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -24606,13 +23987,11 @@ "ctxt": 0 }, "value": "K1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -24631,6 +24010,7 @@ "ctxt": 0 }, "value": "key2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -24653,13 +24033,11 @@ "ctxt": 0 }, "value": "K2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -24678,6 +24056,7 @@ "ctxt": 0 }, "value": "key3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -24700,13 +24079,11 @@ "ctxt": 0 }, "value": "K3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -24742,7 +24119,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -24763,7 +24139,6 @@ "ctxt": 0 }, "value": "K1", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -24789,7 +24164,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24812,7 +24186,6 @@ "ctxt": 0 }, "value": "K2", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -24846,7 +24219,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24866,7 +24238,6 @@ "ctxt": 0 }, "value": "K1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24890,7 +24261,6 @@ "ctxt": 0 }, "value": "K3", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -24932,7 +24302,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24952,7 +24321,6 @@ "ctxt": 0 }, "value": "K1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24973,7 +24341,6 @@ "ctxt": 0 }, "value": "K2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -25030,7 +24397,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -25050,7 +24416,6 @@ "ctxt": 0 }, "value": "K1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -25071,7 +24436,6 @@ "ctxt": 0 }, "value": "K2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -25092,7 +24456,6 @@ "ctxt": 0 }, "value": "K3", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -25110,7 +24473,6 @@ "ctxt": 0 }, "value": "path", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -25131,6 +24493,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -25147,8 +24510,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -25179,8 +24541,8 @@ "ctxt": 0 }, "value": "keys", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -25275,7 +24637,6 @@ "ctxt": 0 }, "value": "path", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -25296,6 +24657,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -25312,8 +24674,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -25344,8 +24705,8 @@ "ctxt": 0 }, "value": "keys", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -25441,8 +24802,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -25452,7 +24813,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "definite": false @@ -25492,8 +24852,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -25508,7 +24868,6 @@ "ctxt": 0 }, "value": "keys", - "typeAnnotation": null, "optional": false }, "body": { @@ -25542,8 +24901,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -25560,7 +24919,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "property": { @@ -25571,7 +24929,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -25596,7 +24953,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false } } @@ -25639,7 +24995,6 @@ "ctxt": 0 }, "value": "Thing", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -25667,7 +25022,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -25705,7 +25059,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -25747,7 +25100,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -25794,7 +25146,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -25833,7 +25184,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -25854,6 +25204,7 @@ "ctxt": 0 }, "value": "thing", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -25876,13 +25227,11 @@ "ctxt": 0 }, "value": "Thing", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -25925,8 +25274,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -25943,7 +25292,6 @@ "ctxt": 0 }, "value": "path", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -25957,7 +25305,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false } }, @@ -26010,8 +25357,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -26028,7 +25375,6 @@ "ctxt": 0 }, "value": "path", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -26042,7 +25388,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false } }, @@ -26112,8 +25457,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -26130,7 +25475,6 @@ "ctxt": 0 }, "value": "path", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -26144,7 +25488,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false } }, @@ -26197,8 +25540,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -26215,7 +25558,6 @@ "ctxt": 0 }, "value": "path", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -26229,7 +25571,6 @@ "ctxt": 0 }, "value": "thing", - "typeAnnotation": null, "optional": false } }, @@ -26323,8 +25664,8 @@ "ctxt": 0 }, "value": "assignTo2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -26342,6 +25683,7 @@ "ctxt": 0 }, "value": "object", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -26364,13 +25706,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -26380,6 +25720,7 @@ "ctxt": 0 }, "value": "key1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -26402,13 +25743,11 @@ "ctxt": 0 }, "value": "K1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -26418,6 +25757,7 @@ "ctxt": 0 }, "value": "key2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -26440,13 +25780,11 @@ "ctxt": 0 }, "value": "K2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -26465,6 +25803,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -26503,7 +25842,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26523,7 +25861,6 @@ "ctxt": 0 }, "value": "K1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26544,14 +25881,12 @@ "ctxt": 0 }, "value": "K2", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "body": { @@ -26584,7 +25919,6 @@ "ctxt": 0 }, "value": "object", - "typeAnnotation": null, "optional": false }, "property": { @@ -26595,7 +25929,6 @@ "ctxt": 0 }, "value": "key1", - "typeAnnotation": null, "optional": false }, "computed": true @@ -26608,7 +25941,6 @@ "ctxt": 0 }, "value": "key2", - "typeAnnotation": null, "optional": false }, "computed": true @@ -26621,7 +25953,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } }, @@ -26655,7 +25986,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -26676,7 +26006,6 @@ "ctxt": 0 }, "value": "K1", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -26702,7 +26031,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26725,7 +26053,6 @@ "ctxt": 0 }, "value": "K2", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -26759,7 +26086,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26779,7 +26105,6 @@ "ctxt": 0 }, "value": "K1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26806,7 +26131,6 @@ "ctxt": 0 }, "value": "one", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -26827,6 +26151,7 @@ "ctxt": 0 }, "value": "handler", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -26850,6 +26175,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -26872,13 +26198,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -26900,8 +26224,7 @@ } } } - }, - "optional": false + } } } ], @@ -26937,7 +26260,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -26967,7 +26289,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26999,8 +26320,8 @@ "ctxt": 0 }, "value": "empty", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -27017,7 +26338,6 @@ "ctxt": 0 }, "value": "one", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -27069,7 +26389,6 @@ "ctxt": 0 }, "value": "Handlers", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -27095,7 +26414,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -27126,7 +26444,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -27152,7 +26469,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -27178,6 +26494,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -27208,7 +26525,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -27228,14 +26544,12 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -27269,7 +26583,6 @@ "ctxt": 0 }, "value": "on", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -27290,6 +26603,7 @@ "ctxt": 0 }, "value": "handlerHash", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -27312,7 +26626,6 @@ "ctxt": 0 }, "value": "Handlers", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -27338,7 +26651,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -27346,8 +26658,7 @@ ] } } - }, - "optional": false + } } } ], @@ -27383,7 +26694,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -27413,7 +26723,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -27445,8 +26754,8 @@ "ctxt": 0 }, "value": "hashOfEmpty1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -27463,7 +26772,6 @@ "ctxt": 0 }, "value": "on", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -27487,7 +26795,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "value": { @@ -27548,8 +26855,8 @@ "ctxt": 0 }, "value": "hashOfEmpty2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -27566,7 +26873,6 @@ "ctxt": 0 }, "value": "on", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -27590,7 +26896,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "value": { @@ -27609,6 +26914,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -27625,8 +26931,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "body": { @@ -27669,7 +26974,6 @@ "ctxt": 0 }, "value": "Options1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -27696,7 +27000,6 @@ "ctxt": 0 }, "value": "Data", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -27717,7 +27020,6 @@ "ctxt": 0 }, "value": "Computed", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -27750,7 +27052,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -27779,7 +27080,6 @@ "ctxt": 0 }, "value": "Data", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -27803,7 +27103,6 @@ "ctxt": 0 }, "value": "computed", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -27832,7 +27131,6 @@ "ctxt": 0 }, "value": "Computed", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -27853,7 +27151,6 @@ "ctxt": 0 }, "value": "Component1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -27879,7 +27176,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -27899,6 +27195,7 @@ "ctxt": 0 }, "value": "options", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -27921,7 +27218,6 @@ "ctxt": 0 }, "value": "Options1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -27947,7 +27243,6 @@ "ctxt": 0 }, "value": "Data", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -27967,7 +27262,6 @@ "ctxt": 0 }, "value": "Computed", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -27975,8 +27269,7 @@ ] } } - }, - "optional": false + } } } ], @@ -27999,7 +27292,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "function": { @@ -28020,6 +27312,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -28042,13 +27335,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -28084,7 +27375,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -28125,7 +27415,6 @@ "ctxt": 0 }, "value": "Data", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -28145,7 +27434,6 @@ "ctxt": 0 }, "value": "Computed", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -28203,7 +27491,6 @@ "ctxt": 0 }, "value": "Data", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -28223,7 +27510,6 @@ "ctxt": 0 }, "value": "Computed", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -28246,7 +27532,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -28286,7 +27571,6 @@ "ctxt": 0 }, "value": "Data", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -28307,7 +27591,6 @@ "ctxt": 0 }, "value": "Computed", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -28343,8 +27626,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -28361,7 +27644,6 @@ "ctxt": 0 }, "value": "Component1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -28385,7 +27667,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "value": { @@ -28406,7 +27687,6 @@ "ctxt": 0 }, "value": "hello", - "typeAnnotation": null, "optional": false }, "value": { @@ -28466,7 +27746,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "property": { @@ -28477,7 +27756,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28519,7 +27797,6 @@ "ctxt": 0 }, "value": "Options2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -28546,7 +27823,6 @@ "ctxt": 0 }, "value": "Data", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -28567,7 +27843,6 @@ "ctxt": 0 }, "value": "Computed", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -28600,7 +27875,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -28629,7 +27903,6 @@ "ctxt": 0 }, "value": "Data", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -28653,7 +27926,6 @@ "ctxt": 0 }, "value": "computed", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -28682,7 +27954,6 @@ "ctxt": 0 }, "value": "Computed", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -28703,7 +27974,6 @@ "ctxt": 0 }, "value": "Component2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -28729,7 +27999,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -28749,6 +28018,7 @@ "ctxt": 0 }, "value": "options", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -28771,7 +28041,6 @@ "ctxt": 0 }, "value": "Options2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -28797,7 +28066,6 @@ "ctxt": 0 }, "value": "Data", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -28817,7 +28085,6 @@ "ctxt": 0 }, "value": "Computed", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -28825,8 +28092,7 @@ ] } } - }, - "optional": false + } } } ], @@ -28849,7 +28115,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "function": { @@ -28870,6 +28135,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -28892,13 +28158,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -28934,7 +28198,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -28968,7 +28231,6 @@ "ctxt": 0 }, "value": "Data", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -28997,7 +28259,6 @@ "ctxt": 0 }, "value": "Computed", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -29054,7 +28315,6 @@ "ctxt": 0 }, "value": "Data", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -29074,7 +28334,6 @@ "ctxt": 0 }, "value": "Computed", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -29097,7 +28356,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -29137,7 +28395,6 @@ "ctxt": 0 }, "value": "Data", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -29158,7 +28415,6 @@ "ctxt": 0 }, "value": "Computed", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -29184,7 +28440,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -29214,7 +28469,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -29253,7 +28507,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -29274,6 +28527,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -29296,13 +28550,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -29345,6 +28597,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -29361,8 +28614,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -29398,7 +28650,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -29409,7 +28660,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": true @@ -29422,7 +28672,6 @@ "ctxt": 0 }, "value": "add", - "typeAnnotation": null, "optional": false }, "computed": false @@ -29455,7 +28704,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -29481,7 +28729,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -29509,7 +28756,6 @@ "ctxt": 0 }, "value": "MethodDescriptor", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -29537,7 +28783,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -29579,7 +28824,6 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -29629,7 +28873,6 @@ "ctxt": 0 }, "value": "returnValue", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -29668,7 +28911,6 @@ "ctxt": 0 }, "value": "dispatchMethod", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -29689,6 +28931,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -29719,7 +28962,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -29747,8 +28989,7 @@ } } } - }, - "optional": false + } } }, { @@ -29767,6 +29008,7 @@ "ctxt": 0 }, "value": "args", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -29797,7 +29039,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -29825,8 +29066,7 @@ } } } - }, - "optional": false + } } } ], @@ -29862,7 +29102,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -29880,7 +29119,6 @@ "ctxt": 0 }, "value": "MethodDescriptor", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -29919,7 +29157,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -29965,7 +29202,6 @@ "ctxt": 0 }, "value": "SomeMethodDescriptor", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -29993,7 +29229,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -30048,7 +29283,6 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -30127,7 +29361,6 @@ "ctxt": 0 }, "value": "returnValue", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -30189,8 +29422,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -30207,7 +29440,6 @@ "ctxt": 0 }, "value": "dispatchMethod", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -30294,7 +29526,6 @@ "ctxt": 0 }, "value": "SomeMethodDescriptor", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -30322,7 +29553,6 @@ "ctxt": 0 }, "value": "KeyTypes", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -30406,6 +29636,7 @@ "ctxt": 0 }, "value": "MyThingy", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -30436,7 +29667,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -30454,7 +29684,6 @@ "ctxt": 0 }, "value": "KeyTypes", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -30481,8 +29710,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -30499,7 +29727,6 @@ "ctxt": 0 }, "value": "addToMyThingy", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -30520,6 +29747,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -30542,13 +29770,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -30602,7 +29828,6 @@ "ctxt": 0 }, "value": "MyThingy", - "typeAnnotation": null, "optional": false }, "property": { @@ -30613,7 +29838,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -30626,7 +29850,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -30680,7 +29903,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -30698,7 +29920,6 @@ "ctxt": 0 }, "value": "KeyTypes", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -30725,7 +29946,6 @@ "ctxt": 0 }, "value": "Handler", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -30751,7 +29971,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -30783,7 +30002,6 @@ "ctxt": 0 }, "value": "onChange", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -30813,6 +30031,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -30843,14 +30062,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -30888,7 +30105,6 @@ "ctxt": 0 }, "value": "onChangeGenericFunction", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -30909,6 +30125,7 @@ "ctxt": 0 }, "value": "handler", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -30931,7 +30148,6 @@ "ctxt": 0 }, "value": "Handler", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -30965,7 +30181,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -30994,7 +30209,6 @@ "ctxt": 0 }, "value": "preset", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -31027,8 +30241,7 @@ ] } } - }, - "optional": false + } } } ], @@ -31075,7 +30288,6 @@ "ctxt": 0 }, "value": "handler", - "typeAnnotation": null, "optional": false }, "property": { @@ -31086,7 +30298,6 @@ "ctxt": 0 }, "value": "onChange", - "typeAnnotation": null, "optional": false }, "computed": false @@ -31140,7 +30351,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -31160,7 +30370,6 @@ "ctxt": 0 }, "value": "updateIds", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -31181,6 +30390,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -31203,13 +30413,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -31228,6 +30436,7 @@ "ctxt": 0 }, "value": "idFields", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -31257,14 +30466,12 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } }, { @@ -31283,6 +30490,7 @@ "ctxt": 0 }, "value": "idMapping", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -31305,7 +30513,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -31331,7 +30538,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -31365,7 +30571,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -31385,7 +30590,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -31414,7 +30618,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -31434,7 +30637,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -31446,8 +30648,7 @@ ] } } - }, - "optional": false + } } } ], @@ -31498,8 +30699,8 @@ "ctxt": 0 }, "value": "idField", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -31514,7 +30715,6 @@ "ctxt": 0 }, "value": "idFields", - "typeAnnotation": null, "optional": false }, "body": { @@ -31550,6 +30750,7 @@ "ctxt": 0 }, "value": "newId", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -31588,7 +30789,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -31608,7 +30808,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -31625,8 +30824,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -31643,7 +30841,6 @@ "ctxt": 0 }, "value": "idMapping", - "typeAnnotation": null, "optional": false }, "property": { @@ -31661,7 +30858,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -31672,7 +30868,6 @@ "ctxt": 0 }, "value": "idField", - "typeAnnotation": null, "optional": false }, "computed": true @@ -31698,7 +30893,6 @@ "ctxt": 0 }, "value": "newId", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -31739,7 +30933,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -31750,7 +30943,6 @@ "ctxt": 0 }, "value": "idField", - "typeAnnotation": null, "optional": false }, "computed": true @@ -31763,7 +30955,6 @@ "ctxt": 0 }, "value": "newId", - "typeAnnotation": null, "optional": false } } @@ -31790,7 +30981,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -31821,7 +31011,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -31839,7 +31028,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -31865,7 +31053,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -31899,7 +31086,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -31937,7 +31123,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -31963,7 +31148,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -31992,7 +31176,6 @@ "ctxt": 0 }, "value": "updateIds2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -32013,6 +31196,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -32035,13 +31219,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -32060,6 +31242,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -32082,13 +31265,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -32107,6 +31288,7 @@ "ctxt": 0 }, "value": "stringMap", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -32133,6 +31315,7 @@ "ctxt": 0 }, "value": "oldId", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -32149,8 +31332,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -32179,8 +31361,7 @@ } ] } - }, - "optional": false + } } } ], @@ -32223,8 +31404,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -32241,7 +31422,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -32252,7 +31432,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -32283,7 +31462,6 @@ "ctxt": 0 }, "value": "stringMap", - "typeAnnotation": null, "optional": false }, "property": { @@ -32294,7 +31472,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": true @@ -32327,7 +31504,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -32349,6 +31525,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -32365,8 +31542,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -32412,7 +31588,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -32438,7 +31613,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -32460,7 +31634,6 @@ "ctxt": 0 }, "value": "head", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -32481,6 +31654,7 @@ "ctxt": 0 }, "value": "list", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -32503,13 +31677,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -32545,7 +31717,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -32563,7 +31734,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -32620,7 +31790,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -32655,7 +31824,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -32681,7 +31849,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "value": null, @@ -32715,7 +31882,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -32744,7 +31910,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -32811,7 +31976,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -32832,7 +31996,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -32858,7 +32021,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -32879,6 +32041,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -32925,8 +32088,7 @@ } } } - }, - "optional": false + } } } ], @@ -32966,7 +32128,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -32977,7 +32138,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33005,7 +32165,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -33042,7 +32201,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -33084,7 +32242,6 @@ "ctxt": 0 }, "value": "Form", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -33110,7 +32267,6 @@ "ctxt": 0 }, "value": "childFormFactories", - "typeAnnotation": null, "optional": false }, "value": null, @@ -33144,7 +32300,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -33170,7 +32325,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -33196,6 +32350,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -33226,7 +32381,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -33246,14 +32400,12 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": null, @@ -33279,7 +32431,6 @@ "ctxt": 0 }, "value": "Form", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -33313,7 +32464,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -33333,7 +32483,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -33371,7 +32520,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "function": { @@ -33392,6 +32540,7 @@ "ctxt": 0 }, "value": "prop", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -33414,13 +32563,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -33439,6 +32586,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -33469,7 +32617,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -33489,14 +32636,12 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -33558,7 +32703,6 @@ "ctxt": 0 }, "value": "childFormFactories", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33571,7 +32715,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": true @@ -33587,7 +32730,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -33622,7 +32764,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -33648,7 +32789,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -33692,7 +32832,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -33713,7 +32852,6 @@ "ctxt": 0 }, "value": "SampleClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -33739,7 +32877,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "value": null, @@ -33765,7 +32902,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -33791,7 +32927,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -33825,7 +32960,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -33845,6 +32979,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -33867,13 +33002,11 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -33923,7 +33056,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33950,7 +33082,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -33961,7 +33092,6 @@ "ctxt": 0 }, "value": "freeze", - "typeAnnotation": null, "optional": false }, "computed": false @@ -33977,7 +33107,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } } @@ -34017,7 +33146,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -34043,7 +33171,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -34073,7 +33200,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -34112,7 +33238,6 @@ "ctxt": 0 }, "value": "merge", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -34133,6 +33258,7 @@ "ctxt": 0 }, "value": "obj1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -34155,13 +33281,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -34180,6 +33304,7 @@ "ctxt": 0 }, "value": "obj2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -34202,13 +33327,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -34244,7 +33367,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -34265,7 +33387,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -34303,7 +33424,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -34323,7 +33443,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -34342,7 +33461,6 @@ "ctxt": 0 }, "value": "AnotherSampleClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -34368,7 +33486,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -34388,6 +33505,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -34410,13 +33528,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -34453,6 +33569,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -34475,13 +33592,11 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -34501,7 +33616,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -34565,7 +33679,6 @@ "ctxt": 0 }, "value": "merge", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -34579,7 +33692,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false } }, @@ -34593,7 +33705,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -34625,7 +33736,6 @@ "ctxt": 0 }, "value": "brokenMethod", - "typeAnnotation": null, "optional": false }, "function": { @@ -34688,7 +33798,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34701,7 +33810,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34714,7 +33822,6 @@ "ctxt": 0 }, "value": "concat", - "typeAnnotation": null, "optional": false }, "computed": false @@ -34742,7 +33849,6 @@ "ctxt": 0 }, "value": "SampleClass", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -34769,7 +33875,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -34808,7 +33913,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -34828,7 +33932,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -34861,7 +33964,6 @@ "ctxt": 0 }, "value": "AnotherSampleClass", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -34891,7 +33993,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -34912,6 +34013,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -34934,13 +34036,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -34959,6 +34059,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -34981,13 +34082,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -35006,6 +34105,7 @@ "ctxt": 0 }, "value": "tk", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -35036,7 +34136,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -35056,14 +34155,12 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -35113,8 +34210,8 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -35129,7 +34226,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "body": { @@ -35163,8 +34259,8 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -35174,7 +34270,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false } } @@ -35209,7 +34304,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -35220,7 +34314,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -35233,7 +34326,6 @@ "ctxt": 0 }, "value": "tk", - "typeAnnotation": null, "optional": false } } @@ -35268,7 +34360,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -35289,7 +34380,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -35307,7 +34397,6 @@ "ctxt": 0 }, "value": "Extract", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -35341,7 +34430,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -35397,7 +34485,6 @@ "ctxt": 0 }, "value": "Predicates", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -35423,7 +34510,6 @@ "ctxt": 0 }, "value": "TaggedRecord", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -35454,7 +34540,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -35480,7 +34565,6 @@ "ctxt": 0 }, "value": "TaggedRecord", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -35506,6 +34590,7 @@ "ctxt": 0 }, "value": "variant", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -35536,7 +34621,6 @@ "ctxt": 0 }, "value": "TaggedRecord", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -35564,15 +34648,13 @@ "ctxt": 0 }, "value": "TaggedRecord", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -35599,7 +34681,6 @@ "ctxt": 0 }, "value": "variant", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -35632,7 +34713,6 @@ "ctxt": 0 }, "value": "TaggedRecord", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -35652,7 +34732,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -35680,7 +34759,6 @@ "ctxt": 0 }, "value": "Example", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -35706,7 +34784,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -35732,7 +34809,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -35758,7 +34834,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -35792,7 +34867,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -35848,7 +34922,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -35874,7 +34947,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -35915,7 +34987,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -35935,7 +35006,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -35982,7 +35052,6 @@ "ctxt": 0 }, "value": "Result", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -36001,7 +35070,6 @@ "ctxt": 0 }, "value": "Example", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -36036,7 +35104,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -36074,7 +35141,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -36121,7 +35187,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -36159,7 +35224,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -36212,7 +35276,6 @@ "ctxt": 0 }, "value": "Helper2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -36238,7 +35301,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -36269,7 +35331,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -36295,7 +35356,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -36320,7 +35380,6 @@ "ctxt": 0 }, "value": "Extract", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -36354,7 +35413,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -36374,7 +35432,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -36404,7 +35461,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -36453,7 +35509,6 @@ "ctxt": 0 }, "value": "Example2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -36479,7 +35534,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -36510,7 +35564,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -36536,7 +35589,6 @@ "ctxt": 0 }, "value": "Helper2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -36562,7 +35614,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -36606,7 +35657,6 @@ "ctxt": 0 }, "value": "Helper2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -36632,7 +35682,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -36655,7 +35704,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -36702,7 +35750,6 @@ "ctxt": 0 }, "value": "Result2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -36721,7 +35768,6 @@ "ctxt": 0 }, "value": "Example2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -36792,7 +35838,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -36875,7 +35920,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -36928,7 +35972,6 @@ "ctxt": 0 }, "value": "DBBoolTable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -36954,7 +35997,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -36993,7 +36035,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -37011,7 +36052,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -37083,7 +36123,6 @@ "ctxt": 0 }, "value": "Flag", - "typeAnnotation": null, "optional": false }, "members": [ @@ -37102,7 +36141,6 @@ "ctxt": 0 }, "value": "FLAG_1", - "typeAnnotation": null, "optional": false }, "init": { @@ -37135,7 +36173,6 @@ "ctxt": 0 }, "value": "FLAG_2", - "typeAnnotation": null, "optional": false }, "init": { @@ -37171,7 +36208,6 @@ "ctxt": 0 }, "value": "SimpleDBRecord", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -37197,7 +36233,6 @@ "ctxt": 0 }, "value": "Flag", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -37245,7 +36280,6 @@ "ctxt": 0 }, "value": "staticField", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -37288,7 +36322,6 @@ "ctxt": 0 }, "value": "DBBoolTable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -37314,7 +36347,6 @@ "ctxt": 0 }, "value": "Flag", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -37335,7 +36367,6 @@ "ctxt": 0 }, "value": "getFlagsFromSimpleRecord", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37356,6 +36387,7 @@ "ctxt": 0 }, "value": "record", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -37378,7 +36410,6 @@ "ctxt": 0 }, "value": "SimpleDBRecord", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -37404,7 +36435,6 @@ "ctxt": 0 }, "value": "Flag", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -37412,8 +36442,7 @@ ] } } - }, - "optional": false + } } }, { @@ -37432,6 +36461,7 @@ "ctxt": 0 }, "value": "flags", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -37461,14 +36491,12 @@ "ctxt": 0 }, "value": "Flag", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -37508,7 +36536,6 @@ "ctxt": 0 }, "value": "record", - "typeAnnotation": null, "optional": false }, "property": { @@ -37526,7 +36553,6 @@ "ctxt": 0 }, "value": "flags", - "typeAnnotation": null, "optional": false }, "property": { @@ -37570,7 +36596,6 @@ "ctxt": 0 }, "value": "Flag", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -37604,7 +36629,6 @@ "ctxt": 0 }, "value": "DynamicDBRecord", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -37630,7 +36654,6 @@ "ctxt": 0 }, "value": "Flag", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -37693,7 +36716,6 @@ "ctxt": 0 }, "value": "dynamicField", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -37745,7 +36767,6 @@ "ctxt": 0 }, "value": "dynamicField", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -37791,7 +36812,6 @@ "ctxt": 0 }, "value": "DBBoolTable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -37817,7 +36837,6 @@ "ctxt": 0 }, "value": "Flag", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -37838,7 +36857,6 @@ "ctxt": 0 }, "value": "getFlagsFromDynamicRecord", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37859,6 +36877,7 @@ "ctxt": 0 }, "value": "record", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -37881,7 +36900,6 @@ "ctxt": 0 }, "value": "DynamicDBRecord", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -37907,7 +36925,6 @@ "ctxt": 0 }, "value": "Flag", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -37915,8 +36932,7 @@ ] } } - }, - "optional": false + } } }, { @@ -37935,6 +36951,7 @@ "ctxt": 0 }, "value": "flags", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -37964,14 +36981,12 @@ "ctxt": 0 }, "value": "Flag", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -38011,7 +37026,6 @@ "ctxt": 0 }, "value": "record", - "typeAnnotation": null, "optional": false }, "property": { @@ -38029,7 +37043,6 @@ "ctxt": 0 }, "value": "flags", - "typeAnnotation": null, "optional": false }, "property": { @@ -38073,7 +37086,6 @@ "ctxt": 0 }, "value": "Flag", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -38106,7 +37118,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -38136,7 +37147,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -38175,7 +37185,6 @@ "ctxt": 0 }, "value": "take", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -38196,6 +37205,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -38218,13 +37228,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -38260,7 +37268,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -38296,7 +37303,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -38317,6 +37323,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -38339,13 +37346,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -38364,6 +37369,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -38386,13 +37392,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -38432,7 +37436,6 @@ "ctxt": 0 }, "value": "take", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -38453,7 +37456,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -38464,7 +37466,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -38542,7 +37543,6 @@ "ctxt": 0 }, "value": "take", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -38563,7 +37563,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -38574,7 +37573,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -38629,7 +37627,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -38647,7 +37644,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -38669,7 +37665,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -38695,7 +37690,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -38717,7 +37711,6 @@ "ctxt": 0 }, "value": "Unbounded", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -38743,7 +37736,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -38764,6 +37756,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -38794,7 +37787,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -38822,15 +37814,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -38873,6 +37863,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -38917,8 +37908,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -38928,7 +37918,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -38974,7 +37963,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -39000,7 +37988,6 @@ "ctxt": 0 }, "value": "I7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -39030,7 +38017,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -39075,7 +38061,6 @@ "ctxt": 0 }, "value": "Foo7", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -39101,7 +38086,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -39132,7 +38116,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -39148,7 +38131,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -39169,6 +38151,7 @@ "ctxt": 0 }, "value": "type", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -39191,13 +38174,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -39233,7 +38214,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -39259,7 +38239,6 @@ "ctxt": 0 }, "value": "I7", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -39291,7 +38270,6 @@ "ctxt": 0 }, "value": "Foo7", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -39325,7 +38303,6 @@ "ctxt": 0 }, "value": "I7", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -39345,7 +38322,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -39372,7 +38348,6 @@ "ctxt": 0 }, "value": "Dict", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -39398,7 +38373,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -39437,7 +38411,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -39455,7 +38428,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -39491,7 +38463,6 @@ "ctxt": 0 }, "value": "DictDict", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -39517,7 +38488,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -39546,7 +38516,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -39585,7 +38554,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -39603,7 +38571,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -39627,7 +38594,6 @@ "ctxt": 0 }, "value": "Dict", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -39653,7 +38619,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -39673,7 +38638,6 @@ "ctxt": 0 }, "value": "ff1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -39694,6 +38658,7 @@ "ctxt": 0 }, "value": "dd", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -39716,7 +38681,6 @@ "ctxt": 0 }, "value": "DictDict", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -39742,7 +38706,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -39762,7 +38725,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -39770,8 +38732,7 @@ ] } } - }, - "optional": false + } } }, { @@ -39790,6 +38751,7 @@ "ctxt": 0 }, "value": "k1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -39812,13 +38774,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -39837,6 +38797,7 @@ "ctxt": 0 }, "value": "k2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -39859,13 +38820,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -39912,7 +38871,6 @@ "ctxt": 0 }, "value": "dd", - "typeAnnotation": null, "optional": false }, "property": { @@ -39923,7 +38881,6 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, "optional": false }, "computed": true @@ -39936,7 +38893,6 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, "optional": false }, "computed": true @@ -39969,7 +38925,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -39998,7 +38953,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -40042,7 +38996,6 @@ "ctxt": 0 }, "value": "ff2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -40063,6 +39016,7 @@ "ctxt": 0 }, "value": "dd", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -40085,7 +39039,6 @@ "ctxt": 0 }, "value": "DictDict", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -40111,7 +39064,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -40131,7 +39083,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -40139,8 +39090,7 @@ ] } } - }, - "optional": false + } } }, { @@ -40159,6 +39109,7 @@ "ctxt": 0 }, "value": "k1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -40181,13 +39132,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -40206,6 +39155,7 @@ "ctxt": 0 }, "value": "k2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -40228,13 +39178,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -40277,6 +39225,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -40299,7 +39248,6 @@ "ctxt": 0 }, "value": "Dict", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -40325,7 +39273,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -40333,8 +39280,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -40351,7 +39297,6 @@ "ctxt": 0 }, "value": "dd", - "typeAnnotation": null, "optional": false }, "property": { @@ -40362,7 +39307,6 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, "optional": false }, "computed": true @@ -40393,7 +39337,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -40404,7 +39347,6 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, "optional": false }, "computed": true @@ -40437,7 +39379,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -40466,7 +39407,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -40525,8 +39465,8 @@ "ctxt": 0 }, "value": "cf1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -40544,6 +39484,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -40566,13 +39507,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -40582,6 +39521,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -40604,13 +39544,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -40646,6 +39584,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -40662,8 +39601,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -40680,7 +39618,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -40691,7 +39628,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -40722,7 +39658,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -40733,7 +39668,6 @@ "ctxt": 0 }, "value": "cool", - "typeAnnotation": null, "optional": false }, "computed": false @@ -40766,7 +39700,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -40800,7 +39733,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -40818,7 +39750,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -40861,7 +39792,6 @@ "ctxt": 0 }, "value": "cool", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -40908,7 +39838,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -40934,7 +39863,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -40975,8 +39903,8 @@ "ctxt": 0 }, "value": "cf2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -40994,6 +39922,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -41016,13 +39945,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -41032,6 +39959,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -41054,13 +39982,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -41096,6 +40022,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -41112,8 +40039,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -41130,7 +40056,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -41141,7 +40066,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -41172,7 +40096,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -41183,7 +40106,6 @@ "ctxt": 0 }, "value": "cool", - "typeAnnotation": null, "optional": false }, "computed": false @@ -41216,7 +40138,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -41242,7 +40163,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -41268,7 +40188,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -41328,7 +40247,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -41354,7 +40272,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/keyof/keyofAndIndexedAccess2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/keyof/keyofAndIndexedAccess2/input.ts.json index ef95863bceb2..25eccadd299e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/keyof/keyofAndIndexedAccess2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/keyof/keyofAndIndexedAccess2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -68,7 +68,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -110,7 +109,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -187,7 +185,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -215,8 +212,7 @@ } ] } - }, - "optional": false + } } }, { @@ -235,6 +231,7 @@ "ctxt": 0 }, "value": "k0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -264,8 +261,7 @@ } } } - }, - "optional": false + } } }, { @@ -284,6 +280,7 @@ "ctxt": 0 }, "value": "k1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -345,8 +342,7 @@ } ] } - }, - "optional": false + } } }, { @@ -365,6 +361,7 @@ "ctxt": 0 }, "value": "k2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -448,8 +445,7 @@ } ] } - }, - "optional": false + } } } ], @@ -497,7 +493,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -508,7 +503,6 @@ "ctxt": 0 }, "value": "k0", - "typeAnnotation": null, "optional": false }, "computed": true @@ -554,7 +548,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -565,7 +558,6 @@ "ctxt": 0 }, "value": "k0", - "typeAnnotation": null, "optional": false }, "computed": true @@ -611,7 +603,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -622,7 +613,6 @@ "ctxt": 0 }, "value": "k0", - "typeAnnotation": null, "optional": false }, "computed": true @@ -673,7 +663,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -684,7 +673,6 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, "optional": false }, "computed": true @@ -730,7 +718,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -741,7 +728,6 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, "optional": false }, "computed": true @@ -787,7 +773,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -798,7 +783,6 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, "optional": false }, "computed": true @@ -849,7 +833,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -860,7 +843,6 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, "optional": false }, "computed": true @@ -906,7 +888,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -917,7 +898,6 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, "optional": false }, "computed": true @@ -963,7 +943,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -974,7 +953,6 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1012,7 +990,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1033,6 +1010,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1064,7 +1042,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1106,7 +1083,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1134,8 +1110,7 @@ } ] } - }, - "optional": false + } } }, { @@ -1154,6 +1129,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1180,6 +1156,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1196,8 +1173,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1226,8 +1202,7 @@ } ] } - }, - "optional": false + } } }, { @@ -1246,6 +1221,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1268,13 +1244,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1293,6 +1267,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1323,14 +1298,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -1371,8 +1344,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1382,7 +1355,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1410,8 +1382,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1421,7 +1393,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1449,8 +1420,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1460,7 +1431,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1488,8 +1458,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1499,7 +1469,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1527,8 +1496,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1538,7 +1507,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1566,8 +1534,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1577,7 +1545,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1604,7 +1571,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1615,7 +1581,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1643,7 +1608,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1654,7 +1618,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1682,7 +1645,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1693,7 +1655,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1721,7 +1682,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1732,7 +1692,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1768,7 +1727,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1779,7 +1737,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1825,7 +1782,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1836,7 +1792,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1882,7 +1837,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1893,7 +1847,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1939,7 +1892,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1950,7 +1902,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1993,7 +1944,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2015,6 +1965,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2031,8 +1982,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2077,7 +2027,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2098,6 +2047,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2128,7 +2078,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2146,7 +2095,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2165,8 +2113,7 @@ "kind": "number" } } - }, - "optional": false + } } }, { @@ -2185,6 +2132,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2211,6 +2159,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2227,8 +2176,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2257,8 +2205,7 @@ } ] } - }, - "optional": false + } } }, { @@ -2277,6 +2224,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2299,13 +2247,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2346,8 +2292,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2357,7 +2303,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2385,8 +2330,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2396,7 +2341,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2423,7 +2367,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -2434,7 +2377,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -2470,7 +2412,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -2481,7 +2422,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -2524,7 +2464,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2552,7 +2491,6 @@ "ctxt": 0 }, "value": "f3b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2573,6 +2511,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2603,7 +2542,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2621,7 +2559,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2640,8 +2577,7 @@ "kind": "number" } } - }, - "optional": false + } } }, { @@ -2660,6 +2596,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2690,7 +2627,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2716,8 +2652,7 @@ "kind": "number" } } - }, - "optional": false + } } }, { @@ -2736,6 +2671,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2758,13 +2694,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2805,8 +2739,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2816,7 +2750,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2844,8 +2777,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2855,7 +2788,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2887,7 +2819,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2915,7 +2846,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2936,6 +2866,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2970,6 +2901,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2986,8 +2918,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3031,14 +2962,12 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } }, { @@ -3057,6 +2986,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3073,8 +3003,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -3115,8 +3044,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3126,7 +3055,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -3154,8 +3082,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3165,7 +3093,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3197,7 +3124,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3231,7 +3157,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3259,7 +3184,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3301,7 +3225,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3340,7 +3263,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3361,6 +3283,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3383,13 +3306,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3408,6 +3329,7 @@ "ctxt": 0 }, "value": "k1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3424,8 +3346,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -3444,6 +3365,7 @@ "ctxt": 0 }, "value": "k2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3474,14 +3396,12 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } }, { @@ -3500,6 +3420,7 @@ "ctxt": 0 }, "value": "k3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3530,14 +3451,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } }, { @@ -3556,6 +3475,7 @@ "ctxt": 0 }, "value": "k4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3578,13 +3498,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3632,7 +3550,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -3643,7 +3560,6 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, "optional": false }, "computed": true @@ -3689,7 +3605,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -3700,7 +3615,6 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, "optional": false }, "computed": true @@ -3746,7 +3660,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -3757,7 +3670,6 @@ "ctxt": 0 }, "value": "k3", - "typeAnnotation": null, "optional": false }, "computed": true @@ -3803,7 +3715,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -3814,7 +3725,6 @@ "ctxt": 0 }, "value": "k4", - "typeAnnotation": null, "optional": false }, "computed": true @@ -3857,7 +3767,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3875,7 +3784,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3897,7 +3805,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3923,7 +3830,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3951,7 +3857,6 @@ "ctxt": 0 }, "value": "Dict", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3970,7 +3875,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4013,7 +3917,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4034,6 +3937,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4056,13 +3960,11 @@ "ctxt": 0 }, "value": "Dict", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4081,6 +3983,7 @@ "ctxt": 0 }, "value": "k1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4111,14 +4014,12 @@ "ctxt": 0 }, "value": "Dict", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } }, { @@ -4137,6 +4038,7 @@ "ctxt": 0 }, "value": "k2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4159,13 +4061,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4213,7 +4113,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -4224,7 +4123,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4270,7 +4168,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -4281,7 +4178,6 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4327,7 +4223,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -4338,7 +4233,6 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4381,7 +4275,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4407,7 +4300,6 @@ "ctxt": 0 }, "value": "Dict", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4429,7 +4321,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4450,6 +4341,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4472,13 +4364,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4497,6 +4387,7 @@ "ctxt": 0 }, "value": "k1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4527,14 +4418,12 @@ "ctxt": 0 }, "value": "Dict", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } }, { @@ -4553,6 +4442,7 @@ "ctxt": 0 }, "value": "k2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4583,14 +4473,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } }, { @@ -4609,6 +4497,7 @@ "ctxt": 0 }, "value": "k3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4631,13 +4520,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4685,7 +4572,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -4696,7 +4582,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4742,7 +4627,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -4753,7 +4637,6 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4799,7 +4682,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -4810,7 +4692,6 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4856,7 +4737,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -4867,7 +4747,6 @@ "ctxt": 0 }, "value": "k3", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4910,7 +4789,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4928,7 +4806,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4954,7 +4831,6 @@ "ctxt": 0 }, "value": "Dict", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4979,7 +4855,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5005,7 +4880,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5039,7 +4913,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5069,7 +4942,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5141,7 +5013,6 @@ "ctxt": 0 }, "value": "IdOf", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5167,7 +5038,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5185,7 +5055,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5217,7 +5086,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5269,7 +5137,6 @@ "ctxt": 0 }, "value": "EntityState", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5296,7 +5163,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5314,7 +5180,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5348,7 +5213,6 @@ "ctxt": 0 }, "value": "ids", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5384,7 +5248,6 @@ "ctxt": 0 }, "value": "IdOf", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5410,7 +5273,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5438,7 +5300,6 @@ "ctxt": 0 }, "value": "entities", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5471,6 +5332,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5487,8 +5349,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -5513,7 +5374,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5537,6 +5397,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5553,8 +5414,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -5579,7 +5439,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5618,7 +5477,6 @@ "ctxt": 0 }, "value": "getAllEntities", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5639,6 +5497,7 @@ "ctxt": 0 }, "value": "state", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5661,7 +5520,6 @@ "ctxt": 0 }, "value": "EntityState", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5687,7 +5545,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5695,8 +5552,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5754,7 +5610,6 @@ "ctxt": 0 }, "value": "ids", - "typeAnnotation": null, "optional": false }, "value": null @@ -5774,7 +5629,6 @@ "ctxt": 0 }, "value": "entities", - "typeAnnotation": null, "optional": false }, "value": null @@ -5791,7 +5645,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "definite": false @@ -5827,7 +5680,6 @@ "ctxt": 0 }, "value": "ids", - "typeAnnotation": null, "optional": false }, "property": { @@ -5838,7 +5690,6 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5862,8 +5713,8 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5881,7 +5732,6 @@ "ctxt": 0 }, "value": "entities", - "typeAnnotation": null, "optional": false }, "property": { @@ -5892,7 +5742,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": true @@ -5934,7 +5783,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5952,7 +5800,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5990,7 +5837,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6016,7 +5862,6 @@ "ctxt": 0 }, "value": "getEntity", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6037,6 +5882,7 @@ "ctxt": 0 }, "value": "id", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6059,7 +5905,6 @@ "ctxt": 0 }, "value": "IdOf", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6085,7 +5930,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6093,8 +5937,7 @@ ] } } - }, - "optional": false + } } }, { @@ -6113,6 +5956,7 @@ "ctxt": 0 }, "value": "state", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6135,7 +5979,6 @@ "ctxt": 0 }, "value": "EntityState", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6161,7 +6004,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6169,8 +6011,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6228,7 +6069,6 @@ "ctxt": 0 }, "value": "ids", - "typeAnnotation": null, "optional": false }, "value": null @@ -6248,7 +6088,6 @@ "ctxt": 0 }, "value": "entities", - "typeAnnotation": null, "optional": false }, "value": null @@ -6265,7 +6104,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "definite": false @@ -6309,7 +6147,6 @@ "ctxt": 0 }, "value": "ids", - "typeAnnotation": null, "optional": false }, "property": { @@ -6320,7 +6157,6 @@ "ctxt": 0 }, "value": "includes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6336,7 +6172,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false } } @@ -6367,7 +6202,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -6397,7 +6231,6 @@ "ctxt": 0 }, "value": "entities", - "typeAnnotation": null, "optional": false }, "property": { @@ -6408,7 +6241,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": true @@ -6441,7 +6273,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6459,7 +6290,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6498,7 +6328,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6532,7 +6361,6 @@ "ctxt": 0 }, "value": "Type", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6562,7 +6390,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6612,7 +6439,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6664,7 +6490,6 @@ "ctxt": 0 }, "value": "get123", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6727,7 +6552,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6753,7 +6577,6 @@ "ctxt": 0 }, "value": "Type", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6793,7 +6616,6 @@ "ctxt": 0 }, "value": "Type", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6813,7 +6635,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6837,7 +6658,6 @@ "ctxt": 0 }, "value": "StrictExtract", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6863,7 +6683,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6884,7 +6703,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6914,7 +6732,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6934,7 +6751,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6961,7 +6777,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6981,7 +6796,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7001,7 +6815,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7043,7 +6856,6 @@ "ctxt": 0 }, "value": "StrictExclude", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7069,7 +6881,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7090,7 +6901,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7120,7 +6930,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7140,7 +6949,6 @@ "ctxt": 0 }, "value": "StrictExtract", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7166,7 +6974,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7186,7 +6993,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7218,7 +7024,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7241,7 +7046,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7267,7 +7071,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7298,7 +7101,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7332,7 +7134,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7358,7 +7159,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7383,7 +7183,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7412,7 +7211,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7446,7 +7244,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7466,7 +7263,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7490,7 +7286,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7516,7 +7311,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7537,7 +7331,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7560,7 +7353,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7594,7 +7386,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7620,7 +7411,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7645,7 +7435,6 @@ "ctxt": 0 }, "value": "StrictExclude", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7671,7 +7460,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7705,7 +7493,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7725,7 +7512,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7746,7 +7532,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7781,7 +7566,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7802,6 +7586,7 @@ "ctxt": 0 }, "value": "param", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7824,13 +7609,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -7849,6 +7632,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7872,6 +7656,7 @@ "ctxt": 0 }, "value": "element", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7910,7 +7695,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7948,8 +7732,7 @@ "kind": "number" } } - }, - "optional": false + } } ], "typeParams": null, @@ -7971,8 +7754,7 @@ } } } - }, - "optional": false + } } } ], @@ -8012,7 +7794,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8040,7 +7821,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "property": { @@ -8051,7 +7831,6 @@ "ctxt": 0 }, "value": "elements", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8099,7 +7878,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8134,7 +7912,6 @@ "ctxt": 0 }, "value": "elements", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8163,7 +7940,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8215,7 +7991,6 @@ "ctxt": 0 }, "value": "elements", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8244,7 +8019,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8290,7 +8064,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8311,6 +8084,7 @@ "ctxt": 0 }, "value": "param", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8333,13 +8107,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -8358,6 +8130,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8381,6 +8154,7 @@ "ctxt": 0 }, "value": "element", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8411,7 +8185,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8426,8 +8199,7 @@ "kind": "number" } } - }, - "optional": false + } } ], "typeParams": null, @@ -8449,8 +8221,7 @@ } } } - }, - "optional": false + } } } ], @@ -8490,7 +8261,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8511,7 +8281,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "property": { @@ -8557,7 +8326,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8575,7 +8343,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8614,7 +8381,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8635,6 +8401,7 @@ "ctxt": 0 }, "value": "param", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8657,13 +8424,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -8682,6 +8447,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8705,6 +8471,7 @@ "ctxt": 0 }, "value": "element", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8735,7 +8502,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8750,8 +8516,7 @@ "kind": "number" } } - }, - "optional": false + } } ], "typeParams": null, @@ -8773,8 +8538,7 @@ } } } - }, - "optional": false + } } } ], @@ -8814,7 +8578,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8835,7 +8598,6 @@ "ctxt": 0 }, "value": "param", - "typeAnnotation": null, "optional": false }, "property": { @@ -8881,7 +8643,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8899,7 +8660,6 @@ "ctxt": 0 }, "value": "ReadonlyArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8938,7 +8698,6 @@ "ctxt": 0 }, "value": "fn4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8982,6 +8741,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9012,7 +8772,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9050,14 +8809,12 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -9102,6 +8859,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9132,7 +8890,6 @@ "ctxt": 0 }, "value": "ReadonlyArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9170,14 +8927,12 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -9224,7 +8979,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9259,7 +9013,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9281,6 +9034,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9297,8 +9051,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -9340,7 +9093,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -9390,7 +9142,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9502,7 +9253,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9528,7 +9278,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9555,6 +9304,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9571,8 +9321,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -9613,7 +9362,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9639,7 +9387,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9664,7 +9411,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9693,7 +9439,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9727,7 +9472,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9753,7 +9497,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9780,6 +9523,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9796,8 +9540,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -9838,7 +9581,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9864,7 +9606,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9905,7 +9646,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9937,7 +9677,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9971,7 +9710,6 @@ "ctxt": 0 }, "value": "Baz", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9997,7 +9735,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10018,7 +9755,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10036,7 +9772,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10062,7 +9797,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10097,7 +9831,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10123,7 +9856,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10156,7 +9888,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10184,7 +9915,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10204,7 +9934,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10229,7 +9958,6 @@ "ctxt": 0 }, "value": "Qux", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10255,7 +9983,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10276,7 +10003,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10294,7 +10020,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10320,7 +10045,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10355,7 +10079,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10381,7 +10104,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10414,7 +10136,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10450,7 +10171,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10470,7 +10190,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10527,8 +10246,8 @@ "ctxt": 0 }, "value": "actions", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsConstAssertion", @@ -10619,8 +10338,8 @@ "ctxt": 0 }, "value": "action", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -10635,7 +10354,6 @@ "ctxt": 0 }, "value": "actions", - "typeAnnotation": null, "optional": false }, "body": { @@ -10676,7 +10394,6 @@ "ctxt": 0 }, "value": "window", - "typeAnnotation": null, "optional": false }, "property": { @@ -10687,7 +10404,6 @@ "ctxt": 0 }, "value": "action", - "typeAnnotation": null, "optional": false }, "computed": true @@ -10708,8 +10424,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -10719,8 +10435,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -10760,7 +10476,6 @@ "ctxt": 0 }, "value": "window", - "typeAnnotation": null, "optional": false }, "property": { @@ -10771,7 +10486,6 @@ "ctxt": 0 }, "value": "action", - "typeAnnotation": null, "optional": false }, "computed": true @@ -10787,7 +10501,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -10801,7 +10514,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/keyof/keyofAndIndexedAccessErrors/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/keyof/keyofAndIndexedAccessErrors/input.ts.json index 34dbd53a6944..c1666df70894 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/keyof/keyofAndIndexedAccessErrors/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/keyof/keyofAndIndexedAccessErrors/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "width", - "typeAnnotation": null, "optional": false }, "value": null, @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "height", - "typeAnnotation": null, "optional": false }, "value": null, @@ -180,7 +176,6 @@ "ctxt": 0 }, "value": "visible", - "typeAnnotation": null, "optional": false }, "value": null, @@ -234,7 +229,6 @@ "ctxt": 0 }, "value": "Dictionary", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -260,7 +254,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -287,6 +280,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -303,8 +297,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -329,7 +322,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -361,7 +353,6 @@ "ctxt": 0 }, "value": "T00", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -388,7 +379,6 @@ "ctxt": 0 }, "value": "K0", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -411,7 +401,6 @@ "ctxt": 0 }, "value": "T01", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -438,7 +427,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -461,7 +449,6 @@ "ctxt": 0 }, "value": "T02", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -496,7 +483,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -520,7 +506,6 @@ "ctxt": 0 }, "value": "T03", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -563,7 +548,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -588,7 +572,6 @@ "ctxt": 0 }, "value": "T04", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -639,7 +622,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -665,7 +647,6 @@ "ctxt": 0 }, "value": "T05", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -724,7 +705,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -751,7 +731,6 @@ "ctxt": 0 }, "value": "T06", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -818,7 +797,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -846,7 +824,6 @@ "ctxt": 0 }, "value": "T10", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -873,7 +850,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -918,7 +894,6 @@ "ctxt": 0 }, "value": "T11", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -945,7 +920,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -990,7 +964,6 @@ "ctxt": 0 }, "value": "T12", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1017,7 +990,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1094,7 +1066,6 @@ "ctxt": 0 }, "value": "T13", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1121,7 +1092,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1153,7 +1123,6 @@ "ctxt": 0 }, "value": "T14", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1180,7 +1149,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1212,7 +1180,6 @@ "ctxt": 0 }, "value": "T15", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1239,7 +1206,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1271,7 +1237,6 @@ "ctxt": 0 }, "value": "T16", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1298,7 +1263,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1330,7 +1294,6 @@ "ctxt": 0 }, "value": "T17", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1357,7 +1320,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1389,7 +1351,6 @@ "ctxt": 0 }, "value": "T18", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1416,7 +1377,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1448,7 +1408,6 @@ "ctxt": 0 }, "value": "T19", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1475,7 +1434,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1504,7 +1462,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1550,7 +1507,6 @@ "ctxt": 0 }, "value": "T20", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1577,7 +1533,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1628,7 +1583,6 @@ "ctxt": 0 }, "value": "T21", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1655,7 +1609,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1706,7 +1659,6 @@ "ctxt": 0 }, "value": "T22", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1733,7 +1685,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1784,7 +1735,6 @@ "ctxt": 0 }, "value": "T30", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1853,7 +1803,6 @@ "ctxt": 0 }, "value": "T31", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1909,7 +1858,6 @@ "ctxt": 0 }, "value": "T32", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1965,7 +1913,6 @@ "ctxt": 0 }, "value": "T33", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2021,7 +1968,6 @@ "ctxt": 0 }, "value": "T40", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2048,7 +1994,6 @@ "ctxt": 0 }, "value": "Dictionary", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2098,7 +2043,6 @@ "ctxt": 0 }, "value": "T41", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2125,7 +2069,6 @@ "ctxt": 0 }, "value": "Dictionary", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2175,7 +2118,6 @@ "ctxt": 0 }, "value": "T42", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2202,7 +2144,6 @@ "ctxt": 0 }, "value": "Dictionary", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2252,7 +2193,6 @@ "ctxt": 0 }, "value": "T43", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2279,7 +2219,6 @@ "ctxt": 0 }, "value": "Dictionary", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2329,7 +2268,6 @@ "ctxt": 0 }, "value": "T50", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2377,7 +2315,6 @@ "ctxt": 0 }, "value": "T51", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2425,7 +2362,6 @@ "ctxt": 0 }, "value": "T52", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2473,7 +2409,6 @@ "ctxt": 0 }, "value": "T53", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2521,7 +2456,6 @@ "ctxt": 0 }, "value": "T60", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2582,7 +2516,6 @@ "ctxt": 0 }, "value": "T61", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2652,6 +2585,7 @@ "ctxt": 0 }, "value": "cond", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2668,8 +2602,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2686,7 +2619,6 @@ "ctxt": 0 }, "value": "getProperty", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2707,6 +2639,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2729,13 +2662,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2754,6 +2685,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2776,13 +2708,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2822,7 +2752,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -2833,7 +2762,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -2866,7 +2794,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2887,7 +2814,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2913,7 +2839,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2935,7 +2860,6 @@ "ctxt": 0 }, "value": "setProperty", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2956,6 +2880,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2978,13 +2903,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3003,6 +2926,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3025,13 +2949,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3050,6 +2972,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3080,7 +3003,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3100,14 +3022,12 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -3155,7 +3075,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -3166,7 +3085,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -3179,7 +3097,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -3211,7 +3128,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3232,7 +3148,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3258,7 +3173,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3280,7 +3194,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3301,6 +3214,7 @@ "ctxt": 0 }, "value": "shape", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3323,13 +3237,11 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3372,8 +3284,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3390,7 +3302,6 @@ "ctxt": 0 }, "value": "getProperty", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3404,7 +3315,6 @@ "ctxt": 0 }, "value": "shape", - "typeAnnotation": null, "optional": false } }, @@ -3457,8 +3367,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3475,7 +3385,6 @@ "ctxt": 0 }, "value": "getProperty", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3489,7 +3398,6 @@ "ctxt": 0 }, "value": "shape", - "typeAnnotation": null, "optional": false } }, @@ -3542,8 +3450,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3560,7 +3468,6 @@ "ctxt": 0 }, "value": "getProperty", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3574,7 +3481,6 @@ "ctxt": 0 }, "value": "shape", - "typeAnnotation": null, "optional": false } }, @@ -3595,7 +3501,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -3657,7 +3562,6 @@ "ctxt": 0 }, "value": "setProperty", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3671,7 +3575,6 @@ "ctxt": 0 }, "value": "shape", - "typeAnnotation": null, "optional": false } }, @@ -3735,7 +3638,6 @@ "ctxt": 0 }, "value": "setProperty", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3749,7 +3651,6 @@ "ctxt": 0 }, "value": "shape", - "typeAnnotation": null, "optional": false } }, @@ -3808,7 +3709,6 @@ "ctxt": 0 }, "value": "setProperty", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3822,7 +3722,6 @@ "ctxt": 0 }, "value": "shape", - "typeAnnotation": null, "optional": false } }, @@ -3843,7 +3742,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -3909,7 +3807,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3930,6 +3827,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3960,7 +3858,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3980,15 +3877,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } }, { @@ -4007,6 +3902,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4037,7 +3933,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4057,15 +3952,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } }, { @@ -4084,6 +3977,7 @@ "ctxt": 0 }, "value": "k1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4129,7 +4023,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4149,7 +4042,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4158,8 +4050,7 @@ } } } - }, - "optional": false + } } }, { @@ -4178,6 +4069,7 @@ "ctxt": 0 }, "value": "k2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4216,7 +4108,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4245,7 +4136,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4253,8 +4143,7 @@ } ] } - }, - "optional": false + } } }, { @@ -4273,6 +4162,7 @@ "ctxt": 0 }, "value": "k3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4318,7 +4208,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4338,7 +4227,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4347,8 +4235,7 @@ } } } - }, - "optional": false + } } }, { @@ -4367,6 +4254,7 @@ "ctxt": 0 }, "value": "k4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4405,7 +4293,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4434,7 +4321,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4442,8 +4328,7 @@ } ] } - }, - "optional": false + } } } ], @@ -4483,7 +4368,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4494,7 +4378,6 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4522,7 +4405,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4533,7 +4415,6 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4561,7 +4442,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4572,7 +4452,6 @@ "ctxt": 0 }, "value": "k3", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4600,7 +4479,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4611,7 +4489,6 @@ "ctxt": 0 }, "value": "k4", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4639,7 +4516,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -4650,7 +4526,6 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4678,7 +4553,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -4689,7 +4563,6 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4717,7 +4590,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -4728,7 +4600,6 @@ "ctxt": 0 }, "value": "k3", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4756,7 +4627,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -4767,7 +4637,6 @@ "ctxt": 0 }, "value": "k4", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4796,8 +4665,8 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4807,7 +4676,6 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, "optional": false } } @@ -4835,8 +4703,8 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4846,7 +4714,6 @@ "ctxt": 0 }, "value": "k3", - "typeAnnotation": null, "optional": false } } @@ -4874,8 +4741,8 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4885,7 +4752,6 @@ "ctxt": 0 }, "value": "k4", - "typeAnnotation": null, "optional": false } } @@ -4913,8 +4779,8 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4924,7 +4790,6 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, "optional": false } } @@ -4952,8 +4817,8 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4963,7 +4828,6 @@ "ctxt": 0 }, "value": "k3", - "typeAnnotation": null, "optional": false } } @@ -4991,8 +4855,8 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5002,7 +4866,6 @@ "ctxt": 0 }, "value": "k4", - "typeAnnotation": null, "optional": false } } @@ -5030,8 +4893,8 @@ "ctxt": 0 }, "value": "k3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5041,7 +4904,6 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, "optional": false } } @@ -5069,8 +4931,8 @@ "ctxt": 0 }, "value": "k3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5080,7 +4942,6 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, "optional": false } } @@ -5108,8 +4969,8 @@ "ctxt": 0 }, "value": "k3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5119,7 +4980,6 @@ "ctxt": 0 }, "value": "k4", - "typeAnnotation": null, "optional": false } } @@ -5147,8 +5007,8 @@ "ctxt": 0 }, "value": "k4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5158,7 +5018,6 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, "optional": false } } @@ -5186,8 +5045,8 @@ "ctxt": 0 }, "value": "k4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5197,7 +5056,6 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, "optional": false } } @@ -5225,8 +5083,8 @@ "ctxt": 0 }, "value": "k4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5236,7 +5094,6 @@ "ctxt": 0 }, "value": "k3", - "typeAnnotation": null, "optional": false } } @@ -5268,7 +5125,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5289,7 +5145,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5309,7 +5164,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5330,6 +5184,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5352,13 +5207,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -5377,6 +5230,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5399,13 +5253,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -5424,6 +5276,7 @@ "ctxt": 0 }, "value": "tk", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5454,7 +5307,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5474,14 +5326,12 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } }, { @@ -5500,6 +5350,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5522,13 +5373,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -5547,6 +5396,7 @@ "ctxt": 0 }, "value": "j", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5569,13 +5419,11 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -5594,6 +5442,7 @@ "ctxt": 0 }, "value": "uk", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5624,7 +5473,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5644,14 +5492,12 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } }, { @@ -5670,6 +5516,7 @@ "ctxt": 0 }, "value": "tj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5700,7 +5547,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5720,14 +5566,12 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } }, { @@ -5746,6 +5590,7 @@ "ctxt": 0 }, "value": "uj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5776,7 +5621,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5796,14 +5640,12 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -5853,8 +5695,8 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -5869,7 +5711,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "body": { @@ -5903,8 +5744,8 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5914,7 +5755,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false } } @@ -5942,8 +5782,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5953,7 +5793,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false } } @@ -5988,7 +5827,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -5999,7 +5837,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -6012,7 +5849,6 @@ "ctxt": 0 }, "value": "tk", - "typeAnnotation": null, "optional": false } } @@ -6040,8 +5876,8 @@ "ctxt": 0 }, "value": "tk", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -6058,7 +5894,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -6069,7 +5904,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -6102,8 +5936,8 @@ "ctxt": 0 }, "value": "tk", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6113,7 +5947,6 @@ "ctxt": 0 }, "value": "uk", - "typeAnnotation": null, "optional": false } } @@ -6141,8 +5974,8 @@ "ctxt": 0 }, "value": "uk", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6152,7 +5985,6 @@ "ctxt": 0 }, "value": "tk", - "typeAnnotation": null, "optional": false } } @@ -6180,8 +6012,8 @@ "ctxt": 0 }, "value": "tj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6191,7 +6023,6 @@ "ctxt": 0 }, "value": "uj", - "typeAnnotation": null, "optional": false } } @@ -6219,8 +6050,8 @@ "ctxt": 0 }, "value": "uj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6230,7 +6061,6 @@ "ctxt": 0 }, "value": "tj", - "typeAnnotation": null, "optional": false } } @@ -6258,8 +6088,8 @@ "ctxt": 0 }, "value": "tk", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6269,7 +6099,6 @@ "ctxt": 0 }, "value": "tj", - "typeAnnotation": null, "optional": false } } @@ -6297,8 +6126,8 @@ "ctxt": 0 }, "value": "tj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6308,7 +6137,6 @@ "ctxt": 0 }, "value": "tk", - "typeAnnotation": null, "optional": false } } @@ -6336,8 +6164,8 @@ "ctxt": 0 }, "value": "tk", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6347,7 +6175,6 @@ "ctxt": 0 }, "value": "uj", - "typeAnnotation": null, "optional": false } } @@ -6375,8 +6202,8 @@ "ctxt": 0 }, "value": "uj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6386,7 +6213,6 @@ "ctxt": 0 }, "value": "tk", - "typeAnnotation": null, "optional": false } } @@ -6418,7 +6244,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6439,7 +6264,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6457,7 +6281,6 @@ "ctxt": 0 }, "value": "Extract", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6491,7 +6314,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6526,7 +6348,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6544,7 +6365,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6566,7 +6386,6 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6584,7 +6403,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6621,7 +6439,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6642,6 +6459,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6672,14 +6490,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -6720,8 +6536,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -6757,8 +6573,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -6803,7 +6619,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6829,7 +6644,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6855,7 +6669,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6897,7 +6710,6 @@ "ctxt": 0 }, "value": "UndefinedKeys", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6923,7 +6735,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6941,7 +6752,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7000,7 +6810,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7026,7 +6835,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7075,7 +6883,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7095,7 +6902,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7116,7 +6922,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7149,7 +6954,6 @@ "ctxt": 0 }, "value": "MyType", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -7177,7 +6981,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7219,7 +7022,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7283,7 +7085,6 @@ "ctxt": 0 }, "value": "Result1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -7302,7 +7103,6 @@ "ctxt": 0 }, "value": "UndefinedKeys", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7328,7 +7128,6 @@ "ctxt": 0 }, "value": "MyType", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7362,6 +7161,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7392,7 +7192,6 @@ "ctxt": 0 }, "value": "Result1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7420,8 +7219,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -7466,6 +7264,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7496,7 +7295,6 @@ "ctxt": 0 }, "value": "Result1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7524,8 +7322,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -7555,7 +7352,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7576,6 +7372,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7598,13 +7395,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -7623,6 +7418,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7645,13 +7441,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -7699,7 +7493,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -7710,7 +7503,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -7756,7 +7548,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -7767,7 +7558,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -7818,7 +7608,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -7829,7 +7618,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -7897,7 +7685,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7915,7 +7702,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7964,7 +7750,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7990,7 +7775,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8012,7 +7796,6 @@ "ctxt": 0 }, "value": "f30", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8056,6 +7839,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8086,7 +7870,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8112,7 +7895,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8146,7 +7928,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8182,14 +7963,12 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -8236,7 +8015,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8257,7 +8035,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8283,7 +8060,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8305,7 +8081,6 @@ "ctxt": 0 }, "value": "f31", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8349,6 +8124,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8379,7 +8155,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8405,7 +8180,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8431,7 +8205,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8457,7 +8230,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8483,7 +8255,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8509,7 +8280,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8535,7 +8305,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8561,7 +8330,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8595,7 +8363,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8649,14 +8416,12 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -8703,7 +8468,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8724,7 +8488,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8750,7 +8513,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/keyof/keyofIntersection/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/keyof/keyofIntersection/input.ts.json index f89898611ca4..665a65052b47 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/keyof/keyofIntersection/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/keyof/keyofIntersection/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -123,7 +120,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -168,7 +164,6 @@ "ctxt": 0 }, "value": "T01", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -210,7 +205,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -230,7 +224,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -256,7 +249,6 @@ "ctxt": 0 }, "value": "T02", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -282,7 +274,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -328,7 +319,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -348,7 +338,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -374,7 +363,6 @@ "ctxt": 0 }, "value": "T03", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -400,7 +388,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -446,7 +433,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -466,7 +452,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -492,7 +477,6 @@ "ctxt": 0 }, "value": "T04", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -518,7 +502,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -539,7 +522,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -585,7 +567,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -605,7 +586,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -631,7 +611,6 @@ "ctxt": 0 }, "value": "T05", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -650,7 +629,6 @@ "ctxt": 0 }, "value": "T02", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -676,7 +654,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -701,7 +678,6 @@ "ctxt": 0 }, "value": "T06", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -720,7 +696,6 @@ "ctxt": 0 }, "value": "T03", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -746,7 +721,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -771,7 +745,6 @@ "ctxt": 0 }, "value": "T07", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -790,7 +763,6 @@ "ctxt": 0 }, "value": "T04", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -816,7 +788,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -836,7 +807,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -861,7 +831,6 @@ "ctxt": 0 }, "value": "Example1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -887,7 +856,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -916,7 +884,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -970,7 +937,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -996,7 +962,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1028,7 +993,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1054,7 +1018,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1092,7 +1055,6 @@ "ctxt": 0 }, "value": "Result1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1111,7 +1073,6 @@ "ctxt": 0 }, "value": "Example1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1186,7 +1147,6 @@ "ctxt": 0 }, "value": "Result2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1228,7 +1188,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1288,7 +1247,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1354,7 +1312,6 @@ "ctxt": 0 }, "value": "Example3", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1380,7 +1337,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1426,7 +1382,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1452,7 +1407,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1488,7 +1442,6 @@ "ctxt": 0 }, "value": "Result3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1507,7 +1460,6 @@ "ctxt": 0 }, "value": "Example3", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1592,7 +1544,6 @@ "ctxt": 0 }, "value": "Example4", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1618,7 +1569,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1647,7 +1597,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1693,7 +1642,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1719,7 +1667,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1751,7 +1698,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1777,7 +1723,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1814,7 +1759,6 @@ "ctxt": 0 }, "value": "Result4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1841,7 +1785,6 @@ "ctxt": 0 }, "value": "Example4", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1917,7 +1860,6 @@ "ctxt": 0 }, "value": "Example5", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1943,7 +1885,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1964,7 +1905,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2010,7 +1950,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2030,7 +1969,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2056,7 +1994,6 @@ "ctxt": 0 }, "value": "Result5", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2075,7 +2012,6 @@ "ctxt": 0 }, "value": "Example5", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2101,7 +2037,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2161,7 +2096,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/booleanLiteralTypes1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/booleanLiteralTypes1/input.ts.json index 47b6b748d63d..fe2a15369127 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/booleanLiteralTypes1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/booleanLiteralTypes1/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "A1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -87,7 +86,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -146,7 +144,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -190,6 +187,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -212,13 +210,11 @@ "ctxt": 0 }, "value": "A1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -250,6 +246,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -272,13 +269,11 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -310,6 +305,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -361,8 +357,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -394,6 +389,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -445,8 +441,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -470,7 +465,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -491,6 +485,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -542,8 +537,7 @@ } ] } - }, - "optional": false + } } }, { @@ -562,6 +556,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -578,8 +573,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -620,8 +614,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -631,7 +625,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -659,8 +652,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -670,7 +663,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -692,7 +684,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -713,6 +704,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -764,8 +756,7 @@ } ] } - }, - "optional": false + } } }, { @@ -784,6 +775,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -835,8 +827,7 @@ } ] } - }, - "optional": false + } } } ], @@ -879,8 +870,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -898,7 +889,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -909,7 +899,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -942,8 +931,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -961,7 +950,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -972,7 +960,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1005,8 +992,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1024,7 +1011,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1049,7 +1035,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1070,6 +1055,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1094,8 +1080,7 @@ "value": true } } - }, - "optional": false + } } }, { @@ -1114,6 +1099,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1138,8 +1124,7 @@ "value": false } } - }, - "optional": false + } } } ], @@ -1182,8 +1167,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1201,7 +1186,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1212,7 +1196,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -1245,8 +1228,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1264,7 +1247,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -1275,7 +1257,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1308,8 +1289,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1327,7 +1308,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1338,7 +1318,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -1371,8 +1350,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1390,7 +1369,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -1401,7 +1379,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1434,8 +1411,8 @@ "ctxt": 0 }, "value": "x5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1453,7 +1430,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1486,8 +1462,8 @@ "ctxt": 0 }, "value": "x6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1505,7 +1481,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -1530,7 +1505,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1551,6 +1525,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1575,8 +1550,7 @@ "value": true } } - }, - "optional": false + } } } ], @@ -1618,7 +1592,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1639,6 +1612,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1663,8 +1637,7 @@ "value": false } } - }, - "optional": false + } } } ], @@ -1706,7 +1679,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1727,6 +1699,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1743,8 +1716,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -1786,7 +1758,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1807,6 +1778,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1823,8 +1795,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -1867,8 +1838,8 @@ "ctxt": 0 }, "value": "z1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1885,7 +1856,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1933,8 +1903,8 @@ "ctxt": 0 }, "value": "z2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1951,7 +1921,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1999,8 +1968,8 @@ "ctxt": 0 }, "value": "z3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2017,7 +1986,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2031,7 +1999,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2059,7 +2026,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2080,6 +2046,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2096,8 +2063,7 @@ }, "kind": "never" } - }, - "optional": false + } } } ], @@ -2137,7 +2103,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2195,7 +2160,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2216,6 +2180,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2267,8 +2232,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2301,7 +2265,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -2406,7 +2369,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2427,6 +2389,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2478,8 +2441,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2512,7 +2474,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -2622,7 +2583,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2636,7 +2596,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2661,7 +2620,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2682,6 +2640,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2733,8 +2692,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2767,7 +2725,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -2793,7 +2750,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2822,7 +2778,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2846,7 +2801,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2867,6 +2821,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2918,8 +2873,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2960,7 +2914,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2996,7 +2949,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3025,7 +2977,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3055,7 +3006,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3091,7 +3041,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3141,7 +3090,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3193,7 +3141,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3243,7 +3190,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3284,7 +3230,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3305,6 +3250,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3327,13 +3273,11 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3373,7 +3317,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3384,7 +3327,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3429,7 +3371,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3440,7 +3381,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3487,7 +3427,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3498,7 +3437,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3525,7 +3463,6 @@ "ctxt": 0 }, "value": "f21", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3546,6 +3483,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3568,13 +3506,11 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3614,7 +3550,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3625,7 +3560,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3670,7 +3604,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3681,7 +3614,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3728,7 +3660,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3739,7 +3670,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3771,7 +3701,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3785,7 +3714,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/booleanLiteralTypes2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/booleanLiteralTypes2/input.ts.json index 9e8755793fe5..53d4f1f5d754 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/booleanLiteralTypes2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/booleanLiteralTypes2/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "A1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -87,7 +86,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -146,7 +144,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -190,6 +187,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -212,13 +210,11 @@ "ctxt": 0 }, "value": "A1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -250,6 +246,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -272,13 +269,11 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -310,6 +305,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -361,8 +357,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -394,6 +389,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -445,8 +441,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -470,7 +465,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -491,6 +485,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -542,8 +537,7 @@ } ] } - }, - "optional": false + } } }, { @@ -562,6 +556,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -578,8 +573,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -620,8 +614,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -631,7 +625,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -659,8 +652,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -670,7 +663,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -692,7 +684,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -713,6 +704,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -764,8 +756,7 @@ } ] } - }, - "optional": false + } } }, { @@ -784,6 +775,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -835,8 +827,7 @@ } ] } - }, - "optional": false + } } } ], @@ -879,8 +870,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -898,7 +889,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -909,7 +899,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -942,8 +931,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -961,7 +950,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -972,7 +960,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1005,8 +992,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1024,7 +1011,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1049,7 +1035,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1070,6 +1055,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1094,8 +1080,7 @@ "value": true } } - }, - "optional": false + } } }, { @@ -1114,6 +1099,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1138,8 +1124,7 @@ "value": false } } - }, - "optional": false + } } } ], @@ -1182,8 +1167,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1201,7 +1186,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1212,7 +1196,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -1245,8 +1228,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1264,7 +1247,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -1275,7 +1257,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1308,8 +1289,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1327,7 +1308,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -1338,7 +1318,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -1371,8 +1350,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1390,7 +1369,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "right": { @@ -1401,7 +1379,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1434,8 +1411,8 @@ "ctxt": 0 }, "value": "x5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1453,7 +1430,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1486,8 +1462,8 @@ "ctxt": 0 }, "value": "x6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1505,7 +1481,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -1530,7 +1505,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1551,6 +1525,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1575,8 +1550,7 @@ "value": true } } - }, - "optional": false + } } } ], @@ -1618,7 +1592,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1639,6 +1612,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1663,8 +1637,7 @@ "value": false } } - }, - "optional": false + } } } ], @@ -1706,7 +1679,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1727,6 +1699,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1743,8 +1716,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -1786,7 +1758,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1807,6 +1778,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1823,8 +1795,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -1867,8 +1838,8 @@ "ctxt": 0 }, "value": "z1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1885,7 +1856,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1933,8 +1903,8 @@ "ctxt": 0 }, "value": "z2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1951,7 +1921,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1999,8 +1968,8 @@ "ctxt": 0 }, "value": "z3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2017,7 +1986,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2031,7 +1999,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2059,7 +2026,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2080,6 +2046,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2096,8 +2063,7 @@ }, "kind": "never" } - }, - "optional": false + } } } ], @@ -2137,7 +2103,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2195,7 +2160,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2216,6 +2180,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2267,8 +2232,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2301,7 +2265,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -2406,7 +2369,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2427,6 +2389,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2478,8 +2441,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2512,7 +2474,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -2622,7 +2583,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2636,7 +2596,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2661,7 +2620,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2682,6 +2640,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2733,8 +2692,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2767,7 +2725,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -2793,7 +2750,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2822,7 +2778,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2846,7 +2801,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2867,6 +2821,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2918,8 +2873,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2960,7 +2914,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2996,7 +2949,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3025,7 +2977,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3055,7 +3006,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3091,7 +3041,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3141,7 +3090,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3193,7 +3141,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3243,7 +3190,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3284,7 +3230,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3305,6 +3250,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3327,13 +3273,11 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3373,7 +3317,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3384,7 +3327,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3429,7 +3371,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3440,7 +3381,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3487,7 +3427,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3498,7 +3437,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3525,7 +3463,6 @@ "ctxt": 0 }, "value": "f21", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3546,6 +3483,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3568,13 +3506,11 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3614,7 +3550,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3625,7 +3560,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3670,7 +3604,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3681,7 +3614,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3728,7 +3660,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3739,7 +3670,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3771,7 +3701,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3785,7 +3714,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/enumLiteralTypes1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/enumLiteralTypes1/input.ts.json index 4271d9630460..4f186e338706 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/enumLiteralTypes1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/enumLiteralTypes1/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "init": null @@ -82,7 +79,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "init": null @@ -113,7 +109,6 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -142,7 +137,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -153,7 +147,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -176,7 +169,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -187,7 +179,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -212,7 +203,6 @@ "ctxt": 0 }, "value": "NoYes", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -241,7 +231,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -252,7 +241,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -275,7 +263,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -286,7 +273,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -311,7 +297,6 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -340,7 +325,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -351,7 +335,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false } }, @@ -374,7 +357,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -385,7 +367,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -408,7 +389,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -419,7 +399,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -438,7 +417,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -482,6 +460,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -504,13 +483,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -542,6 +519,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -564,13 +542,11 @@ "ctxt": 0 }, "value": "NoYes", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -602,6 +578,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -634,7 +611,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -645,7 +621,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -668,7 +643,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -679,7 +653,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -687,8 +660,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -720,6 +692,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -752,7 +725,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -763,7 +735,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -786,7 +757,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -797,7 +767,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -805,8 +774,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -830,7 +798,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -851,6 +818,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -873,13 +841,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -898,6 +864,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -920,13 +887,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -945,6 +910,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -967,13 +933,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1014,8 +978,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1025,7 +989,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1053,8 +1016,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1064,7 +1027,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1092,8 +1054,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1103,7 +1065,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1125,7 +1086,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1146,6 +1106,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1170,7 +1131,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -1181,14 +1141,12 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1207,6 +1165,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1229,13 +1188,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1278,8 +1235,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1297,7 +1254,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1308,7 +1264,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1341,8 +1296,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1360,7 +1315,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1371,7 +1325,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1404,8 +1357,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1423,7 +1376,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1434,7 +1386,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1467,8 +1418,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1486,7 +1437,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1497,7 +1447,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1530,8 +1479,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1549,7 +1498,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1560,7 +1508,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1593,8 +1540,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1612,7 +1559,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1623,7 +1569,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1656,8 +1601,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1675,7 +1620,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1686,7 +1630,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1719,8 +1662,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1738,7 +1681,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1749,7 +1691,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1782,8 +1723,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1801,7 +1742,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1834,8 +1774,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1853,7 +1793,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1886,8 +1825,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1905,7 +1844,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1916,7 +1854,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1949,8 +1886,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1968,7 +1905,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1979,7 +1915,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2012,8 +1947,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2031,7 +1966,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2042,7 +1976,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2075,8 +2008,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2094,7 +2027,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2105,7 +2037,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2138,8 +2069,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2157,7 +2088,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2168,7 +2098,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2201,8 +2130,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2220,7 +2149,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2231,7 +2159,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2264,8 +2191,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2283,7 +2210,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2294,7 +2220,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2327,8 +2252,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2346,7 +2271,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2357,7 +2281,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2390,8 +2313,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -2409,7 +2332,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2434,7 +2356,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2455,6 +2376,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2479,7 +2401,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -2490,14 +2411,12 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2516,6 +2435,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2538,13 +2458,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2586,7 +2504,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2615,7 +2532,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2637,7 +2553,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2658,6 +2573,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2682,7 +2598,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -2693,14 +2608,12 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2742,7 +2655,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2763,6 +2675,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2787,7 +2700,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -2798,14 +2710,12 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2847,7 +2757,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2868,6 +2777,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2890,13 +2800,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2938,7 +2846,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2959,6 +2866,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2981,13 +2889,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3006,6 +2912,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3028,13 +2935,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3053,6 +2958,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3075,13 +2981,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3124,8 +3028,8 @@ "ctxt": 0 }, "value": "z1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3142,7 +3046,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3163,7 +3066,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3174,7 +3076,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3212,8 +3113,8 @@ "ctxt": 0 }, "value": "z2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3230,7 +3131,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3251,7 +3151,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3262,7 +3161,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3300,8 +3198,8 @@ "ctxt": 0 }, "value": "z3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3318,7 +3216,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3332,7 +3229,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3368,8 +3264,8 @@ "ctxt": 0 }, "value": "z4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3386,7 +3282,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3400,7 +3295,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -3436,8 +3330,8 @@ "ctxt": 0 }, "value": "z5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3454,7 +3348,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3468,7 +3361,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -3496,7 +3388,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3517,6 +3408,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3533,8 +3425,7 @@ }, "kind": "never" } - }, - "optional": false + } } } ], @@ -3574,7 +3465,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3632,7 +3522,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3653,6 +3542,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3675,13 +3565,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3714,7 +3602,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -3740,7 +3627,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3751,7 +3637,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3803,7 +3688,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3814,7 +3698,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3863,7 +3746,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3884,6 +3766,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3906,13 +3789,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3945,7 +3826,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -3971,7 +3851,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3982,7 +3861,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4034,7 +3912,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -4045,7 +3922,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4099,7 +3975,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4113,7 +3988,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4138,7 +4012,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4159,6 +4032,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4181,13 +4055,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4220,7 +4092,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -4246,7 +4117,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4275,7 +4145,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4299,7 +4168,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4320,6 +4188,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4342,13 +4211,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4389,7 +4256,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -4407,7 +4273,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -4418,7 +4283,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4447,7 +4311,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4476,7 +4339,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4506,7 +4368,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -4542,7 +4403,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4573,7 +4433,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -4584,7 +4443,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -4609,7 +4467,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4661,7 +4518,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4692,7 +4548,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -4703,7 +4558,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -4728,7 +4582,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4769,7 +4622,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4790,6 +4642,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4812,13 +4665,11 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4858,7 +4709,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4869,7 +4719,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4897,7 +4746,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -4908,7 +4756,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4936,7 +4783,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4947,7 +4793,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4977,7 +4822,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -4988,7 +4832,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5016,7 +4859,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -5027,7 +4869,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5054,7 +4895,6 @@ "ctxt": 0 }, "value": "f21", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5075,6 +4915,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5097,13 +4938,11 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5143,7 +4982,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -5154,7 +4992,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5182,7 +5019,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -5193,7 +5029,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5221,7 +5056,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -5232,7 +5066,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5262,7 +5095,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -5273,7 +5105,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5301,7 +5132,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -5312,7 +5142,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5344,7 +5173,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5358,7 +5186,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/enumLiteralTypes2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/enumLiteralTypes2/input.ts.json index 96d36f404d48..95501d2cd170 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/enumLiteralTypes2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/enumLiteralTypes2/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "init": null @@ -82,7 +79,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "init": null @@ -113,7 +109,6 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -142,7 +137,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -153,7 +147,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -176,7 +169,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -187,7 +179,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -212,7 +203,6 @@ "ctxt": 0 }, "value": "NoYes", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -241,7 +231,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -252,7 +241,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -275,7 +263,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -286,7 +273,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -311,7 +297,6 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -340,7 +325,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -351,7 +335,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false } }, @@ -374,7 +357,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -385,7 +367,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -408,7 +389,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -419,7 +399,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -438,7 +417,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -482,6 +460,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -504,13 +483,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -542,6 +519,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -564,13 +542,11 @@ "ctxt": 0 }, "value": "NoYes", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -602,6 +578,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -634,7 +611,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -645,7 +621,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -668,7 +643,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -679,7 +653,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -687,8 +660,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -720,6 +692,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -752,7 +725,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -763,7 +735,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -786,7 +757,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -797,7 +767,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -805,8 +774,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -830,7 +798,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -851,6 +818,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -873,13 +841,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -898,6 +864,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -920,13 +887,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -945,6 +910,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -967,13 +933,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1014,8 +978,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1025,7 +989,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1053,8 +1016,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1064,7 +1027,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1092,8 +1054,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1103,7 +1065,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1125,7 +1086,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1146,6 +1106,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1170,7 +1131,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -1181,14 +1141,12 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1207,6 +1165,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1229,13 +1188,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1278,8 +1235,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1297,7 +1254,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1308,7 +1264,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1341,8 +1296,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1360,7 +1315,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1371,7 +1325,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1404,8 +1357,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1423,7 +1376,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1434,7 +1386,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1467,8 +1418,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1486,7 +1437,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1497,7 +1447,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1530,8 +1479,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1549,7 +1498,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1560,7 +1508,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1593,8 +1540,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1612,7 +1559,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1623,7 +1569,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1656,8 +1601,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1675,7 +1620,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1686,7 +1630,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1719,8 +1662,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1738,7 +1681,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1749,7 +1691,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1782,8 +1723,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1801,7 +1742,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1834,8 +1774,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1853,7 +1793,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1886,8 +1825,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1905,7 +1844,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1916,7 +1854,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1949,8 +1886,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1968,7 +1905,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1979,7 +1915,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2012,8 +1947,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2031,7 +1966,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2042,7 +1976,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2075,8 +2008,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2094,7 +2027,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2105,7 +2037,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2138,8 +2069,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2157,7 +2088,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2168,7 +2098,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2201,8 +2130,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2220,7 +2149,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2231,7 +2159,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2264,8 +2191,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2283,7 +2210,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2294,7 +2220,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2327,8 +2252,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2346,7 +2271,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2357,7 +2281,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2390,8 +2313,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -2409,7 +2332,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2434,7 +2356,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2455,6 +2376,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2479,7 +2401,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -2490,14 +2411,12 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2516,6 +2435,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2538,13 +2458,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2586,7 +2504,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2615,7 +2532,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2637,7 +2553,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2658,6 +2573,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2682,7 +2598,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -2693,14 +2608,12 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2742,7 +2655,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2763,6 +2675,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2787,7 +2700,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -2798,14 +2710,12 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2847,7 +2757,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2868,6 +2777,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2890,13 +2800,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2938,7 +2846,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2959,6 +2866,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2981,13 +2889,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3006,6 +2912,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3028,13 +2935,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3053,6 +2958,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3075,13 +2981,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3124,8 +3028,8 @@ "ctxt": 0 }, "value": "z1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3142,7 +3046,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3163,7 +3066,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3174,7 +3076,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3212,8 +3113,8 @@ "ctxt": 0 }, "value": "z2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3230,7 +3131,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3251,7 +3151,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3262,7 +3161,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3300,8 +3198,8 @@ "ctxt": 0 }, "value": "z3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3318,7 +3216,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3332,7 +3229,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3368,8 +3264,8 @@ "ctxt": 0 }, "value": "z4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3386,7 +3282,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3400,7 +3295,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -3436,8 +3330,8 @@ "ctxt": 0 }, "value": "z5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3454,7 +3348,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3468,7 +3361,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -3496,7 +3388,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3517,6 +3408,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3533,8 +3425,7 @@ }, "kind": "never" } - }, - "optional": false + } } } ], @@ -3574,7 +3465,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3632,7 +3522,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3653,6 +3542,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3675,13 +3565,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3714,7 +3602,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -3740,7 +3627,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3751,7 +3637,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3803,7 +3688,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3814,7 +3698,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3863,7 +3746,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3884,6 +3766,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3906,13 +3789,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3945,7 +3826,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -3971,7 +3851,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3982,7 +3861,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4034,7 +3912,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -4045,7 +3922,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4099,7 +3975,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4113,7 +3988,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4138,7 +4012,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4159,6 +4032,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4181,13 +4055,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4220,7 +4092,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -4246,7 +4117,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4275,7 +4145,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4299,7 +4168,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4320,6 +4188,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4342,13 +4211,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4389,7 +4256,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -4407,7 +4273,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -4418,7 +4283,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4447,7 +4311,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4476,7 +4339,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4506,7 +4368,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -4542,7 +4403,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4573,7 +4433,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -4584,7 +4443,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -4609,7 +4467,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4661,7 +4518,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4692,7 +4548,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -4703,7 +4558,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -4728,7 +4582,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4769,7 +4622,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4790,6 +4642,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4812,13 +4665,11 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4858,7 +4709,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4869,7 +4719,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4897,7 +4746,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -4908,7 +4756,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4936,7 +4783,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4947,7 +4793,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4977,7 +4822,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -4988,7 +4832,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5016,7 +4859,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -5027,7 +4869,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5054,7 +4895,6 @@ "ctxt": 0 }, "value": "f21", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5075,6 +4915,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5097,13 +4938,11 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5143,7 +4982,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -5154,7 +4992,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5182,7 +5019,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -5193,7 +5029,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5221,7 +5056,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -5232,7 +5066,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5262,7 +5095,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -5273,7 +5105,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5301,7 +5132,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -5312,7 +5142,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5344,7 +5173,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5358,7 +5186,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/enumLiteralTypes3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/enumLiteralTypes3/input.ts.json index cbc729c7d5cb..383adf4cdcfc 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/enumLiteralTypes3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/enumLiteralTypes3/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "init": null @@ -82,7 +79,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "init": null @@ -113,7 +109,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -134,7 +129,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -145,7 +139,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -168,7 +161,6 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -197,7 +189,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -208,7 +199,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -231,7 +221,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -242,7 +231,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -267,7 +255,6 @@ "ctxt": 0 }, "value": "NoYes", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -296,7 +283,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -307,7 +293,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -330,7 +315,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -341,7 +325,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -366,7 +349,6 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -395,7 +377,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -406,7 +387,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false } }, @@ -429,7 +409,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -440,7 +419,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -463,7 +441,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -474,7 +451,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -493,7 +469,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -514,6 +489,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -536,13 +512,11 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -561,6 +535,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,13 +558,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -608,6 +581,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -630,13 +604,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -655,6 +627,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -677,13 +650,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -724,8 +695,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -735,7 +706,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -763,8 +733,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -774,7 +744,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -802,8 +771,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -813,7 +782,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -841,8 +809,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -852,7 +820,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -874,7 +841,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -895,6 +861,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -917,13 +884,11 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -942,6 +907,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -964,13 +930,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -989,6 +953,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1011,13 +976,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1036,6 +999,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1058,13 +1022,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1105,8 +1067,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1116,7 +1078,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1144,8 +1105,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1155,7 +1116,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1183,8 +1143,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1194,7 +1154,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1222,8 +1181,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1233,7 +1192,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -1255,7 +1213,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1276,6 +1233,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1298,13 +1256,11 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1323,6 +1279,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1345,13 +1302,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1370,6 +1325,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1392,13 +1348,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1417,6 +1371,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1439,13 +1394,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1486,8 +1439,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1497,7 +1450,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1525,8 +1477,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1536,7 +1488,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1564,8 +1515,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1575,7 +1526,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1603,8 +1553,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1614,7 +1564,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -1636,7 +1585,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1657,6 +1605,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1679,13 +1628,11 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1704,6 +1651,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1726,13 +1674,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1751,6 +1697,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1773,13 +1720,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1798,6 +1743,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1820,13 +1766,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1867,8 +1811,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1878,7 +1822,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1906,8 +1849,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1917,7 +1860,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1945,8 +1887,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1956,7 +1898,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1984,8 +1925,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1995,7 +1936,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -2017,7 +1957,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2038,6 +1977,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2060,13 +2000,11 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2085,6 +2023,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2107,13 +2046,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2132,6 +2069,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2154,13 +2092,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2179,6 +2115,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2201,13 +2138,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2248,8 +2183,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2266,7 +2201,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2277,7 +2211,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2307,8 +2240,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2325,7 +2258,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2336,7 +2268,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2366,8 +2297,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2384,7 +2315,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2395,7 +2325,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2425,8 +2354,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2443,7 +2372,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2454,7 +2382,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2484,8 +2411,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2502,7 +2429,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2513,7 +2439,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2543,8 +2468,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2561,7 +2486,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2572,7 +2496,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2602,8 +2525,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2620,7 +2543,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2631,7 +2553,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2661,8 +2582,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2679,7 +2600,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2690,7 +2610,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2720,8 +2639,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2738,7 +2657,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2749,7 +2667,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2779,8 +2696,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2797,7 +2714,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2808,7 +2724,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2838,8 +2753,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2856,7 +2771,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2867,7 +2781,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2897,8 +2810,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2915,7 +2828,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2926,7 +2838,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2950,7 +2861,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2971,6 +2881,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2993,13 +2904,11 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3018,6 +2927,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3040,13 +2950,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3065,6 +2973,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3087,13 +2996,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3112,6 +3019,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3134,13 +3042,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3181,7 +3087,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3199,7 +3104,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3210,7 +3114,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3240,7 +3143,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3258,7 +3160,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3269,7 +3170,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3299,7 +3199,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3317,7 +3216,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3328,7 +3226,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3358,7 +3255,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3376,7 +3272,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3387,7 +3282,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3417,7 +3311,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3435,7 +3328,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3446,7 +3338,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3476,7 +3367,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3494,7 +3384,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3505,7 +3394,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3535,7 +3423,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3553,7 +3440,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3564,7 +3450,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3594,7 +3479,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3612,7 +3496,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3623,7 +3506,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3653,7 +3535,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3671,7 +3552,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3682,7 +3562,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3712,7 +3591,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -3730,7 +3608,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3741,7 +3618,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3771,7 +3647,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -3789,7 +3664,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3800,7 +3674,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3830,7 +3703,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -3848,7 +3720,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3859,7 +3730,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3883,7 +3753,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3904,6 +3773,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3926,13 +3796,11 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3951,6 +3819,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3973,13 +3842,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3998,6 +3865,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4020,13 +3888,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4045,6 +3911,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4067,13 +3934,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4114,7 +3979,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4125,7 +3989,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4153,7 +4016,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4164,7 +4026,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -4192,7 +4053,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4203,7 +4063,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -4231,7 +4090,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4242,7 +4100,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -4270,7 +4127,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4281,7 +4137,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4309,7 +4164,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4320,7 +4174,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -4348,7 +4201,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4359,7 +4211,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -4387,7 +4238,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4398,7 +4248,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -4426,7 +4275,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4437,7 +4285,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4465,7 +4312,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4476,7 +4322,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -4504,7 +4349,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4515,7 +4359,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -4543,7 +4386,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4554,7 +4396,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -4582,7 +4423,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4593,7 +4433,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4621,7 +4460,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4632,7 +4470,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -4660,7 +4497,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4671,7 +4507,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -4699,7 +4534,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4710,7 +4544,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -4732,7 +4565,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4753,6 +4585,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4775,13 +4608,11 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4814,7 +4645,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -4840,7 +4670,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -4851,7 +4680,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4872,7 +4700,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4900,7 +4727,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -4911,7 +4737,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4932,7 +4757,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4960,7 +4784,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -4971,7 +4794,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4992,7 +4814,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5015,7 +4836,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5046,7 +4866,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5063,7 +4882,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5084,6 +4902,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5106,13 +4925,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5145,7 +4962,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -5171,7 +4987,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -5182,7 +4997,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5203,7 +5017,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5231,7 +5044,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -5242,7 +5054,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5263,7 +5074,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5291,7 +5101,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -5302,7 +5111,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5323,7 +5131,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5346,7 +5153,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5377,7 +5183,6 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5394,7 +5199,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5415,6 +5219,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5437,13 +5242,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5476,7 +5279,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -5502,7 +5304,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -5513,7 +5314,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5534,7 +5334,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5562,7 +5361,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -5573,7 +5371,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5594,7 +5391,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5622,7 +5418,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -5633,7 +5428,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5654,7 +5448,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5677,7 +5470,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5708,7 +5500,6 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5725,7 +5516,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5746,6 +5536,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5768,13 +5559,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5807,7 +5596,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -5833,7 +5621,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -5844,7 +5631,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5865,7 +5651,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5893,7 +5678,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -5904,7 +5688,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5925,7 +5708,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5953,7 +5735,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -5964,7 +5745,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5985,7 +5765,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -6008,7 +5787,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -6039,7 +5817,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypeWidening/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypeWidening/input.ts.json index c429cd1c6da4..5024897a3214 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypeWidening/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypeWidening/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,8 +59,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -106,8 +105,8 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -117,7 +116,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -149,8 +147,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -160,7 +158,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -192,8 +189,8 @@ "ctxt": 0 }, "value": "v2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -203,7 +200,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "definite": false @@ -235,6 +231,7 @@ "ctxt": 0 }, "value": "c3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -264,8 +261,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -310,8 +306,8 @@ "ctxt": 0 }, "value": "v3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -321,7 +317,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "definite": false @@ -353,6 +348,7 @@ "ctxt": 0 }, "value": "c4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -382,8 +378,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -393,7 +388,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -425,8 +419,8 @@ "ctxt": 0 }, "value": "v4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -436,7 +430,6 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, "optional": false }, "definite": false @@ -460,7 +453,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -481,6 +473,7 @@ "ctxt": 0 }, "value": "cond", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -497,8 +490,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -541,8 +533,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -559,7 +551,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -620,6 +611,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -681,8 +673,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -692,7 +683,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -724,8 +714,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -742,7 +732,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -753,7 +742,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -764,7 +752,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false } }, @@ -797,8 +784,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -815,7 +802,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -826,7 +812,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -873,6 +858,7 @@ "ctxt": 0 }, "value": "c5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -956,8 +942,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -967,7 +952,6 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, "optional": false }, "definite": false @@ -999,8 +983,8 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1010,7 +994,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1042,8 +1025,8 @@ "ctxt": 0 }, "value": "v2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1053,7 +1036,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1085,8 +1067,8 @@ "ctxt": 0 }, "value": "v3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1096,7 +1078,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1128,8 +1109,8 @@ "ctxt": 0 }, "value": "v4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1139,7 +1120,6 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1171,8 +1151,8 @@ "ctxt": 0 }, "value": "v5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1182,7 +1162,6 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1206,7 +1185,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1250,8 +1228,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1291,8 +1269,8 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1302,7 +1280,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1334,8 +1311,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1345,7 +1322,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1377,8 +1353,8 @@ "ctxt": 0 }, "value": "v2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1388,7 +1364,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1420,6 +1395,7 @@ "ctxt": 0 }, "value": "c3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1444,8 +1420,7 @@ "value": 123.0 } } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -1485,8 +1460,8 @@ "ctxt": 0 }, "value": "v3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1496,7 +1471,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1528,6 +1502,7 @@ "ctxt": 0 }, "value": "c4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1552,8 +1527,7 @@ "value": 123.0 } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1563,7 +1537,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1595,8 +1568,8 @@ "ctxt": 0 }, "value": "v4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1606,7 +1579,6 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1630,7 +1602,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1651,6 +1622,7 @@ "ctxt": 0 }, "value": "cond", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1667,8 +1639,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -1711,8 +1682,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1729,7 +1700,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1780,6 +1750,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1831,8 +1802,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1842,7 +1812,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1874,8 +1843,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1892,7 +1861,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1903,7 +1871,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1914,7 +1881,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false } }, @@ -1947,8 +1913,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1965,7 +1931,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1976,7 +1941,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2018,6 +1982,7 @@ "ctxt": 0 }, "value": "c5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2086,8 +2051,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2097,7 +2061,6 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2129,8 +2092,8 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -2140,7 +2103,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2172,8 +2134,8 @@ "ctxt": 0 }, "value": "v2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -2183,7 +2145,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2215,8 +2176,8 @@ "ctxt": 0 }, "value": "v3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -2226,7 +2187,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2258,8 +2218,8 @@ "ctxt": 0 }, "value": "v4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -2269,7 +2229,6 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2301,8 +2260,8 @@ "ctxt": 0 }, "value": "v5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -2312,7 +2271,6 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2336,7 +2294,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2380,8 +2337,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -2426,8 +2383,8 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -2437,7 +2394,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2469,6 +2425,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2498,8 +2455,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -2544,8 +2500,8 @@ "ctxt": 0 }, "value": "v2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -2555,7 +2511,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2587,8 +2542,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -2663,8 +2618,8 @@ "ctxt": 0 }, "value": "v3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -2674,7 +2629,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2706,8 +2660,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -2782,8 +2736,8 @@ "ctxt": 0 }, "value": "v4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -2793,7 +2747,6 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2817,7 +2770,6 @@ "ctxt": 0 }, "value": "widening", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2838,6 +2790,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2860,13 +2813,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2902,7 +2853,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2932,7 +2882,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2949,7 +2898,6 @@ "ctxt": 0 }, "value": "nonWidening", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2970,6 +2918,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2992,13 +2941,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3034,7 +2981,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3100,7 +3046,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3117,7 +3062,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3138,6 +3082,7 @@ "ctxt": 0 }, "value": "cond", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3154,8 +3099,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -3198,8 +3142,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3216,7 +3160,6 @@ "ctxt": 0 }, "value": "widening", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3269,8 +3212,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3287,7 +3230,6 @@ "ctxt": 0 }, "value": "widening", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3335,8 +3277,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3353,7 +3295,6 @@ "ctxt": 0 }, "value": "widening", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3374,7 +3315,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -3434,8 +3374,8 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3452,7 +3392,6 @@ "ctxt": 0 }, "value": "nonWidening", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3505,8 +3444,8 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3523,7 +3462,6 @@ "ctxt": 0 }, "value": "nonWidening", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3571,8 +3509,8 @@ "ctxt": 0 }, "value": "y3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3589,7 +3527,6 @@ "ctxt": 0 }, "value": "nonWidening", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3610,7 +3547,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -3668,7 +3604,6 @@ "ctxt": 0 }, "value": "FAILURE", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3720,8 +3655,8 @@ "ctxt": 0 }, "value": "FAILURE", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -3757,7 +3692,6 @@ "ctxt": 0 }, "value": "Result", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3783,7 +3717,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3814,7 +3747,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3834,7 +3766,6 @@ "ctxt": 0 }, "value": "FAILURE", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3852,7 +3783,6 @@ "ctxt": 0 }, "value": "doWork", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3886,7 +3816,6 @@ "ctxt": 0 }, "value": "FAILURE", - "typeAnnotation": null, "optional": false } } @@ -3917,7 +3846,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3947,7 +3875,6 @@ "ctxt": 0 }, "value": "Result", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3973,7 +3900,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3993,7 +3919,6 @@ "ctxt": 0 }, "value": "isSuccess", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4014,6 +3939,7 @@ "ctxt": 0 }, "value": "result", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4036,7 +3962,6 @@ "ctxt": 0 }, "value": "Result", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4062,7 +3987,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4070,8 +3994,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4119,7 +4042,6 @@ "ctxt": 0 }, "value": "isFailure", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4133,7 +4055,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false } } @@ -4169,7 +4090,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4200,7 +4120,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -4225,7 +4144,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4244,7 +4162,6 @@ "ctxt": 0 }, "value": "isFailure", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4265,6 +4182,7 @@ "ctxt": 0 }, "value": "result", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4287,7 +4205,6 @@ "ctxt": 0 }, "value": "Result", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4313,7 +4230,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4321,8 +4237,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4363,7 +4278,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "right": { @@ -4374,7 +4288,6 @@ "ctxt": 0 }, "value": "FAILURE", - "typeAnnotation": null, "optional": false } } @@ -4406,7 +4319,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4437,7 +4349,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -4462,7 +4373,6 @@ "ctxt": 0 }, "value": "FAILURE", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4481,7 +4391,6 @@ "ctxt": 0 }, "value": "increment", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4502,6 +4411,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4518,8 +4428,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -4560,7 +4469,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -4622,8 +4530,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4640,7 +4548,6 @@ "ctxt": 0 }, "value": "doWork", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4690,7 +4597,6 @@ "ctxt": 0 }, "value": "isSuccess", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4704,7 +4610,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false } } @@ -4741,7 +4646,6 @@ "ctxt": 0 }, "value": "increment", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4755,7 +4659,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false } } @@ -4783,7 +4686,6 @@ "ctxt": 0 }, "value": "TestEvent", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -4852,7 +4754,6 @@ "ctxt": 0 }, "value": "onMouseOver", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4920,7 +4821,6 @@ "ctxt": 0 }, "value": "TestEvent", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4952,8 +4852,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4970,7 +4870,6 @@ "ctxt": 0 }, "value": "onMouseOver", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4997,7 +4896,6 @@ "ctxt": 0 }, "value": "Set", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5030,8 +4928,8 @@ "ctxt": 0 }, "value": "keys", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -5062,7 +4960,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5111,8 +5008,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -5145,7 +5042,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5171,7 +5067,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5249,7 +5144,6 @@ "ctxt": 0 }, "value": "keys", - "typeAnnotation": null, "optional": false }, "property": { @@ -5260,7 +5154,6 @@ "ctxt": 0 }, "value": "forEach", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5284,8 +5177,8 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5311,7 +5204,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "property": { @@ -5322,7 +5214,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -5362,7 +5253,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false } } @@ -5393,7 +5283,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5431,7 +5320,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5457,7 +5345,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5521,7 +5408,6 @@ "ctxt": 0 }, "value": "keys", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5542,6 +5428,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5564,7 +5451,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5590,7 +5476,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5610,7 +5495,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5618,8 +5502,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5673,7 +5556,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -5684,7 +5566,6 @@ "ctxt": 0 }, "value": "keys", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5700,7 +5581,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -5729,7 +5609,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5764,7 +5643,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5793,7 +5671,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5830,7 +5707,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5855,7 +5731,6 @@ "ctxt": 0 }, "value": "Obj", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -5883,7 +5758,6 @@ "ctxt": 0 }, "value": "code", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5912,7 +5786,6 @@ "ctxt": 0 }, "value": "LangCode", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5948,8 +5821,8 @@ "ctxt": 0 }, "value": "langCodeSet", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5966,7 +5839,6 @@ "ctxt": 0 }, "value": "Set", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6085,7 +5957,6 @@ "ctxt": 0 }, "value": "LangCode", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -6112,7 +5983,6 @@ "ctxt": 0 }, "value": "langCodeSet", - "typeAnnotation": null, "optional": false } } @@ -6151,8 +6021,8 @@ "ctxt": 0 }, "value": "langCodes", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6169,7 +6039,6 @@ "ctxt": 0 }, "value": "keys", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6183,7 +6052,6 @@ "ctxt": 0 }, "value": "langCodeSet", - "typeAnnotation": null, "optional": false } } @@ -6220,6 +6088,7 @@ "ctxt": 0 }, "value": "arr", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6249,14 +6118,12 @@ "ctxt": 0 }, "value": "Obj", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -6280,7 +6147,6 @@ "ctxt": 0 }, "value": "langCodes", - "typeAnnotation": null, "optional": false }, "property": { @@ -6291,7 +6157,6 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6315,8 +6180,8 @@ "ctxt": 0 }, "value": "code", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -6342,7 +6207,6 @@ "ctxt": 0 }, "value": "code", - "typeAnnotation": null, "optional": false } ] @@ -6371,7 +6235,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6392,6 +6255,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6414,13 +6278,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6478,7 +6340,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -6503,8 +6364,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -6520,7 +6381,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "definite": false @@ -6559,7 +6419,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -6592,7 +6451,6 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, "optional": false } } @@ -6613,7 +6471,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6647,7 +6504,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6674,7 +6530,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6716,7 +6571,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6770,7 +6624,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6787,7 +6640,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -6808,6 +6660,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6830,13 +6683,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6872,7 +6723,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6902,7 +6752,6 @@ "ctxt": 0 }, "value": "NonNullable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6928,7 +6777,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6955,7 +6803,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -6974,7 +6821,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -6994,7 +6840,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -7026,8 +6871,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7044,7 +6889,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7065,7 +6909,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -7076,7 +6919,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7114,6 +6956,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7138,7 +6981,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -7149,14 +6991,12 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -7166,7 +7006,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypes1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypes1/input.ts.json index ead9ce2f6313..9c53acc74ccb 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypes1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypes1/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "zero", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -55,8 +56,7 @@ "value": 0.0 } } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -96,6 +96,7 @@ "ctxt": 0 }, "value": "one", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -120,8 +121,7 @@ "value": 1.0 } } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -161,6 +161,7 @@ "ctxt": 0 }, "value": "two", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -185,8 +186,7 @@ "value": 2.0 } } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -226,6 +226,7 @@ "ctxt": 0 }, "value": "oneOrTwo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -277,8 +278,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "TsTypeAssertion", @@ -355,7 +355,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -376,6 +375,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -444,8 +444,7 @@ } ] } - }, - "optional": false + } } } ], @@ -478,7 +477,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -497,7 +495,6 @@ "ctxt": 0 }, "value": "zero", - "typeAnnotation": null, "optional": false }, "consequent": [ @@ -516,7 +513,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -546,7 +542,6 @@ "ctxt": 0 }, "value": "one", - "typeAnnotation": null, "optional": false }, "consequent": [ @@ -565,7 +560,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -595,7 +589,6 @@ "ctxt": 0 }, "value": "two", - "typeAnnotation": null, "optional": false }, "consequent": [ @@ -614,7 +607,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -653,7 +645,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -678,7 +669,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -699,6 +689,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -767,8 +758,7 @@ } ] } - }, - "optional": false + } } } ], @@ -801,7 +791,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -820,7 +809,6 @@ "ctxt": 0 }, "value": "zero", - "typeAnnotation": null, "optional": false }, "consequent": [ @@ -839,7 +827,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -869,7 +856,6 @@ "ctxt": 0 }, "value": "oneOrTwo", - "typeAnnotation": null, "optional": false }, "consequent": [ @@ -888,7 +874,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -927,7 +912,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -958,7 +942,6 @@ "ctxt": 0 }, "value": "Falsy", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1057,7 +1040,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1078,6 +1060,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1100,13 +1083,11 @@ "ctxt": 0 }, "value": "Falsy", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1139,7 +1120,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1165,7 +1145,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1194,7 +1173,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1218,7 +1196,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1239,6 +1216,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1316,8 +1294,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1350,7 +1327,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -1386,7 +1362,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1433,7 +1408,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1508,7 +1482,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1554,7 +1527,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1584,7 +1556,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "consequent": [ @@ -1603,7 +1574,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1642,7 +1612,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1667,7 +1636,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1688,6 +1656,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1732,8 +1701,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1766,7 +1734,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -1807,7 +1774,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1872,7 +1838,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1919,7 +1884,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1989,7 +1953,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2028,7 +1991,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypes2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypes2/input.ts.json index cf28296e4d75..61c13112aad8 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypes2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypes2/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -82,7 +79,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -114,6 +110,7 @@ "ctxt": 0 }, "value": "cond", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -130,8 +127,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -148,7 +144,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -176,8 +171,8 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -214,8 +209,8 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -257,8 +252,8 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -295,8 +290,8 @@ "ctxt": 0 }, "value": "p4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -313,7 +308,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -324,7 +318,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -372,8 +365,8 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -413,8 +406,8 @@ "ctxt": 0 }, "value": "v2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -463,8 +456,8 @@ "ctxt": 0 }, "value": "v3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -522,8 +515,8 @@ "ctxt": 0 }, "value": "v4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -568,8 +561,8 @@ "ctxt": 0 }, "value": "v5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -614,8 +607,8 @@ "ctxt": 0 }, "value": "v6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -683,8 +676,8 @@ "ctxt": 0 }, "value": "v7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -724,8 +717,8 @@ "ctxt": 0 }, "value": "v8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -742,7 +735,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -753,7 +745,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -787,8 +778,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -828,8 +819,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -878,8 +869,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -937,8 +928,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -983,8 +974,8 @@ "ctxt": 0 }, "value": "x5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -1029,8 +1020,8 @@ "ctxt": 0 }, "value": "x6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1098,8 +1089,8 @@ "ctxt": 0 }, "value": "x7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -1139,8 +1130,8 @@ "ctxt": 0 }, "value": "x8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1157,7 +1148,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1168,7 +1158,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1202,8 +1191,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1243,8 +1232,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1293,8 +1282,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1352,8 +1341,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -1398,8 +1387,8 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -1444,8 +1433,8 @@ "ctxt": 0 }, "value": "c6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1513,8 +1502,8 @@ "ctxt": 0 }, "value": "c7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -1554,8 +1543,8 @@ "ctxt": 0 }, "value": "c8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1572,7 +1561,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1583,7 +1571,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1609,7 +1596,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1637,6 +1623,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1661,8 +1648,7 @@ "value": 1.0 } } - }, - "optional": false + } }, "right": { "type": "NumericLiteral", @@ -1699,6 +1685,7 @@ "ctxt": 0 }, "value": "p2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1728,8 +1715,7 @@ } } } - }, - "optional": false + } }, "right": { "type": "StringLiteral", @@ -1771,6 +1757,7 @@ "ctxt": 0 }, "value": "p3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1795,8 +1782,7 @@ "value": true } } - }, - "optional": false + } }, "right": { "type": "BooleanLiteral", @@ -1833,6 +1819,7 @@ "ctxt": 0 }, "value": "p4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1857,7 +1844,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -1868,14 +1854,12 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "right": { "type": "MemberExpression", @@ -1892,7 +1876,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1903,7 +1886,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1951,6 +1933,7 @@ "ctxt": 0 }, "value": "v1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1975,8 +1958,7 @@ "value": 1.0 } } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -2016,6 +1998,7 @@ "ctxt": 0 }, "value": "v2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2040,8 +2023,7 @@ "value": -123.0 } } - }, - "optional": false + } }, "init": { "type": "UnaryExpression", @@ -2090,6 +2072,7 @@ "ctxt": 0 }, "value": "v3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2119,8 +2102,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -2165,6 +2147,7 @@ "ctxt": 0 }, "value": "v4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2189,8 +2172,7 @@ "value": true } } - }, - "optional": false + } }, "init": { "type": "BooleanLiteral", @@ -2230,6 +2212,7 @@ "ctxt": 0 }, "value": "v5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2254,7 +2237,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -2265,14 +2247,12 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -2289,7 +2269,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2300,7 +2279,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2334,6 +2312,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2358,8 +2337,7 @@ "value": 1.0 } } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -2399,6 +2377,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2423,8 +2402,7 @@ "value": -123.0 } } - }, - "optional": false + } }, "init": { "type": "UnaryExpression", @@ -2473,6 +2451,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2502,8 +2481,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -2548,6 +2526,7 @@ "ctxt": 0 }, "value": "x4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2572,8 +2551,7 @@ "value": true } } - }, - "optional": false + } }, "init": { "type": "BooleanLiteral", @@ -2613,6 +2591,7 @@ "ctxt": 0 }, "value": "x5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2637,7 +2616,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -2648,14 +2626,12 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -2672,7 +2648,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2683,7 +2658,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2709,7 +2683,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2753,8 +2726,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2771,7 +2744,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -2822,8 +2794,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2840,7 +2812,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -2896,8 +2867,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2914,7 +2885,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -2932,7 +2902,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2943,7 +2912,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2963,7 +2931,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -3015,8 +2982,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3033,7 +3000,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -3088,8 +3054,8 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3106,7 +3072,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -3126,7 +3091,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -3159,6 +3123,7 @@ "ctxt": 0 }, "value": "c6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3190,7 +3155,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3226,8 +3190,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -3247,7 +3210,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "value": { @@ -3291,6 +3253,7 @@ "ctxt": 0 }, "value": "c7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3424,8 +3387,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -3495,8 +3457,8 @@ "ctxt": 0 }, "value": "c8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3513,7 +3475,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -3524,7 +3485,6 @@ "ctxt": 0 }, "value": "c6", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3542,7 +3502,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -3553,7 +3512,6 @@ "ctxt": 0 }, "value": "c7", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3601,8 +3559,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -3612,7 +3570,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3644,8 +3601,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -3655,7 +3612,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3687,8 +3643,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -3698,7 +3654,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3730,8 +3685,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -3741,7 +3696,6 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3773,8 +3727,8 @@ "ctxt": 0 }, "value": "x5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -3784,7 +3738,6 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3816,8 +3769,8 @@ "ctxt": 0 }, "value": "x6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -3827,7 +3780,6 @@ "ctxt": 0 }, "value": "c6", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3859,8 +3811,8 @@ "ctxt": 0 }, "value": "x7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -3870,7 +3822,6 @@ "ctxt": 0 }, "value": "c7", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3902,8 +3853,8 @@ "ctxt": 0 }, "value": "x8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -3913,7 +3864,6 @@ "ctxt": 0 }, "value": "c8", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3937,7 +3887,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3963,7 +3912,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false }, "value": { @@ -4001,7 +3949,6 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, "optional": false }, "value": { @@ -4048,7 +3995,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, "value": { @@ -4104,7 +4050,6 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, "optional": false }, "value": { @@ -4147,7 +4092,6 @@ "ctxt": 0 }, "value": "x5", - "typeAnnotation": null, "optional": false }, "value": { @@ -4190,7 +4134,6 @@ "ctxt": 0 }, "value": "x6", - "typeAnnotation": null, "optional": false }, "value": { @@ -4256,7 +4199,6 @@ "ctxt": 0 }, "value": "x7", - "typeAnnotation": null, "optional": false }, "value": { @@ -4294,7 +4236,6 @@ "ctxt": 0 }, "value": "x8", - "typeAnnotation": null, "optional": false }, "value": { @@ -4312,7 +4253,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4323,7 +4263,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4354,7 +4293,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "value": { @@ -4392,7 +4330,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "value": { @@ -4439,7 +4376,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "value": { @@ -4495,7 +4431,6 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, "optional": false }, "value": { @@ -4538,7 +4473,6 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, "optional": false }, "value": { @@ -4581,7 +4515,6 @@ "ctxt": 0 }, "value": "c6", - "typeAnnotation": null, "optional": false }, "value": { @@ -4647,7 +4580,6 @@ "ctxt": 0 }, "value": "c7", - "typeAnnotation": null, "optional": false }, "value": { @@ -4685,7 +4617,6 @@ "ctxt": 0 }, "value": "c8", - "typeAnnotation": null, "optional": false }, "value": { @@ -4703,7 +4634,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4714,7 +4644,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4747,7 +4676,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4791,8 +4719,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -4812,7 +4740,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -4835,7 +4762,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -4884,6 +4810,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4915,7 +4842,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4992,7 +4918,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5065,8 +4990,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -5086,7 +5010,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -5109,7 +5032,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -5158,8 +5080,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -5179,7 +5101,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -5202,7 +5123,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -5251,6 +5171,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5282,7 +5203,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5359,7 +5279,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5432,8 +5351,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -5453,7 +5371,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -5476,7 +5393,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -5517,7 +5433,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5561,8 +5476,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -5632,6 +5547,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5704,8 +5620,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -5775,6 +5690,7 @@ "ctxt": 0 }, "value": "c3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5849,8 +5765,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -5920,8 +5835,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -5991,6 +5906,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6063,8 +5979,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -6134,6 +6049,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6208,8 +6124,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -6271,7 +6186,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6330,7 +6244,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "value": { @@ -6358,7 +6271,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "value": { @@ -6386,7 +6298,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "value": { @@ -6426,7 +6337,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "value": { @@ -6449,7 +6359,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "value": { @@ -6472,7 +6381,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "value": { @@ -6536,7 +6444,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false }, "value": { @@ -6564,7 +6471,6 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, "optional": false }, "value": { @@ -6592,7 +6498,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, "value": { @@ -6632,7 +6537,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false }, "value": { @@ -6655,7 +6559,6 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, "optional": false }, "value": { @@ -6678,7 +6581,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, "value": { @@ -6719,7 +6621,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6777,7 +6678,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6818,7 +6718,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -6863,7 +6762,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6897,7 +6795,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -6977,7 +6874,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7003,7 +6899,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -7067,7 +6962,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -7108,7 +7002,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -7161,7 +7054,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7205,8 +7097,8 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -7259,8 +7151,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -7318,8 +7210,8 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -7372,8 +7264,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -7398,7 +7290,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -7409,7 +7300,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7448,8 +7338,8 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -7536,6 +7426,7 @@ "ctxt": 0 }, "value": "f6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7615,8 +7506,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -7674,6 +7564,7 @@ "ctxt": 0 }, "value": "f7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7787,8 +7678,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -7838,7 +7728,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -7859,6 +7748,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7881,13 +7771,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -7923,7 +7811,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7953,7 +7840,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7970,7 +7856,6 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -7991,6 +7876,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8013,13 +7899,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -8038,6 +7922,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8060,13 +7945,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -8102,7 +7985,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8132,7 +8014,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8149,7 +8030,6 @@ "ctxt": 0 }, "value": "g3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -8170,6 +8050,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8192,13 +8073,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -8217,6 +8096,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8239,13 +8119,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -8281,7 +8159,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8302,7 +8179,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8340,7 +8216,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8360,7 +8235,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8379,7 +8253,6 @@ "ctxt": 0 }, "value": "g4", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -8400,6 +8273,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8422,13 +8296,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -8464,7 +8336,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8501,7 +8372,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8519,7 +8389,6 @@ "ctxt": 0 }, "value": "g5", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -8540,6 +8409,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8562,13 +8432,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -8587,6 +8455,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8609,13 +8478,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -8651,7 +8518,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8696,7 +8562,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8714,7 +8579,6 @@ "ctxt": 0 }, "value": "g6", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -8735,6 +8599,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8764,14 +8629,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -8807,7 +8670,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8837,7 +8699,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8854,7 +8715,6 @@ "ctxt": 0 }, "value": "g7", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -8875,6 +8735,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8904,14 +8765,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -8947,7 +8806,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8984,7 +8842,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9002,7 +8859,6 @@ "ctxt": 0 }, "value": "g8", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -9023,6 +8879,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9045,13 +8902,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -9070,6 +8925,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9093,6 +8949,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9115,13 +8972,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -9147,15 +9002,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -9191,7 +9044,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9221,7 +9073,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9253,6 +9104,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9320,8 +9172,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -9386,8 +9237,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9404,7 +9255,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9452,8 +9302,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9470,7 +9320,6 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9530,8 +9379,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9548,7 +9397,6 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9608,8 +9456,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9626,7 +9474,6 @@ "ctxt": 0 }, "value": "g3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9691,8 +9538,8 @@ "ctxt": 0 }, "value": "x5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9709,7 +9556,6 @@ "ctxt": 0 }, "value": "g4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9757,8 +9603,8 @@ "ctxt": 0 }, "value": "x6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9775,7 +9621,6 @@ "ctxt": 0 }, "value": "g5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9835,8 +9680,8 @@ "ctxt": 0 }, "value": "x7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9853,7 +9698,6 @@ "ctxt": 0 }, "value": "g6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9926,8 +9770,8 @@ "ctxt": 0 }, "value": "x8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9944,7 +9788,6 @@ "ctxt": 0 }, "value": "g6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9958,7 +9801,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -9994,8 +9836,8 @@ "ctxt": 0 }, "value": "x9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -10012,7 +9854,6 @@ "ctxt": 0 }, "value": "g7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -10026,7 +9867,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -10062,8 +9902,8 @@ "ctxt": 0 }, "value": "x10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -10080,7 +9920,6 @@ "ctxt": 0 }, "value": "g8", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -10114,8 +9953,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -10126,7 +9965,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -10167,8 +10005,8 @@ "ctxt": 0 }, "value": "x11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -10185,7 +10023,6 @@ "ctxt": 0 }, "value": "g8", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -10219,8 +10056,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -10239,7 +10076,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -10275,7 +10111,6 @@ "ctxt": 0 }, "value": "makeArray", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10296,6 +10131,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10318,13 +10154,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -10367,7 +10201,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -10401,7 +10234,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10438,7 +10270,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10456,7 +10287,6 @@ "ctxt": 0 }, "value": "append", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10477,6 +10307,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10506,14 +10337,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } }, { @@ -10532,6 +10361,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10554,13 +10384,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -10603,8 +10431,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -10628,7 +10456,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -10639,7 +10466,6 @@ "ctxt": 0 }, "value": "slice", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10680,7 +10506,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "property": { @@ -10691,7 +10516,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10707,7 +10531,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -10730,7 +10553,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false } } @@ -10761,7 +10583,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10798,7 +10619,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10822,7 +10642,6 @@ "ctxt": 0 }, "value": "Bit", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -10896,8 +10715,8 @@ "ctxt": 0 }, "value": "aa", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -10914,7 +10733,6 @@ "ctxt": 0 }, "value": "makeArray", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -10954,7 +10772,6 @@ "ctxt": 0 }, "value": "Bit", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10989,8 +10806,8 @@ "ctxt": 0 }, "value": "aa", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -11007,7 +10824,6 @@ "ctxt": 0 }, "value": "append", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -11021,7 +10837,6 @@ "ctxt": 0 }, "value": "aa", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypes3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypes3/input.ts.json index 8f5e9669d22e..4fe95e23b03c 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypes3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypes3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -95,7 +94,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -136,7 +134,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -175,7 +172,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -209,7 +205,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -251,7 +246,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -276,7 +270,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -297,6 +290,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -313,8 +307,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -347,7 +340,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -411,7 +403,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -454,7 +445,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -493,7 +483,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -518,7 +507,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -539,6 +527,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -555,8 +544,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -612,7 +600,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -646,7 +633,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -673,7 +659,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -684,7 +669,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -706,7 +690,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -727,6 +710,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -743,8 +727,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -793,7 +776,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -822,7 +804,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -859,7 +840,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -889,7 +869,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -913,7 +892,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -934,6 +912,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -950,8 +929,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -970,6 +948,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1021,8 +1000,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1071,7 +1049,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1100,7 +1077,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1111,7 +1087,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1139,7 +1114,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1164,7 +1138,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1185,6 +1158,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1201,8 +1175,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -1221,6 +1194,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1272,8 +1246,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1322,7 +1295,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -1333,7 +1305,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1362,7 +1333,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1390,7 +1360,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1415,7 +1384,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1436,6 +1404,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1506,8 +1475,7 @@ } ] } - }, - "optional": false + } } }, { @@ -1526,6 +1494,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1586,8 +1555,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1628,7 +1596,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1639,7 +1606,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -1666,7 +1632,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1691,7 +1656,6 @@ "ctxt": 0 }, "value": "f8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1712,6 +1676,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1782,8 +1747,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1816,7 +1780,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -1870,7 +1833,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1922,7 +1884,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1961,7 +1922,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypesAndDestructuring/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypesAndDestructuring/input.ts.json index 0755be761d97..c4997e27ab5c 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypesAndDestructuring/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypesAndDestructuring/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -134,8 +134,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -177,7 +176,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -188,8 +186,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -204,7 +202,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -246,7 +243,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -264,8 +260,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -291,7 +287,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -333,7 +328,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -351,8 +345,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -378,7 +372,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -420,7 +413,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -438,8 +430,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TsConstAssertion", @@ -473,7 +465,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -505,8 +496,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -523,7 +514,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -534,7 +524,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -568,8 +557,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -594,7 +583,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -605,7 +593,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -649,8 +636,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -675,7 +662,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -686,7 +672,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -730,8 +715,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -756,7 +741,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -767,7 +751,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -809,7 +792,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -839,7 +821,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -962,7 +943,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -1015,7 +995,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1040,7 +1019,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypesAndTypeAssertions/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypesAndTypeAssertions/input.ts.json index 727af42576b7..36e999c51fc8 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypesAndTypeAssertions/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypesAndTypeAssertions/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -110,7 +109,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -168,7 +166,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -217,8 +214,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -318,8 +315,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -374,7 +371,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -414,7 +410,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -478,7 +473,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -548,7 +542,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -612,7 +605,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -652,7 +644,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -746,7 +737,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -816,7 +806,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypesWidenInParameterPosition/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypesWidenInParameterPosition/input.ts.json index 5a0d85045948..b0a953d12764 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypesWidenInParameterPosition/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/literalTypesWidenInParameterPosition/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "noWiden", - "typeAnnotation": null, "optional": false }, "value": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -109,8 +106,8 @@ "ctxt": 0 }, "value": "widen", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -171,7 +168,6 @@ "ctxt": 0 }, "value": "noWiden", - "typeAnnotation": null, "optional": false }, "computed": false @@ -225,7 +221,6 @@ "ctxt": 0 }, "value": "widen", - "typeAnnotation": null, "optional": false }, "computed": false @@ -275,7 +270,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/numericLiteralTypes1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/numericLiteralTypes1/input.ts.json index dabd1722fa42..65f86c365e82 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/numericLiteralTypes1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/numericLiteralTypes1/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "A1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -60,7 +59,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -98,7 +96,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "A4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -174,7 +170,6 @@ "ctxt": 0 }, "value": "A5", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -267,7 +262,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -311,6 +305,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -333,13 +328,11 @@ "ctxt": 0 }, "value": "A1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -379,6 +372,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -401,13 +395,11 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -447,6 +439,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -469,13 +462,11 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -515,6 +506,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -537,13 +529,11 @@ "ctxt": 0 }, "value": "A4", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -583,6 +573,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -605,13 +596,11 @@ "ctxt": 0 }, "value": "A5", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -649,7 +638,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -731,7 +719,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -813,7 +800,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -889,7 +875,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -933,6 +918,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -955,13 +941,11 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "UnaryExpression", @@ -1010,6 +994,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1032,13 +1017,11 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -1078,6 +1061,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1100,13 +1084,11 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -1138,7 +1120,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1159,6 +1140,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1183,8 +1165,7 @@ "value": 1.0 } } - }, - "optional": false + } } }, { @@ -1203,6 +1184,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1271,8 +1253,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1315,8 +1296,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1334,7 +1315,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1345,7 +1325,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1378,8 +1357,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1397,7 +1376,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1408,7 +1386,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1441,8 +1418,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1460,7 +1437,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1471,7 +1447,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1504,8 +1479,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1523,7 +1498,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1534,7 +1508,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1567,8 +1540,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1586,7 +1559,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1597,7 +1569,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1630,8 +1601,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1649,7 +1620,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1660,7 +1630,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1693,8 +1662,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1712,7 +1681,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1723,7 +1691,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1756,8 +1723,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1775,7 +1742,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1786,7 +1752,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1819,8 +1784,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1838,7 +1803,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1871,8 +1835,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1890,7 +1854,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1923,8 +1886,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1942,7 +1905,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1953,7 +1915,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1986,8 +1947,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2005,7 +1966,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2016,7 +1976,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2049,8 +2008,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2068,7 +2027,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2079,7 +2037,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2112,8 +2069,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2131,7 +2088,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2142,7 +2098,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2175,8 +2130,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2194,7 +2149,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2205,7 +2159,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2238,8 +2191,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2257,7 +2210,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2268,7 +2220,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2301,8 +2252,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2320,7 +2271,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2331,7 +2281,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2364,8 +2313,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2383,7 +2332,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2394,7 +2342,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2427,8 +2374,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -2446,7 +2393,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2471,7 +2417,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2492,6 +2437,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2516,8 +2462,7 @@ "value": 1.0 } } - }, - "optional": false + } } }, { @@ -2536,6 +2481,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2604,8 +2550,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2647,7 +2592,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2676,7 +2620,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2698,7 +2641,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2719,6 +2661,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2743,8 +2686,7 @@ "value": 0.0 } } - }, - "optional": false + } } } ], @@ -2786,7 +2728,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2807,6 +2748,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2831,8 +2773,7 @@ "value": 1.0 } } - }, - "optional": false + } } } ], @@ -2874,7 +2815,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2895,6 +2835,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2911,8 +2852,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -2954,7 +2894,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2975,6 +2914,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2999,8 +2939,7 @@ "value": 1.0 } } - }, - "optional": false + } } }, { @@ -3019,6 +2958,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3087,8 +3027,7 @@ } ] } - }, - "optional": false + } } } ], @@ -3131,8 +3070,8 @@ "ctxt": 0 }, "value": "z1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3149,7 +3088,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3197,8 +3135,8 @@ "ctxt": 0 }, "value": "z2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3215,7 +3153,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3263,8 +3200,8 @@ "ctxt": 0 }, "value": "z3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3281,7 +3218,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3329,8 +3265,8 @@ "ctxt": 0 }, "value": "z4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3347,7 +3283,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3361,7 +3296,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3397,8 +3331,8 @@ "ctxt": 0 }, "value": "z5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3415,7 +3349,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3429,7 +3362,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -3457,7 +3389,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3478,6 +3409,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3494,8 +3426,7 @@ }, "kind": "never" } - }, - "optional": false + } } } ], @@ -3535,7 +3466,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3599,7 +3529,6 @@ "ctxt": 0 }, "value": "Tag", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3675,7 +3604,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3696,6 +3624,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3718,13 +3647,11 @@ "ctxt": 0 }, "value": "Tag", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3757,7 +3684,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -3903,7 +3829,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3924,6 +3849,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3946,13 +3872,11 @@ "ctxt": 0 }, "value": "Tag", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3985,7 +3909,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -4136,7 +4059,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4150,7 +4072,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4175,7 +4096,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4196,6 +4116,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4218,13 +4139,11 @@ "ctxt": 0 }, "value": "Tag", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4257,7 +4176,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -4283,7 +4201,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4312,7 +4229,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4336,7 +4252,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4357,6 +4272,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4379,13 +4295,11 @@ "ctxt": 0 }, "value": "Tag", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4434,7 +4348,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -4463,7 +4376,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -4500,7 +4412,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4529,7 +4440,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4553,7 +4463,6 @@ "ctxt": 0 }, "value": "f14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4574,6 +4483,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4642,8 +4552,7 @@ } ] } - }, - "optional": false + } } }, { @@ -4662,6 +4571,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4678,8 +4588,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -4722,8 +4631,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4741,7 +4650,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -4752,7 +4660,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -4785,8 +4692,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4804,7 +4711,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -4815,7 +4721,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -4840,7 +4745,6 @@ "ctxt": 0 }, "value": "f15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4861,6 +4765,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4912,8 +4817,7 @@ } ] } - }, - "optional": false + } } }, { @@ -4932,6 +4836,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4988,8 +4893,7 @@ } ] } - }, - "optional": false + } } } ], @@ -5032,8 +4936,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5051,7 +4955,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -5062,7 +4965,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -5095,8 +4997,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5114,7 +5016,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -5125,7 +5026,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5158,8 +5058,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5177,7 +5077,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -5188,7 +5087,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -5221,8 +5119,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5240,7 +5138,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -5251,7 +5148,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5284,8 +5180,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -5303,7 +5199,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5336,8 +5231,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -5355,7 +5250,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -5386,7 +5280,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -5422,7 +5315,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5472,7 +5364,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5524,7 +5415,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5574,7 +5464,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5626,7 +5515,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5676,7 +5564,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5717,7 +5604,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5738,6 +5624,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5760,13 +5647,11 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5806,7 +5691,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -5817,7 +5701,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5862,7 +5745,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -5873,7 +5755,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5920,7 +5801,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -5931,7 +5811,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5978,7 +5857,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -5989,7 +5867,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6016,7 +5893,6 @@ "ctxt": 0 }, "value": "f21", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6037,6 +5913,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6059,13 +5936,11 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6105,7 +5980,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -6116,7 +5990,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6161,7 +6034,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -6172,7 +6044,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6219,7 +6090,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -6230,7 +6100,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6277,7 +6146,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -6288,7 +6156,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6320,7 +6187,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6334,7 +6200,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/numericLiteralTypes2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/numericLiteralTypes2/input.ts.json index fae136b27b01..d034bd1d1603 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/numericLiteralTypes2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/numericLiteralTypes2/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "A1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -60,7 +59,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -98,7 +96,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "A4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -174,7 +170,6 @@ "ctxt": 0 }, "value": "A5", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -267,7 +262,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -311,6 +305,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -333,13 +328,11 @@ "ctxt": 0 }, "value": "A1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -379,6 +372,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -401,13 +395,11 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -447,6 +439,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -469,13 +462,11 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -515,6 +506,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -537,13 +529,11 @@ "ctxt": 0 }, "value": "A4", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -583,6 +573,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -605,13 +596,11 @@ "ctxt": 0 }, "value": "A5", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -649,7 +638,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -731,7 +719,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -813,7 +800,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -889,7 +875,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -933,6 +918,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -955,13 +941,11 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "UnaryExpression", @@ -1010,6 +994,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1032,13 +1017,11 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -1078,6 +1061,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1100,13 +1084,11 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -1138,7 +1120,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1159,6 +1140,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1183,8 +1165,7 @@ "value": 1.0 } } - }, - "optional": false + } } }, { @@ -1203,6 +1184,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1271,8 +1253,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1315,8 +1296,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1334,7 +1315,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1345,7 +1325,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1378,8 +1357,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1397,7 +1376,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1408,7 +1386,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1441,8 +1418,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1460,7 +1437,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1471,7 +1447,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1504,8 +1479,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1523,7 +1498,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1534,7 +1508,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1567,8 +1540,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1586,7 +1559,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1597,7 +1569,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1630,8 +1601,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1649,7 +1620,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1660,7 +1630,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1693,8 +1662,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1712,7 +1681,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1723,7 +1691,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1756,8 +1723,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1775,7 +1742,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1786,7 +1752,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1819,8 +1784,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1838,7 +1803,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1871,8 +1835,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1890,7 +1854,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1923,8 +1886,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1942,7 +1905,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1953,7 +1915,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1986,8 +1947,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2005,7 +1966,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2016,7 +1976,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2049,8 +2008,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2068,7 +2027,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2079,7 +2037,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2112,8 +2069,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2131,7 +2088,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2142,7 +2098,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2175,8 +2130,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2194,7 +2149,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2205,7 +2159,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2238,8 +2191,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2257,7 +2210,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2268,7 +2220,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2301,8 +2252,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2320,7 +2271,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2331,7 +2281,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2364,8 +2313,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2383,7 +2332,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2394,7 +2342,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2427,8 +2374,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -2446,7 +2393,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2471,7 +2417,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2492,6 +2437,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2516,8 +2462,7 @@ "value": 1.0 } } - }, - "optional": false + } } }, { @@ -2536,6 +2481,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2604,8 +2550,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2647,7 +2592,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2676,7 +2620,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2698,7 +2641,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2719,6 +2661,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2743,8 +2686,7 @@ "value": 0.0 } } - }, - "optional": false + } } } ], @@ -2786,7 +2728,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2807,6 +2748,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2831,8 +2773,7 @@ "value": 1.0 } } - }, - "optional": false + } } } ], @@ -2874,7 +2815,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2895,6 +2835,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2911,8 +2852,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -2954,7 +2894,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2975,6 +2914,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2999,8 +2939,7 @@ "value": 1.0 } } - }, - "optional": false + } } }, { @@ -3019,6 +2958,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3087,8 +3027,7 @@ } ] } - }, - "optional": false + } } } ], @@ -3131,8 +3070,8 @@ "ctxt": 0 }, "value": "z1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3149,7 +3088,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3197,8 +3135,8 @@ "ctxt": 0 }, "value": "z2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3215,7 +3153,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3263,8 +3200,8 @@ "ctxt": 0 }, "value": "z3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3281,7 +3218,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3329,8 +3265,8 @@ "ctxt": 0 }, "value": "z4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3347,7 +3283,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3361,7 +3296,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3397,8 +3331,8 @@ "ctxt": 0 }, "value": "z5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3415,7 +3349,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3429,7 +3362,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -3457,7 +3389,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3478,6 +3409,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3494,8 +3426,7 @@ }, "kind": "never" } - }, - "optional": false + } } } ], @@ -3535,7 +3466,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3599,7 +3529,6 @@ "ctxt": 0 }, "value": "Tag", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3675,7 +3604,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3696,6 +3624,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3718,13 +3647,11 @@ "ctxt": 0 }, "value": "Tag", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3757,7 +3684,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -3903,7 +3829,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3924,6 +3849,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3946,13 +3872,11 @@ "ctxt": 0 }, "value": "Tag", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3985,7 +3909,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -4136,7 +4059,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4150,7 +4072,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4175,7 +4096,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4196,6 +4116,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4218,13 +4139,11 @@ "ctxt": 0 }, "value": "Tag", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4257,7 +4176,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -4283,7 +4201,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4312,7 +4229,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4336,7 +4252,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4357,6 +4272,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4379,13 +4295,11 @@ "ctxt": 0 }, "value": "Tag", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4434,7 +4348,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -4463,7 +4376,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -4500,7 +4412,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4529,7 +4440,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4553,7 +4463,6 @@ "ctxt": 0 }, "value": "f14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4574,6 +4483,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4642,8 +4552,7 @@ } ] } - }, - "optional": false + } } }, { @@ -4662,6 +4571,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4678,8 +4588,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -4722,8 +4631,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4741,7 +4650,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -4752,7 +4660,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -4785,8 +4692,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -4804,7 +4711,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -4815,7 +4721,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -4840,7 +4745,6 @@ "ctxt": 0 }, "value": "f15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4861,6 +4765,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4912,8 +4817,7 @@ } ] } - }, - "optional": false + } } }, { @@ -4932,6 +4836,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4988,8 +4893,7 @@ } ] } - }, - "optional": false + } } } ], @@ -5032,8 +4936,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5051,7 +4955,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -5062,7 +4965,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -5095,8 +4997,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5114,7 +5016,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -5125,7 +5026,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5158,8 +5058,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5177,7 +5077,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -5188,7 +5087,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -5221,8 +5119,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -5240,7 +5138,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -5251,7 +5148,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5284,8 +5180,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -5303,7 +5199,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5336,8 +5231,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -5355,7 +5250,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -5386,7 +5280,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -5422,7 +5315,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5472,7 +5364,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5524,7 +5415,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5574,7 +5464,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5626,7 +5515,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5676,7 +5564,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5717,7 +5604,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5738,6 +5624,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5760,13 +5647,11 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5806,7 +5691,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -5817,7 +5701,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5862,7 +5745,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -5873,7 +5755,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5920,7 +5801,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -5931,7 +5811,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5978,7 +5857,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -5989,7 +5867,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6016,7 +5893,6 @@ "ctxt": 0 }, "value": "f21", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6037,6 +5913,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6059,13 +5936,11 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6105,7 +5980,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -6116,7 +5990,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6161,7 +6034,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -6172,7 +6044,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6219,7 +6090,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -6230,7 +6100,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6277,7 +6146,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -6288,7 +6156,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6320,7 +6187,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6334,7 +6200,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/numericLiteralTypes3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/numericLiteralTypes3/input.ts.json index 7d6ce331162a..b5a98389cea0 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/numericLiteralTypes3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/numericLiteralTypes3/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -60,7 +59,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -125,7 +123,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -207,7 +204,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -283,7 +279,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -304,6 +299,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -326,13 +322,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -351,6 +345,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -373,13 +368,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -398,6 +391,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -420,13 +414,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -445,6 +437,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -467,13 +460,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -514,8 +505,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -525,7 +516,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -553,8 +543,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -564,7 +554,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -592,8 +581,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -603,7 +592,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -631,8 +619,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -642,7 +630,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -664,7 +651,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -685,6 +671,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -707,13 +694,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -732,6 +717,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -754,13 +740,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -779,6 +763,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -801,13 +786,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -826,6 +809,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -848,13 +832,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -895,8 +877,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -906,7 +888,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -934,8 +915,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -945,7 +926,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -973,8 +953,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -984,7 +964,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1012,8 +991,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1023,7 +1002,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -1045,7 +1023,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1066,6 +1043,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1088,13 +1066,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1113,6 +1089,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1135,13 +1112,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1160,6 +1135,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1182,13 +1158,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1207,6 +1181,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1229,13 +1204,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1276,8 +1249,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1287,7 +1260,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1315,8 +1287,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1326,7 +1298,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1354,8 +1325,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1365,7 +1336,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1393,8 +1363,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1404,7 +1374,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -1426,7 +1395,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1447,6 +1415,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1469,13 +1438,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1494,6 +1461,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1516,13 +1484,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1541,6 +1507,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1563,13 +1530,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1588,6 +1553,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1610,13 +1576,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1657,8 +1621,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1668,7 +1632,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1696,8 +1659,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1707,7 +1670,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1735,8 +1697,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1746,7 +1708,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1774,8 +1735,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1785,7 +1746,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -1807,7 +1767,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1828,6 +1787,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1850,13 +1810,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1875,6 +1833,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1897,13 +1856,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1922,6 +1879,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1944,13 +1902,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1969,6 +1925,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1991,13 +1948,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2038,8 +1993,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -2075,8 +2030,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -2112,8 +2067,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -2149,8 +2104,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -2186,8 +2141,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -2223,8 +2178,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -2260,8 +2215,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -2297,8 +2252,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -2334,8 +2289,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -2371,8 +2326,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -2408,8 +2363,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -2445,8 +2400,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -2482,8 +2437,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -2519,8 +2474,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -2556,8 +2511,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -2593,8 +2548,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -2624,7 +2579,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2645,6 +2599,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2667,13 +2622,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2692,6 +2645,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2714,13 +2668,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2739,6 +2691,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2761,13 +2714,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2786,6 +2737,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2808,13 +2760,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2855,7 +2805,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2892,7 +2841,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2929,7 +2877,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2966,7 +2913,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3003,7 +2949,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3040,7 +2985,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3077,7 +3021,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3114,7 +3057,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3151,7 +3093,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3188,7 +3129,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3225,7 +3165,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3262,7 +3201,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3299,7 +3237,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -3336,7 +3273,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -3373,7 +3309,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -3410,7 +3345,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -3441,7 +3375,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3462,6 +3395,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3484,13 +3418,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3509,6 +3441,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3531,13 +3464,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3556,6 +3487,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3578,13 +3510,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3603,6 +3533,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3625,13 +3556,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3672,7 +3601,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3683,7 +3611,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3711,7 +3638,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3722,7 +3648,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -3750,7 +3675,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3761,7 +3685,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -3789,7 +3712,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3800,7 +3722,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -3828,7 +3749,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3839,7 +3759,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3867,7 +3786,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3878,7 +3796,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -3906,7 +3823,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3917,7 +3833,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -3945,7 +3860,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3956,7 +3870,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -3984,7 +3897,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3995,7 +3907,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4023,7 +3934,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4034,7 +3944,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -4062,7 +3971,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4073,7 +3981,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -4101,7 +4008,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4112,7 +4018,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -4140,7 +4045,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4151,7 +4055,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4179,7 +4082,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4190,7 +4092,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -4218,7 +4119,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4229,7 +4129,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -4257,7 +4156,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4268,7 +4166,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -4290,7 +4187,6 @@ "ctxt": 0 }, "value": "f8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4311,6 +4207,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4379,8 +4276,7 @@ } ] } - }, - "optional": false + } } } ], @@ -4413,7 +4309,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/stringEnumLiteralTypes1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/stringEnumLiteralTypes1/input.ts.json index bb91fbecd138..bbef20110621 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/stringEnumLiteralTypes1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/stringEnumLiteralTypes1/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "init": { @@ -75,7 +73,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "init": { @@ -108,7 +105,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "init": { @@ -152,7 +148,6 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -181,7 +176,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -192,7 +186,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -215,7 +208,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -226,7 +218,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -251,7 +242,6 @@ "ctxt": 0 }, "value": "NoYes", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -280,7 +270,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -291,7 +280,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -314,7 +302,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -325,7 +312,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -350,7 +336,6 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -379,7 +364,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -390,7 +374,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false } }, @@ -413,7 +396,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -424,7 +406,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -447,7 +428,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -458,7 +438,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -477,7 +456,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -521,6 +499,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -543,13 +522,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -581,6 +558,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -603,13 +581,11 @@ "ctxt": 0 }, "value": "NoYes", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -641,6 +617,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -673,7 +650,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -684,7 +660,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -707,7 +682,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -718,7 +692,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -726,8 +699,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -759,6 +731,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -791,7 +764,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -802,7 +774,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -825,7 +796,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -836,7 +806,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -844,8 +813,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -869,7 +837,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -890,6 +857,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -912,13 +880,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -937,6 +903,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -959,13 +926,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -984,6 +949,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1006,13 +972,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1053,8 +1017,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1064,7 +1028,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1092,8 +1055,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1103,7 +1066,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1131,8 +1093,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1142,7 +1104,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1164,7 +1125,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1185,6 +1145,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1209,7 +1170,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -1220,14 +1180,12 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1246,6 +1204,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1268,13 +1227,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1317,8 +1274,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1336,7 +1293,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1347,7 +1303,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1380,8 +1335,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1399,7 +1354,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1410,7 +1364,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1443,8 +1396,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1462,7 +1415,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1473,7 +1425,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1506,8 +1457,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1525,7 +1476,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1536,7 +1486,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1569,8 +1518,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1588,7 +1537,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1599,7 +1547,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1632,8 +1579,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1651,7 +1598,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1662,7 +1608,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1695,8 +1640,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1714,7 +1659,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1725,7 +1669,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1758,8 +1701,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1777,7 +1720,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1788,7 +1730,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1821,8 +1762,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1840,7 +1781,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1851,7 +1791,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1884,8 +1823,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1903,7 +1842,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1928,7 +1866,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1949,6 +1886,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1973,7 +1911,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -1984,14 +1921,12 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2033,7 +1968,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2054,6 +1988,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2078,7 +2013,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -2089,14 +2023,12 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2138,7 +2070,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2159,6 +2090,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2181,13 +2113,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2229,7 +2159,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2250,6 +2179,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2272,13 +2202,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2297,6 +2225,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2319,13 +2248,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2344,6 +2271,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2366,13 +2294,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2415,8 +2341,8 @@ "ctxt": 0 }, "value": "z1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2433,7 +2359,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2454,7 +2379,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2465,7 +2389,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2503,8 +2426,8 @@ "ctxt": 0 }, "value": "z2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2521,7 +2444,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2542,7 +2464,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2553,7 +2474,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2591,8 +2511,8 @@ "ctxt": 0 }, "value": "z3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2609,7 +2529,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2623,7 +2542,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2659,8 +2577,8 @@ "ctxt": 0 }, "value": "z4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2677,7 +2595,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2691,7 +2608,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2727,8 +2643,8 @@ "ctxt": 0 }, "value": "z5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2745,7 +2661,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2759,7 +2674,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -2787,7 +2701,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2808,6 +2721,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2824,8 +2738,7 @@ }, "kind": "never" } - }, - "optional": false + } } } ], @@ -2865,7 +2778,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2923,7 +2835,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2944,6 +2855,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2966,13 +2878,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3005,7 +2915,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -3031,7 +2940,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3042,7 +2950,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3094,7 +3001,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3105,7 +3011,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3154,7 +3059,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3175,6 +3079,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3197,13 +3102,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3236,7 +3139,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -3262,7 +3164,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3273,7 +3174,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3325,7 +3225,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3336,7 +3235,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3390,7 +3288,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3404,7 +3301,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3429,7 +3325,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3450,6 +3345,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3472,13 +3368,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3511,7 +3405,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -3537,7 +3430,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3566,7 +3458,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3590,7 +3481,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3611,6 +3501,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3633,13 +3524,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3680,7 +3569,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -3698,7 +3586,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3709,7 +3596,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3738,7 +3624,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3767,7 +3652,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3797,7 +3681,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3833,7 +3716,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3864,7 +3746,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -3875,7 +3756,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -3900,7 +3780,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3952,7 +3831,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3983,7 +3861,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -3994,7 +3871,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -4019,7 +3895,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4060,7 +3935,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4081,6 +3955,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4103,13 +3978,11 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4149,7 +4022,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4160,7 +4032,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4188,7 +4059,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -4199,7 +4069,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4227,7 +4096,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4238,7 +4106,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4268,7 +4135,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -4279,7 +4145,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4307,7 +4172,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4318,7 +4182,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4345,7 +4208,6 @@ "ctxt": 0 }, "value": "f21", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4366,6 +4228,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4388,13 +4251,11 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4434,7 +4295,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4445,7 +4305,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4473,7 +4332,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -4484,7 +4342,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4512,7 +4369,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4523,7 +4379,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4553,7 +4408,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -4564,7 +4418,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4592,7 +4445,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4603,7 +4455,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4635,7 +4486,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4649,7 +4499,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/stringEnumLiteralTypes2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/stringEnumLiteralTypes2/input.ts.json index 0bcba1aabd32..670156532acf 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/stringEnumLiteralTypes2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/stringEnumLiteralTypes2/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "init": { @@ -75,7 +73,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "init": { @@ -108,7 +105,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "init": { @@ -152,7 +148,6 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -181,7 +176,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -192,7 +186,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -215,7 +208,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -226,7 +218,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -251,7 +242,6 @@ "ctxt": 0 }, "value": "NoYes", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -280,7 +270,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -291,7 +280,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -314,7 +302,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -325,7 +312,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -350,7 +336,6 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -379,7 +364,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -390,7 +374,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false } }, @@ -413,7 +396,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -424,7 +406,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -447,7 +428,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -458,7 +438,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -477,7 +456,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -521,6 +499,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -543,13 +522,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -581,6 +558,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -603,13 +581,11 @@ "ctxt": 0 }, "value": "NoYes", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -641,6 +617,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -673,7 +650,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -684,7 +660,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -707,7 +682,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -718,7 +692,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -726,8 +699,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -759,6 +731,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -791,7 +764,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -802,7 +774,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -825,7 +796,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -836,7 +806,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -844,8 +813,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -869,7 +837,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -890,6 +857,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -912,13 +880,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -937,6 +903,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -959,13 +926,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -984,6 +949,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1006,13 +972,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1053,8 +1017,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1064,7 +1028,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1092,8 +1055,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1103,7 +1066,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1131,8 +1093,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1142,7 +1104,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1164,7 +1125,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1185,6 +1145,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1209,7 +1170,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -1220,14 +1180,12 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1246,6 +1204,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1268,13 +1227,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1317,8 +1274,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1336,7 +1293,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1347,7 +1303,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1380,8 +1335,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1399,7 +1354,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1410,7 +1364,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1443,8 +1396,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1462,7 +1415,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1473,7 +1425,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1506,8 +1457,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1525,7 +1476,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1536,7 +1486,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1569,8 +1518,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1588,7 +1537,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1599,7 +1547,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1632,8 +1579,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1651,7 +1598,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1662,7 +1608,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1695,8 +1640,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1714,7 +1659,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1725,7 +1669,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1758,8 +1701,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1777,7 +1720,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1788,7 +1730,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1821,8 +1762,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1840,7 +1781,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1851,7 +1791,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1884,8 +1823,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1903,7 +1842,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1928,7 +1866,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1949,6 +1886,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1973,7 +1911,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -1984,14 +1921,12 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2033,7 +1968,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2054,6 +1988,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2078,7 +2013,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -2089,14 +2023,12 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2138,7 +2070,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2159,6 +2090,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2181,13 +2113,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2229,7 +2159,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2250,6 +2179,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2272,13 +2202,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2297,6 +2225,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2319,13 +2248,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2344,6 +2271,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2366,13 +2294,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2415,8 +2341,8 @@ "ctxt": 0 }, "value": "z1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2433,7 +2359,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2454,7 +2379,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2465,7 +2389,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2503,8 +2426,8 @@ "ctxt": 0 }, "value": "z2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2521,7 +2444,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2542,7 +2464,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2553,7 +2474,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2591,8 +2511,8 @@ "ctxt": 0 }, "value": "z3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2609,7 +2529,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2623,7 +2542,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2659,8 +2577,8 @@ "ctxt": 0 }, "value": "z4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2677,7 +2595,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2691,7 +2608,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2727,8 +2643,8 @@ "ctxt": 0 }, "value": "z5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2745,7 +2661,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2759,7 +2674,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -2787,7 +2701,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2808,6 +2721,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2824,8 +2738,7 @@ }, "kind": "never" } - }, - "optional": false + } } } ], @@ -2865,7 +2778,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2923,7 +2835,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2944,6 +2855,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2966,13 +2878,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3005,7 +2915,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -3031,7 +2940,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3042,7 +2950,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3094,7 +3001,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3105,7 +3011,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3154,7 +3059,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3175,6 +3079,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3197,13 +3102,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3236,7 +3139,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -3262,7 +3164,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3273,7 +3174,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3325,7 +3225,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3336,7 +3235,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3390,7 +3288,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3404,7 +3301,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3429,7 +3325,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3450,6 +3345,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3472,13 +3368,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3511,7 +3405,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -3537,7 +3430,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3566,7 +3458,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3590,7 +3481,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3611,6 +3501,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3633,13 +3524,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3680,7 +3569,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -3698,7 +3586,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3709,7 +3596,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3738,7 +3624,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3767,7 +3652,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3797,7 +3681,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3833,7 +3716,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3864,7 +3746,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -3875,7 +3756,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -3900,7 +3780,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3952,7 +3831,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3983,7 +3861,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -3994,7 +3871,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -4019,7 +3895,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4060,7 +3935,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4081,6 +3955,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4103,13 +3978,11 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4149,7 +4022,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4160,7 +4032,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4188,7 +4059,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -4199,7 +4069,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4227,7 +4096,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4238,7 +4106,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4268,7 +4135,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -4279,7 +4145,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4307,7 +4172,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4318,7 +4182,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4345,7 +4208,6 @@ "ctxt": 0 }, "value": "f21", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4366,6 +4228,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4388,13 +4251,11 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4434,7 +4295,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4445,7 +4305,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4473,7 +4332,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -4484,7 +4342,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4512,7 +4369,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4523,7 +4379,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4553,7 +4408,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -4564,7 +4418,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4592,7 +4445,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4603,7 +4455,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4635,7 +4486,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4649,7 +4499,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/stringEnumLiteralTypes3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/stringEnumLiteralTypes3/input.ts.json index 7a64ed2148e1..69e831728605 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/stringEnumLiteralTypes3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/stringEnumLiteralTypes3/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "init": { @@ -75,7 +73,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "init": { @@ -108,7 +105,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "init": { @@ -152,7 +148,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -173,7 +168,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -184,7 +178,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -207,7 +200,6 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -236,7 +228,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -247,7 +238,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -270,7 +260,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -281,7 +270,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -306,7 +294,6 @@ "ctxt": 0 }, "value": "NoYes", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -335,7 +322,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -346,7 +332,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -369,7 +354,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -380,7 +364,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -405,7 +388,6 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -434,7 +416,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -445,7 +426,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false } }, @@ -468,7 +448,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -479,7 +458,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false } }, @@ -502,7 +480,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "right": { @@ -513,7 +490,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false } }, @@ -532,7 +508,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -553,6 +528,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -575,13 +551,11 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -600,6 +574,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -622,13 +597,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -647,6 +620,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -669,13 +643,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -694,6 +666,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -716,13 +689,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -763,8 +734,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -774,7 +745,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -802,8 +772,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -813,7 +783,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -841,8 +810,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -852,7 +821,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -880,8 +848,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -891,7 +859,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -913,7 +880,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -934,6 +900,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -956,13 +923,11 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -981,6 +946,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1003,13 +969,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1028,6 +992,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1050,13 +1015,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1075,6 +1038,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1097,13 +1061,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1144,8 +1106,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1155,7 +1117,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1183,8 +1144,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1194,7 +1155,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1222,8 +1182,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1233,7 +1193,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1261,8 +1220,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1272,7 +1231,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -1294,7 +1252,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1315,6 +1272,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1337,13 +1295,11 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1362,6 +1318,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1384,13 +1341,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1409,6 +1364,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1431,13 +1387,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1456,6 +1410,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1478,13 +1433,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1525,8 +1478,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1536,7 +1489,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1564,8 +1516,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1575,7 +1527,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1603,8 +1554,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1614,7 +1565,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1642,8 +1592,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1653,7 +1603,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -1675,7 +1624,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1696,6 +1644,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1718,13 +1667,11 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1743,6 +1690,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1765,13 +1713,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1790,6 +1736,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1812,13 +1759,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1837,6 +1782,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1859,13 +1805,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1906,8 +1850,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1917,7 +1861,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1945,8 +1888,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1956,7 +1899,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1984,8 +1926,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1995,7 +1937,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -2023,8 +1964,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2034,7 +1975,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -2056,7 +1996,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2077,6 +2016,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2099,13 +2039,11 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2124,6 +2062,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2146,13 +2085,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2171,6 +2108,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2193,13 +2131,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2218,6 +2154,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2240,13 +2177,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2287,8 +2222,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2305,7 +2240,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2316,7 +2250,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2346,8 +2279,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2364,7 +2297,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2375,7 +2307,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2405,8 +2336,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2423,7 +2354,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2434,7 +2364,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2464,8 +2393,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2482,7 +2411,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2493,7 +2421,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2523,8 +2450,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2541,7 +2468,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2552,7 +2478,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2582,8 +2507,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2600,7 +2525,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2611,7 +2535,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2641,8 +2564,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2659,7 +2582,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2670,7 +2592,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2700,8 +2621,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2718,7 +2639,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2729,7 +2649,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2759,8 +2678,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2777,7 +2696,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2788,7 +2706,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2818,8 +2735,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2836,7 +2753,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2847,7 +2763,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2877,8 +2792,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2895,7 +2810,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2906,7 +2820,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2936,8 +2849,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2954,7 +2867,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -2965,7 +2877,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2989,7 +2900,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3010,6 +2920,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3032,13 +2943,11 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3057,6 +2966,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3079,13 +2989,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3104,6 +3012,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3126,13 +3035,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3151,6 +3058,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3173,13 +3081,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3220,7 +3126,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3238,7 +3143,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3249,7 +3153,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3279,7 +3182,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3297,7 +3199,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3308,7 +3209,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3338,7 +3238,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -3356,7 +3255,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3367,7 +3265,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3397,7 +3294,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3415,7 +3311,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3426,7 +3321,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3456,7 +3350,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3474,7 +3367,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3485,7 +3377,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3515,7 +3406,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3533,7 +3423,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3544,7 +3433,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3574,7 +3462,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3592,7 +3479,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3603,7 +3489,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3633,7 +3518,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3651,7 +3535,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3662,7 +3545,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3692,7 +3574,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3710,7 +3591,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3721,7 +3601,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3751,7 +3630,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -3769,7 +3647,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3780,7 +3657,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3810,7 +3686,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -3828,7 +3703,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3839,7 +3713,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3869,7 +3742,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -3887,7 +3759,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -3898,7 +3769,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3922,7 +3792,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3943,6 +3812,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3965,13 +3835,11 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3990,6 +3858,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4012,13 +3881,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4037,6 +3904,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4059,13 +3927,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4084,6 +3950,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4106,13 +3973,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4153,7 +4018,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4164,7 +4028,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4192,7 +4055,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4203,7 +4065,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -4231,7 +4092,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4242,7 +4102,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -4270,7 +4129,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -4281,7 +4139,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -4309,7 +4166,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4320,7 +4176,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4348,7 +4203,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4359,7 +4213,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -4387,7 +4240,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4398,7 +4250,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -4426,7 +4277,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -4437,7 +4287,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -4465,7 +4314,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4476,7 +4324,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4504,7 +4351,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4515,7 +4361,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -4543,7 +4388,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4554,7 +4398,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -4582,7 +4425,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -4593,7 +4435,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -4621,7 +4462,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4632,7 +4472,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4660,7 +4499,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4671,7 +4509,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -4699,7 +4536,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4710,7 +4546,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -4738,7 +4573,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -4749,7 +4583,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -4771,7 +4604,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4792,6 +4624,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4814,13 +4647,11 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4853,7 +4684,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -4879,7 +4709,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -4890,7 +4719,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4911,7 +4739,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4939,7 +4766,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -4950,7 +4776,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4971,7 +4796,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4999,7 +4823,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -5010,7 +4833,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5031,7 +4853,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5054,7 +4875,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5085,7 +4905,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5102,7 +4921,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5123,6 +4941,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5145,13 +4964,11 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5184,7 +5001,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -5210,7 +5026,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -5221,7 +5036,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5242,7 +5056,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5270,7 +5083,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -5281,7 +5093,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5302,7 +5113,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5330,7 +5140,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -5341,7 +5150,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5362,7 +5170,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5385,7 +5192,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5416,7 +5222,6 @@ "ctxt": 0 }, "value": "YesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5433,7 +5238,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5454,6 +5258,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5476,13 +5281,11 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5515,7 +5318,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -5541,7 +5343,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -5552,7 +5353,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5573,7 +5373,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5601,7 +5400,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -5612,7 +5410,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5633,7 +5430,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5661,7 +5457,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -5672,7 +5467,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5693,7 +5487,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5716,7 +5509,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5747,7 +5539,6 @@ "ctxt": 0 }, "value": "UnknownYesNo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5764,7 +5555,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5785,6 +5575,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5807,13 +5598,11 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5846,7 +5635,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -5872,7 +5660,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -5883,7 +5670,6 @@ "ctxt": 0 }, "value": "Unknown", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5904,7 +5690,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5932,7 +5717,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -5943,7 +5727,6 @@ "ctxt": 0 }, "value": "Yes", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5964,7 +5747,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5992,7 +5774,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "property": { @@ -6003,7 +5784,6 @@ "ctxt": 0 }, "value": "No", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6024,7 +5804,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -6047,7 +5826,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -6078,7 +5856,6 @@ "ctxt": 0 }, "value": "Choice", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsAssertionsInEqualityComparisons01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsAssertionsInEqualityComparisons01/input.ts.json index 9c8a289dd586..eeebfc92bbc1 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsAssertionsInEqualityComparisons01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsAssertionsInEqualityComparisons01/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -117,8 +117,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -211,8 +211,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsAssertionsInEqualityComparisons02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsAssertionsInEqualityComparisons02/input.ts.json index b978a35ae770..cec17baba586 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsAssertionsInEqualityComparisons02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsAssertionsInEqualityComparisons02/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "EnhancedString", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -67,7 +66,6 @@ "ctxt": 0 }, "value": "enhancements", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -123,8 +121,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -222,8 +220,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -329,8 +327,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -423,8 +421,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -491,7 +489,6 @@ "ctxt": 0 }, "value": "EnhancedString", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithEqualityChecks01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithEqualityChecks01/input.ts.json index bac6c56bd765..2d27f044b0bd 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithEqualityChecks01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithEqualityChecks01/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,8 +61,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -93,6 +93,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -154,8 +155,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -187,6 +187,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -203,8 +204,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -234,8 +234,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -253,7 +253,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -264,7 +263,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -293,8 +291,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -326,7 +324,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -355,8 +352,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -374,7 +371,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -417,8 +413,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -482,8 +478,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -515,7 +511,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -544,8 +539,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -563,7 +558,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -606,8 +600,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -625,7 +619,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -668,8 +661,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -701,7 +694,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -730,8 +722,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -749,7 +741,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -760,7 +751,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -789,8 +779,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -822,7 +812,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -851,8 +840,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -870,7 +859,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -913,8 +901,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -978,8 +966,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1011,7 +999,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1040,8 +1027,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1059,7 +1046,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1102,8 +1088,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1121,7 +1107,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -1164,8 +1149,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1197,7 +1182,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithEqualityChecks02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithEqualityChecks02/input.ts.json index 8647b1c1b20a..f0cbc3ef1480 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithEqualityChecks02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithEqualityChecks02/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,8 +61,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -93,6 +93,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -154,8 +155,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -187,6 +187,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -203,8 +204,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -234,8 +234,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -253,7 +253,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -264,7 +263,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -293,8 +291,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -326,7 +324,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -355,8 +352,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -374,7 +371,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -417,8 +413,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -482,8 +478,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -515,7 +511,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -544,8 +539,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -563,7 +558,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -606,8 +600,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -625,7 +619,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -668,8 +661,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -701,7 +694,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -730,8 +722,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -749,7 +741,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -760,7 +751,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -789,8 +779,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -822,7 +812,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -851,8 +840,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -870,7 +859,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -913,8 +901,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -978,8 +966,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1011,7 +999,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1040,8 +1027,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1059,7 +1046,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1102,8 +1088,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1121,7 +1107,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -1164,8 +1149,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1197,7 +1182,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithEqualityChecks03/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithEqualityChecks03/input.ts.json index 9859606b4c65..ca1b1eb72232 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithEqualityChecks03/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithEqualityChecks03/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Runnable", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "isRunning", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Refrigerator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Runnable", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "makesFoodGoBrrr", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -200,6 +195,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +212,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -249,6 +244,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -301,15 +297,13 @@ "ctxt": 0 }, "value": "Refrigerator", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -341,6 +335,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -357,8 +352,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -388,8 +382,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -407,7 +401,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -418,7 +411,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -447,8 +439,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -480,7 +472,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -509,8 +500,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -528,7 +519,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -571,8 +561,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -636,8 +626,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -669,7 +659,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -698,8 +687,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -717,7 +706,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -760,8 +748,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -779,7 +767,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -822,8 +809,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -855,7 +842,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -884,8 +870,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -903,7 +889,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -914,7 +899,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -943,8 +927,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -976,7 +960,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1005,8 +988,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1024,7 +1007,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -1067,8 +1049,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1132,8 +1114,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1165,7 +1147,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1194,8 +1175,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1213,7 +1194,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1256,8 +1236,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1275,7 +1255,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -1318,8 +1297,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1351,7 +1330,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithEqualityChecks04/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithEqualityChecks04/input.ts.json index 4394aa5ff825..00d4318b75e6 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithEqualityChecks04/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithEqualityChecks04/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Runnable", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "isRunning", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Refrigerator", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Runnable", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "makesFoodGoBrrr", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -200,6 +195,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +212,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -249,6 +244,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -301,15 +297,13 @@ "ctxt": 0 }, "value": "Refrigerator", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -341,6 +335,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -357,8 +352,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -388,8 +382,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -407,7 +401,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -418,7 +411,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -447,8 +439,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -480,7 +472,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -509,8 +500,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -528,7 +519,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -571,8 +561,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -636,8 +626,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -669,7 +659,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -698,8 +687,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -717,7 +706,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -760,8 +748,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -779,7 +767,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -822,8 +809,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -855,7 +842,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -884,8 +870,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -903,7 +889,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -914,7 +899,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -943,8 +927,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -976,7 +960,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1005,8 +988,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1024,7 +1007,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -1067,8 +1049,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1132,8 +1114,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1165,7 +1147,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1194,8 +1175,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1213,7 +1194,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1256,8 +1236,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1275,7 +1255,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -1318,8 +1297,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -1351,7 +1330,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithSwitchStatements01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithSwitchStatements01/input.ts.json index 568f9286b27b..88d452fbcafd 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithSwitchStatements01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithSwitchStatements01/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,8 +61,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -93,6 +93,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -154,8 +155,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -177,7 +177,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -262,7 +261,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "consequent": [ @@ -281,7 +279,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithSwitchStatements02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithSwitchStatements02/input.ts.json index f32b2e7757d2..978803c1424d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithSwitchStatements02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithSwitchStatements02/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,8 +61,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -93,6 +93,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -154,8 +155,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -187,6 +187,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -203,8 +204,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -234,8 +234,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -253,7 +253,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -264,7 +263,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -293,8 +291,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -326,7 +324,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -355,8 +352,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -374,7 +371,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -417,8 +413,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -482,8 +478,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -501,7 +497,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -512,7 +507,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -541,8 +535,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -574,7 +568,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -603,8 +596,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", @@ -622,7 +615,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -665,8 +657,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BinaryExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithSwitchStatements03/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithSwitchStatements03/input.ts.json index 7f8475d183ac..1c21c7eb75a4 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithSwitchStatements03/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithSwitchStatements03/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,8 +61,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -93,6 +93,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -154,8 +155,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -187,6 +187,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +217,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -234,7 +234,6 @@ "ctxt": 0 }, "value": "randBool", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -282,7 +281,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -315,7 +313,6 @@ "ctxt": 0 }, "value": "randBool", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -398,7 +395,6 @@ "ctxt": 0 }, "value": "randBool", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -569,7 +565,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, { @@ -580,7 +575,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, { @@ -624,7 +618,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -643,7 +636,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -841,7 +833,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "right": { @@ -898,7 +889,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } }, @@ -918,7 +908,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithSwitchStatements04/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithSwitchStatements04/input.ts.json index 965c0de781a1..b905779ac240 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithSwitchStatements04/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithSwitchStatements04/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,8 +61,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -93,6 +93,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -154,8 +155,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -172,7 +172,6 @@ "ctxt": 0 }, "value": "randBool", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -220,7 +219,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -261,7 +259,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } ] @@ -301,7 +298,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, { @@ -355,7 +351,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, { @@ -423,7 +418,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithTypeAssertions01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithTypeAssertions01/input.ts.json index 0cee4e96ccd8..007c75583046 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithTypeAssertions01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/stringLiteralsWithTypeAssertions01/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "fooOrBar", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -92,8 +93,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -125,8 +125,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -201,8 +201,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -277,8 +277,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -295,7 +295,6 @@ "ctxt": 0 }, "value": "fooOrBar", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -350,8 +349,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -368,7 +367,6 @@ "ctxt": 0 }, "value": "fooOrBar", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -423,8 +421,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -441,7 +439,6 @@ "ctxt": 0 }, "value": "fooOrBar", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -496,8 +493,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -535,7 +532,6 @@ "ctxt": 0 }, "value": "fooOrBar", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/templateLiteralTypes2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/templateLiteralTypes2/input.ts.json index f0f17910fc2c..71be53b21e89 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/templateLiteralTypes2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/templateLiteralTypes2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "ft1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -73,6 +72,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -89,8 +89,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -109,6 +108,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -192,8 +192,7 @@ } ] } - }, - "optional": false + } } }, { @@ -212,6 +211,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -234,13 +234,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -283,8 +281,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -302,7 +300,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } ], @@ -412,8 +409,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -431,7 +428,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } ], @@ -541,8 +537,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -560,7 +556,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } ], @@ -670,8 +665,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -689,7 +684,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } ], @@ -799,6 +793,7 @@ "ctxt": 0 }, "value": "d1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -909,8 +904,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "TemplateLiteral", @@ -928,7 +922,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } ], @@ -1038,6 +1031,7 @@ "ctxt": 0 }, "value": "d2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1148,8 +1142,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "TemplateLiteral", @@ -1167,7 +1160,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } ], @@ -1277,6 +1269,7 @@ "ctxt": 0 }, "value": "d3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1454,8 +1447,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "TemplateLiteral", @@ -1473,7 +1465,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } ], @@ -1583,6 +1574,7 @@ "ctxt": 0 }, "value": "d4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1620,7 +1612,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1704,8 +1695,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "TemplateLiteral", @@ -1723,7 +1713,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } ], @@ -1835,7 +1824,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1863,7 +1851,6 @@ "ctxt": 0 }, "value": "ft2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1884,6 +1871,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1900,8 +1888,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1942,7 +1929,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } ], @@ -2041,7 +2027,6 @@ "ctxt": 0 }, "value": "ft10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2062,6 +2047,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2078,8 +2064,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -2122,8 +2107,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -2141,7 +2126,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } ], @@ -2251,8 +2235,8 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -2262,7 +2246,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2294,8 +2277,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -2305,7 +2288,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2337,8 +2319,8 @@ "ctxt": 0 }, "value": "v2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -2348,7 +2330,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2380,6 +2361,7 @@ "ctxt": 0 }, "value": "c3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2490,8 +2472,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "TemplateLiteral", @@ -2509,7 +2490,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } ], @@ -2619,8 +2599,8 @@ "ctxt": 0 }, "value": "v3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -2630,7 +2610,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2662,6 +2641,7 @@ "ctxt": 0 }, "value": "c4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2772,8 +2752,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2783,7 +2762,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2815,8 +2793,8 @@ "ctxt": 0 }, "value": "v4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -2826,7 +2804,6 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2850,7 +2827,6 @@ "ctxt": 0 }, "value": "ft11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2871,6 +2847,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2887,8 +2864,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -2907,6 +2883,7 @@ "ctxt": 0 }, "value": "cond", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2923,8 +2900,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -2967,8 +2943,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2985,7 +2961,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -3004,7 +2979,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } ], @@ -3101,7 +3075,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } ], @@ -3212,6 +3185,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3435,8 +3409,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -3446,7 +3419,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3478,8 +3450,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3496,7 +3468,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -3507,7 +3478,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3518,7 +3488,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false } }, @@ -3551,8 +3520,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3569,7 +3538,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -3580,7 +3548,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3599,7 +3566,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } ], @@ -3710,6 +3676,7 @@ "ctxt": 0 }, "value": "c5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4036,8 +4003,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -4047,7 +4013,6 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, "optional": false }, "definite": false @@ -4079,8 +4044,8 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -4090,7 +4055,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -4122,8 +4086,8 @@ "ctxt": 0 }, "value": "v2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -4133,7 +4097,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "definite": false @@ -4165,8 +4128,8 @@ "ctxt": 0 }, "value": "v3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -4176,7 +4139,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "definite": false @@ -4208,8 +4170,8 @@ "ctxt": 0 }, "value": "v4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -4219,7 +4181,6 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, "optional": false }, "definite": false @@ -4251,8 +4212,8 @@ "ctxt": 0 }, "value": "v5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -4262,7 +4223,6 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, "optional": false }, "definite": false @@ -4286,7 +4246,6 @@ "ctxt": 0 }, "value": "ft12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4307,6 +4266,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4323,8 +4283,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -4367,8 +4326,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -4386,7 +4345,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } ], @@ -4496,8 +4454,8 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -4507,7 +4465,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -4539,6 +4496,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4649,8 +4607,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "TemplateLiteral", @@ -4668,7 +4625,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } ], @@ -4778,8 +4734,8 @@ "ctxt": 0 }, "value": "v2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -4789,7 +4745,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "definite": false @@ -4821,8 +4776,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -4847,7 +4802,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } ], @@ -5061,8 +5015,8 @@ "ctxt": 0 }, "value": "v3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -5072,7 +5026,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "definite": false @@ -5104,8 +5057,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -5130,7 +5083,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } ], @@ -5344,8 +5296,8 @@ "ctxt": 0 }, "value": "v4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -5355,7 +5307,6 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, "optional": false }, "definite": false @@ -5387,8 +5338,8 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsConstAssertion", @@ -5413,7 +5364,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } ], @@ -5524,8 +5474,8 @@ "ctxt": 0 }, "value": "v5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -5535,7 +5485,6 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, "optional": false }, "definite": false @@ -5559,7 +5508,6 @@ "ctxt": 0 }, "value": "widening", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5580,6 +5528,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5602,13 +5551,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5644,7 +5591,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5674,7 +5620,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5691,7 +5636,6 @@ "ctxt": 0 }, "value": "nonWidening", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5712,6 +5656,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5734,13 +5679,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5776,7 +5719,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5842,7 +5784,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5859,7 +5800,6 @@ "ctxt": 0 }, "value": "ft13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5880,6 +5820,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5896,8 +5837,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -5916,6 +5856,7 @@ "ctxt": 0 }, "value": "cond", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5932,8 +5873,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -5976,8 +5916,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5994,7 +5934,6 @@ "ctxt": 0 }, "value": "widening", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6016,7 +5955,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } ], @@ -6130,8 +6068,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6148,7 +6086,6 @@ "ctxt": 0 }, "value": "widening", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6169,7 +6106,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -6202,7 +6138,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } ], @@ -6317,8 +6252,8 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6335,7 +6270,6 @@ "ctxt": 0 }, "value": "nonWidening", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6357,7 +6291,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } ], @@ -6471,8 +6404,8 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6489,7 +6422,6 @@ "ctxt": 0 }, "value": "nonWidening", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6510,7 +6442,6 @@ "ctxt": 0 }, "value": "cond", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -6543,7 +6474,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } ], @@ -6656,7 +6586,6 @@ "ctxt": 0 }, "value": "T0", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -6793,7 +6722,6 @@ "ctxt": 0 }, "value": "ft14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6814,6 +6742,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6924,8 +6853,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6968,6 +6896,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6984,8 +6913,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -6995,7 +6923,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "definite": false @@ -7027,6 +6954,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7049,13 +6977,11 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -7065,7 +6991,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "definite": false @@ -7097,6 +7022,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7119,13 +7045,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -7135,7 +7059,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "definite": false @@ -7167,6 +7090,7 @@ "ctxt": 0 }, "value": "x4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7183,8 +7107,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -7194,7 +7117,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "definite": false @@ -7226,6 +7148,7 @@ "ctxt": 0 }, "value": "x6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7257,7 +7180,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7285,8 +7207,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -7296,7 +7217,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "definite": false @@ -7320,7 +7240,6 @@ "ctxt": 0 }, "value": "takesLiteral", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -7341,6 +7260,7 @@ "ctxt": 0 }, "value": "literal", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7363,13 +7283,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -7405,7 +7323,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7450,7 +7367,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7492,7 +7408,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7593,7 +7508,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7635,8 +7549,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7653,7 +7567,6 @@ "ctxt": 0 }, "value": "takesLiteral", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7706,8 +7619,8 @@ "ctxt": 0 }, "value": "id2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -7752,8 +7665,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7770,7 +7683,6 @@ "ctxt": 0 }, "value": "takesLiteral", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7784,7 +7696,6 @@ "ctxt": 0 }, "value": "id2", - "typeAnnotation": null, "optional": false } } @@ -7820,6 +7731,7 @@ "ctxt": 0 }, "value": "someString", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7836,8 +7748,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -7869,8 +7780,8 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7887,7 +7798,6 @@ "ctxt": 0 }, "value": "takesLiteral", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7909,7 +7819,6 @@ "ctxt": 0 }, "value": "someString", - "typeAnnotation": null, "optional": false } ], @@ -8023,8 +7932,8 @@ "ctxt": 0 }, "value": "id4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TemplateLiteral", @@ -8042,7 +7951,6 @@ "ctxt": 0 }, "value": "someString", - "typeAnnotation": null, "optional": false } ], @@ -8152,8 +8060,8 @@ "ctxt": 0 }, "value": "t4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -8170,7 +8078,6 @@ "ctxt": 0 }, "value": "takesLiteral", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8184,7 +8091,6 @@ "ctxt": 0 }, "value": "id4", - "typeAnnotation": null, "optional": false } } @@ -8220,6 +8126,7 @@ "ctxt": 0 }, "value": "someUnion", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8303,8 +8210,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -8336,8 +8242,8 @@ "ctxt": 0 }, "value": "t5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -8354,7 +8260,6 @@ "ctxt": 0 }, "value": "takesLiteral", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8376,7 +8281,6 @@ "ctxt": 0 }, "value": "someUnion", - "typeAnnotation": null, "optional": false } ], @@ -8490,6 +8394,7 @@ "ctxt": 0 }, "value": "pixelValue", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8506,8 +8411,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -8538,7 +8442,6 @@ "ctxt": 0 }, "value": "PixelValueType", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -8671,6 +8574,7 @@ "ctxt": 0 }, "value": "pixelString", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8693,13 +8597,11 @@ "ctxt": 0 }, "value": "PixelValueType", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "TemplateLiteral", @@ -8778,6 +8680,7 @@ "ctxt": 0 }, "value": "pixelStringWithTemplate", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8800,13 +8703,11 @@ "ctxt": 0 }, "value": "PixelValueType", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "TemplateLiteral", @@ -8824,7 +8725,6 @@ "ctxt": 0 }, "value": "pixelValue", - "typeAnnotation": null, "optional": false } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/templateLiteralTypesPatterns/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/templateLiteralTypesPatterns/input.ts.json index 7b1a9b3add5a..11f25e30053e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/templateLiteralTypesPatterns/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/templateLiteralTypesPatterns/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "RequiresLeadingSlash", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -155,6 +154,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -177,13 +177,11 @@ "ctxt": 0 }, "value": "RequiresLeadingSlash", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -228,6 +226,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -250,13 +249,11 @@ "ctxt": 0 }, "value": "RequiresLeadingSlash", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -292,7 +289,6 @@ "ctxt": 0 }, "value": "Protocol", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -318,7 +314,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -347,7 +342,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -393,7 +387,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -413,7 +406,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -545,7 +537,6 @@ "ctxt": 0 }, "value": "download", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -566,6 +557,7 @@ "ctxt": 0 }, "value": "hostSpec", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -588,7 +580,6 @@ "ctxt": 0 }, "value": "Protocol", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -687,8 +678,7 @@ ] } } - }, - "optional": false + } } } ], @@ -734,7 +724,6 @@ "ctxt": 0 }, "value": "download", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -781,7 +770,6 @@ "ctxt": 0 }, "value": "download", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -828,7 +816,6 @@ "ctxt": 0 }, "value": "download", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -878,6 +865,7 @@ "ctxt": 0 }, "value": "q", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -907,7 +895,6 @@ "ctxt": 0 }, "value": "RequiresLeadingSlash", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -956,8 +943,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "BooleanLiteral", @@ -982,7 +968,6 @@ "ctxt": 0 }, "value": "bools", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1003,6 +988,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1113,8 +1099,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1168,7 +1153,6 @@ "ctxt": 0 }, "value": "bools", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1215,7 +1199,6 @@ "ctxt": 0 }, "value": "bools", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1262,7 +1245,6 @@ "ctxt": 0 }, "value": "bools", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1303,7 +1285,6 @@ "ctxt": 0 }, "value": "Pat", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1329,7 +1310,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1403,7 +1383,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1498,7 +1477,6 @@ "ctxt": 0 }, "value": "nullishes", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1519,6 +1497,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1541,7 +1520,6 @@ "ctxt": 0 }, "value": "Pat", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1583,8 +1561,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1638,7 +1615,6 @@ "ctxt": 0 }, "value": "nullishes", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1685,7 +1661,6 @@ "ctxt": 0 }, "value": "nullishes", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1732,7 +1707,6 @@ "ctxt": 0 }, "value": "nullishes", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1779,7 +1753,6 @@ "ctxt": 0 }, "value": "nullishes", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1826,7 +1799,6 @@ "ctxt": 0 }, "value": "nullishes", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1873,7 +1845,6 @@ "ctxt": 0 }, "value": "nullishes", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1920,7 +1891,6 @@ "ctxt": 0 }, "value": "nullishes", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1955,7 +1925,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1976,6 +1945,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2086,8 +2056,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2141,7 +2110,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2188,7 +2156,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2235,7 +2202,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2282,7 +2248,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2329,7 +2294,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2376,7 +2340,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2423,7 +2386,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2470,7 +2432,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2517,7 +2478,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2564,7 +2524,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2611,7 +2570,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2658,7 +2616,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2705,7 +2662,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2752,7 +2708,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2799,7 +2754,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2846,7 +2800,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2893,7 +2846,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2940,7 +2892,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2987,7 +2938,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3034,7 +2984,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3081,7 +3030,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3128,7 +3076,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3175,7 +3122,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3222,7 +3168,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3269,7 +3214,6 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3304,7 +3248,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3325,6 +3268,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3435,8 +3379,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3490,7 +3433,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3537,7 +3479,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3584,7 +3525,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3631,7 +3571,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3678,7 +3617,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3725,7 +3663,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3772,7 +3709,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3819,7 +3755,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3866,7 +3801,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3913,7 +3847,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3960,7 +3893,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4007,7 +3939,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4054,7 +3985,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4101,7 +4031,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4148,7 +4077,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4195,7 +4123,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4242,7 +4169,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4289,7 +4215,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4336,7 +4261,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4383,7 +4307,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4430,7 +4353,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4477,7 +4399,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4524,7 +4445,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4571,7 +4491,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4618,7 +4537,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4665,7 +4583,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4712,7 +4629,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4759,7 +4675,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4806,7 +4721,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4853,7 +4767,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4900,7 +4813,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4947,7 +4859,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4994,7 +4905,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5041,7 +4951,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5088,7 +4997,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5135,7 +5043,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5182,7 +5089,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5229,7 +5135,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5276,7 +5181,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5323,7 +5227,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5370,7 +5273,6 @@ "ctxt": 0 }, "value": "bigints", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5411,7 +5313,6 @@ "ctxt": 0 }, "value": "AStr", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -5535,7 +5436,6 @@ "ctxt": 0 }, "value": "ANum", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -5659,7 +5559,6 @@ "ctxt": 0 }, "value": "AAny", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -5792,6 +5691,7 @@ "ctxt": 0 }, "value": "str", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5814,13 +5714,11 @@ "ctxt": 0 }, "value": "AStr", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -5852,6 +5750,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5874,13 +5773,11 @@ "ctxt": 0 }, "value": "ANum", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -5912,6 +5809,7 @@ "ctxt": 0 }, "value": "anyish", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5934,13 +5832,11 @@ "ctxt": 0 }, "value": "AAny", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -5970,8 +5866,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5981,7 +5877,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false } } @@ -6009,8 +5904,8 @@ "ctxt": 0 }, "value": "anyish", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TemplateLiteral", @@ -6085,8 +5980,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6096,7 +5991,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false } } @@ -6124,8 +6018,8 @@ "ctxt": 0 }, "value": "anyish", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6135,7 +6029,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false } } @@ -6163,8 +6056,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6174,7 +6067,6 @@ "ctxt": 0 }, "value": "anyish", - "typeAnnotation": null, "optional": false } } @@ -6202,8 +6094,8 @@ "ctxt": 0 }, "value": "anyish", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6213,7 +6105,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false } } @@ -6241,8 +6132,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6252,7 +6143,6 @@ "ctxt": 0 }, "value": "anyish", - "typeAnnotation": null, "optional": false } } @@ -6280,8 +6170,8 @@ "ctxt": 0 }, "value": "anyish", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TemplateLiteral", @@ -6349,7 +6239,6 @@ "ctxt": 0 }, "value": "AGen", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6375,7 +6264,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6434,7 +6322,6 @@ "ctxt": 0 }, "value": "field", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6478,7 +6365,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6593,6 +6479,7 @@ "ctxt": 0 }, "value": "shouldWork1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6615,7 +6502,6 @@ "ctxt": 0 }, "value": "AGen", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6638,8 +6524,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "TsAsExpression", @@ -6688,7 +6573,6 @@ "ctxt": 0 }, "value": "AGen", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6754,6 +6638,7 @@ "ctxt": 0 }, "value": "shouldWork2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6776,7 +6661,6 @@ "ctxt": 0 }, "value": "AGen", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6799,8 +6683,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "TsAsExpression", @@ -6849,7 +6732,6 @@ "ctxt": 0 }, "value": "AGen", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6893,7 +6775,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -7017,7 +6898,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -7051,7 +6931,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7071,7 +6950,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7218,6 +7096,7 @@ "ctxt": 0 }, "value": "exampleBad", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7240,13 +7119,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -7291,6 +7168,7 @@ "ctxt": 0 }, "value": "exampleGood", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7313,13 +7191,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -7364,6 +7240,7 @@ "ctxt": 0 }, "value": "aa", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7393,8 +7270,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -7426,6 +7302,7 @@ "ctxt": 0 }, "value": "aa", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7568,8 +7445,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -7601,6 +7477,7 @@ "ctxt": 0 }, "value": "t1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7765,8 +7642,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -7798,6 +7674,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8062,8 +7939,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -8095,6 +7971,7 @@ "ctxt": 0 }, "value": "t3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8462,8 +8339,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -8495,6 +8371,7 @@ "ctxt": 0 }, "value": "bb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8605,8 +8482,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -8638,6 +8514,7 @@ "ctxt": 0 }, "value": "bb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8780,8 +8657,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -8804,7 +8680,6 @@ "ctxt": 0 }, "value": "T2S", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8830,7 +8705,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8859,7 +8733,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8905,7 +8778,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8925,7 +8797,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9063,7 +8934,6 @@ "ctxt": 0 }, "value": "S10", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -9187,7 +9057,6 @@ "ctxt": 0 }, "value": "S11", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -9403,7 +9272,6 @@ "ctxt": 0 }, "value": "S12", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -9422,7 +9290,6 @@ "ctxt": 0 }, "value": "T2S", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9465,7 +9332,6 @@ "ctxt": 0 }, "value": "ff1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9486,6 +9352,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9642,8 +9509,7 @@ ] } } - }, - "optional": false + } } } ], @@ -9686,8 +9552,8 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9705,7 +9571,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -9747,8 +9612,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -9766,7 +9631,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -9813,7 +9677,6 @@ "ctxt": 0 }, "value": "Id", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9839,7 +9702,6 @@ "ctxt": 0 }, "value": "TA", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9860,7 +9722,6 @@ "ctxt": 0 }, "value": "TId", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9914,7 +9775,6 @@ "ctxt": 0 }, "value": "TId", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9934,7 +9794,6 @@ "ctxt": 0 }, "value": "TId", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10074,7 +9933,6 @@ "ctxt": 0 }, "value": "AA", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10109,7 +9967,6 @@ "ctxt": 0 }, "value": "BB", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10135,7 +9992,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "function": { @@ -10156,6 +10012,7 @@ "ctxt": 0 }, "value": "id", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10178,7 +10035,6 @@ "ctxt": 0 }, "value": "Id", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10204,7 +10060,6 @@ "ctxt": 0 }, "value": "AA", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10212,8 +10067,7 @@ ] } } - }, - "optional": false + } } } ], @@ -10266,7 +10120,6 @@ "ctxt": 0 }, "value": "update", - "typeAnnotation": null, "optional": false }, "function": { @@ -10287,6 +10140,7 @@ "ctxt": 0 }, "value": "id", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10309,7 +10163,6 @@ "ctxt": 0 }, "value": "Id", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10335,7 +10188,6 @@ "ctxt": 0 }, "value": "AA", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10343,8 +10195,7 @@ ] } } - }, - "optional": false + } } } ], @@ -10399,7 +10250,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10422,7 +10272,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/literal/templateLiteralTypesPatternsPrefixSuffixAssignability/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/literal/templateLiteralTypesPatternsPrefixSuffixAssignability/input.ts.json index d9b91ddcab54..e1b9ada5f6a2 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/literal/templateLiteralTypesPatternsPrefixSuffixAssignability/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/literal/templateLiteralTypesPatternsPrefixSuffixAssignability/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "s1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -141,8 +142,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -187,6 +187,7 @@ "ctxt": 0 }, "value": "s2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -297,8 +298,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -343,6 +343,7 @@ "ctxt": 0 }, "value": "s3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -499,8 +500,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -545,6 +545,7 @@ "ctxt": 0 }, "value": "s4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -701,8 +702,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/types/localTypes/localTypes1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/localTypes/localTypes1/input.ts.json index cbf2e1690a17..51e582bbe935 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/localTypes/localTypes1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/localTypes/localTypes1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,7 +51,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -71,7 +69,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -91,7 +88,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -111,7 +107,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -128,7 +123,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -154,7 +148,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -180,7 +173,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -218,7 +210,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -248,7 +239,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -277,7 +267,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -304,7 +293,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -330,7 +318,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -362,6 +349,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -384,13 +372,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -417,7 +403,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -467,7 +452,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -489,7 +473,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -509,7 +492,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -520,7 +502,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -542,7 +523,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -563,7 +543,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -592,7 +571,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -628,7 +606,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -647,7 +624,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -667,7 +643,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -687,7 +662,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -704,7 +678,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -730,7 +703,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -756,7 +728,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -794,7 +765,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -824,7 +794,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -853,7 +822,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -880,7 +848,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -906,7 +873,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -938,6 +904,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -960,13 +927,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -993,7 +958,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1043,7 +1007,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1065,7 +1028,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1085,7 +1047,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1096,7 +1057,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1118,7 +1078,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1151,7 +1110,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1175,7 +1133,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1196,6 +1153,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1212,8 +1170,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -1272,7 +1229,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -1291,7 +1247,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -1311,7 +1266,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -1331,7 +1285,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -1353,7 +1306,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1374,7 +1326,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1400,7 +1351,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1426,7 +1376,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1464,7 +1413,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1494,7 +1442,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1523,7 +1470,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1550,7 +1496,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1576,7 +1521,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1608,6 +1552,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1630,13 +1575,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1663,7 +1606,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1713,7 +1655,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1735,7 +1676,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1755,7 +1695,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1766,7 +1705,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1788,7 +1726,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1812,7 +1749,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1838,7 +1774,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1864,7 +1799,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1902,7 +1836,6 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1932,7 +1865,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1961,7 +1893,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1988,7 +1919,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2014,7 +1944,6 @@ "ctxt": 0 }, "value": "J", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2046,6 +1975,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2068,13 +1998,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -2101,7 +2029,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2151,7 +2078,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -2173,7 +2099,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2193,7 +2118,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2204,7 +2128,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2226,7 +2149,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -2254,7 +2176,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2298,8 +2219,8 @@ "ctxt": 0 }, "value": "z1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -2336,7 +2257,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -2355,7 +2275,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -2375,7 +2294,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -2395,7 +2313,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -2412,7 +2329,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2438,7 +2354,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2464,7 +2379,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2509,7 +2423,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2552,8 +2465,8 @@ "ctxt": 0 }, "value": "z2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -2588,7 +2501,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -2607,7 +2519,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -2627,7 +2538,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -2647,7 +2557,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -2664,7 +2573,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2690,7 +2598,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2716,7 +2623,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2761,7 +2667,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2796,7 +2701,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2822,7 +2726,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -2851,7 +2754,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -2870,7 +2772,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -2890,7 +2791,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -2910,7 +2810,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -2927,7 +2826,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2953,7 +2851,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2979,7 +2876,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3022,7 +2918,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -3058,7 +2953,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -3077,7 +2971,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -3097,7 +2990,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -3117,7 +3009,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -3134,7 +3025,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3160,7 +3050,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3186,7 +3075,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3231,7 +3119,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3266,7 +3153,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "function": { @@ -3302,7 +3188,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -3321,7 +3206,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -3341,7 +3225,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -3361,7 +3244,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -3378,7 +3260,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3404,7 +3285,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3430,7 +3310,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3475,7 +3354,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3512,7 +3390,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3541,7 +3418,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3567,7 +3443,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3615,7 +3490,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3644,7 +3518,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3670,7 +3543,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3710,7 +3582,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -3728,7 +3599,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3757,7 +3627,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3783,7 +3652,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3823,7 +3691,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -3856,8 +3723,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -3874,7 +3741,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3914,7 +3780,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3925,7 +3790,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3976,7 +3840,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3987,7 +3850,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4038,7 +3900,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4049,7 +3910,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4085,7 +3945,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4118,7 +3977,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4154,7 +4012,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/types/localTypes/localTypes2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/localTypes/localTypes2/input.ts.json index a933c1be50c2..bcdfbe607291 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/localTypes/localTypes2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/localTypes/localTypes2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -45,7 +44,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -122,6 +118,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -138,8 +135,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -160,6 +156,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -176,8 +173,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -215,7 +211,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } @@ -251,8 +246,8 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -269,7 +264,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -304,8 +298,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -322,7 +316,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -382,8 +375,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -400,7 +393,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -411,7 +403,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -445,8 +436,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -463,7 +454,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -474,7 +464,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -500,7 +489,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -529,7 +517,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -550,6 +537,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -566,8 +554,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -595,7 +582,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -621,7 +607,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -632,7 +617,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -661,7 +645,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -683,6 +666,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -699,8 +683,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -738,7 +721,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } @@ -774,8 +756,8 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -792,7 +774,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -840,8 +821,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -858,7 +839,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -906,8 +886,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -924,7 +904,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -935,7 +914,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -969,8 +947,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -987,7 +965,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -998,7 +975,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1024,7 +1000,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1053,7 +1028,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1074,6 +1048,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1090,8 +1065,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -1110,6 +1084,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1126,8 +1101,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1155,7 +1129,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1181,7 +1154,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1192,7 +1164,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -1221,7 +1192,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1232,7 +1202,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -1268,7 +1237,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } @@ -1304,8 +1272,8 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1322,7 +1290,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1382,8 +1349,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1400,7 +1367,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1435,8 +1401,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1453,7 +1419,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -1464,7 +1429,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1498,8 +1462,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1516,7 +1480,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -1527,7 +1490,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/localTypes/localTypes3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/localTypes/localTypes3/input.ts.json index 05f6f95c5532..a3b571f22645 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/localTypes/localTypes3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/localTypes/localTypes3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -45,7 +44,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -74,7 +72,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -122,6 +118,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -144,13 +141,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -171,6 +166,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -193,13 +189,11 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -241,7 +235,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -262,7 +255,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -288,7 +280,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } @@ -324,8 +315,8 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -342,7 +333,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -377,8 +367,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -395,7 +385,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -460,8 +449,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -478,7 +467,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -489,7 +477,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -523,8 +510,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -541,7 +528,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -552,7 +538,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -578,7 +563,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -607,7 +591,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -628,6 +611,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -650,13 +634,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -684,7 +666,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -710,7 +691,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -721,7 +701,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -750,7 +729,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -772,6 +750,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -794,13 +773,11 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -842,7 +819,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -868,7 +844,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } @@ -899,7 +874,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -934,8 +908,8 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -952,7 +926,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1000,8 +973,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1018,7 +991,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1071,8 +1043,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1089,7 +1061,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -1100,7 +1071,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1134,8 +1104,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1152,7 +1122,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -1163,7 +1132,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1189,7 +1157,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1218,7 +1185,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1239,6 +1205,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1261,13 +1228,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1286,6 +1251,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1308,13 +1274,11 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1342,7 +1306,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1368,7 +1331,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1379,7 +1341,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -1408,7 +1369,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1419,7 +1379,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -1455,7 +1414,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } @@ -1486,7 +1444,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1507,7 +1464,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1542,8 +1498,8 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1560,7 +1516,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1625,8 +1580,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1643,7 +1598,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1678,8 +1632,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1696,7 +1650,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -1707,7 +1660,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1741,8 +1693,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1759,7 +1711,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -1770,7 +1721,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/localTypes/localTypes4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/localTypes/localTypes4/input.ts.json index 9dd370adf54e..602c12214902 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/localTypes/localTypes4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/localTypes/localTypes4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -45,7 +44,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -66,6 +64,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -88,13 +87,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -127,7 +124,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -158,7 +154,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -188,7 +183,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -212,7 +206,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -241,7 +234,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -262,6 +254,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -284,13 +277,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -323,7 +314,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -354,7 +344,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -385,7 +374,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -409,7 +397,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -438,7 +425,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -472,7 +458,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -503,7 +488,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -534,7 +518,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -561,7 +544,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -595,7 +577,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -625,7 +606,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -679,6 +659,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -701,13 +682,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -744,7 +723,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -755,7 +733,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -810,7 +787,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -840,7 +816,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -894,6 +869,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -916,13 +892,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -959,7 +933,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -970,7 +943,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1031,7 +1003,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -1042,7 +1013,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/localTypes/localTypes5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/localTypes/localTypes5/input.ts.json index 61274a46e531..6c7931554248 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/localTypes/localTypes5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/localTypes/localTypes5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -45,7 +44,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -71,7 +69,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -139,7 +136,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -175,7 +171,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -208,7 +203,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -260,7 +254,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -295,7 +288,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -331,7 +323,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -352,7 +343,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -400,8 +390,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -418,7 +408,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -457,7 +446,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -468,7 +456,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -531,7 +518,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -566,8 +552,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -584,7 +570,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/types/mapped/isomorphicMappedTypeInference/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/mapped/isomorphicMappedTypeInference/input.ts.json index e556a6ba97bd..8c6888d052a9 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/mapped/isomorphicMappedTypeInference/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/mapped/isomorphicMappedTypeInference/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -136,7 +132,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -162,7 +157,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -193,7 +187,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -219,7 +212,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -244,7 +236,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -278,7 +269,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -298,7 +288,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -319,7 +308,6 @@ "ctxt": 0 }, "value": "box", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -340,6 +328,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -362,13 +351,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -411,7 +398,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -422,7 +408,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -456,7 +441,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -486,7 +470,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -512,7 +495,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -532,7 +514,6 @@ "ctxt": 0 }, "value": "unbox", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -553,6 +534,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -575,7 +557,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -601,7 +582,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -609,8 +589,7 @@ ] } } - }, - "optional": false + } } } ], @@ -650,7 +629,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -661,7 +639,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false @@ -694,7 +671,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -724,7 +700,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -741,7 +716,6 @@ "ctxt": 0 }, "value": "boxify", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -762,6 +736,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -784,13 +759,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -833,8 +806,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -867,7 +840,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -893,7 +865,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -938,8 +909,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -954,7 +925,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "body": { @@ -995,7 +965,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "property": { @@ -1006,7 +975,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1026,7 +994,6 @@ "ctxt": 0 }, "value": "box", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1047,7 +1014,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1058,7 +1024,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1087,7 +1052,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false } } @@ -1118,7 +1082,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1148,7 +1111,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1174,7 +1136,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1194,7 +1155,6 @@ "ctxt": 0 }, "value": "unboxify", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1215,6 +1175,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1237,7 +1198,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1263,7 +1223,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1271,8 +1230,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1315,8 +1273,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -1349,7 +1307,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1391,8 +1348,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1407,7 +1364,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "body": { @@ -1448,7 +1404,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "property": { @@ -1459,7 +1414,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1479,7 +1433,6 @@ "ctxt": 0 }, "value": "unbox", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1500,7 +1453,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1511,7 +1463,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1540,7 +1491,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false } } @@ -1571,7 +1521,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1601,7 +1550,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1618,7 +1566,6 @@ "ctxt": 0 }, "value": "assignBoxified", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1639,6 +1586,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1661,7 +1609,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1687,7 +1634,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1695,8 +1641,7 @@ ] } } - }, - "optional": false + } } }, { @@ -1715,6 +1660,7 @@ "ctxt": 0 }, "value": "values", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1737,13 +1683,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1793,8 +1737,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1809,7 +1753,6 @@ "ctxt": 0 }, "value": "values", - "typeAnnotation": null, "optional": false }, "body": { @@ -1857,7 +1800,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1868,7 +1810,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1881,7 +1822,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1901,7 +1841,6 @@ "ctxt": 0 }, "value": "values", - "typeAnnotation": null, "optional": false }, "property": { @@ -1912,7 +1851,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1949,7 +1887,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1969,7 +1906,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2013,8 +1949,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -2034,7 +1970,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2057,7 +1992,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2085,7 +2019,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -2129,8 +2062,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2147,7 +2080,6 @@ "ctxt": 0 }, "value": "boxify", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2161,7 +2093,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -2197,6 +2128,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2213,8 +2145,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -2238,7 +2169,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2249,7 +2179,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2262,7 +2191,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2288,7 +2216,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2332,8 +2259,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -2353,7 +2280,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2371,7 +2297,6 @@ "ctxt": 0 }, "value": "box", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2401,7 +2326,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2419,7 +2343,6 @@ "ctxt": 0 }, "value": "box", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2454,7 +2377,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -2472,7 +2394,6 @@ "ctxt": 0 }, "value": "box", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2523,8 +2444,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2541,7 +2462,6 @@ "ctxt": 0 }, "value": "unboxify", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2555,7 +2475,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2591,6 +2510,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2607,8 +2527,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -2625,7 +2544,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -2636,7 +2554,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2662,7 +2579,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2706,8 +2622,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -2727,7 +2643,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2745,7 +2660,6 @@ "ctxt": 0 }, "value": "box", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2775,7 +2689,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2793,7 +2706,6 @@ "ctxt": 0 }, "value": "box", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2828,7 +2740,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -2846,7 +2757,6 @@ "ctxt": 0 }, "value": "box", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2894,7 +2804,6 @@ "ctxt": 0 }, "value": "assignBoxified", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2908,7 +2817,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2932,7 +2840,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -2969,7 +2876,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3013,8 +2919,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -3034,7 +2940,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -3052,7 +2957,6 @@ "ctxt": 0 }, "value": "box", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3082,7 +2986,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -3100,7 +3003,6 @@ "ctxt": 0 }, "value": "box", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3135,7 +3037,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -3153,7 +3054,6 @@ "ctxt": 0 }, "value": "box", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3202,8 +3102,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -3220,7 +3120,6 @@ "ctxt": 0 }, "value": "boxify", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3241,7 +3140,6 @@ "ctxt": 0 }, "value": "unboxify", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3255,7 +3153,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -3291,8 +3188,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -3309,7 +3206,6 @@ "ctxt": 0 }, "value": "unboxify", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3330,7 +3226,6 @@ "ctxt": 0 }, "value": "boxify", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3344,7 +3239,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -3374,7 +3268,6 @@ "ctxt": 0 }, "value": "makeRecord", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3395,6 +3288,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3425,7 +3319,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3443,7 +3336,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3467,14 +3359,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -3507,7 +3397,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -3538,7 +3427,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3559,7 +3447,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3587,7 +3474,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3608,6 +3494,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3624,8 +3511,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -3668,8 +3554,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3686,7 +3572,6 @@ "ctxt": 0 }, "value": "makeRecord", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3710,7 +3595,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -3728,7 +3612,6 @@ "ctxt": 0 }, "value": "box", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3758,7 +3641,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -3776,7 +3658,6 @@ "ctxt": 0 }, "value": "box", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3811,7 +3692,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -3829,7 +3709,6 @@ "ctxt": 0 }, "value": "box", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3884,8 +3763,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3902,7 +3781,6 @@ "ctxt": 0 }, "value": "unboxify", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3916,7 +3794,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -3952,6 +3829,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3996,8 +3874,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -4014,7 +3891,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -4025,7 +3901,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4051,7 +3926,6 @@ "ctxt": 0 }, "value": "makeDictionary", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4072,6 +3946,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4098,6 +3973,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4114,8 +3990,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4140,7 +4015,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4155,8 +4029,7 @@ } ] } - }, - "optional": false + } } } ], @@ -4189,7 +4062,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -4220,7 +4092,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4240,7 +4111,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4261,6 +4131,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4277,8 +4148,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -4321,8 +4191,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4339,7 +4209,6 @@ "ctxt": 0 }, "value": "makeDictionary", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4363,7 +4232,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -4381,7 +4249,6 @@ "ctxt": 0 }, "value": "box", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4411,7 +4278,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -4429,7 +4295,6 @@ "ctxt": 0 }, "value": "box", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4464,7 +4329,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -4482,7 +4346,6 @@ "ctxt": 0 }, "value": "box", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4537,8 +4400,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4555,7 +4418,6 @@ "ctxt": 0 }, "value": "unboxify", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4569,7 +4431,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -4605,6 +4466,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4649,8 +4511,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -4667,7 +4528,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -4678,7 +4538,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4704,7 +4563,6 @@ "ctxt": 0 }, "value": "validate", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4725,6 +4583,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4755,7 +4614,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4781,7 +4639,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4814,7 +4671,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4834,15 +4690,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -4878,7 +4732,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4908,7 +4761,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4925,7 +4777,6 @@ "ctxt": 0 }, "value": "clone", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4946,6 +4797,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4976,7 +4828,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5002,7 +4853,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5035,7 +4885,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5055,15 +4904,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -5099,7 +4946,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5129,7 +4975,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5146,7 +4991,6 @@ "ctxt": 0 }, "value": "validateAndClone", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5167,6 +5011,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5197,7 +5042,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5223,7 +5067,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5256,7 +5099,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5276,15 +5118,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -5320,7 +5160,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5350,7 +5189,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5373,7 +5211,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -5401,7 +5238,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5443,7 +5279,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5482,7 +5317,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5503,6 +5337,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5525,13 +5360,11 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5574,8 +5407,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5592,7 +5425,6 @@ "ctxt": 0 }, "value": "validate", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5606,7 +5438,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -5642,8 +5473,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5660,7 +5491,6 @@ "ctxt": 0 }, "value": "clone", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5674,7 +5504,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -5710,8 +5539,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5728,7 +5557,6 @@ "ctxt": 0 }, "value": "validateAndClone", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5742,7 +5570,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -5776,7 +5603,6 @@ "ctxt": 0 }, "value": "Func", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5802,7 +5628,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5838,8 +5663,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -5891,7 +5716,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5915,7 +5739,6 @@ "ctxt": 0 }, "value": "Spec", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5941,7 +5764,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5972,7 +5794,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5998,7 +5819,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6031,7 +5851,6 @@ "ctxt": 0 }, "value": "Func", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6065,7 +5884,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6085,7 +5903,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6109,7 +5926,6 @@ "ctxt": 0 }, "value": "Spec", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6143,7 +5959,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6163,7 +5978,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6186,7 +6000,6 @@ "ctxt": 0 }, "value": "applySpec", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -6207,6 +6020,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6229,7 +6043,6 @@ "ctxt": 0 }, "value": "Spec", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6255,7 +6068,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6263,8 +6075,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6300,7 +6111,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6343,8 +6153,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -6396,7 +6206,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6430,8 +6239,8 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6448,7 +6257,6 @@ "ctxt": 0 }, "value": "applySpec", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6472,7 +6280,6 @@ "ctxt": 0 }, "value": "sum", - "typeAnnotation": null, "optional": false }, "value": { @@ -6491,6 +6298,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6507,8 +6315,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "body": { @@ -6536,7 +6343,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "value": { @@ -6557,7 +6363,6 @@ "ctxt": 0 }, "value": "mul", - "typeAnnotation": null, "optional": false }, "value": { @@ -6576,6 +6381,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6592,8 +6398,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "body": { @@ -6654,8 +6459,8 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6672,7 +6477,6 @@ "ctxt": 0 }, "value": "applySpec", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6696,7 +6500,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -6717,7 +6520,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -6738,7 +6540,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -6757,6 +6558,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6773,8 +6575,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "body": { @@ -6833,8 +6634,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -6852,6 +6653,7 @@ "ctxt": 0 }, "value": "object", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6874,13 +6676,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -6890,6 +6690,7 @@ "ctxt": 0 }, "value": "partial", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6912,7 +6713,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6938,7 +6738,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6946,8 +6745,7 @@ ] } } - }, - "optional": false + } } ], "body": { @@ -6958,7 +6756,6 @@ "ctxt": 0 }, "value": "object", - "typeAnnotation": null, "optional": false }, "async": false, @@ -6986,7 +6783,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7025,8 +6821,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -7046,7 +6842,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -7069,7 +6864,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -7110,7 +6904,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7124,7 +6917,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } }, @@ -7148,7 +6940,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -7191,8 +6982,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -7209,7 +7000,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7223,7 +7013,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } }, @@ -7247,7 +7036,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -7278,7 +7066,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -7299,6 +7086,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7321,7 +7109,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7347,7 +7134,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7367,7 +7153,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7375,8 +7160,7 @@ ] } } - }, - "optional": false + } } } ], @@ -7412,7 +7196,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7433,7 +7216,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7459,7 +7241,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7491,7 +7272,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7508,7 +7288,6 @@ "ctxt": 0 }, "value": "f21", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -7529,6 +7308,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7551,7 +7331,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7577,7 +7356,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7597,7 +7375,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7605,8 +7382,7 @@ ] } } - }, - "optional": false + } } } ], @@ -7642,7 +7418,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7663,7 +7438,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7689,7 +7463,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7721,7 +7494,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7738,7 +7510,6 @@ "ctxt": 0 }, "value": "f22", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -7759,6 +7530,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7781,7 +7553,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7807,7 +7578,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7833,7 +7603,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7853,7 +7622,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7864,8 +7632,7 @@ ] } } - }, - "optional": false + } } } ], @@ -7901,7 +7668,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7922,7 +7688,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7948,7 +7713,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7980,7 +7744,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7997,7 +7760,6 @@ "ctxt": 0 }, "value": "f23", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -8018,6 +7780,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8040,7 +7803,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8066,7 +7828,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8086,7 +7847,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8094,8 +7854,7 @@ ] } } - }, - "optional": false + } } } ], @@ -8131,7 +7890,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8152,7 +7910,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8178,7 +7935,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8201,7 +7957,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8219,7 +7974,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8250,7 +8004,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8267,7 +8020,6 @@ "ctxt": 0 }, "value": "f24", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -8288,6 +8040,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8310,7 +8063,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8344,7 +8096,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8364,7 +8115,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8386,7 +8136,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8394,8 +8143,7 @@ ] } } - }, - "optional": false + } } } ], @@ -8431,7 +8179,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8452,7 +8199,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8473,7 +8219,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8507,7 +8252,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8536,7 +8280,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8578,7 +8321,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8598,7 +8340,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8632,8 +8373,8 @@ "ctxt": 0 }, "value": "x0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -8650,7 +8391,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8674,7 +8414,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -8697,7 +8436,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -8750,8 +8488,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -8768,7 +8506,6 @@ "ctxt": 0 }, "value": "f21", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8792,7 +8529,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -8815,7 +8551,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -8868,8 +8603,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -8886,7 +8621,6 @@ "ctxt": 0 }, "value": "f22", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8910,7 +8644,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -8931,7 +8664,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -8957,7 +8689,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -8978,7 +8709,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -9034,8 +8764,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9052,7 +8782,6 @@ "ctxt": 0 }, "value": "f23", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9076,7 +8805,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -9099,7 +8827,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -9152,8 +8879,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9170,7 +8897,6 @@ "ctxt": 0 }, "value": "f24", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9194,7 +8920,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -9217,7 +8942,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -9255,7 +8979,6 @@ "ctxt": 0 }, "value": "getProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9276,6 +8999,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9298,13 +9022,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -9323,6 +9045,7 @@ "ctxt": 0 }, "value": "list", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9352,14 +9075,12 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -9438,7 +9159,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9459,7 +9179,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9485,7 +9204,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9517,7 +9235,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9543,7 +9260,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9563,7 +9279,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9598,6 +9313,7 @@ "ctxt": 0 }, "value": "myAny", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9614,8 +9330,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -9655,8 +9370,8 @@ "ctxt": 0 }, "value": "o1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9673,7 +9388,6 @@ "ctxt": 0 }, "value": "getProps", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9687,7 +9401,6 @@ "ctxt": 0 }, "value": "myAny", - "typeAnnotation": null, "optional": false } }, @@ -9770,6 +9483,7 @@ "ctxt": 0 }, "value": "o2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9801,7 +9515,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9843,7 +9556,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9871,8 +9583,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -9889,7 +9600,6 @@ "ctxt": 0 }, "value": "getProps", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9903,7 +9613,6 @@ "ctxt": 0 }, "value": "myAny", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeAsClauses/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeAsClauses/input.ts.json index 01dd1baac0db..13908213307e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeAsClauses/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeAsClauses/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "Getters", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -113,7 +110,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -162,7 +158,6 @@ "ctxt": 0 }, "value": "Capitalize", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -188,7 +183,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -315,7 +309,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -335,7 +328,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -361,7 +353,6 @@ "ctxt": 0 }, "value": "TG1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -380,7 +371,6 @@ "ctxt": 0 }, "value": "Getters", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -415,7 +405,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -457,7 +446,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -499,7 +487,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -537,7 +524,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -590,7 +576,6 @@ "ctxt": 0 }, "value": "PropDef", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -616,7 +601,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -654,7 +638,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -686,7 +669,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -715,7 +697,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -739,7 +720,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -768,7 +748,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -795,7 +774,6 @@ "ctxt": 0 }, "value": "TypeFromDefs", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -821,7 +799,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -839,7 +816,6 @@ "ctxt": 0 }, "value": "PropDef", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -907,7 +883,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -925,7 +900,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -955,7 +929,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1007,7 +980,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1053,7 +1025,6 @@ "ctxt": 0 }, "value": "TP1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1072,7 +1043,6 @@ "ctxt": 0 }, "value": "TypeFromDefs", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1115,7 +1085,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1170,7 +1139,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1222,7 +1190,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1277,7 +1244,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1329,7 +1295,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1384,7 +1349,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1434,7 +1398,6 @@ "ctxt": 0 }, "value": "TA1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1453,7 +1416,6 @@ "ctxt": 0 }, "value": "Getters", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1501,7 +1463,6 @@ "ctxt": 0 }, "value": "TA2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1520,7 +1481,6 @@ "ctxt": 0 }, "value": "Getters", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1597,7 +1557,6 @@ "ctxt": 0 }, "value": "Methods", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1623,7 +1582,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1654,7 +1612,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1680,7 +1637,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1718,7 +1674,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1738,7 +1693,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1759,7 +1713,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1779,7 +1732,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1818,7 +1770,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1838,7 +1789,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1862,7 +1812,6 @@ "ctxt": 0 }, "value": "TM1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1881,7 +1830,6 @@ "ctxt": 0 }, "value": "Methods", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1916,7 +1864,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1957,7 +1904,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1971,6 +1917,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1987,8 +1934,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -2026,7 +1972,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2093,7 +2038,6 @@ "ctxt": 0 }, "value": "DoubleProp", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2119,7 +2063,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2150,7 +2093,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2184,7 +2126,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2241,7 +2182,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2355,7 +2295,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2465,7 +2404,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2485,7 +2423,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2509,7 +2446,6 @@ "ctxt": 0 }, "value": "TD1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2528,7 +2464,6 @@ "ctxt": 0 }, "value": "DoubleProp", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2563,7 +2498,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2605,7 +2539,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2653,7 +2586,6 @@ "ctxt": 0 }, "value": "TD2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2680,7 +2612,6 @@ "ctxt": 0 }, "value": "TD1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2703,7 +2634,6 @@ "ctxt": 0 }, "value": "TD3", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2729,7 +2659,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2760,7 +2689,6 @@ "ctxt": 0 }, "value": "DoubleProp", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2786,7 +2714,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2812,7 +2739,6 @@ "ctxt": 0 }, "value": "Lazyify", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2838,7 +2764,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2869,7 +2794,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2895,7 +2819,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2933,7 +2856,6 @@ "ctxt": 0 }, "value": "Capitalize", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2967,7 +2889,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3105,7 +3026,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3125,7 +3045,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3150,7 +3069,6 @@ "ctxt": 0 }, "value": "Person", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3180,7 +3098,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3222,7 +3139,6 @@ "ctxt": 0 }, "value": "age", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3264,7 +3180,6 @@ "ctxt": 0 }, "value": "location", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3309,7 +3224,6 @@ "ctxt": 0 }, "value": "LazyPerson", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3328,7 +3242,6 @@ "ctxt": 0 }, "value": "Lazyify", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3354,7 +3267,6 @@ "ctxt": 0 }, "value": "Person", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3379,7 +3291,6 @@ "ctxt": 0 }, "value": "Example", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3407,7 +3318,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3449,7 +3359,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3494,7 +3403,6 @@ "ctxt": 0 }, "value": "PickByValueType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3520,7 +3428,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3541,7 +3448,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3572,7 +3478,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3598,7 +3503,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3636,7 +3540,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3656,7 +3559,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3677,7 +3579,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3697,7 +3598,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3736,7 +3636,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3756,7 +3655,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3780,7 +3678,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3799,7 +3696,6 @@ "ctxt": 0 }, "value": "PickByValueType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3825,7 +3721,6 @@ "ctxt": 0 }, "value": "Example", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3868,6 +3763,7 @@ "ctxt": 0 }, "value": "e1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3890,13 +3786,11 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -3916,7 +3810,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -3956,7 +3849,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3983,7 +3875,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4015,6 +3906,7 @@ "ctxt": 0 }, "value": "e2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4037,13 +3929,11 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -4078,7 +3968,6 @@ "ctxt": 0 }, "value": "Car", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4108,7 +3997,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4150,7 +4038,6 @@ "ctxt": 0 }, "value": "seats", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4192,7 +4079,6 @@ "ctxt": 0 }, "value": "engine", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4221,7 +4107,6 @@ "ctxt": 0 }, "value": "Engine", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4245,7 +4130,6 @@ "ctxt": 0 }, "value": "wheels", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4281,7 +4165,6 @@ "ctxt": 0 }, "value": "Wheel", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4308,7 +4191,6 @@ "ctxt": 0 }, "value": "Engine", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4338,7 +4220,6 @@ "ctxt": 0 }, "value": "manufacturer", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4380,7 +4261,6 @@ "ctxt": 0 }, "value": "horsepower", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4424,7 +4304,6 @@ "ctxt": 0 }, "value": "Wheel", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4454,7 +4333,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4541,7 +4419,6 @@ "ctxt": 0 }, "value": "radius", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4586,7 +4463,6 @@ "ctxt": 0 }, "value": "Primitive", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -4644,7 +4520,6 @@ "ctxt": 0 }, "value": "OnlyPrimitives", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4670,7 +4545,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4701,7 +4575,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4727,7 +4600,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4765,7 +4637,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4785,7 +4656,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4806,7 +4676,6 @@ "ctxt": 0 }, "value": "Primitive", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4826,7 +4695,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4865,7 +4733,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4885,7 +4752,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4918,6 +4784,7 @@ "ctxt": 0 }, "value": "primitiveCar", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4940,7 +4807,6 @@ "ctxt": 0 }, "value": "OnlyPrimitives", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4966,7 +4832,6 @@ "ctxt": 0 }, "value": "Car", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4974,8 +4839,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5007,6 +4871,7 @@ "ctxt": 0 }, "value": "keys", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5037,7 +4902,6 @@ "ctxt": 0 }, "value": "OnlyPrimitives", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5063,7 +4927,6 @@ "ctxt": 0 }, "value": "Car", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5072,8 +4935,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5096,7 +4958,6 @@ "ctxt": 0 }, "value": "KeysOfPrimitives", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5122,7 +4983,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5153,7 +5013,6 @@ "ctxt": 0 }, "value": "OnlyPrimitives", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5179,7 +5038,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5214,6 +5072,7 @@ "ctxt": 0 }, "value": "carKeys", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5236,7 +5095,6 @@ "ctxt": 0 }, "value": "KeysOfPrimitives", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5262,7 +5120,6 @@ "ctxt": 0 }, "value": "Car", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5270,8 +5127,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5294,7 +5150,6 @@ "ctxt": 0 }, "value": "Equal", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5320,7 +5175,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5341,7 +5195,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5394,7 +5247,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5431,7 +5283,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5451,7 +5302,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5532,7 +5382,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5569,7 +5418,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5589,7 +5437,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5684,7 +5531,6 @@ "ctxt": 0 }, "value": "If", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5710,7 +5556,6 @@ "ctxt": 0 }, "value": "Cond", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5739,7 +5584,6 @@ "ctxt": 0 }, "value": "Then", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5760,7 +5604,6 @@ "ctxt": 0 }, "value": "Else", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5790,7 +5633,6 @@ "ctxt": 0 }, "value": "Cond", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5827,7 +5669,6 @@ "ctxt": 0 }, "value": "Then", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5847,7 +5688,6 @@ "ctxt": 0 }, "value": "Else", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5870,7 +5710,6 @@ "ctxt": 0 }, "value": "GetKey", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5896,7 +5735,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5917,7 +5755,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5956,7 +5793,6 @@ "ctxt": 0 }, "value": "TP", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5982,7 +5818,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6012,7 +5847,6 @@ "ctxt": 0 }, "value": "Equal", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6046,7 +5880,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6066,7 +5899,6 @@ "ctxt": 0 }, "value": "TP", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6087,7 +5919,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6127,7 +5958,6 @@ "ctxt": 0 }, "value": "TP", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6171,7 +6001,6 @@ "ctxt": 0 }, "value": "GetKeyWithIf", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6197,7 +6026,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6218,7 +6046,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6257,7 +6084,6 @@ "ctxt": 0 }, "value": "TP", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6283,7 +6109,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6306,7 +6131,6 @@ "ctxt": 0 }, "value": "If", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6332,7 +6156,6 @@ "ctxt": 0 }, "value": "Equal", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6366,7 +6189,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6386,7 +6208,6 @@ "ctxt": 0 }, "value": "TP", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6407,7 +6228,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6430,7 +6250,6 @@ "ctxt": 0 }, "value": "TP", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6476,7 +6295,6 @@ "ctxt": 0 }, "value": "GetObjWithIf", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6502,7 +6320,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6523,7 +6340,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6554,7 +6370,6 @@ "ctxt": 0 }, "value": "TP", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6580,7 +6395,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6603,7 +6417,6 @@ "ctxt": 0 }, "value": "If", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6629,7 +6442,6 @@ "ctxt": 0 }, "value": "Equal", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6663,7 +6475,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6683,7 +6494,6 @@ "ctxt": 0 }, "value": "TP", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6704,7 +6514,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6727,7 +6536,6 @@ "ctxt": 0 }, "value": "TP", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6772,7 +6580,6 @@ "ctxt": 0 }, "value": "Task", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -6800,7 +6607,6 @@ "ctxt": 0 }, "value": "isDone", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6845,7 +6651,6 @@ "ctxt": 0 }, "value": "Schema", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -6873,7 +6678,6 @@ "ctxt": 0 }, "value": "root", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6911,7 +6715,6 @@ "ctxt": 0 }, "value": "title", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6953,7 +6756,6 @@ "ctxt": 0 }, "value": "task", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6982,7 +6784,6 @@ "ctxt": 0 }, "value": "Task", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7011,7 +6812,6 @@ "ctxt": 0 }, "value": "Task", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7040,7 +6840,6 @@ "ctxt": 0 }, "value": "Task", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7067,7 +6866,6 @@ "ctxt": 0 }, "value": "Res1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -7086,7 +6884,6 @@ "ctxt": 0 }, "value": "GetKey", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7112,7 +6909,6 @@ "ctxt": 0 }, "value": "Schema", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7148,7 +6944,6 @@ "ctxt": 0 }, "value": "Schema", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7219,7 +7014,6 @@ "ctxt": 0 }, "value": "Res2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -7238,7 +7032,6 @@ "ctxt": 0 }, "value": "GetKeyWithIf", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7264,7 +7057,6 @@ "ctxt": 0 }, "value": "Schema", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7300,7 +7092,6 @@ "ctxt": 0 }, "value": "Schema", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7371,7 +7162,6 @@ "ctxt": 0 }, "value": "Res3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -7398,7 +7188,6 @@ "ctxt": 0 }, "value": "GetObjWithIf", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7424,7 +7213,6 @@ "ctxt": 0 }, "value": "Schema", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7460,7 +7248,6 @@ "ctxt": 0 }, "value": "Schema", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeConstraints/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeConstraints/input.ts.json index 38440a807c81..9ed554274db5 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeConstraints/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeConstraints/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,7 +59,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -85,7 +84,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -105,7 +103,6 @@ "ctxt": 0 }, "value": "Extract", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -139,7 +136,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -173,8 +169,7 @@ ] } } - }, - "optional": false + } } } ], @@ -214,7 +209,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -225,7 +219,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -258,7 +251,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -285,7 +277,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -327,7 +318,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -371,7 +361,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -392,6 +381,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -414,7 +404,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -440,7 +429,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -460,7 +448,6 @@ "ctxt": 0 }, "value": "Exclude", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -494,7 +481,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -528,8 +514,7 @@ ] } } - }, - "optional": false + } } } ], @@ -569,7 +554,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -580,7 +564,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -613,7 +596,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -640,7 +622,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -682,7 +663,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -726,7 +706,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -747,6 +726,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -769,7 +749,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -803,7 +782,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -823,7 +801,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -868,7 +845,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -888,7 +864,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -900,8 +875,7 @@ ] } } - }, - "optional": false + } } } ], @@ -941,7 +915,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -952,7 +925,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -985,7 +957,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1012,7 +983,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1054,7 +1024,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1099,7 +1068,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1126,7 +1094,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1168,7 +1135,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1212,7 +1178,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1233,6 +1198,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1255,7 +1221,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1289,7 +1254,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1309,7 +1273,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1354,7 +1317,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1374,7 +1336,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1386,8 +1347,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1427,7 +1387,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1438,7 +1397,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1466,7 +1424,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1477,7 +1434,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1505,7 +1461,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -1516,7 +1471,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1549,7 +1503,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1576,7 +1529,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1618,7 +1570,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1663,7 +1614,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1690,7 +1640,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1732,7 +1681,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1776,7 +1724,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1797,6 +1744,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1819,7 +1767,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1853,7 +1800,6 @@ "ctxt": 0 }, "value": "Exclude", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1887,7 +1833,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1954,8 +1899,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1995,7 +1939,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -2006,7 +1949,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2034,7 +1976,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -2045,7 +1986,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2078,7 +2018,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2105,7 +2044,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2147,7 +2085,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2197,7 +2134,6 @@ "ctxt": 0 }, "value": "TargetProps", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2225,7 +2161,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2267,7 +2202,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2321,8 +2255,8 @@ "ctxt": 0 }, "value": "modifier", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -2340,6 +2274,7 @@ "ctxt": 0 }, "value": "targetProps", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2362,13 +2297,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2419,7 +2352,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null @@ -2444,8 +2376,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -2461,7 +2393,6 @@ "ctxt": 0 }, "value": "targetProps", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2490,7 +2421,6 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, "optional": false }, "property": { @@ -2501,7 +2431,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2534,7 +2463,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2552,7 +2480,6 @@ "ctxt": 0 }, "value": "TargetProps", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeErrors/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeErrors/input.ts.json index fbaf27557cd3..620775f97585 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeErrors/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeErrors/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "width", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -135,7 +132,6 @@ "ctxt": 0 }, "value": "height", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -177,7 +173,6 @@ "ctxt": 0 }, "value": "visible", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -221,7 +216,6 @@ "ctxt": 0 }, "value": "Named", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -251,7 +245,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -295,7 +288,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -325,7 +317,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -367,7 +358,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -412,7 +402,6 @@ "ctxt": 0 }, "value": "T00", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -439,7 +428,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -457,7 +445,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -493,7 +480,6 @@ "ctxt": 0 }, "value": "T01", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -520,7 +506,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -563,7 +548,6 @@ "ctxt": 0 }, "value": "T02", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -590,7 +574,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -608,7 +591,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -644,7 +626,6 @@ "ctxt": 0 }, "value": "T03", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -663,7 +644,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -689,7 +669,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -723,7 +702,6 @@ "ctxt": 0 }, "value": "T10", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -742,7 +720,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -768,7 +745,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -815,7 +791,6 @@ "ctxt": 0 }, "value": "T11", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -834,7 +809,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -860,7 +834,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -907,7 +880,6 @@ "ctxt": 0 }, "value": "T12", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -926,7 +898,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -952,7 +923,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1031,7 +1001,6 @@ "ctxt": 0 }, "value": "T13", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1050,7 +1019,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1076,7 +1044,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1104,7 +1071,6 @@ "ctxt": 0 }, "value": "Named", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1130,7 +1096,6 @@ "ctxt": 0 }, "value": "T14", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1149,7 +1114,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1175,7 +1139,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1203,7 +1166,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1229,7 +1191,6 @@ "ctxt": 0 }, "value": "T15", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1248,7 +1209,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1274,7 +1234,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1308,7 +1267,6 @@ "ctxt": 0 }, "value": "T16", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1327,7 +1285,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1353,7 +1310,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1381,7 +1337,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1402,6 +1357,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1424,13 +1380,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1473,6 +1427,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1495,7 +1450,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1521,7 +1475,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1541,7 +1494,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1549,8 +1501,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1584,7 +1535,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1604,7 +1554,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1625,6 +1574,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1647,13 +1597,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1696,6 +1644,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1718,7 +1667,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1744,7 +1692,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1764,7 +1711,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1772,8 +1718,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1807,7 +1752,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1854,7 +1798,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1875,6 +1818,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1897,13 +1841,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1946,6 +1888,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1968,7 +1911,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1994,7 +1936,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2014,7 +1955,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2022,8 +1962,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2057,7 +1996,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2083,7 +2021,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2105,7 +2042,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2126,6 +2062,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2148,13 +2085,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2197,6 +2132,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2219,7 +2155,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2245,7 +2180,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2265,7 +2199,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2273,8 +2206,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2308,7 +2240,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2334,7 +2265,6 @@ "ctxt": 0 }, "value": "Named", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2356,7 +2286,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2391,7 +2320,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2418,7 +2346,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2450,6 +2377,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2480,7 +2408,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2506,7 +2433,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2539,7 +2465,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2559,15 +2484,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2599,6 +2522,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2629,7 +2553,6 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2655,7 +2578,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2688,7 +2610,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2708,15 +2629,13 @@ "ctxt": 0 }, "value": "Q", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2748,6 +2667,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2778,7 +2698,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2796,7 +2715,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2828,7 +2746,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2848,15 +2765,13 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2890,7 +2805,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2910,7 +2824,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2954,6 +2867,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2984,7 +2898,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3010,7 +2923,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3043,7 +2955,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3063,15 +2974,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3103,6 +3012,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3133,7 +3043,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3159,7 +3068,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3192,7 +3100,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3212,15 +3119,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3252,6 +3157,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3282,7 +3188,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3308,7 +3213,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3341,7 +3245,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3361,15 +3264,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3401,6 +3302,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3431,7 +3333,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3457,7 +3358,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3490,7 +3390,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3510,15 +3409,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3552,7 +3449,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3572,7 +3468,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3616,6 +3511,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3646,7 +3542,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3672,7 +3567,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3705,7 +3599,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3725,15 +3618,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3765,6 +3656,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3795,7 +3687,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3821,7 +3712,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3861,7 +3751,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3881,7 +3770,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3889,8 +3777,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3924,7 +3811,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3944,7 +3830,6 @@ "ctxt": 0 }, "value": "objAndReadonly", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3965,6 +3850,7 @@ "ctxt": 0 }, "value": "primary", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3987,13 +3873,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4012,6 +3896,7 @@ "ctxt": 0 }, "value": "secondary", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4034,7 +3919,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4060,7 +3944,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4068,8 +3951,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4105,7 +3987,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4135,7 +4016,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4152,7 +4032,6 @@ "ctxt": 0 }, "value": "objAndPartial", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4173,6 +4052,7 @@ "ctxt": 0 }, "value": "primary", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4195,13 +4075,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4220,6 +4098,7 @@ "ctxt": 0 }, "value": "secondary", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4242,7 +4121,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4268,7 +4146,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4276,8 +4153,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4313,7 +4189,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4343,7 +4218,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4360,7 +4234,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4404,8 +4277,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4422,7 +4295,6 @@ "ctxt": 0 }, "value": "objAndReadonly", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4446,7 +4318,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -4469,7 +4340,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -4505,7 +4375,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -4553,8 +4422,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4571,7 +4440,6 @@ "ctxt": 0 }, "value": "objAndReadonly", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4595,7 +4463,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -4618,7 +4485,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -4654,7 +4520,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -4677,7 +4542,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -4725,8 +4589,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4743,7 +4607,6 @@ "ctxt": 0 }, "value": "objAndReadonly", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4767,7 +4630,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -4790,7 +4652,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -4826,7 +4687,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -4849,7 +4709,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -4872,7 +4731,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -4912,7 +4770,6 @@ "ctxt": 0 }, "value": "f21", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4956,8 +4813,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4974,7 +4831,6 @@ "ctxt": 0 }, "value": "objAndPartial", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4998,7 +4854,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -5021,7 +4876,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -5057,7 +4911,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -5105,8 +4958,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5123,7 +4976,6 @@ "ctxt": 0 }, "value": "objAndPartial", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5147,7 +4999,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -5170,7 +5021,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -5206,7 +5056,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -5229,7 +5078,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -5277,8 +5125,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5295,7 +5143,6 @@ "ctxt": 0 }, "value": "objAndPartial", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5319,7 +5166,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -5342,7 +5188,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -5378,7 +5223,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -5401,7 +5245,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -5424,7 +5267,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -5469,7 +5311,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5499,7 +5340,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5541,7 +5381,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5580,7 +5419,6 @@ "ctxt": 0 }, "value": "setState", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5601,6 +5439,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5623,13 +5462,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -5648,6 +5485,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5670,7 +5508,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5696,7 +5533,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5716,7 +5552,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5724,8 +5559,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5775,8 +5609,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -5791,7 +5625,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "body": { @@ -5832,7 +5665,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -5843,7 +5675,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -5863,7 +5694,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "property": { @@ -5874,7 +5704,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -5911,7 +5740,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5932,7 +5760,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5958,7 +5785,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5995,6 +5821,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6017,13 +5844,11 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -6043,7 +5868,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -6071,7 +5895,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -6112,7 +5935,6 @@ "ctxt": 0 }, "value": "setState", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6126,7 +5948,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -6150,7 +5971,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -6178,7 +5998,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -6220,7 +6039,6 @@ "ctxt": 0 }, "value": "setState", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6234,7 +6052,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -6258,7 +6075,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -6305,7 +6121,6 @@ "ctxt": 0 }, "value": "setState", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6319,7 +6134,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -6343,7 +6157,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -6354,7 +6167,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -6387,7 +6199,6 @@ "ctxt": 0 }, "value": "setState", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6401,7 +6212,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -6443,7 +6253,6 @@ "ctxt": 0 }, "value": "setState", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6457,7 +6266,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -6471,7 +6279,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -6501,7 +6308,6 @@ "ctxt": 0 }, "value": "setState", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6515,7 +6321,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -6539,7 +6344,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -6550,7 +6354,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -6583,7 +6386,6 @@ "ctxt": 0 }, "value": "setState", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6597,7 +6399,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -6621,7 +6422,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -6651,7 +6451,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6677,7 +6476,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "value": null, @@ -6703,7 +6501,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6734,7 +6531,6 @@ "ctxt": 0 }, "value": "setState", - "typeAnnotation": null, "optional": false }, "function": { @@ -6755,6 +6551,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6777,7 +6574,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6803,7 +6599,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6823,7 +6618,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6831,8 +6625,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6882,8 +6675,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -6898,7 +6691,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "body": { @@ -6954,7 +6746,6 @@ "ctxt": 0 }, "value": "state", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6967,7 +6758,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -6987,7 +6777,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "property": { @@ -6998,7 +6787,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -7035,7 +6823,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7061,7 +6848,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7105,7 +6891,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7141,8 +6926,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -7159,7 +6944,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -7186,7 +6970,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7227,7 +7010,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -7238,7 +7020,6 @@ "ctxt": 0 }, "value": "setState", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7264,7 +7045,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -7292,7 +7072,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -7341,7 +7120,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -7352,7 +7130,6 @@ "ctxt": 0 }, "value": "setState", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7378,7 +7155,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -7432,7 +7208,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -7443,7 +7218,6 @@ "ctxt": 0 }, "value": "setState", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7469,7 +7243,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -7480,7 +7253,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -7520,7 +7292,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -7531,7 +7302,6 @@ "ctxt": 0 }, "value": "setState", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7582,7 +7352,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -7593,7 +7362,6 @@ "ctxt": 0 }, "value": "setState", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7609,7 +7377,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -7646,7 +7413,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -7657,7 +7423,6 @@ "ctxt": 0 }, "value": "setState", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7683,7 +7448,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -7694,7 +7458,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -7734,7 +7497,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -7745,7 +7507,6 @@ "ctxt": 0 }, "value": "setState", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7771,7 +7532,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -7807,7 +7567,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -7835,7 +7594,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7872,6 +7630,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7888,8 +7647,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -7944,6 +7702,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7966,13 +7725,11 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -7992,7 +7749,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -8041,6 +7797,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8063,7 +7820,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8089,7 +7845,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8097,8 +7852,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -8118,7 +7872,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -8167,6 +7920,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8197,7 +7951,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8223,7 +7976,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8256,7 +8008,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8276,15 +8027,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -8304,7 +8053,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -8344,7 +8092,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8370,7 +8117,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8391,7 +8137,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8417,7 +8162,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8451,7 +8195,6 @@ "ctxt": 0 }, "value": "pf", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8488,7 +8231,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8506,7 +8248,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8538,7 +8279,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8558,7 +8298,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8584,7 +8323,6 @@ "ctxt": 0 }, "value": "pt", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8621,7 +8359,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8639,7 +8376,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8671,7 +8407,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8691,7 +8426,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8720,7 +8454,6 @@ "ctxt": 0 }, "value": "O", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -8748,7 +8481,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8790,7 +8522,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8844,6 +8575,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8866,13 +8598,11 @@ "ctxt": 0 }, "value": "O", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -8892,7 +8622,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -8915,7 +8644,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -8959,6 +8687,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8981,7 +8710,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9007,7 +8735,6 @@ "ctxt": 0 }, "value": "O", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9037,8 +8764,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -9058,7 +8784,6 @@ "ctxt": 0 }, "value": "pf", - "typeAnnotation": null, "optional": false }, "value": { @@ -9079,7 +8804,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -9105,7 +8829,6 @@ "ctxt": 0 }, "value": "pt", - "typeAnnotation": null, "optional": false }, "value": { @@ -9126,7 +8849,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -9149,7 +8871,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -9181,7 +8902,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9202,6 +8922,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9224,7 +8945,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9250,7 +8970,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9270,7 +8989,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9278,8 +8996,7 @@ ] } } - }, - "optional": false + } } } ], @@ -9322,8 +9039,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -9340,7 +9057,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -9351,7 +9067,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9387,7 +9102,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9408,7 +9122,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9434,7 +9147,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9456,7 +9168,6 @@ "ctxt": 0 }, "value": "test2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9477,6 +9188,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9499,7 +9211,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9525,7 +9236,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9542,8 +9252,7 @@ ] } } - }, - "optional": false + } } } ], @@ -9586,8 +9295,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -9604,7 +9313,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -9615,7 +9323,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9651,7 +9358,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9672,7 +9378,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9698,7 +9403,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeErrors2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeErrors2/input.ts.json index 2deff71ac09c..e1ec05b8be44 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeErrors2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeErrors2/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "AB", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -105,7 +103,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -163,7 +160,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -189,7 +185,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -215,7 +210,6 @@ "ctxt": 0 }, "value": "AB", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -248,7 +242,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -274,7 +267,6 @@ "ctxt": 0 }, "value": "AB", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -294,7 +286,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -339,7 +330,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -365,7 +355,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -449,7 +438,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -475,7 +463,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -498,7 +485,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -521,7 +507,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -548,7 +533,6 @@ "ctxt": 0 }, "value": "AB", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -576,7 +560,6 @@ "ctxt": 0 }, "value": "AB", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -600,7 +583,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -627,7 +609,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -645,7 +626,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -689,7 +669,6 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -715,7 +694,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -799,7 +777,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -819,7 +796,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -842,7 +818,6 @@ "ctxt": 0 }, "value": "T5", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -868,7 +843,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -982,7 +956,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1008,7 +981,6 @@ "ctxt": 0 }, "value": "AB", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1028,7 +1000,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1071,7 +1042,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1094,7 +1064,6 @@ "ctxt": 0 }, "value": "T6", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1120,7 +1089,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1194,7 +1162,6 @@ "ctxt": 0 }, "value": "L", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1286,7 +1253,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1312,7 +1278,6 @@ "ctxt": 0 }, "value": "AB", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1332,7 +1297,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1375,7 +1339,6 @@ "ctxt": 0 }, "value": "L", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1398,7 +1361,6 @@ "ctxt": 0 }, "value": "T7", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1424,7 +1386,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1498,7 +1459,6 @@ "ctxt": 0 }, "value": "L", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1558,7 +1518,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1584,7 +1543,6 @@ "ctxt": 0 }, "value": "AB", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1604,7 +1562,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1647,7 +1604,6 @@ "ctxt": 0 }, "value": "L", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeInferenceErrors/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeInferenceErrors/input.ts.json index b3a2e0399358..644ba6550237 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeInferenceErrors/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeInferenceErrors/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "ComputedOf", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -105,7 +102,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -154,7 +150,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -194,7 +188,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -215,6 +208,7 @@ "ctxt": 0 }, "value": "options", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -254,7 +248,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -283,7 +276,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -307,7 +299,6 @@ "ctxt": 0 }, "value": "computed", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -336,7 +327,6 @@ "ctxt": 0 }, "value": "ComputedOf", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -362,7 +352,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -390,7 +379,6 @@ "ctxt": 0 }, "value": "ThisType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -424,7 +412,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -444,7 +431,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -456,8 +442,7 @@ } ] } - }, - "optional": false + } } } ], @@ -493,7 +478,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -514,7 +498,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -562,7 +545,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -586,7 +568,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "value": { @@ -607,7 +588,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -630,7 +610,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -656,7 +635,6 @@ "ctxt": 0 }, "value": "computed", - "typeAnnotation": null, "optional": false }, "value": { @@ -677,7 +655,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "params": [], @@ -720,8 +697,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -746,7 +723,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -805,7 +781,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeModifiers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeModifiers/input.ts.json index 5fba4314a9d5..07d49daaba70 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeModifiers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeModifiers/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -137,7 +134,6 @@ "ctxt": 0 }, "value": "TP", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -165,7 +161,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -207,7 +202,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -252,7 +246,6 @@ "ctxt": 0 }, "value": "TR", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -280,7 +273,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -322,7 +314,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -367,7 +358,6 @@ "ctxt": 0 }, "value": "TPR", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -395,7 +385,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -437,7 +426,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -491,6 +479,7 @@ "ctxt": 0 }, "value": "v00", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -552,8 +541,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -585,6 +573,7 @@ "ctxt": 0 }, "value": "v00", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -615,14 +604,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -654,6 +641,7 @@ "ctxt": 0 }, "value": "v00", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -684,14 +672,12 @@ "ctxt": 0 }, "value": "TP", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -723,6 +709,7 @@ "ctxt": 0 }, "value": "v00", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -753,14 +740,12 @@ "ctxt": 0 }, "value": "TR", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -792,6 +777,7 @@ "ctxt": 0 }, "value": "v00", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -822,14 +808,12 @@ "ctxt": 0 }, "value": "TPR", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -861,6 +845,7 @@ "ctxt": 0 }, "value": "v01", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -883,13 +868,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -921,6 +904,7 @@ "ctxt": 0 }, "value": "v01", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -951,7 +935,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -977,7 +960,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1010,7 +992,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1030,15 +1011,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1070,6 +1049,7 @@ "ctxt": 0 }, "value": "v01", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1092,7 +1072,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1118,7 +1097,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1146,7 +1124,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1155,8 +1132,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1188,6 +1164,7 @@ "ctxt": 0 }, "value": "v01", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1210,7 +1187,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1236,7 +1212,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1262,7 +1237,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1290,7 +1264,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1322,7 +1295,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1331,8 +1303,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1364,6 +1335,7 @@ "ctxt": 0 }, "value": "v02", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1386,13 +1358,11 @@ "ctxt": 0 }, "value": "TP", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1424,6 +1394,7 @@ "ctxt": 0 }, "value": "v02", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1454,7 +1425,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1480,7 +1450,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1513,7 +1482,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1533,15 +1501,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1573,6 +1539,7 @@ "ctxt": 0 }, "value": "v02", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1595,7 +1562,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1621,7 +1587,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1629,8 +1594,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1662,6 +1626,7 @@ "ctxt": 0 }, "value": "v02", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1692,7 +1657,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1718,7 +1682,6 @@ "ctxt": 0 }, "value": "TP", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1751,7 +1714,6 @@ "ctxt": 0 }, "value": "TP", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1771,15 +1733,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1811,6 +1771,7 @@ "ctxt": 0 }, "value": "v02", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1833,7 +1794,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1859,7 +1819,6 @@ "ctxt": 0 }, "value": "TP", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1887,7 +1846,6 @@ "ctxt": 0 }, "value": "TP", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1896,8 +1854,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1929,6 +1886,7 @@ "ctxt": 0 }, "value": "v03", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1951,13 +1909,11 @@ "ctxt": 0 }, "value": "TR", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1989,6 +1945,7 @@ "ctxt": 0 }, "value": "v03", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2019,7 +1976,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2045,7 +2001,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2078,7 +2033,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2098,15 +2052,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2138,6 +2090,7 @@ "ctxt": 0 }, "value": "v03", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2160,7 +2113,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2186,7 +2138,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2194,8 +2145,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2227,6 +2177,7 @@ "ctxt": 0 }, "value": "v03", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2257,7 +2208,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2283,7 +2233,6 @@ "ctxt": 0 }, "value": "TR", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2316,7 +2265,6 @@ "ctxt": 0 }, "value": "TR", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2336,15 +2284,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2376,6 +2322,7 @@ "ctxt": 0 }, "value": "v03", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2398,7 +2345,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2424,7 +2370,6 @@ "ctxt": 0 }, "value": "TR", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2452,7 +2397,6 @@ "ctxt": 0 }, "value": "TR", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2461,8 +2405,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2494,6 +2437,7 @@ "ctxt": 0 }, "value": "v04", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2516,13 +2460,11 @@ "ctxt": 0 }, "value": "TPR", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2554,6 +2496,7 @@ "ctxt": 0 }, "value": "v04", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2584,7 +2527,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2610,7 +2552,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2643,7 +2584,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2663,15 +2603,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2703,6 +2641,7 @@ "ctxt": 0 }, "value": "v04", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2725,7 +2664,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2751,7 +2689,6 @@ "ctxt": 0 }, "value": "TR", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2759,8 +2696,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2792,6 +2728,7 @@ "ctxt": 0 }, "value": "v04", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2814,7 +2751,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2840,7 +2776,6 @@ "ctxt": 0 }, "value": "TP", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2848,8 +2783,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2881,6 +2815,7 @@ "ctxt": 0 }, "value": "v04", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2903,7 +2838,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2929,7 +2863,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2955,7 +2888,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2966,8 +2898,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2999,6 +2930,7 @@ "ctxt": 0 }, "value": "v04", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3021,7 +2953,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3047,7 +2978,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3073,7 +3003,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3084,8 +3013,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3117,6 +3045,7 @@ "ctxt": 0 }, "value": "v04", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3147,7 +3076,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3173,7 +3101,6 @@ "ctxt": 0 }, "value": "TPR", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3206,7 +3133,6 @@ "ctxt": 0 }, "value": "TPR", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3226,15 +3152,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3266,6 +3190,7 @@ "ctxt": 0 }, "value": "v04", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3288,7 +3213,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3314,7 +3238,6 @@ "ctxt": 0 }, "value": "TPR", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3342,7 +3265,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3351,8 +3273,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3375,7 +3296,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3401,7 +3321,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3432,7 +3351,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3458,7 +3376,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3492,7 +3409,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3529,7 +3445,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3549,7 +3464,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3578,7 +3492,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3606,7 +3519,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3644,7 +3556,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3691,7 +3602,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3729,7 +3639,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3779,7 +3688,6 @@ "ctxt": 0 }, "value": "BP", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3807,7 +3715,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3845,7 +3752,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3892,7 +3798,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3930,7 +3835,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3980,7 +3884,6 @@ "ctxt": 0 }, "value": "BR", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -4008,7 +3911,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4046,7 +3948,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4093,7 +3994,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4131,7 +4031,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4181,7 +4080,6 @@ "ctxt": 0 }, "value": "BPR", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -4209,7 +4107,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4247,7 +4144,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4294,7 +4190,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4332,7 +4227,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4391,6 +4285,7 @@ "ctxt": 0 }, "value": "b00", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4452,8 +4347,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -4485,6 +4379,7 @@ "ctxt": 0 }, "value": "b00", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4515,14 +4410,12 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4554,6 +4447,7 @@ "ctxt": 0 }, "value": "b00", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4584,14 +4478,12 @@ "ctxt": 0 }, "value": "BP", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4623,6 +4515,7 @@ "ctxt": 0 }, "value": "b00", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4653,14 +4546,12 @@ "ctxt": 0 }, "value": "BR", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4692,6 +4583,7 @@ "ctxt": 0 }, "value": "b00", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4722,14 +4614,12 @@ "ctxt": 0 }, "value": "BPR", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4761,6 +4651,7 @@ "ctxt": 0 }, "value": "b01", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4783,13 +4674,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -4821,6 +4710,7 @@ "ctxt": 0 }, "value": "b01", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4851,7 +4741,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4877,7 +4766,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4910,7 +4798,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4930,15 +4817,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4970,6 +4855,7 @@ "ctxt": 0 }, "value": "b01", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4992,7 +4878,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5018,7 +4903,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5046,7 +4930,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5055,8 +4938,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5088,6 +4970,7 @@ "ctxt": 0 }, "value": "b01", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5110,7 +4993,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5136,7 +5018,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5162,7 +5043,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5190,7 +5070,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5222,7 +5101,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5231,8 +5109,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5264,6 +5141,7 @@ "ctxt": 0 }, "value": "b02", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5286,13 +5164,11 @@ "ctxt": 0 }, "value": "BP", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -5324,6 +5200,7 @@ "ctxt": 0 }, "value": "b02", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5354,7 +5231,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5380,7 +5256,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5413,7 +5288,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5433,15 +5307,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5473,6 +5345,7 @@ "ctxt": 0 }, "value": "b02", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5495,7 +5368,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5521,7 +5393,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5529,8 +5400,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5562,6 +5432,7 @@ "ctxt": 0 }, "value": "b02", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5592,7 +5463,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5618,7 +5488,6 @@ "ctxt": 0 }, "value": "BP", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5651,7 +5520,6 @@ "ctxt": 0 }, "value": "BP", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5671,15 +5539,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5711,6 +5577,7 @@ "ctxt": 0 }, "value": "b02", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5733,7 +5600,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5759,7 +5625,6 @@ "ctxt": 0 }, "value": "BP", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5787,7 +5652,6 @@ "ctxt": 0 }, "value": "BP", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5796,8 +5660,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5829,6 +5692,7 @@ "ctxt": 0 }, "value": "b03", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5851,13 +5715,11 @@ "ctxt": 0 }, "value": "BR", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -5889,6 +5751,7 @@ "ctxt": 0 }, "value": "b03", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5919,7 +5782,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5945,7 +5807,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5978,7 +5839,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5998,15 +5858,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -6038,6 +5896,7 @@ "ctxt": 0 }, "value": "b03", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6060,7 +5919,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6086,7 +5944,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6094,8 +5951,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -6127,6 +5983,7 @@ "ctxt": 0 }, "value": "b03", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6157,7 +6014,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6183,7 +6039,6 @@ "ctxt": 0 }, "value": "BR", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6216,7 +6071,6 @@ "ctxt": 0 }, "value": "BR", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6236,15 +6090,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -6276,6 +6128,7 @@ "ctxt": 0 }, "value": "b03", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6298,7 +6151,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6324,7 +6176,6 @@ "ctxt": 0 }, "value": "BR", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6352,7 +6203,6 @@ "ctxt": 0 }, "value": "BR", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6361,8 +6211,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -6394,6 +6243,7 @@ "ctxt": 0 }, "value": "b04", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6416,13 +6266,11 @@ "ctxt": 0 }, "value": "BPR", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -6454,6 +6302,7 @@ "ctxt": 0 }, "value": "b04", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6484,7 +6333,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6510,7 +6358,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6543,7 +6390,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6563,15 +6409,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -6603,6 +6447,7 @@ "ctxt": 0 }, "value": "b04", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6625,7 +6470,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6651,7 +6495,6 @@ "ctxt": 0 }, "value": "BR", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6659,8 +6502,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -6692,6 +6534,7 @@ "ctxt": 0 }, "value": "b04", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6714,7 +6557,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6740,7 +6582,6 @@ "ctxt": 0 }, "value": "BP", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6748,8 +6589,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -6781,6 +6621,7 @@ "ctxt": 0 }, "value": "b04", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6803,7 +6644,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6829,7 +6669,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6855,7 +6694,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6866,8 +6704,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -6899,6 +6736,7 @@ "ctxt": 0 }, "value": "b04", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6921,7 +6759,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6947,7 +6784,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6973,7 +6809,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6984,8 +6819,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -7017,6 +6851,7 @@ "ctxt": 0 }, "value": "b04", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7047,7 +6882,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7073,7 +6907,6 @@ "ctxt": 0 }, "value": "BPR", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7106,7 +6939,6 @@ "ctxt": 0 }, "value": "BPR", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7126,15 +6958,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -7166,6 +6996,7 @@ "ctxt": 0 }, "value": "b04", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7188,7 +7019,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7214,7 +7044,6 @@ "ctxt": 0 }, "value": "BPR", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7242,7 +7071,6 @@ "ctxt": 0 }, "value": "BPR", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7251,8 +7079,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -7275,7 +7102,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -7303,7 +7129,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7340,6 +7165,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7356,8 +7182,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -7397,7 +7222,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7418,6 +7242,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7440,7 +7265,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7466,7 +7290,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7474,8 +7297,7 @@ ] } } - }, - "optional": false + } } } ], @@ -7515,7 +7337,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -7526,7 +7347,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7583,7 +7403,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -7621,7 +7440,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7647,7 +7465,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7668,6 +7485,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7690,7 +7508,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7716,7 +7533,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7724,8 +7540,7 @@ ] } } - }, - "optional": false + } } } ], @@ -7765,7 +7580,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -7776,7 +7590,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7818,7 +7631,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -7845,7 +7657,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7871,7 +7682,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7892,6 +7702,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7914,7 +7725,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7940,7 +7750,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7948,8 +7757,7 @@ ] } } - }, - "optional": false + } } } ], @@ -7989,7 +7797,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -8000,7 +7807,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8049,7 +7855,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -8076,7 +7881,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8089,7 +7893,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8115,7 +7918,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8136,6 +7938,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8166,7 +7969,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8192,7 +7994,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8225,7 +8026,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8245,15 +8045,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -8293,7 +8091,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -8304,7 +8101,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8346,7 +8142,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -8373,7 +8168,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeOverlappingStringEnumKeys/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeOverlappingStringEnumKeys/input.ts.json index da2cbcdba94e..9c86a45d8c04 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeOverlappingStringEnumKeys/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeOverlappingStringEnumKeys/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "TerrestrialAnimalTypes", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "CAT", - "typeAnnotation": null, "optional": false }, "init": { @@ -75,7 +73,6 @@ "ctxt": 0 }, "value": "DOG", - "typeAnnotation": null, "optional": false }, "init": { @@ -120,7 +117,6 @@ "ctxt": 0 }, "value": "AlienAnimalTypes", - "typeAnnotation": null, "optional": false }, "members": [ @@ -139,7 +135,6 @@ "ctxt": 0 }, "value": "CAT", - "typeAnnotation": null, "optional": false }, "init": { @@ -183,7 +178,6 @@ "ctxt": 0 }, "value": "AnimalTypes", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -210,7 +204,6 @@ "ctxt": 0 }, "value": "TerrestrialAnimalTypes", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -230,7 +223,6 @@ "ctxt": 0 }, "value": "AlienAnimalTypes", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -253,7 +245,6 @@ "ctxt": 0 }, "value": "TerrestrialCat", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -283,7 +274,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -314,7 +304,6 @@ "ctxt": 0 }, "value": "TerrestrialAnimalTypes", - "typeAnnotation": null, "optional": false }, "right": { @@ -325,7 +314,6 @@ "ctxt": 0 }, "value": "CAT", - "typeAnnotation": null, "optional": false } }, @@ -350,7 +338,6 @@ "ctxt": 0 }, "value": "address", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -394,7 +381,6 @@ "ctxt": 0 }, "value": "AlienCat", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -424,7 +410,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -455,7 +440,6 @@ "ctxt": 0 }, "value": "AlienAnimalTypes", - "typeAnnotation": null, "optional": false }, "right": { @@ -466,7 +450,6 @@ "ctxt": 0 }, "value": "CAT", - "typeAnnotation": null, "optional": false } }, @@ -491,7 +474,6 @@ "ctxt": 0 }, "value": "planet", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -536,7 +518,6 @@ "ctxt": 0 }, "value": "Cats", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -563,7 +544,6 @@ "ctxt": 0 }, "value": "TerrestrialCat", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -583,7 +563,6 @@ "ctxt": 0 }, "value": "AlienCat", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -607,7 +586,6 @@ "ctxt": 0 }, "value": "CatMap", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -634,7 +612,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -652,7 +629,6 @@ "ctxt": 0 }, "value": "AnimalTypes", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -683,7 +659,6 @@ "ctxt": 0 }, "value": "Extract", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -709,7 +684,6 @@ "ctxt": 0 }, "value": "Cats", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -738,7 +712,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -767,7 +740,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -808,6 +780,7 @@ "ctxt": 0 }, "value": "catMap", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -830,13 +803,11 @@ "ctxt": 0 }, "value": "CatMap", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -856,7 +827,6 @@ "ctxt": 0 }, "value": "cat", - "typeAnnotation": null, "optional": false }, "value": { @@ -887,7 +857,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "value": { @@ -905,7 +874,6 @@ "ctxt": 0 }, "value": "TerrestrialAnimalTypes", - "typeAnnotation": null, "optional": false }, "property": { @@ -916,7 +884,6 @@ "ctxt": 0 }, "value": "CAT", - "typeAnnotation": null, "optional": false }, "computed": false @@ -932,7 +899,6 @@ "ctxt": 0 }, "value": "address", - "typeAnnotation": null, "optional": false }, "value": { @@ -973,7 +939,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "value": { @@ -991,7 +956,6 @@ "ctxt": 0 }, "value": "AlienAnimalTypes", - "typeAnnotation": null, "optional": false }, "property": { @@ -1002,7 +966,6 @@ "ctxt": 0 }, "value": "CAT", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1018,7 +981,6 @@ "ctxt": 0 }, "value": "planet", - "typeAnnotation": null, "optional": false }, "value": { @@ -1052,7 +1014,6 @@ "ctxt": 0 }, "value": "dog", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeRelationships/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeRelationships/input.ts.json index 46f4b439149b..1d325e9c7c97 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeRelationships/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeRelationships/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -114,14 +113,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -161,7 +158,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -172,7 +168,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -205,7 +200,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -225,7 +219,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -246,6 +239,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -268,13 +262,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -293,6 +285,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -315,13 +308,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -361,7 +352,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -372,7 +362,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -405,7 +394,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -426,7 +414,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -452,7 +439,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -474,7 +460,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -495,6 +480,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -517,13 +503,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -542,6 +526,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -564,13 +549,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -589,6 +572,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -619,14 +603,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -674,7 +656,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -685,7 +666,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -705,7 +685,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -716,7 +695,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -753,7 +731,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -764,7 +741,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -784,7 +760,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -795,7 +770,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -829,7 +803,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -850,7 +823,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -868,7 +840,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -889,7 +860,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -910,6 +880,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -932,13 +903,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -957,6 +926,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -979,13 +949,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1004,6 +972,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1026,13 +995,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1080,7 +1047,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1091,7 +1057,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1111,7 +1076,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -1122,7 +1086,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1159,7 +1122,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -1170,7 +1132,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1190,7 +1151,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1201,7 +1161,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1235,7 +1194,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1256,7 +1214,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1274,7 +1231,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1296,7 +1252,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1322,7 +1277,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1344,7 +1298,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1365,6 +1318,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1387,13 +1341,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1412,6 +1364,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1434,13 +1387,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1459,6 +1410,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1489,14 +1441,12 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -1544,7 +1494,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1555,7 +1504,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1575,7 +1523,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -1586,7 +1533,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1623,7 +1569,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -1634,7 +1579,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1654,7 +1598,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1665,7 +1608,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1699,7 +1641,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1720,7 +1661,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1738,7 +1678,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1759,7 +1698,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1780,6 +1718,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1802,13 +1741,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1827,6 +1764,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1849,13 +1787,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1874,6 +1810,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1896,13 +1833,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1950,7 +1885,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1961,7 +1895,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1981,7 +1914,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -1992,7 +1924,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -2029,7 +1960,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -2040,7 +1970,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -2060,7 +1989,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2071,7 +1999,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -2105,7 +2032,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2126,7 +2052,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2144,7 +2069,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2166,7 +2090,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2192,7 +2115,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2214,7 +2136,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2235,6 +2156,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2257,13 +2179,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2282,6 +2202,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2304,7 +2225,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2330,7 +2250,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2338,8 +2257,7 @@ ] } } - }, - "optional": false + } } }, { @@ -2358,6 +2276,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2388,14 +2307,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -2443,7 +2360,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2454,7 +2370,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -2474,7 +2389,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -2485,7 +2399,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -2522,7 +2435,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -2533,7 +2445,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -2553,7 +2464,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2564,7 +2474,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -2598,7 +2507,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2618,7 +2526,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2639,6 +2546,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2661,13 +2569,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2686,6 +2592,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2708,7 +2615,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2734,7 +2640,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2742,8 +2647,7 @@ ] } } - }, - "optional": false + } } }, { @@ -2762,6 +2666,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2784,13 +2689,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2838,7 +2741,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2849,7 +2751,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -2869,7 +2770,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -2880,7 +2780,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -2917,7 +2816,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -2928,7 +2826,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -2948,7 +2845,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2959,7 +2855,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -2993,7 +2888,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3014,7 +2908,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3040,7 +2933,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3062,7 +2954,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3083,6 +2974,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3105,13 +2997,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3130,6 +3020,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3152,7 +3043,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3178,7 +3068,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3186,8 +3075,7 @@ ] } } - }, - "optional": false + } } }, { @@ -3206,6 +3094,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3236,14 +3125,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -3291,7 +3178,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3302,7 +3188,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -3322,7 +3207,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -3333,7 +3217,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -3370,7 +3253,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -3381,7 +3263,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -3401,7 +3282,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3412,7 +3292,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -3446,7 +3325,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3467,7 +3345,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3485,7 +3362,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3506,7 +3382,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3527,6 +3402,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3549,13 +3425,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3574,6 +3448,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3596,7 +3471,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3622,7 +3496,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3630,8 +3503,7 @@ ] } } - }, - "optional": false + } } }, { @@ -3650,6 +3522,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3672,13 +3545,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3726,7 +3597,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3737,7 +3607,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -3757,7 +3626,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -3768,7 +3636,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -3805,7 +3672,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -3816,7 +3682,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -3836,7 +3701,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3847,7 +3711,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -3881,7 +3744,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3902,7 +3764,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3920,7 +3781,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3942,7 +3802,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3968,7 +3827,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3990,7 +3848,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4011,6 +3868,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4033,13 +3891,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4058,6 +3914,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4080,7 +3937,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4106,7 +3962,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4114,8 +3969,7 @@ ] } } - }, - "optional": false + } } }, { @@ -4134,6 +3988,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4164,14 +4019,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -4219,7 +4072,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4230,7 +4082,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4250,7 +4101,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -4261,7 +4111,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4298,7 +4147,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -4309,7 +4157,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4329,7 +4176,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4340,7 +4186,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4374,7 +4219,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4394,7 +4238,6 @@ "ctxt": 0 }, "value": "f21", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4415,6 +4258,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4437,13 +4281,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4462,6 +4304,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4484,7 +4327,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4510,7 +4352,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4518,8 +4359,7 @@ ] } } - }, - "optional": false + } } }, { @@ -4538,6 +4378,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4560,13 +4401,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4614,7 +4453,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4625,7 +4463,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4645,7 +4482,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -4656,7 +4492,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4693,7 +4528,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -4704,7 +4538,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4724,7 +4557,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4735,7 +4567,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -4769,7 +4600,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4790,7 +4620,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4816,7 +4645,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4838,7 +4666,6 @@ "ctxt": 0 }, "value": "f22", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4859,6 +4686,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4881,13 +4709,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4906,6 +4732,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4928,7 +4755,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4954,7 +4780,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4962,8 +4787,7 @@ ] } } - }, - "optional": false + } } }, { @@ -4982,6 +4806,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5012,14 +4837,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -5067,7 +4890,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -5078,7 +4900,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -5098,7 +4919,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -5109,7 +4929,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -5146,7 +4965,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -5157,7 +4975,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -5177,7 +4994,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -5188,7 +5004,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -5222,7 +5037,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5243,7 +5057,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5261,7 +5074,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5282,7 +5094,6 @@ "ctxt": 0 }, "value": "f23", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5303,6 +5114,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5325,13 +5137,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -5350,6 +5160,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5372,7 +5183,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5398,7 +5208,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5406,8 +5215,7 @@ ] } } - }, - "optional": false + } } }, { @@ -5426,6 +5234,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5448,13 +5257,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5502,7 +5309,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -5513,7 +5319,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -5533,7 +5338,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -5544,7 +5348,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -5581,7 +5384,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -5592,7 +5394,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -5612,7 +5413,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -5623,7 +5423,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -5657,7 +5456,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5678,7 +5476,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5696,7 +5493,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5718,7 +5514,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5744,7 +5539,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5772,7 +5566,6 @@ "ctxt": 0 }, "value": "Thing", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -5800,7 +5593,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5842,7 +5634,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5881,7 +5672,6 @@ "ctxt": 0 }, "value": "f30", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5902,6 +5692,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5924,13 +5715,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -5949,6 +5738,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5971,7 +5761,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5997,7 +5786,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6005,8 +5793,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6047,8 +5834,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6058,7 +5845,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -6086,8 +5872,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6097,7 +5883,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -6129,7 +5914,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6149,7 +5933,6 @@ "ctxt": 0 }, "value": "f31", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6170,6 +5953,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6192,7 +5976,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6218,7 +6001,6 @@ "ctxt": 0 }, "value": "Thing", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6226,8 +6008,7 @@ ] } } - }, - "optional": false + } } }, { @@ -6246,6 +6027,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6268,7 +6050,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6294,7 +6075,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6302,8 +6082,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6344,8 +6123,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6355,7 +6134,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -6383,8 +6161,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6394,7 +6172,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -6426,7 +6203,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6444,7 +6220,6 @@ "ctxt": 0 }, "value": "Thing", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6465,7 +6240,6 @@ "ctxt": 0 }, "value": "f40", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6486,6 +6260,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6508,13 +6283,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -6533,6 +6306,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6555,7 +6329,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6581,7 +6354,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6589,8 +6361,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6631,8 +6402,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6642,7 +6413,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -6670,8 +6440,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6681,7 +6451,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -6713,7 +6482,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6733,7 +6501,6 @@ "ctxt": 0 }, "value": "f41", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6754,6 +6521,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6776,7 +6544,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6802,7 +6569,6 @@ "ctxt": 0 }, "value": "Thing", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6810,8 +6576,7 @@ ] } } - }, - "optional": false + } } }, { @@ -6830,6 +6595,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6852,7 +6618,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6878,7 +6643,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6886,8 +6650,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6928,8 +6691,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6939,7 +6702,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -6967,8 +6729,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6978,7 +6740,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -7010,7 +6771,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7028,7 +6788,6 @@ "ctxt": 0 }, "value": "Thing", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7055,7 +6814,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -7083,7 +6841,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7128,7 +6885,6 @@ "ctxt": 0 }, "value": "ItemMap", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -7151,6 +6907,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7167,8 +6924,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -7193,7 +6949,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7219,7 +6974,6 @@ "ctxt": 0 }, "value": "f50", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7240,6 +6994,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7262,13 +7017,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -7287,6 +7040,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7317,14 +7071,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -7367,6 +7119,7 @@ "ctxt": 0 }, "value": "item", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7389,13 +7142,11 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -7412,7 +7163,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -7423,7 +7173,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -7461,7 +7210,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -7472,7 +7220,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -7485,7 +7232,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7518,7 +7264,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7536,7 +7281,6 @@ "ctxt": 0 }, "value": "ItemMap", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7557,7 +7301,6 @@ "ctxt": 0 }, "value": "f51", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7578,6 +7321,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7600,13 +7344,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -7625,6 +7367,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7647,13 +7390,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -7696,6 +7437,7 @@ "ctxt": 0 }, "value": "item", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7718,13 +7460,11 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -7741,7 +7481,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -7752,7 +7491,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -7790,7 +7528,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -7801,7 +7538,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true @@ -7814,7 +7550,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7847,7 +7582,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7865,7 +7599,6 @@ "ctxt": 0 }, "value": "ItemMap", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7887,7 +7620,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7913,7 +7645,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7941,7 +7672,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7967,7 +7697,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7998,7 +7727,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8024,7 +7752,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8057,7 +7784,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8077,7 +7803,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8101,7 +7826,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8127,7 +7851,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8158,7 +7881,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8184,7 +7906,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8217,7 +7938,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8237,7 +7957,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8255,7 +7974,6 @@ "ctxt": 0 }, "value": "f60", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8276,6 +7994,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8298,7 +8017,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8324,7 +8042,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8332,8 +8049,7 @@ ] } } - }, - "optional": false + } } }, { @@ -8352,6 +8068,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8374,7 +8091,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8400,7 +8116,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8408,8 +8123,7 @@ ] } } - }, - "optional": false + } } } ], @@ -8450,8 +8164,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -8461,7 +8175,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -8489,8 +8202,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -8500,7 +8213,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -8532,7 +8244,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8558,7 +8269,6 @@ "ctxt": 0 }, "value": "Identity", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8584,7 +8294,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8615,7 +8324,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8641,7 +8349,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8674,7 +8381,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8694,7 +8400,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8712,7 +8417,6 @@ "ctxt": 0 }, "value": "f61", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8733,6 +8437,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8755,7 +8460,6 @@ "ctxt": 0 }, "value": "Identity", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8781,7 +8485,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8789,8 +8492,7 @@ ] } } - }, - "optional": false + } } }, { @@ -8809,6 +8511,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8831,7 +8534,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8857,7 +8559,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8865,8 +8566,7 @@ ] } } - }, - "optional": false + } } } ], @@ -8907,8 +8607,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -8918,7 +8618,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -8946,8 +8645,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -8957,7 +8656,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -8989,7 +8687,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9009,7 +8706,6 @@ "ctxt": 0 }, "value": "f62", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9030,6 +8726,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9052,7 +8749,6 @@ "ctxt": 0 }, "value": "Identity", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9078,7 +8774,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9086,8 +8781,7 @@ ] } } - }, - "optional": false + } } }, { @@ -9106,6 +8800,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9128,7 +8823,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9154,7 +8848,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9162,8 +8855,7 @@ ] } } - }, - "optional": false + } } } ], @@ -9204,8 +8896,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -9215,7 +8907,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -9243,8 +8934,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -9254,7 +8945,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -9286,7 +8976,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9306,7 +8995,6 @@ "ctxt": 0 }, "value": "f70", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9327,6 +9015,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9357,7 +9046,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9383,7 +9071,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9416,7 +9103,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9436,15 +9122,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -9463,6 +9147,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9493,7 +9178,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9519,7 +9203,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9552,7 +9235,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9572,15 +9254,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -9621,8 +9301,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -9632,7 +9312,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -9660,8 +9339,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -9671,7 +9350,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -9703,7 +9381,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9723,7 +9400,6 @@ "ctxt": 0 }, "value": "f71", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9744,6 +9420,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9774,7 +9451,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9800,7 +9476,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9833,7 +9508,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9853,15 +9527,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -9880,6 +9552,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9910,7 +9583,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9936,7 +9608,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9969,7 +9640,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9989,15 +9659,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -10038,8 +9706,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -10049,7 +9717,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -10077,8 +9744,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -10088,7 +9755,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -10120,7 +9786,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10141,7 +9806,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10159,7 +9823,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10180,7 +9843,6 @@ "ctxt": 0 }, "value": "f72", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10201,6 +9863,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10231,7 +9894,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10257,7 +9919,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10290,7 +9951,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10310,15 +9970,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -10337,6 +9995,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10367,7 +10026,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10393,7 +10051,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10426,7 +10083,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10446,15 +10102,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -10495,8 +10149,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -10506,7 +10160,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -10534,8 +10187,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -10545,7 +10198,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -10577,7 +10229,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10598,7 +10249,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10616,7 +10266,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10637,7 +10286,6 @@ "ctxt": 0 }, "value": "f73", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10658,6 +10306,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10688,7 +10337,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10706,7 +10354,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10738,7 +10385,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10758,15 +10404,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -10785,6 +10429,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10815,7 +10460,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10841,7 +10485,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10874,7 +10517,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10894,15 +10536,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -10943,8 +10583,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -10954,7 +10594,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -10982,8 +10621,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -10993,7 +10632,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -11025,7 +10663,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -11046,7 +10683,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -11072,7 +10708,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11094,7 +10729,6 @@ "ctxt": 0 }, "value": "f74", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -11115,6 +10749,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11145,7 +10780,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -11163,7 +10797,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11195,7 +10828,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11215,15 +10847,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -11242,6 +10872,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11272,7 +10903,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -11298,7 +10928,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11331,7 +10960,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11351,15 +10979,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -11400,8 +11026,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -11411,7 +11037,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -11439,8 +11064,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -11450,7 +11075,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -11482,7 +11106,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -11503,7 +11126,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -11521,7 +11143,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11543,7 +11164,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -11569,7 +11189,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11591,7 +11210,6 @@ "ctxt": 0 }, "value": "f75", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -11612,6 +11230,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11642,7 +11261,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -11660,7 +11278,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11692,7 +11309,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11712,15 +11328,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -11739,6 +11353,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11769,7 +11384,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -11795,7 +11409,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11828,7 +11441,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11848,15 +11460,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -11897,8 +11507,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -11908,7 +11518,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -11936,8 +11545,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -11947,7 +11556,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -11979,7 +11587,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -12000,7 +11607,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -12018,7 +11624,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12040,7 +11645,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -12066,7 +11670,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12088,7 +11691,6 @@ "ctxt": 0 }, "value": "f76", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -12109,6 +11711,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12139,7 +11742,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -12157,7 +11759,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12189,7 +11790,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12209,15 +11809,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -12236,6 +11834,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12266,7 +11865,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -12284,7 +11882,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12316,7 +11913,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12336,15 +11932,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -12385,8 +11979,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -12396,7 +11990,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -12424,8 +12017,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -12435,7 +12028,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -12467,7 +12059,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -12488,7 +12079,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -12506,7 +12096,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12528,7 +12117,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -12554,7 +12142,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12576,7 +12163,6 @@ "ctxt": 0 }, "value": "f80", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -12597,6 +12183,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12619,13 +12206,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -12658,7 +12243,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -12689,7 +12273,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -12719,7 +12302,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -12745,7 +12327,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12765,7 +12346,6 @@ "ctxt": 0 }, "value": "f81", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -12786,6 +12366,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12808,13 +12389,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -12833,6 +12412,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12855,13 +12435,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -12901,7 +12479,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -12912,7 +12489,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -12945,7 +12521,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -12966,7 +12541,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -12992,7 +12566,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13024,7 +12597,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13058,7 +12630,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13078,7 +12649,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13099,7 +12669,6 @@ "ctxt": 0 }, "value": "f82", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -13120,6 +12689,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13142,13 +12712,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -13167,6 +12735,7 @@ "ctxt": 0 }, "value": "k1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13189,13 +12758,11 @@ "ctxt": 0 }, "value": "K1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -13214,6 +12781,7 @@ "ctxt": 0 }, "value": "k2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13236,13 +12804,11 @@ "ctxt": 0 }, "value": "K2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -13289,7 +12855,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -13300,7 +12865,6 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, "optional": false }, "computed": true @@ -13313,7 +12877,6 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, "optional": false }, "computed": true @@ -13346,7 +12909,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -13367,7 +12929,6 @@ "ctxt": 0 }, "value": "K1", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -13393,7 +12954,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13416,7 +12976,6 @@ "ctxt": 0 }, "value": "K2", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -13450,7 +13009,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13470,7 +13028,6 @@ "ctxt": 0 }, "value": "K1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13503,7 +13060,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13545,7 +13101,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13565,7 +13120,6 @@ "ctxt": 0 }, "value": "K1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13586,7 +13140,6 @@ "ctxt": 0 }, "value": "K2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13613,7 +13166,6 @@ "ctxt": 0 }, "value": "Numeric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13639,7 +13191,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -13670,7 +13221,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -13696,7 +13246,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13727,7 +13276,6 @@ "ctxt": 0 }, "value": "f90", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -13771,6 +13319,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13793,7 +13342,6 @@ "ctxt": 0 }, "value": "Numeric", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13819,7 +13367,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13827,8 +13374,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -13848,7 +13394,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -13894,7 +13439,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -13921,7 +13465,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -13965,7 +13508,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -14013,7 +13555,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -14032,7 +13573,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14066,7 +13606,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -14093,7 +13632,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -14147,7 +13685,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14173,7 +13710,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeWithAny/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeWithAny/input.ts.json index bb3418f1acd0..f095a644b084 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeWithAny/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypeWithAny/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "ItemMap", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -121,7 +118,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -152,7 +148,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -178,7 +173,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -203,7 +197,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -235,6 +228,7 @@ "ctxt": 0 }, "value": "x0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -260,8 +254,7 @@ "kind": "any" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -293,6 +286,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -323,7 +317,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -354,14 +347,12 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -393,6 +384,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -423,7 +415,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -454,14 +445,12 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -493,6 +482,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -523,7 +513,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -563,14 +552,12 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -602,6 +589,7 @@ "ctxt": 0 }, "value": "x4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -624,7 +612,6 @@ "ctxt": 0 }, "value": "ItemMap", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -647,8 +634,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -671,7 +657,6 @@ "ctxt": 0 }, "value": "Data", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -699,7 +684,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -744,7 +728,6 @@ "ctxt": 0 }, "value": "StrictDataMap", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -770,7 +753,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -801,7 +783,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -827,7 +808,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -852,7 +832,6 @@ "ctxt": 0 }, "value": "Data", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -884,6 +863,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -906,7 +886,6 @@ "ctxt": 0 }, "value": "StrictDataMap", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -929,8 +908,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -969,8 +947,8 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -985,7 +963,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "body": { @@ -1021,8 +998,8 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1039,7 +1016,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "property": { @@ -1050,7 +1026,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1084,8 +1059,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1102,7 +1077,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "property": { @@ -1113,7 +1087,6 @@ "ctxt": 0 }, "value": "notAValue", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypes1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypes1/input.ts.json index e80ae69fc595..fbb18d9a0055 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypes1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypes1/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -179,7 +175,6 @@ "ctxt": 0 }, "value": "T00", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -206,7 +201,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -294,7 +288,6 @@ "ctxt": 0 }, "value": "T01", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -321,7 +314,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -397,7 +389,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -420,7 +411,6 @@ "ctxt": 0 }, "value": "T02", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -447,7 +437,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -531,7 +520,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -551,7 +539,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -575,7 +562,6 @@ "ctxt": 0 }, "value": "T03", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -602,7 +588,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -628,7 +613,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -653,7 +637,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -676,7 +659,6 @@ "ctxt": 0 }, "value": "T10", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -703,7 +685,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -729,7 +710,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -762,7 +742,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -782,7 +761,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -806,7 +784,6 @@ "ctxt": 0 }, "value": "T11", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -833,7 +810,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -859,7 +835,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -892,7 +867,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -912,7 +886,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -936,7 +909,6 @@ "ctxt": 0 }, "value": "T12", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -963,7 +935,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -989,7 +960,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1022,7 +992,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1042,7 +1011,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1066,7 +1034,6 @@ "ctxt": 0 }, "value": "T13", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1093,7 +1060,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1119,7 +1085,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1152,7 +1117,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1172,7 +1136,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1196,7 +1159,6 @@ "ctxt": 0 }, "value": "T20", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1223,7 +1185,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1249,7 +1210,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1290,7 +1250,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1310,7 +1269,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1345,7 +1303,6 @@ "ctxt": 0 }, "value": "T21", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1372,7 +1329,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1398,7 +1354,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1423,7 +1378,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1457,7 +1411,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1477,7 +1430,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1504,7 +1456,6 @@ "ctxt": 0 }, "value": "T30", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1531,7 +1482,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1583,7 +1533,6 @@ "ctxt": 0 }, "value": "T31", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1610,7 +1559,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1662,7 +1610,6 @@ "ctxt": 0 }, "value": "T32", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1689,7 +1636,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1741,7 +1687,6 @@ "ctxt": 0 }, "value": "T33", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1768,7 +1713,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1820,7 +1764,6 @@ "ctxt": 0 }, "value": "T34", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1847,7 +1790,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1899,7 +1841,6 @@ "ctxt": 0 }, "value": "T35", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1926,7 +1867,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1978,7 +1918,6 @@ "ctxt": 0 }, "value": "T36", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2005,7 +1944,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2057,7 +1995,6 @@ "ctxt": 0 }, "value": "T37", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2084,7 +2021,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2136,7 +2072,6 @@ "ctxt": 0 }, "value": "T38", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2163,7 +2098,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2215,7 +2149,6 @@ "ctxt": 0 }, "value": "T40", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2242,7 +2175,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2285,7 +2217,6 @@ "ctxt": 0 }, "value": "T43", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2312,7 +2243,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2400,7 +2330,6 @@ "ctxt": 0 }, "value": "T44", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2427,7 +2356,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2559,7 +2487,6 @@ "ctxt": 0 }, "value": "T47", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2586,7 +2513,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2721,7 +2647,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2758,7 +2683,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2796,7 +2720,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2822,7 +2745,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2854,7 +2776,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2891,7 +2812,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2937,7 +2857,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2963,7 +2882,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2995,7 +2913,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3032,7 +2949,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3078,7 +2994,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3104,7 +3019,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3136,7 +3050,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3173,7 +3086,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3191,7 +3103,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3230,7 +3141,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3256,7 +3166,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3303,8 +3212,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3321,7 +3230,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3356,8 +3264,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3374,7 +3282,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3409,8 +3316,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3427,7 +3334,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3462,8 +3368,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3480,7 +3386,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypes2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypes2/input.ts.json index 68036ef12f7a..70a38f93d646 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypes2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypes2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "verifyLibTypes", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,6 +59,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -82,7 +82,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -108,7 +107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -116,8 +114,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -149,6 +146,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -179,7 +177,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -205,7 +202,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -238,7 +234,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -258,15 +253,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -298,6 +291,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -320,7 +314,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -346,7 +339,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -354,8 +346,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -387,6 +378,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -417,7 +409,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -443,7 +434,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -476,7 +466,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -496,15 +485,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -536,6 +523,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -558,7 +546,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -584,7 +571,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -604,7 +590,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -612,8 +597,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -645,6 +629,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -675,7 +660,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -693,7 +677,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -725,7 +708,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -745,15 +727,13 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -785,6 +765,7 @@ "ctxt": 0 }, "value": "x4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -807,7 +788,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -833,7 +813,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -853,7 +832,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -861,8 +839,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -894,6 +871,7 @@ "ctxt": 0 }, "value": "x4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -924,7 +902,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -942,7 +919,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -966,14 +942,12 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1007,7 +981,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1028,7 +1001,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1054,7 +1026,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1077,7 +1048,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1103,7 +1073,6 @@ "ctxt": 0 }, "value": "Proxy", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1129,7 +1098,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1161,7 +1129,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1189,7 +1156,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1213,7 +1179,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1227,6 +1192,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1249,13 +1215,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1296,7 +1260,6 @@ "ctxt": 0 }, "value": "Proxify", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1322,7 +1285,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1353,7 +1315,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1379,7 +1340,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1404,7 +1364,6 @@ "ctxt": 0 }, "value": "Proxy", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1438,7 +1397,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1458,7 +1416,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1485,7 +1442,6 @@ "ctxt": 0 }, "value": "DeepReadonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1511,7 +1467,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1542,7 +1497,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1568,7 +1522,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1593,7 +1546,6 @@ "ctxt": 0 }, "value": "DeepReadonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1627,7 +1579,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1647,7 +1598,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1668,7 +1618,6 @@ "ctxt": 0 }, "value": "assign", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1689,6 +1638,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1711,13 +1661,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1736,6 +1684,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1758,7 +1707,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1784,7 +1732,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1792,8 +1739,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1829,7 +1775,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1865,7 +1810,6 @@ "ctxt": 0 }, "value": "freeze", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1886,6 +1830,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1908,13 +1853,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1950,7 +1893,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1980,7 +1922,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2006,7 +1947,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2026,7 +1966,6 @@ "ctxt": 0 }, "value": "pick", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2047,6 +1986,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2069,13 +2009,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2106,8 +2044,8 @@ "ctxt": 0 }, "value": "keys", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2138,7 +2076,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2180,7 +2117,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2201,7 +2137,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2227,7 +2162,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2259,7 +2193,6 @@ "ctxt": 0 }, "value": "Pick", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2285,7 +2218,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2305,7 +2237,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2325,7 +2256,6 @@ "ctxt": 0 }, "value": "mapObject", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2346,6 +2276,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2368,7 +2299,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2394,7 +2324,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2414,7 +2343,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2422,8 +2350,7 @@ ] } } - }, - "optional": false + } } }, { @@ -2442,6 +2369,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2465,6 +2393,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2487,13 +2416,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2519,15 +2446,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -2563,7 +2488,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2592,7 +2516,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2613,7 +2536,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2643,7 +2565,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2669,7 +2590,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2689,7 +2609,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2709,7 +2628,6 @@ "ctxt": 0 }, "value": "proxify", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2730,6 +2648,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2752,13 +2671,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2794,7 +2711,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2824,7 +2740,6 @@ "ctxt": 0 }, "value": "Proxify", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2850,7 +2765,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2875,7 +2789,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2905,7 +2818,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2947,7 +2859,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2991,7 +2902,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3021,7 +2931,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3063,7 +2972,6 @@ "ctxt": 0 }, "value": "width", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3105,7 +3013,6 @@ "ctxt": 0 }, "value": "height", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3147,7 +3054,6 @@ "ctxt": 0 }, "value": "location", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3176,7 +3082,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3202,7 +3107,6 @@ "ctxt": 0 }, "value": "PartialShape", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3232,7 +3136,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3274,7 +3177,6 @@ "ctxt": 0 }, "value": "width", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3316,7 +3218,6 @@ "ctxt": 0 }, "value": "height", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3358,7 +3259,6 @@ "ctxt": 0 }, "value": "location", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3387,7 +3287,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3413,7 +3312,6 @@ "ctxt": 0 }, "value": "ReadonlyShape", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3443,7 +3341,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3485,7 +3382,6 @@ "ctxt": 0 }, "value": "width", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3527,7 +3423,6 @@ "ctxt": 0 }, "value": "height", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3569,7 +3464,6 @@ "ctxt": 0 }, "value": "location", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3598,7 +3492,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3619,7 +3512,6 @@ "ctxt": 0 }, "value": "f0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3640,6 +3532,7 @@ "ctxt": 0 }, "value": "s1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3662,13 +3555,11 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3687,6 +3578,7 @@ "ctxt": 0 }, "value": "s2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3709,13 +3601,11 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3755,7 +3645,6 @@ "ctxt": 0 }, "value": "assign", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3769,7 +3658,6 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, "optional": false } }, @@ -3793,7 +3681,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -3840,7 +3727,6 @@ "ctxt": 0 }, "value": "assign", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3854,7 +3740,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } }, @@ -3878,7 +3763,6 @@ "ctxt": 0 }, "value": "width", - "typeAnnotation": null, "optional": false }, "value": { @@ -3901,7 +3785,6 @@ "ctxt": 0 }, "value": "height", - "typeAnnotation": null, "optional": false }, "value": { @@ -3938,7 +3821,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3959,6 +3841,7 @@ "ctxt": 0 }, "value": "shape", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3981,13 +3864,11 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4030,6 +3911,7 @@ "ctxt": 0 }, "value": "frozen", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4052,13 +3934,11 @@ "ctxt": 0 }, "value": "ReadonlyShape", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -4090,6 +3970,7 @@ "ctxt": 0 }, "value": "frozen", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4112,7 +3993,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4138,7 +4018,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4146,8 +4025,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4179,8 +4057,8 @@ "ctxt": 0 }, "value": "frozen", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4197,7 +4075,6 @@ "ctxt": 0 }, "value": "freeze", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4211,7 +4088,6 @@ "ctxt": 0 }, "value": "shape", - "typeAnnotation": null, "optional": false } } @@ -4239,7 +4115,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4260,6 +4135,7 @@ "ctxt": 0 }, "value": "shape", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4282,13 +4158,11 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4331,6 +4205,7 @@ "ctxt": 0 }, "value": "partial", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4353,13 +4228,11 @@ "ctxt": 0 }, "value": "PartialShape", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -4391,6 +4264,7 @@ "ctxt": 0 }, "value": "partial", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4413,7 +4287,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4439,7 +4312,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4447,8 +4319,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4480,6 +4351,7 @@ "ctxt": 0 }, "value": "partial", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4502,7 +4374,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4528,7 +4399,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4536,8 +4406,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -4569,7 +4438,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4590,6 +4458,7 @@ "ctxt": 0 }, "value": "shape", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4612,13 +4481,11 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4661,8 +4528,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4679,7 +4546,6 @@ "ctxt": 0 }, "value": "pick", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4693,7 +4559,6 @@ "ctxt": 0 }, "value": "shape", - "typeAnnotation": null, "optional": false } }, @@ -4755,7 +4620,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4799,8 +4663,8 @@ "ctxt": 0 }, "value": "rec", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -4820,7 +4684,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -4848,7 +4711,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -4876,7 +4738,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -4925,8 +4786,8 @@ "ctxt": 0 }, "value": "lengths", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4943,7 +4804,6 @@ "ctxt": 0 }, "value": "mapObject", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4957,7 +4817,6 @@ "ctxt": 0 }, "value": "rec", - "typeAnnotation": null, "optional": false } }, @@ -4979,8 +4838,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4998,7 +4857,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -5009,7 +4867,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5044,7 +4901,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5065,6 +4921,7 @@ "ctxt": 0 }, "value": "shape", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5087,13 +4944,11 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5136,8 +4991,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5154,7 +5009,6 @@ "ctxt": 0 }, "value": "proxify", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5168,7 +5022,6 @@ "ctxt": 0 }, "value": "shape", - "typeAnnotation": null, "optional": false } } @@ -5204,8 +5057,8 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5236,7 +5089,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -5247,7 +5099,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5260,7 +5111,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5308,7 +5158,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -5319,7 +5168,6 @@ "ctxt": 0 }, "value": "width", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5332,7 +5180,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5371,7 +5218,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5392,6 +5238,7 @@ "ctxt": 0 }, "value": "shape", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5414,7 +5261,6 @@ "ctxt": 0 }, "value": "DeepReadonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5440,7 +5286,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5448,8 +5293,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5492,8 +5336,8 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -5510,7 +5354,6 @@ "ctxt": 0 }, "value": "shape", - "typeAnnotation": null, "optional": false }, "property": { @@ -5521,7 +5364,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5555,8 +5397,8 @@ "ctxt": 0 }, "value": "location", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -5573,7 +5415,6 @@ "ctxt": 0 }, "value": "shape", - "typeAnnotation": null, "optional": false }, "property": { @@ -5584,7 +5425,6 @@ "ctxt": 0 }, "value": "location", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5618,8 +5458,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -5636,7 +5476,6 @@ "ctxt": 0 }, "value": "location", - "typeAnnotation": null, "optional": false }, "property": { @@ -5647,7 +5486,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypes3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypes3/input.ts.json index 7f88c11adbfa..88943407f4ce 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypes3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypes3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -137,7 +133,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -163,7 +158,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -194,7 +188,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -220,7 +213,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -245,7 +237,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -279,7 +270,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -299,7 +289,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -320,7 +309,6 @@ "ctxt": 0 }, "value": "boxify", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -341,6 +329,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -363,13 +352,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -405,7 +392,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -435,7 +421,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -461,7 +446,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -481,7 +465,6 @@ "ctxt": 0 }, "value": "unboxify", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -502,6 +485,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -524,7 +508,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -550,7 +533,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -558,8 +540,7 @@ ] } } - }, - "optional": false + } } } ], @@ -595,7 +576,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -625,7 +605,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -647,7 +626,6 @@ "ctxt": 0 }, "value": "Bacon", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -677,7 +655,6 @@ "ctxt": 0 }, "value": "isPerfect", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -719,7 +696,6 @@ "ctxt": 0 }, "value": "weight", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -763,7 +739,6 @@ "ctxt": 0 }, "value": "BoxifiedBacon", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -793,7 +768,6 @@ "ctxt": 0 }, "value": "isPerfect", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -822,7 +796,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -864,7 +837,6 @@ "ctxt": 0 }, "value": "weight", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -893,7 +865,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -932,7 +903,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -953,6 +923,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -975,13 +946,11 @@ "ctxt": 0 }, "value": "Bacon", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1024,8 +993,8 @@ "ctxt": 0 }, "value": "bb", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1042,7 +1011,6 @@ "ctxt": 0 }, "value": "boxify", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1056,7 +1024,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1092,8 +1059,8 @@ "ctxt": 0 }, "value": "isPerfect", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1117,7 +1084,6 @@ "ctxt": 0 }, "value": "bb", - "typeAnnotation": null, "optional": false }, "property": { @@ -1128,7 +1094,6 @@ "ctxt": 0 }, "value": "isPerfect", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1141,7 +1106,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1175,8 +1139,8 @@ "ctxt": 0 }, "value": "weight", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1200,7 +1164,6 @@ "ctxt": 0 }, "value": "bb", - "typeAnnotation": null, "optional": false }, "property": { @@ -1211,7 +1174,6 @@ "ctxt": 0 }, "value": "weight", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1224,7 +1186,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1250,7 +1211,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1271,6 +1231,7 @@ "ctxt": 0 }, "value": "bb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1293,7 +1254,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1319,7 +1279,6 @@ "ctxt": 0 }, "value": "Bacon", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1327,8 +1286,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1371,8 +1329,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1389,7 +1347,6 @@ "ctxt": 0 }, "value": "unboxify", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1403,7 +1360,6 @@ "ctxt": 0 }, "value": "bb", - "typeAnnotation": null, "optional": false } } @@ -1439,8 +1395,8 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1457,7 +1413,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1468,7 +1423,6 @@ "ctxt": 0 }, "value": "isPerfect", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1502,8 +1456,8 @@ "ctxt": 0 }, "value": "weight", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1520,7 +1474,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1531,7 +1484,6 @@ "ctxt": 0 }, "value": "weight", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1557,7 +1509,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1578,6 +1529,7 @@ "ctxt": 0 }, "value": "bb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1600,13 +1552,11 @@ "ctxt": 0 }, "value": "BoxifiedBacon", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1649,8 +1599,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1667,7 +1617,6 @@ "ctxt": 0 }, "value": "unboxify", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1681,7 +1630,6 @@ "ctxt": 0 }, "value": "bb", - "typeAnnotation": null, "optional": false } } @@ -1709,7 +1657,6 @@ "ctxt": 0 }, "value": "Bacon", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1746,8 +1693,8 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1764,7 +1711,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1775,7 +1721,6 @@ "ctxt": 0 }, "value": "isPerfect", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1809,8 +1754,8 @@ "ctxt": 0 }, "value": "weight", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1827,7 +1772,6 @@ "ctxt": 0 }, "value": "bb", - "typeAnnotation": null, "optional": false }, "property": { @@ -1838,7 +1782,6 @@ "ctxt": 0 }, "value": "weight", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypes4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypes4/input.ts.json index 9ee464a9ddba..b2407735ff46 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypes4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypes4/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -82,7 +80,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -108,7 +105,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -139,7 +135,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -165,7 +160,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -190,7 +184,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -224,7 +217,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -244,7 +236,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -265,7 +256,6 @@ "ctxt": 0 }, "value": "boxify", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -286,6 +276,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -308,13 +299,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -363,7 +352,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } }, @@ -415,8 +403,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -449,7 +437,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -475,7 +462,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -520,8 +506,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -536,7 +522,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "body": { @@ -577,7 +562,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false }, "property": { @@ -588,7 +572,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -611,7 +594,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -629,7 +611,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "property": { @@ -640,7 +621,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": true @@ -668,7 +648,6 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, "optional": false } } @@ -698,7 +677,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -739,7 +717,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -769,7 +746,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -795,7 +771,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -821,7 +796,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -849,7 +823,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -894,7 +867,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -922,7 +894,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -967,7 +938,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -995,7 +965,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1034,7 +1003,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1055,6 +1023,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1085,7 +1054,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1105,7 +1073,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1125,7 +1092,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1141,8 +1107,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1182,7 +1147,6 @@ "ctxt": 0 }, "value": "boxify", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1196,7 +1160,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1227,7 +1190,6 @@ "ctxt": 0 }, "value": "T00", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1246,7 +1208,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1280,7 +1241,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1300,7 +1260,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1320,7 +1279,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1347,7 +1305,6 @@ "ctxt": 0 }, "value": "T01", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1366,7 +1323,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1400,7 +1356,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1420,7 +1375,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1440,7 +1394,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1485,7 +1438,6 @@ "ctxt": 0 }, "value": "T02", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1504,7 +1456,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1538,7 +1489,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1565,7 +1515,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1586,7 +1535,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1622,7 +1570,6 @@ "ctxt": 0 }, "value": "T03", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1641,7 +1588,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1736,7 +1682,6 @@ "ctxt": 0 }, "value": "T04", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1755,7 +1700,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1850,7 +1794,6 @@ "ctxt": 0 }, "value": "T05", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1869,7 +1812,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1971,7 +1913,6 @@ "ctxt": 0 }, "value": "BoxifiedWithSentinel", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1997,7 +1938,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2018,7 +1958,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2049,7 +1988,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2075,7 +2013,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2108,7 +2045,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2142,7 +2078,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2162,7 +2097,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2186,7 +2120,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2211,7 +2144,6 @@ "ctxt": 0 }, "value": "T10", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2230,7 +2162,6 @@ "ctxt": 0 }, "value": "BoxifiedWithSentinel", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2264,7 +2195,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2284,7 +2214,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2304,7 +2233,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2340,7 +2268,6 @@ "ctxt": 0 }, "value": "T11", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2359,7 +2286,6 @@ "ctxt": 0 }, "value": "BoxifiedWithSentinel", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2393,7 +2319,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2413,7 +2338,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2433,7 +2357,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2469,7 +2392,6 @@ "ctxt": 0 }, "value": "T12", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2488,7 +2410,6 @@ "ctxt": 0 }, "value": "BoxifiedWithSentinel", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2537,7 +2458,6 @@ "ctxt": 0 }, "value": "DeepReadonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2563,7 +2483,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2594,7 +2513,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2620,7 +2538,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2645,7 +2562,6 @@ "ctxt": 0 }, "value": "DeepReadonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2679,7 +2595,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2699,7 +2614,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2726,7 +2640,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2754,7 +2667,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2796,7 +2708,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2834,7 +2745,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2876,7 +2786,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2923,7 +2832,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2968,7 +2876,6 @@ "ctxt": 0 }, "value": "DeepReadonlyFoo", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2996,7 +2903,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3038,7 +2944,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3076,7 +2981,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3118,7 +3022,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3165,7 +3068,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3219,6 +3121,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3241,7 +3144,6 @@ "ctxt": 0 }, "value": "DeepReadonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3267,7 +3169,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3275,8 +3176,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3308,6 +3208,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3330,13 +3231,11 @@ "ctxt": 0 }, "value": "DeepReadonlyFoo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3359,7 +3258,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3387,7 +3285,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3432,7 +3329,6 @@ "ctxt": 0 }, "value": "Clone", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3458,7 +3354,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3489,7 +3384,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3530,7 +3424,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3575,7 +3468,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3595,7 +3487,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3619,7 +3510,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3638,7 +3528,6 @@ "ctxt": 0 }, "value": "Clone", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3664,7 +3553,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3698,6 +3586,7 @@ "ctxt": 0 }, "value": "z1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3720,13 +3609,11 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3758,6 +3645,7 @@ "ctxt": 0 }, "value": "z1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3780,7 +3668,6 @@ "ctxt": 0 }, "value": "Clone", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3806,7 +3693,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3814,8 +3700,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypes5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypes5/input.ts.json index 3a78f6d15b3d..9a3d6a1d1ae1 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypes5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypes5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,7 +59,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -85,7 +84,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -93,8 +91,7 @@ ] } } - }, - "optional": false + } } }, { @@ -113,6 +110,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -135,7 +133,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -161,7 +158,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -169,8 +165,7 @@ ] } } - }, - "optional": false + } } }, { @@ -189,6 +184,7 @@ "ctxt": 0 }, "value": "pr", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -211,7 +207,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -237,7 +232,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -263,7 +257,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -274,8 +267,7 @@ ] } } - }, - "optional": false + } } }, { @@ -294,6 +286,7 @@ "ctxt": 0 }, "value": "rp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -316,7 +309,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -342,7 +334,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -368,7 +359,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -379,8 +369,7 @@ ] } } - }, - "optional": false + } } } ], @@ -423,6 +412,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -445,7 +435,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -471,7 +460,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -479,8 +467,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -490,7 +477,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "definite": false @@ -522,6 +508,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -544,7 +531,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -570,7 +556,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -578,8 +563,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -589,7 +573,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "definite": false @@ -621,6 +604,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -643,7 +627,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -669,7 +652,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -677,8 +659,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -688,7 +669,6 @@ "ctxt": 0 }, "value": "pr", - "typeAnnotation": null, "optional": false }, "definite": false @@ -720,6 +700,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -742,7 +723,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -768,7 +748,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -776,8 +755,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -787,7 +765,6 @@ "ctxt": 0 }, "value": "rp", - "typeAnnotation": null, "optional": false }, "definite": false @@ -819,6 +796,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -841,7 +819,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -867,7 +844,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -875,8 +851,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -886,7 +861,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "definite": false @@ -918,6 +892,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -940,7 +915,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -966,7 +940,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -974,8 +947,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -985,7 +957,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1017,6 +988,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1039,7 +1011,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1065,7 +1036,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1073,8 +1043,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1084,7 +1053,6 @@ "ctxt": 0 }, "value": "pr", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1116,6 +1084,7 @@ "ctxt": 0 }, "value": "b4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1138,7 +1107,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1164,7 +1132,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1172,8 +1139,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1183,7 +1149,6 @@ "ctxt": 0 }, "value": "rp", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1215,6 +1180,7 @@ "ctxt": 0 }, "value": "c1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1237,7 +1203,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1263,7 +1228,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1289,7 +1253,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1300,8 +1263,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1311,7 +1273,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1343,6 +1304,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1365,7 +1327,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1391,7 +1352,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1417,7 +1377,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1428,8 +1387,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1439,7 +1397,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1471,6 +1428,7 @@ "ctxt": 0 }, "value": "c3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1493,7 +1451,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1519,7 +1476,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1545,7 +1501,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1556,8 +1511,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1567,7 +1521,6 @@ "ctxt": 0 }, "value": "pr", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1599,6 +1552,7 @@ "ctxt": 0 }, "value": "c4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1621,7 +1575,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1647,7 +1600,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1673,7 +1625,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1684,8 +1635,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1695,7 +1645,6 @@ "ctxt": 0 }, "value": "rp", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1727,6 +1676,7 @@ "ctxt": 0 }, "value": "d1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1749,7 +1699,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1775,7 +1724,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1801,7 +1749,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1812,8 +1759,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1823,7 +1769,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1855,6 +1800,7 @@ "ctxt": 0 }, "value": "d2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1877,7 +1823,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1903,7 +1848,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1929,7 +1873,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1940,8 +1883,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1951,7 +1893,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1983,6 +1924,7 @@ "ctxt": 0 }, "value": "d3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2005,7 +1947,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2031,7 +1972,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2057,7 +1997,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2068,8 +2007,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2079,7 +2017,6 @@ "ctxt": 0 }, "value": "pr", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2111,6 +2048,7 @@ "ctxt": 0 }, "value": "d4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2133,7 +2071,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2159,7 +2096,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2185,7 +2121,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2196,8 +2131,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2207,7 +2141,6 @@ "ctxt": 0 }, "value": "rp", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2241,7 +2174,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2267,7 +2199,6 @@ "ctxt": 0 }, "value": "State", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2290,6 +2221,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2306,8 +2238,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2390,7 +2321,6 @@ "ctxt": 0 }, "value": "Args1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2416,7 +2346,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2434,7 +2363,6 @@ "ctxt": 0 }, "value": "State", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2467,7 +2395,6 @@ "ctxt": 0 }, "value": "previous", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2496,7 +2423,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2522,7 +2448,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2548,7 +2473,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2578,7 +2502,6 @@ "ctxt": 0 }, "value": "current", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2607,7 +2530,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2633,7 +2555,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2659,7 +2580,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2692,7 +2612,6 @@ "ctxt": 0 }, "value": "Args2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2718,7 +2637,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2736,7 +2654,6 @@ "ctxt": 0 }, "value": "State", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2769,7 +2686,6 @@ "ctxt": 0 }, "value": "previous", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2798,7 +2714,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2824,7 +2739,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2850,7 +2764,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2880,7 +2793,6 @@ "ctxt": 0 }, "value": "current", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2909,7 +2821,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2935,7 +2846,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2961,7 +2871,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2988,7 +2897,6 @@ "ctxt": 0 }, "value": "doit", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3032,6 +2940,7 @@ "ctxt": 0 }, "value": "previous", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3054,7 +2963,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3080,7 +2988,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3088,8 +2995,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -3113,7 +3019,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -3124,7 +3029,6 @@ "ctxt": 0 }, "value": "create", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3173,6 +3077,7 @@ "ctxt": 0 }, "value": "current", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3195,7 +3100,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3221,7 +3125,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3229,8 +3132,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -3254,7 +3156,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -3265,7 +3166,6 @@ "ctxt": 0 }, "value": "create", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3314,6 +3214,7 @@ "ctxt": 0 }, "value": "args1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3336,7 +3237,6 @@ "ctxt": 0 }, "value": "Args1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3362,7 +3262,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3370,8 +3269,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -3389,7 +3287,6 @@ "ctxt": 0 }, "value": "previous", - "typeAnnotation": null, "optional": false }, { @@ -3400,7 +3297,6 @@ "ctxt": 0 }, "value": "current", - "typeAnnotation": null, "optional": false } ] @@ -3434,6 +3330,7 @@ "ctxt": 0 }, "value": "args2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3456,7 +3353,6 @@ "ctxt": 0 }, "value": "Args2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3482,7 +3378,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3490,8 +3385,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -3509,7 +3403,6 @@ "ctxt": 0 }, "value": "previous", - "typeAnnotation": null, "optional": false }, { @@ -3520,7 +3413,6 @@ "ctxt": 0 }, "value": "current", - "typeAnnotation": null, "optional": false } ] @@ -3556,7 +3448,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3574,7 +3465,6 @@ "ctxt": 0 }, "value": "State", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3601,7 +3491,6 @@ "ctxt": 0 }, "value": "State2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3629,7 +3518,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3671,7 +3559,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3716,7 +3603,6 @@ "ctxt": 0 }, "value": "Args3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3744,7 +3630,6 @@ "ctxt": 0 }, "value": "previous", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3773,7 +3658,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3799,7 +3683,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3825,7 +3708,6 @@ "ctxt": 0 }, "value": "State2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3855,7 +3737,6 @@ "ctxt": 0 }, "value": "current", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3884,7 +3765,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3910,7 +3790,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3936,7 +3815,6 @@ "ctxt": 0 }, "value": "State2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3969,7 +3847,6 @@ "ctxt": 0 }, "value": "Args4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3997,7 +3874,6 @@ "ctxt": 0 }, "value": "previous", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4026,7 +3902,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4052,7 +3927,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4078,7 +3952,6 @@ "ctxt": 0 }, "value": "State2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4108,7 +3981,6 @@ "ctxt": 0 }, "value": "current", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4137,7 +4009,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4163,7 +4034,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4189,7 +4059,6 @@ "ctxt": 0 }, "value": "State2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4216,7 +4085,6 @@ "ctxt": 0 }, "value": "doit2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4260,6 +4128,7 @@ "ctxt": 0 }, "value": "previous", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4282,7 +4151,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4308,7 +4176,6 @@ "ctxt": 0 }, "value": "State2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4316,8 +4183,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -4341,7 +4207,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -4352,7 +4217,6 @@ "ctxt": 0 }, "value": "create", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4401,6 +4265,7 @@ "ctxt": 0 }, "value": "current", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4423,7 +4288,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4449,7 +4313,6 @@ "ctxt": 0 }, "value": "State2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4457,8 +4320,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -4482,7 +4344,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -4493,7 +4354,6 @@ "ctxt": 0 }, "value": "create", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4542,6 +4402,7 @@ "ctxt": 0 }, "value": "args1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4564,13 +4425,11 @@ "ctxt": 0 }, "value": "Args3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -4588,7 +4447,6 @@ "ctxt": 0 }, "value": "previous", - "typeAnnotation": null, "optional": false }, { @@ -4599,7 +4457,6 @@ "ctxt": 0 }, "value": "current", - "typeAnnotation": null, "optional": false } ] @@ -4633,6 +4490,7 @@ "ctxt": 0 }, "value": "args2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4655,13 +4513,11 @@ "ctxt": 0 }, "value": "Args4", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -4679,7 +4535,6 @@ "ctxt": 0 }, "value": "previous", - "typeAnnotation": null, "optional": false }, { @@ -4690,7 +4545,6 @@ "ctxt": 0 }, "value": "current", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypes6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypes6/input.ts.json index f4588e093364..8f0d03c2548b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypes6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypes6/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "T00", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -105,7 +102,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -138,7 +134,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -158,7 +153,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -182,7 +176,6 @@ "ctxt": 0 }, "value": "T01", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -208,7 +201,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -239,7 +231,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -265,7 +256,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -298,7 +288,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -318,7 +307,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -342,7 +330,6 @@ "ctxt": 0 }, "value": "T02", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -368,7 +355,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -399,7 +385,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -425,7 +410,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -458,7 +442,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -478,7 +461,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -502,7 +484,6 @@ "ctxt": 0 }, "value": "T03", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -528,7 +509,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -559,7 +539,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -585,7 +564,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -618,7 +596,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -638,7 +615,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -662,7 +638,6 @@ "ctxt": 0 }, "value": "T04", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -688,7 +663,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -719,7 +693,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -745,7 +718,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -778,7 +750,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -798,7 +769,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -822,7 +792,6 @@ "ctxt": 0 }, "value": "T05", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -848,7 +817,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -879,7 +847,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -905,7 +872,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -938,7 +904,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -958,7 +923,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -982,7 +946,6 @@ "ctxt": 0 }, "value": "T06", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1008,7 +971,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1039,7 +1001,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1065,7 +1026,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1098,7 +1058,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1118,7 +1077,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1142,7 +1100,6 @@ "ctxt": 0 }, "value": "T07", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1168,7 +1125,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1199,7 +1155,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1225,7 +1180,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1258,7 +1212,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1278,7 +1231,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1302,7 +1254,6 @@ "ctxt": 0 }, "value": "T08", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1328,7 +1279,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1359,7 +1309,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1385,7 +1334,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1418,7 +1366,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1438,7 +1385,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1462,7 +1408,6 @@ "ctxt": 0 }, "value": "T09", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1488,7 +1433,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1519,7 +1463,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1545,7 +1488,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1578,7 +1520,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1598,7 +1539,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1622,7 +1562,6 @@ "ctxt": 0 }, "value": "T10", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1648,7 +1587,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1679,7 +1617,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1705,7 +1642,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1738,7 +1674,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1758,7 +1693,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1782,7 +1716,6 @@ "ctxt": 0 }, "value": "T11", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1808,7 +1741,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1839,7 +1771,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1865,7 +1796,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1898,7 +1828,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1918,7 +1847,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1942,7 +1870,6 @@ "ctxt": 0 }, "value": "T12", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1968,7 +1895,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1999,7 +1925,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2025,7 +1950,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2058,7 +1982,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2078,7 +2001,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2102,7 +2024,6 @@ "ctxt": 0 }, "value": "T13", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2128,7 +2049,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2159,7 +2079,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2185,7 +2104,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2218,7 +2136,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2238,7 +2155,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2262,7 +2178,6 @@ "ctxt": 0 }, "value": "T14", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2288,7 +2203,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2319,7 +2233,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2345,7 +2258,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2378,7 +2290,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2398,7 +2309,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2422,7 +2332,6 @@ "ctxt": 0 }, "value": "T15", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2448,7 +2357,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2479,7 +2387,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2505,7 +2412,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2538,7 +2444,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2558,7 +2463,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2576,7 +2480,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2597,6 +2500,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2619,7 +2523,6 @@ "ctxt": 0 }, "value": "Required", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2645,7 +2548,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2653,8 +2555,7 @@ ] } } - }, - "optional": false + } } }, { @@ -2673,6 +2574,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2695,13 +2597,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2720,6 +2620,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2742,7 +2643,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2768,7 +2668,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2776,8 +2675,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2818,8 +2716,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2829,7 +2727,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2857,8 +2754,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2868,7 +2765,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -2896,8 +2792,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2907,7 +2803,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -2935,8 +2830,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2946,7 +2841,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2974,8 +2868,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2985,7 +2879,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -3013,8 +2906,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3024,7 +2917,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -3052,8 +2944,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3063,7 +2955,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3091,8 +2982,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3102,7 +2993,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -3130,8 +3020,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3141,7 +3031,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -3173,7 +3062,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3199,7 +3087,6 @@ "ctxt": 0 }, "value": "Denullified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3225,7 +3112,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3256,7 +3142,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3282,7 +3167,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3307,7 +3191,6 @@ "ctxt": 0 }, "value": "NonNullable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3341,7 +3224,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3361,7 +3243,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3382,7 +3263,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3403,6 +3283,7 @@ "ctxt": 0 }, "value": "w", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3425,7 +3306,6 @@ "ctxt": 0 }, "value": "Denullified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3451,7 +3331,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3459,8 +3338,7 @@ ] } } - }, - "optional": false + } } }, { @@ -3479,6 +3357,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3501,7 +3380,6 @@ "ctxt": 0 }, "value": "Required", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3527,7 +3405,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3535,8 +3412,7 @@ ] } } - }, - "optional": false + } } }, { @@ -3555,6 +3431,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3577,13 +3454,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3602,6 +3477,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3624,7 +3500,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3650,7 +3525,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3658,8 +3532,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3700,8 +3573,8 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3711,7 +3584,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false } } @@ -3739,8 +3611,8 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3750,7 +3622,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3778,8 +3649,8 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3789,7 +3660,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -3817,8 +3687,8 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3828,7 +3698,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -3856,8 +3725,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3867,7 +3736,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false } } @@ -3895,8 +3763,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3906,7 +3774,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3934,8 +3801,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3945,7 +3812,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -3973,8 +3839,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3984,7 +3850,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -4012,8 +3877,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4023,7 +3888,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false } } @@ -4051,8 +3915,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4062,7 +3926,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4090,8 +3953,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4101,7 +3964,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -4129,8 +3991,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4140,7 +4002,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -4168,8 +4029,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4179,7 +4040,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false } } @@ -4207,8 +4067,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4218,7 +4078,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4246,8 +4105,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4257,7 +4116,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -4285,8 +4143,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4296,7 +4154,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -4328,7 +4185,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4348,7 +4204,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4369,6 +4224,7 @@ "ctxt": 0 }, "value": "w", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4391,7 +4247,6 @@ "ctxt": 0 }, "value": "Denullified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4417,7 +4272,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4425,8 +4279,7 @@ ] } } - }, - "optional": false + } } }, { @@ -4445,6 +4298,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4467,7 +4321,6 @@ "ctxt": 0 }, "value": "Required", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4493,7 +4346,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4501,8 +4353,7 @@ ] } } - }, - "optional": false + } } }, { @@ -4521,6 +4372,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4543,13 +4395,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4568,6 +4418,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4590,7 +4441,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4616,7 +4466,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4624,8 +4473,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4666,8 +4514,8 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -4703,8 +4551,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -4740,8 +4588,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -4777,8 +4625,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -4818,7 +4666,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4844,7 +4691,6 @@ "ctxt": 0 }, "value": "Readwrite", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4870,7 +4716,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4901,7 +4746,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4927,7 +4771,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4960,7 +4803,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4980,7 +4822,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4998,7 +4839,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5019,6 +4859,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5041,7 +4882,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5067,7 +4907,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5075,8 +4914,7 @@ ] } } - }, - "optional": false + } } }, { @@ -5095,6 +4933,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5117,13 +4956,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -5142,6 +4979,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5164,7 +5002,6 @@ "ctxt": 0 }, "value": "Readwrite", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5190,7 +5027,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5198,8 +5034,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5240,8 +5075,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5251,7 +5086,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5279,8 +5113,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5290,7 +5124,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -5318,8 +5151,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5329,7 +5162,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -5357,8 +5189,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5368,7 +5200,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5396,8 +5227,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5407,7 +5238,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -5435,8 +5265,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5446,7 +5276,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -5474,8 +5303,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5485,7 +5314,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5513,8 +5341,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5524,7 +5352,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -5552,8 +5379,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5563,7 +5390,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -5595,7 +5421,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5621,7 +5446,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -5649,7 +5473,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5691,7 +5514,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5752,7 +5574,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5794,7 +5615,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5867,6 +5687,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5889,13 +5710,11 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -5924,7 +5743,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false }, "property": { @@ -5935,7 +5753,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5963,7 +5780,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false }, "property": { @@ -5974,7 +5790,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6002,7 +5817,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false }, "property": { @@ -6013,7 +5827,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6041,7 +5854,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false }, "property": { @@ -6052,7 +5864,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6081,8 +5892,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -6102,7 +5913,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -6142,8 +5952,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -6163,7 +5973,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -6186,7 +5995,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -6226,8 +6034,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -6247,7 +6055,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -6270,7 +6077,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -6293,7 +6099,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -6333,8 +6138,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -6354,7 +6159,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -6377,7 +6181,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -6400,7 +6203,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -6423,7 +6225,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -6465,6 +6266,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6487,7 +6289,6 @@ "ctxt": 0 }, "value": "Required", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6513,7 +6314,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6521,8 +6321,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -6551,7 +6350,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false }, "property": { @@ -6562,7 +6360,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6590,7 +6387,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false }, "property": { @@ -6601,7 +6397,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6629,7 +6424,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false }, "property": { @@ -6640,7 +6434,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6668,7 +6461,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false }, "property": { @@ -6679,7 +6471,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6708,8 +6499,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -6729,7 +6520,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -6769,8 +6559,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -6790,7 +6580,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -6813,7 +6602,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -6853,8 +6641,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -6874,7 +6662,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -6897,7 +6684,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -6920,7 +6706,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -6960,8 +6745,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -6981,7 +6766,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -7004,7 +6788,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -7027,7 +6810,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -7050,7 +6832,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -7083,7 +6864,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -7111,7 +6891,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7153,7 +6932,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7207,6 +6985,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7229,13 +7008,11 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -7272,7 +7049,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, "property": { @@ -7283,7 +7059,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7329,7 +7104,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, "property": { @@ -7340,7 +7114,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7381,6 +7154,7 @@ "ctxt": 0 }, "value": "x4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7403,7 +7177,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7429,7 +7202,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7437,8 +7209,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -7475,7 +7246,6 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, "optional": false }, "property": { @@ -7486,7 +7256,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7532,7 +7301,6 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, "optional": false }, "property": { @@ -7543,7 +7311,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7584,6 +7351,7 @@ "ctxt": 0 }, "value": "x5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7606,7 +7374,6 @@ "ctxt": 0 }, "value": "Readwrite", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7632,7 +7399,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7640,8 +7406,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -7678,7 +7443,6 @@ "ctxt": 0 }, "value": "x5", - "typeAnnotation": null, "optional": false }, "property": { @@ -7689,7 +7453,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7735,7 +7498,6 @@ "ctxt": 0 }, "value": "x5", - "typeAnnotation": null, "optional": false }, "property": { @@ -7746,7 +7508,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypesAndObjects/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypesAndObjects/input.ts.json index 630220982d41..0f45d80336d2 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypesAndObjects/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypesAndObjects/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,7 +59,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -85,7 +84,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -93,8 +91,7 @@ ] } } - }, - "optional": false + } } }, { @@ -113,6 +110,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -135,7 +133,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -161,7 +158,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -169,8 +165,7 @@ ] } } - }, - "optional": false + } } } ], @@ -213,6 +208,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -229,8 +225,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -260,8 +255,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -271,7 +266,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -299,8 +293,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -310,7 +304,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -342,7 +335,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -362,7 +354,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -383,6 +374,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -405,7 +397,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -431,7 +422,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -439,8 +429,7 @@ ] } } - }, - "optional": false + } } }, { @@ -459,6 +448,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -481,7 +471,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -507,7 +496,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -515,8 +503,7 @@ ] } } - }, - "optional": false + } } } ], @@ -559,6 +546,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -585,6 +573,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -601,8 +590,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -631,8 +619,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -662,8 +649,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -673,7 +660,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -701,8 +687,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -712,7 +698,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -744,7 +729,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -764,7 +748,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -785,6 +768,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -807,7 +791,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -833,7 +816,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -841,8 +823,7 @@ ] } } - }, - "optional": false + } } } ], @@ -883,8 +864,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -924,7 +905,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -949,7 +929,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -979,7 +958,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1012,6 +990,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1028,8 +1007,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1077,7 +1055,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1119,7 +1096,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1163,7 +1139,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1190,7 +1165,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1214,7 +1188,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1244,7 +1217,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1273,7 +1245,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1299,7 +1270,6 @@ "ctxt": 0 }, "value": "Something", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1329,7 +1299,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1371,7 +1340,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1423,7 +1391,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1444,7 +1411,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1474,7 +1440,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1503,7 +1468,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1529,7 +1493,6 @@ "ctxt": 0 }, "value": "Something", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1558,7 +1521,6 @@ "ctxt": 0 }, "value": "E3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1585,7 +1547,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1609,7 +1570,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1639,7 +1599,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1668,7 +1627,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1694,7 +1652,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1718,7 +1675,6 @@ "ctxt": 0 }, "value": "Form", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1744,7 +1700,6 @@ "ctxt": 0 }, "value": "values", - "typeAnnotation": null, "optional": false }, "value": { @@ -1786,7 +1741,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1812,7 +1766,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1845,7 +1798,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1865,7 +1817,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1909,7 +1860,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypesArraysTuples/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypesArraysTuples/input.ts.json index e2d3332809e1..7b42fc1f7e4e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypesArraysTuples/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/mapped/mappedTypesArraysTuples/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -136,7 +132,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -162,7 +157,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -193,7 +187,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -219,7 +212,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -244,7 +236,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -278,7 +269,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -298,7 +288,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -325,7 +314,6 @@ "ctxt": 0 }, "value": "T00", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -344,7 +332,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -463,7 +450,6 @@ "ctxt": 0 }, "value": "T01", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -482,7 +468,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -601,7 +586,6 @@ "ctxt": 0 }, "value": "T02", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -620,7 +604,6 @@ "ctxt": 0 }, "value": "Required", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -739,7 +722,6 @@ "ctxt": 0 }, "value": "T10", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -758,7 +740,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -806,7 +787,6 @@ "ctxt": 0 }, "value": "T11", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -825,7 +805,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -873,7 +852,6 @@ "ctxt": 0 }, "value": "T12", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -892,7 +870,6 @@ "ctxt": 0 }, "value": "Required", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -940,7 +917,6 @@ "ctxt": 0 }, "value": "T13", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -959,7 +935,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -985,7 +960,6 @@ "ctxt": 0 }, "value": "ReadonlyArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1028,7 +1002,6 @@ "ctxt": 0 }, "value": "T14", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1047,7 +1020,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1073,7 +1045,6 @@ "ctxt": 0 }, "value": "ReadonlyArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1116,7 +1087,6 @@ "ctxt": 0 }, "value": "T15", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1135,7 +1105,6 @@ "ctxt": 0 }, "value": "Required", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1161,7 +1130,6 @@ "ctxt": 0 }, "value": "ReadonlyArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1204,7 +1172,6 @@ "ctxt": 0 }, "value": "T20", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1223,7 +1190,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1298,7 +1264,6 @@ "ctxt": 0 }, "value": "T21", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1317,7 +1282,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1392,7 +1356,6 @@ "ctxt": 0 }, "value": "T22", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1411,7 +1374,6 @@ "ctxt": 0 }, "value": "Required", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1486,7 +1448,6 @@ "ctxt": 0 }, "value": "T23", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1505,7 +1466,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1531,7 +1491,6 @@ "ctxt": 0 }, "value": "ReadonlyArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1593,7 +1552,6 @@ "ctxt": 0 }, "value": "T24", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1612,7 +1570,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1638,7 +1595,6 @@ "ctxt": 0 }, "value": "ReadonlyArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1700,7 +1656,6 @@ "ctxt": 0 }, "value": "T25", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1719,7 +1674,6 @@ "ctxt": 0 }, "value": "Required", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1745,7 +1699,6 @@ "ctxt": 0 }, "value": "ReadonlyArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1807,7 +1760,6 @@ "ctxt": 0 }, "value": "T30", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1826,7 +1778,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1852,7 +1803,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1903,7 +1853,6 @@ "ctxt": 0 }, "value": "T31", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1922,7 +1871,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1948,7 +1896,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1999,7 +1946,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2027,7 +1973,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2072,7 +2017,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2100,7 +2044,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2145,7 +2088,6 @@ "ctxt": 0 }, "value": "T40", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2164,7 +2106,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2198,7 +2139,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2225,7 +2165,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2246,7 +2185,6 @@ "ctxt": 0 }, "value": "ReadonlyArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2272,7 +2210,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2311,7 +2248,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2340,7 +2276,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2396,7 +2331,6 @@ "ctxt": 0 }, "value": "ReadWrite", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2422,7 +2356,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2453,7 +2386,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2479,7 +2411,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2512,7 +2443,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2532,7 +2462,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2556,7 +2485,6 @@ "ctxt": 0 }, "value": "T50", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2575,7 +2503,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2623,7 +2550,6 @@ "ctxt": 0 }, "value": "T51", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2642,7 +2568,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2719,7 +2644,6 @@ "ctxt": 0 }, "value": "T52", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2738,7 +2662,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2764,7 +2687,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2815,7 +2737,6 @@ "ctxt": 0 }, "value": "T53", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2834,7 +2755,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2860,7 +2780,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2911,7 +2830,6 @@ "ctxt": 0 }, "value": "T54", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2930,7 +2848,6 @@ "ctxt": 0 }, "value": "ReadWrite", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2956,7 +2873,6 @@ "ctxt": 0 }, "value": "Required", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2982,7 +2898,6 @@ "ctxt": 0 }, "value": "T53", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3004,7 +2919,6 @@ "ctxt": 0 }, "value": "unboxify", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3025,6 +2939,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3047,7 +2962,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3073,7 +2987,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3081,8 +2994,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3118,7 +3030,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3148,7 +3059,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3180,6 +3090,7 @@ "ctxt": 0 }, "value": "x10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3218,7 +3129,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3265,7 +3175,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3326,7 +3235,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3354,8 +3262,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3387,8 +3294,8 @@ "ctxt": 0 }, "value": "y10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3405,7 +3312,6 @@ "ctxt": 0 }, "value": "unboxify", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3419,7 +3325,6 @@ "ctxt": 0 }, "value": "x10", - "typeAnnotation": null, "optional": false } } @@ -3455,6 +3360,7 @@ "ctxt": 0 }, "value": "x11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3484,7 +3390,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3508,8 +3413,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3541,8 +3445,8 @@ "ctxt": 0 }, "value": "y11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3559,7 +3463,6 @@ "ctxt": 0 }, "value": "unboxify", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3573,7 +3476,6 @@ "ctxt": 0 }, "value": "x11", - "typeAnnotation": null, "optional": false } } @@ -3609,6 +3511,7 @@ "ctxt": 0 }, "value": "x12", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3640,7 +3543,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3669,7 +3571,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3711,7 +3612,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3740,7 +3640,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3776,8 +3675,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3809,8 +3707,8 @@ "ctxt": 0 }, "value": "y12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3827,7 +3725,6 @@ "ctxt": 0 }, "value": "unboxify", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3841,7 +3738,6 @@ "ctxt": 0 }, "value": "x12", - "typeAnnotation": null, "optional": false } } @@ -3862,7 +3758,6 @@ "ctxt": 0 }, "value": "nonpartial", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3883,6 +3778,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3905,7 +3801,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3931,7 +3826,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3939,8 +3833,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3976,7 +3869,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4006,7 +3898,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4038,6 +3929,7 @@ "ctxt": 0 }, "value": "x20", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4152,8 +4044,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -4185,8 +4076,8 @@ "ctxt": 0 }, "value": "y20", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4203,7 +4094,6 @@ "ctxt": 0 }, "value": "nonpartial", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4217,7 +4107,6 @@ "ctxt": 0 }, "value": "x20", - "typeAnnotation": null, "optional": false } } @@ -4253,6 +4142,7 @@ "ctxt": 0 }, "value": "x21", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4304,8 +4194,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4337,8 +4226,8 @@ "ctxt": 0 }, "value": "y21", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4355,7 +4244,6 @@ "ctxt": 0 }, "value": "nonpartial", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4369,7 +4257,6 @@ "ctxt": 0 }, "value": "x21", - "typeAnnotation": null, "optional": false } } @@ -4405,6 +4292,7 @@ "ctxt": 0 }, "value": "x22", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4436,7 +4324,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4497,7 +4384,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4533,8 +4419,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -4566,8 +4451,8 @@ "ctxt": 0 }, "value": "y22", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4584,7 +4469,6 @@ "ctxt": 0 }, "value": "nonpartial", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4598,7 +4482,6 @@ "ctxt": 0 }, "value": "x22", - "typeAnnotation": null, "optional": false } } @@ -4625,7 +4508,6 @@ "ctxt": 0 }, "value": "Awaited", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4651,7 +4533,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4681,7 +4562,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4701,7 +4581,6 @@ "ctxt": 0 }, "value": "PromiseLike", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4734,7 +4613,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4759,7 +4637,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4779,7 +4656,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4802,7 +4678,6 @@ "ctxt": 0 }, "value": "Awaitified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4828,7 +4703,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4859,7 +4733,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4885,7 +4758,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4910,7 +4782,6 @@ "ctxt": 0 }, "value": "Awaited", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4944,7 +4815,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4964,7 +4834,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4985,7 +4854,6 @@ "ctxt": 0 }, "value": "all", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5018,8 +4886,8 @@ "ctxt": 0 }, "value": "values", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -5043,7 +4911,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5084,7 +4951,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5130,7 +4996,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5156,7 +5021,6 @@ "ctxt": 0 }, "value": "Awaitified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5182,7 +5046,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5205,7 +5068,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5226,6 +5088,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5242,8 +5105,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -5262,6 +5124,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5284,7 +5147,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5307,8 +5169,7 @@ ] } } - }, - "optional": false + } } }, { @@ -5327,6 +5188,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5351,8 +5213,7 @@ "kind": "string" } } - }, - "optional": false + } } }, { @@ -5371,6 +5232,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5393,7 +5255,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5424,8 +5285,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5468,8 +5328,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5486,7 +5346,6 @@ "ctxt": 0 }, "value": "all", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5500,7 +5359,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -5536,8 +5394,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5554,7 +5412,6 @@ "ctxt": 0 }, "value": "all", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5568,7 +5425,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -5582,7 +5438,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -5618,8 +5473,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5636,7 +5491,6 @@ "ctxt": 0 }, "value": "all", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5650,7 +5504,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -5664,7 +5517,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -5678,7 +5530,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -5714,8 +5565,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5732,7 +5583,6 @@ "ctxt": 0 }, "value": "all", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5746,7 +5596,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -5760,7 +5609,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -5774,7 +5622,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5788,7 +5635,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -5816,7 +5662,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5837,6 +5682,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5859,7 +5705,6 @@ "ctxt": 0 }, "value": "Boxified", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5885,7 +5730,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5893,8 +5737,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5937,6 +5780,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5967,7 +5811,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6001,8 +5844,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -6026,7 +5868,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -6037,7 +5878,6 @@ "ctxt": 0 }, "value": "pop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6074,6 +5914,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6103,7 +5944,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6127,8 +5967,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -6152,7 +5991,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -6163,7 +6001,6 @@ "ctxt": 0 }, "value": "concat", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6179,7 +6016,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -6217,7 +6053,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6259,7 +6094,6 @@ "ctxt": 0 }, "value": "ElementType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6285,7 +6119,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6315,7 +6148,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6335,7 +6167,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6368,7 +6199,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6393,7 +6223,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6425,7 +6254,6 @@ "ctxt": 0 }, "value": "Mapped", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6451,7 +6279,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6482,7 +6309,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6508,7 +6334,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6541,7 +6366,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6561,7 +6385,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6585,7 +6408,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6611,7 +6433,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6634,7 +6455,6 @@ "ctxt": 0 }, "value": "ElementType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6660,7 +6480,6 @@ "ctxt": 0 }, "value": "Mapped", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6686,7 +6505,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6714,7 +6532,6 @@ "ctxt": 0 }, "value": "R1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -6733,7 +6550,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6828,7 +6644,6 @@ "ctxt": 0 }, "value": "R2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -6847,7 +6662,6 @@ "ctxt": 0 }, "value": "ElementType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6873,7 +6687,6 @@ "ctxt": 0 }, "value": "Mapped", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6965,7 +6778,6 @@ "ctxt": 0 }, "value": "acceptArray", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -6986,6 +6798,7 @@ "ctxt": 0 }, "value": "arr", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7010,8 +6823,7 @@ "kind": "any" } } - }, - "optional": false + } } } ], @@ -7053,7 +6865,6 @@ "ctxt": 0 }, "value": "mapArray", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -7074,6 +6885,7 @@ "ctxt": 0 }, "value": "arr", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7096,13 +6908,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -7138,7 +6948,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7184,7 +6993,6 @@ "ctxt": 0 }, "value": "Mapped", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7210,7 +7018,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7230,7 +7037,6 @@ "ctxt": 0 }, "value": "acceptMappedArray", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7251,6 +7057,7 @@ "ctxt": 0 }, "value": "arr", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7273,13 +7080,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -7319,7 +7124,6 @@ "ctxt": 0 }, "value": "acceptArray", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7340,7 +7144,6 @@ "ctxt": 0 }, "value": "mapArray", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7354,7 +7157,6 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, "optional": false } } @@ -7393,7 +7195,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7435,7 +7236,6 @@ "ctxt": 0 }, "value": "Unconstrained", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7461,7 +7261,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7484,7 +7283,6 @@ "ctxt": 0 }, "value": "ElementType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7510,7 +7308,6 @@ "ctxt": 0 }, "value": "Mapped", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7536,7 +7333,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7564,7 +7360,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -7583,7 +7378,6 @@ "ctxt": 0 }, "value": "Unconstrained", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7678,7 +7472,6 @@ "ctxt": 0 }, "value": "Constrained", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7704,7 +7497,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7743,7 +7535,6 @@ "ctxt": 0 }, "value": "ElementType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7769,7 +7560,6 @@ "ctxt": 0 }, "value": "Mapped", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7795,7 +7585,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7823,7 +7612,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -7842,7 +7630,6 @@ "ctxt": 0 }, "value": "Constrained", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/mapped/recursiveMappedTypes/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/mapped/recursiveMappedTypes/input.ts.json index c8378db1cbc8..041b4869f865 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/mapped/recursiveMappedTypes/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/mapped/recursiveMappedTypes/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "Recurse", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -75,7 +73,6 @@ "ctxt": 0 }, "value": "Recurse", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -108,7 +105,6 @@ "ctxt": 0 }, "value": "Recurse", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -128,7 +124,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -152,7 +147,6 @@ "ctxt": 0 }, "value": "Recurse1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -179,7 +173,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -205,7 +198,6 @@ "ctxt": 0 }, "value": "Recurse2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -238,7 +230,6 @@ "ctxt": 0 }, "value": "Recurse2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -258,7 +249,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -282,7 +272,6 @@ "ctxt": 0 }, "value": "Recurse2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -309,7 +298,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -335,7 +323,6 @@ "ctxt": 0 }, "value": "Recurse1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -368,7 +355,6 @@ "ctxt": 0 }, "value": "Recurse1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -388,7 +374,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -419,7 +404,6 @@ "ctxt": 0 }, "value": "Circular", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -445,7 +429,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -476,7 +459,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -502,7 +484,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -527,7 +508,6 @@ "ctxt": 0 }, "value": "Circular", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -553,7 +533,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -580,7 +559,6 @@ "ctxt": 0 }, "value": "tup", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -677,7 +655,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -698,6 +675,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -720,7 +698,6 @@ "ctxt": 0 }, "value": "Circular", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -746,7 +723,6 @@ "ctxt": 0 }, "value": "tup", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -754,8 +730,7 @@ ] } } - }, - "optional": false + } } } ], @@ -788,7 +763,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false } } @@ -819,7 +793,6 @@ "ctxt": 0 }, "value": "tup", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -842,7 +815,6 @@ "ctxt": 0 }, "value": "DeepMap", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -868,7 +840,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -905,7 +876,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -936,7 +906,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -962,7 +931,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1002,7 +970,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1022,7 +989,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1060,7 +1026,6 @@ "ctxt": 0 }, "value": "DeepMap", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1094,7 +1059,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1114,7 +1078,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1135,7 +1098,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1158,7 +1120,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1182,7 +1143,6 @@ "ctxt": 0 }, "value": "tpl", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1305,7 +1265,6 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1351,7 +1310,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1370,7 +1328,6 @@ "ctxt": 0 }, "value": "DeepMap", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1396,7 +1353,6 @@ "ctxt": 0 }, "value": "tpl", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1430,7 +1386,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1449,7 +1404,6 @@ "ctxt": 0 }, "value": "DeepMap", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1475,7 +1429,6 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1509,7 +1462,6 @@ "ctxt": 0 }, "value": "Transform", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1535,7 +1487,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1566,7 +1517,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1592,7 +1542,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1617,7 +1566,6 @@ "ctxt": 0 }, "value": "Transform", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1651,7 +1599,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1671,7 +1618,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1697,7 +1643,6 @@ "ctxt": 0 }, "value": "User", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1727,7 +1672,6 @@ "ctxt": 0 }, "value": "avatar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1771,7 +1715,6 @@ "ctxt": 0 }, "value": "Guest", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1801,7 +1744,6 @@ "ctxt": 0 }, "value": "displayName", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1845,7 +1787,6 @@ "ctxt": 0 }, "value": "Product", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1875,7 +1816,6 @@ "ctxt": 0 }, "value": "users", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1926,7 +1866,6 @@ "ctxt": 0 }, "value": "User", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1946,7 +1885,6 @@ "ctxt": 0 }, "value": "Guest", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1986,6 +1924,7 @@ "ctxt": 0 }, "value": "product", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2008,7 +1947,6 @@ "ctxt": 0 }, "value": "Transform", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2034,7 +1972,6 @@ "ctxt": 0 }, "value": "Product", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2042,8 +1979,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2072,7 +2008,6 @@ "ctxt": 0 }, "value": "product", - "typeAnnotation": null, "optional": false }, "property": { @@ -2083,7 +2018,6 @@ "ctxt": 0 }, "value": "users", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2105,7 +2039,6 @@ "ctxt": 0 }, "value": "Remap1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2131,7 +2064,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2162,7 +2094,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2188,7 +2119,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2213,7 +2143,6 @@ "ctxt": 0 }, "value": "Remap1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2247,7 +2176,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2267,7 +2195,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2294,7 +2221,6 @@ "ctxt": 0 }, "value": "Remap2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2320,7 +2246,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2350,7 +2275,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2387,7 +2311,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2413,7 +2336,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2438,7 +2360,6 @@ "ctxt": 0 }, "value": "Remap2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2472,7 +2393,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2492,7 +2412,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2517,7 +2436,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2540,7 +2458,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2559,7 +2476,6 @@ "ctxt": 0 }, "value": "Remap1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2607,7 +2523,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2626,7 +2541,6 @@ "ctxt": 0 }, "value": "Remap2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2674,7 +2588,6 @@ "ctxt": 0 }, "value": "NonOptionalKeys", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2700,7 +2613,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2739,7 +2651,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2765,7 +2676,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2814,7 +2724,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2834,7 +2743,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2864,7 +2772,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2894,7 +2801,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2918,7 +2824,6 @@ "ctxt": 0 }, "value": "Child", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2944,7 +2849,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2975,7 +2879,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2993,7 +2896,6 @@ "ctxt": 0 }, "value": "NonOptionalKeys", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3019,7 +2921,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3054,7 +2955,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3074,7 +2974,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3104,7 +3003,6 @@ "ctxt": 0 }, "value": "ListWidget", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3359,7 +3257,6 @@ "ctxt": 0 }, "value": "Child", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3385,7 +3282,6 @@ "ctxt": 0 }, "value": "ListWidget", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3416,7 +3312,6 @@ "ctxt": 0 }, "value": "ListChild", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3435,7 +3330,6 @@ "ctxt": 0 }, "value": "Child", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3461,7 +3355,6 @@ "ctxt": 0 }, "value": "ListWidget", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3495,6 +3388,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3517,13 +3411,11 @@ "ctxt": 0 }, "value": "ListChild", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3552,7 +3444,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3563,7 +3454,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3592,7 +3482,6 @@ "ctxt": 0 }, "value": "TV", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3618,7 +3507,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3639,7 +3527,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3665,7 +3552,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3705,7 +3591,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3725,7 +3610,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3746,7 +3630,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3779,7 +3662,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3813,7 +3695,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3853,7 +3734,6 @@ "ctxt": 0 }, "value": "ObjectOrArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3879,7 +3759,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3900,7 +3779,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3972,7 +3850,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3993,7 +3870,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4019,7 +3895,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4047,7 +3922,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4067,7 +3941,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4093,7 +3966,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4113,7 +3985,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4143,7 +4014,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4181,7 +4051,6 @@ "ctxt": 0 }, "value": "ThemeValue", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4207,7 +4076,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4233,7 +4101,6 @@ "ctxt": 0 }, "value": "ThemeType", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4256,7 +4123,6 @@ "ctxt": 0 }, "value": "ThemeType", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4277,7 +4143,6 @@ "ctxt": 0 }, "value": "TVal", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4323,7 +4188,6 @@ "ctxt": 0 }, "value": "ThemeType", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4343,7 +4207,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4371,7 +4234,6 @@ "ctxt": 0 }, "value": "TVal", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4416,7 +4278,6 @@ "ctxt": 0 }, "value": "ThemeType", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4436,7 +4297,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4457,7 +4317,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4490,7 +4349,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4512,7 +4370,6 @@ "ctxt": 0 }, "value": "TVal", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4535,7 +4392,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4570,7 +4426,6 @@ "ctxt": 0 }, "value": "ThemeType", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4590,7 +4445,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4611,7 +4465,6 @@ "ctxt": 0 }, "value": "ObjectOrArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4644,7 +4497,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4669,7 +4521,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4711,7 +4562,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4737,7 +4587,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4767,7 +4616,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4795,7 +4643,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4820,7 +4667,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4856,7 +4702,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/augmentedTypeAssignmentCompatIndexSignature/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/augmentedTypeAssignmentCompatIndexSignature/input.ts.json index a73f0c29048b..2f2d43e12614 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/augmentedTypeAssignmentCompatIndexSignature/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/augmentedTypeAssignmentCompatIndexSignature/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -137,7 +133,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -162,6 +157,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -178,8 +174,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -204,7 +199,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -235,7 +229,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -260,6 +253,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -276,8 +270,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -302,7 +295,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -343,8 +335,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -384,8 +376,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -438,6 +430,7 @@ "ctxt": 0 }, "value": "v1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -464,6 +457,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -480,8 +474,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -506,7 +499,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -521,8 +513,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -532,7 +523,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "definite": false @@ -564,6 +554,7 @@ "ctxt": 0 }, "value": "v2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -590,6 +581,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -606,8 +598,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -632,7 +623,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -647,8 +637,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -658,7 +647,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/augmentedTypeBracketAccessIndexSignature/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/augmentedTypeBracketAccessIndexSignature/input.ts.json index 50d9f56d85de..f2a409958af8 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/augmentedTypeBracketAccessIndexSignature/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/augmentedTypeBracketAccessIndexSignature/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -137,7 +133,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -162,6 +157,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -178,8 +174,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -204,7 +199,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -235,7 +229,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -260,6 +253,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -276,8 +270,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -302,7 +295,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -343,8 +335,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -402,8 +394,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/classWithPrivateProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/classWithPrivateProperty/input.ts.json index a4f63b13e1ae..a166510fa19d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/classWithPrivateProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/classWithPrivateProperty/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -115,7 +112,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -174,7 +170,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "function": { @@ -243,7 +238,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -299,7 +293,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": null, @@ -329,7 +322,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -398,7 +390,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "value": { @@ -471,8 +462,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -489,7 +480,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -524,6 +514,7 @@ "ctxt": 0 }, "value": "r1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -540,8 +531,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -558,7 +548,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -569,7 +558,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -603,6 +591,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -619,8 +608,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -637,7 +625,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -648,7 +635,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -682,6 +668,7 @@ "ctxt": 0 }, "value": "r3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -698,8 +685,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -716,7 +702,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -727,7 +712,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -761,6 +745,7 @@ "ctxt": 0 }, "value": "r4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -777,8 +762,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -802,7 +786,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -813,7 +796,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -850,6 +832,7 @@ "ctxt": 0 }, "value": "r5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -866,8 +849,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -891,7 +873,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -902,7 +883,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -939,6 +919,7 @@ "ctxt": 0 }, "value": "r6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -955,8 +936,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -973,7 +953,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -984,7 +963,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1018,6 +996,7 @@ "ctxt": 0 }, "value": "r7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1034,8 +1013,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1059,7 +1037,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -1070,7 +1047,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1107,6 +1083,7 @@ "ctxt": 0 }, "value": "r8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1123,8 +1100,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1148,7 +1124,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -1159,7 +1134,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/classWithProtectedProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/classWithProtectedProperty/input.ts.json index 0c6bb76f4664..03fdf23bdf2a 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/classWithProtectedProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/classWithProtectedProperty/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -115,7 +112,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -174,7 +170,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "function": { @@ -243,7 +238,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -299,7 +293,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": null, @@ -329,7 +322,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -398,7 +390,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "value": { @@ -456,7 +447,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -482,7 +472,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "function": { @@ -526,8 +515,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -544,7 +533,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -579,6 +567,7 @@ "ctxt": 0 }, "value": "r1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -595,8 +584,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -613,7 +601,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -624,7 +611,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -658,6 +644,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -674,8 +661,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -692,7 +678,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -703,7 +688,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -737,6 +721,7 @@ "ctxt": 0 }, "value": "r3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -753,8 +738,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -771,7 +755,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -782,7 +765,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -816,6 +798,7 @@ "ctxt": 0 }, "value": "r4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -832,8 +815,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -857,7 +839,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -868,7 +849,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -905,6 +885,7 @@ "ctxt": 0 }, "value": "r5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -921,8 +902,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -946,7 +926,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -957,7 +936,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -994,6 +972,7 @@ "ctxt": 0 }, "value": "r6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1010,8 +989,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -1028,7 +1006,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -1039,7 +1016,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1073,6 +1049,7 @@ "ctxt": 0 }, "value": "r7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1089,8 +1066,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1114,7 +1090,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -1125,7 +1100,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1162,6 +1136,7 @@ "ctxt": 0 }, "value": "r8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1178,8 +1153,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1203,7 +1177,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -1214,7 +1187,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1248,7 +1220,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/classWithPublicProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/classWithPublicProperty/input.ts.json index dc060038a01e..f2d5b0a138e1 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/classWithPublicProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/classWithPublicProperty/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -115,7 +112,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -174,7 +170,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "function": { @@ -243,7 +238,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -299,7 +293,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": null, @@ -329,7 +322,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -398,7 +390,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "value": { @@ -471,8 +462,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -489,7 +480,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -524,6 +514,7 @@ "ctxt": 0 }, "value": "r1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -540,8 +531,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -558,7 +548,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -569,7 +558,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -603,6 +591,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -619,8 +608,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -637,7 +625,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -648,7 +635,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -682,6 +668,7 @@ "ctxt": 0 }, "value": "r3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -698,8 +685,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -716,7 +702,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -727,7 +712,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -761,6 +745,7 @@ "ctxt": 0 }, "value": "r4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -777,8 +762,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -802,7 +786,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -813,7 +796,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -850,6 +832,7 @@ "ctxt": 0 }, "value": "r5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -866,8 +849,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -891,7 +873,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -902,7 +883,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -939,6 +919,7 @@ "ctxt": 0 }, "value": "r6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -955,8 +936,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -973,7 +953,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -984,7 +963,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1018,6 +996,7 @@ "ctxt": 0 }, "value": "r7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1034,8 +1013,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1059,7 +1037,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -1070,7 +1047,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1107,6 +1083,7 @@ "ctxt": 0 }, "value": "r8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1123,8 +1100,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1148,7 +1124,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -1159,7 +1134,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/duplicateNumericIndexers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/duplicateNumericIndexers/input.ts.json index f2386c5b7915..94d3bc99737d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/duplicateNumericIndexers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/duplicateNumericIndexers/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -101,6 +100,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -117,8 +117,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -163,7 +162,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -188,6 +186,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -204,8 +203,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -243,6 +241,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -259,8 +258,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -305,7 +303,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -332,7 +329,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -360,6 +356,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -376,8 +373,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -402,7 +398,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -426,6 +421,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -442,8 +438,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -468,7 +463,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -494,7 +488,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -516,6 +509,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -532,8 +526,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -571,6 +564,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -587,8 +581,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -637,7 +630,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -662,6 +654,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -678,8 +671,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -717,6 +709,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -733,8 +726,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -789,6 +781,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -815,6 +808,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -831,8 +825,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -870,6 +863,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -886,8 +880,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -916,8 +909,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/duplicatePropertyNames/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/duplicatePropertyNames/input.ts.json index 5904bf8631c8..6f127cbe1eeb 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/duplicatePropertyNames/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/duplicatePropertyNames/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -137,7 +134,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -167,7 +163,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -208,7 +203,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -251,7 +245,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -278,7 +271,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -311,7 +303,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -340,7 +331,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -364,7 +354,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -393,7 +382,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -414,7 +402,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -440,7 +427,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -486,7 +472,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -532,7 +517,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -553,8 +537,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -599,7 +583,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -620,8 +603,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -666,7 +649,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -717,7 +699,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -775,7 +756,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -805,7 +785,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -847,7 +826,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -901,6 +879,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -932,7 +911,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -974,7 +952,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1016,7 +993,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1076,7 +1052,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1122,8 +1097,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1155,8 +1129,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1176,7 +1150,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1204,7 +1177,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1232,7 +1204,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -1268,7 +1239,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/duplicateStringIndexers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/duplicateStringIndexers/input.ts.json index ce64ec924359..3f591fe8f846 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/duplicateStringIndexers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/duplicateStringIndexers/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -74,6 +72,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -90,8 +89,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -129,6 +127,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +144,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -191,7 +189,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -216,6 +213,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -232,8 +230,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -271,6 +268,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -287,8 +285,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -333,7 +330,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -360,7 +356,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -388,6 +383,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -404,8 +400,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -430,7 +425,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -454,6 +448,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -470,8 +465,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -496,7 +490,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -522,7 +515,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -544,6 +536,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -560,8 +553,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -599,6 +591,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -615,8 +608,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -665,7 +657,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -690,6 +681,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -706,8 +698,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -745,6 +736,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -761,8 +753,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -817,6 +808,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -843,6 +835,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -859,8 +852,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -898,6 +890,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -914,8 +907,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -944,8 +936,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeHidingMembersOfExtendedObject/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeHidingMembersOfExtendedObject/input.ts.json index c4bf3f31d344..4dbeb26e4011 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeHidingMembersOfExtendedObject/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeHidingMembersOfExtendedObject/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -179,7 +174,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -209,7 +203,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -238,7 +231,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -257,6 +249,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -273,8 +266,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -299,7 +291,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -325,7 +316,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -351,7 +341,6 @@ "ctxt": 0 }, "value": "valueOf", - "typeAnnotation": null, "optional": false }, "function": { @@ -397,7 +386,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "value": null, @@ -423,7 +411,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -450,6 +437,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -466,8 +454,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -526,6 +513,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -548,13 +536,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -586,6 +572,7 @@ "ctxt": 0 }, "value": "r1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -602,8 +589,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -627,7 +613,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -638,7 +623,6 @@ "ctxt": 0 }, "value": "valueOf", - "typeAnnotation": null, "optional": false }, "computed": false @@ -675,6 +659,7 @@ "ctxt": 0 }, "value": "r1b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -697,13 +682,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -720,7 +703,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -731,7 +713,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false @@ -765,8 +746,8 @@ "ctxt": 0 }, "value": "r1c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -783,7 +764,6 @@ "ctxt": 0 }, "value": "r1b", - "typeAnnotation": null, "optional": false }, "property": { @@ -831,8 +811,8 @@ "ctxt": 0 }, "value": "r1d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -849,7 +829,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -887,7 +866,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -917,7 +895,6 @@ "ctxt": 0 }, "value": "valueOf", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -958,7 +935,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -987,7 +963,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1006,6 +981,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1022,8 +998,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1078,6 +1053,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1100,13 +1076,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1138,6 +1112,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1154,8 +1129,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1179,7 +1153,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1190,7 +1163,6 @@ "ctxt": 0 }, "value": "valueOf", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1227,6 +1199,7 @@ "ctxt": 0 }, "value": "r2b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1249,13 +1222,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -1272,7 +1243,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1283,7 +1253,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1317,8 +1286,8 @@ "ctxt": 0 }, "value": "r2c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1335,7 +1304,6 @@ "ctxt": 0 }, "value": "r2b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1383,8 +1351,8 @@ "ctxt": 0 }, "value": "r2d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1401,7 +1369,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1449,8 +1416,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1470,7 +1437,6 @@ "ctxt": 0 }, "value": "valueOf", - "typeAnnotation": null, "optional": false }, "value": { @@ -1506,7 +1472,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "value": { @@ -1524,7 +1489,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1562,6 +1526,7 @@ "ctxt": 0 }, "value": "r3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1578,8 +1543,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1603,7 +1567,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1614,7 +1577,6 @@ "ctxt": 0 }, "value": "valueOf", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1651,6 +1613,7 @@ "ctxt": 0 }, "value": "r3b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1673,13 +1636,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -1696,7 +1657,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1707,7 +1667,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1741,8 +1700,8 @@ "ctxt": 0 }, "value": "r3c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1759,7 +1718,6 @@ "ctxt": 0 }, "value": "r3b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1807,8 +1765,8 @@ "ctxt": 0 }, "value": "r3d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1825,7 +1783,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1873,6 +1830,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1904,7 +1862,6 @@ "ctxt": 0 }, "value": "valueOf", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1945,7 +1902,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1974,7 +1930,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1993,6 +1948,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2009,8 +1965,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2039,8 +1994,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2072,6 +2026,7 @@ "ctxt": 0 }, "value": "r4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2088,8 +2043,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -2113,7 +2067,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2124,7 +2077,6 @@ "ctxt": 0 }, "value": "valueOf", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeHidingMembersOfObject/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeHidingMembersOfObject/input.ts.json index da2cd0140668..8c0374ce89bd 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeHidingMembersOfObject/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeHidingMembersOfObject/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "valueOf", - "typeAnnotation": null, "optional": false }, "function": { @@ -105,6 +103,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -127,13 +126,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -165,6 +162,7 @@ "ctxt": 0 }, "value": "r1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -181,8 +179,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -206,7 +203,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -217,7 +213,6 @@ "ctxt": 0 }, "value": "valueOf", - "typeAnnotation": null, "optional": false }, "computed": false @@ -244,7 +239,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -274,7 +268,6 @@ "ctxt": 0 }, "value": "valueOf", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -327,6 +320,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -349,13 +343,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -387,6 +379,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -403,8 +396,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -428,7 +420,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -439,7 +430,6 @@ "ctxt": 0 }, "value": "valueOf", - "typeAnnotation": null, "optional": false }, "computed": false @@ -476,8 +466,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -497,7 +487,6 @@ "ctxt": 0 }, "value": "valueOf", - "typeAnnotation": null, "optional": false }, "value": { @@ -554,6 +543,7 @@ "ctxt": 0 }, "value": "r3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -570,8 +560,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -595,7 +584,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -606,7 +594,6 @@ "ctxt": 0 }, "value": "valueOf", - "typeAnnotation": null, "optional": false }, "computed": false @@ -643,6 +630,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -674,7 +662,6 @@ "ctxt": 0 }, "value": "valueOf", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -701,8 +688,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -734,6 +720,7 @@ "ctxt": 0 }, "value": "r4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -750,8 +737,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -775,7 +761,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -786,7 +771,6 @@ "ctxt": 0 }, "value": "valueOf", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeHidingMembersOfObjectAssignmentCompat/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeHidingMembersOfObjectAssignmentCompat/input.ts.json index 5bd3b0c90727..7c49761e760b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeHidingMembersOfObjectAssignmentCompat/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeHidingMembersOfObjectAssignmentCompat/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -104,6 +102,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -126,13 +125,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -164,6 +161,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -186,13 +184,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -222,8 +218,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -233,7 +229,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -261,8 +256,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -272,7 +267,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } @@ -287,7 +281,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -313,7 +306,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "function": { @@ -392,6 +384,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -414,13 +407,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -450,8 +441,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -461,7 +452,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -489,8 +479,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -500,7 +490,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } @@ -530,8 +519,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -551,7 +540,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "value": { @@ -606,8 +594,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -617,7 +605,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -645,8 +632,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -656,7 +643,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeHidingMembersOfObjectAssignmentCompat2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeHidingMembersOfObjectAssignmentCompat2/input.ts.json index 1967886e308b..5a2f6aefb5cd 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeHidingMembersOfObjectAssignmentCompat2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeHidingMembersOfObjectAssignmentCompat2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -104,6 +102,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -126,13 +125,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -164,6 +161,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -186,13 +184,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -222,8 +218,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -233,7 +229,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -261,8 +256,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -272,7 +267,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } @@ -287,7 +281,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -313,7 +306,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "function": { @@ -410,6 +402,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -432,13 +425,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -468,8 +459,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -479,7 +470,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -507,8 +497,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -518,7 +508,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } @@ -548,8 +537,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -569,7 +558,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "value": { @@ -624,8 +612,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -635,7 +623,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -663,8 +650,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -674,7 +661,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypePropertyAccess/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypePropertyAccess/input.ts.json index 892e8e9f6658..828c28726ebe 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypePropertyAccess/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypePropertyAccess/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -105,6 +103,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -127,13 +126,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -165,8 +162,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -190,7 +187,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -201,7 +197,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -238,8 +233,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -263,7 +258,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -314,8 +308,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -332,7 +326,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -343,7 +336,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -377,8 +369,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -395,7 +387,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -433,7 +424,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -463,7 +453,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -517,6 +506,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -539,13 +529,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -577,8 +565,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -602,7 +590,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -613,7 +600,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -650,8 +636,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -675,7 +661,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -726,8 +711,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -744,7 +729,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -755,7 +739,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -789,8 +772,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -807,7 +790,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -855,8 +837,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -876,7 +858,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -925,8 +906,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -950,7 +931,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -961,7 +941,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -998,8 +977,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1023,7 +1002,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1074,8 +1052,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1092,7 +1070,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1103,7 +1080,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1137,8 +1113,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1155,7 +1131,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithCallSignatureAppearsToBeFunctionType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithCallSignatureAppearsToBeFunctionType/input.ts.json index da9b8bba008b..2a04b2195927 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithCallSignatureAppearsToBeFunctionType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithCallSignatureAppearsToBeFunctionType/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -90,6 +89,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -112,13 +112,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -150,6 +148,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -166,8 +165,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -184,7 +182,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -219,6 +216,7 @@ "ctxt": 0 }, "value": "r2b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -242,6 +240,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -258,8 +257,7 @@ }, "kind": "any" } - }, - "optional": false + } }, { "type": "Identifier", @@ -269,6 +267,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -285,8 +284,7 @@ }, "kind": "any" } - }, - "optional": true + } } ], "typeParams": null, @@ -308,8 +306,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -326,7 +323,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -337,7 +333,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -371,6 +366,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -415,8 +411,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -448,6 +443,7 @@ "ctxt": 0 }, "value": "r4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -464,8 +460,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -482,7 +477,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -517,6 +511,7 @@ "ctxt": 0 }, "value": "rb4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -540,6 +535,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +552,7 @@ }, "kind": "any" } - }, - "optional": false + } }, { "type": "Identifier", @@ -567,6 +562,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,8 +579,7 @@ }, "kind": "any" } - }, - "optional": true + } } ], "typeParams": null, @@ -606,8 +601,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -624,7 +618,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -635,7 +628,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithCallSignatureHidingMembersOfExtendedFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithCallSignatureHidingMembersOfExtendedFunction/input.ts.json index d8912c20d7dc..f29268c8748a 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithCallSignatureHidingMembersOfExtendedFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithCallSignatureHidingMembersOfExtendedFunction/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -88,6 +86,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +103,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -130,7 +128,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -161,7 +158,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -218,7 +214,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -232,6 +227,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -248,8 +244,7 @@ }, "kind": "any" } - }, - "optional": false + } }, { "type": "Identifier", @@ -259,6 +254,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -275,8 +271,7 @@ }, "kind": "any" } - }, - "optional": true + } } ], "typeAnn": { @@ -314,7 +309,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -328,6 +322,7 @@ "ctxt": 0 }, "value": "thisArg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -344,8 +339,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -367,8 +361,8 @@ "ctxt": 0 }, "value": "argArray", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -444,6 +438,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -466,13 +461,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -504,6 +497,7 @@ "ctxt": 0 }, "value": "r1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -527,6 +521,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -543,8 +538,7 @@ }, "kind": "any" } - }, - "optional": false + } }, { "type": "Identifier", @@ -554,6 +548,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -570,8 +565,7 @@ }, "kind": "any" } - }, - "optional": true + } } ], "typeParams": null, @@ -593,8 +587,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -611,7 +604,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -622,7 +614,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -656,6 +647,7 @@ "ctxt": 0 }, "value": "r1b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -679,6 +671,7 @@ "ctxt": 0 }, "value": "thisArg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -695,8 +688,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -718,8 +710,8 @@ "ctxt": 0 }, "value": "argArray", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -767,8 +759,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -785,7 +776,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -796,7 +786,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false @@ -830,8 +819,8 @@ "ctxt": 0 }, "value": "r1c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -848,7 +837,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -859,7 +847,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "computed": false @@ -893,8 +880,8 @@ "ctxt": 0 }, "value": "r1d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -911,7 +898,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -922,7 +908,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false @@ -956,8 +941,8 @@ "ctxt": 0 }, "value": "r1e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -974,7 +959,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1022,6 +1006,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1080,7 +1065,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1094,6 +1078,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1110,8 +1095,7 @@ }, "kind": "any" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1121,6 +1105,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1137,8 +1122,7 @@ }, "kind": "any" } - }, - "optional": true + } } ], "typeAnn": { @@ -1176,7 +1160,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1190,6 +1173,7 @@ "ctxt": 0 }, "value": "thisArg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1206,8 +1190,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -1229,8 +1212,8 @@ "ctxt": 0 }, "value": "argArray", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1280,8 +1263,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1313,6 +1295,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1336,6 +1319,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1352,8 +1336,7 @@ }, "kind": "any" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1363,6 +1346,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1379,8 +1363,7 @@ }, "kind": "any" } - }, - "optional": true + } } ], "typeParams": null, @@ -1402,8 +1385,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -1420,7 +1402,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1431,7 +1412,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1465,6 +1445,7 @@ "ctxt": 0 }, "value": "r2b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1488,6 +1469,7 @@ "ctxt": 0 }, "value": "thisArg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1504,8 +1486,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -1527,8 +1508,8 @@ "ctxt": 0 }, "value": "argArray", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1576,8 +1557,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -1594,7 +1574,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1605,7 +1584,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1639,8 +1617,8 @@ "ctxt": 0 }, "value": "r2c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1657,7 +1635,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1668,7 +1645,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1702,8 +1678,8 @@ "ctxt": 0 }, "value": "r2d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1720,7 +1696,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1731,7 +1706,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1765,8 +1739,8 @@ "ctxt": 0 }, "value": "r2e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1783,7 +1757,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithCallSignatureHidingMembersOfFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithCallSignatureHidingMembersOfFunction/input.ts.json index b23be7a808de..f317a218c69d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithCallSignatureHidingMembersOfFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithCallSignatureHidingMembersOfFunction/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -78,7 +77,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -92,6 +90,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -108,8 +107,7 @@ }, "kind": "any" } - }, - "optional": false + } }, { "type": "Identifier", @@ -119,6 +117,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -135,8 +134,7 @@ }, "kind": "any" } - }, - "optional": true + } } ], "typeAnn": { @@ -174,7 +172,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -188,6 +185,7 @@ "ctxt": 0 }, "value": "thisArg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -204,8 +202,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -227,8 +224,8 @@ "ctxt": 0 }, "value": "argArray", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -304,6 +301,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -326,13 +324,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -364,6 +360,7 @@ "ctxt": 0 }, "value": "r1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -387,6 +384,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -403,8 +401,7 @@ }, "kind": "any" } - }, - "optional": false + } }, { "type": "Identifier", @@ -414,6 +411,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -430,8 +428,7 @@ }, "kind": "any" } - }, - "optional": true + } } ], "typeParams": null, @@ -453,8 +450,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -471,7 +467,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -482,7 +477,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -516,6 +510,7 @@ "ctxt": 0 }, "value": "r1b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -539,6 +534,7 @@ "ctxt": 0 }, "value": "thisArg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -555,8 +551,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -578,8 +573,8 @@ "ctxt": 0 }, "value": "argArray", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -627,8 +622,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -645,7 +639,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -656,7 +649,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false @@ -690,8 +682,8 @@ "ctxt": 0 }, "value": "r1c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -708,7 +700,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -719,7 +710,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "computed": false @@ -753,6 +743,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -811,7 +802,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -825,6 +815,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -841,8 +832,7 @@ }, "kind": "any" } - }, - "optional": false + } }, { "type": "Identifier", @@ -852,6 +842,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -868,8 +859,7 @@ }, "kind": "any" } - }, - "optional": true + } } ], "typeAnn": { @@ -907,7 +897,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -921,6 +910,7 @@ "ctxt": 0 }, "value": "thisArg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -937,8 +927,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -960,8 +949,8 @@ "ctxt": 0 }, "value": "argArray", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1011,8 +1000,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1044,6 +1032,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1067,6 +1056,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1083,8 +1073,7 @@ }, "kind": "any" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1094,6 +1083,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1110,8 +1100,7 @@ }, "kind": "any" } - }, - "optional": true + } } ], "typeParams": null, @@ -1133,8 +1122,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -1151,7 +1139,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1162,7 +1149,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1196,6 +1182,7 @@ "ctxt": 0 }, "value": "r2b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1219,6 +1206,7 @@ "ctxt": 0 }, "value": "thisArg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1235,8 +1223,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -1258,8 +1245,8 @@ "ctxt": 0 }, "value": "argArray", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1307,8 +1294,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -1325,7 +1311,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1336,7 +1321,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1370,8 +1354,8 @@ "ctxt": 0 }, "value": "r2c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1388,7 +1372,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1399,7 +1382,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat/input.ts.json index d8cd5478fc5b..1e1fdd5cf52d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithCallSignatureHidingMembersOfFunctionAssignmentCompat/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -90,6 +89,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -112,13 +112,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -150,6 +148,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -172,13 +171,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -208,8 +205,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -219,7 +216,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -247,8 +243,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -258,7 +254,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -288,6 +283,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -332,8 +328,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -363,8 +358,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -374,7 +369,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -402,8 +396,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -413,7 +407,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithConstructSignatureAppearsToBeFunctionType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithConstructSignatureAppearsToBeFunctionType/input.ts.json index 4aa3df13daa6..aee57b4bea96 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithConstructSignatureAppearsToBeFunctionType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithConstructSignatureAppearsToBeFunctionType/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -90,6 +89,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -112,13 +112,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -150,6 +148,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -166,8 +165,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -184,7 +182,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -219,6 +216,7 @@ "ctxt": 0 }, "value": "r2b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -235,8 +233,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -253,7 +250,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -288,6 +284,7 @@ "ctxt": 0 }, "value": "r2c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -311,6 +308,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -327,8 +325,7 @@ }, "kind": "any" } - }, - "optional": false + } }, { "type": "Identifier", @@ -338,6 +335,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -354,8 +352,7 @@ }, "kind": "any" } - }, - "optional": true + } } ], "typeParams": null, @@ -377,8 +374,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -395,7 +391,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -406,7 +401,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -440,6 +434,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -484,8 +479,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -517,6 +511,7 @@ "ctxt": 0 }, "value": "r4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -533,8 +528,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -551,7 +545,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -586,6 +579,7 @@ "ctxt": 0 }, "value": "r4b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -602,8 +596,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -620,7 +613,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -655,6 +647,7 @@ "ctxt": 0 }, "value": "r4c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -678,6 +671,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -694,8 +688,7 @@ }, "kind": "any" } - }, - "optional": false + } }, { "type": "Identifier", @@ -705,6 +698,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -721,8 +715,7 @@ }, "kind": "any" } - }, - "optional": true + } } ], "typeParams": null, @@ -744,8 +737,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -762,7 +754,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -773,7 +764,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithConstructSignatureHidingMembersOfExtendedFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithConstructSignatureHidingMembersOfExtendedFunction/input.ts.json index 4c38f6418294..d23eebdc7e74 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithConstructSignatureHidingMembersOfExtendedFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithConstructSignatureHidingMembersOfExtendedFunction/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -88,6 +86,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +103,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -130,7 +128,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -161,7 +158,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -218,7 +214,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -232,6 +227,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -248,8 +244,7 @@ }, "kind": "any" } - }, - "optional": false + } }, { "type": "Identifier", @@ -259,6 +254,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -275,8 +271,7 @@ }, "kind": "any" } - }, - "optional": true + } } ], "typeAnn": { @@ -314,7 +309,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -328,6 +322,7 @@ "ctxt": 0 }, "value": "thisArg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -344,8 +339,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -367,8 +361,8 @@ "ctxt": 0 }, "value": "argArray", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -444,6 +438,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -466,13 +461,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -504,6 +497,7 @@ "ctxt": 0 }, "value": "r1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -527,6 +521,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -543,8 +538,7 @@ }, "kind": "any" } - }, - "optional": false + } }, { "type": "Identifier", @@ -554,6 +548,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -570,8 +565,7 @@ }, "kind": "any" } - }, - "optional": true + } } ], "typeParams": null, @@ -593,8 +587,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -611,7 +604,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -622,7 +614,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -656,6 +647,7 @@ "ctxt": 0 }, "value": "r1b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -679,6 +671,7 @@ "ctxt": 0 }, "value": "thisArg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -695,8 +688,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -718,8 +710,8 @@ "ctxt": 0 }, "value": "argArray", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -767,8 +759,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -785,7 +776,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -796,7 +786,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false @@ -830,8 +819,8 @@ "ctxt": 0 }, "value": "r1c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -848,7 +837,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -859,7 +847,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "computed": false @@ -893,8 +880,8 @@ "ctxt": 0 }, "value": "r1d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -911,7 +898,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -922,7 +908,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false @@ -956,8 +941,8 @@ "ctxt": 0 }, "value": "r1e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -974,7 +959,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1022,6 +1006,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1080,7 +1065,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1094,6 +1078,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1110,8 +1095,7 @@ }, "kind": "any" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1121,6 +1105,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1137,8 +1122,7 @@ }, "kind": "any" } - }, - "optional": true + } } ], "typeAnn": { @@ -1176,7 +1160,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1190,6 +1173,7 @@ "ctxt": 0 }, "value": "thisArg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1206,8 +1190,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -1229,8 +1212,8 @@ "ctxt": 0 }, "value": "argArray", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1280,8 +1263,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1313,6 +1295,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1336,6 +1319,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1352,8 +1336,7 @@ }, "kind": "any" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1363,6 +1346,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1379,8 +1363,7 @@ }, "kind": "any" } - }, - "optional": true + } } ], "typeParams": null, @@ -1402,8 +1385,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -1420,7 +1402,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1431,7 +1412,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1465,6 +1445,7 @@ "ctxt": 0 }, "value": "r2b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1488,6 +1469,7 @@ "ctxt": 0 }, "value": "thisArg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1504,8 +1486,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -1527,8 +1508,8 @@ "ctxt": 0 }, "value": "argArray", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1576,8 +1557,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -1594,7 +1574,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1605,7 +1584,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1639,8 +1617,8 @@ "ctxt": 0 }, "value": "r2c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1657,7 +1635,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1668,7 +1645,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1702,8 +1678,8 @@ "ctxt": 0 }, "value": "r2d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1720,7 +1696,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1731,7 +1706,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1765,8 +1739,8 @@ "ctxt": 0 }, "value": "r2e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1783,7 +1757,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithConstructSignatureHidingMembersOfFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithConstructSignatureHidingMembersOfFunction/input.ts.json index 93db9e9cbb0c..b7feb2c7c520 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithConstructSignatureHidingMembersOfFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithConstructSignatureHidingMembersOfFunction/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -78,7 +77,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -92,6 +90,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -108,8 +107,7 @@ }, "kind": "any" } - }, - "optional": false + } }, { "type": "Identifier", @@ -119,6 +117,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -135,8 +134,7 @@ }, "kind": "any" } - }, - "optional": true + } } ], "typeAnn": { @@ -174,7 +172,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -188,6 +185,7 @@ "ctxt": 0 }, "value": "thisArg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -204,8 +202,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -227,8 +224,8 @@ "ctxt": 0 }, "value": "argArray", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -304,6 +301,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -326,13 +324,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -364,6 +360,7 @@ "ctxt": 0 }, "value": "r1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -387,6 +384,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -403,8 +401,7 @@ }, "kind": "any" } - }, - "optional": false + } }, { "type": "Identifier", @@ -414,6 +411,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -430,8 +428,7 @@ }, "kind": "any" } - }, - "optional": true + } } ], "typeParams": null, @@ -453,8 +450,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -471,7 +467,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -482,7 +477,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -516,6 +510,7 @@ "ctxt": 0 }, "value": "r1b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -539,6 +534,7 @@ "ctxt": 0 }, "value": "thisArg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -555,8 +551,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -578,8 +573,8 @@ "ctxt": 0 }, "value": "argArray", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -627,8 +622,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -645,7 +639,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -656,7 +649,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false @@ -690,8 +682,8 @@ "ctxt": 0 }, "value": "r1c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -708,7 +700,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -719,7 +710,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "computed": false @@ -753,6 +743,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -811,7 +802,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -825,6 +815,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -841,8 +832,7 @@ }, "kind": "any" } - }, - "optional": false + } }, { "type": "Identifier", @@ -852,6 +842,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -868,8 +859,7 @@ }, "kind": "any" } - }, - "optional": true + } } ], "typeAnn": { @@ -907,7 +897,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -921,6 +910,7 @@ "ctxt": 0 }, "value": "thisArg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -937,8 +927,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -960,8 +949,8 @@ "ctxt": 0 }, "value": "argArray", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1011,8 +1000,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1044,6 +1032,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1067,6 +1056,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1083,8 +1073,7 @@ }, "kind": "any" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1094,6 +1083,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1110,8 +1100,7 @@ }, "kind": "any" } - }, - "optional": true + } } ], "typeParams": null, @@ -1133,8 +1122,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -1151,7 +1139,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1162,7 +1149,6 @@ "ctxt": 0 }, "value": "apply", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1196,6 +1182,7 @@ "ctxt": 0 }, "value": "r2b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1219,6 +1206,7 @@ "ctxt": 0 }, "value": "thisArg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1235,8 +1223,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -1258,8 +1245,8 @@ "ctxt": 0 }, "value": "argArray", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1307,8 +1294,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -1325,7 +1311,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1336,7 +1321,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1370,8 +1354,8 @@ "ctxt": 0 }, "value": "r2c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1388,7 +1372,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1399,7 +1382,6 @@ "ctxt": 0 }, "value": "arguments", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat/input.ts.json index c6a1f415aec1..2a05df3ec613 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithConstructSignatureHidingMembersOfFunctionAssignmentCompat/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -90,6 +89,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -112,13 +112,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -150,6 +148,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -172,13 +171,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -208,8 +205,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -219,7 +216,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -247,8 +243,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -258,7 +254,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -288,6 +283,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -332,8 +328,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -363,8 +358,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -374,7 +369,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -402,8 +396,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -413,7 +407,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithDuplicateNumericProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithDuplicateNumericProperty/input.ts.json index 571d39d4be01..26805eeb337f 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithDuplicateNumericProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithDuplicateNumericProperty/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -161,7 +160,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -299,6 +297,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -412,8 +411,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -445,8 +443,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithNumericProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithNumericProperty/input.ts.json index 08b9080b3c0e..89fff1c13a8d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithNumericProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithNumericProperty/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -147,6 +146,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -169,13 +169,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -207,8 +205,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -225,7 +223,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -268,8 +265,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -286,7 +283,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -329,8 +325,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -347,7 +343,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -395,8 +390,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -413,7 +408,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -451,7 +445,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -573,6 +566,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -595,13 +589,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -633,8 +625,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -651,7 +643,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -694,8 +685,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -712,7 +703,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -755,8 +745,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -773,7 +763,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -821,8 +810,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -839,7 +828,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -887,6 +875,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -984,8 +973,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1017,8 +1005,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1035,7 +1023,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1078,8 +1065,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1096,7 +1083,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1139,8 +1125,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1157,7 +1143,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1205,8 +1190,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1223,7 +1208,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1271,8 +1255,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1360,8 +1344,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1378,7 +1362,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1421,8 +1404,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1439,7 +1422,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1482,8 +1464,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1500,7 +1482,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1548,8 +1529,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1566,7 +1547,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithStringIndexerHidingObjectIndexer/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithStringIndexerHidingObjectIndexer/input.ts.json index da379f3aaaea..19ca4337484d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithStringIndexerHidingObjectIndexer/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithStringIndexerHidingObjectIndexer/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -129,8 +127,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -170,8 +168,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -188,7 +186,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -221,7 +218,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -247,7 +243,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -289,6 +284,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -305,8 +301,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -365,6 +360,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -387,13 +383,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -425,6 +419,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -441,8 +436,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -459,7 +453,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -497,7 +490,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -527,7 +519,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -564,6 +555,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -580,8 +572,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -636,6 +627,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -658,13 +650,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -696,6 +686,7 @@ "ctxt": 0 }, "value": "r3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -712,8 +703,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -730,7 +720,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -778,6 +767,7 @@ "ctxt": 0 }, "value": "o2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -809,7 +799,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -846,6 +835,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -862,8 +852,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -892,8 +881,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -925,6 +913,7 @@ "ctxt": 0 }, "value": "r4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -941,8 +930,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -959,7 +947,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithStringNamedPropertyOfIllegalCharacters/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithStringNamedPropertyOfIllegalCharacters/input.ts.json index d45588befed7..e6eed8cd25dd 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithStringNamedPropertyOfIllegalCharacters/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/objectTypeWithStringNamedPropertyOfIllegalCharacters/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -304,6 +303,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -326,13 +326,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -364,8 +362,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -382,7 +380,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -430,8 +427,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -448,7 +445,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -496,8 +492,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -514,7 +510,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -562,8 +557,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -580,7 +575,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -618,7 +612,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -795,6 +788,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -817,13 +811,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -855,8 +847,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -873,7 +865,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -921,8 +912,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -939,7 +930,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -987,8 +977,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1005,7 +995,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1053,8 +1042,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1071,7 +1060,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1119,6 +1107,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1271,8 +1260,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1304,8 +1292,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1322,7 +1310,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1370,8 +1357,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1388,7 +1375,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1436,8 +1422,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1454,7 +1440,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1502,8 +1487,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1520,7 +1505,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1568,8 +1552,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1693,8 +1677,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1711,7 +1695,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1759,8 +1742,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1777,7 +1760,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1825,8 +1807,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1843,7 +1825,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1891,8 +1872,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1909,7 +1890,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/typesWithOptionalProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/typesWithOptionalProperty/input.ts.json index 78a17b5c9f20..c89cf2d8c6ac 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/typesWithOptionalProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/typesWithOptionalProperty/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -135,7 +132,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -188,6 +184,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -219,7 +216,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -261,7 +257,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -303,7 +298,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -330,8 +324,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -363,8 +356,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -384,7 +377,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -433,8 +425,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -454,7 +446,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -482,7 +473,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -526,8 +516,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -547,7 +537,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -575,7 +564,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -598,7 +586,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -660,6 +647,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -682,13 +670,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -718,8 +704,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -729,7 +715,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -757,8 +742,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -768,7 +753,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -796,8 +780,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -807,7 +791,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -835,8 +818,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -846,7 +829,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -874,8 +856,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -885,7 +867,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -913,8 +894,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -924,7 +905,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -952,8 +932,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -963,7 +943,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -991,8 +970,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1002,7 +981,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/typesWithPrivateConstructor/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/typesWithPrivateConstructor/input.ts.json index 6bd7ce948edd..bf79f5a5ba00 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/typesWithPrivateConstructor/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/typesWithPrivateConstructor/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -90,8 +88,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -143,6 +140,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -177,8 +175,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -195,7 +192,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -206,7 +202,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -225,7 +220,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -251,7 +245,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -271,6 +264,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -287,8 +281,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -311,7 +304,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -331,6 +323,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -347,8 +340,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -396,8 +388,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -414,7 +406,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -449,6 +440,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -472,6 +464,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -488,8 +481,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -511,8 +503,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -529,7 +520,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "property": { @@ -540,7 +530,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/typesWithProtectedConstructor/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/typesWithProtectedConstructor/input.ts.json index 2ac6c9aa77f3..3c12bdc0c70f 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/typesWithProtectedConstructor/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/typesWithProtectedConstructor/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -90,8 +88,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -143,6 +140,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -177,8 +175,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -195,7 +192,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -206,7 +202,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -225,7 +220,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -251,7 +245,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -271,6 +264,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -287,8 +281,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -311,7 +304,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -331,6 +323,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -347,8 +340,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -396,8 +388,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -414,7 +406,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -449,6 +440,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -472,6 +464,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -488,8 +481,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -511,8 +503,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -529,7 +520,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "property": { @@ -540,7 +530,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/typesWithPublicConstructor/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/typesWithPublicConstructor/input.ts.json index cd559e624ba6..d4de5581c471 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/typesWithPublicConstructor/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/typesWithPublicConstructor/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -90,8 +88,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -143,6 +140,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -177,8 +175,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -195,7 +192,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -206,7 +202,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "computed": false @@ -225,7 +220,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -251,7 +245,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -271,6 +264,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -287,8 +281,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -311,7 +304,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -331,6 +323,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -347,8 +340,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -396,8 +388,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -414,7 +406,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -449,6 +440,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -472,6 +464,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -488,8 +481,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -511,8 +503,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -529,7 +520,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "property": { @@ -540,7 +530,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/typesWithSpecializedCallSignatures/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/typesWithSpecializedCallSignatures/input.ts.json index 154c0209853f..a555f889ea32 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/typesWithSpecializedCallSignatures/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/typesWithSpecializedCallSignatures/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -284,7 +275,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -305,6 +295,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -334,8 +325,7 @@ } } } - }, - "optional": false + } } } ], @@ -371,7 +361,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -399,7 +388,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -420,6 +408,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -449,8 +438,7 @@ } } } - }, - "optional": false + } } } ], @@ -486,7 +474,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -514,7 +501,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -535,6 +521,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -551,8 +538,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -588,7 +574,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -616,7 +601,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -637,8 +621,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -671,7 +655,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -720,8 +703,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -738,7 +721,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -763,7 +745,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -793,7 +774,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -807,6 +787,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -836,8 +817,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": { @@ -862,7 +842,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -886,7 +865,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -900,6 +878,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -929,8 +908,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": { @@ -955,7 +933,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -979,7 +956,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -993,6 +969,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1009,8 +986,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -1035,7 +1011,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1071,6 +1046,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1093,13 +1069,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1131,6 +1105,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1162,7 +1137,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1176,6 +1150,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1205,8 +1180,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": { @@ -1231,7 +1205,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1255,7 +1228,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1269,6 +1241,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1298,8 +1271,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": { @@ -1324,7 +1296,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1348,7 +1319,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1362,6 +1332,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1378,8 +1349,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -1404,7 +1374,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1414,8 +1383,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1445,8 +1413,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1456,7 +1424,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -1484,8 +1451,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1495,7 +1462,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1523,8 +1489,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1534,7 +1500,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1562,8 +1527,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1573,7 +1538,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1601,8 +1565,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1612,7 +1576,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1640,8 +1603,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1651,7 +1614,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -1681,6 +1643,7 @@ "ctxt": 0 }, "value": "r1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1703,13 +1666,11 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1733,7 +1694,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1744,7 +1704,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1799,6 +1758,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1821,13 +1781,11 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1851,7 +1809,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1862,7 +1819,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1917,6 +1873,7 @@ "ctxt": 0 }, "value": "r3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1939,13 +1896,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1969,7 +1924,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1980,7 +1934,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/members/typesWithSpecializedConstructSignatures/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/members/typesWithSpecializedConstructSignatures/input.ts.json index 66cb986bdf8c..830c2d72f9f7 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/members/typesWithSpecializedConstructSignatures/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/members/typesWithSpecializedConstructSignatures/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -284,7 +275,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -304,6 +294,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -333,8 +324,7 @@ } } } - }, - "optional": false + } } } ], @@ -357,7 +347,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -377,6 +366,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -406,8 +396,7 @@ } } } - }, - "optional": false + } } } ], @@ -430,7 +419,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -450,6 +438,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -466,8 +455,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -490,7 +478,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -510,8 +497,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -538,7 +525,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -579,8 +565,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -597,7 +583,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -640,7 +625,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -670,6 +654,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -699,8 +684,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -725,7 +709,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -749,6 +732,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -778,8 +762,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -804,7 +787,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -828,6 +810,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -844,8 +827,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -870,7 +852,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -906,6 +887,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -928,13 +910,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -966,6 +946,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -997,6 +978,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1026,8 +1008,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1052,7 +1033,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1076,6 +1056,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1105,8 +1086,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1131,7 +1111,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1155,6 +1134,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1171,8 +1151,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1197,7 +1176,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1207,8 +1185,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1238,8 +1215,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1249,7 +1226,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -1277,8 +1253,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1288,7 +1264,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1316,8 +1291,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1327,7 +1302,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1355,8 +1329,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1366,7 +1340,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -1396,8 +1369,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1414,7 +1387,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1467,6 +1439,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1489,13 +1462,11 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -1512,7 +1483,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1565,6 +1535,7 @@ "ctxt": 0 }, "value": "r3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1587,13 +1558,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -1610,7 +1579,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface/input.ts.json index c0f42e527349..1491758ef568 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -109,6 +106,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -125,8 +123,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -204,7 +201,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "function": { @@ -268,7 +264,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "function": { @@ -289,8 +284,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -331,6 +326,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -347,8 +343,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -373,7 +368,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -397,6 +391,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -413,8 +408,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -439,7 +433,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -518,7 +511,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -548,7 +540,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -590,7 +581,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -604,6 +594,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -620,8 +611,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -659,7 +649,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -696,6 +685,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -712,8 +702,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -738,7 +727,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -762,6 +750,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -778,8 +767,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -804,7 +792,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -885,6 +872,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -907,13 +895,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -945,6 +931,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -967,13 +954,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1003,8 +988,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1014,7 +999,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -1042,8 +1026,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1053,7 +1037,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface2/input.ts.json index 56442c2e8988..26fa4f606438 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "function": { @@ -109,6 +106,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -125,8 +123,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -204,7 +201,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "function": { @@ -268,7 +264,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "function": { @@ -289,8 +284,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -331,6 +326,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -347,8 +343,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -373,7 +368,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -397,6 +391,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -413,8 +408,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -439,7 +433,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -511,7 +504,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -564,7 +556,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -594,7 +585,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -636,7 +626,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -650,6 +639,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -666,8 +656,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -705,7 +694,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -742,6 +730,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,8 +747,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -784,7 +772,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -808,6 +795,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -824,8 +812,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -850,7 +837,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -931,6 +917,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -953,13 +940,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -991,6 +976,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1013,13 +999,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1049,8 +1033,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1060,7 +1044,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -1088,8 +1071,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1099,7 +1082,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/namedTypes/classWithOptionalParameter/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/namedTypes/classWithOptionalParameter/input.ts.json index 99fc83882108..1972ff4c3af8 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/namedTypes/classWithOptionalParameter/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/namedTypes/classWithOptionalParameter/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": true }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": true }, "function": { @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -162,7 +158,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": true }, "value": null, @@ -188,7 +183,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -219,7 +213,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": true }, "function": { @@ -240,6 +233,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -262,13 +256,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -324,7 +316,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/namedTypes/genericInstantiationEquivalentToObjectLiteral/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/namedTypes/genericInstantiationEquivalentToObjectLiteral/input.ts.json index 26f97475e713..d09f647720f2 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/namedTypes/genericInstantiationEquivalentToObjectLiteral/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/namedTypes/genericInstantiationEquivalentToObjectLiteral/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Pair", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -102,7 +99,6 @@ "ctxt": 0 }, "value": "first", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -155,7 +150,6 @@ "ctxt": 0 }, "value": "second", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -184,7 +178,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -220,6 +213,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -242,7 +236,6 @@ "ctxt": 0 }, "value": "Pair", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -274,8 +267,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -307,6 +299,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -338,7 +331,6 @@ "ctxt": 0 }, "value": "first", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -380,7 +372,6 @@ "ctxt": 0 }, "value": "second", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -408,8 +399,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -439,8 +429,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -450,7 +440,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -478,8 +467,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -489,7 +478,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -504,7 +492,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -525,6 +512,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -547,7 +535,6 @@ "ctxt": 0 }, "value": "Pair", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -573,7 +560,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -593,7 +579,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -601,8 +586,7 @@ ] } } - }, - "optional": false + } } } ], @@ -638,7 +622,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -659,7 +642,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -679,7 +661,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -700,6 +681,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -731,7 +713,6 @@ "ctxt": 0 }, "value": "first", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -760,7 +741,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -784,7 +764,6 @@ "ctxt": 0 }, "value": "second", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -813,7 +792,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -823,8 +801,7 @@ } ] } - }, - "optional": false + } } } ], @@ -860,7 +837,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -881,7 +857,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -913,7 +888,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -927,7 +901,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -957,7 +930,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -971,7 +943,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1001,7 +972,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1015,7 +985,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1045,7 +1014,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1059,7 +1027,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/namedTypes/optionalMethods/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/namedTypes/optionalMethods/input.ts.json index a59881b86f21..7871f04aa100 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/namedTypes/optionalMethods/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/namedTypes/optionalMethods/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -135,7 +132,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -176,7 +172,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -214,7 +209,6 @@ "ctxt": 0 }, "value": "test1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -235,6 +229,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -257,13 +252,11 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -303,7 +296,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -314,7 +306,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -342,7 +333,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -353,7 +343,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -381,7 +370,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -392,7 +380,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -420,7 +407,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -431,7 +417,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -462,8 +447,8 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -487,7 +472,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -498,7 +482,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -535,8 +518,8 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -561,7 +544,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -572,7 +554,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -599,7 +580,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -610,7 +590,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -648,8 +627,8 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -673,7 +652,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -684,7 +662,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -711,7 +688,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -722,7 +698,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -761,7 +736,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -787,7 +761,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -833,7 +806,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": true }, "value": null, @@ -879,7 +851,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": true }, "value": { @@ -917,7 +888,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -939,6 +909,7 @@ "ctxt": 0 }, "value": "d", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -955,8 +926,7 @@ }, "kind": "number" } - }, - "optional": true + } } }, { @@ -984,8 +954,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1027,7 +997,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -1091,7 +1060,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": true }, "function": { @@ -1145,7 +1113,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": true }, "function": { @@ -1211,7 +1178,6 @@ "ctxt": 0 }, "value": "test2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1232,6 +1198,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1254,13 +1221,11 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1300,7 +1265,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1311,7 +1275,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1339,7 +1302,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1350,7 +1312,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1378,7 +1339,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1389,7 +1349,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1417,7 +1376,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1428,7 +1386,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1456,7 +1413,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1467,7 +1423,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1495,7 +1450,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1506,7 +1460,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1534,7 +1487,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1545,7 +1497,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1576,8 +1527,8 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1601,7 +1552,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1612,7 +1562,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1649,8 +1598,8 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1675,7 +1624,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1686,7 +1634,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1713,7 +1660,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1724,7 +1670,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1762,8 +1707,8 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1787,7 +1732,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1798,7 +1742,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1825,7 +1768,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1836,7 +1778,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1883,8 +1824,8 @@ "ctxt": 0 }, "value": "h1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1909,7 +1850,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1920,7 +1860,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1947,7 +1886,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1958,7 +1896,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1996,8 +1933,8 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2021,7 +1958,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2032,7 +1968,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2059,7 +1994,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2070,7 +2004,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2109,7 +2042,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2135,7 +2067,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": true }, "value": null, @@ -2181,7 +2112,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": true }, "function": { @@ -2237,7 +2167,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2263,7 +2192,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2301,7 +2229,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -2375,7 +2302,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/never/neverInference/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/never/neverInference/input.ts.json index 54b860fde38f..7941591d9272 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/never/neverInference/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/never/neverInference/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,14 +66,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -109,7 +107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -139,7 +136,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -171,6 +167,7 @@ "ctxt": 0 }, "value": "neverArray", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -195,8 +192,7 @@ "kind": "never" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -236,8 +232,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -254,7 +250,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -302,8 +297,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -320,7 +315,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -334,7 +328,6 @@ "ctxt": 0 }, "value": "neverArray", - "typeAnnotation": null, "optional": false } } @@ -361,7 +354,6 @@ "ctxt": 0 }, "value": "Comparator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -387,7 +379,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -411,6 +402,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -433,13 +425,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -449,6 +439,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -471,13 +462,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -515,7 +504,6 @@ "ctxt": 0 }, "value": "LinkedList", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -542,7 +530,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -575,7 +562,6 @@ "ctxt": 0 }, "value": "comparator", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -604,7 +590,6 @@ "ctxt": 0 }, "value": "Comparator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -630,7 +615,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -657,7 +641,6 @@ "ctxt": 0 }, "value": "nodes", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -686,7 +669,6 @@ "ctxt": 0 }, "value": "Node", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -712,7 +694,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -742,7 +723,6 @@ "ctxt": 0 }, "value": "Node", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -768,7 +748,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -808,7 +787,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -837,7 +815,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -861,7 +838,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -890,7 +866,6 @@ "ctxt": 0 }, "value": "Node", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -916,7 +891,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -951,7 +925,6 @@ "ctxt": 0 }, "value": "compareNumbers", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -972,6 +945,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -988,8 +962,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -1008,6 +981,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1024,8 +998,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1067,7 +1040,6 @@ "ctxt": 0 }, "value": "mkList", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1088,6 +1060,7 @@ "ctxt": 0 }, "value": "items", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1117,14 +1090,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } }, { @@ -1143,6 +1114,7 @@ "ctxt": 0 }, "value": "comparator", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1165,7 +1137,6 @@ "ctxt": 0 }, "value": "Comparator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1191,7 +1162,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1199,8 +1169,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1236,7 +1205,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1266,7 +1234,6 @@ "ctxt": 0 }, "value": "LinkedList", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1292,7 +1259,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1327,6 +1293,7 @@ "ctxt": 0 }, "value": "list", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1349,7 +1316,6 @@ "ctxt": 0 }, "value": "LinkedList", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1372,8 +1338,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1390,7 +1355,6 @@ "ctxt": 0 }, "value": "mkList", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1416,7 +1380,6 @@ "ctxt": 0 }, "value": "compareNumbers", - "typeAnnotation": null, "optional": false } } @@ -1437,7 +1400,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1458,6 +1420,7 @@ "ctxt": 0 }, "value": "as1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1487,14 +1450,12 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } }, { @@ -1513,6 +1474,7 @@ "ctxt": 0 }, "value": "as2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1542,14 +1504,12 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } }, { @@ -1568,6 +1528,7 @@ "ctxt": 0 }, "value": "cmp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1591,6 +1552,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1613,13 +1575,11 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1629,6 +1589,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1651,13 +1612,11 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1679,8 +1638,7 @@ } } } - }, - "optional": false + } } } ], @@ -1716,7 +1674,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1764,7 +1721,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1792,7 +1748,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "property": { @@ -1803,7 +1758,6 @@ "ctxt": 0 }, "value": "from", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1868,8 +1822,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1879,8 +1833,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1899,7 +1853,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1910,7 +1863,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -1946,7 +1898,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1974,7 +1925,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "property": { @@ -1985,7 +1935,6 @@ "ctxt": 0 }, "value": "from", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2050,8 +1999,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2061,8 +2010,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2081,7 +2030,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2092,7 +2040,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/types/never/neverType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/never/neverType/input.ts.json index 73282ccb22c4..9efdb821a630 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/never/neverType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/never/neverType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "error", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "message", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -94,7 +93,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -108,7 +106,6 @@ "ctxt": 0 }, "value": "message", - "typeAnnotation": null, "optional": false } } @@ -149,7 +146,6 @@ "ctxt": 0 }, "value": "errorVoid", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -170,6 +166,7 @@ "ctxt": 0 }, "value": "message", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -186,8 +183,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -227,7 +223,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -241,7 +236,6 @@ "ctxt": 0 }, "value": "message", - "typeAnnotation": null, "optional": false } } @@ -266,7 +260,6 @@ "ctxt": 0 }, "value": "fail", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -307,7 +300,6 @@ "ctxt": 0 }, "value": "error", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -349,7 +341,6 @@ "ctxt": 0 }, "value": "failOrThrow", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -370,6 +361,7 @@ "ctxt": 0 }, "value": "shouldFail", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -386,8 +378,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -420,7 +411,6 @@ "ctxt": 0 }, "value": "shouldFail", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -453,7 +443,6 @@ "ctxt": 0 }, "value": "fail", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -486,7 +475,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -510,7 +498,6 @@ "ctxt": 0 }, "value": "infiniteLoop1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -572,7 +559,6 @@ "ctxt": 0 }, "value": "infiniteLoop2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -650,7 +636,6 @@ "ctxt": 0 }, "value": "move1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -671,6 +656,7 @@ "ctxt": 0 }, "value": "direction", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -732,8 +718,7 @@ } ] } - }, - "optional": false + } } } ], @@ -766,7 +751,6 @@ "ctxt": 0 }, "value": "direction", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -885,7 +869,6 @@ "ctxt": 0 }, "value": "error", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -927,7 +910,6 @@ "ctxt": 0 }, "value": "move2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -948,6 +930,7 @@ "ctxt": 0 }, "value": "direction", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1009,8 +992,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1058,7 +1040,6 @@ "ctxt": 0 }, "value": "direction", - "typeAnnotation": null, "optional": false }, "right": { @@ -1108,7 +1089,6 @@ "ctxt": 0 }, "value": "direction", - "typeAnnotation": null, "optional": false }, "right": { @@ -1159,7 +1139,6 @@ "ctxt": 0 }, "value": "error", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1203,7 +1182,6 @@ "ctxt": 0 }, "value": "check", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1224,6 +1202,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1254,7 +1233,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1270,8 +1248,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1312,7 +1289,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1330,7 +1306,6 @@ "ctxt": 0 }, "value": "error", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1383,7 +1358,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1403,7 +1377,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1429,7 +1402,6 @@ "ctxt": 0 }, "value": "void1", - "typeAnnotation": null, "optional": false }, "function": { @@ -1470,7 +1442,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1505,7 +1476,6 @@ "ctxt": 0 }, "value": "void2", - "typeAnnotation": null, "optional": false }, "function": { @@ -1578,7 +1548,6 @@ "ctxt": 0 }, "value": "never1", - "typeAnnotation": null, "optional": false }, "function": { @@ -1619,7 +1588,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1670,7 +1638,6 @@ "ctxt": 0 }, "value": "never2", - "typeAnnotation": null, "optional": false }, "function": { @@ -1761,7 +1728,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1782,6 +1748,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1817,8 +1784,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1867,7 +1833,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1909,7 +1874,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1934,7 +1898,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1955,6 +1918,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1990,8 +1954,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2064,7 +2027,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2106,7 +2068,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2134,7 +2095,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2155,6 +2115,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2189,8 +2150,7 @@ } } } - }, - "optional": false + } } } ], @@ -2233,8 +2193,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2251,7 +2211,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2276,7 +2235,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -2312,8 +2270,8 @@ "ctxt": 0 }, "value": "errorCallback", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -2338,7 +2296,6 @@ "ctxt": 0 }, "value": "error", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2393,7 +2350,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2453,7 +2409,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2482,7 +2437,6 @@ "ctxt": 0 }, "value": "fail", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2520,7 +2474,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2564,7 +2517,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2605,7 +2557,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2619,7 +2570,6 @@ "ctxt": 0 }, "value": "errorCallback", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/never/neverTypeErrors1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/never/neverTypeErrors1/input.ts.json index bf3782799941..500e7187c968 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/never/neverTypeErrors1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/never/neverTypeErrors1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,6 +59,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -76,8 +76,7 @@ }, "kind": "never" } - }, - "optional": false + } }, "init": null, "definite": false @@ -107,8 +106,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -144,8 +143,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -186,8 +185,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -223,8 +222,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -234,7 +233,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -262,8 +260,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -298,8 +296,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -334,7 +332,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -358,7 +355,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -419,7 +415,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -488,7 +483,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -562,8 +556,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -585,7 +579,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -633,8 +626,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -656,7 +649,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/types/never/neverTypeErrors2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/never/neverTypeErrors2/input.ts.json index e79a0fd6a327..c0db0d570f66 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/never/neverTypeErrors2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/never/neverTypeErrors2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,6 +59,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -76,8 +76,7 @@ }, "kind": "never" } - }, - "optional": false + } }, "init": null, "definite": false @@ -107,8 +106,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -144,8 +143,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -186,8 +185,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -223,8 +222,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -234,7 +233,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -262,8 +260,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -298,8 +296,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -334,7 +332,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -358,7 +355,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -419,7 +415,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -488,7 +483,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -562,8 +556,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -585,7 +579,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -633,8 +626,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -656,7 +649,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/types/never/neverUnionIntersection/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/never/neverUnionIntersection/input.ts.json index 7c473cda8007..1d3157366522 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/never/neverUnionIntersection/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/never/neverUnionIntersection/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "T01", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "T02", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -120,7 +118,6 @@ "ctxt": 0 }, "value": "T03", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -178,7 +175,6 @@ "ctxt": 0 }, "value": "T04", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -236,7 +232,6 @@ "ctxt": 0 }, "value": "T05", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -285,7 +280,6 @@ "ctxt": 0 }, "value": "T06", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -334,7 +328,6 @@ "ctxt": 0 }, "value": "T07", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -383,7 +376,6 @@ "ctxt": 0 }, "value": "T08", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -432,7 +424,6 @@ "ctxt": 0 }, "value": "T09", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -481,7 +472,6 @@ "ctxt": 0 }, "value": "T10", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -530,7 +520,6 @@ "ctxt": 0 }, "value": "T11", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -566,7 +555,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -622,7 +610,6 @@ "ctxt": 0 }, "value": "T12", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -658,7 +645,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/assignObjectToNonPrimitive/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/assignObjectToNonPrimitive/input.ts.json index 101e31cd1beb..f57870fc2d58 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/assignObjectToNonPrimitive/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/assignObjectToNonPrimitive/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -93,7 +93,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -142,6 +141,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -158,8 +158,7 @@ }, "kind": "object" } - }, - "optional": false + } }, "init": null, "definite": false @@ -189,8 +188,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -200,7 +199,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -228,8 +226,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -239,7 +237,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveAccessProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveAccessProperty/input.ts.json index 6e094534f30a..bafd2ad9e026 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveAccessProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveAccessProperty/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "object" } - }, - "optional": false + } }, "init": null, "definite": false @@ -84,7 +84,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -95,7 +94,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -133,7 +131,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "nonExist", - "typeAnnotation": null, "optional": false }, "computed": false @@ -193,7 +189,6 @@ "ctxt": 0 }, "value": "destructuring", - "typeAnnotation": null, "optional": false }, "value": null @@ -210,7 +205,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -262,8 +256,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -279,7 +273,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveAndTypeVariables/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveAndTypeVariables/input.ts.json index 16fddd405dbc..cca4ee0b52fc 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveAndTypeVariables/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveAndTypeVariables/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -126,7 +122,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -166,7 +161,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -186,7 +180,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -207,7 +200,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -265,7 +257,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -291,7 +282,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -312,7 +302,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -343,7 +332,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -369,7 +357,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -409,7 +396,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -429,7 +415,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -458,7 +443,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -536,6 +520,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -558,7 +543,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -593,7 +577,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -676,8 +659,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -697,7 +679,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -741,6 +722,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -763,7 +745,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -798,7 +779,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -881,8 +861,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -902,7 +881,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -931,7 +909,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -952,6 +929,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -974,13 +952,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1023,6 +999,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1039,8 +1016,7 @@ }, "kind": "object" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1050,7 +1026,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1082,6 +1057,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1112,7 +1088,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1128,8 +1103,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1139,7 +1113,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1173,7 +1146,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1194,7 +1166,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveAsProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveAsProperty/input.ts.json index c493794f04c5..935888a580f8 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveAsProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveAsProperty/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "WithNonPrimitive", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -105,6 +103,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -127,13 +126,11 @@ "ctxt": 0 }, "value": "WithNonPrimitive", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -153,7 +150,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -174,7 +170,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -226,6 +221,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -248,13 +244,11 @@ "ctxt": 0 }, "value": "WithNonPrimitive", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -274,7 +268,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveAssignError/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveAssignError/input.ts.json index 575cceb14b57..76c116d398dd 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveAssignError/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveAssignError/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -93,7 +93,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -142,6 +141,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -158,8 +158,7 @@ }, "kind": "object" } - }, - "optional": false + } }, "init": null, "definite": false @@ -189,8 +188,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -200,7 +199,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -228,8 +226,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -239,7 +237,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -267,8 +264,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -278,7 +275,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -306,8 +302,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -317,7 +313,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -347,8 +342,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -388,8 +383,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -429,8 +424,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -473,8 +468,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -484,7 +479,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -512,8 +506,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -523,7 +517,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -551,8 +544,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -562,7 +555,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -590,8 +582,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -601,7 +593,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -629,8 +620,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -640,7 +631,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -668,8 +658,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -679,7 +669,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -709,6 +698,7 @@ "ctxt": 0 }, "value": "numObj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -731,13 +721,11 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -777,6 +765,7 @@ "ctxt": 0 }, "value": "boolObj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -799,13 +788,11 @@ "ctxt": 0 }, "value": "Boolean", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "BooleanLiteral", @@ -845,6 +832,7 @@ "ctxt": 0 }, "value": "strObj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -867,13 +855,11 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -916,8 +902,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -927,7 +913,6 @@ "ctxt": 0 }, "value": "numObj", - "typeAnnotation": null, "optional": false } } @@ -955,8 +940,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -966,7 +951,6 @@ "ctxt": 0 }, "value": "boolObj", - "typeAnnotation": null, "optional": false } } @@ -994,8 +978,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1005,7 +989,6 @@ "ctxt": 0 }, "value": "strObj", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveConstraintOfIndexAccessType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveConstraintOfIndexAccessType/input.ts.json index 6b098bdc8d0f..832fc5774ace 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveConstraintOfIndexAccessType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveConstraintOfIndexAccessType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -73,6 +72,7 @@ "ctxt": 0 }, "value": "tp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -103,7 +103,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -123,14 +122,12 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -171,8 +168,8 @@ "ctxt": 0 }, "value": "tp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -182,7 +179,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -214,7 +210,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -243,7 +238,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -269,7 +263,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -307,7 +300,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -328,6 +320,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -344,8 +337,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -364,6 +356,7 @@ "ctxt": 0 }, "value": "tp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -394,7 +387,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -414,14 +406,12 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -462,8 +452,8 @@ "ctxt": 0 }, "value": "tp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -473,7 +463,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -505,7 +494,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -534,7 +522,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -560,7 +547,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -598,7 +584,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -619,6 +604,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -635,8 +621,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -655,6 +640,7 @@ "ctxt": 0 }, "value": "tp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -685,7 +671,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -705,14 +690,12 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -753,8 +736,8 @@ "ctxt": 0 }, "value": "tp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -764,7 +747,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -796,7 +778,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -825,7 +806,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -851,7 +831,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -889,7 +868,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -910,6 +888,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -926,8 +905,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -946,6 +924,7 @@ "ctxt": 0 }, "value": "tp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -976,7 +955,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -996,14 +974,12 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -1044,8 +1020,8 @@ "ctxt": 0 }, "value": "tp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1055,7 +1031,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -1087,7 +1062,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1116,7 +1090,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1142,7 +1115,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1180,7 +1152,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1201,6 +1172,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1217,8 +1189,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -1237,6 +1208,7 @@ "ctxt": 0 }, "value": "tp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1267,7 +1239,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1287,14 +1258,12 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -1335,8 +1304,8 @@ "ctxt": 0 }, "value": "tp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1346,7 +1315,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -1378,7 +1346,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1407,7 +1374,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1433,7 +1399,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1471,7 +1436,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1492,6 +1456,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1508,8 +1473,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -1528,6 +1492,7 @@ "ctxt": 0 }, "value": "tp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1558,7 +1523,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1578,14 +1542,12 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -1626,8 +1588,8 @@ "ctxt": 0 }, "value": "tp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1637,7 +1599,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -1669,7 +1630,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1698,7 +1658,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1724,7 +1683,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1762,7 +1720,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1783,6 +1740,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1799,8 +1757,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -1819,6 +1776,7 @@ "ctxt": 0 }, "value": "tp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1849,7 +1807,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1869,14 +1826,12 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -1917,8 +1872,8 @@ "ctxt": 0 }, "value": "tp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1928,7 +1883,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -1960,7 +1914,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1989,7 +1942,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2015,7 +1967,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2053,7 +2004,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2074,6 +2024,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2090,8 +2041,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -2110,6 +2060,7 @@ "ctxt": 0 }, "value": "tp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2140,7 +2091,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2160,14 +2110,12 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -2208,8 +2156,8 @@ "ctxt": 0 }, "value": "tp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2219,7 +2167,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -2251,7 +2198,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2280,7 +2226,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2306,7 +2251,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2344,7 +2288,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2365,6 +2308,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2381,8 +2325,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -2401,6 +2344,7 @@ "ctxt": 0 }, "value": "tp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2431,7 +2375,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2451,14 +2394,12 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -2499,8 +2440,8 @@ "ctxt": 0 }, "value": "tp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2510,7 +2451,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -2542,7 +2482,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2569,7 +2508,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2614,7 +2552,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2640,7 +2577,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2678,7 +2614,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2699,6 +2634,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2715,8 +2651,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -2735,6 +2670,7 @@ "ctxt": 0 }, "value": "tp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2765,7 +2701,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2785,14 +2720,12 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -2833,8 +2766,8 @@ "ctxt": 0 }, "value": "tp", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2844,7 +2777,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -2876,7 +2808,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2898,6 +2829,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2914,8 +2846,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2961,7 +2892,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2987,7 +2917,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveInFunction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveInFunction/input.ts.json index 93f4e3951298..f6b3b74551fd 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveInFunction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveInFunction/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "takeObject", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "object" } - }, - "optional": false + } } } ], @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "returnObject", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -172,6 +170,7 @@ "ctxt": 0 }, "value": "nonPrimitive", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -188,8 +187,7 @@ }, "kind": "object" } - }, - "optional": false + } }, "init": null, "definite": false @@ -221,6 +219,7 @@ "ctxt": 0 }, "value": "primitive", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -237,8 +236,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -267,7 +265,6 @@ "ctxt": 0 }, "value": "takeObject", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -281,7 +278,6 @@ "ctxt": 0 }, "value": "nonPrimitive", - "typeAnnotation": null, "optional": false } } @@ -312,8 +308,8 @@ "ctxt": 0 }, "value": "nonPrimitive", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -330,7 +326,6 @@ "ctxt": 0 }, "value": "returnObject", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -360,7 +355,6 @@ "ctxt": 0 }, "value": "takeObject", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -374,7 +368,6 @@ "ctxt": 0 }, "value": "primitive", - "typeAnnotation": null, "optional": false } } @@ -405,8 +398,8 @@ "ctxt": 0 }, "value": "primitive", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -423,7 +416,6 @@ "ctxt": 0 }, "value": "returnObject", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -441,7 +433,6 @@ "ctxt": 0 }, "value": "returnError", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -485,8 +476,8 @@ "ctxt": 0 }, "value": "ret", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -516,7 +507,6 @@ "ctxt": 0 }, "value": "ret", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveInGeneric/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveInGeneric/input.ts.json index 53437c1c0bb8..9fa199f8fd4f 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveInGeneric/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveInGeneric/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "generic", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -108,6 +106,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -124,8 +123,7 @@ }, "kind": "object" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -135,7 +133,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "definite": false @@ -169,7 +166,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -204,8 +200,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -245,8 +241,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -288,7 +284,6 @@ "ctxt": 0 }, "value": "generic", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -348,7 +343,6 @@ "ctxt": 0 }, "value": "generic", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -362,7 +356,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -410,7 +403,6 @@ "ctxt": 0 }, "value": "generic", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -470,7 +462,6 @@ "ctxt": 0 }, "value": "generic", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -484,7 +475,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -520,7 +510,6 @@ "ctxt": 0 }, "value": "bound", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -541,6 +530,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -563,13 +553,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -612,6 +600,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -628,8 +617,7 @@ }, "kind": "object" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -639,7 +627,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "definite": false @@ -673,7 +660,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -713,7 +699,6 @@ "ctxt": 0 }, "value": "bound", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -755,7 +740,6 @@ "ctxt": 0 }, "value": "bound", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -769,7 +753,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -799,7 +782,6 @@ "ctxt": 0 }, "value": "bound", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -841,7 +823,6 @@ "ctxt": 0 }, "value": "bound", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -855,7 +836,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -873,7 +853,6 @@ "ctxt": 0 }, "value": "bound2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -918,7 +897,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -958,7 +936,6 @@ "ctxt": 0 }, "value": "bound2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1005,7 +982,6 @@ "ctxt": 0 }, "value": "bound2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1032,7 +1008,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1063,7 +1038,6 @@ "ctxt": 0 }, "value": "bound2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1110,7 +1084,6 @@ "ctxt": 0 }, "value": "bound2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1145,7 +1118,6 @@ "ctxt": 0 }, "value": "bound3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1166,6 +1138,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1188,13 +1161,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1237,6 +1208,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1253,8 +1225,7 @@ }, "kind": "object" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1264,7 +1235,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1298,7 +1268,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1331,7 +1300,6 @@ "ctxt": 0 }, "value": "Proxy", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1358,7 +1326,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1410,6 +1377,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1432,7 +1400,6 @@ "ctxt": 0 }, "value": "Proxy", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1455,8 +1422,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1488,6 +1454,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1510,7 +1477,6 @@ "ctxt": 0 }, "value": "Proxy", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1533,8 +1499,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1566,6 +1531,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1588,7 +1554,6 @@ "ctxt": 0 }, "value": "Proxy", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1611,8 +1576,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1634,7 +1598,6 @@ "ctxt": 0 }, "value": "Blah", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1664,7 +1627,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1718,6 +1680,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1740,7 +1703,6 @@ "ctxt": 0 }, "value": "Proxy", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1766,7 +1728,6 @@ "ctxt": 0 }, "value": "Blah", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1774,8 +1735,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveIndexingWithForIn/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveIndexingWithForIn/input.ts.json index 91abf039b1ab..8a4f3e3caf2d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveIndexingWithForIn/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveIndexingWithForIn/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "object" } - }, - "optional": false + } }, "init": null, "definite": false @@ -87,8 +87,8 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -103,7 +103,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "body": { @@ -139,8 +138,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -157,7 +156,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -168,7 +166,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true diff --git a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveIndexingWithForInNoImplicitAny/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveIndexingWithForInNoImplicitAny/input.ts.json index 4a92ea79666a..31021ea622d2 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveIndexingWithForInNoImplicitAny/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveIndexingWithForInNoImplicitAny/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "object" } - }, - "optional": false + } }, "init": null, "definite": false @@ -87,8 +87,8 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -103,7 +103,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "body": { @@ -139,8 +138,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -157,7 +156,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -168,7 +166,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true diff --git a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveIndexingWithForInSupressError/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveIndexingWithForInSupressError/input.ts.json index 11c96d1e8b85..9cc5e24a9aac 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveIndexingWithForInSupressError/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveIndexingWithForInSupressError/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "object" } - }, - "optional": false + } }, "init": null, "definite": false @@ -87,8 +87,8 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -103,7 +103,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "body": { @@ -139,8 +138,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -157,7 +156,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -168,7 +166,6 @@ "ctxt": 0 }, "value": "key", - "typeAnnotation": null, "optional": false }, "computed": true diff --git a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveNarrow/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveNarrow/input.ts.json index a6382c45d2b9..03cf6f88bd57 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveNarrow/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveNarrow/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Narrow", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "narrowed", - "typeAnnotation": null, "optional": false }, "value": null, @@ -105,6 +103,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,8 +120,7 @@ }, "kind": "object" } - }, - "optional": false + } }, "init": null, "definite": false @@ -152,7 +150,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -163,7 +160,6 @@ "ctxt": 0 }, "value": "Narrow", - "typeAnnotation": null, "optional": false } }, @@ -197,7 +193,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -208,7 +203,6 @@ "ctxt": 0 }, "value": "narrowed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -237,8 +231,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -286,7 +280,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -342,7 +335,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -353,7 +345,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -391,6 +382,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -426,8 +418,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -465,7 +456,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -521,7 +511,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -532,7 +521,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -580,7 +568,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -591,7 +578,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveRhsSideOfInExpression/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveRhsSideOfInExpression/input.ts.json index f8bb55292d33..a2670343a2ab 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveRhsSideOfInExpression/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveRhsSideOfInExpression/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "object" } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -73,7 +73,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -157,8 +156,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -190,7 +189,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } }, @@ -223,8 +221,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -263,7 +261,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveStrictNull/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveStrictNull/input.ts.json index fd0d59406383..3f7ea60e99fb 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveStrictNull/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveStrictNull/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "object" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -115,8 +116,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -148,6 +148,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -183,8 +184,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -216,6 +216,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -260,8 +261,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -293,6 +293,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -328,8 +329,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -358,7 +358,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -369,7 +368,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -398,8 +396,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -409,7 +407,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -437,8 +434,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -473,8 +470,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -484,7 +481,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -512,8 +508,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -523,7 +519,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -551,8 +546,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -562,7 +557,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -590,8 +584,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -601,7 +595,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -629,8 +622,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -640,7 +633,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -676,7 +668,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -732,7 +723,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -743,7 +733,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -787,7 +776,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -837,8 +825,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -848,7 +836,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -888,7 +875,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -938,8 +924,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -949,7 +935,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -983,7 +968,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -994,7 +978,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1042,7 +1025,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -1053,7 +1035,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1088,7 +1069,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1137,7 +1117,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -1148,7 +1127,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1196,7 +1174,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -1207,7 +1184,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1242,7 +1218,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1291,7 +1266,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -1302,7 +1276,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1350,7 +1323,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -1361,7 +1333,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1404,7 +1375,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -1460,7 +1430,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -1471,7 +1440,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1519,7 +1487,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -1530,7 +1497,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1557,7 +1523,6 @@ "ctxt": 0 }, "value": "Proxy", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1584,7 +1549,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1636,6 +1600,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1658,7 +1623,6 @@ "ctxt": 0 }, "value": "Proxy", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1681,8 +1645,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1714,6 +1677,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1736,7 +1700,6 @@ "ctxt": 0 }, "value": "Proxy", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1759,8 +1722,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1792,6 +1754,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1814,7 +1777,6 @@ "ctxt": 0 }, "value": "Proxy", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1837,8 +1799,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1860,7 +1821,6 @@ "ctxt": 0 }, "value": "Blah", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1890,7 +1850,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1944,6 +1903,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1966,7 +1926,6 @@ "ctxt": 0 }, "value": "Proxy", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1992,7 +1951,6 @@ "ctxt": 0 }, "value": "Blah", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2000,8 +1958,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveUnionIntersection/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveUnionIntersection/input.ts.json index 072ff431781e..531de304f9d1 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveUnionIntersection/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/nonPrimitive/nonPrimitiveUnionIntersection/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -112,6 +112,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -147,8 +148,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -193,6 +193,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -228,8 +229,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -267,8 +267,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -278,7 +278,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -306,8 +305,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -317,7 +316,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -347,6 +345,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -382,8 +381,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -403,7 +401,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -452,6 +449,7 @@ "ctxt": 0 }, "value": "bar", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -500,7 +498,6 @@ "ctxt": 0 }, "value": "err", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -530,8 +527,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -551,7 +547,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignatureWithoutAnnotationsOrBody/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignatureWithoutAnnotationsOrBody/input.ts.json index 1cca271a6ce3..5a1c3bc12ef0 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignatureWithoutAnnotationsOrBody/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignatureWithoutAnnotationsOrBody/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -87,8 +86,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -105,7 +104,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -143,7 +141,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,7 +181,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -221,6 +217,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -243,13 +240,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -281,8 +276,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -299,7 +294,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -334,8 +328,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -359,7 +353,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -370,7 +363,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -407,6 +399,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -449,7 +442,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -460,8 +452,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -493,8 +484,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -511,7 +502,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -546,8 +536,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -571,7 +561,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -582,7 +571,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignatureWithoutReturnTypeAnnotationInference/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignatureWithoutReturnTypeAnnotationInference/input.ts.json index 7d117c62a67e..bbf37b685ad1 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignatureWithoutReturnTypeAnnotationInference/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignatureWithoutReturnTypeAnnotationInference/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -105,8 +104,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -123,7 +122,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -156,7 +154,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -177,8 +174,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -218,7 +215,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -232,7 +228,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -272,8 +267,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -290,7 +285,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -323,7 +317,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -364,7 +357,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -403,8 +395,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -421,7 +413,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -441,7 +432,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -462,6 +452,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -484,13 +475,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -523,7 +512,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -554,7 +542,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -589,8 +576,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -607,7 +594,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -640,7 +626,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -661,8 +646,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -783,8 +768,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -801,7 +786,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -834,7 +818,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -855,8 +838,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -905,8 +888,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -996,8 +979,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1014,7 +997,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1047,7 +1029,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1068,8 +1049,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1110,7 +1091,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1147,8 +1127,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1165,7 +1145,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1198,7 +1177,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1219,6 +1197,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1235,8 +1214,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1279,7 +1257,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1290,7 +1267,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1329,8 +1305,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1347,7 +1323,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1385,7 +1360,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1415,7 +1389,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1454,7 +1427,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1475,6 +1447,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1491,8 +1464,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1535,6 +1507,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1557,13 +1530,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1585,7 +1556,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -1621,8 +1591,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1639,7 +1609,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1672,7 +1641,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1698,7 +1666,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1746,7 +1713,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1767,6 +1733,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1783,8 +1750,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1827,6 +1793,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1849,13 +1816,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1877,7 +1842,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1913,8 +1877,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1931,7 +1895,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1971,7 +1934,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -2014,8 +1976,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2048,7 +2010,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2074,7 +2035,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2126,7 +2086,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2160,7 +2119,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } } @@ -2196,8 +2154,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2214,7 +2172,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2239,7 +2196,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2269,7 +2225,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2313,7 +2268,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2343,7 +2297,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2382,7 +2335,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2426,6 +2378,7 @@ "ctxt": 0 }, "value": "i2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2448,13 +2401,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2476,7 +2427,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false } } @@ -2512,8 +2462,8 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2530,7 +2480,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2550,7 +2499,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2610,7 +2558,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "body": { @@ -2653,8 +2600,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2683,7 +2630,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2717,7 +2663,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false } } @@ -2753,8 +2698,8 @@ "ctxt": 0 }, "value": "r13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2771,7 +2716,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2791,7 +2735,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2817,7 +2760,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2863,7 +2805,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2883,8 +2824,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -2924,7 +2865,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "body": { @@ -2967,8 +2907,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2997,7 +2937,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3031,7 +2970,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } } @@ -3067,8 +3005,8 @@ "ctxt": 0 }, "value": "r14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3085,7 +3023,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3112,7 +3049,6 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, "optional": false }, "members": [ @@ -3131,7 +3067,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -3155,7 +3090,6 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, "optional": false }, "body": { @@ -3198,8 +3132,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -3228,7 +3162,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3262,7 +3195,6 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, "optional": false } } @@ -3298,8 +3230,8 @@ "ctxt": 0 }, "value": "r15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3316,7 +3248,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesThatDifferOnlyByReturnType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesThatDifferOnlyByReturnType/input.ts.json index 6f47d039738a..059c777db9cf 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesThatDifferOnlyByReturnType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesThatDifferOnlyByReturnType/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,8 +50,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": { @@ -90,8 +89,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": { @@ -129,6 +128,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -151,13 +151,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -200,7 +198,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -225,6 +222,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -247,13 +245,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -296,7 +292,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -323,7 +318,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -353,6 +347,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -375,13 +370,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -424,7 +417,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -449,6 +441,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -471,13 +464,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -520,7 +511,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -547,7 +537,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -574,7 +563,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -607,6 +595,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -629,13 +618,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -673,6 +660,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -695,13 +683,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -751,6 +737,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -782,8 +769,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -793,8 +780,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": { @@ -819,7 +806,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -843,8 +829,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -854,8 +840,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": { @@ -879,8 +865,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -912,6 +897,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -943,6 +929,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -965,13 +952,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1014,7 +999,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1039,6 +1023,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1061,13 +1046,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1110,7 +1093,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1121,8 +1103,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesThatDifferOnlyByReturnType2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesThatDifferOnlyByReturnType2/input.ts.json index 9e3c503c0f24..df6117895b48 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesThatDifferOnlyByReturnType2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesThatDifferOnlyByReturnType2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,6 +92,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -111,8 +109,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -137,7 +134,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -163,7 +159,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -222,7 +216,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -281,6 +274,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -303,13 +297,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -341,8 +333,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -366,7 +358,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -377,7 +368,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -427,8 +417,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -452,7 +442,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -463,7 +452,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesThatDifferOnlyByReturnType3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesThatDifferOnlyByReturnType3/input.ts.json index 1dba1ad5eebb..1946b51ec25d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesThatDifferOnlyByReturnType3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesThatDifferOnlyByReturnType3/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,6 +50,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -67,8 +67,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -108,7 +107,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -138,6 +136,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -154,8 +153,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -195,7 +193,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -222,7 +219,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -255,6 +251,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -271,8 +268,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -312,7 +308,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -339,7 +334,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -372,6 +366,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -388,8 +383,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesWithAccessibilityModifiersOnParameters/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesWithAccessibilityModifiersOnParameters/input.ts.json index 2115176003ba..9f3ae3e436a4 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesWithAccessibilityModifiersOnParameters/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesWithAccessibilityModifiersOnParameters/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -57,8 +56,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -107,8 +106,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -120,7 +119,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -140,8 +138,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -160,8 +158,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -214,8 +212,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -237,8 +235,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -257,8 +255,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -311,8 +309,8 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -330,8 +328,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -341,8 +339,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -388,8 +386,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -407,6 +405,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -429,13 +428,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -445,6 +442,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -467,13 +465,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -510,7 +506,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -534,7 +529,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -555,6 +549,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -571,8 +566,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -591,6 +585,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -607,8 +602,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -657,8 +651,8 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -670,7 +664,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -690,6 +683,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -706,8 +700,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -726,6 +719,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -742,8 +736,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -796,8 +789,8 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -819,6 +812,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -835,8 +829,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -855,6 +848,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -871,8 +865,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -925,8 +918,8 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -944,6 +937,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -960,8 +954,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -971,6 +964,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -987,8 +981,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1034,8 +1027,8 @@ "ctxt": 0 }, "value": "f8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1053,6 +1046,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1075,13 +1069,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1091,6 +1083,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1113,13 +1106,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1156,7 +1147,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1180,7 +1170,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1206,7 +1195,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -1227,8 +1215,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1247,8 +1235,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1293,7 +1281,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "function": { @@ -1314,6 +1301,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1330,8 +1318,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -1350,6 +1337,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1366,8 +1354,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1412,7 +1399,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "function": { @@ -1433,6 +1419,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1455,13 +1442,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1480,6 +1465,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1502,13 +1488,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1552,7 +1536,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1590,7 +1573,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1620,8 +1602,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1631,8 +1613,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": null, @@ -1654,6 +1636,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1670,8 +1653,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1681,6 +1663,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1697,8 +1680,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -1720,7 +1702,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1734,8 +1715,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1745,8 +1726,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnn": null, @@ -1768,7 +1749,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1782,6 +1762,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1798,8 +1779,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1809,6 +1789,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1825,8 +1806,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": null, @@ -1848,7 +1828,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1862,6 +1841,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1884,13 +1864,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1900,6 +1878,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1922,13 +1901,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": null, @@ -1955,7 +1932,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1992,6 +1968,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2023,7 +2000,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2037,8 +2013,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2048,8 +2024,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnn": null, @@ -2071,7 +2047,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2085,6 +2060,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2101,8 +2077,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2112,6 +2087,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2128,8 +2104,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": null, @@ -2137,8 +2112,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2170,8 +2144,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -2191,7 +2165,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2211,8 +2184,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -2231,8 +2204,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -2266,7 +2239,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2279,7 +2251,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2299,6 +2270,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2315,8 +2287,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -2335,6 +2306,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2351,8 +2323,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -2387,7 +2358,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2406,6 +2376,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2428,13 +2399,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2444,6 +2413,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2466,13 +2436,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2509,7 +2477,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesWithDuplicateParameters/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesWithDuplicateParameters/input.ts.json index 02571f6bc0c6..45da83e394e0 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesWithDuplicateParameters/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesWithDuplicateParameters/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -57,8 +56,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -107,8 +106,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -120,7 +119,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -140,8 +138,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -160,8 +158,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -214,8 +212,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -237,8 +235,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -257,8 +255,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -311,8 +309,8 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -330,8 +328,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -341,8 +339,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -388,8 +386,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -407,6 +405,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -429,13 +428,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -445,6 +442,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -467,13 +465,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -510,7 +506,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -534,7 +529,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -555,6 +549,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -571,8 +566,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -591,6 +585,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -607,8 +602,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -657,8 +651,8 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -670,7 +664,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -690,6 +683,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -706,8 +700,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -726,6 +719,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -742,8 +736,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -796,8 +789,8 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -819,6 +812,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -835,8 +829,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -855,6 +848,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -871,8 +865,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -925,8 +918,8 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -944,6 +937,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -960,8 +954,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -971,6 +964,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -987,8 +981,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1034,8 +1027,8 @@ "ctxt": 0 }, "value": "f8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1053,6 +1046,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1075,13 +1069,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1091,6 +1083,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1113,13 +1106,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1156,7 +1147,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1180,7 +1170,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1206,7 +1195,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -1227,8 +1215,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1247,8 +1235,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1293,7 +1281,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "function": { @@ -1314,6 +1301,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1330,8 +1318,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -1350,6 +1337,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1366,8 +1354,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1412,7 +1399,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "function": { @@ -1433,6 +1419,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1455,13 +1442,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1480,6 +1465,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1502,13 +1488,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1552,7 +1536,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1590,7 +1573,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1620,8 +1602,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1631,8 +1613,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": null, @@ -1654,6 +1636,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1670,8 +1653,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1681,6 +1663,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1697,8 +1680,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -1720,7 +1702,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1734,8 +1715,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1745,8 +1726,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnn": null, @@ -1768,7 +1749,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1782,6 +1762,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1798,8 +1779,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1809,6 +1789,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1825,8 +1806,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": null, @@ -1848,7 +1828,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1862,6 +1841,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1884,13 +1864,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1900,6 +1878,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1922,13 +1901,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": null, @@ -1955,7 +1932,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1992,6 +1968,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2023,7 +2000,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2037,8 +2013,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2048,8 +2024,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnn": null, @@ -2071,7 +2047,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2085,6 +2060,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2101,8 +2077,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2112,6 +2087,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2128,8 +2104,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": null, @@ -2137,8 +2112,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2170,8 +2144,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -2191,7 +2165,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2211,8 +2184,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -2231,8 +2204,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -2266,7 +2239,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2279,7 +2251,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2299,6 +2270,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2315,8 +2287,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -2335,6 +2306,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2351,8 +2323,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -2387,7 +2358,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2406,6 +2376,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2428,13 +2399,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2444,6 +2413,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2466,13 +2436,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2509,7 +2477,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesWithOptionalParameters/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesWithOptionalParameters/input.ts.json index 8a12521713fd..88e01e3aac4c 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesWithOptionalParameters/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesWithOptionalParameters/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -103,8 +102,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -116,7 +115,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -136,6 +134,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -152,8 +151,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -206,8 +204,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -225,6 +223,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -241,8 +240,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -252,6 +250,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -268,8 +267,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "body": { @@ -312,7 +310,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -354,7 +351,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -383,7 +379,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -425,7 +420,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -454,7 +448,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -496,7 +489,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -538,7 +530,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -564,7 +555,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -585,6 +575,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -601,8 +592,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -664,6 +654,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -686,13 +677,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -728,7 +717,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -739,7 +727,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -777,7 +764,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -788,7 +774,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -825,7 +810,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -855,6 +839,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -871,8 +856,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnnotation": null, @@ -894,7 +878,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -908,6 +891,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -924,8 +908,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -935,6 +918,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -951,8 +935,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnn": null, @@ -986,6 +969,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1008,13 +992,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1043,7 +1025,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1072,7 +1053,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1121,7 +1101,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1132,7 +1111,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1183,7 +1161,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1194,7 +1171,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1253,6 +1229,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1284,6 +1261,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1300,8 +1278,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnnotation": null, @@ -1323,7 +1300,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1337,6 +1313,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1353,8 +1330,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnn": null, @@ -1362,8 +1338,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1392,7 +1367,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1421,7 +1395,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1470,7 +1443,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1481,7 +1453,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1519,7 +1490,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1530,7 +1500,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1577,8 +1546,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1598,7 +1567,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1618,6 +1586,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1634,8 +1603,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -1669,7 +1637,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1682,7 +1649,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1702,6 +1668,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1718,8 +1685,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -1738,6 +1704,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1754,8 +1721,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -1790,7 +1756,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1809,6 +1774,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1825,8 +1791,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "body": { @@ -1879,7 +1844,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1890,7 +1854,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1928,7 +1891,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1939,7 +1901,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1990,7 +1951,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2001,7 +1961,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2052,7 +2011,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2063,7 +2021,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2126,7 +2083,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2137,7 +2093,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2175,7 +2130,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2186,7 +2140,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesWithOptionalParameters2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesWithOptionalParameters2/input.ts.json index d28a78915988..392a58114e45 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesWithOptionalParameters2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/callSignaturesWithOptionalParameters2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -80,7 +79,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -101,6 +99,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -117,8 +116,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -164,7 +162,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -206,7 +203,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -223,7 +219,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -244,6 +239,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -260,8 +256,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -287,7 +282,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -308,6 +302,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -324,8 +319,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -344,6 +338,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -360,8 +355,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -387,7 +381,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -408,6 +401,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -424,8 +418,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -444,6 +437,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -460,8 +454,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -507,7 +500,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -549,7 +541,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -591,7 +582,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -617,7 +607,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -638,6 +627,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -654,8 +644,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -692,7 +681,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -713,6 +701,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -729,8 +718,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -775,7 +763,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "function": { @@ -796,6 +783,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -812,8 +800,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -850,7 +837,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "function": { @@ -871,6 +857,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -887,8 +874,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -907,6 +893,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -923,8 +910,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -961,7 +947,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "function": { @@ -982,6 +967,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -998,8 +984,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -1018,6 +1003,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1034,8 +1020,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -1097,6 +1082,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1119,13 +1105,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1161,7 +1145,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1172,7 +1155,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1210,7 +1192,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1221,7 +1202,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1272,7 +1252,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1283,7 +1262,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1334,7 +1312,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1345,7 +1322,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1394,7 +1370,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1424,6 +1399,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1440,8 +1416,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnnotation": null, @@ -1463,6 +1438,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1479,8 +1455,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -1490,6 +1465,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1506,8 +1482,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnnotation": null, @@ -1529,7 +1504,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1543,6 +1517,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1559,8 +1534,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1570,6 +1544,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1586,8 +1561,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnn": null, @@ -1609,7 +1583,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1623,6 +1596,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1639,8 +1613,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1650,6 +1623,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1666,8 +1640,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -1677,6 +1650,7 @@ "ctxt": 0 }, "value": "z", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1693,8 +1667,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnn": null, @@ -1728,6 +1701,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1750,13 +1724,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1785,7 +1757,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1814,7 +1785,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1856,7 +1826,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1917,7 +1886,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1928,7 +1896,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1979,7 +1946,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1990,7 +1956,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2053,7 +2018,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -2064,7 +2028,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2135,6 +2098,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2166,6 +2130,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2182,8 +2147,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnnotation": null, @@ -2205,6 +2169,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2221,8 +2186,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -2232,6 +2196,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2248,8 +2213,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnnotation": null, @@ -2271,7 +2235,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2285,6 +2248,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2301,8 +2265,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2312,6 +2275,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2328,8 +2292,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnn": null, @@ -2351,7 +2314,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2365,6 +2327,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2381,8 +2344,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2392,6 +2354,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2408,8 +2371,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -2419,6 +2381,7 @@ "ctxt": 0 }, "value": "z", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2435,8 +2398,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnn": null, @@ -2444,8 +2406,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2474,7 +2435,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2503,7 +2463,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2545,7 +2504,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2606,7 +2564,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -2617,7 +2574,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2668,7 +2624,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -2679,7 +2634,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2742,7 +2696,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -2753,7 +2706,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters/input.ts.json index 315d49719dfb..e09881a1aa8d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -64,8 +62,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -86,8 +84,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -120,7 +118,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -146,7 +143,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -168,8 +164,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -202,7 +198,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -228,7 +223,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -250,8 +244,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -289,7 +283,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -319,8 +312,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": null, @@ -344,7 +337,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -374,8 +366,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": null, @@ -409,6 +401,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -440,8 +433,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": null, @@ -449,8 +442,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -482,6 +474,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -513,8 +506,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": null, @@ -522,8 +515,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters2/input.ts.json index c886690ff179..55d55d33f5cc 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/constructSignatureWithAccessibilityModifiersOnParameters2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -64,8 +62,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -86,8 +84,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -110,7 +108,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -132,8 +129,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -154,8 +151,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -188,7 +185,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -214,7 +210,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -236,8 +231,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -260,7 +255,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -282,8 +276,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -316,7 +310,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -342,7 +335,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -364,8 +356,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -388,7 +380,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -410,8 +401,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -449,7 +440,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -479,8 +469,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": null, @@ -502,8 +492,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": null, @@ -527,7 +517,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -557,8 +546,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": null, @@ -580,8 +569,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": null, @@ -615,6 +604,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -646,8 +636,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": null, @@ -669,8 +659,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": null, @@ -678,8 +668,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -711,6 +700,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -742,8 +732,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": null, @@ -765,8 +755,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": null, @@ -774,8 +764,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/identicalCallSignatures/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/identicalCallSignatures/input.ts.json index fc4171d98b2f..c5b026bd570a 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/identicalCallSignatures/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/identicalCallSignatures/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,8 +50,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": { @@ -90,6 +89,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -106,8 +106,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -145,6 +144,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -167,13 +167,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -198,7 +196,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -227,7 +224,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -252,6 +248,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -274,13 +271,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -305,7 +300,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -334,7 +328,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -361,7 +354,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -388,7 +380,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -421,6 +412,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -443,13 +435,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -474,7 +464,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -498,6 +487,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -520,13 +510,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -551,7 +539,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -587,6 +574,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -618,8 +606,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": { @@ -657,6 +645,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -673,8 +662,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -712,6 +700,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -734,13 +723,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -765,7 +752,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -794,7 +780,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -819,6 +804,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -841,13 +827,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -872,7 +856,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -901,7 +884,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -912,8 +894,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/identicalCallSignatures2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/identicalCallSignatures2/input.ts.json index 8676358d3fd3..f9b6b98538ac 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/identicalCallSignatures2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/identicalCallSignatures2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -81,6 +79,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -97,8 +96,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -138,7 +136,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -159,7 +156,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -197,7 +193,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -246,7 +241,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -273,7 +267,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -297,7 +290,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -335,7 +327,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/identicalCallSignatures3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/identicalCallSignatures3/input.ts.json index 32d200c6ef2a..9476a6c78ca3 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/identicalCallSignatures3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/identicalCallSignatures3/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,6 +50,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -67,8 +67,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -108,7 +107,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -138,6 +136,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -154,8 +153,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -195,7 +193,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -222,7 +219,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -255,6 +251,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -271,8 +268,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -312,7 +308,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -339,7 +334,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -372,6 +366,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -388,8 +383,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/parametersWithNoAnnotationAreAny/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/parametersWithNoAnnotationAreAny/input.ts.json index c85932eedfc4..62b434832c1c 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/parametersWithNoAnnotationAreAny/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/parametersWithNoAnnotationAreAny/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,8 +36,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -107,8 +105,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -120,7 +118,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -140,8 +137,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -174,7 +171,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -214,8 +210,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -233,8 +229,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -245,7 +241,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -282,8 +277,8 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -301,8 +296,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -313,7 +308,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -341,7 +335,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -365,7 +358,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -391,7 +383,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -412,8 +403,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -446,7 +437,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -485,7 +475,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -515,7 +504,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -529,8 +517,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnn": null, @@ -552,7 +540,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -566,8 +553,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -577,8 +564,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnn": null, @@ -612,6 +599,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -643,7 +631,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -657,8 +644,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnn": null, @@ -666,8 +653,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -699,8 +685,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -720,7 +706,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -740,8 +725,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -774,7 +759,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -795,7 +779,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -808,7 +791,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -828,8 +810,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -862,7 +844,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -884,7 +865,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -903,8 +883,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -915,7 +895,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature/input.ts.json index 1c57c2bb82ce..97ea05608562 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +66,7 @@ } } } - }, - "optional": false + } } } ], @@ -93,7 +92,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -114,6 +112,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -130,8 +129,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -165,7 +163,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -191,7 +188,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -212,6 +208,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -241,8 +238,7 @@ } } } - }, - "optional": false + } } } ], @@ -279,7 +275,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -300,6 +295,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -316,8 +312,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -354,7 +349,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -375,6 +369,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -391,8 +386,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -439,7 +433,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -465,7 +458,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -486,6 +478,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -515,8 +508,7 @@ } } } - }, - "optional": false + } } } ], @@ -553,7 +545,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -574,6 +565,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -596,13 +588,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -639,7 +629,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -660,6 +649,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -676,8 +666,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -733,7 +722,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -754,7 +742,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -780,7 +767,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -801,6 +787,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -830,8 +817,7 @@ } } } - }, - "optional": false + } } } ], @@ -868,7 +854,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -889,6 +874,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -911,13 +897,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -954,7 +938,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -975,6 +958,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -991,8 +975,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1048,7 +1031,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1066,7 +1048,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1093,7 +1074,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1123,6 +1103,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1152,8 +1133,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -1175,6 +1155,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1191,8 +1172,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -1214,7 +1194,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1228,6 +1207,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1257,8 +1237,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": null, @@ -1280,7 +1259,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1294,6 +1272,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1310,8 +1289,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": null, @@ -1335,7 +1313,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1362,7 +1339,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1395,6 +1371,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1424,8 +1401,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -1447,6 +1423,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1469,13 +1446,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -1497,7 +1472,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1511,6 +1485,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1540,8 +1515,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": null, @@ -1563,7 +1537,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1577,6 +1550,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1599,13 +1573,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": null, @@ -1629,7 +1601,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1656,7 +1627,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1674,7 +1644,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1708,6 +1677,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1737,8 +1707,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -1760,6 +1729,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1782,13 +1752,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -1810,7 +1778,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1824,6 +1791,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1853,8 +1821,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": null, @@ -1876,7 +1843,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1890,6 +1856,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1912,13 +1879,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": null, @@ -1952,6 +1917,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1983,6 +1949,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2012,8 +1979,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -2035,6 +2001,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2051,8 +2018,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -2074,7 +2040,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2088,6 +2053,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2117,8 +2083,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": null, @@ -2140,7 +2105,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2154,6 +2118,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2170,8 +2135,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": null, @@ -2179,8 +2143,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2212,6 +2175,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2243,6 +2207,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2272,8 +2237,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -2295,6 +2259,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2317,13 +2282,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -2350,7 +2313,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2375,7 +2337,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2389,6 +2350,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2418,8 +2380,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": null, @@ -2441,7 +2402,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2455,6 +2415,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2477,13 +2438,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": null, @@ -2510,7 +2469,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2521,8 +2479,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2554,6 +2511,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2585,6 +2543,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2614,8 +2573,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -2637,6 +2595,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2659,13 +2618,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -2692,7 +2649,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2717,7 +2673,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2731,6 +2686,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2760,8 +2716,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": null, @@ -2783,7 +2738,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2797,6 +2751,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2819,13 +2774,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": null, @@ -2852,7 +2805,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2870,7 +2822,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2882,8 +2833,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/specializedSignatureIsSubtypeOfNonSpecializedSignature/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/specializedSignatureIsSubtypeOfNonSpecializedSignature/input.ts.json index 49fc7cd5db07..13359eb0d38e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/specializedSignatureIsSubtypeOfNonSpecializedSignature/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/specializedSignatureIsSubtypeOfNonSpecializedSignature/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +66,7 @@ } } } - }, - "optional": false + } } } ], @@ -93,7 +92,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -114,6 +112,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -130,8 +129,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -157,7 +155,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -178,6 +175,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -194,8 +192,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -229,7 +226,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -255,7 +251,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -276,6 +271,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -305,8 +301,7 @@ } } } - }, - "optional": false + } } } ], @@ -343,7 +338,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -364,6 +358,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -380,8 +375,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -418,7 +412,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -439,6 +432,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -455,8 +449,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -503,7 +496,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -529,7 +521,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -550,6 +541,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -579,8 +571,7 @@ } } } - }, - "optional": false + } } } ], @@ -617,7 +608,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -638,6 +628,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -654,8 +645,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -692,7 +682,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -713,6 +702,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -735,13 +725,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -778,7 +766,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -799,6 +786,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -815,8 +803,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -872,7 +859,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -893,7 +879,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -919,7 +904,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -940,6 +924,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -969,8 +954,7 @@ } } } - }, - "optional": false + } } } ], @@ -1007,7 +991,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -1028,6 +1011,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1044,8 +1028,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1082,7 +1065,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -1103,6 +1085,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1125,13 +1108,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1168,7 +1149,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -1189,6 +1169,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1205,8 +1186,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1262,7 +1242,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1280,7 +1259,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1307,7 +1285,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1337,6 +1314,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1366,8 +1344,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -1389,6 +1366,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1405,8 +1383,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -1428,6 +1405,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1444,8 +1422,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -1467,7 +1444,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1481,6 +1457,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1510,8 +1487,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": null, @@ -1533,7 +1509,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1547,6 +1522,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1563,8 +1539,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": null, @@ -1586,7 +1561,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1600,6 +1574,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1616,8 +1591,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": null, @@ -1641,7 +1615,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1668,7 +1641,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1701,6 +1673,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1730,8 +1703,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -1753,6 +1725,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1775,13 +1748,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -1803,6 +1774,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1819,8 +1791,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -1842,7 +1813,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1856,6 +1826,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1885,8 +1856,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": null, @@ -1908,7 +1878,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1922,6 +1891,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1938,8 +1908,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": null, @@ -1961,7 +1930,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1975,6 +1943,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1997,13 +1966,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": null, @@ -2027,7 +1994,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2054,7 +2020,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2072,7 +2037,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2106,6 +2070,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2135,8 +2100,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -2158,6 +2122,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2174,8 +2139,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -2197,6 +2161,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2219,13 +2184,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -2247,7 +2210,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2261,6 +2223,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2290,8 +2253,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": null, @@ -2313,7 +2275,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2327,6 +2288,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2343,8 +2305,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": null, @@ -2366,7 +2327,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2380,6 +2340,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2402,13 +2363,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": null, @@ -2442,6 +2401,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2473,6 +2433,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2489,8 +2450,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -2512,6 +2472,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2541,8 +2502,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -2564,6 +2524,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2580,8 +2541,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -2603,7 +2563,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2617,6 +2576,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2633,8 +2593,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": null, @@ -2656,7 +2615,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2670,6 +2628,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2699,8 +2658,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": null, @@ -2722,7 +2680,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2736,6 +2693,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2752,8 +2710,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": null, @@ -2761,8 +2718,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2794,6 +2750,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2825,6 +2782,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2854,8 +2812,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -2877,6 +2834,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2893,8 +2851,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -2916,6 +2873,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2938,13 +2896,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -2971,7 +2927,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2996,7 +2951,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3010,6 +2964,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3026,8 +2981,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": null, @@ -3049,7 +3003,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3063,6 +3016,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3092,8 +3046,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": null, @@ -3115,7 +3068,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3129,6 +3081,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3151,13 +3104,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": null, @@ -3184,7 +3135,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3195,8 +3145,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3228,6 +3177,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3259,6 +3209,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3288,8 +3239,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -3311,6 +3261,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3333,13 +3284,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -3366,7 +3315,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3391,6 +3339,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3407,8 +3356,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -3430,7 +3378,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3444,6 +3391,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3460,8 +3408,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": null, @@ -3483,7 +3430,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3497,6 +3443,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3526,8 +3473,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": null, @@ -3549,7 +3495,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3563,6 +3508,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3585,13 +3531,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": null, @@ -3618,7 +3562,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3636,7 +3579,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3648,8 +3590,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/specializedSignatureWithOptional/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/specializedSignatureWithOptional/input.ts.json index 35d2d2b8ca3d..33d723686448 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/specializedSignatureWithOptional/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/specializedSignatureWithOptional/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +66,7 @@ } } } - }, - "optional": true + } } } ], @@ -109,7 +108,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -130,6 +128,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -146,8 +145,7 @@ }, "kind": "string" } - }, - "optional": true + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures/input.ts.json index 3d406e5a5eb1..5057016271bc 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +66,7 @@ } } } - }, - "optional": false + } } } ], @@ -116,8 +115,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -129,7 +128,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -149,6 +147,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -178,8 +177,7 @@ } } } - }, - "optional": false + } } } ], @@ -232,8 +230,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -251,6 +249,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -280,8 +279,7 @@ } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -291,6 +289,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -320,8 +319,7 @@ } } } - }, - "optional": false + } } ], "body": { @@ -352,7 +350,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -378,7 +375,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -399,6 +395,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -428,8 +425,7 @@ } } } - }, - "optional": false + } } } ], @@ -481,7 +477,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -511,6 +506,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -540,8 +536,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -563,7 +558,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -577,6 +571,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -606,8 +601,7 @@ } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -617,6 +611,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -646,8 +641,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": null, @@ -681,6 +675,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -712,6 +707,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -741,8 +737,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -764,7 +759,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -778,6 +772,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -807,8 +802,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": null, @@ -816,8 +810,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -849,8 +842,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -870,7 +863,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -890,6 +882,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -919,8 +912,7 @@ } } } - }, - "optional": false + } } } ], @@ -954,7 +946,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -967,7 +958,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -987,6 +977,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1016,8 +1007,7 @@ } } } - }, - "optional": false + } } }, { @@ -1036,6 +1026,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1065,8 +1056,7 @@ } } } - }, - "optional": false + } } } ], @@ -1101,7 +1091,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1120,6 +1109,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1149,8 +1139,7 @@ } } } - }, - "optional": false + } } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2/input.ts.json index a148f3de8010..e4c96f34a57e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -80,7 +79,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -101,6 +99,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -130,8 +129,7 @@ } } } - }, - "optional": false + } } } ], @@ -165,7 +163,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -191,7 +188,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -212,6 +208,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -228,8 +225,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -266,7 +262,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -287,6 +282,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -316,8 +312,7 @@ } } } - }, - "optional": false + } } } ], @@ -369,7 +364,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -399,6 +393,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -428,8 +423,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -451,6 +445,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -480,8 +475,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -503,7 +497,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -517,6 +510,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -546,8 +540,7 @@ } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -557,6 +550,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -586,8 +580,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": null, @@ -609,7 +602,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -623,6 +615,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -652,8 +645,7 @@ } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -663,6 +655,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -692,8 +685,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": null, @@ -727,6 +719,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,6 +751,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -787,8 +781,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -810,6 +803,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -839,8 +833,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -862,7 +855,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -876,6 +868,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -905,8 +898,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": null, @@ -928,7 +920,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -942,6 +933,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -971,8 +963,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": null, @@ -980,8 +971,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1013,8 +1003,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1034,7 +1024,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1054,6 +1043,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1083,8 +1073,7 @@ } } } - }, - "optional": false + } } } ], @@ -1118,7 +1107,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1138,6 +1126,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1167,8 +1156,7 @@ } } } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/typeParameterAsTypeArgument/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/typeParameterAsTypeArgument/input.ts.json index 71385b451b4a..fad66db44049 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/typeParameterAsTypeArgument/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/typeParameterAsTypeArgument/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -106,13 +105,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -152,7 +149,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -166,7 +162,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -180,7 +175,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -208,7 +202,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -228,7 +221,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -259,7 +251,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -286,7 +277,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -306,7 +296,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -342,7 +331,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -363,7 +351,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -383,7 +370,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -409,7 +395,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -435,7 +420,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -477,7 +461,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -498,7 +481,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -524,7 +506,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -551,7 +532,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -572,7 +552,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -605,7 +584,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -634,7 +612,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -660,7 +637,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -680,7 +656,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint/input.ts.json index c976ce721b88..64f9f901a6f9 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -106,13 +105,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -153,8 +150,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -164,7 +161,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -184,7 +180,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -215,7 +210,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -236,7 +230,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -254,7 +247,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -285,7 +277,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -302,7 +293,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -323,6 +313,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -345,13 +336,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -370,6 +359,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -392,13 +382,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -439,8 +427,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -450,7 +438,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -470,7 +457,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -501,7 +487,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -519,7 +504,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -541,7 +525,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -571,7 +554,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -603,8 +585,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -626,6 +608,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -648,13 +631,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -673,6 +654,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -695,13 +677,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -742,8 +722,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -753,7 +733,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -773,7 +752,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -804,7 +782,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -825,7 +802,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -843,7 +819,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -874,7 +849,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -910,8 +884,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -933,6 +907,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -955,13 +930,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -980,6 +953,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1002,13 +976,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1049,8 +1021,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1060,7 +1032,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1080,7 +1051,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1111,7 +1081,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1129,7 +1098,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1151,7 +1119,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1181,7 +1148,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1217,8 +1183,8 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1236,6 +1202,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1258,13 +1225,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1274,6 +1239,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1296,13 +1262,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1336,8 +1300,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1347,7 +1311,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1367,7 +1330,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1398,7 +1360,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1419,7 +1380,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1437,7 +1397,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1468,7 +1427,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1504,8 +1462,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1523,6 +1481,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1545,13 +1504,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1561,6 +1518,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1583,13 +1541,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1623,8 +1579,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1634,7 +1590,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1654,7 +1609,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1685,7 +1639,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1703,7 +1656,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1725,7 +1677,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1755,7 +1706,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint2/input.ts.json index 1c7dc7f7334b..b1cc9a62b3e0 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -106,13 +105,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -140,7 +137,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -190,6 +185,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -212,13 +208,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -237,6 +231,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -259,13 +254,11 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -306,8 +299,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -317,7 +310,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -337,7 +329,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -368,7 +359,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -386,7 +376,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -408,7 +397,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -426,7 +414,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -457,7 +444,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -491,7 +477,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -509,7 +494,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -531,7 +515,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -549,7 +532,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -587,7 +569,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -608,7 +589,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -626,7 +606,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -647,7 +626,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -668,6 +646,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -690,13 +669,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -715,6 +692,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -737,13 +715,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -771,7 +747,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -800,7 +775,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -821,6 +795,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -843,13 +818,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -868,6 +841,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -890,13 +864,11 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -937,8 +909,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -948,7 +920,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -968,7 +939,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -999,7 +969,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1017,7 +986,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1039,7 +1007,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1057,7 +1024,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1088,7 +1054,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1122,7 +1087,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1140,7 +1104,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1162,7 +1125,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1180,7 +1142,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1218,7 +1179,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1236,7 +1196,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1258,7 +1217,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1293,8 +1251,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -1316,6 +1274,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1338,13 +1297,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1363,6 +1320,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1385,13 +1343,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1419,7 +1375,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1463,8 +1418,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -1486,6 +1441,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1508,13 +1464,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1533,6 +1487,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1555,13 +1510,11 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1602,8 +1555,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1613,7 +1566,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1633,7 +1585,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1664,7 +1615,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1682,7 +1632,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1704,7 +1653,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1722,7 +1670,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1753,7 +1700,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1791,7 +1737,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1809,7 +1754,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1831,7 +1775,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1849,7 +1792,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1887,7 +1829,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1908,7 +1849,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1926,7 +1866,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1966,8 +1905,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -1989,6 +1928,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2011,13 +1951,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2036,6 +1974,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2058,13 +1997,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2092,7 +2029,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2136,8 +2072,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -2149,7 +2085,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2169,6 +2104,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2191,13 +2127,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2216,6 +2150,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2238,13 +2173,11 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2285,8 +2218,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2296,7 +2229,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -2316,7 +2248,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -2347,7 +2278,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2365,7 +2295,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2387,7 +2316,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2405,7 +2333,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2436,7 +2363,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2474,7 +2400,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2492,7 +2417,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2514,7 +2438,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2532,7 +2455,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2570,7 +2492,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2588,7 +2509,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2610,7 +2530,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2649,8 +2568,8 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -2668,6 +2587,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2690,13 +2610,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2706,6 +2624,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2728,13 +2647,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2755,7 +2672,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2799,8 +2715,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -2818,6 +2734,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2840,13 +2757,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2856,6 +2771,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2878,13 +2794,11 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2918,8 +2832,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2929,7 +2843,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -2949,7 +2862,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -2980,7 +2892,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2998,7 +2909,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3020,7 +2930,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3038,7 +2947,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3069,7 +2977,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3107,7 +3014,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3125,7 +3031,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3147,7 +3052,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3165,7 +3069,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3203,7 +3106,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3224,7 +3126,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3242,7 +3143,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3282,8 +3182,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -3301,6 +3201,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3323,13 +3224,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -3339,6 +3238,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3361,13 +3261,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -3388,7 +3286,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3432,8 +3329,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -3451,6 +3348,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3473,13 +3371,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -3489,6 +3385,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3511,13 +3408,11 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -3551,8 +3446,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3562,7 +3457,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -3582,7 +3476,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -3613,7 +3506,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3631,7 +3523,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3653,7 +3544,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3671,7 +3561,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3702,7 +3591,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3740,7 +3628,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3758,7 +3645,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3780,7 +3666,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3798,7 +3683,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3836,7 +3720,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3854,7 +3737,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3876,7 +3758,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint3/input.ts.json index 3c1f38e088b5..999bd4586a23 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint3/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -90,7 +87,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -123,7 +119,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -152,7 +147,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -176,7 +170,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -205,7 +198,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -229,7 +221,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -258,7 +249,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -282,7 +272,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -296,6 +285,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -318,13 +308,11 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -349,7 +337,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -378,7 +365,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -396,7 +382,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -424,7 +409,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -451,7 +435,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -472,7 +455,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -493,7 +475,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -526,7 +507,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -555,7 +535,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -579,7 +558,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -608,7 +586,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -632,7 +609,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -661,7 +637,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -685,7 +660,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -699,6 +673,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -721,13 +696,11 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -752,7 +725,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -781,7 +753,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -799,7 +770,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4/input.ts.json index 32acc195ebbf..6637e2b2859b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/callSignatures/typeParameterUsedAsTypeParameterConstraint4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -99,7 +96,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -120,6 +116,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -142,13 +139,11 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -191,6 +186,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -213,13 +209,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -241,7 +235,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -272,7 +265,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -290,7 +282,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -321,7 +312,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -360,7 +350,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -381,7 +370,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -399,7 +387,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -421,7 +408,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -439,7 +425,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -466,7 +451,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -493,7 +477,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -514,7 +497,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -532,7 +514,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -554,7 +535,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -572,7 +552,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -606,7 +585,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -635,7 +613,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -659,7 +636,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -688,7 +664,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -712,7 +687,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -741,7 +715,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -765,7 +738,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -779,6 +751,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -801,13 +774,11 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -832,7 +803,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -861,7 +831,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -879,7 +848,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -902,7 +870,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -923,6 +890,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -945,13 +913,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -970,6 +936,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -992,13 +959,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1026,7 +991,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1055,7 +1019,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1076,6 +1039,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1098,13 +1062,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1123,6 +1085,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1145,13 +1108,11 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1192,8 +1153,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1203,7 +1164,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1223,7 +1183,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1254,7 +1213,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1272,7 +1230,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1294,7 +1251,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1312,7 +1268,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1343,7 +1298,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1377,7 +1331,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1395,7 +1348,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1417,7 +1369,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1435,7 +1386,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1466,7 +1416,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1500,7 +1449,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1521,7 +1469,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1539,7 +1486,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1570,7 +1516,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1587,7 +1532,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1608,6 +1552,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1630,13 +1575,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1655,6 +1598,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1677,13 +1621,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1711,7 +1653,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1740,7 +1681,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1761,6 +1701,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1783,13 +1724,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1808,6 +1747,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1830,13 +1770,11 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1877,8 +1815,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1888,7 +1826,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1908,7 +1845,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1939,7 +1875,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1957,7 +1892,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1979,7 +1913,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1997,7 +1930,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2028,7 +1960,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2062,7 +1993,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2080,7 +2010,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2102,7 +2031,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2120,7 +2048,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2151,7 +2078,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2185,7 +2111,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2203,7 +2128,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2225,7 +2149,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2255,7 +2178,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2287,8 +2209,8 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -2306,6 +2228,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2328,13 +2251,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2344,6 +2265,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2366,13 +2288,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2393,7 +2313,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2414,6 +2333,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2436,13 +2356,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2461,6 +2379,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2483,13 +2402,11 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2532,8 +2449,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -2551,6 +2468,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2573,13 +2491,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2589,6 +2505,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2611,13 +2528,11 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2651,8 +2566,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2662,7 +2577,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -2682,7 +2596,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -2713,7 +2626,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2731,7 +2643,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2753,7 +2664,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2771,7 +2681,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2802,7 +2711,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2840,7 +2748,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2858,7 +2765,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2880,7 +2786,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2898,7 +2803,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2936,7 +2840,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2957,7 +2860,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2975,7 +2877,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3015,8 +2916,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -3034,6 +2935,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3056,13 +2958,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -3072,6 +2972,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3094,13 +2995,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -3121,7 +3020,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3165,8 +3063,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -3184,6 +3082,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3206,13 +3105,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -3222,6 +3119,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3244,13 +3142,11 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -3284,8 +3180,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3295,7 +3191,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -3315,7 +3210,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -3346,7 +3240,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3364,7 +3257,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3386,7 +3278,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3404,7 +3295,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3435,7 +3325,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3473,7 +3362,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3491,7 +3379,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3513,7 +3400,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3531,7 +3417,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3569,7 +3454,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3587,7 +3471,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3609,7 +3492,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/constructSignatures/constructSignaturesWithIdenticalOverloads/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/constructSignatures/constructSignaturesWithIdenticalOverloads/input.ts.json index 3ffb64a755a1..98a67c3fd37a 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/constructSignatures/constructSignaturesWithIdenticalOverloads/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/constructSignatures/constructSignaturesWithIdenticalOverloads/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -78,8 +77,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -98,6 +96,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -114,8 +113,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -138,7 +136,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -158,6 +155,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -174,8 +172,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -194,6 +191,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -210,8 +208,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -234,7 +231,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -254,6 +250,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -270,8 +267,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -319,8 +315,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -337,7 +333,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -387,7 +382,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -413,7 +407,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -433,6 +426,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -455,13 +449,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -480,6 +472,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -496,8 +489,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -520,7 +512,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -540,6 +531,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -562,13 +554,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -587,6 +577,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -603,8 +594,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -627,7 +617,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -647,6 +636,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -669,13 +659,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -717,7 +705,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -753,8 +740,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -771,7 +758,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -826,7 +812,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -856,6 +841,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -872,8 +858,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -883,6 +868,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -899,8 +885,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -925,7 +910,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -949,6 +933,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -965,8 +950,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -976,6 +960,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -992,8 +977,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1018,7 +1002,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1054,6 +1037,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1076,13 +1060,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1114,8 +1096,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1132,7 +1114,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1187,7 +1168,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1214,7 +1194,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1247,6 +1226,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1269,13 +1249,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1285,6 +1263,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1301,8 +1280,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1327,7 +1305,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1353,7 +1330,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1380,6 +1356,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1402,13 +1379,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1418,6 +1393,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1434,8 +1410,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1460,7 +1435,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1486,7 +1460,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1513,6 +1486,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1535,13 +1509,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1551,6 +1523,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1567,8 +1540,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1593,7 +1565,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1619,7 +1590,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1651,7 +1621,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1676,6 +1645,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1698,13 +1668,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1714,6 +1682,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1730,8 +1699,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1756,7 +1724,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1782,7 +1749,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1814,7 +1780,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1851,6 +1816,7 @@ "ctxt": 0 }, "value": "i2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1873,7 +1839,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1896,8 +1861,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1929,8 +1893,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1947,7 +1911,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2012,6 +1975,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2043,6 +2007,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2059,8 +2024,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2070,6 +2034,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2086,8 +2051,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2112,7 +2076,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2136,6 +2099,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2152,8 +2116,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2163,6 +2126,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2179,8 +2143,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2205,7 +2168,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2215,8 +2177,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2248,8 +2209,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2266,7 +2227,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2331,6 +2291,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2362,6 +2323,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2384,13 +2346,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2400,6 +2360,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2416,8 +2377,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2442,7 +2402,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2468,7 +2427,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2500,7 +2458,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2525,6 +2482,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2547,13 +2505,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2563,6 +2519,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2579,8 +2536,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2605,7 +2561,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2631,7 +2586,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2663,7 +2617,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2674,8 +2627,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2707,8 +2659,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2725,7 +2677,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads/input.ts.json index c9cbe046c656..bb621ccde2bc 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -78,8 +77,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -98,6 +96,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -114,8 +113,7 @@ }, "kind": "string" } - }, - "optional": true + } } } ], @@ -138,7 +136,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -158,6 +155,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -174,8 +172,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -194,6 +191,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -210,8 +208,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -234,7 +231,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -254,6 +250,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -270,8 +267,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -319,8 +315,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -337,7 +333,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -387,7 +382,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -413,7 +407,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -433,6 +426,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -455,13 +449,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -480,6 +472,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -496,8 +489,7 @@ }, "kind": "string" } - }, - "optional": true + } } } ], @@ -520,7 +512,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -540,6 +531,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -562,13 +554,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -587,6 +577,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -603,8 +594,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -627,7 +617,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -647,6 +636,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -669,13 +659,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -717,7 +705,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -753,8 +740,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -771,7 +758,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -826,7 +812,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -856,6 +841,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -872,8 +858,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -883,6 +868,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -899,8 +885,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -925,7 +910,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -949,6 +933,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -965,8 +950,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -976,6 +960,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -992,8 +977,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1018,7 +1002,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1054,6 +1037,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1076,13 +1060,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1114,8 +1096,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1132,7 +1114,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1187,7 +1168,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1214,7 +1194,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1247,6 +1226,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1269,13 +1249,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1285,6 +1263,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1301,8 +1280,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -1327,7 +1305,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1353,7 +1330,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1380,6 +1356,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1402,13 +1379,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1418,6 +1393,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1434,8 +1410,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1460,7 +1435,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1486,7 +1460,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1513,6 +1486,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1535,13 +1509,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1551,6 +1523,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1567,8 +1540,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -1593,7 +1565,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1619,7 +1590,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1651,7 +1621,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1676,6 +1645,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1698,13 +1668,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1714,6 +1682,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1730,8 +1699,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1756,7 +1724,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1782,7 +1749,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1814,7 +1780,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1851,6 +1816,7 @@ "ctxt": 0 }, "value": "i2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1873,7 +1839,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1896,8 +1861,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1929,8 +1893,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1947,7 +1911,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2012,6 +1975,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2043,6 +2007,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2059,8 +2024,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2070,6 +2034,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2086,8 +2051,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -2112,7 +2076,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2136,6 +2099,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2152,8 +2116,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2163,6 +2126,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2179,8 +2143,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2205,7 +2168,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2215,8 +2177,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2248,8 +2209,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2266,7 +2227,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2331,6 +2291,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2362,6 +2323,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2384,13 +2346,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2400,6 +2360,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2416,8 +2377,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -2442,7 +2402,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2468,7 +2427,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2500,7 +2458,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2525,6 +2482,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2547,13 +2505,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2563,6 +2519,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2579,8 +2536,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2605,7 +2561,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2631,7 +2586,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2663,7 +2617,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2674,8 +2627,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2707,8 +2659,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2725,7 +2677,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads2/input.ts.json index 33838e50d4ad..0c4097137b06 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -78,8 +77,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -98,6 +96,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -114,8 +113,7 @@ }, "kind": "string" } - }, - "optional": true + } } } ], @@ -138,7 +136,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -158,6 +155,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -174,8 +172,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -194,6 +191,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -210,8 +208,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -234,7 +231,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -254,6 +250,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -270,8 +267,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -311,7 +307,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "body": { @@ -354,8 +349,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -399,8 +394,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -417,7 +412,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -467,7 +461,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -493,7 +486,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -513,6 +505,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -535,13 +528,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -560,6 +551,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -576,8 +568,7 @@ }, "kind": "string" } - }, - "optional": true + } } } ], @@ -600,7 +591,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -620,6 +610,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -642,13 +633,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -667,6 +656,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -683,8 +673,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -707,7 +696,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -727,6 +715,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -749,13 +738,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -797,7 +784,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -825,7 +811,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "body": { @@ -868,8 +853,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -913,8 +898,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -931,7 +916,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -986,7 +970,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1016,6 +999,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1032,8 +1016,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1043,6 +1026,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1059,8 +1043,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -1085,7 +1068,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1109,6 +1091,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1125,8 +1108,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1136,6 +1118,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1152,8 +1135,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1178,7 +1160,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1204,7 +1185,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1231,7 +1211,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1264,6 +1243,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1286,13 +1266,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1302,6 +1280,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1318,8 +1297,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -1344,7 +1322,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1370,7 +1347,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1397,6 +1373,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1419,13 +1396,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1435,6 +1410,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1451,8 +1427,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1477,7 +1452,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1503,7 +1477,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1542,6 +1515,7 @@ "ctxt": 0 }, "value": "i2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1564,7 +1538,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1587,8 +1560,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1620,8 +1592,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1638,7 +1610,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1703,8 +1674,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1721,7 +1692,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloadsThatDifferOnlyByReturnType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloadsThatDifferOnlyByReturnType/input.ts.json index 586958387efd..72cafd6f74a4 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloadsThatDifferOnlyByReturnType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloadsThatDifferOnlyByReturnType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -78,8 +77,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -112,7 +110,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -138,7 +135,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -158,6 +154,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,13 +177,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -205,6 +200,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -221,8 +217,7 @@ }, "kind": "string" } - }, - "optional": true + } } } ], @@ -264,7 +259,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -290,7 +284,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -320,6 +313,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -336,8 +330,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -347,6 +340,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -363,8 +357,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -389,7 +382,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -413,6 +405,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -429,8 +422,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -440,6 +432,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -456,8 +449,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -482,7 +474,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -526,7 +517,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -553,7 +543,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -586,6 +575,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -608,13 +598,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -624,6 +612,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -640,8 +629,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -666,7 +654,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -708,6 +695,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -730,13 +718,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -746,6 +732,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -762,8 +749,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -788,7 +774,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -812,6 +797,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -834,13 +820,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -850,6 +834,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -866,8 +851,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -892,7 +876,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -918,7 +901,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -950,7 +932,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -975,6 +956,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -997,13 +979,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1013,6 +993,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1029,8 +1010,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1055,7 +1035,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1084,7 +1063,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1121,6 +1099,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1152,6 +1131,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1168,8 +1148,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1179,6 +1158,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1195,8 +1175,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1221,7 +1200,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1263,6 +1241,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1279,8 +1258,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1290,6 +1268,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1306,8 +1285,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1332,7 +1310,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1342,8 +1319,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1375,6 +1351,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1406,6 +1383,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1428,13 +1406,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1444,6 +1420,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1460,8 +1437,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1486,7 +1462,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1512,7 +1487,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1544,7 +1518,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1569,6 +1542,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1591,13 +1565,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1607,6 +1579,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1623,8 +1596,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1649,7 +1621,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1678,7 +1649,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1689,8 +1659,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/multipleNumericIndexers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/multipleNumericIndexers/input.ts.json index 2d0bd466cbc5..16944342f0d3 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/multipleNumericIndexers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/multipleNumericIndexers/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -38,6 +37,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,8 +54,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -93,6 +92,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -109,8 +109,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -159,7 +158,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,6 +182,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -200,8 +199,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -239,6 +237,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -255,8 +254,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -311,6 +309,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -337,6 +336,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -353,8 +353,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -392,6 +391,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -408,8 +408,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -438,8 +437,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -471,6 +469,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -497,6 +496,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -513,8 +513,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -552,6 +551,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -568,8 +568,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -598,8 +597,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -682,7 +680,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -704,6 +701,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -720,8 +718,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -759,6 +756,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -775,8 +773,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -829,7 +826,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -855,7 +851,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -882,7 +877,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -910,6 +904,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -926,8 +921,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -965,6 +959,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -981,8 +976,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/multipleStringIndexers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/multipleStringIndexers/input.ts.json index 005ddb39ca2a..cd925da0fd05 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/multipleStringIndexers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/multipleStringIndexers/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -38,6 +37,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,8 +54,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -93,6 +92,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -109,8 +109,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -159,7 +158,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -184,6 +182,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -200,8 +199,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -239,6 +237,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -255,8 +254,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -311,6 +309,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -337,6 +336,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -353,8 +353,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -392,6 +391,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -408,8 +408,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -438,8 +437,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -471,6 +469,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -497,6 +496,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -513,8 +513,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -552,6 +551,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -568,8 +568,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -598,8 +597,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -619,7 +617,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -653,7 +650,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -675,6 +671,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -691,8 +688,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -730,6 +726,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -746,8 +743,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -800,7 +796,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -826,7 +821,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -853,7 +847,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -881,6 +874,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -897,8 +891,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -936,6 +929,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -952,8 +946,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations/input.ts.json index 305a23cf3f19..5b00bd246f65 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "MyNumber", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -111,7 +108,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -133,6 +129,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -149,8 +146,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -192,7 +188,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -223,7 +218,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -269,7 +263,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -315,7 +308,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -687,7 +679,6 @@ "ctxt": 0 }, "value": "MyNumber", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -718,7 +709,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "function": { @@ -787,7 +777,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "function": { @@ -808,8 +797,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -854,7 +843,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -923,7 +911,6 @@ "ctxt": 0 }, "value": "sa", - "typeAnnotation": null, "optional": false }, "value": null, @@ -969,7 +956,6 @@ "ctxt": 0 }, "value": "sb", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1015,7 +1001,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -1061,7 +1046,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "function": { @@ -1132,7 +1116,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1157,6 +1140,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1173,8 +1157,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1217,7 +1200,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1259,7 +1241,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1301,7 +1282,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1558,8 +1538,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": { @@ -1597,7 +1577,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1728,7 +1707,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1757,7 +1735,6 @@ "ctxt": 0 }, "value": "MyNumber", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1793,6 +1770,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1819,6 +1797,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1835,8 +1814,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1879,7 +1857,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1921,7 +1898,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1963,7 +1939,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2220,8 +2195,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": { @@ -2259,7 +2234,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2390,7 +2364,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2419,7 +2392,6 @@ "ctxt": 0 }, "value": "MyNumber", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2429,8 +2401,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2462,6 +2433,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2488,6 +2460,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2504,8 +2477,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2534,8 +2506,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -2555,7 +2526,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2583,7 +2553,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2606,7 +2575,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -2803,7 +2771,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -2836,7 +2803,6 @@ "ctxt": 0 }, "value": "Myn", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2858,7 +2824,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -2910,7 +2875,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "param": { @@ -2921,8 +2885,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -2944,7 +2908,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations2/input.ts.json index bf6c7e1855f9..47d3b46e5852 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -129,7 +127,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -155,7 +152,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -234,7 +230,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -252,7 +247,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -274,6 +268,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -290,8 +285,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -316,7 +310,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -368,7 +361,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -423,7 +415,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -483,7 +474,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -614,7 +604,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -639,6 +628,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -655,8 +645,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -681,7 +670,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -737,7 +725,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -788,7 +775,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -844,7 +830,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -965,6 +950,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -991,6 +977,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1007,8 +994,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1033,7 +1019,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1089,7 +1074,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1140,7 +1124,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1196,7 +1179,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1291,8 +1273,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1324,6 +1305,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1350,6 +1332,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1366,8 +1349,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1392,7 +1374,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1407,8 +1388,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1444,7 +1424,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1477,7 +1456,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1515,7 +1493,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/numericIndexingResults/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/numericIndexingResults/input.ts.json index 2464e74f4f08..8f5b2ff1eb54 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/numericIndexingResults/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/numericIndexingResults/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -38,6 +37,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,8 +54,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -201,6 +200,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -223,13 +223,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -261,8 +259,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -279,7 +277,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -327,8 +324,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -345,7 +342,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -393,8 +389,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -411,7 +407,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -459,8 +454,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -477,7 +472,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -520,8 +514,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -538,7 +532,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -581,8 +574,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -599,7 +592,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -632,7 +624,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -657,6 +648,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -673,8 +665,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -814,6 +805,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -836,13 +828,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -874,8 +864,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -892,7 +882,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -940,8 +929,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -958,7 +947,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1006,8 +994,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1024,7 +1012,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1072,8 +1059,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1090,7 +1077,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1133,8 +1119,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1151,7 +1137,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1194,8 +1179,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1212,7 +1197,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1255,6 +1239,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1281,6 +1266,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1297,8 +1283,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1412,8 +1397,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1445,8 +1429,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1463,7 +1447,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1511,8 +1494,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1529,7 +1512,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1577,8 +1559,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1595,7 +1577,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1643,8 +1624,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1661,7 +1642,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1704,8 +1684,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1722,7 +1702,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1765,8 +1744,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1783,7 +1762,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1826,6 +1804,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1852,6 +1831,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1868,8 +1848,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1898,8 +1877,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1997,8 +1975,8 @@ "ctxt": 0 }, "value": "r1a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2015,7 +1993,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2063,8 +2040,8 @@ "ctxt": 0 }, "value": "r2a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2081,7 +2058,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2129,8 +2105,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2147,7 +2123,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2195,8 +2170,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2213,7 +2188,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2256,8 +2230,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2274,7 +2248,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2317,8 +2290,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2335,7 +2308,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2378,6 +2350,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2404,6 +2377,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2420,8 +2394,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2535,8 +2508,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -2634,8 +2606,8 @@ "ctxt": 0 }, "value": "r1b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2652,7 +2624,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2700,8 +2671,8 @@ "ctxt": 0 }, "value": "r2b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2718,7 +2689,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2766,8 +2736,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2784,7 +2754,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2832,8 +2801,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2850,7 +2819,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2893,8 +2861,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2911,7 +2879,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2954,8 +2921,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2972,7 +2939,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations/input.ts.json index 8bd2956babdf..5f9b9867d990 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "MyString", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -111,7 +108,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -133,6 +129,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -149,8 +146,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -192,7 +188,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [], @@ -223,7 +218,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -269,7 +263,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -315,7 +308,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -663,7 +655,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": null, @@ -689,7 +680,6 @@ "ctxt": 0 }, "value": "MyString", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -720,7 +710,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "function": { @@ -789,7 +778,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "function": { @@ -810,8 +798,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -856,7 +844,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -925,7 +912,6 @@ "ctxt": 0 }, "value": "sa", - "typeAnnotation": null, "optional": false }, "value": null, @@ -971,7 +957,6 @@ "ctxt": 0 }, "value": "sb", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1017,7 +1002,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -1063,7 +1047,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "function": { @@ -1134,7 +1117,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1159,6 +1141,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1175,8 +1158,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1219,7 +1201,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1261,7 +1242,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1303,7 +1283,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1560,8 +1539,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": { @@ -1599,7 +1578,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1730,7 +1708,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1759,7 +1736,6 @@ "ctxt": 0 }, "value": "MyString", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1795,6 +1771,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1821,6 +1798,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1837,8 +1815,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1881,7 +1858,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1923,7 +1899,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1965,7 +1940,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2222,8 +2196,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": { @@ -2261,7 +2235,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2392,7 +2365,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2421,7 +2393,6 @@ "ctxt": 0 }, "value": "MyString", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2431,8 +2402,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2464,6 +2434,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2490,6 +2461,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2506,8 +2478,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2536,8 +2507,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -2557,7 +2527,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2585,7 +2554,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2608,7 +2576,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -2805,7 +2772,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -2838,7 +2804,6 @@ "ctxt": 0 }, "value": "MyString", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2860,7 +2825,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -2912,7 +2876,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "param": { @@ -2923,8 +2886,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -2946,7 +2909,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2/input.ts.json index 2d3d3378bcd3..61effaa81f0a 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -129,7 +127,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -155,7 +152,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -234,7 +230,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -252,7 +247,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -274,6 +268,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -290,8 +285,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -316,7 +310,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -344,7 +337,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -370,7 +362,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -401,7 +392,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -427,7 +417,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -458,7 +447,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -504,7 +492,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -557,7 +544,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -582,6 +568,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -598,8 +585,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -624,7 +610,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -653,7 +638,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -682,7 +666,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -706,7 +689,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -735,7 +717,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -759,7 +740,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -801,7 +781,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -855,6 +834,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -881,6 +861,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -897,8 +878,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -923,7 +903,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -952,7 +931,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -981,7 +959,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1005,7 +982,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1034,7 +1010,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1058,7 +1033,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1100,7 +1074,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1128,8 +1101,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1161,6 +1133,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1187,6 +1160,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1203,8 +1177,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1229,7 +1202,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1244,8 +1216,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1265,7 +1236,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1276,7 +1246,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -1290,7 +1259,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1301,7 +1269,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/stringIndexingResults/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/stringIndexingResults/input.ts.json index 65e4a6c08af0..b84c59fb5584 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/stringIndexingResults/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/indexSignatures/stringIndexingResults/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -38,6 +37,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,8 +54,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -97,7 +96,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -157,6 +155,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -179,13 +178,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -217,8 +214,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -235,7 +232,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -283,8 +279,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -301,7 +297,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -349,8 +344,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -367,7 +362,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -400,7 +394,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -425,6 +418,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -441,8 +435,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -485,7 +478,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -539,6 +531,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -561,13 +554,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -599,8 +590,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -617,7 +608,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -665,8 +655,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -683,7 +673,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -731,8 +720,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -749,7 +738,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -792,6 +780,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -818,6 +807,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -834,8 +824,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -878,7 +867,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -906,8 +894,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -939,8 +926,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -957,7 +944,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1005,8 +991,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1023,7 +1009,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1071,8 +1056,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1089,7 +1074,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1132,6 +1116,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1158,6 +1143,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1174,8 +1160,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1204,8 +1189,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1225,7 +1209,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1274,8 +1257,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1292,7 +1275,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1340,8 +1322,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1358,7 +1340,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1406,8 +1387,8 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1424,7 +1405,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/methodSignatures/functionLiterals/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/methodSignatures/functionLiterals/input.ts.json index 684db5a60892..508a9c7e1a56 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/methodSignatures/functionLiterals/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/methodSignatures/functionLiterals/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "func1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -76,6 +76,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -92,8 +93,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -131,7 +131,6 @@ "ctxt": 0 }, "value": "func2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -161,6 +160,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -177,8 +177,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -219,7 +218,6 @@ "ctxt": 0 }, "value": "func3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -257,6 +255,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -273,8 +272,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -303,8 +301,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -341,7 +338,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -352,7 +348,6 @@ "ctxt": 0 }, "value": "func1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -372,7 +367,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -383,7 +377,6 @@ "ctxt": 0 }, "value": "func2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -420,7 +413,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -431,7 +423,6 @@ "ctxt": 0 }, "value": "func1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -451,7 +442,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -462,7 +452,6 @@ "ctxt": 0 }, "value": "func3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -499,7 +488,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -510,7 +498,6 @@ "ctxt": 0 }, "value": "func2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -530,7 +517,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -541,7 +527,6 @@ "ctxt": 0 }, "value": "func1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -578,7 +563,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -589,7 +573,6 @@ "ctxt": 0 }, "value": "func2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -609,7 +592,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -620,7 +602,6 @@ "ctxt": 0 }, "value": "func3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -657,7 +638,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -668,7 +648,6 @@ "ctxt": 0 }, "value": "func3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -688,7 +667,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -699,7 +677,6 @@ "ctxt": 0 }, "value": "func1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -736,7 +713,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -747,7 +723,6 @@ "ctxt": 0 }, "value": "func3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -767,7 +742,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -778,7 +752,6 @@ "ctxt": 0 }, "value": "func2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -810,6 +783,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -841,7 +815,6 @@ "ctxt": 0 }, "value": "func4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -855,6 +828,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -871,8 +845,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -910,7 +883,6 @@ "ctxt": 0 }, "value": "func4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -924,6 +896,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -940,8 +913,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -979,7 +951,6 @@ "ctxt": 0 }, "value": "func5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1017,6 +988,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1033,8 +1005,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1072,6 +1043,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1088,8 +1060,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1118,8 +1089,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1156,7 +1126,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1167,7 +1136,6 @@ "ctxt": 0 }, "value": "func4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1187,7 +1155,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1198,7 +1165,6 @@ "ctxt": 0 }, "value": "func5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1235,7 +1201,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1246,7 +1211,6 @@ "ctxt": 0 }, "value": "func5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1266,7 +1230,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1277,7 +1240,6 @@ "ctxt": 0 }, "value": "func4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1309,6 +1271,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1340,7 +1303,6 @@ "ctxt": 0 }, "value": "func1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1354,6 +1316,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1376,13 +1339,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1425,7 +1386,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1450,7 +1410,6 @@ "ctxt": 0 }, "value": "func2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1480,6 +1439,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1502,13 +1462,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -1534,7 +1492,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1579,7 +1536,6 @@ "ctxt": 0 }, "value": "func3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1617,6 +1573,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1639,13 +1596,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1688,7 +1643,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1704,8 +1658,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1742,7 +1695,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1753,7 +1705,6 @@ "ctxt": 0 }, "value": "func1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1773,7 +1724,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1784,7 +1734,6 @@ "ctxt": 0 }, "value": "func2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1821,7 +1770,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1832,7 +1780,6 @@ "ctxt": 0 }, "value": "func1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1852,7 +1799,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1863,7 +1809,6 @@ "ctxt": 0 }, "value": "func3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1900,7 +1845,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1911,7 +1855,6 @@ "ctxt": 0 }, "value": "func2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1931,7 +1874,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1942,7 +1884,6 @@ "ctxt": 0 }, "value": "func1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1979,7 +1920,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1990,7 +1930,6 @@ "ctxt": 0 }, "value": "func2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2010,7 +1949,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2021,7 +1959,6 @@ "ctxt": 0 }, "value": "func3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2058,7 +1995,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2069,7 +2005,6 @@ "ctxt": 0 }, "value": "func3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2089,7 +2024,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2100,7 +2034,6 @@ "ctxt": 0 }, "value": "func1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2137,7 +2070,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2148,7 +2080,6 @@ "ctxt": 0 }, "value": "func3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2168,7 +2099,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2179,7 +2109,6 @@ "ctxt": 0 }, "value": "func2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2211,6 +2140,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2242,7 +2172,6 @@ "ctxt": 0 }, "value": "func4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2256,6 +2185,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2278,13 +2208,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -2327,7 +2255,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2352,7 +2279,6 @@ "ctxt": 0 }, "value": "func4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2366,6 +2292,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2388,13 +2315,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -2437,7 +2362,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2462,7 +2386,6 @@ "ctxt": 0 }, "value": "func5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2500,6 +2423,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2522,13 +2446,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2571,7 +2493,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2596,6 +2517,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2618,13 +2540,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2667,7 +2587,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2683,8 +2602,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2721,7 +2639,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2732,7 +2649,6 @@ "ctxt": 0 }, "value": "func4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2752,7 +2668,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2763,7 +2678,6 @@ "ctxt": 0 }, "value": "func5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2800,7 +2714,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2811,7 +2724,6 @@ "ctxt": 0 }, "value": "func5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2831,7 +2743,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2842,7 +2753,6 @@ "ctxt": 0 }, "value": "func4", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/methodSignatures/methodSignaturesWithOverloads/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/methodSignatures/methodSignaturesWithOverloads/input.ts.json index e6466ea87e8e..50bdb83c3420 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/methodSignatures/methodSignaturesWithOverloads/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/methodSignatures/methodSignaturesWithOverloads/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "func4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -76,6 +76,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -92,8 +93,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -131,7 +131,6 @@ "ctxt": 0 }, "value": "func4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -145,6 +144,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -161,8 +161,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -200,7 +199,6 @@ "ctxt": 0 }, "value": "func5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -238,6 +236,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -254,8 +253,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -293,6 +291,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -309,8 +308,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -339,8 +337,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -372,6 +369,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -403,7 +401,6 @@ "ctxt": 0 }, "value": "func4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -417,6 +414,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -439,13 +437,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -488,7 +484,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -513,7 +508,6 @@ "ctxt": 0 }, "value": "func4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -527,6 +521,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -549,13 +544,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -598,7 +591,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -623,7 +615,6 @@ "ctxt": 0 }, "value": "func5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -661,6 +652,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -683,13 +675,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -732,7 +722,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -757,6 +746,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -779,13 +769,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -828,7 +816,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -844,8 +831,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/methodSignatures/methodSignaturesWithOverloads2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/methodSignatures/methodSignaturesWithOverloads2/input.ts.json index c1641234fc29..989b7a0aace0 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/methodSignatures/methodSignaturesWithOverloads2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/methodSignatures/methodSignaturesWithOverloads2/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "func4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -76,6 +76,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -92,8 +93,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -131,7 +131,6 @@ "ctxt": 0 }, "value": "func4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -145,6 +144,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -161,8 +161,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -200,7 +199,6 @@ "ctxt": 0 }, "value": "func5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -238,6 +236,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -254,8 +253,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -293,6 +291,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -309,8 +308,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -339,8 +337,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -377,7 +374,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -388,7 +384,6 @@ "ctxt": 0 }, "value": "func4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -408,7 +403,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -419,7 +413,6 @@ "ctxt": 0 }, "value": "func5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -456,7 +449,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -467,7 +459,6 @@ "ctxt": 0 }, "value": "func5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -487,7 +478,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -498,7 +488,6 @@ "ctxt": 0 }, "value": "func4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -530,6 +519,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -561,7 +551,6 @@ "ctxt": 0 }, "value": "func4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -575,6 +564,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -597,13 +587,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -646,7 +634,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -671,7 +658,6 @@ "ctxt": 0 }, "value": "func4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -685,6 +671,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -707,13 +694,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -756,7 +741,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -781,7 +765,6 @@ "ctxt": 0 }, "value": "func5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -819,6 +802,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -841,13 +825,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -890,7 +872,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -915,6 +896,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -937,13 +919,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -986,7 +966,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1002,8 +981,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1040,7 +1018,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1051,7 +1028,6 @@ "ctxt": 0 }, "value": "func4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1071,7 +1047,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1082,7 +1057,6 @@ "ctxt": 0 }, "value": "func5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1119,7 +1093,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1130,7 +1103,6 @@ "ctxt": 0 }, "value": "func5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1150,7 +1122,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1161,7 +1132,6 @@ "ctxt": 0 }, "value": "func4", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/objectTypeLiteralSyntax/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/objectTypeLiteralSyntax/input.ts.json index 2f2fbbdaccab..ffd7ddde1c5a 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/objectTypeLiteralSyntax/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/objectTypeLiteralSyntax/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -104,7 +104,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -132,8 +131,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -165,6 +163,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -196,7 +195,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -238,7 +236,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -266,8 +263,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/propertySignatures/numericStringNamedPropertyEquivalence/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/propertySignatures/numericStringNamedPropertyEquivalence/input.ts.json index 7e309e2dd65e..b8d80f1d1938 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/propertySignatures/numericStringNamedPropertyEquivalence/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/propertySignatures/numericStringNamedPropertyEquivalence/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -191,7 +190,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -363,6 +361,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -465,8 +464,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -498,8 +496,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/propertySignatures/propertyNameWithoutTypeAnnotation/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/propertySignatures/propertyNameWithoutTypeAnnotation/input.ts.json index b25dbd721a2c..8766a0fb6efd 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/propertySignatures/propertyNameWithoutTypeAnnotation/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/propertySignatures/propertyNameWithoutTypeAnnotation/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -147,6 +143,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -178,7 +175,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,8 +186,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -223,8 +218,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -244,7 +239,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -287,8 +281,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -319,7 +313,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -334,7 +327,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -368,8 +360,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -415,7 +407,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -430,7 +421,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -464,8 +454,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -482,7 +472,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -493,7 +482,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -527,8 +515,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -545,7 +533,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -556,7 +543,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/propertySignatures/stringNamedPropertyAccess/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/propertySignatures/stringNamedPropertyAccess/input.ts.json index a14b3301e591..8677b4567d50 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/propertySignatures/stringNamedPropertyAccess/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/objectTypeLiteral/propertySignatures/stringNamedPropertyAccess/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -157,6 +156,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -179,13 +179,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -217,8 +215,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -235,7 +233,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -283,8 +280,8 @@ "ctxt": 0 }, "value": "r1b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -301,7 +298,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -339,7 +335,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -426,6 +421,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -448,13 +444,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -486,8 +480,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -504,7 +498,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -552,6 +545,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -614,8 +608,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -647,8 +640,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -665,7 +658,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -713,8 +705,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -781,8 +773,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -799,7 +791,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/assignFromBooleanInterface/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/assignFromBooleanInterface/input.ts.json index f6895deac7ba..1916a6ff51fe 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/assignFromBooleanInterface/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/assignFromBooleanInterface/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -72,6 +72,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -94,13 +95,11 @@ "ctxt": 0 }, "value": "Boolean", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -130,8 +129,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -141,7 +140,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -169,8 +167,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -180,7 +178,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/assignFromBooleanInterface2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/assignFromBooleanInterface2/input.ts.json index 10d23c33e0d7..a878ae7d3beb 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/assignFromBooleanInterface2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/assignFromBooleanInterface2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Boolean", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "doStuff", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "NotBoolean", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -124,7 +121,6 @@ "ctxt": 0 }, "value": "doStuff", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -177,8 +173,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -218,6 +214,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -240,13 +237,11 @@ "ctxt": 0 }, "value": "Boolean", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -278,6 +273,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -300,13 +296,11 @@ "ctxt": 0 }, "value": "NotBoolean", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -336,8 +330,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -347,7 +341,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -375,8 +368,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -386,7 +379,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -414,8 +406,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -425,7 +417,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -453,8 +444,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -464,7 +455,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -492,8 +482,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -503,7 +493,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -531,8 +520,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -542,7 +531,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/boolInsteadOfBoolean/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/boolInsteadOfBoolean/input.ts.json index 44cb3cf8f853..b7d62b147993 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/boolInsteadOfBoolean/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/boolInsteadOfBoolean/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,13 +54,11 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -91,6 +90,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -107,8 +107,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -118,7 +117,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -148,8 +146,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -159,7 +157,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/booleanPropertyAccess/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/booleanPropertyAccess/input.ts.json index 3e13eddde098..cdc7c6feb825 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/booleanPropertyAccess/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/booleanPropertyAccess/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -97,7 +97,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -108,7 +107,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -145,8 +143,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -170,7 +168,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/extendBooleanInterface/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/extendBooleanInterface/input.ts.json index 51c766f672d3..2d6e1c35c531 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/extendBooleanInterface/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/extendBooleanInterface/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Boolean", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "doStuff", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "doOtherStuff", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -106,6 +103,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -128,13 +126,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -159,7 +155,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -188,7 +183,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -225,8 +219,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -266,6 +260,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -282,8 +277,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -307,7 +301,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -318,7 +311,6 @@ "ctxt": 0 }, "value": "doStuff", - "typeAnnotation": null, "optional": false }, "computed": false @@ -355,6 +347,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +364,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -396,7 +388,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -407,7 +398,6 @@ "ctxt": 0 }, "value": "doOtherStuff", - "typeAnnotation": null, "optional": false }, "computed": false @@ -462,6 +452,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -478,8 +469,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -503,7 +493,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -554,6 +543,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -570,8 +560,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -595,7 +584,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/invalidBooleanAssignments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/invalidBooleanAssignments/input.ts.json index 10b3ed0fed86..641edc29a264 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/invalidBooleanAssignments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/invalidBooleanAssignments/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -72,6 +72,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -88,8 +89,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -99,7 +99,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -131,6 +130,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -147,8 +147,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -158,7 +157,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -190,6 +188,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -206,8 +205,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -217,7 +215,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -249,6 +246,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -271,12 +269,10 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -286,7 +282,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -310,7 +305,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -329,7 +323,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -361,6 +354,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -383,13 +377,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -399,7 +391,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -416,7 +407,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -442,7 +432,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -505,6 +494,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -527,13 +517,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -543,7 +531,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -565,7 +552,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -595,7 +581,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -649,6 +634,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -671,13 +657,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -687,7 +671,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -719,6 +702,7 @@ "ctxt": 0 }, "value": "h", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -763,8 +747,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -774,7 +757,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -806,6 +788,7 @@ "ctxt": 0 }, "value": "h2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -837,7 +820,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -864,8 +846,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -875,7 +856,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -899,7 +879,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -942,8 +921,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -985,8 +964,8 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -996,7 +975,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1011,7 +989,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1032,6 +1009,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1054,13 +1032,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1101,8 +1077,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1112,7 +1088,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1144,7 +1119,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1177,8 +1151,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1188,7 +1162,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/validBooleanAssignments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/validBooleanAssignments/input.ts.json index d71be5fec52b..9d02c768c4b0 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/validBooleanAssignments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/boolean/validBooleanAssignments/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -72,6 +72,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -88,8 +89,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -99,7 +99,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -131,6 +130,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -153,13 +153,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -169,7 +167,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -201,6 +198,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -223,13 +221,11 @@ "ctxt": 0 }, "value": "Boolean", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -239,7 +235,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -271,6 +266,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -287,8 +283,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -298,7 +293,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/enum/invalidEnumAssignments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/enum/invalidEnumAssignments/input.ts.json index 7dc11e8a5771..cbdda4e06e2b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/enum/invalidEnumAssignments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/enum/invalidEnumAssignments/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -86,7 +83,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "members": [ @@ -105,7 +101,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -125,7 +120,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -157,6 +151,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -179,13 +174,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -217,6 +210,7 @@ "ctxt": 0 }, "value": "e2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -239,13 +233,11 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -275,8 +267,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -293,7 +285,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "property": { @@ -304,7 +295,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -334,8 +324,8 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -352,7 +342,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -363,7 +352,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -393,8 +381,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TsTypeAssertion", @@ -446,8 +434,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -483,8 +471,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -512,7 +500,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -533,6 +520,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -555,13 +543,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -602,8 +588,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -613,7 +599,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -645,7 +630,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/enum/validEnumAssignments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/enum/validEnumAssignments/input.ts.json index a72359c36fe1..4ac6a868b46c 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/enum/validEnumAssignments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/enum/validEnumAssignments/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -94,6 +91,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -110,8 +108,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -143,6 +140,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -159,8 +157,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -192,6 +189,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -214,13 +212,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -250,8 +246,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -261,7 +257,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -289,8 +284,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -307,7 +302,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -318,7 +312,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -348,8 +341,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -359,7 +352,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -387,8 +379,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -398,7 +390,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -426,8 +417,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -444,7 +435,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -455,7 +445,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -485,8 +474,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -496,7 +485,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -524,8 +512,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -542,7 +530,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -553,7 +540,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -583,8 +569,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -601,7 +587,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -612,7 +597,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -642,8 +626,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -653,7 +637,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -681,8 +664,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -717,8 +700,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -728,7 +711,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -756,8 +738,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -793,8 +775,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -830,8 +812,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -867,8 +849,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "UnaryExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/null/directReferenceToNull/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/null/directReferenceToNull/input.ts.json index 2abe382e5b4e..35713e398a43 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/null/directReferenceToNull/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/null/directReferenceToNull/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,13 +54,11 @@ "ctxt": 0 }, "value": "Null", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/null/validNullAssignments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/null/validNullAssignments/input.ts.json index 088ce7098d93..d3640640c70b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/null/validNullAssignments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/null/validNullAssignments/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -87,6 +87,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -103,8 +104,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -143,6 +143,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -159,8 +160,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -199,6 +199,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -215,8 +216,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -255,6 +255,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -277,12 +278,10 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -319,8 +318,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -349,7 +348,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -368,7 +366,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -405,7 +402,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -416,7 +412,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -441,7 +436,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -467,7 +461,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -530,6 +523,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -552,13 +546,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -588,8 +580,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -624,8 +616,8 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -652,7 +644,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -682,7 +673,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -736,6 +726,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -758,13 +749,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -794,8 +783,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -830,8 +819,8 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -860,7 +849,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -903,8 +891,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -946,8 +934,8 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -984,6 +972,7 @@ "ctxt": 0 }, "value": "h", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1015,7 +1004,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1042,8 +1030,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -1067,7 +1054,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1088,6 +1074,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1110,13 +1097,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1157,8 +1142,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -1197,7 +1182,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1230,8 +1214,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/number/assignFromNumberInterface/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/number/assignFromNumberInterface/input.ts.json index ab233ea822af..9a0e5c68f704 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/number/assignFromNumberInterface/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/number/assignFromNumberInterface/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,6 +72,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -94,13 +95,11 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -130,8 +129,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -141,7 +140,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -169,8 +167,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -180,7 +178,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/number/assignFromNumberInterface2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/number/assignFromNumberInterface2/input.ts.json index 8f7fe2c070ff..8bfb7ef75aa3 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/number/assignFromNumberInterface2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/number/assignFromNumberInterface2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "doStuff", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "NotNumber", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -124,7 +121,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -138,6 +134,7 @@ "ctxt": 0 }, "value": "radix", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -154,8 +151,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnn": { @@ -193,7 +189,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -207,6 +202,7 @@ "ctxt": 0 }, "value": "fractionDigits", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -223,8 +219,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnn": { @@ -262,7 +257,6 @@ "ctxt": 0 }, "value": "toExponential", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -276,6 +270,7 @@ "ctxt": 0 }, "value": "fractionDigits", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -292,8 +287,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnn": { @@ -331,7 +325,6 @@ "ctxt": 0 }, "value": "toPrecision", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -345,6 +338,7 @@ "ctxt": 0 }, "value": "precision", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -361,8 +355,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnn": { @@ -400,7 +393,6 @@ "ctxt": 0 }, "value": "valueOf", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -441,7 +433,6 @@ "ctxt": 0 }, "value": "doStuff", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -494,8 +485,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -535,6 +526,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -557,13 +549,11 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -595,6 +585,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -617,13 +608,11 @@ "ctxt": 0 }, "value": "NotNumber", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -653,8 +642,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -664,7 +653,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -692,8 +680,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -703,7 +691,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -731,8 +718,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -742,7 +729,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -770,8 +756,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -781,7 +767,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -809,8 +794,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -820,7 +805,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -848,8 +832,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -859,7 +843,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/number/extendNumberInterface/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/number/extendNumberInterface/input.ts.json index f87103fe7a6b..5915d5ddd8d8 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/number/extendNumberInterface/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/number/extendNumberInterface/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "doStuff", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "doOtherStuff", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -106,6 +103,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -128,13 +126,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -159,7 +155,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -188,7 +183,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -225,8 +219,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -266,6 +260,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -282,8 +277,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -307,7 +301,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -318,7 +311,6 @@ "ctxt": 0 }, "value": "doStuff", - "typeAnnotation": null, "optional": false }, "computed": false @@ -355,6 +347,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +364,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -396,7 +388,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -407,7 +398,6 @@ "ctxt": 0 }, "value": "doOtherStuff", - "typeAnnotation": null, "optional": false }, "computed": false @@ -462,6 +452,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -478,8 +469,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -503,7 +493,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -554,6 +543,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -570,8 +560,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -595,7 +584,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/number/invalidNumberAssignments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/number/invalidNumberAssignments/input.ts.json index 05025a8245ab..1da83eab7123 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/number/invalidNumberAssignments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/number/invalidNumberAssignments/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,6 +72,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -88,8 +89,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -99,7 +99,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -131,6 +130,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -147,8 +147,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -158,7 +157,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -190,6 +188,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -206,8 +205,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -217,7 +215,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -249,6 +246,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -271,12 +269,10 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -286,7 +282,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -303,7 +298,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -329,7 +323,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -392,6 +385,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -414,13 +408,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -430,7 +422,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -452,7 +443,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -482,7 +472,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -536,6 +525,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -558,13 +548,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -574,7 +562,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -606,6 +593,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -637,7 +625,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -665,8 +652,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -706,6 +692,7 @@ "ctxt": 0 }, "value": "g2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -763,8 +750,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -796,7 +782,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -839,8 +824,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -882,8 +867,8 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -893,7 +878,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -908,7 +892,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -929,6 +912,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -951,13 +935,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -998,8 +980,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1009,7 +991,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1041,7 +1022,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1074,8 +1054,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1085,7 +1065,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/number/numberPropertyAccess/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/number/numberPropertyAccess/input.ts.json index 2f4b908611ac..69117b2f9857 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/number/numberPropertyAccess/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/number/numberPropertyAccess/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -97,7 +97,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -108,7 +107,6 @@ "ctxt": 0 }, "value": "toExponential", - "typeAnnotation": null, "optional": false }, "computed": false @@ -145,8 +143,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -170,7 +168,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -181,7 +178,6 @@ "ctxt": 0 }, "value": "hasOwnProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -236,8 +232,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -261,7 +257,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -312,8 +307,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -337,7 +332,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/number/validNumberAssignments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/number/validNumberAssignments/input.ts.json index c7734fd47a18..6beee2f33bdc 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/number/validNumberAssignments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/number/validNumberAssignments/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -72,6 +72,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -88,8 +89,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -99,7 +99,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -131,6 +130,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -153,13 +153,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -169,7 +167,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -201,6 +198,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -217,8 +215,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -228,7 +225,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -252,7 +248,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -271,7 +266,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -311,6 +305,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -333,13 +328,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -349,7 +342,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -381,8 +373,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -399,7 +391,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -410,7 +401,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -442,8 +432,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -453,7 +443,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/string/assignFromStringInterface/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/string/assignFromStringInterface/input.ts.json index 68cfbf99ac2e..164ba6368ae3 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/string/assignFromStringInterface/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/string/assignFromStringInterface/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -77,6 +77,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -99,13 +100,11 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -135,8 +134,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -146,7 +145,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -174,8 +172,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -185,7 +183,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/string/assignFromStringInterface2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/string/assignFromStringInterface2/input.ts.json index 9a66ff6b79e3..fd6c2dbba93e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/string/assignFromStringInterface2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/string/assignFromStringInterface2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "doStuff", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "NotString", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -124,7 +121,6 @@ "ctxt": 0 }, "value": "doStuff", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -165,7 +161,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -206,7 +201,6 @@ "ctxt": 0 }, "value": "charAt", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -220,6 +214,7 @@ "ctxt": 0 }, "value": "pos", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -236,8 +231,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -275,7 +269,6 @@ "ctxt": 0 }, "value": "charCodeAt", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -289,6 +282,7 @@ "ctxt": 0 }, "value": "index", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -305,8 +299,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -344,7 +337,6 @@ "ctxt": 0 }, "value": "concat", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -370,8 +362,8 @@ "ctxt": 0 }, "value": "strings", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -435,7 +427,6 @@ "ctxt": 0 }, "value": "indexOf", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -449,6 +440,7 @@ "ctxt": 0 }, "value": "searchString", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -465,8 +457,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -476,6 +467,7 @@ "ctxt": 0 }, "value": "position", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -492,8 +484,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnn": { @@ -531,7 +522,6 @@ "ctxt": 0 }, "value": "lastIndexOf", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -545,6 +535,7 @@ "ctxt": 0 }, "value": "searchString", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -561,8 +552,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -572,6 +562,7 @@ "ctxt": 0 }, "value": "position", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -588,8 +579,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnn": { @@ -627,7 +617,6 @@ "ctxt": 0 }, "value": "localeCompare", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -641,6 +630,7 @@ "ctxt": 0 }, "value": "that", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -657,8 +647,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -696,7 +685,6 @@ "ctxt": 0 }, "value": "match", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -710,6 +698,7 @@ "ctxt": 0 }, "value": "regexp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -726,8 +715,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -773,7 +761,6 @@ "ctxt": 0 }, "value": "match", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -787,6 +774,7 @@ "ctxt": 0 }, "value": "regexp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -809,13 +797,11 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -861,7 +847,6 @@ "ctxt": 0 }, "value": "replace", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -875,6 +860,7 @@ "ctxt": 0 }, "value": "searchValue", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -891,8 +877,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -902,6 +887,7 @@ "ctxt": 0 }, "value": "replaceValue", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -918,8 +904,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -957,7 +942,6 @@ "ctxt": 0 }, "value": "replace", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -971,6 +955,7 @@ "ctxt": 0 }, "value": "searchValue", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -987,8 +972,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -998,6 +982,7 @@ "ctxt": 0 }, "value": "replaceValue", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1021,6 +1006,7 @@ "ctxt": 0 }, "value": "substring", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1037,8 +1023,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "RestElement", @@ -1060,8 +1045,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1109,8 +1094,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": { @@ -1148,7 +1132,6 @@ "ctxt": 0 }, "value": "replace", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1162,6 +1145,7 @@ "ctxt": 0 }, "value": "searchValue", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1184,13 +1168,11 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1200,6 +1182,7 @@ "ctxt": 0 }, "value": "replaceValue", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1216,8 +1199,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -1255,7 +1237,6 @@ "ctxt": 0 }, "value": "replace", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1269,6 +1250,7 @@ "ctxt": 0 }, "value": "searchValue", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1291,13 +1273,11 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1307,6 +1287,7 @@ "ctxt": 0 }, "value": "replaceValue", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1330,6 +1311,7 @@ "ctxt": 0 }, "value": "substring", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1346,8 +1328,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "RestElement", @@ -1369,8 +1350,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1418,8 +1399,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": { @@ -1457,7 +1437,6 @@ "ctxt": 0 }, "value": "search", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1471,6 +1450,7 @@ "ctxt": 0 }, "value": "regexp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1487,8 +1467,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -1526,7 +1505,6 @@ "ctxt": 0 }, "value": "search", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1540,6 +1518,7 @@ "ctxt": 0 }, "value": "regexp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1562,13 +1541,11 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1606,7 +1583,6 @@ "ctxt": 0 }, "value": "slice", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1620,6 +1596,7 @@ "ctxt": 0 }, "value": "start", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1636,8 +1613,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -1647,6 +1623,7 @@ "ctxt": 0 }, "value": "end", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1663,8 +1640,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnn": { @@ -1702,7 +1678,6 @@ "ctxt": 0 }, "value": "split", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1716,6 +1691,7 @@ "ctxt": 0 }, "value": "separator", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1732,8 +1708,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1743,6 +1718,7 @@ "ctxt": 0 }, "value": "limit", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1759,8 +1735,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnn": { @@ -1806,7 +1781,6 @@ "ctxt": 0 }, "value": "split", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1820,6 +1794,7 @@ "ctxt": 0 }, "value": "separator", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1842,13 +1817,11 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1858,6 +1831,7 @@ "ctxt": 0 }, "value": "limit", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1874,8 +1848,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnn": { @@ -1921,7 +1894,6 @@ "ctxt": 0 }, "value": "substring", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1935,6 +1907,7 @@ "ctxt": 0 }, "value": "start", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1951,8 +1924,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1962,6 +1934,7 @@ "ctxt": 0 }, "value": "end", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1978,8 +1951,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnn": { @@ -2017,7 +1989,6 @@ "ctxt": 0 }, "value": "toLowerCase", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2058,7 +2029,6 @@ "ctxt": 0 }, "value": "toLocaleLowerCase", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2099,7 +2069,6 @@ "ctxt": 0 }, "value": "toUpperCase", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2140,7 +2109,6 @@ "ctxt": 0 }, "value": "toLocaleUpperCase", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2181,7 +2149,6 @@ "ctxt": 0 }, "value": "trim", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2222,7 +2189,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2264,7 +2230,6 @@ "ctxt": 0 }, "value": "substr", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2278,6 +2243,7 @@ "ctxt": 0 }, "value": "from", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2294,8 +2260,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2305,6 +2270,7 @@ "ctxt": 0 }, "value": "length", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2321,8 +2287,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnn": { @@ -2360,7 +2325,6 @@ "ctxt": 0 }, "value": "valueOf", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2396,6 +2360,7 @@ "ctxt": 0 }, "value": "index", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2412,8 +2377,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2468,8 +2432,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -2514,6 +2478,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2536,13 +2501,11 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2574,6 +2537,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2596,13 +2560,11 @@ "ctxt": 0 }, "value": "NotString", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2632,8 +2594,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2643,7 +2605,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2671,8 +2632,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2682,7 +2643,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2710,8 +2670,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2721,7 +2681,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2749,8 +2708,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2760,7 +2719,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2788,8 +2746,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2799,7 +2757,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2827,8 +2784,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2838,7 +2795,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/string/extendStringInterface/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/string/extendStringInterface/input.ts.json index 01e9f92ee52e..3d6a8ce57c54 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/string/extendStringInterface/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/string/extendStringInterface/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "doStuff", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "doOtherStuff", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -106,6 +103,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -128,13 +126,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -159,7 +155,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -188,7 +183,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -225,8 +219,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -271,6 +265,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -287,8 +282,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -312,7 +306,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -323,7 +316,6 @@ "ctxt": 0 }, "value": "doStuff", - "typeAnnotation": null, "optional": false }, "computed": false @@ -360,6 +352,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -376,8 +369,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -401,7 +393,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -412,7 +403,6 @@ "ctxt": 0 }, "value": "doOtherStuff", - "typeAnnotation": null, "optional": false }, "computed": false @@ -467,6 +457,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -483,8 +474,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -508,7 +498,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -559,6 +548,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -575,8 +565,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -600,7 +589,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/string/invalidStringAssignments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/string/invalidStringAssignments/input.ts.json index 2c15b8285bf5..90be89739c8e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/string/invalidStringAssignments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/string/invalidStringAssignments/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -77,6 +77,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -93,8 +94,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -104,7 +104,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -136,6 +135,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -152,8 +152,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -163,7 +162,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -195,6 +193,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -211,8 +210,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -222,7 +220,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -254,6 +251,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -276,12 +274,10 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -291,7 +287,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -308,7 +303,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -334,7 +328,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -397,6 +390,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -419,13 +413,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -435,7 +427,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -457,7 +448,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -487,7 +477,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -541,6 +530,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -563,13 +553,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -579,7 +567,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -611,6 +598,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -642,7 +630,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -670,8 +657,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -711,6 +697,7 @@ "ctxt": 0 }, "value": "g2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -768,8 +755,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -801,7 +787,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -844,8 +829,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -887,8 +872,8 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -898,7 +883,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -913,7 +897,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -934,6 +917,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -956,13 +940,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1003,8 +985,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1014,7 +996,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1046,7 +1027,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1079,8 +1059,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1090,7 +1070,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1112,7 +1091,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -1131,7 +1109,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -1163,6 +1140,7 @@ "ctxt": 0 }, "value": "j", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1185,13 +1163,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1201,7 +1177,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/string/stringPropertyAccess/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/string/stringPropertyAccess/input.ts.json index cfa9974a95e3..216b7fa2bab7 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/string/stringPropertyAccess/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/string/stringPropertyAccess/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -77,8 +77,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -102,7 +102,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -113,7 +112,6 @@ "ctxt": 0 }, "value": "charAt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -163,8 +161,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -188,7 +186,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -199,7 +196,6 @@ "ctxt": 0 }, "value": "hasOwnProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -254,8 +250,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -279,7 +275,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -343,8 +338,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -368,7 +363,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/string/stringPropertyAccessWithError/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/string/stringPropertyAccessWithError/input.ts.json index 234f36c0b0e2..9aa94ba501e5 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/string/stringPropertyAccessWithError/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/string/stringPropertyAccessWithError/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -77,8 +77,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -102,7 +102,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/string/validStringAssignments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/string/validStringAssignments/input.ts.json index b092b6c843ec..03bb3341f807 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/string/validStringAssignments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/string/validStringAssignments/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -77,6 +77,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -93,8 +94,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -104,7 +104,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -136,6 +135,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -158,13 +158,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -174,7 +172,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -206,6 +203,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -222,8 +220,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -233,7 +230,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -265,6 +261,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -287,13 +284,11 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -303,7 +298,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/stringLiteral/stringLiteralType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/stringLiteral/stringLiteralType/input.ts.json index 71e8de3ca874..9e6787592d4a 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/stringLiteral/stringLiteralType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/stringLiteral/stringLiteralType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,8 +61,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -78,7 +78,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -99,6 +98,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -128,8 +128,7 @@ } } } - }, - "optional": false + } } } ], @@ -155,7 +154,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -176,6 +174,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -192,8 +191,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -219,7 +217,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -240,6 +237,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -256,8 +254,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/undefined/directReferenceToUndefined/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/undefined/directReferenceToUndefined/input.ts.json index 2140e6e1b3fd..e31eadca832b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/undefined/directReferenceToUndefined/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/undefined/directReferenceToUndefined/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,13 +54,11 @@ "ctxt": 0 }, "value": "Undefined", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -91,8 +90,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -102,7 +101,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/undefined/invalidUndefinedAssignments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/undefined/invalidUndefinedAssignments/input.ts.json index 1d9f66308330..02761b6cc29a 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/undefined/invalidUndefinedAssignments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/undefined/invalidUndefinedAssignments/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,12 +54,10 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -82,7 +81,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -101,7 +99,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -131,8 +128,8 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -142,7 +139,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -177,7 +173,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -188,7 +183,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -201,7 +195,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -216,7 +209,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -242,7 +234,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -305,6 +296,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -327,13 +319,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -363,8 +353,8 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -374,7 +364,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -394,7 +383,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -424,7 +412,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -478,6 +465,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -500,13 +488,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -536,8 +522,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -547,7 +533,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -575,8 +560,8 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -586,7 +571,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -608,7 +592,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -651,8 +634,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -694,8 +677,8 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -705,7 +688,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -720,7 +702,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -741,6 +722,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -763,13 +745,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -813,7 +793,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -846,8 +825,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -857,7 +836,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/undefined/invalidUndefinedValues/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/undefined/invalidUndefinedValues/input.ts.json index 0995f6081ccd..470691e5e101 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/undefined/invalidUndefinedValues/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/undefined/invalidUndefinedValues/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,12 +54,10 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -88,8 +87,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -125,8 +124,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -167,8 +166,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -206,6 +205,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -222,8 +222,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -253,8 +252,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -264,7 +263,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -292,8 +290,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -315,7 +313,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -341,7 +338,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -404,6 +400,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -426,13 +423,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -462,8 +457,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -473,7 +468,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } @@ -501,8 +495,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -512,7 +506,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -532,7 +525,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -562,7 +554,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -616,6 +607,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -638,13 +630,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -674,8 +664,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -685,7 +675,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -707,7 +696,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -750,8 +738,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -793,8 +781,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -804,7 +792,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } } @@ -832,8 +819,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -853,7 +840,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -891,7 +877,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -912,6 +897,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -934,13 +920,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -981,8 +965,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -992,7 +976,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1024,7 +1007,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1057,8 +1039,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1068,7 +1050,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -1090,7 +1071,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -1109,7 +1089,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -1139,8 +1118,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1150,7 +1129,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false } } @@ -1178,8 +1156,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1196,7 +1174,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1207,7 +1184,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/undefined/validUndefinedAssignments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/undefined/validUndefinedAssignments/input.ts.json index 9a2fd306633d..2fb4e5ba8cfe 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/undefined/validUndefinedAssignments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/undefined/validUndefinedAssignments/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,12 +54,10 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -90,6 +89,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -106,8 +106,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -117,7 +116,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -149,6 +147,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -165,8 +164,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -176,7 +174,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -208,6 +205,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -224,8 +222,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -235,7 +232,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -267,6 +263,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -283,8 +280,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -294,7 +290,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -326,6 +321,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -348,12 +344,10 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -363,7 +357,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -393,8 +386,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -404,7 +397,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -419,7 +411,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -445,7 +436,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -508,6 +498,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -530,13 +521,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -566,8 +555,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -577,7 +566,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -597,7 +585,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -627,7 +614,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -681,6 +667,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -703,13 +690,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -739,8 +724,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -750,7 +735,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -780,6 +764,7 @@ "ctxt": 0 }, "value": "h", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -811,7 +796,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -838,8 +822,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -849,7 +832,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -866,7 +848,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -887,6 +868,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -909,13 +891,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -956,8 +936,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -967,7 +947,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -999,7 +978,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/undefined/validUndefinedValues/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/undefined/validUndefinedValues/input.ts.json index 2db4d5f6f2e2..d4aad56d15be 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/undefined/validUndefinedValues/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/undefined/validUndefinedValues/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,12 +54,10 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -88,8 +87,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -99,7 +98,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/void/invalidAssignmentsToVoid/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/void/invalidAssignmentsToVoid/input.ts.json index 78c9be30c637..3b514e121b3c 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/void/invalidAssignmentsToVoid/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/void/invalidAssignmentsToVoid/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -78,8 +78,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -115,8 +115,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -152,8 +152,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -194,8 +194,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -218,7 +218,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -244,7 +243,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -307,6 +305,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -329,13 +328,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -365,8 +362,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -376,7 +373,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } @@ -404,8 +400,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -415,7 +411,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -435,7 +430,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -465,7 +459,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -519,6 +512,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -541,13 +535,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -577,8 +569,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -588,7 +580,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -610,7 +601,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -653,8 +643,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -696,8 +686,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -707,7 +697,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } } @@ -722,7 +711,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -743,6 +731,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -765,13 +754,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -812,8 +799,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -823,7 +810,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -855,7 +841,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -888,8 +873,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -899,7 +884,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/void/invalidVoidAssignments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/void/invalidVoidAssignments/input.ts.json index 28414fd4cd78..763617e42b9e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/void/invalidVoidAssignments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/void/invalidVoidAssignments/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -107,7 +107,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -139,6 +138,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -155,8 +155,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -166,7 +165,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -198,6 +196,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -214,8 +213,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -225,7 +223,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -257,6 +254,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -279,12 +277,10 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -294,7 +290,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -311,7 +306,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -337,7 +331,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -400,6 +393,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -422,13 +416,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -438,7 +430,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -460,7 +451,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -490,7 +480,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -544,6 +533,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -566,13 +556,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -582,7 +570,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -614,6 +601,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -645,7 +633,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -673,8 +660,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -714,6 +700,7 @@ "ctxt": 0 }, "value": "g2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -771,8 +758,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -804,7 +790,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -847,8 +832,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -890,8 +875,8 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -901,7 +886,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -916,7 +900,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -937,6 +920,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -959,13 +943,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1006,8 +988,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1017,7 +999,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1049,7 +1030,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1082,8 +1062,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1093,7 +1073,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1115,7 +1094,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -1134,7 +1112,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -1164,8 +1141,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1175,7 +1152,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false } } @@ -1203,8 +1179,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1221,7 +1197,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1232,7 +1207,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1262,8 +1236,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1283,7 +1257,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/void/invalidVoidValues/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/void/invalidVoidValues/input.ts.json index 851821f44425..6dc45b355ffe 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/void/invalidVoidValues/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/void/invalidVoidValues/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -78,8 +78,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -115,8 +115,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -157,8 +157,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "BooleanLiteral", @@ -188,7 +188,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -207,7 +206,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -237,8 +235,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -248,7 +246,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false } } @@ -276,8 +273,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -294,7 +291,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -305,7 +301,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -322,7 +317,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -348,7 +342,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -411,6 +404,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -433,13 +427,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -469,8 +461,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -480,7 +472,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -500,7 +491,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -530,7 +520,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -584,6 +573,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -606,13 +596,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -642,8 +630,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -653,7 +641,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -681,8 +668,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -702,7 +689,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -747,7 +733,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -790,8 +775,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -833,8 +818,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -844,7 +829,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } } @@ -859,7 +843,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -880,6 +863,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -902,13 +886,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -949,8 +931,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -960,7 +942,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -992,7 +973,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1025,8 +1005,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1036,7 +1016,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/void/validVoidAssignments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/void/validVoidAssignments/input.ts.json index 441db029a478..1c7af82cc3f0 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/void/validVoidAssignments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/void/validVoidAssignments/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -176,8 +176,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -187,7 +187,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -215,8 +214,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -226,7 +225,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -254,8 +252,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -265,7 +263,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/primitives/void/validVoidValues/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/primitives/void/validVoidValues/input.ts.json index 7116ff88fae0..4418c5b59976 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/primitives/void/validVoidValues/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/primitives/void/validVoidValues/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -78,8 +78,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -89,7 +89,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -117,8 +116,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/types/rest/genericObjectRest/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/rest/genericObjectRest/input.ts.json index 577a9e46a9bd..e3b3148f2d3c 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/rest/genericObjectRest/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/rest/genericObjectRest/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -62,7 +62,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -83,6 +82,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -105,13 +105,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -174,8 +172,8 @@ "ctxt": 0 }, "value": "r0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -191,7 +189,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "definite": false @@ -233,7 +230,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -244,8 +240,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -268,8 +264,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -285,7 +281,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "definite": false @@ -327,7 +322,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -338,8 +332,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -352,7 +346,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -363,8 +356,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -387,8 +380,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -404,7 +397,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "definite": false @@ -460,8 +452,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -484,8 +476,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -501,7 +493,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "definite": false @@ -565,8 +556,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -589,8 +580,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -606,7 +597,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "definite": false @@ -655,7 +645,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -667,8 +656,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -691,8 +680,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -708,7 +697,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "definite": false @@ -742,7 +730,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -769,7 +756,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -811,7 +797,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -870,8 +855,8 @@ "ctxt": 0 }, "value": "sa", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -888,7 +873,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -923,8 +907,8 @@ "ctxt": 0 }, "value": "sb", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -941,7 +925,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -961,7 +944,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -982,6 +964,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1004,13 +987,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1070,7 +1051,6 @@ "ctxt": 0 }, "value": "sa", - "typeAnnotation": null, "optional": false } }, @@ -1082,8 +1062,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1103,7 +1083,6 @@ "ctxt": 0 }, "value": "sb", - "typeAnnotation": null, "optional": false } }, @@ -1115,8 +1094,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1139,8 +1118,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1156,7 +1135,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1190,7 +1168,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1217,7 +1194,6 @@ "ctxt": 0 }, "value": "sa", - "typeAnnotation": null, "optional": false }, "computed": true, @@ -1259,7 +1235,6 @@ "ctxt": 0 }, "value": "sb", - "typeAnnotation": null, "optional": false }, "computed": true, @@ -1303,7 +1278,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1324,6 +1298,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1346,13 +1321,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1371,6 +1344,7 @@ "ctxt": 0 }, "value": "k1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1393,13 +1367,11 @@ "ctxt": 0 }, "value": "K1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1418,6 +1390,7 @@ "ctxt": 0 }, "value": "k2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1440,13 +1413,11 @@ "ctxt": 0 }, "value": "K2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1506,7 +1477,6 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, "optional": false } }, @@ -1518,8 +1488,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1539,7 +1509,6 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, "optional": false } }, @@ -1551,8 +1520,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1575,8 +1544,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1592,7 +1561,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1626,7 +1594,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1647,7 +1614,6 @@ "ctxt": 0 }, "value": "K1", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1673,7 +1639,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1696,7 +1661,6 @@ "ctxt": 0 }, "value": "K2", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1722,7 +1686,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1750,7 +1713,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1778,7 +1740,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1820,7 +1781,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1862,7 +1822,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1901,7 +1860,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1922,6 +1880,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1944,13 +1903,11 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1969,6 +1926,7 @@ "ctxt": 0 }, "value": "k1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1991,13 +1949,11 @@ "ctxt": 0 }, "value": "K1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2016,6 +1972,7 @@ "ctxt": 0 }, "value": "k2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2038,13 +1995,11 @@ "ctxt": 0 }, "value": "K2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2104,7 +2059,6 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, "optional": false } }, @@ -2116,8 +2070,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -2137,7 +2091,6 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, "optional": false } }, @@ -2149,8 +2102,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -2173,8 +2126,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -2190,7 +2143,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2224,7 +2176,6 @@ "ctxt": 0 }, "value": "K1", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2250,7 +2201,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2273,7 +2223,6 @@ "ctxt": 0 }, "value": "K2", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2299,7 +2248,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/rest/genericRestArity/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/rest/genericRestArity/input.ts.json index fbab3f7a6f6f..a2acca283553 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/rest/genericRestArity/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/rest/genericRestArity/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "handler", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -97,7 +97,6 @@ "ctxt": 0 }, "value": "TS", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -124,8 +123,7 @@ } } } - }, - "optional": false + } } }, { @@ -156,8 +154,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -181,7 +179,6 @@ "ctxt": 0 }, "value": "TS", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -222,7 +219,6 @@ "ctxt": 0 }, "value": "TS", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -286,7 +282,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -308,6 +303,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -324,8 +320,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -335,6 +330,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -351,8 +347,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -371,7 +366,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -382,7 +376,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -418,7 +411,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -440,6 +432,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -456,8 +449,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -467,6 +459,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -483,8 +476,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -503,7 +495,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -514,7 +505,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/types/rest/genericRestArityStrict/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/rest/genericRestArityStrict/input.ts.json index 33dcc6805507..7807f2d56039 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/rest/genericRestArityStrict/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/rest/genericRestArityStrict/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "handler", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -97,7 +97,6 @@ "ctxt": 0 }, "value": "TS", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -124,8 +123,7 @@ } } } - }, - "optional": false + } } }, { @@ -156,8 +154,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -181,7 +179,6 @@ "ctxt": 0 }, "value": "TS", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -222,7 +219,6 @@ "ctxt": 0 }, "value": "TS", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -286,7 +282,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -308,6 +303,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -324,8 +320,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -335,6 +330,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -351,8 +347,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -371,7 +366,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -382,7 +376,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -418,7 +411,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -440,6 +432,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -456,8 +449,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -467,6 +459,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -483,8 +476,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -503,7 +495,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -514,7 +505,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/types/rest/genericRestParameters1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/rest/genericRestParameters1/input.ts.json index 753a01d7581c..5b0bb0053cdd 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/rest/genericRestParameters1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/rest/genericRestParameters1/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "f1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -162,8 +163,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -195,6 +195,7 @@ "ctxt": 0 }, "value": "f2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -218,6 +219,7 @@ "ctxt": 0 }, "value": "x0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -234,8 +236,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -245,6 +246,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -261,8 +263,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -272,6 +273,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -288,8 +290,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeParams": null, @@ -311,8 +312,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -342,8 +342,8 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -353,7 +353,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false } } @@ -381,8 +380,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -392,7 +391,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } } @@ -422,6 +420,7 @@ "ctxt": 0 }, "value": "t3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -493,8 +492,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -526,6 +524,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -579,8 +578,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -612,6 +610,7 @@ "ctxt": 0 }, "value": "t1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -647,8 +646,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -680,6 +678,7 @@ "ctxt": 0 }, "value": "t0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -696,8 +695,7 @@ }, "elemTypes": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -729,6 +727,7 @@ "ctxt": 0 }, "value": "ns", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -782,8 +781,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -815,6 +813,7 @@ "ctxt": 0 }, "value": "sn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -868,8 +867,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -898,7 +896,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -969,7 +966,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -990,7 +986,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1022,7 +1017,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1054,7 +1048,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1095,7 +1088,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1113,7 +1105,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false } } @@ -1143,7 +1134,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1173,7 +1163,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1203,7 +1192,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1250,7 +1238,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1280,7 +1267,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1339,7 +1325,6 @@ "ctxt": 0 }, "value": "t0", - "typeAnnotation": null, "optional": false } } @@ -1369,7 +1354,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1390,7 +1374,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -1422,7 +1405,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -1475,7 +1457,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1493,7 +1474,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } }, @@ -1535,7 +1515,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1606,7 +1585,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1627,7 +1605,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1659,7 +1636,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1691,7 +1667,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1732,7 +1707,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1750,7 +1724,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false } } @@ -1780,7 +1753,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1810,7 +1782,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1840,7 +1811,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1887,7 +1857,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1917,7 +1886,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1976,7 +1944,6 @@ "ctxt": 0 }, "value": "t0", - "typeAnnotation": null, "optional": false } } @@ -2006,7 +1973,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2027,7 +1993,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -2059,7 +2024,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false }, "property": { @@ -2112,7 +2076,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2130,7 +2093,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } }, @@ -2160,7 +2122,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2193,8 +2154,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2218,7 +2179,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2259,7 +2219,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2305,7 +2264,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2337,8 +2295,8 @@ "ctxt": 0 }, "value": "x10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2355,7 +2313,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2432,8 +2389,8 @@ "ctxt": 0 }, "value": "x11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2450,7 +2407,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2515,8 +2471,8 @@ "ctxt": 0 }, "value": "x12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2533,7 +2489,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2581,8 +2536,8 @@ "ctxt": 0 }, "value": "x13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2599,7 +2554,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2634,8 +2588,8 @@ "ctxt": 0 }, "value": "x14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2652,7 +2606,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2670,7 +2623,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false } } @@ -2706,8 +2658,8 @@ "ctxt": 0 }, "value": "x15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2724,7 +2676,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2754,7 +2705,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -2790,8 +2740,8 @@ "ctxt": 0 }, "value": "x16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2808,7 +2758,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2855,7 +2804,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2891,8 +2839,8 @@ "ctxt": 0 }, "value": "x17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2909,7 +2857,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2968,7 +2915,6 @@ "ctxt": 0 }, "value": "t0", - "typeAnnotation": null, "optional": false } } @@ -3004,8 +2950,8 @@ "ctxt": 0 }, "value": "x18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3022,7 +2968,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3040,7 +2985,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } }, @@ -3073,7 +3017,6 @@ "ctxt": 0 }, "value": "g10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3094,6 +3037,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3116,13 +3060,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3141,6 +3083,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3163,13 +3106,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3212,8 +3153,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3230,7 +3171,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3248,7 +3188,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -3284,8 +3223,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3302,7 +3241,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3320,7 +3258,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -3356,8 +3293,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3374,7 +3311,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3404,7 +3340,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -3440,8 +3375,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3458,7 +3393,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3476,7 +3410,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -3494,7 +3427,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -3532,7 +3464,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3569,7 +3500,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3634,7 +3564,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3667,8 +3596,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -3692,7 +3621,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3733,7 +3661,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3815,7 +3742,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3847,8 +3773,8 @@ "ctxt": 0 }, "value": "z10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3865,7 +3791,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3942,8 +3867,8 @@ "ctxt": 0 }, "value": "z11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3960,7 +3885,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4025,8 +3949,8 @@ "ctxt": 0 }, "value": "z12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4043,7 +3967,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4091,8 +4014,8 @@ "ctxt": 0 }, "value": "z13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4109,7 +4032,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4144,8 +4066,8 @@ "ctxt": 0 }, "value": "z14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4162,7 +4084,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4180,7 +4101,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false } } @@ -4216,8 +4136,8 @@ "ctxt": 0 }, "value": "z15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4234,7 +4154,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4264,7 +4183,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -4300,8 +4218,8 @@ "ctxt": 0 }, "value": "z16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4318,7 +4236,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4365,7 +4282,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -4401,8 +4317,8 @@ "ctxt": 0 }, "value": "z17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4419,7 +4335,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4478,7 +4393,6 @@ "ctxt": 0 }, "value": "t0", - "typeAnnotation": null, "optional": false } } @@ -4514,8 +4428,8 @@ "ctxt": 0 }, "value": "z18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4532,7 +4446,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4550,7 +4463,6 @@ "ctxt": 0 }, "value": "ns", - "typeAnnotation": null, "optional": false } }, @@ -4583,7 +4495,6 @@ "ctxt": 0 }, "value": "g11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4604,6 +4515,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4626,13 +4538,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4651,6 +4561,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4673,13 +4584,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4722,8 +4631,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4740,7 +4649,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4758,7 +4666,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -4794,8 +4701,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4812,7 +4719,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4830,7 +4736,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -4866,8 +4771,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4884,7 +4789,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4914,7 +4818,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -4950,8 +4853,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4968,7 +4871,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4986,7 +4888,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -5004,7 +4905,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -5042,7 +4942,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5079,7 +4978,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5144,7 +5042,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5165,6 +5062,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5200,8 +5098,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -5225,7 +5123,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5256,15 +5153,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -5295,8 +5190,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -5320,7 +5215,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5365,7 +5259,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5383,7 +5276,6 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, "optional": false } } @@ -5418,7 +5310,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5455,7 +5346,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5475,7 +5365,6 @@ "ctxt": 0 }, "value": "callr", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5496,6 +5385,7 @@ "ctxt": 0 }, "value": "args", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5518,13 +5408,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -5543,6 +5431,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5578,8 +5467,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -5603,7 +5492,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5634,15 +5522,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -5682,7 +5568,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5700,7 +5585,6 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, "optional": false } } @@ -5735,7 +5619,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5772,7 +5655,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5792,7 +5674,6 @@ "ctxt": 0 }, "value": "f15", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5813,6 +5694,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5829,8 +5711,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -5849,6 +5730,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5865,8 +5747,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -5927,7 +5808,6 @@ "ctxt": 0 }, "value": "f16", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5948,6 +5828,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5970,13 +5851,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -5995,6 +5874,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6017,13 +5897,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6059,7 +5937,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6080,7 +5957,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6118,7 +5994,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6138,7 +6013,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6172,8 +6046,8 @@ "ctxt": 0 }, "value": "x20", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6190,7 +6064,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6212,8 +6085,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6223,8 +6096,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -6243,7 +6116,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -6254,7 +6126,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -6320,8 +6191,8 @@ "ctxt": 0 }, "value": "x21", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6338,7 +6209,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6360,8 +6230,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6371,8 +6241,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -6391,7 +6261,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -6402,7 +6271,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -6473,8 +6341,8 @@ "ctxt": 0 }, "value": "x22", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6491,7 +6359,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6505,7 +6372,6 @@ "ctxt": 0 }, "value": "f15", - "typeAnnotation": null, "optional": false } }, @@ -6570,8 +6436,8 @@ "ctxt": 0 }, "value": "x23", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6588,7 +6454,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6602,7 +6467,6 @@ "ctxt": 0 }, "value": "f16", - "typeAnnotation": null, "optional": false } }, @@ -6667,8 +6531,8 @@ "ctxt": 0 }, "value": "x24", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6685,7 +6549,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6699,7 +6562,6 @@ "ctxt": 0 }, "value": "f16", - "typeAnnotation": null, "optional": false } }, @@ -6847,8 +6709,8 @@ "ctxt": 0 }, "value": "x30", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6865,7 +6727,6 @@ "ctxt": 0 }, "value": "callr", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6879,7 +6740,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false } }, @@ -6901,8 +6761,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6912,8 +6772,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -6932,7 +6792,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -6943,7 +6802,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -6985,8 +6843,8 @@ "ctxt": 0 }, "value": "x31", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7003,7 +6861,6 @@ "ctxt": 0 }, "value": "callr", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7017,7 +6874,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false } }, @@ -7031,7 +6887,6 @@ "ctxt": 0 }, "value": "f15", - "typeAnnotation": null, "optional": false } } @@ -7067,8 +6922,8 @@ "ctxt": 0 }, "value": "x32", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7085,7 +6940,6 @@ "ctxt": 0 }, "value": "callr", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7099,7 +6953,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false } }, @@ -7113,7 +6966,6 @@ "ctxt": 0 }, "value": "f16", - "typeAnnotation": null, "optional": false } } @@ -7134,7 +6986,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7155,6 +7006,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7178,6 +7030,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7200,13 +7053,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "RestElement", @@ -7228,8 +7079,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -7253,7 +7104,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7284,15 +7134,13 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -7311,6 +7159,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7333,13 +7182,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -7392,8 +7239,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -7417,7 +7264,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7440,7 +7286,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7454,7 +7299,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -7472,7 +7316,6 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, "optional": false } } @@ -7512,7 +7355,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7533,7 +7375,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7570,7 +7411,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7605,6 +7445,7 @@ "ctxt": 0 }, "value": "f20", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7628,6 +7469,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7644,8 +7486,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -7655,6 +7496,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7671,8 +7513,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -7682,6 +7523,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7698,8 +7540,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeParams": null, @@ -7729,8 +7570,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -7762,8 +7602,8 @@ "ctxt": 0 }, "value": "f21", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7780,7 +7620,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7794,7 +7633,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false } }, @@ -7842,8 +7680,8 @@ "ctxt": 0 }, "value": "f22", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7860,7 +7698,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7874,7 +7711,6 @@ "ctxt": 0 }, "value": "f21", - "typeAnnotation": null, "optional": false } }, @@ -7927,8 +7763,8 @@ "ctxt": 0 }, "value": "f23", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7945,7 +7781,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7959,7 +7794,6 @@ "ctxt": 0 }, "value": "f22", - "typeAnnotation": null, "optional": false } }, @@ -8004,7 +7838,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8075,7 +7908,6 @@ "ctxt": 0 }, "value": "f21", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8134,7 +7966,6 @@ "ctxt": 0 }, "value": "f22", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8176,7 +8007,6 @@ "ctxt": 0 }, "value": "f23", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -8208,6 +8038,7 @@ "ctxt": 0 }, "value": "g20", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8231,6 +8062,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8247,8 +8079,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -8258,6 +8089,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8274,8 +8106,7 @@ }, "kind": "string" } - }, - "optional": true + } }, { "type": "Identifier", @@ -8285,6 +8116,7 @@ "ctxt": 0 }, "value": "z", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8301,8 +8133,7 @@ }, "kind": "boolean" } - }, - "optional": true + } } ], "typeParams": null, @@ -8332,8 +8163,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -8365,8 +8195,8 @@ "ctxt": 0 }, "value": "g21", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -8383,7 +8213,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8397,7 +8226,6 @@ "ctxt": 0 }, "value": "g20", - "typeAnnotation": null, "optional": false } }, @@ -8445,8 +8273,8 @@ "ctxt": 0 }, "value": "g22", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -8463,7 +8291,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8477,7 +8304,6 @@ "ctxt": 0 }, "value": "g21", - "typeAnnotation": null, "optional": false } }, @@ -8530,8 +8356,8 @@ "ctxt": 0 }, "value": "g23", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -8548,7 +8374,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8562,7 +8387,6 @@ "ctxt": 0 }, "value": "g22", - "typeAnnotation": null, "optional": false } }, @@ -8607,7 +8431,6 @@ "ctxt": 0 }, "value": "g20", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8678,7 +8501,6 @@ "ctxt": 0 }, "value": "g20", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8737,7 +8559,6 @@ "ctxt": 0 }, "value": "g20", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8779,7 +8600,6 @@ "ctxt": 0 }, "value": "g21", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8838,7 +8658,6 @@ "ctxt": 0 }, "value": "g21", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8885,7 +8704,6 @@ "ctxt": 0 }, "value": "g21", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -8914,7 +8732,6 @@ "ctxt": 0 }, "value": "g22", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8956,7 +8773,6 @@ "ctxt": 0 }, "value": "g22", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -8985,7 +8801,6 @@ "ctxt": 0 }, "value": "g23", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -9002,7 +8817,6 @@ "ctxt": 0 }, "value": "f30", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -9023,6 +8837,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9045,13 +8860,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -9082,8 +8895,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -9107,7 +8920,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9148,7 +8960,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9169,7 +8980,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9202,6 +9012,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9224,13 +9035,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -9280,7 +9089,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9312,8 +9120,8 @@ "ctxt": 0 }, "value": "c30", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9330,7 +9138,6 @@ "ctxt": 0 }, "value": "f30", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9364,8 +9171,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -9398,7 +9205,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -9426,8 +9232,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -9446,7 +9252,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -9488,7 +9293,6 @@ "ctxt": 0 }, "value": "T01", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -9507,7 +9311,6 @@ "ctxt": 0 }, "value": "Parameters", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9534,6 +9337,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9550,8 +9354,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -9561,6 +9364,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9577,8 +9381,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -9588,6 +9391,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9604,8 +9408,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeParams": null, @@ -9647,7 +9450,6 @@ "ctxt": 0 }, "value": "T02", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -9666,7 +9468,6 @@ "ctxt": 0 }, "value": "Parameters", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9705,8 +9506,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -9821,7 +9622,6 @@ "ctxt": 0 }, "value": "T03", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -9840,7 +9640,6 @@ "ctxt": 0 }, "value": "ConstructorParameters", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9867,6 +9666,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9883,8 +9683,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -9894,6 +9693,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9910,8 +9710,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -9921,6 +9720,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9937,8 +9737,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeParams": null, @@ -9981,7 +9780,6 @@ "ctxt": 0 }, "value": "T04", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -10000,7 +9798,6 @@ "ctxt": 0 }, "value": "ConstructorParameters", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10039,8 +9836,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -10156,7 +9953,6 @@ "ctxt": 0 }, "value": "T05", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10182,7 +9978,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10205,7 +10000,6 @@ "ctxt": 0 }, "value": "Parameters", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10244,8 +10038,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -10276,7 +10070,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10324,7 +10117,6 @@ "ctxt": 0 }, "value": "T06", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10350,7 +10142,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10373,7 +10164,6 @@ "ctxt": 0 }, "value": "ConstructorParameters", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10412,8 +10202,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -10474,7 +10264,6 @@ "ctxt": 0 }, "value": "T07", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10500,7 +10289,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10539,7 +10327,6 @@ "ctxt": 0 }, "value": "Parameters", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10578,8 +10365,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -10603,7 +10390,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10650,7 +10436,6 @@ "ctxt": 0 }, "value": "T08", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10676,7 +10461,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10715,7 +10499,6 @@ "ctxt": 0 }, "value": "ConstructorParameters", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10754,8 +10537,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -10779,7 +10562,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10827,7 +10609,6 @@ "ctxt": 0 }, "value": "T09", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -10846,7 +10627,6 @@ "ctxt": 0 }, "value": "Parameters", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10872,7 +10652,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10897,7 +10676,6 @@ "ctxt": 0 }, "value": "Record1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -10925,7 +10703,6 @@ "ctxt": 0 }, "value": "move", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -11049,7 +10826,6 @@ "ctxt": 0 }, "value": "jump", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -11173,7 +10949,6 @@ "ctxt": 0 }, "value": "stop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -11215,7 +10990,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -11260,7 +11034,6 @@ "ctxt": 0 }, "value": "EventType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -11286,7 +11059,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -11318,7 +11090,6 @@ "ctxt": 0 }, "value": "emit", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -11332,6 +11103,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11354,13 +11126,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "RestElement", @@ -11382,8 +11152,8 @@ "ctxt": 0 }, "value": "payload", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -11422,7 +11192,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11442,7 +11211,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11488,7 +11256,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11508,7 +11275,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11553,7 +11319,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11573,7 +11338,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11626,7 +11390,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -11652,7 +11415,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11681,7 +11443,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11719,6 +11480,7 @@ "ctxt": 0 }, "value": "events", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11741,7 +11503,6 @@ "ctxt": 0 }, "value": "EventType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -11767,7 +11528,6 @@ "ctxt": 0 }, "value": "Record1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11775,8 +11535,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -11812,7 +11571,6 @@ "ctxt": 0 }, "value": "events", - "typeAnnotation": null, "optional": false }, "property": { @@ -11823,7 +11581,6 @@ "ctxt": 0 }, "value": "emit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11908,7 +11665,6 @@ "ctxt": 0 }, "value": "events", - "typeAnnotation": null, "optional": false }, "property": { @@ -11919,7 +11675,6 @@ "ctxt": 0 }, "value": "emit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12004,7 +11759,6 @@ "ctxt": 0 }, "value": "events", - "typeAnnotation": null, "optional": false }, "property": { @@ -12015,7 +11769,6 @@ "ctxt": 0 }, "value": "emit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12088,7 +11841,6 @@ "ctxt": 0 }, "value": "events", - "typeAnnotation": null, "optional": false }, "property": { @@ -12099,7 +11851,6 @@ "ctxt": 0 }, "value": "emit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12151,6 +11902,7 @@ "ctxt": 0 }, "value": "ff1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12186,8 +11938,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -12235,8 +11987,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -12268,6 +12019,7 @@ "ctxt": 0 }, "value": "ff2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12302,8 +12054,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -12335,6 +12086,7 @@ "ctxt": 0 }, "value": "ff3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12370,8 +12122,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -12411,8 +12163,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -12444,6 +12195,7 @@ "ctxt": 0 }, "value": "ff4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12467,6 +12219,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12483,8 +12236,7 @@ }, "kind": "never" } - }, - "optional": false + } } ], "typeParams": null, @@ -12506,8 +12258,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -12537,8 +12288,8 @@ "ctxt": 0 }, "value": "ff1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -12548,7 +12299,6 @@ "ctxt": 0 }, "value": "ff2", - "typeAnnotation": null, "optional": false } } @@ -12576,8 +12326,8 @@ "ctxt": 0 }, "value": "ff1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -12587,7 +12337,6 @@ "ctxt": 0 }, "value": "ff3", - "typeAnnotation": null, "optional": false } } @@ -12615,8 +12364,8 @@ "ctxt": 0 }, "value": "ff1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -12626,7 +12375,6 @@ "ctxt": 0 }, "value": "ff4", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/rest/genericRestParameters2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/rest/genericRestParameters2/input.ts.json index 480db0453dac..66fbf5ecf43e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/rest/genericRestParameters2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/rest/genericRestParameters2/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "t1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -118,8 +119,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -151,6 +151,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -220,8 +221,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -253,6 +253,7 @@ "ctxt": 0 }, "value": "t3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -304,8 +305,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -337,6 +337,7 @@ "ctxt": 0 }, "value": "t4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -353,8 +354,7 @@ }, "elemTypes": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -386,6 +386,7 @@ "ctxt": 0 }, "value": "f00", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -421,8 +422,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -517,8 +518,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -550,6 +550,7 @@ "ctxt": 0 }, "value": "f01", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -573,6 +574,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -589,8 +591,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -612,8 +613,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -690,8 +691,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -723,6 +723,7 @@ "ctxt": 0 }, "value": "f02", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -746,6 +747,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -762,8 +764,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -773,6 +774,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -789,8 +791,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "RestElement", @@ -812,8 +813,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -872,8 +873,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -905,6 +905,7 @@ "ctxt": 0 }, "value": "f03", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -928,6 +929,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -944,8 +946,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -955,6 +956,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -971,8 +973,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -982,6 +983,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -998,8 +1000,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeParams": null, @@ -1021,8 +1022,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1054,6 +1054,7 @@ "ctxt": 0 }, "value": "f04", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1077,6 +1078,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1093,8 +1095,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1104,6 +1105,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1120,8 +1122,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1131,6 +1132,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1147,8 +1149,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "RestElement", @@ -1170,8 +1171,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1211,8 +1212,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1244,6 +1244,7 @@ "ctxt": 0 }, "value": "f10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1279,8 +1280,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1391,8 +1392,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1424,6 +1424,7 @@ "ctxt": 0 }, "value": "f11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1447,6 +1448,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1463,8 +1465,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -1486,8 +1487,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1580,8 +1581,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1613,6 +1613,7 @@ "ctxt": 0 }, "value": "f12", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1636,6 +1637,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1652,8 +1654,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1663,6 +1664,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1679,8 +1681,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "RestElement", @@ -1702,8 +1703,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1778,8 +1779,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1811,6 +1811,7 @@ "ctxt": 0 }, "value": "f13", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1834,6 +1835,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1850,8 +1852,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1861,6 +1862,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1877,8 +1879,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "RestElement", @@ -1900,8 +1901,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1949,8 +1950,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1982,6 +1982,7 @@ "ctxt": 0 }, "value": "ns", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2035,8 +2036,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2068,6 +2068,7 @@ "ctxt": 0 }, "value": "sn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2121,8 +2122,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2151,7 +2151,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2210,7 +2209,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2281,7 +2279,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2364,7 +2361,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2385,7 +2381,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2417,7 +2412,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2449,7 +2443,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2481,7 +2474,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2522,7 +2514,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2540,7 +2531,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2570,7 +2560,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2600,7 +2589,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -2630,7 +2618,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2677,7 +2664,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false } } @@ -2707,7 +2693,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2766,7 +2751,6 @@ "ctxt": 0 }, "value": "t4", - "typeAnnotation": null, "optional": false } } @@ -2796,7 +2780,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2855,7 +2838,6 @@ "ctxt": 0 }, "value": "t4", - "typeAnnotation": null, "optional": false } }, @@ -2885,7 +2867,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false } } @@ -2915,7 +2896,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2974,7 +2954,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3045,7 +3024,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3128,7 +3106,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3149,7 +3126,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "property": { @@ -3181,7 +3157,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "property": { @@ -3213,7 +3188,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "property": { @@ -3245,7 +3219,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "property": { @@ -3286,7 +3259,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3304,7 +3276,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3334,7 +3305,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3364,7 +3334,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -3394,7 +3363,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3441,7 +3409,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false } } @@ -3471,7 +3438,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3530,7 +3496,6 @@ "ctxt": 0 }, "value": "t4", - "typeAnnotation": null, "optional": false } } @@ -3560,7 +3525,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3619,7 +3583,6 @@ "ctxt": 0 }, "value": "t4", - "typeAnnotation": null, "optional": false } }, @@ -3649,7 +3612,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false } } @@ -3679,7 +3641,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3738,7 +3699,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3809,7 +3769,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3892,7 +3851,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3913,7 +3871,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "property": { @@ -3945,7 +3902,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "property": { @@ -3977,7 +3933,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "property": { @@ -4009,7 +3964,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "property": { @@ -4050,7 +4004,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4068,7 +4021,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -4098,7 +4050,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4128,7 +4079,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -4158,7 +4108,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4205,7 +4154,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false } } @@ -4235,7 +4183,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4294,7 +4241,6 @@ "ctxt": 0 }, "value": "t4", - "typeAnnotation": null, "optional": false } } @@ -4324,7 +4270,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4383,7 +4328,6 @@ "ctxt": 0 }, "value": "t4", - "typeAnnotation": null, "optional": false } }, @@ -4413,7 +4357,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false } } @@ -4443,7 +4386,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4502,7 +4444,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4573,7 +4514,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4656,7 +4596,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4677,7 +4616,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "property": { @@ -4709,7 +4647,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "property": { @@ -4741,7 +4678,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "property": { @@ -4773,7 +4709,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "property": { @@ -4814,7 +4749,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4832,7 +4766,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -4862,7 +4795,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4892,7 +4824,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -4922,7 +4853,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4969,7 +4899,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false } } @@ -4999,7 +4928,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5058,7 +4986,6 @@ "ctxt": 0 }, "value": "t4", - "typeAnnotation": null, "optional": false } } @@ -5088,7 +5015,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5147,7 +5073,6 @@ "ctxt": 0 }, "value": "t4", - "typeAnnotation": null, "optional": false } }, @@ -5177,7 +5102,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false } } @@ -5210,6 +5134,7 @@ "ctxt": 0 }, "value": "f20", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5245,8 +5170,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -5270,7 +5195,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5301,7 +5225,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5347,15 +5270,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5384,7 +5305,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5402,7 +5322,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -5432,7 +5351,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5462,7 +5380,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -5492,7 +5409,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5539,7 +5455,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false } } @@ -5569,7 +5484,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5616,7 +5530,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -5652,7 +5565,6 @@ "ctxt": 0 }, "value": "T01", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -5671,7 +5583,6 @@ "ctxt": 0 }, "value": "Parameters", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5698,6 +5609,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5714,8 +5626,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -5725,6 +5636,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5741,8 +5653,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "RestElement", @@ -5764,8 +5675,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -5833,7 +5744,6 @@ "ctxt": 0 }, "value": "T02", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -5852,7 +5762,6 @@ "ctxt": 0 }, "value": "Parameters", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5891,8 +5800,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -6023,7 +5932,6 @@ "ctxt": 0 }, "value": "T03", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -6042,7 +5950,6 @@ "ctxt": 0 }, "value": "ConstructorParameters", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6069,6 +5976,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6085,8 +5993,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -6096,6 +6003,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6112,8 +6020,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "RestElement", @@ -6135,8 +6042,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -6205,7 +6112,6 @@ "ctxt": 0 }, "value": "T04", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -6224,7 +6130,6 @@ "ctxt": 0 }, "value": "ConstructorParameters", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6263,8 +6168,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -6396,7 +6301,6 @@ "ctxt": 0 }, "value": "T05", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6422,7 +6326,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6461,7 +6364,6 @@ "ctxt": 0 }, "value": "Parameters", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6488,6 +6390,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6504,8 +6407,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "RestElement", @@ -6527,8 +6429,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -6552,7 +6454,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6599,7 +6500,6 @@ "ctxt": 0 }, "value": "T06", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -6618,7 +6518,6 @@ "ctxt": 0 }, "value": "T05", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6711,7 +6610,6 @@ "ctxt": 0 }, "value": "P1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6737,7 +6635,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6755,7 +6652,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6786,7 +6682,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6807,6 +6702,7 @@ "ctxt": 0 }, "value": "head", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6836,15 +6732,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, "default": null } } - }, - "optional": false + } }, { "type": "RestElement", @@ -6866,8 +6760,8 @@ "ctxt": 0 }, "value": "tail", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -6898,7 +6792,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6951,7 +6844,6 @@ "ctxt": 0 }, "value": "head", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6980,7 +6872,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7004,7 +6895,6 @@ "ctxt": 0 }, "value": "tail", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7033,7 +6923,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7078,7 +6967,6 @@ "ctxt": 0 }, "value": "T10", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -7097,7 +6985,6 @@ "ctxt": 0 }, "value": "P1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7124,6 +7011,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7140,8 +7028,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -7151,6 +7038,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7167,8 +7055,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "RestElement", @@ -7190,8 +7077,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -7259,7 +7146,6 @@ "ctxt": 0 }, "value": "T11", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -7278,7 +7164,6 @@ "ctxt": 0 }, "value": "P1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7317,8 +7202,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -7386,7 +7271,6 @@ "ctxt": 0 }, "value": "T12", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -7405,7 +7289,6 @@ "ctxt": 0 }, "value": "P1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7432,6 +7315,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7448,8 +7332,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -7459,6 +7342,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7475,8 +7359,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/rest/genericRestParameters3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/rest/genericRestParameters3/input.ts.json index 99879841b9b1..5b8a0e0b8f10 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/rest/genericRestParameters3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/rest/genericRestParameters3/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "f1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,6 +55,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -70,8 +72,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "RestElement", @@ -93,8 +94,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -209,8 +210,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -242,6 +242,7 @@ "ctxt": 0 }, "value": "f2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -265,6 +266,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -281,8 +283,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -292,6 +293,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -308,8 +310,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -331,8 +332,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -364,6 +364,7 @@ "ctxt": 0 }, "value": "f3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -387,6 +388,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -403,8 +405,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -414,6 +415,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -430,8 +432,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -441,6 +442,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -457,8 +459,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeParams": null, @@ -480,8 +481,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -513,6 +513,7 @@ "ctxt": 0 }, "value": "f4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -548,8 +549,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -700,8 +701,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -733,6 +733,7 @@ "ctxt": 0 }, "value": "t1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -824,8 +825,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -857,6 +857,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -957,8 +958,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -990,6 +990,7 @@ "ctxt": 0 }, "value": "t3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1090,8 +1091,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1123,6 +1123,7 @@ "ctxt": 0 }, "value": "t4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1232,8 +1233,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1262,7 +1262,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1326,7 +1325,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1397,7 +1395,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1432,7 +1429,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -1462,7 +1458,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1497,7 +1492,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1527,7 +1521,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1562,7 +1555,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false } } @@ -1592,7 +1584,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1627,7 +1618,6 @@ "ctxt": 0 }, "value": "t4", - "typeAnnotation": null, "optional": false } } @@ -1657,7 +1647,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1716,7 +1705,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1764,8 +1752,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1775,7 +1763,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } } @@ -1803,8 +1790,8 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1814,7 +1801,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } } @@ -1842,8 +1828,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1853,7 +1839,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } } @@ -1881,8 +1866,8 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1892,7 +1877,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false } } @@ -1920,8 +1904,8 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1931,7 +1915,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false } } @@ -1959,8 +1942,8 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1970,7 +1953,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false } } @@ -1990,7 +1972,6 @@ "ctxt": 0 }, "value": "CoolArray", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2017,7 +1998,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2041,7 +2021,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -2067,7 +2046,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2100,7 +2078,6 @@ "ctxt": 0 }, "value": "hello", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2139,7 +2116,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2160,6 +2136,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2195,8 +2172,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2220,7 +2197,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2247,8 +2223,7 @@ } } } - }, - "optional": false + } } } ], @@ -2284,7 +2259,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2348,7 +2322,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2375,7 +2348,6 @@ "ctxt": 0 }, "value": "CoolArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2424,7 +2396,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2464,7 +2435,6 @@ "ctxt": 0 }, "value": "CoolArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2513,7 +2483,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2527,7 +2496,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -2555,7 +2523,6 @@ "ctxt": 0 }, "value": "CoolArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2592,7 +2559,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2625,8 +2591,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2650,7 +2616,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2688,7 +2653,6 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, "optional": false } } @@ -2719,7 +2683,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2765,7 +2728,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2797,8 +2759,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2815,7 +2777,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2875,8 +2836,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2893,7 +2854,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2945,7 +2905,6 @@ "ctxt": 0 }, "value": "CoolArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2985,7 +2944,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3018,8 +2976,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -3043,7 +3001,6 @@ "ctxt": 0 }, "value": "CoolArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3069,7 +3026,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3113,7 +3069,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3164,6 +3119,7 @@ "ctxt": 0 }, "value": "ca", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3186,7 +3142,6 @@ "ctxt": 0 }, "value": "CoolArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3209,8 +3164,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3239,7 +3193,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3268,7 +3221,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3310,7 +3262,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3364,7 +3315,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3382,7 +3332,6 @@ "ctxt": 0 }, "value": "ca", - "typeAnnotation": null, "optional": false } } @@ -3400,7 +3349,6 @@ "ctxt": 0 }, "value": "hmm", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3433,8 +3381,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -3458,7 +3406,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3499,7 +3446,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3611,7 +3557,6 @@ "ctxt": 0 }, "value": "hmm", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3640,7 +3585,6 @@ "ctxt": 0 }, "value": "hmm", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3699,7 +3643,6 @@ "ctxt": 0 }, "value": "hmm", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3734,7 +3677,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3767,8 +3709,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -3878,6 +3820,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3900,7 +3843,6 @@ "ctxt": 0 }, "value": "ReadonlyArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3923,8 +3865,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -3979,7 +3920,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3997,7 +3937,6 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/rest/objectRest/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/rest/objectRest/input.ts.json index 478fc7b8e11f..6be2252fe476 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/rest/objectRest/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/rest/objectRest/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -75,7 +74,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -144,8 +142,8 @@ "ctxt": 0 }, "value": "clone", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -161,7 +159,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "definite": false @@ -208,7 +205,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -233,8 +229,8 @@ "ctxt": 0 }, "value": "justB", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -250,7 +246,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "definite": false @@ -297,7 +292,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -312,7 +306,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -323,8 +316,8 @@ "ctxt": 0 }, "value": "renamed", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -347,8 +340,8 @@ "ctxt": 0 }, "value": "empty", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -364,7 +357,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "definite": false @@ -428,8 +420,8 @@ "ctxt": 0 }, "value": "renamed", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -452,8 +444,8 @@ "ctxt": 0 }, "value": "justA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -469,7 +461,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "definite": false @@ -525,8 +516,8 @@ "ctxt": 0 }, "value": "renamed", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -549,8 +540,8 @@ "ctxt": 0 }, "value": "justA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -566,7 +557,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "definite": false @@ -608,7 +598,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -643,8 +632,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -671,8 +660,8 @@ "ctxt": 0 }, "value": "oooo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -700,8 +689,8 @@ "ctxt": 0 }, "value": "justA", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -717,7 +706,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "definite": false @@ -749,8 +737,8 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -770,7 +758,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -798,7 +785,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -857,7 +843,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -868,8 +853,8 @@ "ctxt": 0 }, "value": "renamed", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -892,8 +877,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -909,7 +894,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "definite": false @@ -941,6 +925,7 @@ "ctxt": 0 }, "value": "nestedrest", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -972,7 +957,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1014,7 +998,6 @@ "ctxt": 0 }, "value": "n1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1052,7 +1035,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1094,7 +1076,6 @@ "ctxt": 0 }, "value": "n2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1132,7 +1113,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1174,7 +1154,6 @@ "ctxt": 0 }, "value": "n3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1212,7 +1191,6 @@ "ctxt": 0 }, "value": "n4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1269,7 +1247,6 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1311,7 +1288,6 @@ "ctxt": 0 }, "value": "restrest", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1339,8 +1315,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1387,7 +1362,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -1402,7 +1376,6 @@ "ctxt": 0 }, "value": "n1", - "typeAnnotation": null, "optional": false }, "value": { @@ -1428,7 +1401,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null @@ -1443,7 +1415,6 @@ "ctxt": 0 }, "value": "n2", - "typeAnnotation": null, "optional": false }, "value": { @@ -1469,7 +1440,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null @@ -1484,7 +1454,6 @@ "ctxt": 0 }, "value": "n3", - "typeAnnotation": null, "optional": false }, "value": { @@ -1515,8 +1484,8 @@ "ctxt": 0 }, "value": "nr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1555,8 +1524,8 @@ "ctxt": 0 }, "value": "restrest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1572,7 +1541,6 @@ "ctxt": 0 }, "value": "nestedrest", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1604,6 +1572,7 @@ "ctxt": 0 }, "value": "complex", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1635,7 +1604,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1673,7 +1641,6 @@ "ctxt": 0 }, "value": "ka", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1699,7 +1666,6 @@ "ctxt": 0 }, "value": "ki", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1730,7 +1696,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1758,8 +1723,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1801,7 +1765,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1827,7 +1790,6 @@ "ctxt": 0 }, "value": "ka", - "typeAnnotation": null, "optional": false }, "value": null @@ -1852,8 +1814,8 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1872,7 +1834,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1883,8 +1844,8 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1907,8 +1868,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1924,7 +1885,6 @@ "ctxt": 0 }, "value": "complex", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1971,7 +1931,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1997,7 +1956,6 @@ "ctxt": 0 }, "value": "ka", - "typeAnnotation": null, "optional": false }, "value": null @@ -2022,8 +1980,8 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -2042,7 +2000,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2053,8 +2010,8 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -2077,8 +2034,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -2094,7 +2051,6 @@ "ctxt": 0 }, "value": "complex", - "typeAnnotation": null, "optional": false } } @@ -2140,7 +2096,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -2165,8 +2120,8 @@ "ctxt": 0 }, "value": "fresh", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -2192,7 +2147,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -2215,7 +2169,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2279,7 +2232,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -2304,8 +2256,8 @@ "ctxt": 0 }, "value": "fresh", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -2331,7 +2283,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -2354,7 +2305,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2382,7 +2332,6 @@ "ctxt": 0 }, "value": "Removable", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2408,7 +2357,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2454,7 +2402,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2500,7 +2447,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "function": { @@ -2521,6 +2467,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2537,8 +2484,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -2583,7 +2529,6 @@ "ctxt": 0 }, "value": "both", - "typeAnnotation": null, "optional": false }, "function": { @@ -2663,7 +2608,6 @@ "ctxt": 0 }, "value": "both", - "typeAnnotation": null, "optional": false }, "function": { @@ -2684,6 +2628,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2700,8 +2645,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -2746,7 +2690,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -2792,7 +2735,6 @@ "ctxt": 0 }, "value": "removed", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2838,7 +2780,6 @@ "ctxt": 0 }, "value": "remainder", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2891,7 +2832,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2921,7 +2861,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2962,7 +2901,6 @@ "ctxt": 0 }, "value": "removed", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3004,7 +2942,6 @@ "ctxt": 0 }, "value": "remainder", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3058,8 +2995,8 @@ "ctxt": 0 }, "value": "removable", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -3076,7 +3013,6 @@ "ctxt": 0 }, "value": "Removable", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3126,7 +3062,6 @@ "ctxt": 0 }, "value": "removed", - "typeAnnotation": null, "optional": false }, "value": null @@ -3151,8 +3086,8 @@ "ctxt": 0 }, "value": "removableRest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -3168,7 +3103,6 @@ "ctxt": 0 }, "value": "removable", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3200,6 +3134,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3222,13 +3157,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -3238,7 +3171,6 @@ "ctxt": 0 }, "value": "removable", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3285,7 +3217,6 @@ "ctxt": 0 }, "value": "removed", - "typeAnnotation": null, "optional": false }, "value": null @@ -3310,8 +3241,8 @@ "ctxt": 0 }, "value": "removableRest2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -3327,7 +3258,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3359,8 +3289,8 @@ "ctxt": 0 }, "value": "computed", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -3405,8 +3335,8 @@ "ctxt": 0 }, "value": "computed2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -3468,7 +3398,6 @@ "ctxt": 0 }, "value": "computed", - "typeAnnotation": null, "optional": false } }, @@ -3480,8 +3409,8 @@ "ctxt": 0 }, "value": "stillNotGreat", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -3501,7 +3430,6 @@ "ctxt": 0 }, "value": "computed2", - "typeAnnotation": null, "optional": false } }, @@ -3513,8 +3441,8 @@ "ctxt": 0 }, "value": "soSo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -3537,8 +3465,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -3554,7 +3482,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3608,7 +3535,6 @@ "ctxt": 0 }, "value": "computed", - "typeAnnotation": null, "optional": false } }, @@ -3620,8 +3546,8 @@ "ctxt": 0 }, "value": "stillNotGreat", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -3641,7 +3567,6 @@ "ctxt": 0 }, "value": "computed2", - "typeAnnotation": null, "optional": false } }, @@ -3653,8 +3578,8 @@ "ctxt": 0 }, "value": "soSo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -3677,8 +3602,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -3694,7 +3619,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } @@ -3725,8 +3649,8 @@ "ctxt": 0 }, "value": "noContextualType", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -3759,7 +3683,6 @@ "ctxt": 0 }, "value": "aNumber", - "typeAnnotation": null, "optional": false }, "value": { @@ -3792,8 +3715,8 @@ "ctxt": 0 }, "value": "notEmptyObject", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -3818,7 +3741,6 @@ "ctxt": 0 }, "value": "aNumber", - "typeAnnotation": null, "optional": false }, "right": { @@ -3836,7 +3758,6 @@ "ctxt": 0 }, "value": "notEmptyObject", - "typeAnnotation": null, "optional": false }, "property": { @@ -3847,7 +3768,6 @@ "ctxt": 0 }, "value": "anythingGoes", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/rest/objectRest2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/rest/objectRest2/input.ts.json index 2f366b85b0a9..f60276f0edf9 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/rest/objectRest2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/rest/objectRest2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "connectionFromArray", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "objects", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -73,6 +72,7 @@ "ctxt": 0 }, "value": "args", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -89,8 +89,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -132,7 +131,6 @@ "ctxt": 0 }, "value": "rootConnection", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -153,6 +151,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -169,8 +168,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -213,7 +211,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "value": { @@ -232,8 +229,8 @@ "ctxt": 0 }, "value": "context", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -243,8 +240,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -295,7 +292,6 @@ "ctxt": 0 }, "value": "objects", - "typeAnnotation": null, "optional": false }, "value": null @@ -329,7 +325,6 @@ "ctxt": 0 }, "value": "objects", - "typeAnnotation": null, "optional": false }, "value": { @@ -386,7 +381,6 @@ "ctxt": 0 }, "value": "connectionFromArray", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -400,7 +394,6 @@ "ctxt": 0 }, "value": "objects", - "typeAnnotation": null, "optional": false } }, @@ -414,7 +407,6 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, "optional": false } } @@ -465,7 +457,6 @@ "ctxt": 0 }, "value": "rootConnection", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestAssignment/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestAssignment/input.ts.json index 76cdeb18786e..c88cb8f80260 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestAssignment/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestAssignment/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "ka", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "nested", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -111,7 +112,6 @@ "ctxt": 0 }, "value": "ki", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -123,8 +123,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -156,6 +155,7 @@ "ctxt": 0 }, "value": "other", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -172,8 +172,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -205,6 +204,7 @@ "ctxt": 0 }, "value": "rest", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -221,8 +221,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -254,6 +253,7 @@ "ctxt": 0 }, "value": "complex", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -285,7 +285,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -323,7 +322,6 @@ "ctxt": 0 }, "value": "ka", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -349,7 +347,6 @@ "ctxt": 0 }, "value": "ki", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -380,7 +377,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -408,8 +404,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -456,7 +451,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -482,7 +476,6 @@ "ctxt": 0 }, "value": "ka", - "typeAnnotation": null, "optional": false }, "value": null @@ -507,8 +500,8 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -527,7 +520,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -538,8 +530,8 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -562,8 +554,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -579,7 +571,6 @@ "ctxt": 0 }, "value": "complex", - "typeAnnotation": null, "optional": false } } @@ -610,6 +601,7 @@ "ctxt": 0 }, "value": "overEmit", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -641,7 +633,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -686,7 +677,6 @@ "ctxt": 0 }, "value": "ka", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -728,7 +718,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -776,7 +765,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -814,7 +802,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -856,7 +843,6 @@ "ctxt": 0 }, "value": "ki", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -898,7 +884,6 @@ "ctxt": 0 }, "value": "ku", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -945,7 +930,6 @@ "ctxt": 0 }, "value": "ke", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -987,7 +971,6 @@ "ctxt": 0 }, "value": "ko", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1015,8 +998,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1058,7 +1040,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1097,8 +1078,8 @@ "ctxt": 0 }, "value": "nested2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1126,8 +1107,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1146,7 +1127,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1172,7 +1152,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null @@ -1197,8 +1176,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1227,8 +1206,8 @@ "ctxt": 0 }, "value": "rest2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1244,7 +1223,6 @@ "ctxt": 0 }, "value": "overEmit", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1291,7 +1269,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1330,8 +1307,8 @@ "ctxt": 0 }, "value": "nested2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1359,8 +1336,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1379,7 +1356,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1405,7 +1381,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null @@ -1430,8 +1405,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1460,8 +1435,8 @@ "ctxt": 0 }, "value": "rest2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1477,7 +1452,6 @@ "ctxt": 0 }, "value": "overEmit", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestCatchES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestCatchES5/input.ts.json index 8e34cd731479..fb1674e5f0ab 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestCatchES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestCatchES5/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -60,8 +60,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -122,7 +122,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -147,8 +146,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } diff --git a/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestForOf/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestForOf/input.ts.json index 17164e98b84c..dcba6ccc5b49 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestForOf/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestForOf/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "array", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -69,7 +70,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -111,7 +111,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -140,8 +139,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -196,7 +194,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -221,8 +218,8 @@ "ctxt": 0 }, "value": "restOf", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -243,7 +240,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false }, "body": { @@ -279,7 +275,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -293,7 +288,6 @@ "ctxt": 0 }, "value": "restOf", - "typeAnnotation": null, "optional": false } } @@ -328,6 +322,7 @@ "ctxt": 0 }, "value": "xx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -344,8 +339,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -377,6 +371,7 @@ "ctxt": 0 }, "value": "rrestOff", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -408,7 +403,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -436,8 +430,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -470,7 +463,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -481,8 +473,8 @@ "ctxt": 0 }, "value": "xx", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -505,8 +497,8 @@ "ctxt": 0 }, "value": "rrestOff", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -522,7 +514,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false }, "body": { @@ -558,7 +549,6 @@ "ctxt": 0 }, "value": "xx", - "typeAnnotation": null, "optional": false } }, @@ -572,7 +562,6 @@ "ctxt": 0 }, "value": "rrestOff", - "typeAnnotation": null, "optional": false } } @@ -615,8 +604,8 @@ "ctxt": 0 }, "value": "norest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -645,7 +634,6 @@ "ctxt": 0 }, "value": "array", - "typeAnnotation": null, "optional": false }, "property": { @@ -656,7 +644,6 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -680,8 +667,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -714,7 +701,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -728,7 +714,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -798,7 +783,6 @@ "ctxt": 0 }, "value": "norest", - "typeAnnotation": null, "optional": false }, "property": { @@ -809,7 +793,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -832,7 +815,6 @@ "ctxt": 0 }, "value": "norest", - "typeAnnotation": null, "optional": false }, "property": { @@ -843,7 +825,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestNegative/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestNegative/input.ts.json index 9669bffcb487..49f20dab071f 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestNegative/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestNegative/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -75,7 +74,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -144,8 +142,8 @@ "ctxt": 0 }, "value": "mustBeLast", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null }, @@ -164,7 +162,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -181,7 +178,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "definite": false @@ -213,6 +209,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -229,8 +226,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -262,6 +258,7 @@ "ctxt": 0 }, "value": "notAssignable", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -293,7 +290,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -321,8 +317,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -374,7 +369,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -399,8 +393,8 @@ "ctxt": 0 }, "value": "notAssignable", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -416,7 +410,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } @@ -432,7 +425,6 @@ "ctxt": 0 }, "value": "stillMustBeLast", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -473,8 +465,8 @@ "ctxt": 0 }, "value": "mustBeLast", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null }, @@ -493,7 +485,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -531,7 +522,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -573,7 +563,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -651,7 +640,6 @@ "ctxt": 0 }, "value": "generic", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -672,6 +660,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -694,13 +683,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -758,7 +745,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -783,8 +769,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -800,7 +786,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "definite": false @@ -822,7 +807,6 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, "optional": false } } @@ -853,7 +837,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -880,7 +863,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -906,7 +888,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -949,6 +930,7 @@ "ctxt": 0 }, "value": "rest", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -980,7 +962,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1008,8 +989,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1061,7 +1041,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -1100,7 +1079,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestParameter/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestParameter/input.ts.json index 738860353726..4f32c6f703fa 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestParameter/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestParameter/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "cloneAgain", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,7 +51,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -77,8 +75,8 @@ "ctxt": 0 }, "value": "clone", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -115,7 +113,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -157,7 +154,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -235,7 +231,6 @@ "ctxt": 0 }, "value": "suddenly", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -256,6 +251,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -279,6 +275,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -310,7 +307,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -348,7 +344,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -374,7 +369,6 @@ "ctxt": 0 }, "value": "ka", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -405,7 +399,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -433,8 +426,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -456,8 +448,7 @@ } } } - }, - "optional": false + } } } ], @@ -495,7 +486,6 @@ "ctxt": 0 }, "value": "suddenly", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -527,7 +517,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -538,8 +527,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -562,8 +551,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -587,7 +576,6 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, "optional": false }, "property": { @@ -598,7 +586,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -635,7 +622,6 @@ "ctxt": 0 }, "value": "suddenly", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -674,7 +660,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -700,7 +685,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -733,8 +717,8 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -763,8 +747,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -790,7 +774,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -811,7 +794,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -834,7 +816,6 @@ "ctxt": 0 }, "value": "ka", - "typeAnnotation": null, "optional": false }, "value": { @@ -860,7 +841,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -906,7 +886,6 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, "optional": false }, "property": { @@ -917,7 +896,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -937,7 +915,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "property": { @@ -948,7 +925,6 @@ "ctxt": 0 }, "value": "ka", - "typeAnnotation": null, "optional": false }, "computed": false @@ -974,7 +950,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1000,7 +975,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -1036,7 +1010,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -1061,8 +1034,8 @@ "ctxt": 0 }, "value": "clone", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1099,7 +1072,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1141,7 +1113,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1230,7 +1201,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "function": { @@ -1266,7 +1236,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -1291,8 +1260,8 @@ "ctxt": 0 }, "value": "clone", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1329,7 +1298,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1371,7 +1339,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1446,7 +1413,6 @@ "ctxt": 0 }, "value": "foobar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1489,7 +1455,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -1522,8 +1487,8 @@ "ctxt": 0 }, "value": "opts", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1602,7 +1567,6 @@ "ctxt": 0 }, "value": "foobar", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1631,7 +1595,6 @@ "ctxt": 0 }, "value": "foobar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1655,7 +1618,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -1702,7 +1664,6 @@ "ctxt": 0 }, "value": "foobar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1726,7 +1687,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -1747,7 +1707,6 @@ "ctxt": 0 }, "value": "greeting", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestParameterES5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestParameterES5/input.ts.json index c186ec6541a5..f1d9f9ca60f5 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestParameterES5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestParameterES5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "cloneAgain", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,7 +51,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -77,8 +75,8 @@ "ctxt": 0 }, "value": "clone", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -115,7 +113,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -157,7 +154,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -235,7 +231,6 @@ "ctxt": 0 }, "value": "suddenly", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -256,6 +251,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -279,6 +275,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -310,7 +307,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -348,7 +344,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -374,7 +369,6 @@ "ctxt": 0 }, "value": "ka", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -405,7 +399,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -433,8 +426,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -456,8 +448,7 @@ } } } - }, - "optional": false + } } } ], @@ -495,7 +486,6 @@ "ctxt": 0 }, "value": "suddenly", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -527,7 +517,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -538,8 +527,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -562,8 +551,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -587,7 +576,6 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, "optional": false }, "property": { @@ -598,7 +586,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -635,7 +622,6 @@ "ctxt": 0 }, "value": "suddenly", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -674,7 +660,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -700,7 +685,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -733,8 +717,8 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -763,8 +747,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -790,7 +774,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -811,7 +794,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -834,7 +816,6 @@ "ctxt": 0 }, "value": "ka", - "typeAnnotation": null, "optional": false }, "value": { @@ -860,7 +841,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -906,7 +886,6 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, "optional": false }, "property": { @@ -917,7 +896,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -937,7 +915,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "property": { @@ -948,7 +925,6 @@ "ctxt": 0 }, "value": "ka", - "typeAnnotation": null, "optional": false }, "computed": false @@ -974,7 +950,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1000,7 +975,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -1036,7 +1010,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -1061,8 +1034,8 @@ "ctxt": 0 }, "value": "clone", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1099,7 +1072,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1141,7 +1113,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1230,7 +1201,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "function": { @@ -1266,7 +1236,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null @@ -1291,8 +1260,8 @@ "ctxt": 0 }, "value": "clone", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1329,7 +1298,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1371,7 +1339,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1446,7 +1413,6 @@ "ctxt": 0 }, "value": "foobar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1489,7 +1455,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -1522,8 +1487,8 @@ "ctxt": 0 }, "value": "opts", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1602,7 +1567,6 @@ "ctxt": 0 }, "value": "foobar", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1631,7 +1595,6 @@ "ctxt": 0 }, "value": "foobar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1655,7 +1618,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -1702,7 +1664,6 @@ "ctxt": 0 }, "value": "foobar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1726,7 +1687,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -1747,7 +1707,6 @@ "ctxt": 0 }, "value": "greeting", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestPropertyMustBeLast/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestPropertyMustBeLast/input.ts.json index 642a86400426..a575b653dfae 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestPropertyMustBeLast/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestPropertyMustBeLast/input.ts.json @@ -51,8 +51,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null }, @@ -71,7 +71,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -98,7 +97,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -167,8 +165,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null }, @@ -187,7 +185,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -214,7 +211,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -277,8 +273,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null }, @@ -297,7 +293,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -322,8 +317,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -349,7 +344,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -418,8 +412,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null }, @@ -438,7 +432,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null @@ -463,8 +456,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -490,7 +483,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestReadonly/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestReadonly/input.ts.json index 757299e0fc80..2e6f95237813 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestReadonly/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/rest/objectRestReadonly/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "ObjType", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "quux", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -188,6 +184,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -210,7 +207,6 @@ "ctxt": 0 }, "value": "Readonly", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -236,7 +232,6 @@ "ctxt": 0 }, "value": "ObjType", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -244,8 +239,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -265,7 +259,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -293,7 +286,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -321,7 +313,6 @@ "ctxt": 0 }, "value": "quux", - "typeAnnotation": null, "optional": false }, "value": { @@ -385,7 +376,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null @@ -410,8 +400,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -427,7 +417,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false }, "definite": false @@ -464,7 +453,6 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, "optional": false }, "property": { @@ -475,7 +463,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/rest/restTuplesFromContextualTypes/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/rest/restTuplesFromContextualTypes/input.ts.json index e6df89d620ac..0eae4d91dc4c 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/rest/restTuplesFromContextualTypes/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/rest/restTuplesFromContextualTypes/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "t1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,8 +103,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -151,8 +151,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -171,8 +171,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -191,8 +191,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -232,7 +232,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -293,8 +292,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -336,7 +335,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -385,8 +383,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -417,8 +415,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -460,7 +458,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -509,8 +506,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -529,8 +526,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -561,8 +558,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -604,7 +601,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -653,8 +649,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -673,8 +669,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -693,8 +689,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -725,8 +721,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -768,7 +764,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -786,7 +781,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -807,6 +801,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -842,8 +837,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -867,7 +862,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -893,8 +887,7 @@ } } } - }, - "optional": false + } } } ], @@ -948,7 +941,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -970,8 +962,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -981,8 +973,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -992,8 +984,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1037,7 +1029,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1071,8 +1062,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1118,7 +1109,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1140,8 +1130,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -1163,8 +1153,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1210,7 +1200,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1232,8 +1221,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1243,8 +1232,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -1266,8 +1255,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1313,7 +1302,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1335,8 +1323,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1346,8 +1334,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1357,8 +1345,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -1380,8 +1368,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1430,6 +1418,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1517,8 +1506,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1566,8 +1554,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1586,8 +1574,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1606,8 +1594,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1647,7 +1635,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1708,8 +1695,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1751,7 +1738,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1800,8 +1786,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1832,8 +1818,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -1875,7 +1861,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1924,8 +1909,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1944,8 +1929,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1976,8 +1961,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -2019,7 +2004,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -2068,8 +2052,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -2088,8 +2072,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -2108,8 +2092,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -2140,8 +2124,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -2183,7 +2167,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -2201,7 +2184,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2222,6 +2204,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2257,8 +2240,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2282,7 +2265,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -2308,8 +2290,7 @@ } } } - }, - "optional": false + } } } ], @@ -2363,7 +2344,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2385,8 +2365,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2396,8 +2376,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2407,8 +2387,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2452,7 +2432,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2486,8 +2465,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -2533,7 +2512,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2555,8 +2533,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -2578,8 +2556,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -2625,7 +2603,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2647,8 +2624,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2658,8 +2635,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -2681,8 +2658,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -2728,7 +2705,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2750,8 +2726,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2761,8 +2737,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2772,8 +2748,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -2795,8 +2771,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -2845,6 +2821,7 @@ "ctxt": 0 }, "value": "t3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2914,8 +2891,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2963,8 +2939,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -2983,8 +2959,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -3003,8 +2979,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -3056,7 +3032,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false } } @@ -3117,8 +3092,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -3172,7 +3147,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false } } @@ -3221,8 +3195,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -3253,8 +3227,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -3308,7 +3282,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false } } @@ -3357,8 +3330,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -3377,8 +3350,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -3409,8 +3382,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -3464,7 +3437,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false } } @@ -3513,8 +3485,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -3533,8 +3505,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -3553,8 +3525,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -3585,8 +3557,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -3640,7 +3612,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false } } @@ -3658,7 +3629,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3679,6 +3649,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3702,6 +3673,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3718,8 +3690,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -3741,8 +3712,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -3766,7 +3737,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false } } @@ -3792,8 +3762,7 @@ } } } - }, - "optional": false + } } } ], @@ -3847,7 +3816,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3869,8 +3837,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3880,8 +3848,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3891,8 +3859,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3936,7 +3904,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3970,8 +3937,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -4017,7 +3984,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4039,8 +4005,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -4062,8 +4028,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -4109,7 +4075,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4131,8 +4096,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4142,8 +4107,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -4165,8 +4130,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -4212,7 +4177,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4234,8 +4198,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4245,8 +4209,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4256,8 +4220,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -4279,8 +4243,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -4314,7 +4278,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4335,6 +4298,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4357,13 +4321,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4434,8 +4396,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -4477,7 +4439,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -4526,8 +4487,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -4558,8 +4519,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -4613,7 +4574,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -4662,8 +4622,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -4694,8 +4654,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -4761,7 +4721,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -4779,7 +4738,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4800,6 +4758,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4823,6 +4782,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4839,8 +4799,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -4862,8 +4821,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -4887,7 +4846,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4914,8 +4872,7 @@ } } } - }, - "optional": false + } } } ], @@ -4961,7 +4918,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4995,8 +4951,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -5042,7 +4998,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5064,8 +5019,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -5087,8 +5042,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -5134,7 +5089,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5156,8 +5110,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5167,8 +5121,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -5190,8 +5144,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -5242,7 +5196,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5278,7 +5231,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5299,6 +5251,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5334,8 +5287,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -5359,7 +5312,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5390,15 +5342,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -5434,7 +5384,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5471,7 +5420,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5514,8 +5462,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -5539,7 +5487,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5570,7 +5517,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5604,8 +5550,8 @@ "ctxt": 0 }, "value": "g0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5622,7 +5568,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5688,8 +5633,8 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5706,7 +5651,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5728,8 +5672,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -5739,8 +5683,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5790,8 +5734,8 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5808,7 +5752,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5830,6 +5773,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5846,8 +5790,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -5857,8 +5800,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5908,8 +5851,8 @@ "ctxt": 0 }, "value": "g3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5926,7 +5869,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5948,6 +5890,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5964,8 +5907,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -5975,6 +5917,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5991,8 +5934,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -6011,7 +5953,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -6022,7 +5963,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -6064,8 +6004,8 @@ "ctxt": 0 }, "value": "g4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6082,7 +6022,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6116,8 +6055,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -6154,7 +6093,6 @@ "ctxt": 0 }, "value": "pipe", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -6175,6 +6113,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6210,8 +6149,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -6235,7 +6174,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6266,15 +6204,13 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -6293,6 +6229,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6316,6 +6253,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6338,13 +6276,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6370,15 +6306,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -6414,7 +6348,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6451,7 +6384,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6472,7 +6404,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6515,8 +6446,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -6540,7 +6471,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6571,7 +6501,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6605,8 +6534,8 @@ "ctxt": 0 }, "value": "g5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6623,7 +6552,6 @@ "ctxt": 0 }, "value": "pipe", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6670,8 +6598,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -6721,8 +6649,8 @@ "ctxt": 0 }, "value": "g6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6739,7 +6667,6 @@ "ctxt": 0 }, "value": "pipe", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6761,8 +6688,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -6803,8 +6730,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -6822,7 +6749,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -6833,7 +6759,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6876,8 +6801,8 @@ "ctxt": 0 }, "value": "g7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6894,7 +6819,6 @@ "ctxt": 0 }, "value": "pipe", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6916,8 +6840,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6927,8 +6851,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -6964,8 +6888,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -6998,7 +6922,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -7040,8 +6963,8 @@ "ctxt": 0 }, "value": "g8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7058,7 +6981,6 @@ "ctxt": 0 }, "value": "pipe", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7080,6 +7002,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7096,8 +7019,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -7107,6 +7029,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7123,8 +7046,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -7160,8 +7082,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -7194,7 +7116,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -7236,6 +7157,7 @@ "ctxt": 0 }, "value": "tuple", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7289,8 +7211,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -7328,7 +7249,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -7348,8 +7268,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -7368,8 +7288,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -7408,7 +7328,6 @@ "ctxt": 0 }, "value": "tuple", - "typeAnnotation": null, "optional": false } } @@ -7427,7 +7346,6 @@ "ctxt": 0 }, "value": "take", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -7448,6 +7366,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7471,6 +7390,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7487,8 +7407,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -7498,6 +7417,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7514,8 +7434,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -7537,8 +7456,7 @@ } } } - }, - "optional": false + } } } ], @@ -7601,7 +7519,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -7633,8 +7550,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -7717,7 +7634,6 @@ "ctxt": 0 }, "value": "take", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7755,8 +7671,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -7803,7 +7719,6 @@ "ctxt": 0 }, "value": "ArgsUnion", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -7910,7 +7825,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7937,7 +7851,6 @@ "ctxt": 0 }, "value": "TupleUnionFunc", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -7969,8 +7882,8 @@ "ctxt": 0 }, "value": "params", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -7994,7 +7907,6 @@ "ctxt": 0 }, "value": "ArgsUnion", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8047,6 +7959,7 @@ "ctxt": 0 }, "value": "funcUnionTupleNoRest", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8069,13 +7982,11 @@ "ctxt": 0 }, "value": "TupleUnionFunc", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -8093,8 +8004,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -8104,8 +8015,8 @@ "ctxt": 0 }, "value": "strOrErr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -8131,7 +8042,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false } } @@ -8171,6 +8081,7 @@ "ctxt": 0 }, "value": "funcUnionTupleRest", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8193,13 +8104,11 @@ "ctxt": 0 }, "value": "TupleUnionFunc", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -8229,8 +8138,8 @@ "ctxt": 0 }, "value": "params", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -8276,8 +8185,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -8287,8 +8196,8 @@ "ctxt": 0 }, "value": "strOrErr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -8302,7 +8211,6 @@ "ctxt": 0 }, "value": "params", - "typeAnnotation": null, "optional": false }, "definite": false @@ -8324,7 +8232,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/predefinedTypes/objectTypesWithPredefinedTypesAsName/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/predefinedTypes/objectTypesWithPredefinedTypesAsName/input.ts.json index 7798ba99c359..822138dc1fbc 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/predefinedTypes/objectTypesWithPredefinedTypesAsName/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/predefinedTypes/objectTypesWithPredefinedTypesAsName/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "any", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "boolean", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -97,7 +94,6 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -124,7 +120,6 @@ "ctxt": 0 }, "value": "string", - "typeAnnotation": null, "optional": false }, "declare": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/arrayLiteral/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/arrayLiteral/input.ts.json index f518427cdfcc..37b76af30f03 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/arrayLiteral/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/arrayLiteral/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -90,7 +90,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -138,8 +137,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -192,8 +191,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -258,8 +257,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -276,7 +275,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -329,6 +327,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -353,8 +352,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -394,6 +392,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -418,8 +417,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -436,7 +434,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -484,6 +481,7 @@ "ctxt": 0 }, "value": "y2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -508,8 +506,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -562,6 +559,7 @@ "ctxt": 0 }, "value": "y2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -586,8 +584,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -652,6 +649,7 @@ "ctxt": 0 }, "value": "y2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -676,8 +674,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -694,7 +691,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/arrayOfFunctionTypes3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/arrayOfFunctionTypes3/input.ts.json index fd49b37bc969..8f0c20461c47 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/arrayOfFunctionTypes3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/arrayOfFunctionTypes3/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -123,8 +123,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -148,7 +148,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -179,7 +178,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -205,7 +203,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -268,8 +265,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -289,7 +286,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -303,7 +299,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } @@ -338,8 +333,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -363,7 +358,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -409,6 +403,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -440,6 +435,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -456,8 +452,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -495,6 +490,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -511,8 +507,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -536,8 +531,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -569,6 +563,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -600,6 +595,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -616,8 +612,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -655,6 +650,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -671,8 +667,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -696,8 +691,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -729,6 +723,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -760,6 +755,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -776,8 +772,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -815,6 +810,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -831,8 +827,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -856,8 +851,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -889,8 +883,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -910,7 +904,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -924,7 +917,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -938,7 +930,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -973,8 +964,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -991,7 +982,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "property": { @@ -1034,8 +1024,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1052,7 +1042,6 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1105,8 +1094,8 @@ "ctxt": 0 }, "value": "r5b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1123,7 +1112,6 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1171,6 +1159,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1202,6 +1191,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1224,13 +1214,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1273,7 +1261,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1298,6 +1285,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1314,8 +1302,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1339,8 +1326,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1372,6 +1358,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1403,6 +1390,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1425,13 +1413,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1474,7 +1460,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1499,6 +1484,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1515,8 +1501,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1540,8 +1525,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1573,6 +1557,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1604,6 +1589,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1620,8 +1606,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1659,6 +1644,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1681,13 +1667,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1730,7 +1714,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1741,8 +1724,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1774,8 +1756,8 @@ "ctxt": 0 }, "value": "z2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1795,7 +1777,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } }, @@ -1809,7 +1790,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } }, @@ -1823,7 +1803,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false } } @@ -1858,8 +1837,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1876,7 +1855,6 @@ "ctxt": 0 }, "value": "z2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1919,8 +1897,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1937,7 +1915,6 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/arrayTypeOfFunctionTypes/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/arrayTypeOfFunctionTypes/input.ts.json index 4e90538883f6..e7086ff8a74d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/arrayTypeOfFunctionTypes/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/arrayTypeOfFunctionTypes/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -73,8 +74,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -106,8 +106,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -124,7 +124,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -167,8 +166,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -185,7 +184,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -220,8 +218,8 @@ "ctxt": 0 }, "value": "r2b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -238,7 +236,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -273,6 +270,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -325,8 +323,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -358,8 +355,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -376,7 +373,6 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, "optional": false }, "property": { @@ -419,8 +415,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -437,7 +433,6 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -472,8 +467,8 @@ "ctxt": 0 }, "value": "r4b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -490,7 +485,6 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -525,6 +519,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -547,7 +542,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -588,8 +582,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -621,8 +614,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -639,7 +632,6 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, "optional": false }, "property": { @@ -682,8 +674,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -700,7 +692,6 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -735,8 +726,8 @@ "ctxt": 0 }, "value": "r6b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -753,7 +744,6 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/arrayTypeOfFunctionTypes2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/arrayTypeOfFunctionTypes2/input.ts.json index 54db3a550b86..d7635ede4ac4 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/arrayTypeOfFunctionTypes2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/arrayTypeOfFunctionTypes2/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -74,8 +75,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -107,8 +107,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -125,7 +125,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -168,8 +167,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -186,7 +185,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -221,8 +219,8 @@ "ctxt": 0 }, "value": "r2b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -239,7 +237,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -274,6 +271,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -326,8 +324,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -359,8 +356,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -377,7 +374,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -420,8 +416,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -438,7 +434,6 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -473,8 +468,8 @@ "ctxt": 0 }, "value": "r4b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -491,7 +486,6 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -526,6 +520,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -548,7 +543,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -590,8 +584,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -623,8 +616,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -641,7 +634,6 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, "optional": false }, "property": { @@ -684,8 +676,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -702,7 +694,6 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -737,8 +728,8 @@ "ctxt": 0 }, "value": "r6b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -755,7 +746,6 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/functionLiteral/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/functionLiteral/input.ts.json index 1670c90d378a..6fabe67bb91b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/functionLiteral/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/functionLiteral/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -85,6 +85,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -129,8 +130,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -162,6 +162,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -193,6 +194,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -209,8 +211,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -234,8 +235,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -267,6 +267,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -290,6 +291,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -306,8 +308,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -329,8 +330,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -362,6 +362,7 @@ "ctxt": 0 }, "value": "y2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -393,6 +394,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -415,13 +417,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -446,7 +446,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -475,7 +474,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -486,8 +484,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -505,6 +502,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -527,13 +525,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -544,7 +540,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -572,7 +567,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -611,6 +605,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -642,6 +637,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -658,8 +654,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -683,8 +678,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -716,6 +710,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -739,6 +734,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -755,8 +751,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -779,8 +774,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/functionLiteralForOverloads/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/functionLiteralForOverloads/input.ts.json index 957213e1d969..9c323238ede9 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/functionLiteralForOverloads/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/functionLiteralForOverloads/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,6 +63,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -78,8 +80,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -117,6 +118,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -133,8 +135,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -158,8 +159,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -177,8 +177,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -189,7 +189,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -226,6 +225,7 @@ "ctxt": 0 }, "value": "f2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -257,6 +257,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -273,8 +274,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -317,7 +317,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -342,6 +341,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -358,8 +358,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -402,7 +401,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -413,8 +411,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -432,8 +429,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -444,7 +441,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -481,6 +477,7 @@ "ctxt": 0 }, "value": "f3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -512,6 +509,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -534,13 +532,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -583,7 +579,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -608,6 +603,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -630,13 +626,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -679,7 +673,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -690,8 +683,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -709,8 +701,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -721,7 +713,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -758,6 +749,7 @@ "ctxt": 0 }, "value": "f4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -789,6 +781,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -805,8 +798,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -831,7 +823,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -860,7 +851,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -885,6 +875,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -901,8 +892,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -927,7 +917,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -956,7 +945,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -967,8 +955,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -986,8 +973,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -998,7 +985,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/functionLiteralForOverloads2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/functionLiteralForOverloads2/input.ts.json index 6496c830c961..c0d5791a05c3 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/functionLiteralForOverloads2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/functionLiteralForOverloads2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -78,8 +77,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -102,7 +100,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -122,6 +119,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -138,8 +136,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -162,7 +159,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -182,8 +178,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -216,7 +212,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -242,7 +237,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -262,6 +256,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -278,8 +273,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -302,7 +296,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -322,6 +315,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -338,8 +332,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -362,7 +355,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -382,8 +374,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -425,7 +417,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -461,6 +452,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -492,6 +484,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -508,8 +501,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -534,7 +526,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -558,6 +549,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -574,8 +566,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -600,7 +591,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -610,8 +600,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -621,7 +610,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "definite": false @@ -653,6 +641,7 @@ "ctxt": 0 }, "value": "f2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -684,6 +673,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -700,8 +690,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -726,7 +715,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -755,7 +743,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -780,6 +767,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -796,8 +784,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -822,7 +809,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -851,7 +837,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -862,8 +847,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -873,7 +857,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "definite": false @@ -905,6 +888,7 @@ "ctxt": 0 }, "value": "f3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -936,6 +920,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -952,8 +937,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -978,7 +962,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1004,7 +987,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1036,7 +1018,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1061,6 +1042,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1077,8 +1059,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1103,7 +1084,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1129,7 +1109,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1161,7 +1140,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1172,8 +1150,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1183,7 +1160,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/parenthesizedTypes/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/parenthesizedTypes/input.ts.json index db5d96f03cbd..04fb4773b667 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/parenthesizedTypes/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/parenthesizedTypes/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +105,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -137,6 +137,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -221,8 +222,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -254,6 +254,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -590,8 +591,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -623,6 +623,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -646,6 +647,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -662,8 +664,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -685,8 +686,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -718,6 +718,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -748,6 +749,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -772,8 +774,7 @@ "kind": "string" } } - }, - "optional": false + } } ], "typeParams": null, @@ -804,8 +805,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -837,6 +837,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -888,8 +889,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -921,6 +921,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -988,8 +989,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1021,6 +1021,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1104,8 +1105,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1137,6 +1137,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1189,6 +1190,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1205,8 +1207,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -1252,6 +1253,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1268,8 +1270,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1296,8 +1297,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1329,6 +1329,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1382,6 +1383,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1398,8 +1400,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1447,6 +1448,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1463,8 +1465,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1492,8 +1493,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1525,6 +1525,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1547,7 +1548,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1589,6 +1589,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1605,8 +1606,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -1652,6 +1652,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1668,8 +1669,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1697,8 +1697,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1730,6 +1729,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1752,7 +1752,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1795,6 +1794,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1811,8 +1811,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1860,6 +1859,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1876,8 +1876,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1906,8 +1905,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1939,6 +1937,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1968,7 +1967,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2011,6 +2009,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2027,8 +2026,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2076,6 +2074,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2092,8 +2091,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2123,8 +2121,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2156,6 +2153,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2185,13 +2183,11 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2223,6 +2219,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2259,14 +2256,12 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2298,6 +2293,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2321,8 +2317,8 @@ "ctxt": 0 }, "value": "string", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeParams": null, @@ -2344,8 +2340,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2377,6 +2372,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2400,6 +2396,7 @@ "ctxt": 0 }, "value": "string", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2416,8 +2413,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "typeParams": null, @@ -2439,8 +2435,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2472,6 +2467,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2525,8 +2521,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2558,6 +2553,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2619,8 +2615,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2652,6 +2647,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2737,7 +2733,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2747,8 +2742,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/unionTypeLiterals/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/unionTypeLiterals/input.ts.json index d89f06bad734..19acac7cce9e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/unionTypeLiterals/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeLiterals/unionTypeLiterals/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "simpleUnion", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -99,6 +99,7 @@ "ctxt": 0 }, "value": "unionOfUnion", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -143,8 +144,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -176,6 +176,7 @@ "ctxt": 0 }, "value": "arrayOfUnions", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -227,8 +228,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -260,6 +260,7 @@ "ctxt": 0 }, "value": "arrayOfUnions", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -282,7 +283,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -324,8 +324,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -357,6 +356,7 @@ "ctxt": 0 }, "value": "unionOfFunctionType", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -444,8 +444,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -477,6 +476,7 @@ "ctxt": 0 }, "value": "unionOfFunctionType", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -568,8 +568,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -601,6 +600,7 @@ "ctxt": 0 }, "value": "unionOfFunctionType", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -654,8 +654,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -687,6 +686,7 @@ "ctxt": 0 }, "value": "unionOfConstructorType", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -776,8 +776,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -809,6 +808,7 @@ "ctxt": 0 }, "value": "unionOfConstructorType", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -900,8 +900,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -933,6 +932,7 @@ "ctxt": 0 }, "value": "unionOfConstructorType", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -987,8 +987,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/circularTypeofWithVarOrFunc/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/circularTypeofWithVarOrFunc/input.ts.json index bc895a75dcb4..ef80cb05caaa 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/circularTypeofWithVarOrFunc/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/circularTypeofWithVarOrFunc/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "typeAlias1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -41,7 +40,6 @@ "ctxt": 0 }, "value": "varOfAliasedType1", - "typeAnnotation": null, "optional": false } } @@ -71,6 +69,7 @@ "ctxt": 0 }, "value": "varOfAliasedType1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -93,13 +92,11 @@ "ctxt": 0 }, "value": "typeAlias1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -131,6 +128,7 @@ "ctxt": 0 }, "value": "varOfAliasedType2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -153,13 +151,11 @@ "ctxt": 0 }, "value": "typeAlias2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "typeAlias2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -201,7 +196,6 @@ "ctxt": 0 }, "value": "varOfAliasedType2", - "typeAnnotation": null, "optional": false } } @@ -216,7 +210,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -278,7 +271,6 @@ "ctxt": 0 }, "value": "typeAlias3", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -310,8 +302,8 @@ "ctxt": 0 }, "value": "varOfAliasedType3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -328,7 +320,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -354,7 +345,6 @@ "ctxt": 0 }, "value": "typeAlias3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -373,7 +363,6 @@ "ctxt": 0 }, "value": "varOfAliasedType3", - "typeAnnotation": null, "optional": false } } @@ -393,7 +382,6 @@ "ctxt": 0 }, "value": "Input", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -423,7 +411,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -465,7 +452,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -510,7 +496,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -529,7 +514,6 @@ "ctxt": 0 }, "value": "ReturnType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -555,7 +539,6 @@ "ctxt": 0 }, "value": "mul", - "typeAnnotation": null, "optional": false } } @@ -573,7 +556,6 @@ "ctxt": 0 }, "value": "mul", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -594,6 +576,7 @@ "ctxt": 0 }, "value": "input", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -616,13 +599,11 @@ "ctxt": 0 }, "value": "Input", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -670,7 +651,6 @@ "ctxt": 0 }, "value": "input", - "typeAnnotation": null, "optional": false }, "property": { @@ -681,7 +661,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -701,7 +680,6 @@ "ctxt": 0 }, "value": "input", - "typeAnnotation": null, "optional": false }, "property": { @@ -712,7 +690,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -746,7 +723,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -769,7 +745,6 @@ "ctxt": 0 }, "value": "R2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -788,7 +763,6 @@ "ctxt": 0 }, "value": "ReturnType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -814,7 +788,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -832,7 +805,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -895,7 +867,6 @@ "ctxt": 0 }, "value": "R2", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/recursiveTypesWithTypeof/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/recursiveTypesWithTypeof/input.ts.json index 07c70f19c2da..0135af1fc98a 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/recursiveTypesWithTypeof/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/recursiveTypesWithTypeof/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,12 +54,10 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -90,6 +89,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -106,8 +106,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -139,6 +138,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -161,12 +161,10 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -198,6 +196,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -214,8 +213,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -247,6 +245,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -269,12 +268,10 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -306,6 +303,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -322,8 +320,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -345,7 +342,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -372,7 +368,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -416,6 +411,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -438,7 +434,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -464,15 +459,13 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -504,6 +497,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -520,8 +514,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -553,6 +546,7 @@ "ctxt": 0 }, "value": "f2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -575,7 +569,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -601,15 +594,13 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false } } ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -641,6 +632,7 @@ "ctxt": 0 }, "value": "f2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -657,8 +649,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -690,6 +681,7 @@ "ctxt": 0 }, "value": "f3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -719,7 +711,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -745,7 +736,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false } } @@ -753,8 +743,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -786,6 +775,7 @@ "ctxt": 0 }, "value": "f3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -802,8 +792,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -835,6 +824,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -866,7 +856,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -895,7 +884,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } } @@ -904,8 +892,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -937,6 +924,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -961,7 +949,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "right": { @@ -972,13 +959,11 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1010,6 +995,7 @@ "ctxt": 0 }, "value": "h", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1048,14 +1034,12 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false } } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1087,8 +1071,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1105,7 +1089,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1140,6 +1123,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1163,6 +1147,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1185,12 +1170,10 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } ], "typeParams": null, @@ -1216,14 +1199,12 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1255,8 +1236,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1273,7 +1254,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1287,7 +1267,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -1323,6 +1302,7 @@ "ctxt": 0 }, "value": "j", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1346,6 +1326,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1368,13 +1349,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -1400,7 +1379,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1418,7 +1396,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false } }, @@ -1448,15 +1425,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1488,8 +1463,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1506,7 +1481,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1520,7 +1494,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false } } @@ -1556,6 +1529,7 @@ "ctxt": 0 }, "value": "h2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1594,15 +1568,13 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false } } }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -1634,8 +1606,8 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1652,7 +1624,6 @@ "ctxt": 0 }, "value": "h2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1687,6 +1658,7 @@ "ctxt": 0 }, "value": "i2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1710,6 +1682,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1732,12 +1705,10 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } ], "typeParams": null, @@ -1763,15 +1734,13 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -1803,8 +1772,8 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1821,7 +1790,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1835,7 +1803,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false } } @@ -1871,6 +1838,7 @@ "ctxt": 0 }, "value": "j2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1894,6 +1862,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1916,13 +1885,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -1948,7 +1915,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1966,7 +1932,6 @@ "ctxt": 0 }, "value": "j2", - "typeAnnotation": null, "optional": false } }, @@ -1996,7 +1961,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2004,8 +1968,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -2037,8 +2000,8 @@ "ctxt": 0 }, "value": "j2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2055,7 +2018,6 @@ "ctxt": 0 }, "value": "j2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2069,7 +2031,6 @@ "ctxt": 0 }, "value": "j2", - "typeAnnotation": null, "optional": false } } @@ -2105,6 +2066,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2131,6 +2093,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2147,8 +2110,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2173,7 +2135,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false } } @@ -2196,6 +2157,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2212,8 +2174,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2238,7 +2199,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false } } @@ -2252,8 +2212,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2285,8 +2244,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2303,7 +2262,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "property": { @@ -2346,8 +2304,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2364,7 +2322,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "property": { @@ -2412,6 +2369,7 @@ "ctxt": 0 }, "value": "hy1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2450,7 +2408,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2479,7 +2436,6 @@ "ctxt": 0 }, "value": "hy1", - "typeAnnotation": null, "optional": false } } @@ -2489,8 +2445,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2522,8 +2477,8 @@ "ctxt": 0 }, "value": "hy1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2547,7 +2502,6 @@ "ctxt": 0 }, "value": "hy1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2569,7 +2523,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2603,6 +2556,7 @@ "ctxt": 0 }, "value": "hy2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2634,7 +2588,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2663,7 +2616,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2689,7 +2641,6 @@ "ctxt": 0 }, "value": "hy2", - "typeAnnotation": null, "optional": false } } @@ -2701,8 +2652,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2734,8 +2684,8 @@ "ctxt": 0 }, "value": "hy2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2759,7 +2709,6 @@ "ctxt": 0 }, "value": "hy2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2770,7 +2719,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2805,7 +2753,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2832,7 +2779,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2853,7 +2799,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2897,6 +2842,7 @@ "ctxt": 0 }, "value": "hy3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2919,7 +2865,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2945,7 +2890,6 @@ "ctxt": 0 }, "value": "hy3", - "typeAnnotation": null, "optional": false } }, @@ -2973,7 +2917,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3002,7 +2945,6 @@ "ctxt": 0 }, "value": "hy3", - "typeAnnotation": null, "optional": false } } @@ -3014,8 +2956,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3047,6 +2988,7 @@ "ctxt": 0 }, "value": "hy3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3063,8 +3005,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeQueryOnClass/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeQueryOnClass/input.ts.json index 5db33d7951a8..71aa3c1766c3 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeQueryOnClass/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeQueryOnClass/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -78,8 +77,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -102,7 +100,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -122,6 +119,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -138,8 +136,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -162,7 +159,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -184,8 +180,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -216,7 +212,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -237,6 +232,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -253,8 +249,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -291,7 +286,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -312,6 +306,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -328,8 +323,7 @@ }, "members": [] } - }, - "optional": false + } } } ], @@ -366,7 +360,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -387,8 +380,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -433,7 +426,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -454,8 +446,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -500,7 +492,6 @@ "ctxt": 0 }, "value": "sa", - "typeAnnotation": null, "optional": false }, "value": { @@ -538,7 +529,6 @@ "ctxt": 0 }, "value": "sb", - "typeAnnotation": null, "optional": false }, "value": { @@ -589,7 +579,6 @@ "ctxt": 0 }, "value": "sc", - "typeAnnotation": null, "optional": false }, "function": { @@ -653,7 +642,6 @@ "ctxt": 0 }, "value": "sc", - "typeAnnotation": null, "optional": false }, "function": { @@ -674,8 +662,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -720,7 +708,6 @@ "ctxt": 0 }, "value": "sd", - "typeAnnotation": null, "optional": false }, "function": { @@ -784,7 +771,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -805,8 +791,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -890,7 +876,6 @@ "ctxt": 0 }, "value": "ia", - "typeAnnotation": null, "optional": false }, "value": { @@ -928,7 +913,6 @@ "ctxt": 0 }, "value": "ib", - "typeAnnotation": null, "optional": false }, "value": { @@ -962,7 +946,6 @@ "ctxt": 0 }, "value": "ia", - "typeAnnotation": null, "optional": false }, "computed": false @@ -998,7 +981,6 @@ "ctxt": 0 }, "value": "ic", - "typeAnnotation": null, "optional": false }, "function": { @@ -1062,7 +1044,6 @@ "ctxt": 0 }, "value": "ic", - "typeAnnotation": null, "optional": false }, "function": { @@ -1083,8 +1064,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1129,7 +1110,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "function": { @@ -1204,7 +1184,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1240,6 +1219,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1262,7 +1242,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1285,8 +1264,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1318,6 +1296,7 @@ "ctxt": 0 }, "value": "r1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1340,12 +1319,10 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1377,6 +1354,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1399,12 +1377,10 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1421,7 +1397,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1447,7 +1422,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1469,8 +1443,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": true + "optional": true, + "typeAnnotation": null } } ], @@ -1501,7 +1475,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1527,7 +1500,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1558,7 +1530,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -1615,7 +1586,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1651,6 +1621,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1673,7 +1644,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1696,8 +1666,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1729,6 +1698,7 @@ "ctxt": 0 }, "value": "r3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1751,12 +1721,10 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1788,6 +1756,7 @@ "ctxt": 0 }, "value": "r4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1810,12 +1779,10 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeQueryWithReservedWords/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeQueryWithReservedWords/input.ts.json index 6954d8adaf27..99fb755b5e34 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeQueryWithReservedWords/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeQueryWithReservedWords/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Controller", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "create", - "typeAnnotation": null, "optional": false }, "function": { @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "delete", - "typeAnnotation": null, "optional": false }, "function": { @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "var", - "typeAnnotation": null, "optional": false }, "function": { @@ -187,7 +183,6 @@ "ctxt": 0 }, "value": "IScope", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -217,7 +212,6 @@ "ctxt": 0 }, "value": "create", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -250,7 +244,6 @@ "ctxt": 0 }, "value": "Controller", - "typeAnnotation": null, "optional": false }, "right": { @@ -261,7 +254,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false } }, @@ -273,7 +265,6 @@ "ctxt": 0 }, "value": "create", - "typeAnnotation": null, "optional": false } } @@ -297,7 +288,6 @@ "ctxt": 0 }, "value": "delete", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -330,7 +320,6 @@ "ctxt": 0 }, "value": "Controller", - "typeAnnotation": null, "optional": false }, "right": { @@ -341,7 +330,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false } }, @@ -353,7 +341,6 @@ "ctxt": 0 }, "value": "delete", - "typeAnnotation": null, "optional": false } } @@ -377,7 +364,6 @@ "ctxt": 0 }, "value": "var", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -410,7 +396,6 @@ "ctxt": 0 }, "value": "Controller", - "typeAnnotation": null, "optional": false }, "right": { @@ -421,7 +406,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false } }, @@ -433,7 +417,6 @@ "ctxt": 0 }, "value": "var", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeofANonExportedType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeofANonExportedType/input.ts.json index 9038d88ee4a0..2057259fda7b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeofANonExportedType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeofANonExportedType/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -79,6 +79,7 @@ "ctxt": 0 }, "value": "r1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -101,12 +102,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -139,8 +138,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -160,7 +159,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -216,6 +214,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -238,12 +237,10 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -261,7 +258,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -287,7 +283,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -357,6 +352,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -379,13 +375,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -418,6 +412,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -440,13 +435,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -485,6 +478,7 @@ "ctxt": 0 }, "value": "r3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -507,12 +501,10 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -552,6 +544,7 @@ "ctxt": 0 }, "value": "r4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -574,12 +567,10 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -619,6 +610,7 @@ "ctxt": 0 }, "value": "r4b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -641,12 +633,10 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -669,7 +659,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -699,7 +688,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -760,6 +748,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -782,13 +771,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -821,6 +808,7 @@ "ctxt": 0 }, "value": "i2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -843,13 +831,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -888,6 +874,7 @@ "ctxt": 0 }, "value": "r5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -910,12 +897,10 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -955,6 +940,7 @@ "ctxt": 0 }, "value": "r5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -977,12 +963,10 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1007,7 +991,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -1050,8 +1033,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -1089,7 +1072,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1115,7 +1097,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1189,6 +1170,7 @@ "ctxt": 0 }, "value": "r6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1211,12 +1193,10 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1256,6 +1236,7 @@ "ctxt": 0 }, "value": "r7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1280,7 +1261,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "right": { @@ -1291,13 +1271,11 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1322,7 +1300,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -1333,7 +1310,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } }, @@ -1369,6 +1345,7 @@ "ctxt": 0 }, "value": "r8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1391,12 +1368,10 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1436,6 +1411,7 @@ "ctxt": 0 }, "value": "r9", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1460,7 +1436,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "right": { @@ -1471,13 +1446,11 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1502,7 +1475,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -1521,7 +1493,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -1560,6 +1531,7 @@ "ctxt": 0 }, "value": "r10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1582,12 +1554,10 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1627,6 +1597,7 @@ "ctxt": 0 }, "value": "r11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1651,7 +1622,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -1662,13 +1632,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1708,6 +1676,7 @@ "ctxt": 0 }, "value": "r12", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1730,12 +1699,10 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1753,7 +1720,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1795,7 +1761,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "body": { @@ -1838,8 +1803,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1872,7 +1837,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1898,7 +1862,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1972,6 +1935,7 @@ "ctxt": 0 }, "value": "r13", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1994,12 +1958,10 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeofAnExportedType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeofAnExportedType/input.ts.json index 07cf0b8e9d1b..3b58c28aa619 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeofAnExportedType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeofAnExportedType/input.ts.json @@ -38,8 +38,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -87,6 +87,7 @@ "ctxt": 0 }, "value": "r1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -109,12 +110,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -154,8 +153,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -175,7 +174,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -232,6 +230,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -254,12 +253,10 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -284,7 +281,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -310,7 +306,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -381,6 +376,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -403,13 +399,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -442,6 +436,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -464,13 +459,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -509,6 +502,7 @@ "ctxt": 0 }, "value": "r3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -531,12 +525,10 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -576,6 +568,7 @@ "ctxt": 0 }, "value": "r4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -598,12 +591,10 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -643,6 +634,7 @@ "ctxt": 0 }, "value": "r4b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -665,12 +657,10 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -700,7 +690,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -730,7 +719,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -792,6 +780,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -814,13 +803,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -853,6 +840,7 @@ "ctxt": 0 }, "value": "i2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -875,13 +863,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -920,6 +906,7 @@ "ctxt": 0 }, "value": "r5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -942,12 +929,10 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -987,6 +972,7 @@ "ctxt": 0 }, "value": "r5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1009,12 +995,10 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1046,7 +1030,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -1089,8 +1072,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -1128,7 +1111,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1154,7 +1136,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1229,6 +1210,7 @@ "ctxt": 0 }, "value": "r6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1251,12 +1233,10 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1296,6 +1276,7 @@ "ctxt": 0 }, "value": "r7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1320,7 +1301,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "right": { @@ -1331,13 +1311,11 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1362,7 +1340,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "moduleRef": { @@ -1373,7 +1350,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } }, @@ -1409,6 +1385,7 @@ "ctxt": 0 }, "value": "r8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1431,12 +1408,10 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1476,6 +1451,7 @@ "ctxt": 0 }, "value": "r9", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1500,7 +1476,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "right": { @@ -1511,13 +1486,11 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1549,7 +1522,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -1568,7 +1540,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -1608,6 +1579,7 @@ "ctxt": 0 }, "value": "r10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1630,12 +1602,10 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1675,6 +1645,7 @@ "ctxt": 0 }, "value": "r11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1699,7 +1670,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "right": { @@ -1710,13 +1680,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1756,6 +1724,7 @@ "ctxt": 0 }, "value": "r12", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1778,12 +1747,10 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1808,7 +1775,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1858,7 +1824,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "body": { @@ -1901,8 +1866,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1935,7 +1900,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1961,7 +1925,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2036,6 +1999,7 @@ "ctxt": 0 }, "value": "r13", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2058,12 +2022,10 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeofClass2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeofClass2/input.ts.json index e87efb8c7d6e..699304f64672 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeofClass2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeofClass2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -78,8 +77,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -102,7 +100,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -122,6 +119,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -138,8 +136,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -162,7 +159,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -182,8 +178,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -214,7 +210,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -235,6 +230,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -251,8 +247,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -289,7 +284,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -310,6 +304,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -332,13 +327,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -375,7 +368,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -396,8 +388,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -442,7 +434,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -463,8 +454,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -511,7 +502,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -537,7 +527,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -558,6 +547,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -574,8 +564,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -620,7 +609,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -660,7 +648,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -693,6 +680,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -715,13 +703,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -753,6 +739,7 @@ "ctxt": 0 }, "value": "r1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -775,12 +762,10 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -812,6 +797,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -834,12 +820,10 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeofClassWithPrivates/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeofClassWithPrivates/input.ts.json index f9e814d6f44c..384e8f496f3a 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeofClassWithPrivates/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeofClassWithPrivates/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -88,7 +86,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -134,7 +131,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -160,7 +156,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -191,7 +186,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -217,7 +211,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -259,7 +252,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -295,6 +287,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -317,7 +310,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -340,8 +332,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -373,6 +364,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -395,12 +387,10 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -432,6 +422,7 @@ "ctxt": 0 }, "value": "r2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -454,12 +445,10 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeofModuleWithoutExports/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeofModuleWithoutExports/input.ts.json index 17e52d56d653..10cf0f385810 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeofModuleWithoutExports/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeofModuleWithoutExports/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "body": { @@ -59,8 +58,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -85,7 +84,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -111,7 +109,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -177,6 +174,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -199,12 +197,10 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeofTypeParameter/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeofTypeParameter/input.ts.json index 666ec38f72a1..5980710f38cc 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeofTypeParameter/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeQueries/typeofTypeParameter/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -108,6 +106,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -130,12 +129,10 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -167,6 +164,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -189,12 +187,10 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -216,7 +212,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -247,7 +242,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -277,7 +271,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments/input.ts.json index 3a1744c3289d..00ab97671452 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [] @@ -102,7 +99,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -141,6 +137,7 @@ "ctxt": 0 }, "value": "v1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -163,7 +160,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -186,8 +182,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -219,6 +214,7 @@ "ctxt": 0 }, "value": "v2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -241,7 +237,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -264,8 +259,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -297,6 +291,7 @@ "ctxt": 0 }, "value": "v3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -319,7 +314,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -342,8 +336,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -375,6 +368,7 @@ "ctxt": 0 }, "value": "v4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -397,7 +391,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -420,8 +413,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -438,7 +430,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -467,7 +458,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -499,7 +489,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -532,7 +521,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [] @@ -553,7 +541,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -592,6 +579,7 @@ "ctxt": 0 }, "value": "v1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -614,7 +602,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -637,8 +624,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -670,6 +656,7 @@ "ctxt": 0 }, "value": "v2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -692,7 +679,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -715,8 +701,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -748,6 +733,7 @@ "ctxt": 0 }, "value": "v3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -770,7 +756,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -793,8 +778,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -826,6 +810,7 @@ "ctxt": 0 }, "value": "v4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -848,7 +833,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -871,8 +855,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -904,6 +887,7 @@ "ctxt": 0 }, "value": "v5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -926,7 +910,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -949,8 +932,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -984,7 +966,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpread/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpread/input.ts.json index c4351086bc79..f806e6aa01ea 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpread/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpread/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -75,7 +74,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -124,8 +122,8 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -145,7 +143,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -173,7 +170,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -217,8 +213,8 @@ "ctxt": 0 }, "value": "swap", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -238,7 +234,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -266,7 +261,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -319,6 +313,7 @@ "ctxt": 0 }, "value": "addAfter", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -350,7 +345,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -392,7 +386,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -434,7 +427,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -462,8 +454,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -488,7 +479,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } }, @@ -502,7 +492,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -546,6 +535,7 @@ "ctxt": 0 }, "value": "addBefore", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -577,7 +567,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -619,7 +608,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -661,7 +649,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -689,8 +676,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -710,7 +696,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -738,7 +723,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } @@ -773,6 +757,7 @@ "ctxt": 0 }, "value": "override", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -804,7 +789,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -846,7 +830,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -874,8 +857,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -900,7 +882,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } }, @@ -914,7 +895,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -963,6 +943,7 @@ "ctxt": 0 }, "value": "nested", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -994,7 +975,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1036,7 +1016,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1078,7 +1057,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1106,8 +1084,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1142,7 +1119,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1180,7 +1156,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1203,7 +1178,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -1237,7 +1211,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -1286,6 +1259,7 @@ "ctxt": 0 }, "value": "combined", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1317,7 +1291,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1359,7 +1332,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1401,7 +1373,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1429,8 +1400,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1455,7 +1425,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } }, @@ -1474,7 +1443,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false } } @@ -1509,6 +1477,7 @@ "ctxt": 0 }, "value": "combinedAfter", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1540,7 +1509,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1582,7 +1550,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1624,7 +1591,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1652,8 +1618,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1678,7 +1643,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } }, @@ -1697,7 +1661,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false } }, @@ -1711,7 +1674,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1760,6 +1722,7 @@ "ctxt": 0 }, "value": "combinedNestedChangeType", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1791,7 +1754,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1833,7 +1795,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1875,7 +1836,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1903,8 +1863,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1939,7 +1898,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1977,7 +1935,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2000,7 +1957,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -2034,7 +1990,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -2087,6 +2042,7 @@ "ctxt": 0 }, "value": "propertyNested", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2118,7 +2074,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2156,7 +2111,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2198,7 +2152,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2231,8 +2184,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -2252,7 +2204,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2278,7 +2229,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } @@ -2316,8 +2266,8 @@ "ctxt": 0 }, "value": "op", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -2342,7 +2292,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -2405,6 +2354,7 @@ "ctxt": 0 }, "value": "getter", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2436,7 +2386,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2478,7 +2427,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2506,8 +2454,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -2532,7 +2479,6 @@ "ctxt": 0 }, "value": "op", - "typeAnnotation": null, "optional": false } }, @@ -2546,7 +2492,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -2595,7 +2540,6 @@ "ctxt": 0 }, "value": "getter", - "typeAnnotation": null, "optional": false }, "property": { @@ -2606,7 +2550,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2647,8 +2590,8 @@ "ctxt": 0 }, "value": "spreadFunc", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -2720,7 +2663,6 @@ "ctxt": 0 }, "value": "Header", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2748,7 +2690,6 @@ "ctxt": 0 }, "value": "head", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2790,7 +2731,6 @@ "ctxt": 0 }, "value": "body", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2832,7 +2772,6 @@ "ctxt": 0 }, "value": "authToken", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2871,7 +2810,6 @@ "ctxt": 0 }, "value": "from16326", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2892,6 +2830,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2923,7 +2862,6 @@ "ctxt": 0 }, "value": "header", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2952,7 +2890,6 @@ "ctxt": 0 }, "value": "Header", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2962,8 +2899,7 @@ } ] } - }, - "optional": false + } } }, { @@ -2982,6 +2918,7 @@ "ctxt": 0 }, "value": "header", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3004,13 +2941,11 @@ "ctxt": 0 }, "value": "Header", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3029,6 +2964,7 @@ "ctxt": 0 }, "value": "authToken", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3045,8 +2981,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -3109,7 +3044,6 @@ "ctxt": 0 }, "value": "header", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3130,7 +3064,6 @@ "ctxt": 0 }, "value": "header", - "typeAnnotation": null, "optional": false } }, @@ -3157,7 +3090,6 @@ "ctxt": 0 }, "value": "authToken", - "typeAnnotation": null, "optional": false }, "right": { @@ -3176,7 +3108,6 @@ "ctxt": 0 }, "value": "authToken", - "typeAnnotation": null, "optional": false } ] @@ -3213,7 +3144,6 @@ "ctxt": 0 }, "value": "Header", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3230,7 +3160,6 @@ "ctxt": 0 }, "value": "conditionalSpreadBoolean", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3251,6 +3180,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3267,8 +3197,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -3311,8 +3240,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -3332,7 +3261,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -3355,7 +3283,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -3397,8 +3324,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -3423,7 +3350,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } }, @@ -3450,7 +3376,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3471,7 +3396,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -3517,8 +3441,8 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -3551,7 +3475,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -3572,7 +3495,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -3610,7 +3532,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } @@ -3650,7 +3571,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3692,7 +3612,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3732,7 +3651,6 @@ "ctxt": 0 }, "value": "conditionalSpreadNumber", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3753,6 +3671,7 @@ "ctxt": 0 }, "value": "nt", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3769,8 +3688,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -3813,8 +3731,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -3834,7 +3752,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -3857,7 +3774,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -3899,8 +3815,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -3925,7 +3841,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } }, @@ -3952,7 +3867,6 @@ "ctxt": 0 }, "value": "nt", - "typeAnnotation": null, "optional": false }, "right": { @@ -3973,7 +3887,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -3984,7 +3897,6 @@ "ctxt": 0 }, "value": "nt", - "typeAnnotation": null, "optional": false } } @@ -4021,8 +3933,8 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -4055,7 +3967,6 @@ "ctxt": 0 }, "value": "nt", - "typeAnnotation": null, "optional": false }, "right": { @@ -4076,7 +3987,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -4087,7 +3997,6 @@ "ctxt": 0 }, "value": "nt", - "typeAnnotation": null, "optional": false } } @@ -4116,7 +4025,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } @@ -4156,7 +4064,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4198,7 +4105,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4238,7 +4144,6 @@ "ctxt": 0 }, "value": "conditionalSpreadString", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4259,6 +4164,7 @@ "ctxt": 0 }, "value": "st", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4275,8 +4181,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -4319,8 +4224,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -4340,7 +4245,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -4368,7 +4272,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -4410,8 +4313,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -4436,7 +4339,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } }, @@ -4463,7 +4365,6 @@ "ctxt": 0 }, "value": "st", - "typeAnnotation": null, "optional": false }, "right": { @@ -4484,7 +4385,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -4495,7 +4395,6 @@ "ctxt": 0 }, "value": "st", - "typeAnnotation": null, "optional": false } } @@ -4532,8 +4431,8 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -4566,7 +4465,6 @@ "ctxt": 0 }, "value": "st", - "typeAnnotation": null, "optional": false }, "right": { @@ -4587,7 +4485,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -4598,7 +4495,6 @@ "ctxt": 0 }, "value": "st", - "typeAnnotation": null, "optional": false } } @@ -4627,7 +4523,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } @@ -4667,7 +4562,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4709,7 +4603,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4764,6 +4657,7 @@ "ctxt": 0 }, "value": "anything", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4780,8 +4674,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -4813,8 +4706,8 @@ "ctxt": 0 }, "value": "spreadAny", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -4839,7 +4732,6 @@ "ctxt": 0 }, "value": "anything", - "typeAnnotation": null, "optional": false } } @@ -4859,7 +4751,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4885,7 +4776,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -4923,7 +4813,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -4986,6 +4875,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5008,13 +4898,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -5031,7 +4919,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -5066,6 +4953,7 @@ "ctxt": 0 }, "value": "spreadC", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5097,7 +4985,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5125,8 +5012,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -5151,7 +5037,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -5186,6 +5071,7 @@ "ctxt": 0 }, "value": "cplus", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5217,7 +5103,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5259,7 +5144,6 @@ "ctxt": 0 }, "value": "plus", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5286,8 +5170,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -5312,7 +5195,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -5326,7 +5208,6 @@ "ctxt": 0 }, "value": "plus", - "typeAnnotation": null, "optional": false }, "params": [], @@ -5382,7 +5263,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5440,7 +5320,6 @@ "ctxt": 0 }, "value": "cplus", - "typeAnnotation": null, "optional": false }, "property": { @@ -5451,7 +5330,6 @@ "ctxt": 0 }, "value": "plus", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5485,6 +5363,7 @@ "ctxt": 0 }, "value": "changeTypeAfter", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5516,7 +5395,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5558,7 +5436,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5586,8 +5463,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -5612,7 +5488,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } }, @@ -5626,7 +5501,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -5675,6 +5549,7 @@ "ctxt": 0 }, "value": "changeTypeBoth", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5706,7 +5581,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5748,7 +5622,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5776,8 +5649,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -5802,7 +5674,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } }, @@ -5821,7 +5692,6 @@ "ctxt": 0 }, "value": "swap", - "typeAnnotation": null, "optional": false } } @@ -5841,7 +5711,6 @@ "ctxt": 0 }, "value": "container", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5862,6 +5731,7 @@ "ctxt": 0 }, "value": "definiteBoolean", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5893,7 +5763,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5921,8 +5790,7 @@ } ] } - }, - "optional": false + } } }, { @@ -5941,6 +5809,7 @@ "ctxt": 0 }, "value": "definiteString", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5972,7 +5841,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6000,8 +5868,7 @@ } ] } - }, - "optional": false + } } }, { @@ -6020,6 +5887,7 @@ "ctxt": 0 }, "value": "optionalString", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6051,7 +5919,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6079,8 +5946,7 @@ } ] } - }, - "optional": false + } } }, { @@ -6099,6 +5965,7 @@ "ctxt": 0 }, "value": "optionalNumber", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6130,7 +5997,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6158,8 +6024,7 @@ } ] } - }, - "optional": false + } } } ], @@ -6202,6 +6067,7 @@ "ctxt": 0 }, "value": "optionalUnionStops", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6233,7 +6099,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6289,8 +6154,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -6315,7 +6179,6 @@ "ctxt": 0 }, "value": "definiteBoolean", - "typeAnnotation": null, "optional": false } }, @@ -6334,7 +6197,6 @@ "ctxt": 0 }, "value": "definiteString", - "typeAnnotation": null, "optional": false } }, @@ -6353,7 +6215,6 @@ "ctxt": 0 }, "value": "optionalNumber", - "typeAnnotation": null, "optional": false } } @@ -6388,6 +6249,7 @@ "ctxt": 0 }, "value": "optionalUnionDuplicates", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6419,7 +6281,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6466,8 +6327,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -6492,7 +6352,6 @@ "ctxt": 0 }, "value": "definiteBoolean", - "typeAnnotation": null, "optional": false } }, @@ -6511,7 +6370,6 @@ "ctxt": 0 }, "value": "definiteString", - "typeAnnotation": null, "optional": false } }, @@ -6530,7 +6388,6 @@ "ctxt": 0 }, "value": "optionalString", - "typeAnnotation": null, "optional": false } }, @@ -6549,7 +6406,6 @@ "ctxt": 0 }, "value": "optionalNumber", - "typeAnnotation": null, "optional": false } } @@ -6584,6 +6440,7 @@ "ctxt": 0 }, "value": "allOptional", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6615,7 +6472,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6662,8 +6518,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -6688,7 +6543,6 @@ "ctxt": 0 }, "value": "optionalString", - "typeAnnotation": null, "optional": false } }, @@ -6707,7 +6561,6 @@ "ctxt": 0 }, "value": "optionalNumber", - "typeAnnotation": null, "optional": false } } @@ -6742,6 +6595,7 @@ "ctxt": 0 }, "value": "computedFirst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6773,7 +6627,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6815,7 +6668,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6888,8 +6740,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -6948,7 +6799,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } }, @@ -6962,7 +6812,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -7011,6 +6860,7 @@ "ctxt": 0 }, "value": "computedAfter", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7042,7 +6892,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7084,7 +6933,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7157,8 +7005,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -7183,7 +7030,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } }, @@ -7197,7 +7043,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -7287,8 +7132,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -7328,6 +7173,7 @@ "ctxt": 0 }, "value": "shortCutted", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7359,7 +7205,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7401,7 +7246,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7429,8 +7273,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -7455,7 +7298,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } }, @@ -7467,7 +7309,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } ] @@ -7501,8 +7342,8 @@ "ctxt": 0 }, "value": "spreadNonPrimitive", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -7562,7 +7403,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7583,6 +7423,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7605,13 +7446,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -7630,6 +7469,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7652,13 +7492,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -7706,7 +7544,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -7725,7 +7562,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -7739,7 +7575,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": { @@ -7787,7 +7622,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7808,7 +7642,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7843,6 +7676,7 @@ "ctxt": 0 }, "value": "exclusive", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7874,7 +7708,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7916,7 +7749,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7958,7 +7790,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8000,7 +7831,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8042,7 +7872,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8070,8 +7899,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -8088,7 +7916,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8112,7 +7939,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -8135,7 +7961,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -8176,7 +8001,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -8204,7 +8028,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -8252,6 +8075,7 @@ "ctxt": 0 }, "value": "overlap", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8283,7 +8107,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8325,7 +8148,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8367,7 +8189,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8395,8 +8216,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -8413,7 +8233,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8437,7 +8256,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -8473,7 +8291,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -8496,7 +8313,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -8549,6 +8365,7 @@ "ctxt": 0 }, "value": "overlapConflict", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8580,7 +8397,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8622,7 +8438,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8650,8 +8465,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -8668,7 +8482,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8692,7 +8505,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -8728,7 +8540,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -8781,6 +8592,7 @@ "ctxt": 0 }, "value": "overwriteId", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8812,7 +8624,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8854,7 +8665,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8896,7 +8706,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8938,7 +8747,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8966,8 +8774,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -8984,7 +8791,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9008,7 +8814,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -9031,7 +8836,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": { @@ -9067,7 +8871,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -9090,7 +8893,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -9128,7 +8930,6 @@ "ctxt": 0 }, "value": "genericSpread", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9149,6 +8950,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9171,13 +8973,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -9196,6 +8996,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9218,13 +9019,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -9243,6 +9042,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9273,7 +9073,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9293,15 +9092,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } }, { @@ -9320,6 +9117,7 @@ "ctxt": 0 }, "value": "w", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9350,7 +9148,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9379,7 +9176,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9409,8 +9205,7 @@ } ] } - }, - "optional": false + } } }, { @@ -9429,6 +9224,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9460,7 +9256,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9488,8 +9283,7 @@ } ] } - }, - "optional": false + } } } ], @@ -9532,8 +9326,8 @@ "ctxt": 0 }, "value": "x01", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -9558,7 +9352,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -9593,8 +9386,8 @@ "ctxt": 0 }, "value": "x02", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -9619,7 +9412,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -9638,7 +9430,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -9673,8 +9464,8 @@ "ctxt": 0 }, "value": "x03", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -9699,7 +9490,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -9718,7 +9508,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -9753,8 +9542,8 @@ "ctxt": 0 }, "value": "x04", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -9779,7 +9568,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -9798,7 +9586,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -9833,8 +9620,8 @@ "ctxt": 0 }, "value": "x05", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -9854,7 +9641,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -9877,7 +9663,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -9910,7 +9695,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -9945,8 +9729,8 @@ "ctxt": 0 }, "value": "x06", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -9971,7 +9755,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -9985,7 +9768,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -10008,7 +9790,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -10057,8 +9838,8 @@ "ctxt": 0 }, "value": "x07", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -10078,7 +9859,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -10101,7 +9881,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -10134,7 +9913,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -10148,7 +9926,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -10176,7 +9953,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -10211,8 +9987,8 @@ "ctxt": 0 }, "value": "x09", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -10232,7 +10008,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -10260,7 +10035,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -10274,7 +10048,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -10302,7 +10075,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -10330,7 +10102,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -10365,8 +10136,8 @@ "ctxt": 0 }, "value": "x10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -10386,7 +10157,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -10414,7 +10184,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -10428,7 +10197,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -10461,7 +10229,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -10480,7 +10247,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -10515,8 +10281,8 @@ "ctxt": 0 }, "value": "x11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -10541,7 +10307,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -10576,8 +10341,8 @@ "ctxt": 0 }, "value": "x12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -10602,7 +10367,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -10621,7 +10385,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -10656,8 +10419,8 @@ "ctxt": 0 }, "value": "x13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -10682,7 +10445,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false } } @@ -10717,8 +10479,8 @@ "ctxt": 0 }, "value": "x14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -10743,7 +10505,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false } }, @@ -10762,7 +10523,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -10797,8 +10557,8 @@ "ctxt": 0 }, "value": "x15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -10823,7 +10583,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -10842,7 +10601,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -10877,8 +10635,8 @@ "ctxt": 0 }, "value": "x16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -10903,7 +10661,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -10922,7 +10679,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false } } @@ -10957,8 +10713,8 @@ "ctxt": 0 }, "value": "x17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -10983,7 +10739,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -11002,7 +10757,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false } }, @@ -11021,7 +10775,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -11056,8 +10809,8 @@ "ctxt": 0 }, "value": "x18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -11082,7 +10835,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -11101,7 +10853,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -11120,7 +10871,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false } } @@ -11157,7 +10907,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -11178,7 +10927,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadComputedProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadComputedProperty/input.ts.json index ae4ef43e67c3..3cb6305481ba 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadComputedProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadComputedProperty/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -60,6 +59,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -76,8 +76,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -117,6 +116,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -133,8 +133,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -174,6 +173,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -190,8 +190,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -230,8 +229,8 @@ "ctxt": 0 }, "value": "o1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -275,7 +274,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } }, @@ -287,7 +285,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -322,8 +319,8 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -367,7 +364,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -379,7 +375,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -414,8 +409,8 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -442,7 +437,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -454,7 +448,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } }, @@ -492,7 +485,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } }, @@ -504,7 +496,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } }, @@ -542,7 +533,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } }, @@ -554,7 +544,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadIndexSignature/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadIndexSignature/input.ts.json index bf9981b0ed50..769ff7bf0a0d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadIndexSignature/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadIndexSignature/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "indexed1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -57,6 +58,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -73,8 +75,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -117,7 +118,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -145,8 +145,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,6 +177,7 @@ "ctxt": 0 }, "value": "indexed2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -204,6 +204,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -220,8 +221,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -264,7 +264,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -292,8 +291,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -325,6 +323,7 @@ "ctxt": 0 }, "value": "indexed3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -351,6 +350,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -367,8 +367,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -397,8 +396,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -430,8 +428,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -456,7 +454,6 @@ "ctxt": 0 }, "value": "indexed1", - "typeAnnotation": null, "optional": false } }, @@ -470,7 +467,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -511,7 +507,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -551,8 +546,8 @@ "ctxt": 0 }, "value": "ii", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -577,7 +572,6 @@ "ctxt": 0 }, "value": "indexed1", - "typeAnnotation": null, "optional": false } }, @@ -596,7 +590,6 @@ "ctxt": 0 }, "value": "indexed2", - "typeAnnotation": null, "optional": false } } @@ -628,7 +621,6 @@ "ctxt": 0 }, "value": "ii", - "typeAnnotation": null, "optional": false }, "property": { @@ -668,6 +660,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -684,8 +677,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -715,8 +707,8 @@ "ctxt": 0 }, "value": "indexed3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -748,7 +740,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -759,7 +750,6 @@ "ctxt": 0 }, "value": "indexed3", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -770,7 +760,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -804,6 +793,7 @@ "ctxt": 0 }, "value": "roindex", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -830,6 +820,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -846,8 +837,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -876,8 +866,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -909,8 +898,8 @@ "ctxt": 0 }, "value": "writable", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -935,7 +924,6 @@ "ctxt": 0 }, "value": "roindex", - "typeAnnotation": null, "optional": false } } @@ -975,7 +963,6 @@ "ctxt": 0 }, "value": "writable", - "typeAnnotation": null, "optional": false }, "property": { @@ -986,7 +973,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadNegative/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadNegative/input.ts.json index bf6693e5906f..eb5579dae92b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadNegative/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadNegative/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -75,7 +74,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -109,7 +107,6 @@ "ctxt": 0 }, "value": "PrivateOptionalX", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -135,7 +132,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": true }, "value": null, @@ -183,7 +179,6 @@ "ctxt": 0 }, "value": "PublicX", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -209,7 +204,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -272,6 +266,7 @@ "ctxt": 0 }, "value": "publicX", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -294,13 +289,11 @@ "ctxt": 0 }, "value": "PublicX", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -332,6 +325,7 @@ "ctxt": 0 }, "value": "privateOptionalX", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -354,13 +348,11 @@ "ctxt": 0 }, "value": "PrivateOptionalX", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -392,8 +384,8 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -418,7 +410,6 @@ "ctxt": 0 }, "value": "publicX", - "typeAnnotation": null, "optional": false } }, @@ -437,7 +428,6 @@ "ctxt": 0 }, "value": "privateOptionalX", - "typeAnnotation": null, "optional": false } } @@ -472,6 +462,7 @@ "ctxt": 0 }, "value": "sn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -488,8 +479,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -506,7 +496,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false }, "property": { @@ -517,7 +506,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -551,6 +539,7 @@ "ctxt": 0 }, "value": "optionalString", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -582,7 +571,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -610,8 +598,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -643,6 +630,7 @@ "ctxt": 0 }, "value": "optionalNumber", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -674,7 +662,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -702,8 +689,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -735,6 +721,7 @@ "ctxt": 0 }, "value": "allOptional", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -766,7 +753,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -813,8 +799,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -839,7 +824,6 @@ "ctxt": 0 }, "value": "optionalString", - "typeAnnotation": null, "optional": false } }, @@ -858,7 +842,6 @@ "ctxt": 0 }, "value": "optionalNumber", - "typeAnnotation": null, "optional": false } } @@ -883,7 +866,6 @@ "ctxt": 0 }, "value": "Bool", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -913,7 +895,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -965,7 +946,6 @@ "ctxt": 0 }, "value": "Str", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -995,7 +975,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1057,8 +1036,8 @@ "ctxt": 0 }, "value": "spread", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1093,7 +1072,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1134,7 +1112,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": { @@ -1184,8 +1161,8 @@ "ctxt": 0 }, "value": "spread", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1205,7 +1182,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": { @@ -1252,8 +1228,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1273,7 +1249,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1315,8 +1290,8 @@ "ctxt": 0 }, "value": "spread", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1326,7 +1301,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1356,8 +1330,8 @@ "ctxt": 0 }, "value": "duplicated", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1377,7 +1351,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1410,7 +1383,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } }, @@ -1424,7 +1396,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1457,7 +1428,6 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, "optional": false } }, @@ -1471,7 +1441,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1520,8 +1489,8 @@ "ctxt": 0 }, "value": "duplicatedSpread", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1546,7 +1515,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } }, @@ -1565,7 +1533,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } @@ -1600,6 +1567,7 @@ "ctxt": 0 }, "value": "ignore", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1631,7 +1599,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1673,7 +1640,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1701,8 +1667,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1722,7 +1687,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1755,7 +1719,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } @@ -1790,8 +1753,8 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1811,7 +1774,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1834,7 +1796,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1883,8 +1844,8 @@ "ctxt": 0 }, "value": "o4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1904,7 +1865,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1932,7 +1892,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -1976,6 +1935,7 @@ "ctxt": 0 }, "value": "combinedBefore", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2007,7 +1967,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2049,7 +2008,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2091,7 +2049,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2119,8 +2076,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -2140,7 +2096,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2173,7 +2128,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false } }, @@ -2192,7 +2146,6 @@ "ctxt": 0 }, "value": "o4", - "typeAnnotation": null, "optional": false } } @@ -2227,6 +2180,7 @@ "ctxt": 0 }, "value": "combinedMid", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2258,7 +2212,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2300,7 +2253,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2342,7 +2294,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2370,8 +2321,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -2396,7 +2346,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false } }, @@ -2410,7 +2359,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2443,7 +2391,6 @@ "ctxt": 0 }, "value": "o4", - "typeAnnotation": null, "optional": false } } @@ -2478,6 +2425,7 @@ "ctxt": 0 }, "value": "combinedNested", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2509,7 +2457,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2551,7 +2498,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2593,7 +2539,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2635,7 +2580,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2663,8 +2607,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -2699,7 +2642,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2737,7 +2679,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2760,7 +2701,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -2794,7 +2734,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -2837,7 +2776,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2860,7 +2798,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -2912,6 +2849,7 @@ "ctxt": 0 }, "value": "changeTypeBefore", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2943,7 +2881,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2985,7 +2922,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3013,8 +2949,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -3034,7 +2969,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -3067,7 +3001,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false } } @@ -3102,6 +3035,7 @@ "ctxt": 0 }, "value": "computedMiddle", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3133,7 +3067,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3175,7 +3108,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3217,7 +3149,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3290,8 +3221,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -3316,7 +3246,6 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, "optional": false } }, @@ -3364,7 +3293,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -3397,7 +3325,6 @@ "ctxt": 0 }, "value": "o4", - "typeAnnotation": null, "optional": false } } @@ -3432,8 +3359,8 @@ "ctxt": 0 }, "value": "spreadNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -3491,8 +3418,8 @@ "ctxt": 0 }, "value": "spreadSum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -3568,8 +3495,8 @@ "ctxt": 0 }, "value": "spreadZero", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -3631,7 +3558,6 @@ "ctxt": 0 }, "value": "spreadZero", - "typeAnnotation": null, "optional": false }, "property": { @@ -3642,7 +3568,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3676,8 +3601,8 @@ "ctxt": 0 }, "value": "spreadBool", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -3739,7 +3664,6 @@ "ctxt": 0 }, "value": "spreadBool", - "typeAnnotation": null, "optional": false }, "property": { @@ -3750,7 +3674,6 @@ "ctxt": 0 }, "value": "valueOf", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3784,8 +3707,8 @@ "ctxt": 0 }, "value": "spreadStr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -3845,7 +3768,6 @@ "ctxt": 0 }, "value": "spreadStr", - "typeAnnotation": null, "optional": false }, "property": { @@ -3856,7 +3778,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3891,7 +3812,6 @@ "ctxt": 0 }, "value": "spreadStr", - "typeAnnotation": null, "optional": false }, "property": { @@ -3902,7 +3822,6 @@ "ctxt": 0 }, "value": "charAt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3949,8 +3868,8 @@ "ctxt": 0 }, "value": "spreadFunc", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -4020,7 +3939,6 @@ "ctxt": 0 }, "value": "spreadFunc", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4052,8 +3970,8 @@ "ctxt": 0 }, "value": "setterOnly", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -4093,7 +4011,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "param": { @@ -4104,6 +4021,7 @@ "ctxt": 0 }, "value": "bad", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4120,8 +4038,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "body": { "type": "BlockStatement", @@ -4172,7 +4089,6 @@ "ctxt": 0 }, "value": "setterOnly", - "typeAnnotation": null, "optional": false }, "property": { @@ -4183,7 +4099,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4209,7 +4124,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4235,7 +4149,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -4273,7 +4186,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -4336,6 +4248,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4358,13 +4271,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NewExpression", @@ -4381,7 +4292,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4416,8 +4326,8 @@ "ctxt": 0 }, "value": "spreadC", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -4442,7 +4352,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -4481,7 +4390,6 @@ "ctxt": 0 }, "value": "spreadC", - "typeAnnotation": null, "optional": false }, "property": { @@ -4492,7 +4400,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4526,6 +4433,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4542,8 +4450,7 @@ }, "kind": "object" } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -4563,7 +4470,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -4607,8 +4513,8 @@ "ctxt": 0 }, "value": "spreadObj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -4633,7 +4539,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -4665,7 +4570,6 @@ "ctxt": 0 }, "value": "spreadObj", - "typeAnnotation": null, "optional": false }, "property": { @@ -4676,7 +4580,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadNoTransform/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadNoTransform/input.ts.json index 3558e9b290ec..f2038cbf5514 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadNoTransform/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadNoTransform/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -80,7 +79,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -129,8 +127,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -150,7 +148,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -178,7 +175,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -213,8 +209,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -246,6 +242,7 @@ "ctxt": 0 }, "value": "rest", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -262,8 +259,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -315,7 +311,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null @@ -340,8 +335,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -357,7 +352,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadRepeatedComplexity/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadRepeatedComplexity/input.ts.json index 73b0df3335fa..23344c0796b0 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadRepeatedComplexity/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadRepeatedComplexity/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "cnd", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,7 +59,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -91,8 +90,7 @@ ] } } - }, - "optional": false + } } } ], @@ -170,7 +168,6 @@ "ctxt": 0 }, "value": "cnd", - "typeAnnotation": null, "optional": false }, "property": { @@ -199,7 +196,6 @@ "ctxt": 0 }, "value": "cnd", - "typeAnnotation": null, "optional": false }, "property": { @@ -232,7 +228,6 @@ "ctxt": 0 }, "value": "prop0", - "typeAnnotation": null, "optional": false }, "value": { @@ -287,7 +282,6 @@ "ctxt": 0 }, "value": "cnd", - "typeAnnotation": null, "optional": false }, "property": { @@ -319,7 +313,6 @@ "ctxt": 0 }, "value": "prop3a", - "typeAnnotation": null, "optional": false }, "value": { @@ -342,7 +335,6 @@ "ctxt": 0 }, "value": "prop3b", - "typeAnnotation": null, "optional": false }, "value": { @@ -397,7 +389,6 @@ "ctxt": 0 }, "value": "cnd", - "typeAnnotation": null, "optional": false }, "property": { @@ -429,7 +420,6 @@ "ctxt": 0 }, "value": "prop4a", - "typeAnnotation": null, "optional": false }, "value": { @@ -452,7 +442,6 @@ "ctxt": 0 }, "value": "prop4b", - "typeAnnotation": null, "optional": false }, "value": { @@ -507,7 +496,6 @@ "ctxt": 0 }, "value": "cnd", - "typeAnnotation": null, "optional": false }, "property": { @@ -539,7 +527,6 @@ "ctxt": 0 }, "value": "prop5a", - "typeAnnotation": null, "optional": false }, "value": { @@ -562,7 +549,6 @@ "ctxt": 0 }, "value": "prop5b", - "typeAnnotation": null, "optional": false }, "value": { @@ -617,7 +603,6 @@ "ctxt": 0 }, "value": "cnd", - "typeAnnotation": null, "optional": false }, "property": { @@ -649,7 +634,6 @@ "ctxt": 0 }, "value": "prop6a", - "typeAnnotation": null, "optional": false }, "value": { @@ -672,7 +656,6 @@ "ctxt": 0 }, "value": "prop6b", - "typeAnnotation": null, "optional": false }, "value": { @@ -727,7 +710,6 @@ "ctxt": 0 }, "value": "cnd", - "typeAnnotation": null, "optional": false }, "property": { @@ -759,7 +741,6 @@ "ctxt": 0 }, "value": "prop7a", - "typeAnnotation": null, "optional": false }, "value": { @@ -782,7 +763,6 @@ "ctxt": 0 }, "value": "prop7b", - "typeAnnotation": null, "optional": false }, "value": { @@ -837,7 +817,6 @@ "ctxt": 0 }, "value": "cnd", - "typeAnnotation": null, "optional": false }, "property": { @@ -869,7 +848,6 @@ "ctxt": 0 }, "value": "prop8a", - "typeAnnotation": null, "optional": false }, "value": { @@ -892,7 +870,6 @@ "ctxt": 0 }, "value": "prop8b", - "typeAnnotation": null, "optional": false }, "value": { @@ -947,7 +924,6 @@ "ctxt": 0 }, "value": "cnd", - "typeAnnotation": null, "optional": false }, "property": { @@ -979,7 +955,6 @@ "ctxt": 0 }, "value": "prop9a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1002,7 +977,6 @@ "ctxt": 0 }, "value": "prop9b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1057,7 +1031,6 @@ "ctxt": 0 }, "value": "cnd", - "typeAnnotation": null, "optional": false }, "property": { @@ -1089,7 +1062,6 @@ "ctxt": 0 }, "value": "prop10a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1112,7 +1084,6 @@ "ctxt": 0 }, "value": "prop10b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1167,7 +1138,6 @@ "ctxt": 0 }, "value": "cnd", - "typeAnnotation": null, "optional": false }, "property": { @@ -1199,7 +1169,6 @@ "ctxt": 0 }, "value": "prop11a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1222,7 +1191,6 @@ "ctxt": 0 }, "value": "prop11b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1277,7 +1245,6 @@ "ctxt": 0 }, "value": "cnd", - "typeAnnotation": null, "optional": false }, "property": { @@ -1309,7 +1276,6 @@ "ctxt": 0 }, "value": "prop12a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1332,7 +1298,6 @@ "ctxt": 0 }, "value": "prop12b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1387,7 +1352,6 @@ "ctxt": 0 }, "value": "cnd", - "typeAnnotation": null, "optional": false }, "property": { @@ -1419,7 +1383,6 @@ "ctxt": 0 }, "value": "prop13a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1442,7 +1405,6 @@ "ctxt": 0 }, "value": "prop13b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1497,7 +1459,6 @@ "ctxt": 0 }, "value": "cnd", - "typeAnnotation": null, "optional": false }, "property": { @@ -1529,7 +1490,6 @@ "ctxt": 0 }, "value": "prop14a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1552,7 +1512,6 @@ "ctxt": 0 }, "value": "prop14b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1607,7 +1566,6 @@ "ctxt": 0 }, "value": "cnd", - "typeAnnotation": null, "optional": false }, "property": { @@ -1639,7 +1597,6 @@ "ctxt": 0 }, "value": "prop15a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1662,7 +1619,6 @@ "ctxt": 0 }, "value": "prop15b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1717,7 +1673,6 @@ "ctxt": 0 }, "value": "cnd", - "typeAnnotation": null, "optional": false }, "property": { @@ -1749,7 +1704,6 @@ "ctxt": 0 }, "value": "prop16a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1772,7 +1726,6 @@ "ctxt": 0 }, "value": "prop16b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1827,7 +1780,6 @@ "ctxt": 0 }, "value": "cnd", - "typeAnnotation": null, "optional": false }, "property": { @@ -1859,7 +1811,6 @@ "ctxt": 0 }, "value": "prop17a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1882,7 +1833,6 @@ "ctxt": 0 }, "value": "prop17b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1937,7 +1887,6 @@ "ctxt": 0 }, "value": "cnd", - "typeAnnotation": null, "optional": false }, "property": { @@ -1969,7 +1918,6 @@ "ctxt": 0 }, "value": "prop18a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1992,7 +1940,6 @@ "ctxt": 0 }, "value": "prop18b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2047,7 +1994,6 @@ "ctxt": 0 }, "value": "cnd", - "typeAnnotation": null, "optional": false }, "property": { @@ -2079,7 +2025,6 @@ "ctxt": 0 }, "value": "prop19a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2102,7 +2047,6 @@ "ctxt": 0 }, "value": "prop19b", - "typeAnnotation": null, "optional": false }, "value": { @@ -2157,7 +2101,6 @@ "ctxt": 0 }, "value": "cnd", - "typeAnnotation": null, "optional": false }, "property": { @@ -2189,7 +2132,6 @@ "ctxt": 0 }, "value": "prop20a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2212,7 +2154,6 @@ "ctxt": 0 }, "value": "prop20b", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadRepeatedNullCheckPerf/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadRepeatedNullCheckPerf/input.ts.json index e8589e63d83a..5cb9748a5584 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadRepeatedNullCheckPerf/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadRepeatedNullCheckPerf/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Props", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -135,7 +132,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -177,7 +173,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -219,7 +214,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -261,7 +255,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -303,7 +296,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -345,7 +337,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -387,7 +378,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -429,7 +419,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -471,7 +460,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -513,7 +501,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -555,7 +542,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -597,7 +583,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -639,7 +624,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -681,7 +665,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -723,7 +706,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -765,7 +747,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -807,7 +788,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -849,7 +829,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -891,7 +870,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -933,7 +911,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -975,7 +952,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1017,7 +993,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1059,7 +1034,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1101,7 +1075,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1140,7 +1113,6 @@ "ctxt": 0 }, "value": "parseWithSpread", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1161,6 +1133,7 @@ "ctxt": 0 }, "value": "config", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1183,7 +1156,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1215,8 +1187,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1287,7 +1258,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -1298,7 +1268,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1311,7 +1280,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1333,7 +1301,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1365,7 +1332,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -1376,7 +1342,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1389,7 +1354,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1440,7 +1404,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -1451,7 +1414,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1464,7 +1426,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1486,7 +1447,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1518,7 +1478,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -1529,7 +1488,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1542,7 +1500,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1593,7 +1550,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -1604,7 +1560,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1617,7 +1572,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1639,7 +1593,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -1671,7 +1624,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -1682,7 +1634,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1695,7 +1646,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1746,7 +1696,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -1757,7 +1706,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1770,7 +1718,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1792,7 +1739,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -1824,7 +1770,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -1835,7 +1780,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1848,7 +1792,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1899,7 +1842,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -1910,7 +1852,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1923,7 +1864,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1945,7 +1885,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": { @@ -1977,7 +1916,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -1988,7 +1926,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2001,7 +1938,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2052,7 +1988,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -2063,7 +1998,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2076,7 +2010,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2098,7 +2031,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -2130,7 +2062,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -2141,7 +2072,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2154,7 +2084,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2205,7 +2134,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -2216,7 +2144,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2229,7 +2156,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2251,7 +2177,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "value": { @@ -2283,7 +2208,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -2294,7 +2218,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2307,7 +2230,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2358,7 +2280,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -2369,7 +2290,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2382,7 +2302,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2404,7 +2323,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "value": { @@ -2436,7 +2354,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -2447,7 +2364,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2460,7 +2376,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2511,7 +2426,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -2522,7 +2436,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2535,7 +2448,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2557,7 +2469,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "value": { @@ -2589,7 +2500,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -2600,7 +2510,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2613,7 +2522,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2664,7 +2572,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -2675,7 +2582,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2688,7 +2594,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2710,7 +2615,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "value": { @@ -2742,7 +2646,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -2753,7 +2656,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2766,7 +2668,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2817,7 +2718,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -2828,7 +2728,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2841,7 +2740,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -2863,7 +2761,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "value": { @@ -2895,7 +2792,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -2906,7 +2802,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2919,7 +2814,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2970,7 +2864,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -2981,7 +2874,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2994,7 +2886,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -3016,7 +2907,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "value": { @@ -3048,7 +2938,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -3059,7 +2948,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3072,7 +2960,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3123,7 +3010,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -3134,7 +3020,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3147,7 +3032,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -3169,7 +3053,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": { @@ -3201,7 +3084,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -3212,7 +3094,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3225,7 +3106,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3276,7 +3156,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -3287,7 +3166,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3300,7 +3178,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -3322,7 +3199,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -3354,7 +3230,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -3365,7 +3240,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3378,7 +3252,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3429,7 +3302,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -3440,7 +3312,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3453,7 +3324,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -3475,7 +3345,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "value": { @@ -3507,7 +3376,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -3518,7 +3386,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3531,7 +3398,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3582,7 +3448,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -3593,7 +3458,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3606,7 +3470,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -3628,7 +3491,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -3660,7 +3522,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -3671,7 +3532,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3684,7 +3544,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3735,7 +3594,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -3746,7 +3604,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3759,7 +3616,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -3781,7 +3637,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "value": { @@ -3813,7 +3668,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -3824,7 +3678,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3837,7 +3690,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3888,7 +3740,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -3899,7 +3750,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3912,7 +3762,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -3934,7 +3783,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "value": { @@ -3966,7 +3814,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -3977,7 +3824,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3990,7 +3836,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4041,7 +3886,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -4052,7 +3896,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4065,7 +3908,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -4087,7 +3929,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": { @@ -4119,7 +3960,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -4130,7 +3970,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4143,7 +3982,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4194,7 +4032,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -4205,7 +4042,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4218,7 +4054,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -4240,7 +4075,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "value": { @@ -4272,7 +4106,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -4283,7 +4116,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4296,7 +4128,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4347,7 +4178,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -4358,7 +4188,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4371,7 +4200,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -4393,7 +4221,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "value": { @@ -4425,7 +4252,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -4436,7 +4262,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4449,7 +4274,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4500,7 +4324,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -4511,7 +4334,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4524,7 +4346,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -4546,7 +4367,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "value": { @@ -4578,7 +4398,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -4589,7 +4408,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4602,7 +4420,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4653,7 +4470,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -4664,7 +4480,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4677,7 +4492,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -4699,7 +4513,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false }, "value": { @@ -4731,7 +4544,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -4742,7 +4554,6 @@ "ctxt": 0 }, "value": "w", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4755,7 +4566,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4806,7 +4616,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -4817,7 +4626,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4830,7 +4638,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -4852,7 +4659,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -4884,7 +4690,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -4895,7 +4700,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4908,7 +4712,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4959,7 +4762,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -4970,7 +4772,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4983,7 +4784,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -5005,7 +4805,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -5037,7 +4836,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -5048,7 +4846,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5061,7 +4858,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5112,7 +4908,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -5123,7 +4918,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5136,7 +4930,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -5158,7 +4951,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -5190,7 +4982,6 @@ "ctxt": 0 }, "value": "config", - "typeAnnotation": null, "optional": false }, "property": { @@ -5201,7 +4992,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5214,7 +5004,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5257,7 +5046,6 @@ "ctxt": 0 }, "value": "Props", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5286,7 +5074,6 @@ "ctxt": 0 }, "value": "parseWithSpread", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5310,7 +5097,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -5333,7 +5119,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -5356,7 +5141,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadSetonlyAccessor/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadSetonlyAccessor/input.ts.json index ec38c868bb60..220c06932ddc 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadSetonlyAccessor/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadSetonlyAccessor/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "o1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -104,7 +104,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -132,8 +131,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -153,7 +151,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -196,7 +193,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "param": { @@ -207,6 +203,7 @@ "ctxt": 0 }, "value": "_v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -223,8 +220,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "body": { "type": "BlockStatement", @@ -270,6 +266,7 @@ "ctxt": 0 }, "value": "o2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -301,7 +298,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -329,8 +325,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -350,7 +345,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -393,7 +387,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "param": { @@ -404,6 +397,7 @@ "ctxt": 0 }, "value": "_v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -420,8 +414,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "body": { "type": "BlockStatement", diff --git a/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadStrictNull/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadStrictNull/input.ts.json index 4ef173e78ada..fdcbffe7bfa6 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadStrictNull/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/spread/objectSpreadStrictNull/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "definiteBoolean", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -68,7 +68,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -96,8 +95,7 @@ } ] } - }, - "optional": false + } } }, { @@ -116,6 +114,7 @@ "ctxt": 0 }, "value": "definiteString", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -147,7 +146,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -175,8 +173,7 @@ } ] } - }, - "optional": false + } } }, { @@ -195,6 +192,7 @@ "ctxt": 0 }, "value": "optionalString", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -226,7 +224,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -254,8 +251,7 @@ } ] } - }, - "optional": false + } } }, { @@ -274,6 +270,7 @@ "ctxt": 0 }, "value": "optionalNumber", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -305,7 +302,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -333,8 +329,7 @@ } ] } - }, - "optional": false + } } }, { @@ -353,6 +348,7 @@ "ctxt": 0 }, "value": "undefinedString", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -384,7 +380,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -431,8 +426,7 @@ } ] } - }, - "optional": false + } } }, { @@ -451,6 +445,7 @@ "ctxt": 0 }, "value": "undefinedNumber", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -482,7 +477,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -529,8 +523,7 @@ } ] } - }, - "optional": false + } } } ], @@ -573,6 +566,7 @@ "ctxt": 0 }, "value": "optionalUnionStops", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -604,7 +598,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -651,8 +644,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -677,7 +669,6 @@ "ctxt": 0 }, "value": "definiteBoolean", - "typeAnnotation": null, "optional": false } }, @@ -696,7 +687,6 @@ "ctxt": 0 }, "value": "definiteString", - "typeAnnotation": null, "optional": false } }, @@ -715,7 +705,6 @@ "ctxt": 0 }, "value": "optionalNumber", - "typeAnnotation": null, "optional": false } } @@ -750,6 +739,7 @@ "ctxt": 0 }, "value": "optionalUnionDuplicates", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -781,7 +771,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -828,8 +817,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -854,7 +842,6 @@ "ctxt": 0 }, "value": "definiteBoolean", - "typeAnnotation": null, "optional": false } }, @@ -873,7 +860,6 @@ "ctxt": 0 }, "value": "definiteString", - "typeAnnotation": null, "optional": false } }, @@ -892,7 +878,6 @@ "ctxt": 0 }, "value": "optionalString", - "typeAnnotation": null, "optional": false } }, @@ -911,7 +896,6 @@ "ctxt": 0 }, "value": "optionalNumber", - "typeAnnotation": null, "optional": false } } @@ -946,6 +930,7 @@ "ctxt": 0 }, "value": "allOptional", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -977,7 +962,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1024,8 +1008,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1050,7 +1033,6 @@ "ctxt": 0 }, "value": "optionalString", - "typeAnnotation": null, "optional": false } }, @@ -1069,7 +1051,6 @@ "ctxt": 0 }, "value": "optionalNumber", - "typeAnnotation": null, "optional": false } } @@ -1104,6 +1085,7 @@ "ctxt": 0 }, "value": "undefinedUnionStops", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1135,7 +1117,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1182,8 +1163,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1208,7 +1188,6 @@ "ctxt": 0 }, "value": "definiteBoolean", - "typeAnnotation": null, "optional": false } }, @@ -1227,7 +1206,6 @@ "ctxt": 0 }, "value": "definiteString", - "typeAnnotation": null, "optional": false } }, @@ -1246,7 +1224,6 @@ "ctxt": 0 }, "value": "undefinedNumber", - "typeAnnotation": null, "optional": false } } @@ -1281,6 +1258,7 @@ "ctxt": 0 }, "value": "undefinedUnionDuplicates", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1312,7 +1290,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1359,8 +1336,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1385,7 +1361,6 @@ "ctxt": 0 }, "value": "definiteBoolean", - "typeAnnotation": null, "optional": false } }, @@ -1404,7 +1379,6 @@ "ctxt": 0 }, "value": "definiteString", - "typeAnnotation": null, "optional": false } }, @@ -1423,7 +1397,6 @@ "ctxt": 0 }, "value": "undefinedString", - "typeAnnotation": null, "optional": false } }, @@ -1442,7 +1415,6 @@ "ctxt": 0 }, "value": "undefinedNumber", - "typeAnnotation": null, "optional": false } } @@ -1477,6 +1449,7 @@ "ctxt": 0 }, "value": "allUndefined", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1508,7 +1481,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1564,8 +1536,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1590,7 +1561,6 @@ "ctxt": 0 }, "value": "undefinedString", - "typeAnnotation": null, "optional": false } }, @@ -1609,7 +1579,6 @@ "ctxt": 0 }, "value": "undefinedNumber", - "typeAnnotation": null, "optional": false } } @@ -1644,6 +1613,7 @@ "ctxt": 0 }, "value": "undefinedWithOptionalContinues", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1675,7 +1645,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1731,8 +1700,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1757,7 +1725,6 @@ "ctxt": 0 }, "value": "definiteBoolean", - "typeAnnotation": null, "optional": false } }, @@ -1776,7 +1743,6 @@ "ctxt": 0 }, "value": "undefinedString", - "typeAnnotation": null, "optional": false } }, @@ -1795,7 +1761,6 @@ "ctxt": 0 }, "value": "optionalNumber", - "typeAnnotation": null, "optional": false } } @@ -1828,7 +1793,6 @@ "ctxt": 0 }, "value": "Movie", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1856,7 +1820,6 @@ "ctxt": 0 }, "value": "title", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1898,7 +1861,6 @@ "ctxt": 0 }, "value": "yearReleased", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1952,8 +1914,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1973,7 +1935,6 @@ "ctxt": 0 }, "value": "title", - "typeAnnotation": null, "optional": false }, "value": { @@ -2001,7 +1962,6 @@ "ctxt": 0 }, "value": "yearReleased", - "typeAnnotation": null, "optional": false }, "value": { @@ -2045,6 +2005,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2067,13 +2028,11 @@ "ctxt": 0 }, "value": "Movie", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -2098,7 +2057,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } }, @@ -2112,7 +2070,6 @@ "ctxt": 0 }, "value": "title", - "typeAnnotation": null, "optional": false }, "value": { @@ -2123,7 +2080,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2148,7 +2104,6 @@ "ctxt": 0 }, "value": "Fields", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2178,7 +2133,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2220,7 +2174,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2264,7 +2217,6 @@ "ctxt": 0 }, "value": "NearlyPartialFields", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2294,7 +2246,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2355,7 +2306,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2413,7 +2363,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2434,6 +2383,7 @@ "ctxt": 0 }, "value": "fields", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2456,13 +2406,11 @@ "ctxt": 0 }, "value": "Fields", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2481,6 +2429,7 @@ "ctxt": 0 }, "value": "partialFields", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2503,7 +2452,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2529,7 +2477,6 @@ "ctxt": 0 }, "value": "Fields", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2537,8 +2484,7 @@ ] } } - }, - "optional": false + } } }, { @@ -2557,6 +2503,7 @@ "ctxt": 0 }, "value": "nearlyPartialFields", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2579,13 +2526,11 @@ "ctxt": 0 }, "value": "NearlyPartialFields", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2626,8 +2571,8 @@ "ctxt": 0 }, "value": "fields", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -2652,7 +2597,6 @@ "ctxt": 0 }, "value": "fields", - "typeAnnotation": null, "optional": false } }, @@ -2671,7 +2615,6 @@ "ctxt": 0 }, "value": "partialFields", - "typeAnnotation": null, "optional": false } } @@ -2702,8 +2645,8 @@ "ctxt": 0 }, "value": "fields", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -2728,7 +2671,6 @@ "ctxt": 0 }, "value": "fields", - "typeAnnotation": null, "optional": false } }, @@ -2747,7 +2689,6 @@ "ctxt": 0 }, "value": "nearlyPartialFields", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/spread/spreadContextualTypedBindingPattern/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/spread/spreadContextualTypedBindingPattern/input.ts.json index e6c339f5de24..fe63f6cfdd88 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/spread/spreadContextualTypedBindingPattern/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/spread/spreadContextualTypedBindingPattern/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Person", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "naam", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "age", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -147,6 +144,7 @@ "ctxt": 0 }, "value": "bob", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -169,13 +167,11 @@ "ctxt": 0 }, "value": "Person", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -207,6 +203,7 @@ "ctxt": 0 }, "value": "alice", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -229,13 +226,11 @@ "ctxt": 0 }, "value": "Person", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -282,7 +277,6 @@ "ctxt": 0 }, "value": "naam", - "typeAnnotation": null, "optional": false }, "value": null @@ -302,7 +296,6 @@ "ctxt": 0 }, "value": "age", - "typeAnnotation": null, "optional": false }, "value": null @@ -334,7 +327,6 @@ "ctxt": 0 }, "value": "bob", - "typeAnnotation": null, "optional": false } }, @@ -353,7 +345,6 @@ "ctxt": 0 }, "value": "alice", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/spread/spreadExcessProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/spread/spreadExcessProperty/input.ts.json index dc6b3cff2618..c9f2c767f4f8 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/spread/spreadExcessProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/spread/spreadExcessProperty/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -146,8 +143,8 @@ "ctxt": 0 }, "value": "extra1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -167,7 +164,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -195,7 +191,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -223,7 +218,6 @@ "ctxt": 0 }, "value": "extra", - "typeAnnotation": null, "optional": false }, "value": { @@ -272,6 +266,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -294,13 +289,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -325,7 +318,6 @@ "ctxt": 0 }, "value": "extra1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/spread/spreadMethods/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/spread/spreadMethods/input.ts.json index 3552eff5d1e1..3aa9bde0a61d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/spread/spreadMethods/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/spread/spreadMethods/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -126,7 +123,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "function": { @@ -197,7 +193,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -227,7 +222,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -269,7 +263,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -310,7 +303,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -364,8 +356,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -382,7 +374,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -417,8 +408,8 @@ "ctxt": 0 }, "value": "sk", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -443,7 +434,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false } } @@ -478,8 +468,8 @@ "ctxt": 0 }, "value": "ssk", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -504,7 +494,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false } }, @@ -523,7 +512,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false } } @@ -555,7 +543,6 @@ "ctxt": 0 }, "value": "sk", - "typeAnnotation": null, "optional": false }, "property": { @@ -566,7 +553,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -601,7 +587,6 @@ "ctxt": 0 }, "value": "sk", - "typeAnnotation": null, "optional": false }, "property": { @@ -612,7 +597,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -643,7 +627,6 @@ "ctxt": 0 }, "value": "sk", - "typeAnnotation": null, "optional": false }, "property": { @@ -654,7 +637,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -682,7 +664,6 @@ "ctxt": 0 }, "value": "ssk", - "typeAnnotation": null, "optional": false }, "property": { @@ -693,7 +674,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -728,7 +708,6 @@ "ctxt": 0 }, "value": "ssk", - "typeAnnotation": null, "optional": false }, "property": { @@ -739,7 +718,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -770,7 +748,6 @@ "ctxt": 0 }, "value": "ssk", - "typeAnnotation": null, "optional": false }, "property": { @@ -781,7 +758,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -812,6 +788,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -834,13 +811,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -860,7 +835,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -883,7 +857,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "params": [], @@ -922,7 +895,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -985,8 +957,8 @@ "ctxt": 0 }, "value": "si", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1011,7 +983,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -1046,8 +1017,8 @@ "ctxt": 0 }, "value": "ssi", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1072,7 +1043,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -1091,7 +1061,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -1123,7 +1092,6 @@ "ctxt": 0 }, "value": "si", - "typeAnnotation": null, "optional": false }, "property": { @@ -1134,7 +1102,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1169,7 +1136,6 @@ "ctxt": 0 }, "value": "si", - "typeAnnotation": null, "optional": false }, "property": { @@ -1180,7 +1146,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1211,7 +1176,6 @@ "ctxt": 0 }, "value": "si", - "typeAnnotation": null, "optional": false }, "property": { @@ -1222,7 +1186,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1250,7 +1213,6 @@ "ctxt": 0 }, "value": "ssi", - "typeAnnotation": null, "optional": false }, "property": { @@ -1261,7 +1223,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1296,7 +1257,6 @@ "ctxt": 0 }, "value": "ssi", - "typeAnnotation": null, "optional": false }, "property": { @@ -1307,7 +1267,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1338,7 +1297,6 @@ "ctxt": 0 }, "value": "ssi", - "typeAnnotation": null, "optional": false }, "property": { @@ -1349,7 +1307,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1380,8 +1337,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1401,7 +1358,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -1424,7 +1380,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1463,7 +1418,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -1526,8 +1480,8 @@ "ctxt": 0 }, "value": "so", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1552,7 +1506,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } @@ -1587,8 +1540,8 @@ "ctxt": 0 }, "value": "sso", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1613,7 +1566,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } }, @@ -1632,7 +1584,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } @@ -1664,7 +1615,6 @@ "ctxt": 0 }, "value": "so", - "typeAnnotation": null, "optional": false }, "property": { @@ -1675,7 +1625,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1710,7 +1659,6 @@ "ctxt": 0 }, "value": "so", - "typeAnnotation": null, "optional": false }, "property": { @@ -1721,7 +1669,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1752,7 +1699,6 @@ "ctxt": 0 }, "value": "so", - "typeAnnotation": null, "optional": false }, "property": { @@ -1763,7 +1709,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1791,7 +1736,6 @@ "ctxt": 0 }, "value": "sso", - "typeAnnotation": null, "optional": false }, "property": { @@ -1802,7 +1746,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1837,7 +1780,6 @@ "ctxt": 0 }, "value": "sso", - "typeAnnotation": null, "optional": false }, "property": { @@ -1848,7 +1790,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1879,7 +1820,6 @@ "ctxt": 0 }, "value": "sso", - "typeAnnotation": null, "optional": false }, "property": { @@ -1890,7 +1830,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/spread/spreadNonPrimitive/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/spread/spreadNonPrimitive/input.ts.json index f054593b968b..cb3c3ee66a88 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/spread/spreadNonPrimitive/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/spread/spreadNonPrimitive/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "object" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -111,7 +112,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -153,7 +153,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -181,8 +180,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -202,7 +200,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -230,7 +227,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } }, @@ -244,7 +240,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/spread/spreadOverwritesProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/spread/spreadOverwritesProperty/input.ts.json index 631250aa6607..0e9b8ee3199c 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/spread/spreadOverwritesProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/spread/spreadOverwritesProperty/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "ab", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -104,7 +104,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -132,8 +131,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -165,6 +163,7 @@ "ctxt": 0 }, "value": "abq", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -196,7 +195,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -238,7 +236,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -266,8 +263,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -299,8 +295,8 @@ "ctxt": 0 }, "value": "unused1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -320,7 +316,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -348,7 +343,6 @@ "ctxt": 0 }, "value": "ab", - "typeAnnotation": null, "optional": false } } @@ -383,8 +377,8 @@ "ctxt": 0 }, "value": "unused2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -409,7 +403,6 @@ "ctxt": 0 }, "value": "ab", - "typeAnnotation": null, "optional": false } }, @@ -428,7 +421,6 @@ "ctxt": 0 }, "value": "ab", - "typeAnnotation": null, "optional": false } } @@ -463,8 +455,8 @@ "ctxt": 0 }, "value": "unused3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -484,7 +476,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -512,7 +503,6 @@ "ctxt": 0 }, "value": "abq", - "typeAnnotation": null, "optional": false } } @@ -532,7 +522,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -553,6 +542,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -584,7 +574,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -631,8 +620,7 @@ } ] } - }, - "optional": false + } } } ], @@ -675,7 +663,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -703,7 +690,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -727,7 +713,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -748,6 +733,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -779,7 +765,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -807,8 +792,7 @@ } ] } - }, - "optional": false + } } } ], @@ -851,7 +835,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -879,7 +862,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/spread/spreadOverwritesPropertyStrict/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/spread/spreadOverwritesPropertyStrict/input.ts.json index 739c790c00fc..223bba92c09b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/spread/spreadOverwritesPropertyStrict/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/spread/spreadOverwritesPropertyStrict/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "ab", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -104,7 +104,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -132,8 +131,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -165,6 +163,7 @@ "ctxt": 0 }, "value": "abq", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -196,7 +195,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -238,7 +236,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -266,8 +263,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -299,8 +295,8 @@ "ctxt": 0 }, "value": "unused1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -320,7 +316,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -348,7 +343,6 @@ "ctxt": 0 }, "value": "ab", - "typeAnnotation": null, "optional": false } } @@ -383,8 +377,8 @@ "ctxt": 0 }, "value": "unused2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -409,7 +403,6 @@ "ctxt": 0 }, "value": "ab", - "typeAnnotation": null, "optional": false } }, @@ -428,7 +421,6 @@ "ctxt": 0 }, "value": "ab", - "typeAnnotation": null, "optional": false } } @@ -463,8 +455,8 @@ "ctxt": 0 }, "value": "unused3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -484,7 +476,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -512,7 +503,6 @@ "ctxt": 0 }, "value": "abq", - "typeAnnotation": null, "optional": false } } @@ -547,8 +537,8 @@ "ctxt": 0 }, "value": "unused4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -573,7 +563,6 @@ "ctxt": 0 }, "value": "ab", - "typeAnnotation": null, "optional": false } }, @@ -587,7 +576,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -631,8 +619,8 @@ "ctxt": 0 }, "value": "unused5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -657,7 +645,6 @@ "ctxt": 0 }, "value": "abq", - "typeAnnotation": null, "optional": false } }, @@ -671,7 +658,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -700,7 +686,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -721,6 +706,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -752,7 +738,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -799,8 +784,7 @@ } ] } - }, - "optional": false + } } } ], @@ -843,7 +827,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -871,7 +854,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -895,7 +877,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -916,6 +897,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -955,7 +937,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -994,8 +975,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1038,7 +1018,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1066,7 +1045,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -1090,7 +1068,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1111,6 +1088,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1150,7 +1128,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1202,7 +1179,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1232,8 +1208,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1276,7 +1251,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1304,7 +1278,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -1328,7 +1301,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1349,6 +1321,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1365,8 +1338,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -1385,6 +1357,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1416,7 +1389,6 @@ "ctxt": 0 }, "value": "command", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1458,7 +1430,6 @@ "ctxt": 0 }, "value": "ok", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1486,8 +1457,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1530,7 +1500,6 @@ "ctxt": 0 }, "value": "command", - "typeAnnotation": null, "optional": false }, "value": { @@ -1577,7 +1546,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1588,7 +1556,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1623,7 +1590,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1682,7 +1648,6 @@ "ctxt": 0 }, "value": "command", - "typeAnnotation": null, "optional": false }, "value": { @@ -1728,7 +1693,6 @@ "ctxt": 0 }, "value": "command", - "typeAnnotation": null, "optional": false }, "value": { @@ -1769,7 +1733,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1790,6 +1753,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1821,7 +1785,6 @@ "ctxt": 0 }, "value": "command", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1863,7 +1826,6 @@ "ctxt": 0 }, "value": "ok", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1891,8 +1853,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1935,7 +1896,6 @@ "ctxt": 0 }, "value": "command", - "typeAnnotation": null, "optional": false }, "value": { @@ -1978,7 +1938,6 @@ "ctxt": 0 }, "value": "spoiler", - "typeAnnotation": null, "optional": false }, "value": { @@ -2004,7 +1963,6 @@ "ctxt": 0 }, "value": "spoiler2", - "typeAnnotation": null, "optional": false }, "value": { @@ -2032,7 +1990,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -2056,7 +2013,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2077,6 +2033,7 @@ "ctxt": 0 }, "value": "anyrequired", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2108,7 +2065,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2136,8 +2092,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2180,7 +2135,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2213,7 +2167,6 @@ "ctxt": 0 }, "value": "anyrequired", - "typeAnnotation": null, "optional": false } } @@ -2237,7 +2190,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2258,6 +2210,7 @@ "ctxt": 0 }, "value": "anyoptional", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2289,7 +2242,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2317,8 +2269,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2361,7 +2312,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2394,7 +2344,6 @@ "ctxt": 0 }, "value": "anyoptional", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/spread/spreadTypeVariable/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/spread/spreadTypeVariable/input.ts.json index 7b8b6b588224..6e10aa41185d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/spread/spreadTypeVariable/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/spread/spreadTypeVariable/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -113,7 +111,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false } } @@ -147,7 +144,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -175,7 +171,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -196,6 +191,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -218,13 +214,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -272,7 +266,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false } } @@ -306,7 +299,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -342,7 +334,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -363,6 +354,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -385,13 +377,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -439,7 +429,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false } } @@ -473,7 +462,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -528,7 +516,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -549,6 +536,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -571,13 +559,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -625,7 +611,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false } } @@ -659,7 +644,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -698,6 +682,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -714,8 +699,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -762,7 +746,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -783,6 +766,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -805,13 +789,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -859,7 +841,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false } } @@ -893,7 +874,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -940,6 +920,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -956,8 +937,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1004,7 +984,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1025,6 +1004,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1047,13 +1027,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1101,7 +1079,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false } } @@ -1135,7 +1112,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/spread/spreadUnion/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/spread/spreadUnion/input.ts.json index 9ef98106b57c..3ea605d45a32 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/spread/spreadUnion/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/spread/spreadUnion/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "union", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -70,7 +71,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -122,7 +122,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -152,8 +151,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -185,6 +183,7 @@ "ctxt": 0 }, "value": "o3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -224,7 +223,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -276,7 +274,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -306,8 +303,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -339,8 +335,8 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -365,7 +361,6 @@ "ctxt": 0 }, "value": "union", - "typeAnnotation": null, "optional": false } } @@ -400,6 +395,7 @@ "ctxt": 0 }, "value": "o4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -439,7 +435,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -491,7 +486,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -533,7 +527,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -563,8 +556,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -596,8 +588,8 @@ "ctxt": 0 }, "value": "o4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -622,7 +614,6 @@ "ctxt": 0 }, "value": "union", - "typeAnnotation": null, "optional": false } }, @@ -636,7 +627,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -680,6 +670,7 @@ "ctxt": 0 }, "value": "o5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -719,7 +710,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -771,7 +761,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -823,7 +812,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -865,7 +853,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -895,8 +882,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -928,8 +914,8 @@ "ctxt": 0 }, "value": "o5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -954,7 +940,6 @@ "ctxt": 0 }, "value": "union", - "typeAnnotation": null, "optional": false } }, @@ -973,7 +958,6 @@ "ctxt": 0 }, "value": "union", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/spread/spreadUnion2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/spread/spreadUnion2/input.ts.json index 3c50d7549846..6173da62c0c9 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/spread/spreadUnion2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/spread/spreadUnion2/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "undefinedUnion", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -70,7 +71,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -109,8 +109,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -142,6 +141,7 @@ "ctxt": 0 }, "value": "nullUnion", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -181,7 +181,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -220,8 +219,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -253,6 +251,7 @@ "ctxt": 0 }, "value": "o1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -301,7 +300,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -331,8 +329,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -364,8 +361,8 @@ "ctxt": 0 }, "value": "o1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -390,7 +387,6 @@ "ctxt": 0 }, "value": "undefinedUnion", - "typeAnnotation": null, "optional": false } } @@ -425,6 +421,7 @@ "ctxt": 0 }, "value": "o2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -473,7 +470,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -503,8 +499,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -536,8 +531,8 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -562,7 +557,6 @@ "ctxt": 0 }, "value": "nullUnion", - "typeAnnotation": null, "optional": false } } @@ -597,6 +591,7 @@ "ctxt": 0 }, "value": "o3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -645,7 +640,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -697,7 +691,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -749,7 +742,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -791,7 +783,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -821,8 +812,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -854,8 +844,8 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -880,7 +870,6 @@ "ctxt": 0 }, "value": "undefinedUnion", - "typeAnnotation": null, "optional": false } }, @@ -899,7 +888,6 @@ "ctxt": 0 }, "value": "nullUnion", - "typeAnnotation": null, "optional": false } } @@ -934,8 +922,8 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -960,7 +948,6 @@ "ctxt": 0 }, "value": "nullUnion", - "typeAnnotation": null, "optional": false } }, @@ -979,7 +966,6 @@ "ctxt": 0 }, "value": "undefinedUnion", - "typeAnnotation": null, "optional": false } } @@ -1014,6 +1000,7 @@ "ctxt": 0 }, "value": "o4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1062,7 +1049,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1092,8 +1078,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1125,8 +1110,8 @@ "ctxt": 0 }, "value": "o4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1151,7 +1136,6 @@ "ctxt": 0 }, "value": "undefinedUnion", - "typeAnnotation": null, "optional": false } }, @@ -1170,7 +1154,6 @@ "ctxt": 0 }, "value": "undefinedUnion", - "typeAnnotation": null, "optional": false } } @@ -1205,6 +1188,7 @@ "ctxt": 0 }, "value": "o5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1253,7 +1237,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1283,8 +1266,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1316,8 +1298,8 @@ "ctxt": 0 }, "value": "o5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1342,7 +1324,6 @@ "ctxt": 0 }, "value": "nullUnion", - "typeAnnotation": null, "optional": false } }, @@ -1361,7 +1342,6 @@ "ctxt": 0 }, "value": "nullUnion", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/spread/spreadUnion3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/spread/spreadUnion3/input.ts.json index 88b548cad8db..c269b243bf9d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/spread/spreadUnion3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/spread/spreadUnion3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -76,7 +76,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -115,8 +114,7 @@ } ] } - }, - "optional": false + } } } ], @@ -159,7 +157,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -187,7 +184,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -230,7 +226,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -282,7 +277,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -296,7 +290,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -314,7 +307,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -335,6 +327,7 @@ "ctxt": 0 }, "value": "t", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -374,7 +367,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -413,8 +405,7 @@ } ] } - }, - "optional": true + } } } ], @@ -457,8 +448,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -483,7 +474,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -518,6 +508,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -534,8 +525,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -552,7 +542,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -563,7 +552,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -617,7 +605,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -646,7 +633,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -660,7 +646,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -690,7 +675,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -734,6 +718,7 @@ "ctxt": 0 }, "value": "nullAndUndefinedUnion", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -769,8 +754,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -802,8 +786,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -828,7 +812,6 @@ "ctxt": 0 }, "value": "nullAndUndefinedUnion", - "typeAnnotation": null, "optional": false } }, @@ -847,7 +830,6 @@ "ctxt": 0 }, "value": "nullAndUndefinedUnion", - "typeAnnotation": null, "optional": false } } @@ -882,8 +864,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -908,7 +890,6 @@ "ctxt": 0 }, "value": "nullAndUndefinedUnion", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralCheckedInIf01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralCheckedInIf01/input.ts.json index eb545f48019b..297ad6405940 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralCheckedInIf01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralCheckedInIf01/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -97,7 +96,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -131,7 +129,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -152,7 +149,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -170,7 +166,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -191,6 +186,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -213,13 +209,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -260,7 +254,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "right": { @@ -301,7 +294,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -330,7 +322,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "right": { @@ -371,7 +362,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -421,7 +411,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -446,7 +435,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralCheckedInIf02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralCheckedInIf02/input.ts.json index 1de7dca3a987..1dac46f0b640 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralCheckedInIf02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralCheckedInIf02/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -97,7 +96,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -131,7 +129,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -152,7 +149,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -170,7 +166,6 @@ "ctxt": 0 }, "value": "isS", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -191,6 +186,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -213,13 +209,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -268,7 +262,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -302,7 +295,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "right": { @@ -350,7 +342,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -375,7 +366,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -394,7 +384,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -415,6 +404,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -437,13 +427,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -483,7 +471,6 @@ "ctxt": 0 }, "value": "isS", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -497,7 +484,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -527,7 +513,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -563,7 +548,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralMatchedInSwitch01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralMatchedInSwitch01/input.ts.json index d87a58c5f3dc..41d11e3d272d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralMatchedInSwitch01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralMatchedInSwitch01/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -97,7 +96,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -131,7 +129,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -152,7 +149,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -185,6 +181,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -207,13 +204,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -235,7 +230,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -327,8 +321,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -359,7 +353,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -384,7 +377,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypeAssertion01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypeAssertion01/input.ts.json index df0c3218574e..c2efcf353d50 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypeAssertion01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypeAssertion01/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -97,7 +96,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -131,7 +129,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -152,7 +149,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -185,6 +181,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -207,13 +204,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -245,6 +240,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -267,13 +263,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -305,6 +299,7 @@ "ctxt": 0 }, "value": "str", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -321,8 +316,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -352,8 +346,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TsTypeAssertion", @@ -370,7 +364,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -388,7 +381,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -419,8 +411,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TsAsExpression", @@ -437,7 +429,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -455,7 +446,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -486,8 +476,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TsTypeAssertion", @@ -504,7 +494,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -522,7 +511,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -553,8 +541,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TsAsExpression", @@ -571,7 +559,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -589,7 +576,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -620,8 +606,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TsTypeAssertion", @@ -638,7 +624,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -656,7 +641,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -687,8 +671,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TsAsExpression", @@ -705,7 +689,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -723,7 +706,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -754,8 +736,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TsTypeAssertion", @@ -772,7 +754,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -790,7 +771,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -821,8 +801,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TsAsExpression", @@ -839,7 +819,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -857,7 +836,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -888,8 +866,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TsTypeAssertion", @@ -906,7 +884,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -944,8 +921,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TsAsExpression", @@ -962,7 +939,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1000,8 +976,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TsTypeAssertion", @@ -1018,7 +994,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1056,8 +1031,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "TsAsExpression", @@ -1074,7 +1049,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAndLogicalOrExpressions01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAndLogicalOrExpressions01/input.ts.json index abbd37a5c75e..0c11efde76ea 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAndLogicalOrExpressions01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAndLogicalOrExpressions01/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "myRandBool", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -74,6 +73,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -103,8 +103,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -149,8 +148,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -168,7 +167,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -215,6 +213,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -244,8 +243,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -255,7 +253,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "definite": false @@ -287,8 +284,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -306,7 +303,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -353,6 +349,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -414,8 +411,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -425,7 +421,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAndParenthesizedExpressions01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAndParenthesizedExpressions01/input.ts.json index b1945b3f5172..4f5427238684 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAndParenthesizedExpressions01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAndParenthesizedExpressions01/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "myRandBool", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -74,6 +73,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -103,8 +103,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ParenthesisExpression", @@ -157,6 +156,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -218,8 +218,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ParenthesisExpression", @@ -272,6 +271,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -301,8 +301,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ParenthesisExpression", @@ -326,7 +325,6 @@ "ctxt": 0 }, "value": "myRandBool", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -396,6 +394,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -457,8 +456,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ParenthesisExpression", @@ -482,7 +480,6 @@ "ctxt": 0 }, "value": "myRandBool", - "typeAnnotation": null, "optional": false }, "consequent": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAndTuples01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAndTuples01/input.ts.json index bf3f5a6084bd..ad77015e16dd 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAndTuples01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAndTuples01/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "hello", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "brave", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -61,8 +61,8 @@ "ctxt": 0 }, "value": "newish", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "world", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -177,7 +177,6 @@ "ctxt": 0 }, "value": "RexOrRaptor", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -269,8 +268,8 @@ "ctxt": 0 }, "value": "im", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -280,8 +279,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -291,8 +290,8 @@ "ctxt": 0 }, "value": "dinosaur", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -396,7 +395,6 @@ "ctxt": 0 }, "value": "RexOrRaptor", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -493,7 +491,6 @@ "ctxt": 0 }, "value": "rawr", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -507,7 +504,6 @@ "ctxt": 0 }, "value": "dinosaur", - "typeAnnotation": null, "optional": false } } @@ -525,7 +521,6 @@ "ctxt": 0 }, "value": "rawr", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -546,6 +541,7 @@ "ctxt": 0 }, "value": "dino", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -568,13 +564,11 @@ "ctxt": 0 }, "value": "RexOrRaptor", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -615,7 +609,6 @@ "ctxt": 0 }, "value": "dino", - "typeAnnotation": null, "optional": false }, "right": { @@ -690,7 +683,6 @@ "ctxt": 0 }, "value": "dino", - "typeAnnotation": null, "optional": false }, "right": { @@ -779,7 +771,6 @@ "ctxt": 0 }, "value": "dino", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAsTags01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAsTags01/input.ts.json index fd91092e66e1..1bc40d2d6791 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAsTags01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAsTags01/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -96,7 +95,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -126,7 +124,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -155,7 +152,6 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -181,7 +177,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -202,7 +197,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -232,7 +226,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -287,7 +280,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -331,7 +323,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -352,7 +343,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -382,7 +372,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -437,7 +426,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -476,7 +464,6 @@ "ctxt": 0 }, "value": "hasKind", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -497,6 +484,7 @@ "ctxt": 0 }, "value": "entity", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -519,13 +507,11 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -544,6 +530,7 @@ "ctxt": 0 }, "value": "kind", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -573,8 +560,7 @@ } } } - }, - "optional": false + } } } ], @@ -611,7 +597,6 @@ "ctxt": 0 }, "value": "entity", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -636,7 +621,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -655,7 +639,6 @@ "ctxt": 0 }, "value": "hasKind", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -676,6 +659,7 @@ "ctxt": 0 }, "value": "entity", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -698,13 +682,11 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -723,6 +705,7 @@ "ctxt": 0 }, "value": "kind", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -752,8 +735,7 @@ } } } - }, - "optional": false + } } } ], @@ -790,7 +772,6 @@ "ctxt": 0 }, "value": "entity", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -815,7 +796,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -834,7 +814,6 @@ "ctxt": 0 }, "value": "hasKind", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -855,6 +834,7 @@ "ctxt": 0 }, "value": "entity", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -877,13 +857,11 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -902,6 +880,7 @@ "ctxt": 0 }, "value": "kind", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -924,13 +903,11 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -967,7 +944,6 @@ "ctxt": 0 }, "value": "entity", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -992,7 +968,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1011,7 +986,6 @@ "ctxt": 0 }, "value": "hasKind", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1032,6 +1006,7 @@ "ctxt": 0 }, "value": "entity", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1054,13 +1029,11 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1079,6 +1052,7 @@ "ctxt": 0 }, "value": "kind", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1101,13 +1075,11 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1155,7 +1127,6 @@ "ctxt": 0 }, "value": "entity", - "typeAnnotation": null, "optional": false }, "property": { @@ -1166,7 +1137,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1179,7 +1149,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false } } @@ -1232,6 +1201,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1254,13 +1224,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1280,7 +1248,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "value": { @@ -1308,7 +1275,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1349,7 +1315,6 @@ "ctxt": 0 }, "value": "hasKind", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1363,7 +1328,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1420,8 +1384,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1431,7 +1395,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1473,8 +1436,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1484,7 +1447,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1524,7 +1486,6 @@ "ctxt": 0 }, "value": "hasKind", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1538,7 +1499,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1596,8 +1556,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1607,7 +1567,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1649,8 +1608,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1660,7 +1619,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAsTags02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAsTags02/input.ts.json index 65ae429df996..ffeca78d1a7c 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAsTags02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAsTags02/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -96,7 +95,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -126,7 +124,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -155,7 +152,6 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -181,7 +177,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -202,7 +197,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -232,7 +226,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -287,7 +280,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -331,7 +323,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -352,7 +343,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -382,7 +372,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -437,7 +426,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -476,7 +464,6 @@ "ctxt": 0 }, "value": "hasKind", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -497,6 +484,7 @@ "ctxt": 0 }, "value": "entity", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -519,13 +507,11 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -544,6 +530,7 @@ "ctxt": 0 }, "value": "kind", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -573,8 +560,7 @@ } } } - }, - "optional": false + } } } ], @@ -611,7 +597,6 @@ "ctxt": 0 }, "value": "entity", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -636,7 +621,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -655,7 +639,6 @@ "ctxt": 0 }, "value": "hasKind", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -676,6 +659,7 @@ "ctxt": 0 }, "value": "entity", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -698,13 +682,11 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -723,6 +705,7 @@ "ctxt": 0 }, "value": "kind", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -752,8 +735,7 @@ } } } - }, - "optional": false + } } } ], @@ -790,7 +772,6 @@ "ctxt": 0 }, "value": "entity", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -815,7 +796,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -834,7 +814,6 @@ "ctxt": 0 }, "value": "hasKind", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -855,6 +834,7 @@ "ctxt": 0 }, "value": "entity", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -877,13 +857,11 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -902,6 +880,7 @@ "ctxt": 0 }, "value": "kind", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -924,13 +903,11 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -978,7 +955,6 @@ "ctxt": 0 }, "value": "entity", - "typeAnnotation": null, "optional": false }, "property": { @@ -989,7 +965,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1002,7 +977,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false } } @@ -1035,7 +1009,6 @@ "ctxt": 0 }, "value": "entity", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1075,7 +1048,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1095,7 +1067,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1132,6 +1103,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1154,13 +1126,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1180,7 +1150,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "value": { @@ -1208,7 +1177,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1249,7 +1217,6 @@ "ctxt": 0 }, "value": "hasKind", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1263,7 +1230,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1320,8 +1286,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1331,7 +1297,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1373,8 +1338,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1384,7 +1349,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1424,7 +1388,6 @@ "ctxt": 0 }, "value": "hasKind", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1438,7 +1401,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1496,8 +1458,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1507,7 +1469,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1549,8 +1510,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1560,7 +1521,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAsTags03/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAsTags03/input.ts.json index 334a5ad0fdd4..7c32cf3abf5d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAsTags03/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAsTags03/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -96,7 +95,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -126,7 +124,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -155,7 +152,6 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -181,7 +177,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -202,7 +197,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -232,7 +226,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -287,7 +280,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -331,7 +323,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -352,7 +343,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -382,7 +372,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -437,7 +426,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -476,7 +464,6 @@ "ctxt": 0 }, "value": "hasKind", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -497,6 +484,7 @@ "ctxt": 0 }, "value": "entity", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -519,13 +507,11 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -544,6 +530,7 @@ "ctxt": 0 }, "value": "kind", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -605,8 +592,7 @@ } ] } - }, - "optional": false + } } } ], @@ -643,7 +629,6 @@ "ctxt": 0 }, "value": "entity", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -668,7 +653,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -687,7 +671,6 @@ "ctxt": 0 }, "value": "hasKind", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -708,6 +691,7 @@ "ctxt": 0 }, "value": "entity", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -730,13 +714,11 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -755,6 +737,7 @@ "ctxt": 0 }, "value": "kind", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -816,8 +799,7 @@ } ] } - }, - "optional": false + } } } ], @@ -854,7 +836,6 @@ "ctxt": 0 }, "value": "entity", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -879,7 +860,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -898,7 +878,6 @@ "ctxt": 0 }, "value": "hasKind", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -919,6 +898,7 @@ "ctxt": 0 }, "value": "entity", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -941,13 +921,11 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -966,6 +944,7 @@ "ctxt": 0 }, "value": "kind", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -988,13 +967,11 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1042,7 +1019,6 @@ "ctxt": 0 }, "value": "entity", - "typeAnnotation": null, "optional": false }, "property": { @@ -1053,7 +1029,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1066,7 +1041,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false } } @@ -1099,7 +1073,6 @@ "ctxt": 0 }, "value": "entity", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1124,7 +1097,6 @@ "ctxt": 0 }, "value": "Entity", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1158,6 +1130,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1180,13 +1153,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1206,7 +1177,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "value": { @@ -1234,7 +1204,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1275,7 +1244,6 @@ "ctxt": 0 }, "value": "hasKind", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1289,7 +1257,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1346,8 +1313,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1357,7 +1324,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1399,8 +1365,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1410,7 +1376,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1450,7 +1415,6 @@ "ctxt": 0 }, "value": "hasKind", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1464,7 +1428,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1522,8 +1485,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1533,7 +1496,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1575,8 +1537,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1586,7 +1548,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01/input.ts.json index 78785103fcfd..39657e395a59 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -82,13 +83,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -114,15 +113,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -155,7 +152,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -186,7 +182,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -227,7 +222,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -248,6 +242,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -271,6 +266,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -293,13 +289,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -325,15 +319,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -366,7 +358,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -397,7 +388,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -485,8 +475,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -503,7 +493,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -525,8 +514,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -537,7 +526,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -578,8 +566,8 @@ "ctxt": 0 }, "value": "fResult", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -596,7 +584,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -649,8 +636,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -667,7 +654,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -696,8 +682,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -708,7 +694,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -750,8 +735,8 @@ "ctxt": 0 }, "value": "gResult", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -768,7 +753,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -821,8 +805,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -839,7 +823,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -861,8 +844,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -873,7 +856,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -914,8 +896,8 @@ "ctxt": 0 }, "value": "hResult", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -932,7 +914,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -983,8 +964,8 @@ "ctxt": 0 }, "value": "hResult", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -1001,7 +982,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint02/input.ts.json index 66a291fa7b75..e49205c79357 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint02/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -82,13 +83,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -114,15 +113,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -155,7 +152,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -186,7 +182,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -242,8 +237,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -260,7 +255,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -282,6 +276,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -343,8 +338,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -370,7 +364,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -396,7 +389,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -452,8 +444,8 @@ "ctxt": 0 }, "value": "fResult", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -470,7 +462,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesInUnionTypes01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesInUnionTypes01/input.ts.json index e7ffadc5afcf..9af6b06eb5d4 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesInUnionTypes01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesInUnionTypes01/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -128,6 +127,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -211,8 +211,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -222,7 +221,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -254,6 +252,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -276,13 +275,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -292,7 +289,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -322,7 +318,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -373,8 +368,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -384,7 +379,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -416,7 +410,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -467,8 +460,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -486,7 +479,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -497,7 +489,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -540,8 +531,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -551,7 +542,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -583,8 +573,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -594,7 +584,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -626,6 +615,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -663,7 +653,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -690,15 +679,13 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -716,7 +703,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -727,7 +713,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -762,8 +747,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -773,7 +758,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -801,8 +785,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -812,7 +796,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesInUnionTypes02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesInUnionTypes02/input.ts.json index ea5df11c01be..2a007c0b36a0 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesInUnionTypes02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesInUnionTypes02/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -137,6 +136,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -229,8 +229,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -240,7 +239,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -272,6 +270,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -294,13 +293,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -310,7 +307,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -340,7 +336,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -391,8 +386,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -402,7 +397,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -434,7 +428,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -485,8 +478,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -504,7 +497,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -515,7 +507,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -558,8 +549,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -569,7 +560,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -601,8 +591,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -612,7 +602,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -644,6 +633,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -681,7 +671,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -708,15 +697,13 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -734,7 +721,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -745,7 +731,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -780,8 +765,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -791,7 +776,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -819,8 +803,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -830,7 +814,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesInUnionTypes03/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesInUnionTypes03/input.ts.json index 86a7f7103b76..f3dba9484f7e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesInUnionTypes03/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesInUnionTypes03/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -115,6 +114,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -185,8 +185,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -218,6 +217,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -240,13 +240,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -256,7 +254,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -286,7 +283,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -337,8 +333,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -348,7 +344,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -380,7 +375,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -431,8 +425,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -450,7 +444,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -461,7 +454,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -504,8 +496,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -515,7 +507,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -547,8 +538,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -558,7 +549,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -590,6 +580,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -627,7 +618,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -654,15 +644,13 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -680,7 +668,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -691,7 +678,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -726,8 +712,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -737,7 +723,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -765,8 +750,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -776,7 +761,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesInUnionTypes04/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesInUnionTypes04/input.ts.json index 08400f8acc3e..45bf9aa4272c 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesInUnionTypes04/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesInUnionTypes04/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -106,6 +105,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -128,13 +128,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -144,7 +142,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -176,6 +173,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -198,13 +196,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -214,7 +210,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -244,7 +239,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -295,8 +289,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -306,7 +300,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -340,7 +333,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -391,8 +383,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -402,7 +394,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -436,7 +427,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -487,8 +477,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -498,7 +488,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -532,7 +521,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -583,8 +571,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -594,7 +582,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -620,7 +607,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -656,8 +642,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -667,7 +653,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -701,7 +686,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -738,8 +722,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -749,7 +733,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -791,7 +774,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -829,8 +811,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -840,7 +822,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -890,7 +871,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -929,8 +909,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -940,7 +920,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloadAssignability01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloadAssignability01/input.ts.json index 37175377f796..f4021e784ac2 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloadAssignability01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloadAssignability01/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +66,7 @@ } } } - }, - "optional": false + } } } ], @@ -109,7 +108,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -130,6 +128,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -146,8 +145,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -215,7 +213,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -236,6 +233,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -265,8 +263,7 @@ } } } - }, - "optional": false + } } } ], @@ -308,7 +305,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -329,6 +325,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -345,8 +342,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -429,8 +425,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -440,7 +436,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "definite": false @@ -472,8 +467,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -483,7 +478,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "definite": false @@ -513,8 +507,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -524,7 +518,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -552,8 +545,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -563,7 +556,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloadAssignability02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloadAssignability02/input.ts.json index a06029c35f2e..0403d8e3be90 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloadAssignability02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloadAssignability02/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +66,7 @@ } } } - }, - "optional": false + } } } ], @@ -109,7 +108,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -130,6 +128,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -159,8 +158,7 @@ } } } - }, - "optional": false + } } } ], @@ -228,7 +226,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -249,6 +246,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -278,8 +276,7 @@ } } } - }, - "optional": false + } } } ], @@ -321,7 +318,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -342,6 +338,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +368,7 @@ } } } - }, - "optional": false + } } } ], @@ -455,8 +451,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -466,7 +462,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "definite": false @@ -498,8 +493,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -509,7 +504,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "definite": false @@ -539,8 +533,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -550,7 +544,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -578,8 +571,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -589,7 +582,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloadAssignability03/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloadAssignability03/input.ts.json index 33f0b5389bd8..6f55ee97053b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloadAssignability03/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloadAssignability03/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +66,7 @@ } } } - }, - "optional": false + } } } ], @@ -109,7 +108,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -130,6 +128,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -146,8 +145,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -215,7 +213,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -236,6 +233,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -265,8 +263,7 @@ } } } - }, - "optional": false + } } } ], @@ -308,7 +305,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -329,6 +325,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -345,8 +342,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -429,8 +425,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -440,7 +436,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "definite": false @@ -472,8 +467,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -483,7 +478,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "definite": false @@ -513,8 +507,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -524,7 +518,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -552,8 +545,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -563,7 +556,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloadAssignability04/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloadAssignability04/input.ts.json index 11dfdf6765fa..b23ea3fd88e0 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloadAssignability04/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloadAssignability04/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +66,7 @@ } } } - }, - "optional": false + } } } ], @@ -109,7 +108,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -130,6 +128,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -159,8 +158,7 @@ } } } - }, - "optional": false + } } } ], @@ -228,7 +226,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -249,6 +246,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -278,8 +276,7 @@ } } } - }, - "optional": false + } } } ], @@ -321,7 +318,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -342,6 +338,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +368,7 @@ } } } - }, - "optional": false + } } } ], @@ -455,8 +451,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -466,7 +462,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "definite": false @@ -498,8 +493,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -509,7 +504,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "definite": false @@ -539,8 +533,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -550,7 +544,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -578,8 +571,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -589,7 +582,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloadAssignability05/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloadAssignability05/input.ts.json index aa558b7b71cb..063f4aa87ea3 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloadAssignability05/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloadAssignability05/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +66,7 @@ } } } - }, - "optional": false + } } } ], @@ -109,7 +108,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -130,6 +128,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -146,8 +145,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -189,7 +187,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -210,6 +207,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -226,8 +224,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -295,7 +292,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -316,6 +312,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -345,8 +342,7 @@ } } } - }, - "optional": false + } } } ], @@ -388,7 +384,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -409,6 +404,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -425,8 +421,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -509,8 +504,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -520,7 +515,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "definite": false @@ -552,8 +546,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -563,7 +557,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "definite": false @@ -593,8 +586,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -604,7 +597,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -632,8 +624,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -643,7 +635,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloads01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloads01/input.ts.json index 63f4393d6afb..5da053306164 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloads01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloads01/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "PrimitiveName", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -113,7 +112,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -134,6 +132,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -163,8 +162,7 @@ } } } - }, - "optional": false + } } } ], @@ -206,7 +204,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -227,6 +224,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -256,8 +254,7 @@ } } } - }, - "optional": false + } } } ], @@ -299,7 +296,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -320,6 +316,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -349,8 +346,7 @@ } } } - }, - "optional": false + } } } ], @@ -392,7 +388,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -413,6 +408,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -474,8 +470,7 @@ } ] } - }, - "optional": false + } } } ], @@ -536,7 +531,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -557,6 +551,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -618,8 +613,7 @@ } ] } - }, - "optional": false + } } } ], @@ -680,7 +674,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -701,6 +694,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -762,8 +756,7 @@ } ] } - }, - "optional": false + } } } ], @@ -824,7 +817,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -845,6 +837,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -928,8 +921,7 @@ } ] } - }, - "optional": false + } } } ], @@ -999,7 +991,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1020,6 +1011,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1042,13 +1034,11 @@ "ctxt": 0 }, "value": "PrimitiveName", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1089,7 +1079,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1164,7 +1153,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1234,7 +1222,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1371,7 +1358,6 @@ "ctxt": 0 }, "value": "Consts1", - "typeAnnotation": null, "optional": false }, "body": { @@ -1407,8 +1393,8 @@ "ctxt": 0 }, "value": "EMPTY_STRING", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1425,7 +1411,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1478,8 +1463,8 @@ "ctxt": 0 }, "value": "ZERO", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1496,7 +1481,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1549,8 +1533,8 @@ "ctxt": 0 }, "value": "FALSE", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1567,7 +1551,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1623,6 +1606,7 @@ "ctxt": 0 }, "value": "string", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1652,8 +1636,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -1698,6 +1681,7 @@ "ctxt": 0 }, "value": "number", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1727,8 +1711,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -1773,6 +1756,7 @@ "ctxt": 0 }, "value": "boolean", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1802,8 +1786,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -1848,8 +1831,8 @@ "ctxt": 0 }, "value": "stringOrNumber", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1867,7 +1850,6 @@ "ctxt": 0 }, "value": "string", - "typeAnnotation": null, "optional": false }, "right": { @@ -1878,7 +1860,6 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, "optional": false } }, @@ -1911,8 +1892,8 @@ "ctxt": 0 }, "value": "stringOrBoolean", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1930,7 +1911,6 @@ "ctxt": 0 }, "value": "string", - "typeAnnotation": null, "optional": false }, "right": { @@ -1941,7 +1921,6 @@ "ctxt": 0 }, "value": "boolean", - "typeAnnotation": null, "optional": false } }, @@ -1974,8 +1953,8 @@ "ctxt": 0 }, "value": "booleanOrNumber", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1993,7 +1972,6 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, "optional": false }, "right": { @@ -2004,7 +1982,6 @@ "ctxt": 0 }, "value": "boolean", - "typeAnnotation": null, "optional": false } }, @@ -2037,8 +2014,8 @@ "ctxt": 0 }, "value": "stringOrBooleanOrNumber", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2056,7 +2033,6 @@ "ctxt": 0 }, "value": "stringOrBoolean", - "typeAnnotation": null, "optional": false }, "right": { @@ -2067,7 +2043,6 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, "optional": false } }, @@ -2092,7 +2067,6 @@ "ctxt": 0 }, "value": "Consts2", - "typeAnnotation": null, "optional": false }, "body": { @@ -2128,8 +2102,8 @@ "ctxt": 0 }, "value": "EMPTY_STRING", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2146,7 +2120,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2160,7 +2133,6 @@ "ctxt": 0 }, "value": "string", - "typeAnnotation": null, "optional": false } } @@ -2196,8 +2168,8 @@ "ctxt": 0 }, "value": "ZERO", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2214,7 +2186,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2228,7 +2199,6 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, "optional": false } } @@ -2264,8 +2234,8 @@ "ctxt": 0 }, "value": "FALSE", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2282,7 +2252,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2296,7 +2265,6 @@ "ctxt": 0 }, "value": "boolean", - "typeAnnotation": null, "optional": false } } @@ -2332,8 +2300,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2350,7 +2318,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2364,7 +2331,6 @@ "ctxt": 0 }, "value": "stringOrNumber", - "typeAnnotation": null, "optional": false } } @@ -2400,8 +2366,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2418,7 +2384,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2432,7 +2397,6 @@ "ctxt": 0 }, "value": "stringOrBoolean", - "typeAnnotation": null, "optional": false } } @@ -2468,8 +2432,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2486,7 +2450,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2500,7 +2463,6 @@ "ctxt": 0 }, "value": "booleanOrNumber", - "typeAnnotation": null, "optional": false } } @@ -2536,8 +2498,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2554,7 +2516,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2568,7 +2529,6 @@ "ctxt": 0 }, "value": "stringOrBooleanOrNumber", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloads02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloads02/input.ts.json index 36f1a777a033..8a040f768ede 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloads02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloads02/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +66,7 @@ } } } - }, - "optional": false + } } } ], @@ -109,7 +108,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -130,6 +128,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -159,8 +158,7 @@ } } } - }, - "optional": false + } } } ], @@ -202,7 +200,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -223,6 +220,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -252,8 +250,7 @@ } } } - }, - "optional": false + } } } ], @@ -295,7 +292,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -316,6 +312,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -377,8 +374,7 @@ } ] } - }, - "optional": false + } } } ], @@ -439,7 +435,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -460,6 +455,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -521,8 +517,7 @@ } ] } - }, - "optional": false + } } } ], @@ -583,7 +578,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -604,6 +598,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -665,8 +660,7 @@ } ] } - }, - "optional": false + } } } ], @@ -727,7 +721,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -748,6 +741,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -831,8 +825,7 @@ } ] } - }, - "optional": false + } } } ], @@ -902,7 +895,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -923,6 +915,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -939,8 +932,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -981,7 +973,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1056,7 +1047,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1126,7 +1116,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1263,7 +1252,6 @@ "ctxt": 0 }, "value": "Consts1", - "typeAnnotation": null, "optional": false }, "body": { @@ -1299,8 +1287,8 @@ "ctxt": 0 }, "value": "EMPTY_STRING", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1317,7 +1305,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1370,8 +1357,8 @@ "ctxt": 0 }, "value": "ZERO", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1388,7 +1375,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1441,8 +1427,8 @@ "ctxt": 0 }, "value": "FALSE", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1459,7 +1445,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1515,8 +1500,8 @@ "ctxt": 0 }, "value": "string", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -1561,8 +1546,8 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -1607,8 +1592,8 @@ "ctxt": 0 }, "value": "boolean", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "StringLiteral", @@ -1653,8 +1638,8 @@ "ctxt": 0 }, "value": "stringOrNumber", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1672,7 +1657,6 @@ "ctxt": 0 }, "value": "string", - "typeAnnotation": null, "optional": false }, "right": { @@ -1683,7 +1667,6 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, "optional": false } }, @@ -1716,8 +1699,8 @@ "ctxt": 0 }, "value": "stringOrBoolean", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1735,7 +1718,6 @@ "ctxt": 0 }, "value": "string", - "typeAnnotation": null, "optional": false }, "right": { @@ -1746,7 +1728,6 @@ "ctxt": 0 }, "value": "boolean", - "typeAnnotation": null, "optional": false } }, @@ -1779,8 +1760,8 @@ "ctxt": 0 }, "value": "booleanOrNumber", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1798,7 +1779,6 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, "optional": false }, "right": { @@ -1809,7 +1789,6 @@ "ctxt": 0 }, "value": "boolean", - "typeAnnotation": null, "optional": false } }, @@ -1842,8 +1821,8 @@ "ctxt": 0 }, "value": "stringOrBooleanOrNumber", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1861,7 +1840,6 @@ "ctxt": 0 }, "value": "stringOrBoolean", - "typeAnnotation": null, "optional": false }, "right": { @@ -1872,7 +1850,6 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, "optional": false } }, @@ -1897,7 +1874,6 @@ "ctxt": 0 }, "value": "Consts2", - "typeAnnotation": null, "optional": false }, "body": { @@ -1933,8 +1909,8 @@ "ctxt": 0 }, "value": "EMPTY_STRING", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1951,7 +1927,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1965,7 +1940,6 @@ "ctxt": 0 }, "value": "string", - "typeAnnotation": null, "optional": false } } @@ -2001,8 +1975,8 @@ "ctxt": 0 }, "value": "ZERO", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2019,7 +1993,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2033,7 +2006,6 @@ "ctxt": 0 }, "value": "number", - "typeAnnotation": null, "optional": false } } @@ -2069,8 +2041,8 @@ "ctxt": 0 }, "value": "FALSE", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2087,7 +2059,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2101,7 +2072,6 @@ "ctxt": 0 }, "value": "boolean", - "typeAnnotation": null, "optional": false } } @@ -2137,8 +2107,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2155,7 +2125,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2169,7 +2138,6 @@ "ctxt": 0 }, "value": "stringOrNumber", - "typeAnnotation": null, "optional": false } } @@ -2205,8 +2173,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2223,7 +2191,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2237,7 +2204,6 @@ "ctxt": 0 }, "value": "stringOrBoolean", - "typeAnnotation": null, "optional": false } } @@ -2273,8 +2239,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2291,7 +2257,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2305,7 +2270,6 @@ "ctxt": 0 }, "value": "booleanOrNumber", - "typeAnnotation": null, "optional": false } } @@ -2341,8 +2305,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2359,7 +2323,6 @@ "ctxt": 0 }, "value": "getFalsyPrimitive", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2373,7 +2336,6 @@ "ctxt": 0 }, "value": "stringOrBooleanOrNumber", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloads03/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloads03/input.ts.json index 8d662a8ba6e6..a9f91aab0102 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloads03/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloads03/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -137,7 +134,6 @@ "ctxt": 0 }, "value": "HelloOrWorld", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -158,7 +154,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -188,7 +183,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -232,7 +226,6 @@ "ctxt": 0 }, "value": "JustHello", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -253,7 +246,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -283,7 +275,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -327,7 +318,6 @@ "ctxt": 0 }, "value": "JustWorld", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -348,7 +338,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -378,7 +367,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -432,6 +420,7 @@ "ctxt": 0 }, "value": "hello", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -461,8 +450,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -494,6 +482,7 @@ "ctxt": 0 }, "value": "world", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -523,8 +512,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -556,6 +544,7 @@ "ctxt": 0 }, "value": "helloOrWorld", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -617,8 +606,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -635,7 +623,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -656,6 +643,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -685,8 +673,7 @@ } } } - }, - "optional": false + } } } ], @@ -722,7 +709,6 @@ "ctxt": 0 }, "value": "JustHello", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -739,7 +725,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -760,6 +745,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -821,8 +807,7 @@ } ] } - }, - "optional": false + } } } ], @@ -858,7 +843,6 @@ "ctxt": 0 }, "value": "HelloOrWorld", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -875,7 +859,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -896,6 +879,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -925,8 +909,7 @@ } } } - }, - "optional": false + } } } ], @@ -962,7 +945,6 @@ "ctxt": 0 }, "value": "JustWorld", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -979,7 +961,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1000,6 +981,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1016,8 +998,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1053,7 +1034,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1070,7 +1050,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1103,8 +1082,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1163,7 +1142,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1215,8 +1193,8 @@ "ctxt": 0 }, "value": "fResult1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1233,7 +1211,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1247,7 +1224,6 @@ "ctxt": 0 }, "value": "hello", - "typeAnnotation": null, "optional": false } } @@ -1283,8 +1259,8 @@ "ctxt": 0 }, "value": "fResult2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1301,7 +1277,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1315,7 +1290,6 @@ "ctxt": 0 }, "value": "world", - "typeAnnotation": null, "optional": false } } @@ -1351,8 +1325,8 @@ "ctxt": 0 }, "value": "fResult3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1369,7 +1343,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1383,7 +1356,6 @@ "ctxt": 0 }, "value": "helloOrWorld", - "typeAnnotation": null, "optional": false } } @@ -1404,7 +1376,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1425,6 +1396,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1441,8 +1413,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1478,7 +1449,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1495,7 +1465,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1516,6 +1485,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1545,8 +1515,7 @@ } } } - }, - "optional": false + } } } ], @@ -1582,7 +1551,6 @@ "ctxt": 0 }, "value": "JustHello", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1599,7 +1567,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1620,6 +1587,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1681,8 +1649,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1718,7 +1685,6 @@ "ctxt": 0 }, "value": "HelloOrWorld", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1735,7 +1701,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1756,6 +1721,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1785,8 +1751,7 @@ } } } - }, - "optional": false + } } } ], @@ -1822,7 +1787,6 @@ "ctxt": 0 }, "value": "JustWorld", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1839,7 +1803,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1872,8 +1835,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1932,7 +1895,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1984,8 +1946,8 @@ "ctxt": 0 }, "value": "gResult1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2002,7 +1964,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2016,7 +1977,6 @@ "ctxt": 0 }, "value": "hello", - "typeAnnotation": null, "optional": false } } @@ -2052,8 +2012,8 @@ "ctxt": 0 }, "value": "gResult2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2070,7 +2030,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2084,7 +2043,6 @@ "ctxt": 0 }, "value": "world", - "typeAnnotation": null, "optional": false } } @@ -2120,8 +2078,8 @@ "ctxt": 0 }, "value": "gResult3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2138,7 +2096,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2152,7 +2109,6 @@ "ctxt": 0 }, "value": "helloOrWorld", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloads04/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloads04/input.ts.json index c1f1d2656187..0a1a332b4a0f 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloads04/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloads04/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,6 +60,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,8 +122,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -157,8 +157,7 @@ } } } - }, - "optional": false + } } } ], @@ -196,7 +195,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -218,8 +216,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -255,8 +253,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AssignmentExpression", @@ -274,8 +272,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -311,7 +309,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloads05/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloads05/input.ts.json index d51fe33c77dc..1d6d2122f737 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloads05/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesOverloads05/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Animal", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "animal", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -103,7 +101,6 @@ "ctxt": 0 }, "value": "Dog", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -124,7 +121,6 @@ "ctxt": 0 }, "value": "Animal", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -154,7 +150,6 @@ "ctxt": 0 }, "value": "dog", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -198,7 +193,6 @@ "ctxt": 0 }, "value": "Cat", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -219,7 +213,6 @@ "ctxt": 0 }, "value": "Animal", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -249,7 +242,6 @@ "ctxt": 0 }, "value": "cat", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -293,7 +285,6 @@ "ctxt": 0 }, "value": "Moose", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -314,7 +305,6 @@ "ctxt": 0 }, "value": "Animal", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -344,7 +334,6 @@ "ctxt": 0 }, "value": "moose", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -383,7 +372,6 @@ "ctxt": 0 }, "value": "doThing", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -404,6 +392,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -433,8 +422,7 @@ } } } - }, - "optional": false + } } } ], @@ -470,7 +458,6 @@ "ctxt": 0 }, "value": "Dog", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -487,7 +474,6 @@ "ctxt": 0 }, "value": "doThing", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -508,6 +494,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -537,8 +524,7 @@ } } } - }, - "optional": false + } } } ], @@ -574,7 +560,6 @@ "ctxt": 0 }, "value": "Cat", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -591,7 +576,6 @@ "ctxt": 0 }, "value": "doThing", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -612,6 +596,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -628,8 +613,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -665,7 +649,6 @@ "ctxt": 0 }, "value": "Animal", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -682,7 +665,6 @@ "ctxt": 0 }, "value": "doThing", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -703,6 +685,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -719,8 +702,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -739,6 +721,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -755,8 +738,7 @@ }, "kind": "string" } - }, - "optional": true + } } } ], @@ -789,7 +771,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -820,7 +801,6 @@ "ctxt": 0 }, "value": "Moose", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesTypePredicates01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesTypePredicates01/input.ts.json index 120ce419d660..73b6c2bebb9f 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesTypePredicates01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesTypePredicates01/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -91,7 +90,6 @@ "ctxt": 0 }, "value": "kindIs", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -112,6 +110,7 @@ "ctxt": 0 }, "value": "kind", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -134,13 +133,11 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -159,6 +156,7 @@ "ctxt": 0 }, "value": "is", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -188,8 +186,7 @@ } } } - }, - "optional": false + } } } ], @@ -226,7 +223,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -272,7 +268,6 @@ "ctxt": 0 }, "value": "kindIs", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -293,6 +288,7 @@ "ctxt": 0 }, "value": "kind", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -315,13 +311,11 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -340,6 +334,7 @@ "ctxt": 0 }, "value": "is", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -369,8 +364,7 @@ } } } - }, - "optional": false + } } } ], @@ -407,7 +401,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -453,7 +446,6 @@ "ctxt": 0 }, "value": "kindIs", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -474,6 +466,7 @@ "ctxt": 0 }, "value": "kind", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -496,13 +489,11 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -521,6 +512,7 @@ "ctxt": 0 }, "value": "is", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -543,13 +535,11 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -590,7 +580,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "right": { @@ -601,7 +590,6 @@ "ctxt": 0 }, "value": "is", - "typeAnnotation": null, "optional": false } } @@ -654,6 +642,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -676,13 +665,11 @@ "ctxt": 0 }, "value": "Kind", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -692,7 +679,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -721,7 +707,6 @@ "ctxt": 0 }, "value": "kindIs", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -735,7 +720,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -792,8 +776,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -803,7 +787,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -845,8 +828,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -856,7 +839,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -896,7 +878,6 @@ "ctxt": 0 }, "value": "kindIs", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -910,7 +891,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -968,8 +948,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -979,7 +959,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1021,8 +1000,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -1032,7 +1011,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesWithTemplateStrings01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesWithTemplateStrings01/input.ts.json index fd8d8d8cf4c1..b7c5f167ad45 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesWithTemplateStrings01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesWithTemplateStrings01/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "ABC", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,8 +61,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "TemplateLiteral", @@ -140,6 +140,7 @@ "ctxt": 0 }, "value": "DE_NEWLINE_F", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -169,8 +170,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "TemplateLiteral", @@ -249,6 +249,7 @@ "ctxt": 0 }, "value": "G_QUOTE_HI", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -278,8 +279,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -311,6 +311,7 @@ "ctxt": 0 }, "value": "JK_BACKTICK_L", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -340,8 +341,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesWithTemplateStrings02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesWithTemplateStrings02/input.ts.json index 8eb71a00ab94..935bb29304ae 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesWithTemplateStrings02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesWithTemplateStrings02/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "abc", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,8 +61,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "TemplateLiteral", @@ -140,6 +140,7 @@ "ctxt": 0 }, "value": "de_NEWLINE_f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -169,8 +170,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "TemplateLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesWithVariousOperators01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesWithVariousOperators01/input.ts.json index 9f383b740435..679f0ab48987 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesWithVariousOperators01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesWithVariousOperators01/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "abc", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,8 +61,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -106,6 +106,7 @@ "ctxt": 0 }, "value": "xyz", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -135,8 +136,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -181,6 +181,7 @@ "ctxt": 0 }, "value": "abcOrXyz", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -242,8 +243,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -261,7 +261,6 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, "optional": false }, "right": { @@ -272,7 +271,6 @@ "ctxt": 0 }, "value": "xyz", - "typeAnnotation": null, "optional": false } }, @@ -305,6 +303,7 @@ "ctxt": 0 }, "value": "abcOrXyzOrNumber", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -375,8 +374,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -394,7 +392,6 @@ "ctxt": 0 }, "value": "abcOrXyz", - "typeAnnotation": null, "optional": false }, "right": { @@ -436,8 +433,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -469,7 +466,6 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, "optional": false } }, @@ -502,8 +498,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -521,7 +517,6 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, "optional": false }, "right": { @@ -568,8 +563,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -596,7 +591,6 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, "optional": false } }, @@ -629,8 +623,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -648,7 +642,6 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, "optional": false }, "right": { @@ -690,8 +683,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -709,7 +702,6 @@ "ctxt": 0 }, "value": "xyz", - "typeAnnotation": null, "optional": false }, "right": { @@ -720,7 +712,6 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, "optional": false } }, @@ -753,8 +744,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -772,7 +763,6 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, "optional": false }, "right": { @@ -783,7 +773,6 @@ "ctxt": 0 }, "value": "xyz", - "typeAnnotation": null, "optional": false } }, @@ -816,8 +805,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -844,7 +833,6 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, "optional": false } }, @@ -877,8 +865,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -896,7 +884,6 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, "optional": false }, "right": { @@ -938,8 +925,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -965,7 +952,6 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, "optional": false }, "right": { @@ -976,7 +962,6 @@ "ctxt": 0 }, "value": "abcOrXyz", - "typeAnnotation": null, "optional": false } }, @@ -988,7 +973,6 @@ "ctxt": 0 }, "value": "xyz", - "typeAnnotation": null, "optional": false } }, @@ -1021,8 +1005,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1040,7 +1024,6 @@ "ctxt": 0 }, "value": "abcOrXyz", - "typeAnnotation": null, "optional": false }, "right": { @@ -1051,7 +1034,6 @@ "ctxt": 0 }, "value": "abcOrXyz", - "typeAnnotation": null, "optional": false } }, @@ -1084,8 +1066,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1103,7 +1085,6 @@ "ctxt": 0 }, "value": "abcOrXyz", - "typeAnnotation": null, "optional": false } }, @@ -1136,8 +1117,8 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1155,7 +1136,6 @@ "ctxt": 0 }, "value": "abcOrXyz", - "typeAnnotation": null, "optional": false } }, @@ -1188,8 +1168,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1207,7 +1187,6 @@ "ctxt": 0 }, "value": "abcOrXyzOrNumber", - "typeAnnotation": null, "optional": false }, "right": { @@ -1254,8 +1233,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1287,7 +1266,6 @@ "ctxt": 0 }, "value": "abcOrXyzOrNumber", - "typeAnnotation": null, "optional": false } }, @@ -1320,8 +1298,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1339,7 +1317,6 @@ "ctxt": 0 }, "value": "abcOrXyzOrNumber", - "typeAnnotation": null, "optional": false }, "right": { @@ -1350,7 +1327,6 @@ "ctxt": 0 }, "value": "abcOrXyz", - "typeAnnotation": null, "optional": false } }, @@ -1383,8 +1359,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1402,7 +1378,6 @@ "ctxt": 0 }, "value": "abcOrXyz", - "typeAnnotation": null, "optional": false }, "right": { @@ -1413,7 +1388,6 @@ "ctxt": 0 }, "value": "abcOrXyzOrNumber", - "typeAnnotation": null, "optional": false } }, @@ -1446,8 +1420,8 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1465,7 +1439,6 @@ "ctxt": 0 }, "value": "abcOrXyzOrNumber", - "typeAnnotation": null, "optional": false } }, @@ -1498,8 +1471,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -1517,7 +1490,6 @@ "ctxt": 0 }, "value": "abcOrXyzOrNumber", - "typeAnnotation": null, "optional": false } }, @@ -1550,8 +1522,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1569,7 +1541,6 @@ "ctxt": 0 }, "value": "abcOrXyzOrNumber", - "typeAnnotation": null, "optional": false }, "right": { @@ -1580,7 +1551,6 @@ "ctxt": 0 }, "value": "abcOrXyzOrNumber", - "typeAnnotation": null, "optional": false } }, @@ -1613,8 +1583,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1632,7 +1602,6 @@ "ctxt": 0 }, "value": "abcOrXyzOrNumber", - "typeAnnotation": null, "optional": false }, "right": { @@ -1643,7 +1612,6 @@ "ctxt": 0 }, "value": "abcOrXyz", - "typeAnnotation": null, "optional": false } }, @@ -1676,8 +1644,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1695,7 +1663,6 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, "optional": false }, "right": { @@ -1706,7 +1673,6 @@ "ctxt": 0 }, "value": "abcOrXyz", - "typeAnnotation": null, "optional": false } }, @@ -1739,8 +1705,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1758,7 +1724,6 @@ "ctxt": 0 }, "value": "abcOrXyz", - "typeAnnotation": null, "optional": false }, "right": { @@ -1769,7 +1734,6 @@ "ctxt": 0 }, "value": "abcOrXyzOrNumber", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesWithVariousOperators02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesWithVariousOperators02/input.ts.json index ba1daa605e27..e4455522cecf 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesWithVariousOperators02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/stringLiteralTypesWithVariousOperators02/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "abc", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,8 +61,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -106,6 +106,7 @@ "ctxt": 0 }, "value": "xyz", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -135,8 +136,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "StringLiteral", @@ -181,6 +181,7 @@ "ctxt": 0 }, "value": "abcOrXyz", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -242,8 +243,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -261,7 +261,6 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, "optional": false }, "right": { @@ -272,7 +271,6 @@ "ctxt": 0 }, "value": "xyz", - "typeAnnotation": null, "optional": false } }, @@ -305,6 +303,7 @@ "ctxt": 0 }, "value": "abcOrXyzOrNumber", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -375,8 +374,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -394,7 +392,6 @@ "ctxt": 0 }, "value": "abcOrXyz", - "typeAnnotation": null, "optional": false }, "right": { @@ -436,8 +433,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -455,7 +452,6 @@ "ctxt": 0 }, "value": "abcOrXyzOrNumber", - "typeAnnotation": null, "optional": false }, "right": { @@ -497,8 +493,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -525,7 +521,6 @@ "ctxt": 0 }, "value": "abcOrXyzOrNumber", - "typeAnnotation": null, "optional": false } }, @@ -558,8 +553,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -577,7 +572,6 @@ "ctxt": 0 }, "value": "abcOrXyzOrNumber", - "typeAnnotation": null, "optional": false }, "right": { @@ -588,7 +582,6 @@ "ctxt": 0 }, "value": "abcOrXyzOrNumber", - "typeAnnotation": null, "optional": false } }, @@ -621,8 +614,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -640,7 +633,6 @@ "ctxt": 0 }, "value": "abcOrXyzOrNumber", - "typeAnnotation": null, "optional": false }, "right": { @@ -682,8 +674,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -710,7 +702,6 @@ "ctxt": 0 }, "value": "abcOrXyzOrNumber", - "typeAnnotation": null, "optional": false } }, @@ -743,8 +734,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -763,7 +754,6 @@ "ctxt": 0 }, "value": "abcOrXyzOrNumber", - "typeAnnotation": null, "optional": false } }, @@ -796,8 +786,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UpdateExpression", @@ -816,7 +806,6 @@ "ctxt": 0 }, "value": "abcOrXyzOrNumber", - "typeAnnotation": null, "optional": false } }, @@ -849,8 +838,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -868,7 +857,6 @@ "ctxt": 0 }, "value": "abcOrXyzOrNumber", - "typeAnnotation": null, "optional": false }, "right": { @@ -910,8 +898,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -929,7 +917,6 @@ "ctxt": 0 }, "value": "abcOrXyzOrNumber", - "typeAnnotation": null, "optional": false }, "right": { @@ -971,8 +958,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -990,7 +977,6 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, "optional": false }, "right": { @@ -1001,7 +987,6 @@ "ctxt": 0 }, "value": "xyz", - "typeAnnotation": null, "optional": false } }, @@ -1034,8 +1019,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1053,7 +1038,6 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, "optional": false }, "right": { @@ -1064,7 +1048,6 @@ "ctxt": 0 }, "value": "xyz", - "typeAnnotation": null, "optional": false } }, @@ -1097,8 +1080,8 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1116,7 +1099,6 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, "optional": false }, "right": { @@ -1127,7 +1109,6 @@ "ctxt": 0 }, "value": "xyz", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/typeArgumentsWithStringLiteralTypes01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/typeArgumentsWithStringLiteralTypes01/input.ts.json index 5223d312b327..2a7622b3bf82 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/typeArgumentsWithStringLiteralTypes01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/stringLiteral/typeArgumentsWithStringLiteralTypes01/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "randBool", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -59,7 +58,6 @@ "ctxt": 0 }, "value": "takeReturnString", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -80,6 +78,7 @@ "ctxt": 0 }, "value": "str", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +95,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -139,7 +137,6 @@ "ctxt": 0 }, "value": "takeReturnHello", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -160,6 +157,7 @@ "ctxt": 0 }, "value": "str", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -189,8 +187,7 @@ } } } - }, - "optional": false + } } } ], @@ -245,7 +242,6 @@ "ctxt": 0 }, "value": "takeReturnHelloWorld", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -266,6 +262,7 @@ "ctxt": 0 }, "value": "str", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -327,8 +324,7 @@ } ] } - }, - "optional": false + } } } ], @@ -415,7 +411,6 @@ "ctxt": 0 }, "value": "fun1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -436,6 +431,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -458,13 +454,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -483,6 +477,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,13 +500,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -558,7 +551,6 @@ "ctxt": 0 }, "value": "randBool", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -572,7 +564,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -583,7 +574,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -615,7 +605,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -635,7 +624,6 @@ "ctxt": 0 }, "value": "fun2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -656,6 +644,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -678,13 +667,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -703,6 +690,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -725,13 +713,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -778,7 +764,6 @@ "ctxt": 0 }, "value": "randBool", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -792,7 +777,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -803,7 +787,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -835,7 +818,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -856,7 +838,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -876,7 +857,6 @@ "ctxt": 0 }, "value": "fun3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -909,8 +889,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -941,7 +921,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -987,7 +966,6 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, "optional": false }, "property": { @@ -1013,7 +991,6 @@ "ctxt": 0 }, "value": "randBool", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1050,7 +1027,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1080,7 +1056,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1104,7 +1079,6 @@ "ctxt": 0 }, "value": "n1", - "typeAnnotation": null, "optional": false }, "body": { @@ -1147,8 +1121,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1165,7 +1139,6 @@ "ctxt": 0 }, "value": "fun1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1243,8 +1216,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1261,7 +1234,6 @@ "ctxt": 0 }, "value": "fun1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1339,8 +1311,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1357,7 +1329,6 @@ "ctxt": 0 }, "value": "fun2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1435,8 +1406,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1453,7 +1424,6 @@ "ctxt": 0 }, "value": "fun2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1531,8 +1501,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1549,7 +1519,6 @@ "ctxt": 0 }, "value": "fun3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1652,8 +1621,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -1670,7 +1639,6 @@ "ctxt": 0 }, "value": "takeReturnString", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1684,7 +1652,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1716,8 +1683,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -1734,7 +1701,6 @@ "ctxt": 0 }, "value": "takeReturnString", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1748,7 +1714,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1780,8 +1745,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -1798,7 +1763,6 @@ "ctxt": 0 }, "value": "takeReturnString", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1812,7 +1776,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1844,8 +1807,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -1862,7 +1825,6 @@ "ctxt": 0 }, "value": "takeReturnString", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1876,7 +1838,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -1908,8 +1869,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -1926,7 +1887,6 @@ "ctxt": 0 }, "value": "takeReturnString", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1940,7 +1900,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -1972,8 +1931,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -1990,7 +1949,6 @@ "ctxt": 0 }, "value": "takeReturnHello", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2004,7 +1962,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2036,8 +1993,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -2054,7 +2011,6 @@ "ctxt": 0 }, "value": "takeReturnHello", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2068,7 +2024,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2100,8 +2055,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -2118,7 +2073,6 @@ "ctxt": 0 }, "value": "takeReturnHello", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2132,7 +2086,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -2164,8 +2117,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -2182,7 +2135,6 @@ "ctxt": 0 }, "value": "takeReturnHello", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2196,7 +2148,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -2228,8 +2179,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -2246,7 +2197,6 @@ "ctxt": 0 }, "value": "takeReturnHello", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2260,7 +2210,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -2292,8 +2241,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -2310,7 +2259,6 @@ "ctxt": 0 }, "value": "takeReturnHelloWorld", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2324,7 +2272,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2356,8 +2303,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -2374,7 +2321,6 @@ "ctxt": 0 }, "value": "takeReturnHelloWorld", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2388,7 +2334,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2420,8 +2365,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -2438,7 +2383,6 @@ "ctxt": 0 }, "value": "takeReturnHelloWorld", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2452,7 +2396,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -2484,8 +2427,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -2502,7 +2445,6 @@ "ctxt": 0 }, "value": "takeReturnHelloWorld", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2516,7 +2458,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -2548,8 +2489,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -2566,7 +2507,6 @@ "ctxt": 0 }, "value": "takeReturnHelloWorld", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2580,7 +2520,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -2609,7 +2548,6 @@ "ctxt": 0 }, "value": "n2", - "typeAnnotation": null, "optional": false }, "body": { @@ -2652,8 +2590,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2670,7 +2608,6 @@ "ctxt": 0 }, "value": "fun1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2779,8 +2716,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2797,7 +2734,6 @@ "ctxt": 0 }, "value": "fun1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2906,8 +2842,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2924,7 +2860,6 @@ "ctxt": 0 }, "value": "fun2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3055,8 +2990,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3073,7 +3008,6 @@ "ctxt": 0 }, "value": "fun2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3204,8 +3138,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3222,7 +3156,6 @@ "ctxt": 0 }, "value": "fun3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3322,8 +3255,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -3340,7 +3273,6 @@ "ctxt": 0 }, "value": "takeReturnString", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3354,7 +3286,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3386,8 +3317,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -3404,7 +3335,6 @@ "ctxt": 0 }, "value": "takeReturnString", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3418,7 +3348,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -3450,8 +3379,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -3468,7 +3397,6 @@ "ctxt": 0 }, "value": "takeReturnString", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3482,7 +3410,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -3514,8 +3441,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -3532,7 +3459,6 @@ "ctxt": 0 }, "value": "takeReturnString", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3546,7 +3472,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -3578,8 +3503,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -3596,7 +3521,6 @@ "ctxt": 0 }, "value": "takeReturnString", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3610,7 +3534,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -3642,8 +3565,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -3660,7 +3583,6 @@ "ctxt": 0 }, "value": "takeReturnHello", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3674,7 +3596,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3706,8 +3627,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -3724,7 +3645,6 @@ "ctxt": 0 }, "value": "takeReturnHello", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3738,7 +3658,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -3770,8 +3689,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -3788,7 +3707,6 @@ "ctxt": 0 }, "value": "takeReturnHello", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3802,7 +3720,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -3834,8 +3751,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -3852,7 +3769,6 @@ "ctxt": 0 }, "value": "takeReturnHello", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3866,7 +3782,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -3898,8 +3813,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -3916,7 +3831,6 @@ "ctxt": 0 }, "value": "takeReturnHello", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3930,7 +3844,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -3962,8 +3875,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -3980,7 +3893,6 @@ "ctxt": 0 }, "value": "takeReturnHelloWorld", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3994,7 +3906,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4026,8 +3937,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -4044,7 +3955,6 @@ "ctxt": 0 }, "value": "takeReturnHelloWorld", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4058,7 +3968,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -4090,8 +3999,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -4108,7 +4017,6 @@ "ctxt": 0 }, "value": "takeReturnHelloWorld", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4122,7 +4030,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -4154,8 +4061,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -4172,7 +4079,6 @@ "ctxt": 0 }, "value": "takeReturnHelloWorld", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4186,7 +4092,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -4218,8 +4123,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -4236,7 +4141,6 @@ "ctxt": 0 }, "value": "takeReturnHelloWorld", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4250,7 +4154,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -4279,7 +4182,6 @@ "ctxt": 0 }, "value": "n3", - "typeAnnotation": null, "optional": false }, "body": { @@ -4322,8 +4224,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4340,7 +4242,6 @@ "ctxt": 0 }, "value": "fun2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4471,8 +4372,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4489,7 +4390,6 @@ "ctxt": 0 }, "value": "fun2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4620,8 +4520,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4638,7 +4538,6 @@ "ctxt": 0 }, "value": "fun2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4769,8 +4668,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4787,7 +4686,6 @@ "ctxt": 0 }, "value": "fun2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4918,8 +4816,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4936,7 +4834,6 @@ "ctxt": 0 }, "value": "fun3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5068,8 +4965,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -5086,7 +4983,6 @@ "ctxt": 0 }, "value": "takeReturnString", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5100,7 +4996,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -5132,8 +5027,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -5150,7 +5045,6 @@ "ctxt": 0 }, "value": "takeReturnString", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5164,7 +5058,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -5196,8 +5089,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -5214,7 +5107,6 @@ "ctxt": 0 }, "value": "takeReturnString", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5228,7 +5120,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -5260,8 +5151,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -5278,7 +5169,6 @@ "ctxt": 0 }, "value": "takeReturnString", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5292,7 +5182,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -5324,8 +5213,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -5342,7 +5231,6 @@ "ctxt": 0 }, "value": "takeReturnString", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5356,7 +5244,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -5388,8 +5275,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -5406,7 +5293,6 @@ "ctxt": 0 }, "value": "takeReturnHello", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5420,7 +5306,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -5452,8 +5337,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -5470,7 +5355,6 @@ "ctxt": 0 }, "value": "takeReturnHello", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5484,7 +5368,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -5516,8 +5399,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -5534,7 +5417,6 @@ "ctxt": 0 }, "value": "takeReturnHello", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5548,7 +5430,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -5580,8 +5461,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -5598,7 +5479,6 @@ "ctxt": 0 }, "value": "takeReturnHello", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5612,7 +5492,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -5644,8 +5523,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -5662,7 +5541,6 @@ "ctxt": 0 }, "value": "takeReturnHello", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5676,7 +5554,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -5708,8 +5585,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -5726,7 +5603,6 @@ "ctxt": 0 }, "value": "takeReturnHelloWorld", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5740,7 +5616,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -5772,8 +5647,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -5790,7 +5665,6 @@ "ctxt": 0 }, "value": "takeReturnHelloWorld", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5804,7 +5678,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -5836,8 +5709,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -5854,7 +5727,6 @@ "ctxt": 0 }, "value": "takeReturnHelloWorld", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5868,7 +5740,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -5900,8 +5771,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -5918,7 +5789,6 @@ "ctxt": 0 }, "value": "takeReturnHelloWorld", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5932,7 +5802,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -5964,8 +5833,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -5982,7 +5851,6 @@ "ctxt": 0 }, "value": "takeReturnHelloWorld", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5996,7 +5864,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/thisType/contextualThisType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/thisType/contextualThisType/input.ts.json index bc3a08a0962e..1d36493564d8 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/thisType/contextualThisType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/thisType/contextualThisType/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -81,6 +79,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +95,7 @@ "ctxt": 0 } } - }, - "optional": false + } } ], "typeParams": null, @@ -139,7 +137,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -160,7 +157,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -201,6 +197,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -223,13 +220,11 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -249,7 +244,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "params": [ @@ -269,8 +263,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -303,7 +297,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -345,8 +338,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -370,7 +363,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -381,7 +373,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -397,7 +388,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/thisType/contextualThisTypeInJavascript/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/thisType/contextualThisTypeInJavascript/input.ts.json index d614f4a8e0e2..1ea95f9ca9e6 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/thisType/contextualThisTypeInJavascript/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/thisType/contextualThisTypeInJavascript/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": { @@ -75,7 +74,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "params": [], @@ -139,7 +137,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -175,7 +172,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false @@ -211,7 +207,6 @@ "ctxt": 0 }, "value": "unknown", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/thisType/declarationFiles/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/thisType/declarationFiles/input.ts.json index aefcb68e2aa8..b23db4be5210 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/thisType/declarationFiles/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/thisType/declarationFiles/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -87,7 +85,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -108,6 +105,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -123,8 +121,7 @@ "ctxt": 0 } } - }, - "optional": false + } } } ], @@ -157,7 +154,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -204,7 +200,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -224,6 +219,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -239,8 +235,7 @@ "ctxt": 0 } } - }, - "optional": false + } } } ], @@ -273,7 +268,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -295,6 +289,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -311,8 +306,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -360,7 +354,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -387,7 +380,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -420,7 +412,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -449,7 +440,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -473,7 +463,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -511,7 +500,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -537,7 +525,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -590,7 +577,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -671,7 +657,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -713,7 +698,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -746,7 +730,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -788,7 +771,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -821,7 +803,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": null, @@ -890,7 +871,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": null, @@ -917,6 +897,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -932,8 +913,7 @@ "ctxt": 0 } } - }, - "optional": false + } } ], "typeParams": null, @@ -980,7 +960,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1007,6 +986,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1022,8 +1002,7 @@ "ctxt": 0 } } - }, - "optional": false + } } ], "typeParams": null, @@ -1071,7 +1050,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1097,7 +1075,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1145,7 +1122,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1171,7 +1147,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1263,7 +1238,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1290,6 +1264,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1306,8 +1281,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "typeParams": null, @@ -1334,7 +1308,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1384,7 +1357,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1410,7 +1382,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false }, "value": { @@ -1431,7 +1402,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1471,7 +1441,6 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, "optional": false }, "value": { @@ -1521,7 +1490,6 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, "optional": false }, "value": { @@ -1552,7 +1520,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1595,7 +1562,6 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, "optional": false }, "value": { @@ -1645,7 +1611,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "function": { @@ -1689,7 +1654,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1732,7 +1696,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "function": { @@ -1808,7 +1771,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "function": { @@ -1862,7 +1824,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1908,7 +1869,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "function": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/thisType/fluentClasses/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/thisType/fluentClasses/input.ts.json index d9bc015a8613..b24d6f203b81 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/thisType/fluentClasses/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/thisType/fluentClasses/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -107,7 +105,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -133,7 +130,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -190,7 +186,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -208,7 +203,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -234,7 +228,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "function": { @@ -291,7 +284,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -324,6 +316,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -346,13 +339,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -384,8 +375,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -437,7 +428,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -448,7 +438,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -464,7 +453,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -480,7 +468,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/thisType/fluentInterfaces/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/thisType/fluentInterfaces/input.ts.json index aace5171151e..714f9cd23d39 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/thisType/fluentInterfaces/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/thisType/fluentInterfaces/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -114,7 +111,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -144,7 +140,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -186,7 +181,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -207,7 +201,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -237,7 +230,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -289,6 +281,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -311,13 +304,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -349,8 +340,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -402,7 +393,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -413,7 +403,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -429,7 +418,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -445,7 +433,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/thisType/inferThisType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/thisType/inferThisType/input.ts.json index 7c03a0480a6b..ff62a2008be6 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/thisType/inferThisType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/thisType/inferThisType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,6 +60,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -82,13 +83,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -110,8 +109,7 @@ } } } - }, - "optional": false + } } } ], @@ -147,7 +145,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -177,7 +174,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -194,7 +190,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -215,6 +210,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -231,8 +227,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -286,7 +281,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -300,7 +294,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false } } @@ -324,7 +317,6 @@ "ctxt": 0 }, "value": "Check", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -350,7 +342,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -380,7 +371,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -401,6 +391,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -430,15 +421,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, "default": null } } - }, - "optional": false + } }, { "type": "RestElement", @@ -460,8 +449,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -545,7 +534,6 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -564,7 +552,6 @@ "ctxt": 0 }, "value": "Check", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -591,6 +578,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -607,8 +595,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -650,7 +637,6 @@ "ctxt": 0 }, "value": "This", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -676,7 +662,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -706,7 +691,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -727,6 +711,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -756,15 +741,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, "default": null } } - }, - "optional": false + } }, { "type": "RestElement", @@ -786,8 +769,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -850,7 +833,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -882,7 +864,6 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -901,7 +882,6 @@ "ctxt": 0 }, "value": "This", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -928,6 +908,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -944,8 +925,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/thisType/looseThisTypeInFunctions/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/thisType/looseThisTypeInFunctions/input.ts.json index 54e556c1f90e..19aaca1c99f2 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/thisType/looseThisTypeInFunctions/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/thisType/looseThisTypeInFunctions/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "explicitThis", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -107,6 +104,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -122,8 +120,7 @@ "ctxt": 0 } } - }, - "optional": false + } }, { "type": "Identifier", @@ -133,6 +130,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -149,8 +147,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -190,7 +187,6 @@ "ctxt": 0 }, "value": "Unused", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -220,7 +216,6 @@ "ctxt": 0 }, "value": "implicitNoThis", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -234,6 +229,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -250,8 +246,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -286,7 +281,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -312,7 +306,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": null, @@ -358,7 +351,6 @@ "ctxt": 0 }, "value": "explicitThis", - "typeAnnotation": null, "optional": false }, "function": { @@ -379,6 +371,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -394,8 +387,7 @@ "ctxt": 0 } } - }, - "optional": false + } } }, { @@ -414,6 +406,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -430,8 +423,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -487,7 +479,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -500,7 +491,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -549,7 +539,6 @@ "ctxt": 0 }, "value": "implicitThis", - "typeAnnotation": null, "optional": false }, "function": { @@ -570,6 +559,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -586,8 +576,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -643,7 +632,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -656,7 +644,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -705,7 +692,6 @@ "ctxt": 0 }, "value": "explicitVoid", - "typeAnnotation": null, "optional": false }, "function": { @@ -726,6 +712,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -742,8 +729,7 @@ }, "kind": "void" } - }, - "optional": false + } } }, { @@ -762,6 +748,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -778,8 +765,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -820,7 +806,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "right": { @@ -884,7 +869,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -916,8 +900,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -934,7 +918,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -974,7 +957,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -985,7 +967,6 @@ "ctxt": 0 }, "value": "explicitVoid", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1005,7 +986,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1016,7 +996,6 @@ "ctxt": 0 }, "value": "explicitThis", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1048,8 +1027,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1069,7 +1048,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -1092,7 +1070,6 @@ "ctxt": 0 }, "value": "explicitThis", - "typeAnnotation": null, "optional": false }, "value": { @@ -1115,6 +1092,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1131,8 +1109,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1173,7 +1150,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "right": { @@ -1206,7 +1182,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1219,7 +1194,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1244,7 +1218,6 @@ "ctxt": 0 }, "value": "implicitThis", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1264,6 +1237,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1280,8 +1254,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1314,7 +1287,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -1372,6 +1344,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1394,13 +1367,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1410,7 +1381,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1442,6 +1412,7 @@ "ctxt": 0 }, "value": "o2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1464,13 +1435,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1490,7 +1459,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -1513,7 +1481,6 @@ "ctxt": 0 }, "value": "explicitThis", - "typeAnnotation": null, "optional": false }, "value": { @@ -1536,8 +1503,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1578,7 +1545,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "right": { @@ -1611,7 +1577,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1624,7 +1589,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1670,8 +1634,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1688,7 +1652,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1699,7 +1662,6 @@ "ctxt": 0 }, "value": "explicitThis", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1733,8 +1695,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1751,7 +1713,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1799,6 +1760,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1821,13 +1783,11 @@ "ctxt": 0 }, "value": "Unused", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1859,8 +1819,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1877,7 +1837,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "property": { @@ -1888,7 +1847,6 @@ "ctxt": 0 }, "value": "implicitNoThis", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1920,8 +1878,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -1938,7 +1896,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1989,7 +1946,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -2000,7 +1956,6 @@ "ctxt": 0 }, "value": "explicitVoid", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2020,7 +1975,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -2031,7 +1985,6 @@ "ctxt": 0 }, "value": "implicitThis", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2068,7 +2021,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -2079,7 +2031,6 @@ "ctxt": 0 }, "value": "implicitThis", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2099,7 +2050,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -2110,7 +2060,6 @@ "ctxt": 0 }, "value": "implicitThis", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2147,7 +2096,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -2158,7 +2106,6 @@ "ctxt": 0 }, "value": "implicitThis", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2178,7 +2125,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -2189,7 +2135,6 @@ "ctxt": 0 }, "value": "explicitThis", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2226,7 +2171,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -2237,7 +2181,6 @@ "ctxt": 0 }, "value": "implicitThis", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2257,7 +2200,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -2268,7 +2210,6 @@ "ctxt": 0 }, "value": "explicitThis", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2305,7 +2246,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -2316,7 +2256,6 @@ "ctxt": 0 }, "value": "explicitThis", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2341,8 +2280,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -2397,7 +2336,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2410,7 +2348,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeAccessibility/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeAccessibility/input.ts.json index 19b2a3e2e409..eec24ec72d76 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeAccessibility/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeAccessibility/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": { @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "pp", - "typeAnnotation": null, "optional": false }, "value": { @@ -150,7 +147,6 @@ "ctxt": 0 }, "value": "ppp", - "typeAnnotation": null, "optional": false }, "value": { @@ -204,7 +200,6 @@ "ctxt": 0 }, "value": "sp", - "typeAnnotation": null, "optional": false }, "value": { @@ -258,7 +253,6 @@ "ctxt": 0 }, "value": "spp", - "typeAnnotation": null, "optional": false }, "value": { @@ -312,7 +306,6 @@ "ctxt": 0 }, "value": "sppp", - "typeAnnotation": null, "optional": false }, "value": { @@ -373,7 +366,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -403,7 +395,6 @@ "ctxt": 0 }, "value": "extension1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -417,6 +408,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -433,8 +425,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -472,7 +463,6 @@ "ctxt": 0 }, "value": "extension2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -486,6 +476,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -502,8 +493,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -541,7 +531,6 @@ "ctxt": 0 }, "value": "extension3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -555,6 +544,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -571,8 +561,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -607,7 +596,6 @@ "ctxt": 0 }, "value": "MyGenericClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -633,7 +621,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "value": null, @@ -659,7 +646,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -690,7 +676,6 @@ "ctxt": 0 }, "value": "pp", - "typeAnnotation": null, "optional": false }, "value": null, @@ -716,7 +701,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -747,7 +731,6 @@ "ctxt": 0 }, "value": "ppp", - "typeAnnotation": null, "optional": false }, "value": null, @@ -773,7 +756,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -804,7 +786,6 @@ "ctxt": 0 }, "value": "sp", - "typeAnnotation": null, "optional": false }, "value": null, @@ -850,7 +831,6 @@ "ctxt": 0 }, "value": "spp", - "typeAnnotation": null, "optional": false }, "value": null, @@ -896,7 +876,6 @@ "ctxt": 0 }, "value": "sppp", - "typeAnnotation": null, "optional": false }, "value": null, @@ -953,7 +932,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1001,7 +979,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "property": { @@ -1012,7 +989,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1025,7 +1001,6 @@ "ctxt": 0 }, "value": "extension1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1050,6 +1025,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1072,13 +1048,11 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1097,6 +1071,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1113,8 +1088,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1170,7 +1144,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1183,7 +1156,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1226,7 +1198,6 @@ "ctxt": 0 }, "value": "pp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1239,7 +1210,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1282,7 +1252,6 @@ "ctxt": 0 }, "value": "ppp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1295,7 +1264,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1330,7 +1298,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "property": { @@ -1341,7 +1308,6 @@ "ctxt": 0 }, "value": "sp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1354,7 +1320,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1389,7 +1354,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "property": { @@ -1400,7 +1364,6 @@ "ctxt": 0 }, "value": "spp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1413,7 +1376,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1448,7 +1410,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "property": { @@ -1459,7 +1420,6 @@ "ctxt": 0 }, "value": "sppp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1472,7 +1432,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1523,7 +1482,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "property": { @@ -1534,7 +1492,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1547,7 +1504,6 @@ "ctxt": 0 }, "value": "extension2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1572,6 +1528,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1594,13 +1551,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1619,6 +1574,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1635,8 +1591,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1692,7 +1647,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1705,7 +1659,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1748,7 +1701,6 @@ "ctxt": 0 }, "value": "pp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1761,7 +1713,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1804,7 +1755,6 @@ "ctxt": 0 }, "value": "ppp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1817,7 +1767,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1852,7 +1801,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "property": { @@ -1863,7 +1811,6 @@ "ctxt": 0 }, "value": "sp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1876,7 +1823,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1911,7 +1857,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "property": { @@ -1922,7 +1867,6 @@ "ctxt": 0 }, "value": "spp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1935,7 +1879,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -1970,7 +1913,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "property": { @@ -1981,7 +1923,6 @@ "ctxt": 0 }, "value": "sppp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1994,7 +1935,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -2026,7 +1966,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2044,7 +1983,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2067,7 +2005,6 @@ "ctxt": 0 }, "value": "extension3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2088,6 +2025,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2110,13 +2048,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2135,6 +2071,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2151,8 +2088,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -2208,7 +2144,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2221,7 +2156,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -2264,7 +2198,6 @@ "ctxt": 0 }, "value": "pp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2277,7 +2210,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -2320,7 +2252,6 @@ "ctxt": 0 }, "value": "ppp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2333,7 +2264,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -2368,7 +2298,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "property": { @@ -2379,7 +2308,6 @@ "ctxt": 0 }, "value": "sp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2392,7 +2320,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -2427,7 +2354,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "property": { @@ -2438,7 +2364,6 @@ "ctxt": 0 }, "value": "spp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2451,7 +2376,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -2486,7 +2410,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "property": { @@ -2497,7 +2420,6 @@ "ctxt": 0 }, "value": "sppp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2510,7 +2432,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -2542,7 +2463,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2560,7 +2480,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2608,7 +2527,6 @@ "ctxt": 0 }, "value": "MyClass", - "typeAnnotation": null, "optional": false }, "property": { @@ -2619,7 +2537,6 @@ "ctxt": 0 }, "value": "prototype", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2632,7 +2549,6 @@ "ctxt": 0 }, "value": "extension3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2645,7 +2561,6 @@ "ctxt": 0 }, "value": "extension3", - "typeAnnotation": null, "optional": false } } @@ -2660,7 +2575,6 @@ "ctxt": 0 }, "value": "extension4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2681,6 +2595,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2703,7 +2618,6 @@ "ctxt": 0 }, "value": "MyGenericClass", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2729,7 +2643,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2737,8 +2650,7 @@ ] } } - }, - "optional": false + } } }, { @@ -2757,6 +2669,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2779,13 +2692,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2841,7 +2752,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2854,7 +2764,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -2897,7 +2806,6 @@ "ctxt": 0 }, "value": "pp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2910,7 +2818,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -2953,7 +2860,6 @@ "ctxt": 0 }, "value": "ppp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2966,7 +2872,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -3001,7 +2906,6 @@ "ctxt": 0 }, "value": "MyGenericClass", - "typeAnnotation": null, "optional": false }, "property": { @@ -3012,7 +2916,6 @@ "ctxt": 0 }, "value": "sp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3025,7 +2928,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -3060,7 +2962,6 @@ "ctxt": 0 }, "value": "MyGenericClass", - "typeAnnotation": null, "optional": false }, "property": { @@ -3071,7 +2972,6 @@ "ctxt": 0 }, "value": "spp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3084,7 +2984,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -3119,7 +3018,6 @@ "ctxt": 0 }, "value": "MyGenericClass", - "typeAnnotation": null, "optional": false }, "property": { @@ -3130,7 +3028,6 @@ "ctxt": 0 }, "value": "sppp", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3143,7 +3040,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -3175,7 +3071,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeAndConstraints/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeAndConstraints/input.ts.json index 4a58abb732e9..8ad53a08a314 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeAndConstraints/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeAndConstraints/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "function": { @@ -107,7 +105,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -128,6 +125,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -150,13 +148,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -184,7 +180,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -205,6 +200,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -227,13 +223,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -274,8 +268,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -299,7 +293,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -310,7 +303,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "computed": false @@ -347,7 +339,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -365,7 +356,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -399,8 +389,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -424,7 +414,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -435,7 +424,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "computed": false @@ -472,7 +460,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -490,7 +477,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -511,7 +497,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -537,7 +522,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -558,6 +542,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -580,13 +565,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -627,8 +610,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -652,7 +635,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -663,7 +645,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "computed": false @@ -701,7 +682,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -722,6 +702,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -744,13 +725,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -791,8 +770,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -816,7 +795,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -827,7 +805,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "computed": false @@ -864,7 +841,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -882,7 +858,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -925,7 +900,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -943,7 +917,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeErrors/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeErrors/input.ts.json index fda4331c0c8b..15a2d7663a11 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeErrors/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeErrors/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -46,8 +47,7 @@ "ctxt": 0 } } - }, - "optional": false + } }, "init": null, "definite": false @@ -79,6 +79,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -110,7 +111,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -137,8 +137,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -170,6 +169,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -193,8 +193,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -211,7 +210,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -232,6 +230,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -247,8 +246,7 @@ "ctxt": 0 } } - }, - "optional": false + } } } ], @@ -291,6 +289,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -306,8 +305,7 @@ "ctxt": 0 } } - }, - "optional": false + } }, "init": null, "definite": false @@ -367,7 +365,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -397,7 +394,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -435,7 +431,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -481,7 +476,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -550,7 +544,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -619,7 +612,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -652,6 +644,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -668,8 +661,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -716,7 +708,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -754,7 +745,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -768,6 +758,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -783,8 +774,7 @@ "ctxt": 0 } } - }, - "optional": false + } } ], "typeAnn": { @@ -823,7 +813,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -849,7 +838,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -884,7 +872,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -937,7 +924,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1010,7 +996,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1083,7 +1068,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1113,6 +1097,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1129,8 +1114,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1184,7 +1168,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1219,7 +1202,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1233,6 +1215,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1248,8 +1231,7 @@ "ctxt": 0 } } - }, - "optional": false + } } ], "typeAnn": { @@ -1300,7 +1282,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1326,7 +1307,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1371,7 +1351,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1389,7 +1368,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1427,7 +1405,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -1448,6 +1425,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1463,8 +1441,7 @@ "ctxt": 0 } } - }, - "optional": false + } } } ], @@ -1497,7 +1474,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1553,7 +1529,6 @@ "ctxt": 0 }, "value": "N1", - "typeAnnotation": null, "optional": false }, "body": { @@ -1596,6 +1571,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1611,8 +1587,7 @@ "ctxt": 0 } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1652,8 +1627,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ThisExpression", @@ -1681,7 +1656,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1707,7 +1681,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false }, "value": { @@ -1728,7 +1701,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1748,6 +1720,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1763,8 +1736,7 @@ "ctxt": 0 } } - }, - "optional": false + } } } ], @@ -1797,7 +1769,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1851,7 +1822,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -1880,7 +1850,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1901,6 +1870,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1916,8 +1886,7 @@ "ctxt": 0 } } - }, - "optional": false + } } } ], @@ -1950,7 +1919,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2001,8 +1969,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -2022,7 +1990,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2042,6 +2009,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2057,8 +2025,7 @@ "ctxt": 0 } } - }, - "optional": false + } } } ], @@ -2091,7 +2058,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeErrors2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeErrors2/input.ts.json index e9645f169622..695aae77754d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeErrors2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeErrors2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -77,8 +76,7 @@ "ctxt": 0 } } - }, - "optional": false + } } } ], @@ -111,7 +109,6 @@ "ctxt": 0 }, "value": "Generic", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -147,7 +144,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -168,7 +164,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -194,7 +189,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +234,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -262,6 +255,7 @@ "ctxt": 0 }, "value": "host", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -284,7 +278,6 @@ "ctxt": 0 }, "value": "Generic", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -306,8 +299,7 @@ ] } } - }, - "optional": false + } } } ], @@ -344,6 +336,7 @@ "ctxt": 0 }, "value": "self", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -359,8 +352,7 @@ "ctxt": 0 } } - }, - "optional": false + } }, "init": { "type": "ThisExpression", @@ -412,7 +404,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInAccessors/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInAccessors/input.ts.json index 2913f7610ebc..f45acd87dc5a 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInAccessors/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInAccessors/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -147,8 +144,8 @@ "ctxt": 0 }, "value": "explicit", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -168,7 +165,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -196,7 +192,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -254,7 +249,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -278,7 +272,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "param": { @@ -289,6 +282,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -311,13 +305,11 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "body": { "type": "BlockStatement", @@ -365,7 +357,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -378,7 +369,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -417,8 +407,8 @@ "ctxt": 0 }, "value": "copiedFromGetter", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -438,7 +428,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -466,7 +455,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -524,7 +512,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -548,7 +535,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "param": { @@ -559,8 +545,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -608,7 +594,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -621,7 +606,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -660,8 +644,8 @@ "ctxt": 0 }, "value": "copiedFromSetter", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -681,7 +665,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -709,7 +692,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -751,7 +733,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -775,7 +756,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "param": { @@ -786,6 +766,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -808,13 +789,11 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "body": { "type": "BlockStatement", @@ -862,7 +841,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -875,7 +853,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -914,8 +891,8 @@ "ctxt": 0 }, "value": "copiedFromGetterUnannotated", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -935,7 +912,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -963,7 +939,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -1005,7 +980,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1029,7 +1003,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "param": { @@ -1040,8 +1013,8 @@ "ctxt": 0 }, "value": "this", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -1089,7 +1062,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1102,7 +1074,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -1126,7 +1097,6 @@ "ctxt": 0 }, "value": "Explicit", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1152,7 +1122,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -1190,7 +1159,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -1211,6 +1179,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1233,13 +1202,11 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1287,7 +1254,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1337,7 +1303,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -1358,6 +1323,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1380,13 +1346,11 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1405,6 +1369,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1421,8 +1386,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1478,7 +1442,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1491,7 +1454,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -1526,7 +1488,6 @@ "ctxt": 0 }, "value": "Contextual", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1552,7 +1513,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -1590,7 +1550,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "function": { @@ -1639,7 +1598,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInAccessorsNegative/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInAccessorsNegative/input.ts.json index b97f823d08f9..1e8521362515 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInAccessorsNegative/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInAccessorsNegative/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -137,7 +134,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -167,7 +163,6 @@ "ctxt": 0 }, "value": "wrong", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -310,8 +305,8 @@ "ctxt": 0 }, "value": "mismatch", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -331,7 +326,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -359,7 +353,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -401,7 +394,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -425,7 +417,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "param": { @@ -436,6 +427,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -458,13 +450,11 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "body": { "type": "BlockStatement", @@ -512,7 +502,6 @@ "ctxt": 0 }, "value": "wrong", - "typeAnnotation": null, "optional": false }, "computed": false @@ -567,6 +556,7 @@ "ctxt": 0 }, "value": "contextual", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -589,13 +579,11 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -615,7 +603,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -643,7 +630,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -685,7 +671,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInBasePropertyAndDerivedContainerOfBase01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInBasePropertyAndDerivedContainerOfBase01/input.ts.json index fc4e6a85a134..a71f592e87cc 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInBasePropertyAndDerivedContainerOfBase01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInBasePropertyAndDerivedContainerOfBase01/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "BoxOfFoo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -66,7 +64,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -129,7 +125,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -155,7 +150,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -185,7 +179,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -228,7 +221,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -249,7 +241,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -279,7 +270,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -308,7 +298,6 @@ "ctxt": 0 }, "value": "BoxOfFoo", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInClasses/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInClasses/input.ts.json index 677d06a1d830..10c5161a33a6 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInClasses/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInClasses/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -87,7 +85,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -108,6 +105,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -123,8 +121,7 @@ "ctxt": 0 } } - }, - "optional": false + } } } ], @@ -157,7 +154,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -206,7 +202,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -228,6 +223,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -244,8 +240,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -293,7 +288,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -320,7 +314,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -353,7 +346,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -382,7 +374,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -406,7 +397,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -444,7 +434,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -470,7 +459,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -523,7 +511,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -604,7 +591,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -646,7 +632,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -679,7 +664,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -721,7 +705,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -754,7 +737,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": null, @@ -823,7 +805,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": null, @@ -850,6 +831,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -865,8 +847,7 @@ "ctxt": 0 } } - }, - "optional": false + } } ], "typeParams": null, @@ -913,7 +894,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "value": null, @@ -940,6 +920,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -955,8 +936,7 @@ "ctxt": 0 } } - }, - "optional": false + } } ], "typeParams": null, @@ -1004,7 +984,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1030,7 +1009,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1078,7 +1056,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1104,7 +1081,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1196,7 +1172,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1223,6 +1198,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1239,8 +1215,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "typeParams": null, @@ -1267,7 +1242,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1317,7 +1291,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1343,7 +1316,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1388,7 +1360,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -1409,6 +1380,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1424,8 +1396,7 @@ "ctxt": 0 } } - }, - "optional": false + } } } ], @@ -1479,7 +1450,6 @@ "ctxt": 0 }, "value": "C5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1505,7 +1475,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -1549,8 +1518,8 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1568,6 +1537,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1583,8 +1553,7 @@ "ctxt": 0 } } - }, - "optional": false + } } ], "body": { @@ -1644,8 +1613,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1663,6 +1632,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1678,8 +1648,7 @@ "ctxt": 0 } } - }, - "optional": false + } } ], "body": { @@ -1724,8 +1693,8 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1743,6 +1712,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1758,8 +1728,7 @@ "ctxt": 0 } } - }, - "optional": false + } } ], "body": { @@ -1778,6 +1747,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1793,8 +1763,7 @@ "ctxt": 0 } } - }, - "optional": false + } } ], "body": { @@ -1844,8 +1813,8 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1863,6 +1832,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1878,8 +1848,7 @@ "ctxt": 0 } } - }, - "optional": false + } } ], "body": { @@ -1915,8 +1884,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1934,6 +1903,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1949,8 +1919,7 @@ "ctxt": 0 } } - }, - "optional": false + } } ], "body": { @@ -2023,7 +1992,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2081,7 +2049,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -2125,8 +2092,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -2143,7 +2110,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -2184,8 +2150,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -2202,7 +2168,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInFunctions/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInFunctions/input.ts.json index 0c13133450e1..e08bea5cd939 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInFunctions/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInFunctions/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +158,6 @@ "ctxt": 0 }, "value": "explicitThis", - "typeAnnotation": null, "optional": false }, "function": { @@ -183,6 +178,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -198,8 +194,7 @@ "ctxt": 0 } } - }, - "optional": false + } } }, { @@ -218,6 +213,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -234,8 +230,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -291,7 +286,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -304,7 +298,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -353,7 +346,6 @@ "ctxt": 0 }, "value": "explicitC", - "typeAnnotation": null, "optional": false }, "function": { @@ -374,6 +366,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -396,13 +389,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -421,6 +412,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -437,8 +429,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -494,7 +485,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -507,7 +497,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -556,7 +545,6 @@ "ctxt": 0 }, "value": "explicitProperty", - "typeAnnotation": null, "optional": false }, "function": { @@ -577,6 +565,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -608,7 +597,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -636,8 +624,7 @@ } ] } - }, - "optional": false + } } }, { @@ -656,6 +643,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -672,8 +660,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -729,7 +716,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -742,7 +728,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -791,7 +776,6 @@ "ctxt": 0 }, "value": "explicitVoid", - "typeAnnotation": null, "optional": false }, "function": { @@ -812,6 +796,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -828,8 +813,7 @@ }, "kind": "void" } - }, - "optional": false + } } }, { @@ -848,6 +832,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -864,8 +849,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -906,7 +890,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "right": { @@ -966,7 +949,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -985,7 +967,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1008,7 +989,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1038,7 +1018,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1080,7 +1059,6 @@ "ctxt": 0 }, "value": "explicitVoid1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1094,6 +1072,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1110,8 +1089,7 @@ }, "kind": "void" } - }, - "optional": false + } } ], "typeAnn": { @@ -1149,7 +1127,6 @@ "ctxt": 0 }, "value": "explicitVoid2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1163,6 +1140,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1179,8 +1157,7 @@ }, "kind": "void" } - }, - "optional": false + } } ], "typeAnn": { @@ -1218,7 +1195,6 @@ "ctxt": 0 }, "value": "explicitStructural", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1232,6 +1208,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1263,7 +1240,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1291,8 +1267,7 @@ } ] } - }, - "optional": false + } } ], "typeAnn": { @@ -1330,7 +1305,6 @@ "ctxt": 0 }, "value": "explicitInterface", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1344,6 +1318,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1366,13 +1341,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1410,7 +1383,6 @@ "ctxt": 0 }, "value": "explicitThis", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1424,6 +1396,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1439,8 +1412,7 @@ "ctxt": 0 } } - }, - "optional": false + } } ], "typeAnn": { @@ -1475,7 +1447,6 @@ "ctxt": 0 }, "value": "explicitStructural", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1496,6 +1467,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1527,7 +1499,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1555,8 +1526,7 @@ } ] } - }, - "optional": false + } } }, { @@ -1575,6 +1545,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1591,8 +1562,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1633,7 +1603,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1659,7 +1628,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1699,7 +1667,6 @@ "ctxt": 0 }, "value": "justThis", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1720,6 +1687,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1751,7 +1719,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1779,8 +1746,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1828,7 +1794,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1867,7 +1832,6 @@ "ctxt": 0 }, "value": "implicitThis", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1888,6 +1852,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1904,8 +1869,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1969,7 +1933,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1982,7 +1945,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } }, @@ -2045,6 +2007,7 @@ "ctxt": 0 }, "value": "impl", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2067,13 +2030,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -2093,7 +2054,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -2116,7 +2076,6 @@ "ctxt": 0 }, "value": "explicitVoid2", - "typeAnnotation": null, "optional": false }, "value": { @@ -2150,7 +2109,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2171,7 +2129,6 @@ "ctxt": 0 }, "value": "explicitVoid1", - "typeAnnotation": null, "optional": false }, "params": [], @@ -2223,7 +2180,6 @@ "ctxt": 0 }, "value": "explicitStructural", - "typeAnnotation": null, "optional": false }, "params": [], @@ -2271,7 +2227,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2294,7 +2249,6 @@ "ctxt": 0 }, "value": "explicitInterface", - "typeAnnotation": null, "optional": false }, "params": [], @@ -2342,7 +2296,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2365,7 +2318,6 @@ "ctxt": 0 }, "value": "explicitThis", - "typeAnnotation": null, "optional": false }, "params": [], @@ -2413,7 +2365,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2462,7 +2413,6 @@ "ctxt": 0 }, "value": "impl", - "typeAnnotation": null, "optional": false }, "property": { @@ -2473,7 +2423,6 @@ "ctxt": 0 }, "value": "explicitVoid1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2552,7 +2501,6 @@ "ctxt": 0 }, "value": "impl", - "typeAnnotation": null, "optional": false }, "property": { @@ -2563,7 +2511,6 @@ "ctxt": 0 }, "value": "explicitVoid2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2622,7 +2569,6 @@ "ctxt": 0 }, "value": "impl", - "typeAnnotation": null, "optional": false }, "property": { @@ -2633,7 +2579,6 @@ "ctxt": 0 }, "value": "explicitStructural", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2686,7 +2631,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2731,7 +2675,6 @@ "ctxt": 0 }, "value": "impl", - "typeAnnotation": null, "optional": false }, "property": { @@ -2742,7 +2685,6 @@ "ctxt": 0 }, "value": "explicitInterface", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2795,7 +2737,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2840,7 +2781,6 @@ "ctxt": 0 }, "value": "impl", - "typeAnnotation": null, "optional": false }, "property": { @@ -2851,7 +2791,6 @@ "ctxt": 0 }, "value": "explicitStructural", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2910,7 +2849,6 @@ "ctxt": 0 }, "value": "impl", - "typeAnnotation": null, "optional": false }, "property": { @@ -2921,7 +2859,6 @@ "ctxt": 0 }, "value": "explicitInterface", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2980,7 +2917,6 @@ "ctxt": 0 }, "value": "impl", - "typeAnnotation": null, "optional": false }, "property": { @@ -2991,7 +2927,6 @@ "ctxt": 0 }, "value": "explicitThis", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3044,7 +2979,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3084,6 +3018,7 @@ "ctxt": 0 }, "value": "ok", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3115,7 +3050,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3157,7 +3091,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3187,6 +3120,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3218,7 +3152,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3246,8 +3179,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -3257,6 +3189,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3273,8 +3206,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -3301,8 +3233,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -3322,7 +3253,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -3345,7 +3275,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -3356,7 +3285,6 @@ "ctxt": 0 }, "value": "explicitStructural", - "typeAnnotation": null, "optional": false } } @@ -3391,6 +3319,7 @@ "ctxt": 0 }, "value": "implicitAnyOk", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3422,7 +3351,6 @@ "ctxt": 0 }, "value": "notSpecified", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3464,7 +3392,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3494,6 +3421,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3510,8 +3438,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -3538,8 +3465,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -3559,7 +3485,6 @@ "ctxt": 0 }, "value": "notSpecified", - "typeAnnotation": null, "optional": false }, "value": { @@ -3582,7 +3507,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -3593,7 +3517,6 @@ "ctxt": 0 }, "value": "implicitThis", - "typeAnnotation": null, "optional": false } } @@ -3632,7 +3555,6 @@ "ctxt": 0 }, "value": "ok", - "typeAnnotation": null, "optional": false }, "property": { @@ -3643,7 +3565,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3687,7 +3608,6 @@ "ctxt": 0 }, "value": "implicitThis", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3736,7 +3656,6 @@ "ctxt": 0 }, "value": "implicitAnyOk", - "typeAnnotation": null, "optional": false }, "property": { @@ -3747,7 +3666,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3794,8 +3712,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -3812,7 +3730,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3847,8 +3764,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -3865,7 +3782,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3900,8 +3816,8 @@ "ctxt": 0 }, "value": "ripped", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3918,7 +3834,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3929,7 +3844,6 @@ "ctxt": 0 }, "value": "explicitC", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3967,7 +3881,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3978,7 +3891,6 @@ "ctxt": 0 }, "value": "explicitC", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4029,7 +3941,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4040,7 +3951,6 @@ "ctxt": 0 }, "value": "explicitProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4091,7 +4001,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4102,7 +4011,6 @@ "ctxt": 0 }, "value": "explicitThis", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4153,7 +4061,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -4164,7 +4071,6 @@ "ctxt": 0 }, "value": "explicitC", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4215,7 +4121,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -4226,7 +4131,6 @@ "ctxt": 0 }, "value": "explicitProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4277,7 +4181,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "property": { @@ -4288,7 +4191,6 @@ "ctxt": 0 }, "value": "explicitThis", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4335,6 +4237,7 @@ "ctxt": 0 }, "value": "reconstructed", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4366,7 +4269,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4408,7 +4310,6 @@ "ctxt": 0 }, "value": "explicitThis", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4422,6 +4323,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4444,13 +4346,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -4460,6 +4360,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4476,8 +4377,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -4515,7 +4415,6 @@ "ctxt": 0 }, "value": "explicitC", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4529,6 +4428,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4551,13 +4451,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -4567,6 +4465,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4583,8 +4482,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -4622,7 +4520,6 @@ "ctxt": 0 }, "value": "explicitProperty", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4652,6 +4549,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4683,7 +4581,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4711,8 +4608,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -4722,6 +4618,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4738,8 +4635,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -4780,7 +4676,6 @@ "ctxt": 0 }, "value": "explicitVoid", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4794,6 +4689,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4810,8 +4706,7 @@ }, "kind": "void" } - }, - "optional": false + } }, { "type": "Identifier", @@ -4821,6 +4716,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4837,8 +4733,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -4862,8 +4757,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -4883,7 +4777,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -4906,7 +4799,6 @@ "ctxt": 0 }, "value": "explicitThis", - "typeAnnotation": null, "optional": false }, "value": { @@ -4924,7 +4816,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4935,7 +4826,6 @@ "ctxt": 0 }, "value": "explicitThis", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4951,7 +4841,6 @@ "ctxt": 0 }, "value": "explicitC", - "typeAnnotation": null, "optional": false }, "value": { @@ -4969,7 +4858,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4980,7 +4868,6 @@ "ctxt": 0 }, "value": "explicitC", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4996,7 +4883,6 @@ "ctxt": 0 }, "value": "explicitProperty", - "typeAnnotation": null, "optional": false }, "value": { @@ -5014,7 +4900,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -5025,7 +4910,6 @@ "ctxt": 0 }, "value": "explicitProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5041,7 +4925,6 @@ "ctxt": 0 }, "value": "explicitVoid", - "typeAnnotation": null, "optional": false }, "value": { @@ -5059,7 +4942,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -5070,7 +4952,6 @@ "ctxt": 0 }, "value": "explicitVoid", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5111,7 +4992,6 @@ "ctxt": 0 }, "value": "reconstructed", - "typeAnnotation": null, "optional": false }, "property": { @@ -5122,7 +5002,6 @@ "ctxt": 0 }, "value": "explicitThis", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5173,7 +5052,6 @@ "ctxt": 0 }, "value": "reconstructed", - "typeAnnotation": null, "optional": false }, "property": { @@ -5184,7 +5062,6 @@ "ctxt": 0 }, "value": "explicitProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5231,8 +5108,8 @@ "ctxt": 0 }, "value": "explicitVoid", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -5249,7 +5126,6 @@ "ctxt": 0 }, "value": "reconstructed", - "typeAnnotation": null, "optional": false }, "property": { @@ -5260,7 +5136,6 @@ "ctxt": 0 }, "value": "explicitVoid", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5291,7 +5166,6 @@ "ctxt": 0 }, "value": "explicitVoid", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5336,6 +5210,7 @@ "ctxt": 0 }, "value": "unboundToSpecified", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5359,6 +5234,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5390,7 +5266,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5418,8 +5293,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -5429,6 +5303,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5445,8 +5320,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -5468,8 +5342,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -5487,8 +5360,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5507,7 +5380,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -5533,7 +5405,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5573,6 +5444,7 @@ "ctxt": 0 }, "value": "specifiedToSpecified", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5596,6 +5468,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5627,7 +5500,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5655,8 +5527,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -5666,6 +5537,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5682,8 +5554,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -5705,8 +5576,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -5716,7 +5586,6 @@ "ctxt": 0 }, "value": "explicitStructural", - "typeAnnotation": null, "optional": false }, "definite": false @@ -5748,6 +5617,7 @@ "ctxt": 0 }, "value": "anyToSpecified", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5771,6 +5641,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5802,7 +5673,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5830,8 +5700,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -5841,6 +5710,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5857,8 +5727,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -5880,8 +5749,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -5903,6 +5771,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5919,8 +5788,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -5961,7 +5829,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -6027,6 +5894,7 @@ "ctxt": 0 }, "value": "unspecifiedLambda", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6050,6 +5918,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6066,8 +5935,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -6089,8 +5957,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -6108,8 +5975,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -6128,7 +5995,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -6175,6 +6041,7 @@ "ctxt": 0 }, "value": "specifiedLambda", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6198,6 +6065,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6214,8 +6082,7 @@ }, "kind": "void" } - }, - "optional": false + } }, { "type": "Identifier", @@ -6225,6 +6092,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6241,8 +6109,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -6264,8 +6131,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -6283,8 +6149,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -6303,7 +6169,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -6350,6 +6215,7 @@ "ctxt": 0 }, "value": "unspecifiedLambdaToSpecified", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6373,6 +6239,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6404,7 +6271,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6432,8 +6298,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -6443,6 +6308,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6459,8 +6325,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -6482,8 +6347,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -6493,7 +6357,6 @@ "ctxt": 0 }, "value": "unspecifiedLambda", - "typeAnnotation": null, "optional": false }, "definite": false @@ -6525,6 +6388,7 @@ "ctxt": 0 }, "value": "specifiedLambdaToSpecified", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6548,6 +6412,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6579,7 +6444,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6607,8 +6471,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -6618,6 +6481,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6634,8 +6498,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -6657,8 +6520,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -6668,7 +6530,6 @@ "ctxt": 0 }, "value": "specifiedLambda", - "typeAnnotation": null, "optional": false }, "definite": false @@ -6700,6 +6561,7 @@ "ctxt": 0 }, "value": "explicitCFunction", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6723,6 +6585,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6745,13 +6608,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -6761,6 +6622,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6777,8 +6639,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -6800,8 +6661,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -6833,6 +6693,7 @@ "ctxt": 0 }, "value": "explicitPropertyFunction", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6856,6 +6717,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6887,7 +6749,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6915,8 +6776,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -6926,6 +6786,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6942,8 +6803,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -6965,8 +6825,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -7003,7 +6862,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -7014,7 +6872,6 @@ "ctxt": 0 }, "value": "explicitC", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7027,7 +6884,6 @@ "ctxt": 0 }, "value": "explicitCFunction", - "typeAnnotation": null, "optional": false } } @@ -7062,7 +6918,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -7073,7 +6928,6 @@ "ctxt": 0 }, "value": "explicitC", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7098,6 +6952,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7120,13 +6975,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -7145,6 +6998,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7161,8 +7015,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -7218,7 +7071,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7231,7 +7083,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -7275,7 +7126,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -7286,7 +7136,6 @@ "ctxt": 0 }, "value": "explicitProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7299,7 +7148,6 @@ "ctxt": 0 }, "value": "explicitPropertyFunction", - "typeAnnotation": null, "optional": false } } @@ -7334,7 +7182,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -7345,7 +7192,6 @@ "ctxt": 0 }, "value": "explicitProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7370,6 +7216,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7401,7 +7248,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7429,8 +7275,7 @@ } ] } - }, - "optional": false + } } }, { @@ -7449,6 +7294,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7465,8 +7311,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -7522,7 +7367,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7535,7 +7379,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -7579,7 +7422,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -7590,7 +7432,6 @@ "ctxt": 0 }, "value": "explicitProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7610,7 +7451,6 @@ "ctxt": 0 }, "value": "reconstructed", - "typeAnnotation": null, "optional": false }, "property": { @@ -7621,7 +7461,6 @@ "ctxt": 0 }, "value": "explicitProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7658,7 +7497,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -7669,7 +7507,6 @@ "ctxt": 0 }, "value": "explicitC", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7690,8 +7527,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -7702,7 +7539,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "async": false, @@ -7742,7 +7578,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -7753,7 +7588,6 @@ "ctxt": 0 }, "value": "explicitThis", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7774,8 +7608,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -7786,7 +7620,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "async": false, @@ -7826,7 +7659,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -7837,7 +7669,6 @@ "ctxt": 0 }, "value": "explicitProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7858,8 +7689,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -7870,7 +7701,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "async": false, @@ -7910,7 +7740,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -7921,7 +7750,6 @@ "ctxt": 0 }, "value": "explicitC", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7942,8 +7770,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -7962,7 +7790,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "right": { @@ -7988,7 +7815,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8031,7 +7857,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -8042,7 +7867,6 @@ "ctxt": 0 }, "value": "explicitThis", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8063,8 +7887,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -8083,7 +7907,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "right": { @@ -8109,7 +7932,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8152,7 +7974,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -8163,7 +7984,6 @@ "ctxt": 0 }, "value": "explicitProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8184,8 +8004,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -8204,7 +8024,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "right": { @@ -8230,7 +8049,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8273,7 +8091,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -8284,7 +8101,6 @@ "ctxt": 0 }, "value": "explicitThis", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8297,7 +8113,6 @@ "ctxt": 0 }, "value": "explicitCFunction", - "typeAnnotation": null, "optional": false } } @@ -8332,7 +8147,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -8343,7 +8157,6 @@ "ctxt": 0 }, "value": "explicitThis", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8368,6 +8181,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8390,13 +8204,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -8415,6 +8227,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8431,8 +8244,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -8488,7 +8300,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8501,7 +8312,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -8545,7 +8355,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -8556,7 +8365,6 @@ "ctxt": 0 }, "value": "explicitC", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8581,8 +8389,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -8638,7 +8446,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8651,7 +8458,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -8695,7 +8501,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -8706,7 +8511,6 @@ "ctxt": 0 }, "value": "explicitProperty", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8731,8 +8535,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -8788,7 +8592,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8801,7 +8604,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -8845,7 +8647,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -8856,7 +8657,6 @@ "ctxt": 0 }, "value": "explicitThis", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8881,8 +8681,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -8938,7 +8738,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8951,7 +8750,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -8995,7 +8793,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -9006,7 +8803,6 @@ "ctxt": 0 }, "value": "explicitThis", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9031,8 +8827,8 @@ "ctxt": 0 }, "value": "this", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -9051,8 +8847,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -9108,7 +8904,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9121,7 +8916,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -9165,7 +8959,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -9176,7 +8969,6 @@ "ctxt": 0 }, "value": "explicitC", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9201,6 +8993,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9223,13 +9016,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -9248,6 +9039,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9264,8 +9056,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -9321,7 +9112,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9334,7 +9124,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -9378,7 +9167,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -9389,7 +9177,6 @@ "ctxt": 0 }, "value": "explicitVoid", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9410,8 +9197,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -9422,7 +9209,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "async": false, @@ -9442,7 +9228,6 @@ "ctxt": 0 }, "value": "Base1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9468,7 +9253,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -9514,7 +9298,6 @@ "ctxt": 0 }, "value": "polymorphic", - "typeAnnotation": null, "optional": false }, "function": { @@ -9535,6 +9318,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9550,8 +9334,7 @@ "ctxt": 0 } } - }, - "optional": false + } } } ], @@ -9599,7 +9382,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9649,7 +9431,6 @@ "ctxt": 0 }, "value": "explicit", - "typeAnnotation": null, "optional": false }, "function": { @@ -9670,6 +9451,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9692,13 +9474,11 @@ "ctxt": 0 }, "value": "Base1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -9746,7 +9526,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9796,7 +9575,6 @@ "ctxt": 0 }, "value": "explicitStatic", - "typeAnnotation": null, "optional": false }, "function": { @@ -9817,6 +9595,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9839,12 +9618,10 @@ "ctxt": 0 }, "value": "Base1", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -9892,7 +9669,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9942,7 +9718,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -9990,7 +9765,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10016,7 +9790,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -10056,7 +9829,6 @@ "ctxt": 0 }, "value": "Base1", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -10074,7 +9846,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10100,7 +9871,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -10146,7 +9916,6 @@ "ctxt": 0 }, "value": "polymorphic", - "typeAnnotation": null, "optional": false }, "function": { @@ -10167,6 +9936,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10182,8 +9952,7 @@ "ctxt": 0 } } - }, - "optional": false + } } } ], @@ -10231,7 +10000,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10281,7 +10049,6 @@ "ctxt": 0 }, "value": "explicit", - "typeAnnotation": null, "optional": false }, "function": { @@ -10302,6 +10069,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10324,13 +10092,11 @@ "ctxt": 0 }, "value": "Base1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -10378,7 +10144,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10430,7 +10195,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10456,7 +10220,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -10496,7 +10259,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -10529,8 +10291,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -10547,7 +10309,6 @@ "ctxt": 0 }, "value": "Base1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -10582,8 +10343,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -10600,7 +10361,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -10635,8 +10395,8 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -10653,7 +10413,6 @@ "ctxt": 0 }, "value": "Derived1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -10688,8 +10447,8 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -10706,7 +10465,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -10746,7 +10504,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "property": { @@ -10757,7 +10514,6 @@ "ctxt": 0 }, "value": "polymorphic", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10777,7 +10533,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "property": { @@ -10788,7 +10543,6 @@ "ctxt": 0 }, "value": "polymorphic", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10825,7 +10579,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "property": { @@ -10836,7 +10589,6 @@ "ctxt": 0 }, "value": "polymorphic", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10856,7 +10608,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "property": { @@ -10867,7 +10618,6 @@ "ctxt": 0 }, "value": "polymorphic", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10904,7 +10654,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "property": { @@ -10915,7 +10664,6 @@ "ctxt": 0 }, "value": "polymorphic", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10935,7 +10683,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false }, "property": { @@ -10946,7 +10693,6 @@ "ctxt": 0 }, "value": "polymorphic", - "typeAnnotation": null, "optional": false }, "computed": false @@ -10983,7 +10729,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "property": { @@ -10994,7 +10739,6 @@ "ctxt": 0 }, "value": "polymorphic", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11014,7 +10758,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false }, "property": { @@ -11025,7 +10768,6 @@ "ctxt": 0 }, "value": "explicit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11062,7 +10804,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "property": { @@ -11073,7 +10814,6 @@ "ctxt": 0 }, "value": "polymorphic", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11093,7 +10833,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "property": { @@ -11104,7 +10843,6 @@ "ctxt": 0 }, "value": "polymorphic", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11141,7 +10879,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false }, "property": { @@ -11152,7 +10889,6 @@ "ctxt": 0 }, "value": "explicit", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11172,7 +10908,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false }, "property": { @@ -11183,7 +10918,6 @@ "ctxt": 0 }, "value": "polymorphic", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11200,7 +10934,6 @@ "ctxt": 0 }, "value": "InterfaceThis", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -11221,6 +10954,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11243,13 +10977,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -11305,7 +11037,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11338,7 +11069,6 @@ "ctxt": 0 }, "value": "LiteralTypeThis", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -11359,6 +11089,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11390,7 +11121,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -11418,8 +11148,7 @@ } ] } - }, - "optional": false + } } } ], @@ -11475,7 +11204,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11513,7 +11241,6 @@ "ctxt": 0 }, "value": "AnyThis", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -11534,6 +11261,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11550,8 +11278,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -11607,7 +11334,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -11660,8 +11386,8 @@ "ctxt": 0 }, "value": "interfaceThis", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -11678,7 +11404,6 @@ "ctxt": 0 }, "value": "InterfaceThis", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -11713,8 +11438,8 @@ "ctxt": 0 }, "value": "literalTypeThis", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -11731,7 +11456,6 @@ "ctxt": 0 }, "value": "LiteralTypeThis", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -11766,8 +11490,8 @@ "ctxt": 0 }, "value": "anyThis", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -11784,7 +11508,6 @@ "ctxt": 0 }, "value": "AnyThis", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -11819,6 +11542,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11850,6 +11574,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11866,8 +11591,7 @@ }, "kind": "void" } - }, - "optional": false + } }, { "type": "Identifier", @@ -11877,6 +11601,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11893,8 +11618,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -11932,7 +11656,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -11946,6 +11669,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11981,8 +11705,8 @@ "ctxt": 0 }, "value": "argArray", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -12034,15 +11758,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "RestElement", @@ -12064,8 +11786,8 @@ "ctxt": 0 }, "value": "argArray", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -12116,7 +11838,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12145,7 +11866,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -12156,8 +11876,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -12189,6 +11908,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12205,8 +11925,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -12230,7 +11949,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "property": { @@ -12241,7 +11959,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12276,7 +11993,6 @@ "ctxt": 0 }, "value": "missingTypeIsImplicitAny", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -12297,8 +12013,8 @@ "ctxt": 0 }, "value": "this", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -12317,6 +12033,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12333,8 +12050,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -12390,7 +12106,6 @@ "ctxt": 0 }, "value": "anything", - "typeAnnotation": null, "optional": false }, "computed": false @@ -12403,7 +12118,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInFunctions2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInFunctions2/input.ts.json index a957df6edde7..ac8908be205f 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInFunctions2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInFunctions2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "IndexedWithThis", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "init", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -81,6 +79,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +95,7 @@ "ctxt": 0 } } - }, - "optional": false + } } ], "typeParams": null, @@ -138,7 +136,6 @@ "ctxt": 0 }, "value": "willDestroy", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -168,6 +165,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -184,8 +182,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "typeParams": null, @@ -221,6 +218,7 @@ "ctxt": 0 }, "value": "propName", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -237,8 +235,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -342,6 +339,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -358,8 +356,7 @@ }, "kind": "any" } - }, - "optional": false + } }, { "type": "RestElement", @@ -381,8 +378,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -459,7 +456,6 @@ "ctxt": 0 }, "value": "IndexedWithoutThis", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -489,7 +485,6 @@ "ctxt": 0 }, "value": "init", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -549,7 +544,6 @@ "ctxt": 0 }, "value": "willDestroy", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -604,6 +598,7 @@ "ctxt": 0 }, "value": "propName", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -620,8 +615,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -666,7 +660,6 @@ "ctxt": 0 }, "value": "SimpleInterface", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -696,7 +689,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -710,6 +702,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -726,8 +719,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": null, @@ -749,7 +741,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -787,7 +778,6 @@ "ctxt": 0 }, "value": "extend1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -808,6 +798,7 @@ "ctxt": 0 }, "value": "args", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -830,13 +821,11 @@ "ctxt": 0 }, "value": "IndexedWithThis", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -878,7 +867,6 @@ "ctxt": 0 }, "value": "extend2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -899,6 +887,7 @@ "ctxt": 0 }, "value": "args", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -921,13 +910,11 @@ "ctxt": 0 }, "value": "IndexedWithoutThis", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -969,7 +956,6 @@ "ctxt": 0 }, "value": "simple", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -990,6 +976,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1012,13 +999,11 @@ "ctxt": 0 }, "value": "SimpleInterface", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1072,7 +1057,6 @@ "ctxt": 0 }, "value": "extend1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1096,7 +1080,6 @@ "ctxt": 0 }, "value": "init", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1160,7 +1143,6 @@ "ctxt": 0 }, "value": "willDestroy", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1183,7 +1165,6 @@ "ctxt": 0 }, "value": "mine", - "typeAnnotation": null, "optional": false }, "value": { @@ -1206,7 +1187,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1254,7 +1234,6 @@ "ctxt": 0 }, "value": "url", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1290,7 +1269,6 @@ "ctxt": 0 }, "value": "willDestroy", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1332,7 +1310,6 @@ "ctxt": 0 }, "value": "extend2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1356,7 +1333,6 @@ "ctxt": 0 }, "value": "init", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1420,7 +1396,6 @@ "ctxt": 0 }, "value": "mine", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1443,7 +1418,6 @@ "ctxt": 0 }, "value": "mine", - "typeAnnotation": null, "optional": false }, "value": { @@ -1466,7 +1440,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1530,7 +1503,6 @@ "ctxt": 0 }, "value": "mine", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1572,7 +1544,6 @@ "ctxt": 0 }, "value": "simple", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1596,7 +1567,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1616,8 +1586,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1665,7 +1635,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "property": { @@ -1676,7 +1645,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1711,7 +1679,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1738,7 +1705,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "params": [], diff --git a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInFunctions3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInFunctions3/input.ts.json index c7baefa5a940..60a565ed26ce 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInFunctions3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInFunctions3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "check", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "prop", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -85,13 +84,11 @@ "ctxt": 0 }, "value": "TProp", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -127,7 +124,6 @@ "ctxt": 0 }, "value": "TProp", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -183,7 +179,6 @@ "ctxt": 0 }, "value": "Test", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -209,7 +204,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "function": { @@ -265,7 +259,6 @@ "ctxt": 0 }, "value": "check", - "typeAnnotation": null, "optional": false }, "computed": false @@ -308,7 +301,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInInterfaces/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInInterfaces/input.ts.json index 4858ce7a0a64..0e9ea9118ae6 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInInterfaces/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInInterfaces/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -92,7 +90,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -106,6 +103,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -121,8 +119,7 @@ "ctxt": 0 } } - }, - "optional": false + } } ], "typeAnn": { @@ -161,7 +158,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -191,6 +187,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -206,8 +203,7 @@ "ctxt": 0 } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -244,6 +240,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -259,8 +256,7 @@ "ctxt": 0 } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -292,6 +288,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -308,8 +305,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -353,7 +349,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -380,7 +375,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -413,7 +407,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -442,7 +435,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -466,7 +458,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -509,7 +500,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -539,7 +529,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -588,7 +577,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -665,7 +653,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -710,7 +697,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -736,7 +722,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -781,7 +766,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -807,7 +791,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -872,7 +855,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -902,6 +884,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -917,8 +900,7 @@ "ctxt": 0 } } - }, - "optional": false + } } ], "typeParams": null, @@ -958,7 +940,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -988,6 +969,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1003,8 +985,7 @@ "ctxt": 0 } } - }, - "optional": false + } } ], "typeParams": null, @@ -1045,7 +1026,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1074,7 +1054,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1115,7 +1094,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1144,7 +1122,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1229,7 +1206,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1259,6 +1235,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1275,8 +1252,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "typeParams": null, @@ -1303,7 +1279,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInObjectLiterals/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInObjectLiterals/input.ts.json index 5a1dcae4fa9a..0e9b5caae900 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInObjectLiterals/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInObjectLiterals/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -80,7 +79,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "params": [], @@ -135,7 +133,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -148,7 +145,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -171,7 +167,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -229,7 +224,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -242,7 +236,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -287,8 +280,8 @@ "ctxt": 0 }, "value": "mutuallyRecursive", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -308,7 +301,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -331,7 +323,6 @@ "ctxt": 0 }, "value": "start", - "typeAnnotation": null, "optional": false }, "params": [], @@ -386,7 +377,6 @@ "ctxt": 0 }, "value": "passthrough", - "typeAnnotation": null, "optional": false }, "computed": false @@ -417,7 +407,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -444,7 +433,6 @@ "ctxt": 0 }, "value": "passthrough", - "typeAnnotation": null, "optional": false }, "params": [ @@ -464,6 +452,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -480,8 +469,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -536,7 +524,6 @@ "ctxt": 0 }, "value": "sub1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -552,7 +539,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -577,7 +563,6 @@ "ctxt": 0 }, "value": "sub1", - "typeAnnotation": null, "optional": false }, "params": [ @@ -597,6 +582,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -613,8 +599,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -655,7 +640,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -713,7 +697,6 @@ "ctxt": 0 }, "value": "passthrough", - "typeAnnotation": null, "optional": false }, "computed": false @@ -737,7 +720,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "right": { @@ -774,7 +756,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -832,6 +813,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -848,8 +830,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -873,7 +854,6 @@ "ctxt": 0 }, "value": "mutuallyRecursive", - "typeAnnotation": null, "optional": false }, "property": { @@ -884,7 +864,6 @@ "ctxt": 0 }, "value": "start", - "typeAnnotation": null, "optional": false }, "computed": false @@ -911,7 +890,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -941,7 +919,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -983,7 +960,6 @@ "ctxt": 0 }, "value": "start", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1024,7 +1000,6 @@ "ctxt": 0 }, "value": "passthrough", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1038,6 +1013,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1054,8 +1030,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -1093,7 +1068,6 @@ "ctxt": 0 }, "value": "sub1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1107,6 +1081,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1123,8 +1098,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -1174,6 +1148,7 @@ "ctxt": 0 }, "value": "impl", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1196,13 +1171,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1212,7 +1185,6 @@ "ctxt": 0 }, "value": "mutuallyRecursive", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInObjectLiterals2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInObjectLiterals2/input.ts.json index 56763ae5d814..83ff28e9af22 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInObjectLiterals2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInObjectLiterals2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -75,7 +74,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -123,7 +121,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -146,7 +143,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -174,7 +170,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -195,7 +190,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "params": [], @@ -250,7 +244,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -284,7 +277,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -326,7 +318,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -350,7 +341,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -392,7 +382,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -416,7 +405,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "param": { @@ -427,8 +415,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -476,7 +464,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -489,7 +476,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -519,7 +505,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -547,7 +532,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -589,7 +573,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -631,7 +614,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -673,7 +655,6 @@ "ctxt": 0 }, "value": "moveBy", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -687,6 +668,7 @@ "ctxt": 0 }, "value": "dx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -703,8 +685,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -714,6 +695,7 @@ "ctxt": 0 }, "value": "dy", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -730,8 +712,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -741,6 +722,7 @@ "ctxt": 0 }, "value": "dz", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -757,8 +739,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnn": { @@ -808,6 +789,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -830,13 +812,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -856,7 +836,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -879,7 +858,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -902,7 +880,6 @@ "ctxt": 0 }, "value": "moveBy", - "typeAnnotation": null, "optional": false }, "params": [ @@ -922,8 +899,8 @@ "ctxt": 0 }, "value": "dx", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -942,8 +919,8 @@ "ctxt": 0 }, "value": "dy", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -962,8 +939,8 @@ "ctxt": 0 }, "value": "dz", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1019,7 +996,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1032,7 +1008,6 @@ "ctxt": 0 }, "value": "dx", - "typeAnnotation": null, "optional": false } } @@ -1075,7 +1050,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1088,7 +1062,6 @@ "ctxt": 0 }, "value": "dy", - "typeAnnotation": null, "optional": false } } @@ -1131,7 +1104,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1144,7 +1116,6 @@ "ctxt": 0 }, "value": "dz", - "typeAnnotation": null, "optional": false } }, @@ -1194,7 +1165,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1207,7 +1177,6 @@ "ctxt": 0 }, "value": "dz", - "typeAnnotation": null, "optional": false } } @@ -1254,6 +1223,7 @@ "ctxt": 0 }, "value": "p2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1284,7 +1254,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1300,8 +1269,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1321,7 +1289,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1344,7 +1311,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1367,7 +1333,6 @@ "ctxt": 0 }, "value": "moveBy", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1387,8 +1352,8 @@ "ctxt": 0 }, "value": "dx", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1407,8 +1372,8 @@ "ctxt": 0 }, "value": "dy", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1427,8 +1392,8 @@ "ctxt": 0 }, "value": "dz", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1484,7 +1449,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1497,7 +1461,6 @@ "ctxt": 0 }, "value": "dx", - "typeAnnotation": null, "optional": false } } @@ -1540,7 +1503,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1553,7 +1515,6 @@ "ctxt": 0 }, "value": "dy", - "typeAnnotation": null, "optional": false } } @@ -1596,7 +1557,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1609,7 +1569,6 @@ "ctxt": 0 }, "value": "dz", - "typeAnnotation": null, "optional": false } }, @@ -1659,7 +1618,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1672,7 +1630,6 @@ "ctxt": 0 }, "value": "dz", - "typeAnnotation": null, "optional": false } } @@ -1719,6 +1676,7 @@ "ctxt": 0 }, "value": "p3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1749,7 +1707,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1765,8 +1722,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1786,7 +1742,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1809,7 +1764,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1832,7 +1786,6 @@ "ctxt": 0 }, "value": "moveBy", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1852,8 +1805,8 @@ "ctxt": 0 }, "value": "dx", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1872,8 +1825,8 @@ "ctxt": 0 }, "value": "dy", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -1892,8 +1845,8 @@ "ctxt": 0 }, "value": "dz", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1949,7 +1902,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1962,7 +1914,6 @@ "ctxt": 0 }, "value": "dx", - "typeAnnotation": null, "optional": false } } @@ -2005,7 +1956,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2018,7 +1968,6 @@ "ctxt": 0 }, "value": "dy", - "typeAnnotation": null, "optional": false } } @@ -2061,7 +2010,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2074,7 +2022,6 @@ "ctxt": 0 }, "value": "dz", - "typeAnnotation": null, "optional": false } }, @@ -2124,7 +2071,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2137,7 +2083,6 @@ "ctxt": 0 }, "value": "dz", - "typeAnnotation": null, "optional": false } } @@ -2184,6 +2129,7 @@ "ctxt": 0 }, "value": "p4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2214,7 +2160,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2239,8 +2184,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -2260,7 +2204,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -2283,7 +2226,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2306,7 +2248,6 @@ "ctxt": 0 }, "value": "moveBy", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2326,8 +2267,8 @@ "ctxt": 0 }, "value": "dx", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -2346,8 +2287,8 @@ "ctxt": 0 }, "value": "dy", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -2366,8 +2307,8 @@ "ctxt": 0 }, "value": "dz", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -2423,7 +2364,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2436,7 +2376,6 @@ "ctxt": 0 }, "value": "dx", - "typeAnnotation": null, "optional": false } } @@ -2479,7 +2418,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2492,7 +2430,6 @@ "ctxt": 0 }, "value": "dy", - "typeAnnotation": null, "optional": false } } @@ -2535,7 +2472,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2548,7 +2484,6 @@ "ctxt": 0 }, "value": "dz", - "typeAnnotation": null, "optional": false } }, @@ -2598,7 +2533,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2611,7 +2545,6 @@ "ctxt": 0 }, "value": "dz", - "typeAnnotation": null, "optional": false } } @@ -2643,7 +2576,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2664,6 +2596,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2686,13 +2619,11 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2746,7 +2677,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2770,7 +2700,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -2793,7 +2722,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -2816,7 +2744,6 @@ "ctxt": 0 }, "value": "moveBy", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2836,8 +2763,8 @@ "ctxt": 0 }, "value": "dx", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -2856,8 +2783,8 @@ "ctxt": 0 }, "value": "dy", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -2876,8 +2803,8 @@ "ctxt": 0 }, "value": "dz", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -2933,7 +2860,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2946,7 +2872,6 @@ "ctxt": 0 }, "value": "dx", - "typeAnnotation": null, "optional": false } } @@ -2989,7 +2914,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3002,7 +2926,6 @@ "ctxt": 0 }, "value": "dy", - "typeAnnotation": null, "optional": false } } @@ -3045,7 +2968,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3058,7 +2980,6 @@ "ctxt": 0 }, "value": "dz", - "typeAnnotation": null, "optional": false } }, @@ -3108,7 +3029,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3121,7 +3041,6 @@ "ctxt": 0 }, "value": "dz", - "typeAnnotation": null, "optional": false } } @@ -3154,7 +3073,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3175,6 +3093,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3205,7 +3124,6 @@ "ctxt": 0 }, "value": "Point", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3230,8 +3148,7 @@ } ] } - }, - "optional": false + } } } ], @@ -3285,7 +3202,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3309,7 +3225,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -3332,7 +3247,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -3355,7 +3269,6 @@ "ctxt": 0 }, "value": "moveBy", - "typeAnnotation": null, "optional": false }, "params": [ @@ -3375,8 +3288,8 @@ "ctxt": 0 }, "value": "dx", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -3395,8 +3308,8 @@ "ctxt": 0 }, "value": "dy", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } }, { @@ -3415,8 +3328,8 @@ "ctxt": 0 }, "value": "dz", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -3472,7 +3385,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3485,7 +3397,6 @@ "ctxt": 0 }, "value": "dx", - "typeAnnotation": null, "optional": false } } @@ -3528,7 +3439,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3541,7 +3451,6 @@ "ctxt": 0 }, "value": "dy", - "typeAnnotation": null, "optional": false } } @@ -3584,7 +3493,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3597,7 +3505,6 @@ "ctxt": 0 }, "value": "dz", - "typeAnnotation": null, "optional": false } }, @@ -3647,7 +3554,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3660,7 +3566,6 @@ "ctxt": 0 }, "value": "dz", - "typeAnnotation": null, "optional": false } } @@ -3699,7 +3604,6 @@ "ctxt": 0 }, "value": "ObjectDescriptor", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3725,7 +3629,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3746,7 +3649,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3778,7 +3680,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3807,7 +3708,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3831,7 +3731,6 @@ "ctxt": 0 }, "value": "methods", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3868,7 +3767,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3888,7 +3786,6 @@ "ctxt": 0 }, "value": "ThisType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3922,7 +3819,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3942,7 +3838,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3970,7 +3865,6 @@ "ctxt": 0 }, "value": "makeObject", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3991,6 +3885,7 @@ "ctxt": 0 }, "value": "desc", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4013,7 +3908,6 @@ "ctxt": 0 }, "value": "ObjectDescriptor", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4039,7 +3933,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4059,7 +3952,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4067,8 +3959,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4104,7 +3995,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4125,7 +4015,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4163,7 +4052,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4183,7 +4071,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4217,8 +4104,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4235,7 +4122,6 @@ "ctxt": 0 }, "value": "makeObject", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4259,7 +4145,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "value": { @@ -4280,7 +4165,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -4303,7 +4187,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -4329,7 +4212,6 @@ "ctxt": 0 }, "value": "methods", - "typeAnnotation": null, "optional": false }, "value": { @@ -4350,7 +4232,6 @@ "ctxt": 0 }, "value": "moveBy", - "typeAnnotation": null, "optional": false }, "params": [ @@ -4370,6 +4251,7 @@ "ctxt": 0 }, "value": "dx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4386,8 +4268,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -4406,6 +4287,7 @@ "ctxt": 0 }, "value": "dy", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4422,8 +4304,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -4479,7 +4360,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4492,7 +4372,6 @@ "ctxt": 0 }, "value": "dx", - "typeAnnotation": null, "optional": false } } @@ -4535,7 +4414,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4548,7 +4426,6 @@ "ctxt": 0 }, "value": "dy", - "typeAnnotation": null, "optional": false } } @@ -4589,7 +4466,6 @@ "ctxt": 0 }, "value": "ObjectDescriptor2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4615,7 +4491,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4636,7 +4511,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4667,7 +4541,6 @@ "ctxt": 0 }, "value": "ThisType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4701,7 +4574,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4721,7 +4593,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4755,7 +4626,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4784,7 +4654,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4808,7 +4677,6 @@ "ctxt": 0 }, "value": "methods", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4837,7 +4705,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4860,7 +4727,6 @@ "ctxt": 0 }, "value": "makeObject2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4881,6 +4747,7 @@ "ctxt": 0 }, "value": "desc", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4903,7 +4770,6 @@ "ctxt": 0 }, "value": "ObjectDescriptor", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4929,7 +4795,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4949,7 +4814,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4957,8 +4821,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4994,7 +4857,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5015,7 +4877,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5053,7 +4914,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5073,7 +4933,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5107,8 +4966,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5125,7 +4984,6 @@ "ctxt": 0 }, "value": "makeObject2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5149,7 +5007,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "value": { @@ -5170,7 +5027,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -5193,7 +5049,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -5219,7 +5074,6 @@ "ctxt": 0 }, "value": "methods", - "typeAnnotation": null, "optional": false }, "value": { @@ -5240,7 +5094,6 @@ "ctxt": 0 }, "value": "moveBy", - "typeAnnotation": null, "optional": false }, "params": [ @@ -5260,6 +5113,7 @@ "ctxt": 0 }, "value": "dx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5276,8 +5130,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -5296,6 +5149,7 @@ "ctxt": 0 }, "value": "dy", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5312,8 +5166,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -5369,7 +5222,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5382,7 +5234,6 @@ "ctxt": 0 }, "value": "dx", - "typeAnnotation": null, "optional": false } } @@ -5425,7 +5276,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5438,7 +5288,6 @@ "ctxt": 0 }, "value": "dy", - "typeAnnotation": null, "optional": false } } @@ -5479,7 +5328,6 @@ "ctxt": 0 }, "value": "PropDesc", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5505,7 +5353,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5537,7 +5384,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5566,7 +5412,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5590,7 +5435,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5618,7 +5462,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5642,7 +5485,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5656,6 +5498,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5678,13 +5521,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -5725,7 +5566,6 @@ "ctxt": 0 }, "value": "PropDescMap", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5751,7 +5591,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5782,7 +5621,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5808,7 +5646,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5833,7 +5670,6 @@ "ctxt": 0 }, "value": "PropDesc", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5867,7 +5703,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5887,7 +5722,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5908,7 +5742,6 @@ "ctxt": 0 }, "value": "defineProp", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5929,6 +5762,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5951,13 +5785,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -5976,6 +5808,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5998,13 +5831,11 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -6023,6 +5854,7 @@ "ctxt": 0 }, "value": "desc", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6053,7 +5885,6 @@ "ctxt": 0 }, "value": "PropDesc", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6079,7 +5910,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6102,7 +5932,6 @@ "ctxt": 0 }, "value": "ThisType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6128,7 +5957,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6138,8 +5966,7 @@ } ] } - }, - "optional": false + } } } ], @@ -6175,7 +6002,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6196,7 +6022,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6225,7 +6050,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6263,7 +6087,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6283,7 +6106,6 @@ "ctxt": 0 }, "value": "Record", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6309,7 +6131,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6329,7 +6150,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6351,7 +6171,6 @@ "ctxt": 0 }, "value": "defineProps", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -6372,6 +6191,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6394,13 +6214,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -6419,6 +6237,7 @@ "ctxt": 0 }, "value": "descs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6449,7 +6268,6 @@ "ctxt": 0 }, "value": "PropDescMap", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6475,7 +6293,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6498,7 +6315,6 @@ "ctxt": 0 }, "value": "ThisType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6524,7 +6340,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6534,8 +6349,7 @@ } ] } - }, - "optional": false + } } } ], @@ -6571,7 +6385,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6592,7 +6405,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6630,7 +6442,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6650,7 +6461,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6684,8 +6494,8 @@ "ctxt": 0 }, "value": "p10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6702,7 +6512,6 @@ "ctxt": 0 }, "value": "defineProp", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6716,7 +6525,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false } }, @@ -6757,7 +6565,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -6810,7 +6617,6 @@ "ctxt": 0 }, "value": "p10", - "typeAnnotation": null, "optional": false }, "property": { @@ -6821,7 +6627,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6849,7 +6654,6 @@ "ctxt": 0 }, "value": "p10", - "typeAnnotation": null, "optional": false }, "property": { @@ -6860,7 +6664,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6902,8 +6705,8 @@ "ctxt": 0 }, "value": "p11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6920,7 +6723,6 @@ "ctxt": 0 }, "value": "defineProp", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6934,7 +6736,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false } }, @@ -6975,7 +6776,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "params": [], @@ -7023,7 +6823,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7046,7 +6845,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "params": [ @@ -7066,6 +6864,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7082,8 +6881,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -7139,7 +6937,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7152,7 +6949,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -7204,7 +7000,6 @@ "ctxt": 0 }, "value": "p11", - "typeAnnotation": null, "optional": false }, "property": { @@ -7215,7 +7010,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7243,7 +7037,6 @@ "ctxt": 0 }, "value": "p11", - "typeAnnotation": null, "optional": false }, "property": { @@ -7254,7 +7047,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7296,8 +7088,8 @@ "ctxt": 0 }, "value": "p12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7314,7 +7106,6 @@ "ctxt": 0 }, "value": "defineProps", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7328,7 +7119,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false } }, @@ -7352,7 +7142,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -7373,7 +7162,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -7399,7 +7187,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -7420,7 +7207,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "params": [], @@ -7468,7 +7254,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7507,7 +7292,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "params": [ @@ -7527,6 +7311,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7543,8 +7328,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -7600,7 +7384,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7613,7 +7396,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -7668,7 +7450,6 @@ "ctxt": 0 }, "value": "p12", - "typeAnnotation": null, "optional": false }, "property": { @@ -7679,7 +7460,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7707,7 +7487,6 @@ "ctxt": 0 }, "value": "p12", - "typeAnnotation": null, "optional": false }, "property": { @@ -7718,7 +7497,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7765,7 +7543,6 @@ "ctxt": 0 }, "value": "p12", - "typeAnnotation": null, "optional": false }, "property": { @@ -7776,7 +7553,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7804,7 +7580,6 @@ "ctxt": 0 }, "value": "p12", - "typeAnnotation": null, "optional": false }, "property": { @@ -7815,7 +7590,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7848,7 +7622,6 @@ "ctxt": 0 }, "value": "Accessors", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7874,7 +7647,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7905,7 +7677,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7931,7 +7702,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7995,7 +7765,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8015,7 +7784,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8039,7 +7807,6 @@ "ctxt": 0 }, "value": "Computed", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8073,7 +7840,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8093,7 +7859,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8122,7 +7887,6 @@ "ctxt": 0 }, "value": "Dictionary", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8148,7 +7912,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8175,6 +7938,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8191,8 +7955,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -8217,7 +7980,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8249,7 +8011,6 @@ "ctxt": 0 }, "value": "Computed", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8275,7 +8036,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8307,7 +8067,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8335,7 +8094,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8359,7 +8117,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8373,6 +8130,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8395,13 +8153,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -8442,7 +8198,6 @@ "ctxt": 0 }, "value": "VueOptions", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8468,7 +8223,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8489,7 +8243,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8510,7 +8263,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8541,7 +8293,6 @@ "ctxt": 0 }, "value": "ThisType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8575,7 +8326,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8595,7 +8345,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8615,7 +8364,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8649,7 +8397,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8686,7 +8433,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8729,7 +8475,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8758,7 +8503,6 @@ "ctxt": 0 }, "value": "methods", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8787,7 +8531,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8811,7 +8554,6 @@ "ctxt": 0 }, "value": "computed", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8840,7 +8582,6 @@ "ctxt": 0 }, "value": "Accessors", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8866,7 +8607,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8907,6 +8647,7 @@ "ctxt": 0 }, "value": "Vue", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8930,6 +8671,7 @@ "ctxt": 0 }, "value": "options", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8952,7 +8694,6 @@ "ctxt": 0 }, "value": "VueOptions", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8978,7 +8719,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8998,7 +8738,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9018,7 +8757,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9026,8 +8764,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": { @@ -9053,7 +8790,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9074,7 +8810,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9095,7 +8830,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9133,7 +8867,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9153,7 +8886,6 @@ "ctxt": 0 }, "value": "M", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9173,7 +8905,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9183,8 +8914,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -9216,8 +8946,8 @@ "ctxt": 0 }, "value": "vue", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -9234,7 +8964,6 @@ "ctxt": 0 }, "value": "Vue", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9258,7 +8987,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "value": { @@ -9294,7 +9022,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -9317,7 +9044,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -9349,7 +9075,6 @@ "ctxt": 0 }, "value": "methods", - "typeAnnotation": null, "optional": false }, "value": { @@ -9370,7 +9095,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [ @@ -9390,6 +9114,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9406,8 +9131,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -9455,7 +9179,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9481,7 +9204,6 @@ "ctxt": 0 }, "value": "computed", - "typeAnnotation": null, "optional": false }, "value": { @@ -9502,7 +9224,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "params": [], @@ -9550,7 +9271,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9589,7 +9309,6 @@ "ctxt": 0 }, "value": "hello", - "typeAnnotation": null, "optional": false }, "value": { @@ -9610,7 +9329,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "params": [], @@ -9667,7 +9385,6 @@ "ctxt": 0 }, "value": "set", - "typeAnnotation": null, "optional": false }, "params": [ @@ -9687,6 +9404,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9703,8 +9421,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -9759,7 +9476,6 @@ "ctxt": 0 }, "value": "vue", - "typeAnnotation": null, "optional": false } }, @@ -9785,7 +9501,6 @@ "ctxt": 0 }, "value": "vue", - "typeAnnotation": null, "optional": false }, "property": { @@ -9796,7 +9511,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9831,7 +9545,6 @@ "ctxt": 0 }, "value": "vue", - "typeAnnotation": null, "optional": false }, "property": { @@ -9842,7 +9555,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9891,7 +9603,6 @@ "ctxt": 0 }, "value": "vue", - "typeAnnotation": null, "optional": false }, "property": { @@ -9902,7 +9613,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9930,7 +9640,6 @@ "ctxt": 0 }, "value": "vue", - "typeAnnotation": null, "optional": false }, "property": { @@ -9941,7 +9650,6 @@ "ctxt": 0 }, "value": "hello", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInTuples/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInTuples/input.ts.json index 54f2fb6d52ef..e9841b1570ee 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInTuples/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInTuples/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "slice", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -133,6 +130,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -186,8 +184,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -257,8 +254,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -282,7 +279,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -293,7 +289,6 @@ "ctxt": 0 }, "value": "slice", - "typeAnnotation": null, "optional": false }, "computed": false @@ -330,8 +325,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -355,7 +350,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -366,7 +360,6 @@ "ctxt": 0 }, "value": "slice", - "typeAnnotation": null, "optional": false }, "computed": false @@ -416,8 +409,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -441,7 +434,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -452,7 +444,6 @@ "ctxt": 0 }, "value": "slice", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInTypePredicate/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInTypePredicate/input.ts.json index b4eff0638d40..b78a0f8a8451 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInTypePredicate/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeInTypePredicate/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "filter", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,6 +60,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -76,8 +77,7 @@ }, "kind": "void" } - }, - "optional": false + } }, { "type": "Identifier", @@ -87,6 +87,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -103,8 +104,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "typeParams": null, @@ -131,7 +131,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -156,7 +155,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -165,8 +163,7 @@ } } } - }, - "optional": false + } } } ], @@ -202,7 +199,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -239,7 +235,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -272,8 +267,8 @@ "ctxt": 0 }, "value": "numbers", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -290,7 +285,6 @@ "ctxt": 0 }, "value": "filter", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -312,8 +306,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -354,7 +348,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -385,7 +378,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeOptionalCall/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeOptionalCall/input.ts.json index fc3a73d046d8..8fe478825c24 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeOptionalCall/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeOptionalCall/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "maybeBind", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "fn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -122,6 +121,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -144,13 +144,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "RestElement", @@ -172,8 +170,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -197,7 +195,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -228,7 +225,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -247,8 +243,7 @@ } ] } - }, - "optional": false + } } } ], @@ -307,7 +302,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "property": { @@ -318,7 +312,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -335,7 +328,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -370,7 +362,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -391,7 +382,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -428,7 +418,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -486,8 +475,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -511,7 +500,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -542,7 +530,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeSyntacticContext/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeSyntacticContext/input.ts.json index 62d7a0c41a3b..9fd5c3bb4f53 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeSyntacticContext/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/thisType/thisTypeSyntacticContext/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -68,7 +68,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -96,8 +95,7 @@ } ] } - }, - "optional": false + } } } ], @@ -146,6 +144,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -177,7 +176,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -219,7 +217,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -249,6 +246,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -280,7 +278,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -308,8 +305,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -336,8 +332,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -357,7 +352,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -406,7 +400,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -417,7 +410,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "computed": false @@ -430,7 +422,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -464,7 +455,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -475,7 +465,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "computed": false @@ -520,7 +509,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } }, @@ -532,7 +520,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "computed": false @@ -577,7 +564,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -588,7 +574,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "computed": false @@ -648,7 +633,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -659,7 +643,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "computed": false @@ -714,7 +697,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -725,7 +707,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "computed": false @@ -772,7 +753,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -783,7 +763,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/thisType/typeRelationships/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/thisType/typeRelationships/input.ts.json index 36ff2b2cd2c0..7ccc8cb650d5 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/thisType/typeRelationships/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/thisType/typeRelationships/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "value": { @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -97,7 +94,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -129,7 +125,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -192,7 +187,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "function": { @@ -249,7 +243,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -277,7 +270,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "computed": false @@ -322,7 +314,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "computed": false @@ -350,7 +341,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -385,7 +375,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "function": { @@ -429,6 +418,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -458,14 +448,12 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -497,8 +485,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -544,7 +532,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -581,6 +568,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -604,8 +592,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -637,8 +624,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -684,7 +671,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "computed": false @@ -711,7 +697,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -749,7 +734,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "function": { @@ -770,6 +754,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -786,8 +771,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -827,7 +811,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -853,7 +836,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -881,7 +863,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "computed": false @@ -918,7 +899,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -944,7 +924,6 @@ "ctxt": 0 }, "value": "self1", - "typeAnnotation": null, "optional": false }, "value": { @@ -981,7 +960,6 @@ "ctxt": 0 }, "value": "self2", - "typeAnnotation": null, "optional": false }, "value": { @@ -1007,7 +985,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1038,7 +1015,6 @@ "ctxt": 0 }, "value": "self3", - "typeAnnotation": null, "optional": false }, "value": { @@ -1071,7 +1047,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1105,7 +1080,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -1123,7 +1097,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1155,7 +1128,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -1212,7 +1184,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1240,7 +1211,6 @@ "ctxt": 0 }, "value": "self1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1285,7 +1255,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1313,7 +1282,6 @@ "ctxt": 0 }, "value": "self2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1358,7 +1326,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1386,7 +1353,6 @@ "ctxt": 0 }, "value": "self3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1431,7 +1397,6 @@ "ctxt": 0 }, "value": "self1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1459,7 +1424,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1504,7 +1468,6 @@ "ctxt": 0 }, "value": "self2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1532,7 +1495,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1577,7 +1539,6 @@ "ctxt": 0 }, "value": "self3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1605,7 +1566,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1650,7 +1610,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1678,7 +1637,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1723,7 +1681,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1751,7 +1708,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1796,7 +1752,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1824,7 +1779,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1869,7 +1823,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1897,7 +1850,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1926,7 +1878,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/thisType/unionThisTypeInFunctions/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/thisType/unionThisTypeInFunctions/input.ts.json index b946d4d38000..0779243fc4e2 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/thisType/unionThisTypeInFunctions/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/thisType/unionThisTypeInFunctions/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Real", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -65,6 +63,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,8 +79,7 @@ "ctxt": 0 } } - }, - "optional": false + } }, { "type": "Identifier", @@ -91,6 +89,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -107,8 +106,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -146,7 +144,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +187,6 @@ "ctxt": 0 }, "value": "Fake", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -220,7 +216,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -234,6 +229,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -249,8 +245,7 @@ "ctxt": 0 } } - }, - "optional": false + } }, { "type": "Identifier", @@ -260,6 +255,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -276,8 +272,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -315,7 +310,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -354,7 +348,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -375,6 +368,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -405,7 +399,6 @@ "ctxt": 0 }, "value": "Real", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -425,15 +418,13 @@ "ctxt": 0 }, "value": "Fake", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -480,7 +471,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -491,7 +481,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/tuple/arityAndOrderCompatibility01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/tuple/arityAndOrderCompatibility01/input.ts.json index 662e1606d6bb..9c36f6053581 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/tuple/arityAndOrderCompatibility01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/tuple/arityAndOrderCompatibility01/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "StrNum", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -189,7 +187,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -251,6 +248,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -304,8 +302,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -337,6 +334,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -359,13 +357,11 @@ "ctxt": 0 }, "value": "StrNum", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -397,6 +393,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -508,7 +505,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -544,8 +540,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -585,8 +580,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -596,8 +591,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -607,8 +602,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -622,7 +617,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -662,8 +656,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -673,8 +667,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -684,8 +678,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -699,7 +693,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -739,8 +732,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -750,8 +743,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -761,8 +754,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -776,7 +769,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "definite": false @@ -808,6 +800,7 @@ "ctxt": 0 }, "value": "j1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -879,8 +872,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -890,7 +882,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -922,6 +913,7 @@ "ctxt": 0 }, "value": "j2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -993,8 +985,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1004,7 +995,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1036,6 +1026,7 @@ "ctxt": 0 }, "value": "j3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1107,8 +1098,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1118,7 +1108,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1150,6 +1139,7 @@ "ctxt": 0 }, "value": "k1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1221,8 +1211,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1232,7 +1221,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1264,6 +1252,7 @@ "ctxt": 0 }, "value": "k2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1335,8 +1324,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1346,7 +1334,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1378,6 +1365,7 @@ "ctxt": 0 }, "value": "k3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1449,8 +1437,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1460,7 +1447,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1492,6 +1478,7 @@ "ctxt": 0 }, "value": "l1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1527,8 +1514,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1538,7 +1524,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1570,6 +1555,7 @@ "ctxt": 0 }, "value": "l2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1605,8 +1591,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1616,7 +1601,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1648,6 +1632,7 @@ "ctxt": 0 }, "value": "l3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1683,8 +1668,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1694,7 +1678,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1726,6 +1709,7 @@ "ctxt": 0 }, "value": "m1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1761,8 +1745,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1772,7 +1755,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1804,6 +1786,7 @@ "ctxt": 0 }, "value": "m2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1839,8 +1822,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1850,7 +1832,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1882,6 +1863,7 @@ "ctxt": 0 }, "value": "m3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1917,8 +1899,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1928,7 +1909,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1960,6 +1940,7 @@ "ctxt": 0 }, "value": "n1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2013,8 +1994,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2024,7 +2004,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2056,6 +2035,7 @@ "ctxt": 0 }, "value": "n2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2109,8 +2089,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2120,7 +2099,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2152,6 +2130,7 @@ "ctxt": 0 }, "value": "n3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2205,8 +2184,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2216,7 +2194,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2248,6 +2225,7 @@ "ctxt": 0 }, "value": "o1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2301,8 +2279,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2312,7 +2289,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2344,6 +2320,7 @@ "ctxt": 0 }, "value": "o2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2397,8 +2374,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2408,7 +2384,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2440,6 +2415,7 @@ "ctxt": 0 }, "value": "o3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2493,8 +2469,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2504,7 +2479,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/tuple/castingTuple/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/tuple/castingTuple/input.ts.json index 223b994875bc..b042df11274a 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/tuple/castingTuple/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/tuple/castingTuple/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -47,7 +46,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -73,7 +71,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -113,7 +110,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -139,7 +135,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -175,7 +170,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -226,7 +219,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -262,7 +254,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -287,7 +278,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -313,7 +303,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": null, @@ -337,7 +326,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -363,7 +351,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -389,7 +376,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": null, @@ -413,7 +399,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -446,7 +431,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "members": [ @@ -465,7 +449,6 @@ "ctxt": 0 }, "value": "one", - "typeAnnotation": null, "optional": false }, "init": null @@ -489,7 +472,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "members": [ @@ -508,7 +490,6 @@ "ctxt": 0 }, "value": "one", - "typeAnnotation": null, "optional": false }, "init": null @@ -540,6 +521,7 @@ "ctxt": 0 }, "value": "numStrTuple", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -593,8 +575,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -664,8 +645,8 @@ "ctxt": 0 }, "value": "emptyObjTuple", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -682,7 +663,6 @@ "ctxt": 0 }, "value": "numStrTuple", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -761,8 +741,8 @@ "ctxt": 0 }, "value": "numStrBoolTuple", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -779,7 +759,6 @@ "ctxt": 0 }, "value": "numStrTuple", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -876,8 +855,8 @@ "ctxt": 0 }, "value": "shorter", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -894,7 +873,6 @@ "ctxt": 0 }, "value": "numStrBoolTuple", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -973,8 +951,8 @@ "ctxt": 0 }, "value": "longer", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -991,7 +969,6 @@ "ctxt": 0 }, "value": "numStrTuple", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1088,6 +1065,7 @@ "ctxt": 0 }, "value": "classCDTuple", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1126,7 +1104,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1155,7 +1132,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1163,8 +1139,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1191,7 +1166,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1215,7 +1189,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1253,8 +1226,8 @@ "ctxt": 0 }, "value": "interfaceIITuple", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -1271,7 +1244,6 @@ "ctxt": 0 }, "value": "classCDTuple", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1305,7 +1277,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1334,7 +1305,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1372,8 +1342,8 @@ "ctxt": 0 }, "value": "classCDATuple", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -1390,7 +1360,6 @@ "ctxt": 0 }, "value": "classCDTuple", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1424,7 +1393,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1453,7 +1421,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1482,7 +1449,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1520,8 +1486,8 @@ "ctxt": 0 }, "value": "eleFromCDA1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1538,7 +1504,6 @@ "ctxt": 0 }, "value": "classCDATuple", - "typeAnnotation": null, "optional": false }, "property": { @@ -1581,8 +1546,8 @@ "ctxt": 0 }, "value": "eleFromCDA2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1599,7 +1564,6 @@ "ctxt": 0 }, "value": "classCDATuple", - "typeAnnotation": null, "optional": false }, "property": { @@ -1642,6 +1606,7 @@ "ctxt": 0 }, "value": "t10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1680,7 +1645,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1709,7 +1673,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1717,8 +1680,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1745,7 +1707,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1756,7 +1717,6 @@ "ctxt": 0 }, "value": "one", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1779,7 +1739,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1790,7 +1749,6 @@ "ctxt": 0 }, "value": "one", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1827,8 +1785,8 @@ "ctxt": 0 }, "value": "t11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -1845,7 +1803,6 @@ "ctxt": 0 }, "value": "t10", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1924,8 +1881,8 @@ "ctxt": 0 }, "value": "array1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -1942,7 +1899,6 @@ "ctxt": 0 }, "value": "emptyObjTuple", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1992,6 +1948,7 @@ "ctxt": 0 }, "value": "unionTuple", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2030,7 +1987,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2075,8 +2031,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -2103,7 +2058,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2158,6 +2112,7 @@ "ctxt": 0 }, "value": "unionTuple2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2196,7 +2151,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2262,7 +2216,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2270,8 +2223,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -2298,7 +2250,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2339,7 +2290,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2377,6 +2327,7 @@ "ctxt": 0 }, "value": "unionTuple3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2449,8 +2400,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -2520,8 +2470,8 @@ "ctxt": 0 }, "value": "unionTuple4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -2538,7 +2488,6 @@ "ctxt": 0 }, "value": "unionTuple3", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -2617,8 +2566,8 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -2635,7 +2584,6 @@ "ctxt": 0 }, "value": "numStrTuple", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -2714,8 +2662,8 @@ "ctxt": 0 }, "value": "t9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -2732,7 +2680,6 @@ "ctxt": 0 }, "value": "classCDTuple", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -2766,7 +2713,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2795,7 +2741,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2833,8 +2778,8 @@ "ctxt": 0 }, "value": "array1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -2851,7 +2796,6 @@ "ctxt": 0 }, "value": "numStrTuple", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -2906,7 +2850,6 @@ "ctxt": 0 }, "value": "t4", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/tuple/contextualTypeWithTuple/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/tuple/contextualTypeWithTuple/input.ts.json index 42f2c5227270..afaf4f2d8d16 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/tuple/contextualTypeWithTuple/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/tuple/contextualTypeWithTuple/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "numStrTuple", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,8 +85,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -155,6 +155,7 @@ "ctxt": 0 }, "value": "numStrTuple2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -208,8 +209,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -291,6 +291,7 @@ "ctxt": 0 }, "value": "numStrBoolTuple", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -362,8 +363,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -445,6 +445,7 @@ "ctxt": 0 }, "value": "objNumTuple", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -492,7 +493,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -541,8 +541,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -572,7 +571,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -636,6 +634,7 @@ "ctxt": 0 }, "value": "strTupleTuple", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -726,8 +725,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -796,7 +794,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -819,7 +816,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -854,7 +850,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -881,7 +876,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -923,6 +917,7 @@ "ctxt": 0 }, "value": "unionTuple", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -961,7 +956,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1006,8 +1000,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1034,7 +1027,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1089,6 +1081,7 @@ "ctxt": 0 }, "value": "unionTuple1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1127,7 +1120,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1172,8 +1164,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1200,7 +1191,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1255,6 +1245,7 @@ "ctxt": 0 }, "value": "unionTuple2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1293,7 +1284,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1359,7 +1349,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1367,8 +1356,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1395,7 +1383,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1436,7 +1423,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1474,6 +1460,7 @@ "ctxt": 0 }, "value": "unionTuple3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1546,8 +1533,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1615,8 +1601,8 @@ "ctxt": 0 }, "value": "numStrTuple", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1626,7 +1612,6 @@ "ctxt": 0 }, "value": "numStrTuple2", - "typeAnnotation": null, "optional": false } } @@ -1654,8 +1639,8 @@ "ctxt": 0 }, "value": "numStrTuple", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1665,7 +1650,6 @@ "ctxt": 0 }, "value": "numStrBoolTuple", - "typeAnnotation": null, "optional": false } } @@ -1693,8 +1677,8 @@ "ctxt": 0 }, "value": "objNumTuple", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -1755,8 +1739,8 @@ "ctxt": 0 }, "value": "numStrBoolTuple", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1766,7 +1750,6 @@ "ctxt": 0 }, "value": "numStrTuple", - "typeAnnotation": null, "optional": false } } @@ -1796,6 +1779,7 @@ "ctxt": 0 }, "value": "strStrTuple", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1849,8 +1833,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -1935,8 +1918,8 @@ "ctxt": 0 }, "value": "unionTuple", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1946,7 +1929,6 @@ "ctxt": 0 }, "value": "unionTuple1", - "typeAnnotation": null, "optional": false } } @@ -1974,8 +1956,8 @@ "ctxt": 0 }, "value": "unionTuple", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1985,7 +1967,6 @@ "ctxt": 0 }, "value": "unionTuple2", - "typeAnnotation": null, "optional": false } } @@ -2013,8 +1994,8 @@ "ctxt": 0 }, "value": "unionTuple2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2024,7 +2005,6 @@ "ctxt": 0 }, "value": "unionTuple", - "typeAnnotation": null, "optional": false } } @@ -2052,8 +2032,8 @@ "ctxt": 0 }, "value": "numStrTuple", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2063,7 +2043,6 @@ "ctxt": 0 }, "value": "unionTuple3", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/tuple/emptyTuples/emptyTuplesTypeAssertion01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/tuple/emptyTuples/emptyTuplesTypeAssertion01/input.ts.json index 84f2f0992d5b..df56e361083b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/tuple/emptyTuples/emptyTuplesTypeAssertion01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/tuple/emptyTuples/emptyTuplesTypeAssertion01/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -89,8 +89,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -107,7 +107,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/tuple/emptyTuples/emptyTuplesTypeAssertion02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/tuple/emptyTuples/emptyTuplesTypeAssertion02/input.ts.json index 3ac6a427ba64..0ec10b7b26fe 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/tuple/emptyTuples/emptyTuplesTypeAssertion02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/tuple/emptyTuples/emptyTuplesTypeAssertion02/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -89,8 +89,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -107,7 +107,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/tuple/indexerWithTuple/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/tuple/indexerWithTuple/input.ts.json index b85aa145f511..0023b8ca28f0 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/tuple/indexerWithTuple/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/tuple/indexerWithTuple/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "strNumTuple", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,8 +85,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -155,6 +155,7 @@ "ctxt": 0 }, "value": "numTupleTuple", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -245,8 +246,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -341,6 +341,7 @@ "ctxt": 0 }, "value": "unionTuple1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -413,8 +414,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -484,6 +484,7 @@ "ctxt": 0 }, "value": "unionTuple2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +557,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -627,8 +627,8 @@ "ctxt": 0 }, "value": "idx0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -668,8 +668,8 @@ "ctxt": 0 }, "value": "idx1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -709,8 +709,8 @@ "ctxt": 0 }, "value": "ele10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -727,7 +727,6 @@ "ctxt": 0 }, "value": "strNumTuple", - "typeAnnotation": null, "optional": false }, "property": { @@ -770,8 +769,8 @@ "ctxt": 0 }, "value": "ele11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -788,7 +787,6 @@ "ctxt": 0 }, "value": "strNumTuple", - "typeAnnotation": null, "optional": false }, "property": { @@ -831,8 +829,8 @@ "ctxt": 0 }, "value": "ele12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -849,7 +847,6 @@ "ctxt": 0 }, "value": "strNumTuple", - "typeAnnotation": null, "optional": false }, "property": { @@ -892,8 +889,8 @@ "ctxt": 0 }, "value": "ele13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -910,7 +907,6 @@ "ctxt": 0 }, "value": "strNumTuple", - "typeAnnotation": null, "optional": false }, "property": { @@ -921,7 +917,6 @@ "ctxt": 0 }, "value": "idx0", - "typeAnnotation": null, "optional": false }, "computed": true @@ -955,8 +950,8 @@ "ctxt": 0 }, "value": "ele14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -973,7 +968,6 @@ "ctxt": 0 }, "value": "strNumTuple", - "typeAnnotation": null, "optional": false }, "property": { @@ -984,7 +978,6 @@ "ctxt": 0 }, "value": "idx1", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1018,8 +1011,8 @@ "ctxt": 0 }, "value": "ele15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1036,7 +1029,6 @@ "ctxt": 0 }, "value": "strNumTuple", - "typeAnnotation": null, "optional": false }, "property": { @@ -1084,8 +1076,8 @@ "ctxt": 0 }, "value": "ele16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1102,7 +1094,6 @@ "ctxt": 0 }, "value": "strNumTuple", - "typeAnnotation": null, "optional": false }, "property": { @@ -1150,8 +1141,8 @@ "ctxt": 0 }, "value": "strNumTuple1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1168,7 +1159,6 @@ "ctxt": 0 }, "value": "numTupleTuple", - "typeAnnotation": null, "optional": false }, "property": { @@ -1211,8 +1201,8 @@ "ctxt": 0 }, "value": "ele17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1229,7 +1219,6 @@ "ctxt": 0 }, "value": "numTupleTuple", - "typeAnnotation": null, "optional": false }, "property": { @@ -1272,8 +1261,8 @@ "ctxt": 0 }, "value": "eleUnion10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1290,7 +1279,6 @@ "ctxt": 0 }, "value": "unionTuple1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1333,8 +1321,8 @@ "ctxt": 0 }, "value": "eleUnion11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1351,7 +1339,6 @@ "ctxt": 0 }, "value": "unionTuple1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1394,8 +1381,8 @@ "ctxt": 0 }, "value": "eleUnion12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1412,7 +1399,6 @@ "ctxt": 0 }, "value": "unionTuple1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1455,8 +1441,8 @@ "ctxt": 0 }, "value": "eleUnion13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1473,7 +1459,6 @@ "ctxt": 0 }, "value": "unionTuple1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1484,7 +1469,6 @@ "ctxt": 0 }, "value": "idx0", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1518,8 +1502,8 @@ "ctxt": 0 }, "value": "eleUnion14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1536,7 +1520,6 @@ "ctxt": 0 }, "value": "unionTuple1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1547,7 +1530,6 @@ "ctxt": 0 }, "value": "idx1", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1581,8 +1563,8 @@ "ctxt": 0 }, "value": "eleUnion15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1599,7 +1581,6 @@ "ctxt": 0 }, "value": "unionTuple1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1647,8 +1628,8 @@ "ctxt": 0 }, "value": "eleUnion16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1665,7 +1646,6 @@ "ctxt": 0 }, "value": "unionTuple1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1713,8 +1693,8 @@ "ctxt": 0 }, "value": "eleUnion20", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1731,7 +1711,6 @@ "ctxt": 0 }, "value": "unionTuple2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1774,8 +1753,8 @@ "ctxt": 0 }, "value": "eleUnion21", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1792,7 +1771,6 @@ "ctxt": 0 }, "value": "unionTuple2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1835,8 +1813,8 @@ "ctxt": 0 }, "value": "eleUnion22", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1853,7 +1831,6 @@ "ctxt": 0 }, "value": "unionTuple2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1896,8 +1873,8 @@ "ctxt": 0 }, "value": "eleUnion23", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1914,7 +1891,6 @@ "ctxt": 0 }, "value": "unionTuple2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1925,7 +1901,6 @@ "ctxt": 0 }, "value": "idx0", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1959,8 +1934,8 @@ "ctxt": 0 }, "value": "eleUnion24", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1977,7 +1952,6 @@ "ctxt": 0 }, "value": "unionTuple2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1988,7 +1962,6 @@ "ctxt": 0 }, "value": "idx1", - "typeAnnotation": null, "optional": false }, "computed": true @@ -2022,8 +1995,8 @@ "ctxt": 0 }, "value": "eleUnion25", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2040,7 +2013,6 @@ "ctxt": 0 }, "value": "unionTuple2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2088,8 +2060,8 @@ "ctxt": 0 }, "value": "eleUnion26", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2106,7 +2078,6 @@ "ctxt": 0 }, "value": "unionTuple2", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/tuple/named/namedTupleMembers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/tuple/named/namedTupleMembers/input.ts.json index 3a4e5575ad04..46f82731f0c0 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/tuple/named/namedTupleMembers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/tuple/named/namedTupleMembers/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "Segment", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -56,8 +55,8 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "ty": { "type": "TsKeywordType", @@ -84,8 +83,8 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "ty": { "type": "TsKeywordType", @@ -124,7 +123,6 @@ "ctxt": 0 }, "value": "SegmentAnnotated", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -151,8 +149,8 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "ty": { "type": "TsKeywordType", @@ -179,8 +177,8 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "ty": { "type": "TsKeywordType", @@ -221,6 +219,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -243,13 +242,11 @@ "ctxt": 0 }, "value": "Segment", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -281,6 +278,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -303,13 +301,11 @@ "ctxt": 0 }, "value": "SegmentAnnotated", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -341,6 +337,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -394,8 +391,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -427,6 +423,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -457,8 +454,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "ty": { "type": "TsKeywordType", @@ -485,8 +482,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "ty": { "type": "TsKeywordType", @@ -500,8 +497,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -531,8 +527,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -542,7 +538,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -570,8 +565,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -581,7 +576,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -609,8 +603,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -620,7 +614,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -648,8 +641,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -659,7 +652,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -687,8 +679,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -698,7 +690,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -726,8 +717,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -737,7 +728,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -765,8 +755,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -776,7 +766,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -804,8 +793,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -815,7 +804,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -843,8 +831,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -854,7 +842,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -882,8 +869,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -893,7 +880,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -921,8 +907,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -932,7 +918,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -960,8 +945,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -971,7 +956,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -999,7 +983,6 @@ "ctxt": 0 }, "value": "WithOptAndRest", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1026,8 +1009,8 @@ "ctxt": 0 }, "value": "first", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "ty": { "type": "TsKeywordType", @@ -1054,8 +1037,8 @@ "ctxt": 0 }, "value": "second", - "typeAnnotation": null, - "optional": true + "optional": true, + "typeAnnotation": null }, "ty": { "type": "TsKeywordType", @@ -1094,8 +1077,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null }, @@ -1144,7 +1127,6 @@ "ctxt": 0 }, "value": "Func", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1170,7 +1152,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1222,8 +1203,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1247,7 +1228,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1308,8 +1288,8 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -1358,7 +1338,6 @@ "ctxt": 0 }, "value": "Func", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1384,7 +1363,6 @@ "ctxt": 0 }, "value": "SegmentAnnotated", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1415,7 +1393,6 @@ "ctxt": 0 }, "value": "useState", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1436,6 +1413,7 @@ "ctxt": 0 }, "value": "initial", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1458,13 +1436,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1542,7 +1518,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1580,8 +1555,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "ty": { "type": "TsTypeReference", @@ -1598,7 +1573,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1619,8 +1593,8 @@ "ctxt": 0 }, "value": "setter", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "ty": { "type": "TsFunctionType", @@ -1638,8 +1612,8 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeParams": null, @@ -1690,7 +1664,6 @@ "ctxt": 0 }, "value": "Iter", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1709,7 +1682,6 @@ "ctxt": 0 }, "value": "Func", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1743,8 +1715,8 @@ "ctxt": 0 }, "value": "step", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "ty": { "type": "TsKeywordType", @@ -1771,8 +1743,8 @@ "ctxt": 0 }, "value": "iterations", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "ty": { "type": "TsKeywordType", @@ -1808,7 +1780,6 @@ "ctxt": 0 }, "value": "readSegment", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1837,8 +1808,8 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1848,8 +1819,8 @@ "ctxt": 0 }, "value": "count", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1963,8 +1934,8 @@ "ctxt": 0 }, "value": "val", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -2021,7 +1992,6 @@ "ctxt": 0 }, "value": "Parameters", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2047,7 +2017,6 @@ "ctxt": 0 }, "value": "readSegment", - "typeAnnotation": null, "optional": false } } @@ -2101,7 +2070,6 @@ "ctxt": 0 }, "value": "RecursiveTupleA", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2128,8 +2096,8 @@ "ctxt": 0 }, "value": "initial", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "ty": { "type": "TsKeywordType", @@ -2156,8 +2124,8 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "ty": { "type": "TsTypeReference", @@ -2174,7 +2142,6 @@ "ctxt": 0 }, "value": "RecursiveTupleA", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2207,7 +2174,6 @@ "ctxt": 0 }, "value": "RecursiveTupleB", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2234,8 +2200,8 @@ "ctxt": 0 }, "value": "first", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "ty": { "type": "TsKeywordType", @@ -2262,8 +2228,8 @@ "ctxt": 0 }, "value": "ptr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "ty": { "type": "TsTypeReference", @@ -2280,7 +2246,6 @@ "ctxt": 0 }, "value": "RecursiveTupleB", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2315,6 +2280,7 @@ "ctxt": 0 }, "value": "q", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2337,13 +2303,11 @@ "ctxt": 0 }, "value": "RecursiveTupleA", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2375,6 +2339,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2397,13 +2362,11 @@ "ctxt": 0 }, "value": "RecursiveTupleB", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2433,8 +2396,8 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2444,7 +2407,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false } } @@ -2472,8 +2434,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2483,7 +2445,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false } } @@ -2511,7 +2472,6 @@ "ctxt": 0 }, "value": "RecusiveRest", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2538,8 +2498,8 @@ "ctxt": 0 }, "value": "first", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "ty": { "type": "TsKeywordType", @@ -2578,8 +2538,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null }, @@ -2605,7 +2565,6 @@ "ctxt": 0 }, "value": "RecusiveRest", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2639,7 +2598,6 @@ "ctxt": 0 }, "value": "RecusiveRest2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2706,7 +2664,6 @@ "ctxt": 0 }, "value": "RecusiveRest2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2743,6 +2700,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2765,13 +2723,11 @@ "ctxt": 0 }, "value": "RecusiveRest", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2803,6 +2759,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2825,13 +2782,11 @@ "ctxt": 0 }, "value": "RecusiveRest2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2861,8 +2816,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2872,7 +2827,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -2900,8 +2854,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2911,7 +2865,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2926,7 +2879,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2959,8 +2911,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2984,7 +2936,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3025,7 +2976,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3071,7 +3021,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3088,7 +3037,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3109,6 +3057,7 @@ "ctxt": 0 }, "value": "elem", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3125,8 +3074,7 @@ }, "kind": "object" } - }, - "optional": false + } } }, { @@ -3145,6 +3093,7 @@ "ctxt": 0 }, "value": "index", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3161,8 +3110,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -3204,7 +3152,6 @@ "ctxt": 0 }, "value": "getArgsForInjection", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3225,6 +3172,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3247,13 +3195,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3289,7 +3235,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3320,8 +3265,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -3395,7 +3340,6 @@ "ctxt": 0 }, "value": "Parameters", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3421,7 +3365,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3463,8 +3406,8 @@ "ctxt": 0 }, "value": "argumentsOfGAsFirstArgument", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3481,7 +3424,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3502,7 +3444,6 @@ "ctxt": 0 }, "value": "getArgsForInjection", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3516,7 +3457,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } } @@ -3564,8 +3504,8 @@ "ctxt": 0 }, "value": "argumentsOfG", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3582,7 +3522,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3607,7 +3546,6 @@ "ctxt": 0 }, "value": "getArgsForInjection", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3621,7 +3559,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/tuple/strictTupleLength/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/tuple/strictTupleLength/input.ts.json index 28aa3631bb6b..c27080edc512 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/tuple/strictTupleLength/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/tuple/strictTupleLength/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "t0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "elemTypes": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "t1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -115,8 +116,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -148,6 +148,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -201,8 +202,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -234,6 +234,7 @@ "ctxt": 0 }, "value": "arr", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -258,8 +259,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -291,6 +291,7 @@ "ctxt": 0 }, "value": "len0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -315,8 +316,7 @@ "value": 0.0 } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -333,7 +333,6 @@ "ctxt": 0 }, "value": "t0", - "typeAnnotation": null, "optional": false }, "property": { @@ -344,7 +343,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -378,6 +376,7 @@ "ctxt": 0 }, "value": "len1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -402,8 +401,7 @@ "value": 1.0 } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -420,7 +418,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "property": { @@ -431,7 +428,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -465,6 +461,7 @@ "ctxt": 0 }, "value": "len2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -489,8 +486,7 @@ "value": 2.0 } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -507,7 +503,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "property": { @@ -518,7 +513,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -552,6 +546,7 @@ "ctxt": 0 }, "value": "lena", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -568,8 +563,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -586,7 +580,6 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, "optional": false }, "property": { @@ -597,7 +590,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -631,8 +623,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -642,7 +634,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "definite": false @@ -674,8 +665,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -685,7 +676,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -708,7 +698,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -734,7 +723,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -781,7 +769,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -835,6 +822,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -857,7 +845,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -899,8 +886,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -932,6 +918,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -956,8 +943,7 @@ "value": 1.0 } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -967,7 +953,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "definite": false @@ -997,8 +982,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1008,7 +993,6 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, "optional": false } } @@ -1036,8 +1020,8 @@ "ctxt": 0 }, "value": "arr", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1047,7 +1031,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/tuple/tupleElementTypes1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/tuple/tupleElementTypes1/input.ts.json index 57ff2a9194c4..495f54db24b3 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/tuple/tupleElementTypes1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/tuple/tupleElementTypes1/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -128,7 +128,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -142,7 +141,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/tuple/tupleElementTypes2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/tuple/tupleElementTypes2/input.ts.json index a60dee15c027..1482a01c5b10 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/tuple/tupleElementTypes2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/tuple/tupleElementTypes2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -45,8 +44,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -56,8 +55,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/tuple/tupleElementTypes3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/tuple/tupleElementTypes3/input.ts.json index 78dfa0d7970e..73b6997e9f57 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/tuple/tupleElementTypes3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/tuple/tupleElementTypes3/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -87,7 +87,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/tuple/tupleElementTypes4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/tuple/tupleElementTypes4/input.ts.json index e300344af1c6..d8e9c70675a3 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/tuple/tupleElementTypes4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/tuple/tupleElementTypes4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,8 +51,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -63,8 +62,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -100,7 +99,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/tuple/tupleLengthCheck/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/tuple/tupleLengthCheck/input.ts.json index 24d63261d76e..1f86c9aa8f62 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/tuple/tupleLengthCheck/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/tuple/tupleLengthCheck/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,8 +85,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -117,6 +117,7 @@ "ctxt": 0 }, "value": "rest", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -204,8 +205,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -237,8 +237,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -255,7 +255,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -298,8 +297,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -316,7 +315,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -359,8 +357,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -377,7 +375,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -420,8 +417,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -438,7 +435,6 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, "optional": false }, "property": { @@ -481,8 +477,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -499,7 +495,6 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, "optional": false }, "property": { @@ -542,8 +537,8 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -560,7 +555,6 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, "optional": false }, "property": { @@ -603,8 +597,8 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -621,7 +615,6 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/tuple/typeInferenceWithTupleType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/tuple/typeInferenceWithTupleType/input.ts.json index d20d7247b42c..6c967bcae3a1 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/tuple/typeInferenceWithTupleType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/tuple/typeInferenceWithTupleType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "combine", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -106,13 +105,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -155,7 +152,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -203,7 +198,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -224,7 +218,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -270,7 +263,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -299,7 +291,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -334,8 +325,8 @@ "ctxt": 0 }, "value": "combineResult", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -352,7 +343,6 @@ "ctxt": 0 }, "value": "combine", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -417,8 +407,8 @@ "ctxt": 0 }, "value": "combineEle1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -435,7 +425,6 @@ "ctxt": 0 }, "value": "combineResult", - "typeAnnotation": null, "optional": false }, "property": { @@ -478,8 +467,8 @@ "ctxt": 0 }, "value": "combineEle2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -496,7 +485,6 @@ "ctxt": 0 }, "value": "combineResult", - "typeAnnotation": null, "optional": false }, "property": { @@ -524,7 +512,6 @@ "ctxt": 0 }, "value": "zip", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -545,6 +532,7 @@ "ctxt": 0 }, "value": "array1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -574,14 +562,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } }, { @@ -600,6 +586,7 @@ "ctxt": 0 }, "value": "array2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -629,14 +616,12 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -684,7 +669,6 @@ "ctxt": 0 }, "value": "array1", - "typeAnnotation": null, "optional": false }, "property": { @@ -695,7 +679,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -715,7 +698,6 @@ "ctxt": 0 }, "value": "array2", - "typeAnnotation": null, "optional": false }, "property": { @@ -726,7 +708,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -775,7 +756,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -789,7 +769,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -828,8 +807,8 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -846,7 +825,6 @@ "ctxt": 0 }, "value": "array1", - "typeAnnotation": null, "optional": false }, "property": { @@ -857,7 +835,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -891,6 +868,7 @@ "ctxt": 0 }, "value": "zipResult", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -945,7 +923,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -974,7 +951,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -985,8 +961,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1025,8 +1000,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1057,7 +1032,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "right": { @@ -1068,7 +1042,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false } }, @@ -1089,7 +1062,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -1130,7 +1102,6 @@ "ctxt": 0 }, "value": "zipResult", - "typeAnnotation": null, "optional": false }, "property": { @@ -1141,7 +1112,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1174,7 +1144,6 @@ "ctxt": 0 }, "value": "array1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1185,7 +1154,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1208,7 +1176,6 @@ "ctxt": 0 }, "value": "array2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1219,7 +1186,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": true @@ -1250,7 +1216,6 @@ "ctxt": 0 }, "value": "zipResult", - "typeAnnotation": null, "optional": false } } @@ -1281,7 +1246,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1302,7 +1266,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1364,7 +1327,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1393,7 +1355,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1431,8 +1392,8 @@ "ctxt": 0 }, "value": "zipResult", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1449,7 +1410,6 @@ "ctxt": 0 }, "value": "zip", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1569,8 +1529,8 @@ "ctxt": 0 }, "value": "zipResultEle", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1587,7 +1547,6 @@ "ctxt": 0 }, "value": "zipResult", - "typeAnnotation": null, "optional": false }, "property": { @@ -1630,8 +1589,8 @@ "ctxt": 0 }, "value": "zipResultEleEle", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1655,7 +1614,6 @@ "ctxt": 0 }, "value": "zipResult", - "typeAnnotation": null, "optional": false }, "property": { @@ -1694,7 +1652,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1715,6 +1672,7 @@ "ctxt": 0 }, "value": "values", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1760,7 +1718,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1797,7 +1754,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1806,8 +1762,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1843,7 +1798,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1864,7 +1818,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1894,7 +1847,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1911,7 +1863,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1932,6 +1883,7 @@ "ctxt": 0 }, "value": "values", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1985,7 +1937,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2022,7 +1973,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2032,8 +1982,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2069,7 +2018,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2090,7 +2038,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2120,7 +2067,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2152,6 +2098,7 @@ "ctxt": 0 }, "value": "expected", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2181,8 +2128,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2212,8 +2158,8 @@ "ctxt": 0 }, "value": "expected", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -2230,7 +2176,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2251,7 +2196,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -2372,8 +2316,8 @@ "ctxt": 0 }, "value": "expected", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -2390,7 +2334,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2411,7 +2354,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/tuple/unionsOfTupleTypes1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/tuple/unionsOfTupleTypes1/input.ts.json index 4b2ddc1cdb85..5eca07105a1f 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/tuple/unionsOfTupleTypes1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/tuple/unionsOfTupleTypes1/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -89,7 +88,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -194,7 +192,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -277,7 +274,6 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -398,7 +394,6 @@ "ctxt": 0 }, "value": "T10", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -425,7 +420,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -465,7 +459,6 @@ "ctxt": 0 }, "value": "T11", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -492,7 +485,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -532,7 +524,6 @@ "ctxt": 0 }, "value": "T12", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -559,7 +550,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -599,7 +589,6 @@ "ctxt": 0 }, "value": "T1N", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -626,7 +615,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -658,7 +646,6 @@ "ctxt": 0 }, "value": "T20", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -685,7 +672,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -725,7 +711,6 @@ "ctxt": 0 }, "value": "T21", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -752,7 +737,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -792,7 +776,6 @@ "ctxt": 0 }, "value": "T22", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -819,7 +802,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -859,7 +841,6 @@ "ctxt": 0 }, "value": "T2N", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -886,7 +867,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -918,7 +898,6 @@ "ctxt": 0 }, "value": "T30", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -945,7 +924,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -985,7 +963,6 @@ "ctxt": 0 }, "value": "T31", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1012,7 +989,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1052,7 +1028,6 @@ "ctxt": 0 }, "value": "T32", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1079,7 +1054,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1119,7 +1093,6 @@ "ctxt": 0 }, "value": "T3N", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1146,7 +1119,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1178,7 +1150,6 @@ "ctxt": 0 }, "value": "T40", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1205,7 +1176,6 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1245,7 +1215,6 @@ "ctxt": 0 }, "value": "T41", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1272,7 +1241,6 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1312,7 +1280,6 @@ "ctxt": 0 }, "value": "T42", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1339,7 +1306,6 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1379,7 +1345,6 @@ "ctxt": 0 }, "value": "T4N", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1406,7 +1371,6 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1432,7 +1396,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1453,6 +1416,7 @@ "ctxt": 0 }, "value": "t1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1475,13 +1439,11 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1500,6 +1462,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1522,13 +1485,11 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1547,6 +1508,7 @@ "ctxt": 0 }, "value": "t3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1569,13 +1531,11 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1594,6 +1554,7 @@ "ctxt": 0 }, "value": "t4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1616,13 +1577,11 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1641,6 +1600,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1657,8 +1617,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1709,8 +1668,8 @@ "ctxt": 0 }, "value": "d10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1720,8 +1679,8 @@ "ctxt": 0 }, "value": "d11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1731,8 +1690,8 @@ "ctxt": 0 }, "value": "d12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1746,7 +1705,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1786,8 +1744,8 @@ "ctxt": 0 }, "value": "d20", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1797,8 +1755,8 @@ "ctxt": 0 }, "value": "d21", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1808,8 +1766,8 @@ "ctxt": 0 }, "value": "d22", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1823,7 +1781,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1863,8 +1820,8 @@ "ctxt": 0 }, "value": "d30", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1874,8 +1831,8 @@ "ctxt": 0 }, "value": "d31", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1885,8 +1842,8 @@ "ctxt": 0 }, "value": "d32", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1900,7 +1857,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1940,8 +1896,8 @@ "ctxt": 0 }, "value": "d40", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1951,8 +1907,8 @@ "ctxt": 0 }, "value": "d41", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1962,8 +1918,8 @@ "ctxt": 0 }, "value": "d42", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -1977,7 +1933,6 @@ "ctxt": 0 }, "value": "t4", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2015,8 +1970,8 @@ "ctxt": 0 }, "value": "d10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2026,8 +1981,8 @@ "ctxt": 0 }, "value": "d11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2037,8 +1992,8 @@ "ctxt": 0 }, "value": "d12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -2052,7 +2007,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2088,8 +2042,8 @@ "ctxt": 0 }, "value": "d20", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2099,8 +2053,8 @@ "ctxt": 0 }, "value": "d21", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2110,8 +2064,8 @@ "ctxt": 0 }, "value": "d22", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -2125,7 +2079,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -2161,8 +2114,8 @@ "ctxt": 0 }, "value": "d30", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2172,8 +2125,8 @@ "ctxt": 0 }, "value": "d31", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2183,8 +2136,8 @@ "ctxt": 0 }, "value": "d32", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -2198,7 +2151,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false } } @@ -2234,8 +2186,8 @@ "ctxt": 0 }, "value": "d40", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2245,8 +2197,8 @@ "ctxt": 0 }, "value": "d41", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2256,8 +2208,8 @@ "ctxt": 0 }, "value": "d42", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -2271,7 +2223,6 @@ "ctxt": 0 }, "value": "t4", - "typeAnnotation": null, "optional": false } } @@ -2301,8 +2252,8 @@ "ctxt": 0 }, "value": "t10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2319,7 +2270,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2362,8 +2312,8 @@ "ctxt": 0 }, "value": "t11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2380,7 +2330,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2423,8 +2372,8 @@ "ctxt": 0 }, "value": "t12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2441,7 +2390,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2484,8 +2432,8 @@ "ctxt": 0 }, "value": "t1x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2502,7 +2450,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2513,7 +2460,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": true @@ -2547,8 +2493,8 @@ "ctxt": 0 }, "value": "t20", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2565,7 +2511,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2608,8 +2553,8 @@ "ctxt": 0 }, "value": "t21", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2626,7 +2571,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2669,8 +2613,8 @@ "ctxt": 0 }, "value": "t22", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2687,7 +2631,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2730,8 +2673,8 @@ "ctxt": 0 }, "value": "t2x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2748,7 +2691,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2759,7 +2701,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": true @@ -2793,8 +2734,8 @@ "ctxt": 0 }, "value": "t30", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2811,7 +2752,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false }, "property": { @@ -2854,8 +2794,8 @@ "ctxt": 0 }, "value": "t31", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2872,7 +2812,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false }, "property": { @@ -2915,8 +2854,8 @@ "ctxt": 0 }, "value": "t32", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2933,7 +2872,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false }, "property": { @@ -2976,8 +2914,8 @@ "ctxt": 0 }, "value": "t3x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2994,7 +2932,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false }, "property": { @@ -3005,7 +2942,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": true @@ -3039,8 +2975,8 @@ "ctxt": 0 }, "value": "t40", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3057,7 +2993,6 @@ "ctxt": 0 }, "value": "t4", - "typeAnnotation": null, "optional": false }, "property": { @@ -3100,8 +3035,8 @@ "ctxt": 0 }, "value": "t41", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3118,7 +3053,6 @@ "ctxt": 0 }, "value": "t4", - "typeAnnotation": null, "optional": false }, "property": { @@ -3161,8 +3095,8 @@ "ctxt": 0 }, "value": "t42", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3179,7 +3113,6 @@ "ctxt": 0 }, "value": "t4", - "typeAnnotation": null, "optional": false }, "property": { @@ -3222,8 +3155,8 @@ "ctxt": 0 }, "value": "t4x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3240,7 +3173,6 @@ "ctxt": 0 }, "value": "t4", - "typeAnnotation": null, "optional": false }, "property": { @@ -3251,7 +3183,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": true @@ -3290,7 +3221,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "property": { @@ -3345,7 +3275,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "property": { @@ -3400,7 +3329,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false }, "property": { @@ -3455,7 +3383,6 @@ "ctxt": 0 }, "value": "t4", - "typeAnnotation": null, "optional": false }, "property": { @@ -3503,7 +3430,6 @@ "ctxt": 0 }, "value": "Unioned", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3617,6 +3543,7 @@ "ctxt": 0 }, "value": "ex", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3639,13 +3566,11 @@ "ctxt": 0 }, "value": "Unioned", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "TsAsExpression", @@ -3696,7 +3621,6 @@ "ctxt": 0 }, "value": "Unioned", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3739,8 +3663,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3750,8 +3674,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -3765,7 +3689,6 @@ "ctxt": 0 }, "value": "ex", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/tuple/variadicTuples1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/tuple/variadicTuples1/input.ts.json index adccace28944..a3a12879dcd7 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/tuple/variadicTuples1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/tuple/variadicTuples1/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "TV0", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -128,7 +126,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -154,7 +151,6 @@ "ctxt": 0 }, "value": "TV1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -180,7 +176,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -260,7 +255,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -304,7 +298,6 @@ "ctxt": 0 }, "value": "TV2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -330,7 +323,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -410,7 +402,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -465,7 +456,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -491,7 +481,6 @@ "ctxt": 0 }, "value": "TV3", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -517,7 +506,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -597,7 +585,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -668,7 +655,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -694,7 +680,6 @@ "ctxt": 0 }, "value": "TN1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -713,7 +698,6 @@ "ctxt": 0 }, "value": "TV1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -790,7 +774,6 @@ "ctxt": 0 }, "value": "TN2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -809,7 +792,6 @@ "ctxt": 0 }, "value": "TV1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -849,7 +831,6 @@ "ctxt": 0 }, "value": "TN3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -868,7 +849,6 @@ "ctxt": 0 }, "value": "TV1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -935,7 +915,6 @@ "ctxt": 0 }, "value": "TN4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -954,7 +933,6 @@ "ctxt": 0 }, "value": "TV1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1002,7 +980,6 @@ "ctxt": 0 }, "value": "TN5", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1021,7 +998,6 @@ "ctxt": 0 }, "value": "TV1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1136,7 +1112,6 @@ "ctxt": 0 }, "value": "TN6", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1155,7 +1130,6 @@ "ctxt": 0 }, "value": "TV1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1195,7 +1169,6 @@ "ctxt": 0 }, "value": "TN7", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1214,7 +1187,6 @@ "ctxt": 0 }, "value": "TV1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1248,7 +1220,6 @@ "ctxt": 0 }, "value": "tup2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1269,6 +1240,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1314,7 +1286,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1323,8 +1294,7 @@ } ] } - }, - "optional": false + } } }, { @@ -1343,6 +1313,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1388,7 +1359,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1397,8 +1367,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1464,7 +1433,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1494,7 +1462,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -1541,7 +1508,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1578,7 +1544,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1629,8 +1594,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1647,7 +1612,6 @@ "ctxt": 0 }, "value": "tup2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1735,7 +1699,6 @@ "ctxt": 0 }, "value": "concat", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1756,6 +1719,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1801,7 +1765,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1810,8 +1773,7 @@ } ] } - }, - "optional": false + } } }, { @@ -1830,6 +1792,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1875,7 +1838,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1884,8 +1846,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1932,7 +1893,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1950,7 +1910,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -1984,7 +1943,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2021,7 +1979,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2090,7 +2047,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2127,7 +2083,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2163,6 +2118,7 @@ "ctxt": 0 }, "value": "sa", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2187,8 +2143,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2220,8 +2175,8 @@ "ctxt": 0 }, "value": "tc1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2238,7 +2193,6 @@ "ctxt": 0 }, "value": "concat", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2298,8 +2252,8 @@ "ctxt": 0 }, "value": "tc2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2316,7 +2270,6 @@ "ctxt": 0 }, "value": "concat", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2407,8 +2360,8 @@ "ctxt": 0 }, "value": "tc3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2425,7 +2378,6 @@ "ctxt": 0 }, "value": "concat", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2488,7 +2440,6 @@ "ctxt": 0 }, "value": "sa", - "typeAnnotation": null, "optional": false } } @@ -2524,8 +2475,8 @@ "ctxt": 0 }, "value": "tc4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2542,7 +2493,6 @@ "ctxt": 0 }, "value": "concat", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2556,7 +2506,6 @@ "ctxt": 0 }, "value": "sa", - "typeAnnotation": null, "optional": false } }, @@ -2626,7 +2575,6 @@ "ctxt": 0 }, "value": "concat2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2647,6 +2595,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2669,13 +2618,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2694,6 +2641,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2716,13 +2664,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2769,7 +2715,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -2787,7 +2732,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -2821,7 +2765,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2867,7 +2810,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2927,8 +2869,8 @@ "ctxt": 0 }, "value": "tc5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2945,7 +2887,6 @@ "ctxt": 0 }, "value": "concat2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3080,7 +3021,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3101,6 +3041,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3117,8 +3058,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -3137,6 +3077,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3153,8 +3094,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -3173,6 +3113,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3189,8 +3130,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -3221,8 +3161,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -3290,7 +3230,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3311,6 +3250,7 @@ "ctxt": 0 }, "value": "t1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3364,8 +3304,7 @@ } ] } - }, - "optional": false + } } }, { @@ -3384,6 +3323,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3419,8 +3359,7 @@ } ] } - }, - "optional": false + } } }, { @@ -3439,6 +3378,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3463,8 +3403,7 @@ "kind": "number" } } - }, - "optional": false + } } } ], @@ -3504,7 +3443,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3611,7 +3549,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3629,7 +3566,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -3707,7 +3643,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3725,7 +3660,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -3743,7 +3677,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -3809,7 +3742,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3827,7 +3759,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -3845,7 +3776,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } }, @@ -3863,7 +3793,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } } @@ -3893,7 +3822,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3911,7 +3839,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -3941,7 +3868,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3959,7 +3885,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } }, @@ -3996,7 +3921,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4017,6 +3941,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4033,8 +3958,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -4065,8 +3989,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -4113,7 +4037,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4176,7 +4099,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4222,7 +4144,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4239,7 +4160,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4260,6 +4180,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4282,13 +4203,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4328,7 +4247,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4382,7 +4300,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4465,7 +4382,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4495,7 +4411,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -4554,7 +4469,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4601,7 +4515,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4637,7 +4550,6 @@ "ctxt": 0 }, "value": "ft1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4658,6 +4570,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4680,13 +4593,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4722,7 +4633,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4768,7 +4678,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4785,7 +4694,6 @@ "ctxt": 0 }, "value": "ft2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4806,6 +4714,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4828,13 +4737,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4870,7 +4777,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4947,7 +4853,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4969,7 +4874,6 @@ "ctxt": 0 }, "value": "ft3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4990,6 +4894,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5035,7 +4940,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5044,8 +4948,7 @@ } ] } - }, - "optional": false + } } } ], @@ -5081,7 +4984,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5127,7 +5029,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5144,7 +5045,6 @@ "ctxt": 0 }, "value": "ft4", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5165,6 +5065,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5210,7 +5111,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5219,8 +5119,7 @@ } ] } - }, - "optional": false + } } } ], @@ -5256,7 +5155,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5333,7 +5231,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5367,7 +5264,6 @@ "ctxt": 0 }, "value": "ft1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5439,7 +5335,6 @@ "ctxt": 0 }, "value": "ft2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5511,7 +5406,6 @@ "ctxt": 0 }, "value": "ft3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5583,7 +5477,6 @@ "ctxt": 0 }, "value": "ft4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5643,7 +5536,6 @@ "ctxt": 0 }, "value": "f0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5664,6 +5556,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5727,7 +5620,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5736,8 +5628,7 @@ } ] } - }, - "optional": false + } } }, { @@ -5756,6 +5647,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5772,8 +5664,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -5816,8 +5707,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -5834,7 +5725,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -5877,8 +5767,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -5895,7 +5785,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -5938,8 +5827,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -5956,7 +5845,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -5999,8 +5887,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -6017,7 +5905,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -6028,7 +5915,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": true @@ -6064,7 +5950,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6100,7 +5985,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6121,6 +6005,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6184,7 +6069,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6211,8 +6095,7 @@ } ] } - }, - "optional": false + } } }, { @@ -6231,6 +6114,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6247,8 +6131,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -6291,8 +6174,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -6309,7 +6192,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -6352,8 +6234,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -6370,7 +6252,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -6413,8 +6294,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -6431,7 +6312,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -6474,8 +6354,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -6492,7 +6372,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -6503,7 +6382,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": true @@ -6539,7 +6417,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6575,7 +6452,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6596,6 +6472,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6659,7 +6536,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6668,8 +6544,7 @@ } ] } - }, - "optional": false + } } } ], @@ -6732,8 +6607,8 @@ "ctxt": 0 }, "value": "ax", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -6749,7 +6624,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "definite": false @@ -6789,8 +6663,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -6812,8 +6686,8 @@ "ctxt": 0 }, "value": "bx", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -6829,7 +6703,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "definite": false @@ -6869,8 +6742,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -6880,8 +6753,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -6903,8 +6776,8 @@ "ctxt": 0 }, "value": "cx", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -6920,7 +6793,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "definite": false @@ -6954,7 +6826,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6990,7 +6861,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7011,6 +6881,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7074,7 +6945,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7101,8 +6971,7 @@ } ] } - }, - "optional": false + } } } ], @@ -7165,8 +7034,8 @@ "ctxt": 0 }, "value": "ax", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -7182,7 +7051,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "definite": false @@ -7222,8 +7090,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -7245,8 +7113,8 @@ "ctxt": 0 }, "value": "bx", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -7262,7 +7130,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "definite": false @@ -7302,8 +7169,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -7313,8 +7180,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "RestElement", @@ -7336,8 +7203,8 @@ "ctxt": 0 }, "value": "cx", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -7353,7 +7220,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "definite": false @@ -7387,7 +7253,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7429,7 +7294,6 @@ "ctxt": 0 }, "value": "Arrayify", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7455,7 +7319,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7486,7 +7349,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7512,7 +7374,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7552,7 +7413,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7572,7 +7432,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7597,7 +7456,6 @@ "ctxt": 0 }, "value": "TM1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7623,7 +7481,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7662,7 +7519,6 @@ "ctxt": 0 }, "value": "Arrayify", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7763,7 +7619,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7827,7 +7682,6 @@ "ctxt": 0 }, "value": "TP1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7853,7 +7707,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7892,7 +7745,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7959,7 +7811,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8006,7 +7857,6 @@ "ctxt": 0 }, "value": "TP2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8032,7 +7882,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8071,7 +7920,6 @@ "ctxt": 0 }, "value": "Partial", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8138,7 +7986,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8195,7 +8042,6 @@ "ctxt": 0 }, "value": "fm1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -8216,6 +8062,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8238,7 +8085,6 @@ "ctxt": 0 }, "value": "Arrayify", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8323,7 +8169,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8335,8 +8180,7 @@ ] } } - }, - "optional": false + } } } ], @@ -8372,7 +8216,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8418,7 +8261,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8450,8 +8292,8 @@ "ctxt": 0 }, "value": "tm1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -8468,7 +8310,6 @@ "ctxt": 0 }, "value": "fm1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8612,7 +8453,6 @@ "ctxt": 0 }, "value": "fx1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -8633,6 +8473,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8649,8 +8490,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -8681,8 +8521,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -8706,7 +8546,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8747,7 +8586,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8793,7 +8631,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8810,7 +8647,6 @@ "ctxt": 0 }, "value": "gx1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8831,6 +8667,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8853,13 +8690,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -8878,6 +8713,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8900,13 +8736,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -8946,7 +8780,6 @@ "ctxt": 0 }, "value": "fx1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8993,7 +8826,6 @@ "ctxt": 0 }, "value": "fx1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9028,7 +8860,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -9058,7 +8889,6 @@ "ctxt": 0 }, "value": "fx1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9093,7 +8923,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -9123,7 +8952,6 @@ "ctxt": 0 }, "value": "fx1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9158,7 +8986,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -9186,7 +9013,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9217,7 +9043,6 @@ "ctxt": 0 }, "value": "fx1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9252,7 +9077,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -9280,7 +9104,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9316,7 +9139,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9353,7 +9175,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9398,7 +9219,6 @@ "ctxt": 0 }, "value": "fx2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -9419,6 +9239,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9435,8 +9256,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -9467,8 +9287,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -9492,7 +9312,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9533,7 +9352,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9588,7 +9406,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9605,7 +9422,6 @@ "ctxt": 0 }, "value": "gx2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9626,6 +9442,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9648,13 +9465,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -9673,6 +9488,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9695,13 +9511,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -9741,7 +9555,6 @@ "ctxt": 0 }, "value": "fx2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9788,7 +9601,6 @@ "ctxt": 0 }, "value": "fx2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9823,7 +9635,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -9853,7 +9664,6 @@ "ctxt": 0 }, "value": "fx2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9888,7 +9698,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -9918,7 +9727,6 @@ "ctxt": 0 }, "value": "fx2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9953,7 +9761,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -9981,7 +9788,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10012,7 +9818,6 @@ "ctxt": 0 }, "value": "fx2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -10047,7 +9852,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -10075,7 +9879,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10111,7 +9914,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10148,7 +9950,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10193,7 +9994,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10214,6 +10014,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10283,8 +10084,7 @@ } ] } - }, - "optional": false + } } }, { @@ -10303,6 +10103,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10366,7 +10167,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10375,8 +10175,7 @@ } ] } - }, - "optional": false + } } }, { @@ -10395,6 +10194,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10458,7 +10258,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10467,8 +10266,7 @@ } ] } - }, - "optional": false + } } } ], @@ -10509,8 +10307,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -10520,7 +10318,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -10548,8 +10345,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -10559,7 +10356,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -10587,8 +10383,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -10598,7 +10394,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -10626,8 +10421,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -10637,7 +10432,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -10665,8 +10459,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -10676,7 +10470,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -10704,8 +10497,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -10715,7 +10508,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -10747,7 +10539,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10784,7 +10575,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10802,7 +10592,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10823,7 +10612,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10844,6 +10632,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10866,13 +10655,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -10891,6 +10678,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10936,7 +10724,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10945,8 +10732,7 @@ } ] } - }, - "optional": false + } } }, { @@ -10965,6 +10751,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11018,7 +10805,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11028,8 +10814,7 @@ ] } } - }, - "optional": false + } } } ], @@ -11070,8 +10855,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -11081,7 +10866,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -11109,8 +10893,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -11120,7 +10904,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false } } @@ -11148,8 +10931,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -11159,7 +10942,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -11187,8 +10969,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -11198,7 +10980,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false } } @@ -11226,8 +11007,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -11237,7 +11018,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -11265,8 +11045,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -11276,7 +11056,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -11308,7 +11087,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -11344,7 +11122,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -11365,6 +11142,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11387,13 +11165,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -11412,6 +11188,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11457,7 +11234,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11466,8 +11242,7 @@ } ] } - }, - "optional": false + } } }, { @@ -11486,6 +11261,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11539,7 +11315,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11549,8 +11324,7 @@ ] } } - }, - "optional": false + } } } ], @@ -11591,8 +11365,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -11602,7 +11376,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -11630,8 +11403,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -11641,7 +11414,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false } } @@ -11669,8 +11441,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -11680,7 +11452,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -11708,8 +11479,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -11719,7 +11490,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false } } @@ -11747,8 +11517,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -11758,7 +11528,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -11786,8 +11555,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -11797,7 +11566,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -11829,7 +11597,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -11874,7 +11641,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -11895,6 +11661,7 @@ "ctxt": 0 }, "value": "t0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11917,13 +11684,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -11942,6 +11707,7 @@ "ctxt": 0 }, "value": "t1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11987,7 +11753,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11996,8 +11761,7 @@ } ] } - }, - "optional": false + } } }, { @@ -12016,6 +11780,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12061,7 +11826,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12070,8 +11834,7 @@ } ] } - }, - "optional": false + } } } ], @@ -12112,8 +11875,8 @@ "ctxt": 0 }, "value": "t0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -12123,7 +11886,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -12151,8 +11913,8 @@ "ctxt": 0 }, "value": "t0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -12162,7 +11924,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -12190,8 +11951,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -12201,7 +11962,6 @@ "ctxt": 0 }, "value": "t0", - "typeAnnotation": null, "optional": false } } @@ -12229,8 +11989,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -12240,7 +12000,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -12268,8 +12027,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -12279,7 +12038,6 @@ "ctxt": 0 }, "value": "t0", - "typeAnnotation": null, "optional": false } } @@ -12307,8 +12065,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -12318,7 +12076,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -12350,7 +12107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -12387,7 +12143,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -12405,7 +12160,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12426,7 +12180,6 @@ "ctxt": 0 }, "value": "f14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -12447,6 +12200,7 @@ "ctxt": 0 }, "value": "t0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12469,13 +12223,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -12494,6 +12246,7 @@ "ctxt": 0 }, "value": "t1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12539,7 +12292,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12548,8 +12300,7 @@ } ] } - }, - "optional": false + } } }, { @@ -12568,6 +12319,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12613,7 +12365,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12622,8 +12373,7 @@ } ] } - }, - "optional": false + } } } ], @@ -12664,8 +12414,8 @@ "ctxt": 0 }, "value": "t0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -12675,7 +12425,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -12703,8 +12452,8 @@ "ctxt": 0 }, "value": "t0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -12714,7 +12463,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -12742,8 +12490,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -12753,7 +12501,6 @@ "ctxt": 0 }, "value": "t0", - "typeAnnotation": null, "optional": false } } @@ -12781,8 +12528,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -12792,7 +12539,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -12820,8 +12566,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -12831,7 +12577,6 @@ "ctxt": 0 }, "value": "t0", - "typeAnnotation": null, "optional": false } } @@ -12859,8 +12604,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -12870,7 +12615,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -12902,7 +12646,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -12948,7 +12691,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -12966,7 +12708,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12987,7 +12728,6 @@ "ctxt": 0 }, "value": "f15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -13008,6 +12748,7 @@ "ctxt": 0 }, "value": "k0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13038,14 +12779,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } }, { @@ -13064,6 +12803,7 @@ "ctxt": 0 }, "value": "k1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13117,7 +12857,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13127,8 +12866,7 @@ ] } } - }, - "optional": false + } } }, { @@ -13147,6 +12885,7 @@ "ctxt": 0 }, "value": "k2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13200,7 +12939,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13210,8 +12948,7 @@ ] } } - }, - "optional": false + } } }, { @@ -13230,6 +12967,7 @@ "ctxt": 0 }, "value": "k3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13335,7 +13073,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13345,8 +13082,7 @@ ] } } - }, - "optional": false + } } } ], @@ -13387,8 +13123,8 @@ "ctxt": 0 }, "value": "k0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -13429,8 +13165,8 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -13471,8 +13207,8 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -13513,8 +13249,8 @@ "ctxt": 0 }, "value": "k0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -13555,8 +13291,8 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -13597,8 +13333,8 @@ "ctxt": 0 }, "value": "k2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -13639,8 +13375,8 @@ "ctxt": 0 }, "value": "k3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -13681,8 +13417,8 @@ "ctxt": 0 }, "value": "k3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -13723,8 +13459,8 @@ "ctxt": 0 }, "value": "k3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -13769,7 +13505,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -13806,7 +13541,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -13824,7 +13558,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13851,7 +13584,6 @@ "ctxt": 0 }, "value": "First", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13877,7 +13609,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -13932,7 +13663,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14031,7 +13761,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14085,7 +13814,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14137,7 +13865,6 @@ "ctxt": 0 }, "value": "DropFirst", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14163,7 +13890,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -14218,7 +13944,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14302,7 +14027,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -14329,7 +14053,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14372,7 +14095,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14399,7 +14121,6 @@ "ctxt": 0 }, "value": "Last", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14425,7 +14146,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -14480,7 +14200,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14565,7 +14284,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -14591,7 +14309,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14618,7 +14335,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14717,7 +14433,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14763,7 +14478,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14808,7 +14522,6 @@ "ctxt": 0 }, "value": "DropLast", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14834,7 +14547,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -14889,7 +14601,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14947,7 +14658,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -14992,7 +14702,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -15035,7 +14744,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -15062,7 +14770,6 @@ "ctxt": 0 }, "value": "T00", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -15081,7 +14788,6 @@ "ctxt": 0 }, "value": "First", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -15176,7 +14882,6 @@ "ctxt": 0 }, "value": "T01", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -15195,7 +14900,6 @@ "ctxt": 0 }, "value": "First", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -15272,7 +14976,6 @@ "ctxt": 0 }, "value": "T02", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -15291,7 +14994,6 @@ "ctxt": 0 }, "value": "First", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -15350,7 +15052,6 @@ "ctxt": 0 }, "value": "T03", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -15369,7 +15070,6 @@ "ctxt": 0 }, "value": "First", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -15480,7 +15180,6 @@ "ctxt": 0 }, "value": "T04", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -15499,7 +15198,6 @@ "ctxt": 0 }, "value": "First", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -15592,7 +15290,6 @@ "ctxt": 0 }, "value": "T05", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -15611,7 +15308,6 @@ "ctxt": 0 }, "value": "First", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -15678,7 +15374,6 @@ "ctxt": 0 }, "value": "T06", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -15697,7 +15392,6 @@ "ctxt": 0 }, "value": "First", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -15745,7 +15439,6 @@ "ctxt": 0 }, "value": "T07", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -15764,7 +15457,6 @@ "ctxt": 0 }, "value": "First", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -15804,7 +15496,6 @@ "ctxt": 0 }, "value": "T08", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -15823,7 +15514,6 @@ "ctxt": 0 }, "value": "First", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -15863,7 +15553,6 @@ "ctxt": 0 }, "value": "T09", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -15882,7 +15571,6 @@ "ctxt": 0 }, "value": "First", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -15922,7 +15610,6 @@ "ctxt": 0 }, "value": "T10", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -15941,7 +15628,6 @@ "ctxt": 0 }, "value": "DropFirst", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -16036,7 +15722,6 @@ "ctxt": 0 }, "value": "T11", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -16055,7 +15740,6 @@ "ctxt": 0 }, "value": "DropFirst", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -16132,7 +15816,6 @@ "ctxt": 0 }, "value": "T12", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -16151,7 +15834,6 @@ "ctxt": 0 }, "value": "DropFirst", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -16210,7 +15892,6 @@ "ctxt": 0 }, "value": "T13", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -16229,7 +15910,6 @@ "ctxt": 0 }, "value": "DropFirst", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -16340,7 +16020,6 @@ "ctxt": 0 }, "value": "T14", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -16359,7 +16038,6 @@ "ctxt": 0 }, "value": "DropFirst", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -16452,7 +16130,6 @@ "ctxt": 0 }, "value": "T15", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -16471,7 +16148,6 @@ "ctxt": 0 }, "value": "DropFirst", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -16538,7 +16214,6 @@ "ctxt": 0 }, "value": "T16", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -16557,7 +16232,6 @@ "ctxt": 0 }, "value": "DropFirst", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -16605,7 +16279,6 @@ "ctxt": 0 }, "value": "T17", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -16624,7 +16297,6 @@ "ctxt": 0 }, "value": "DropFirst", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -16664,7 +16336,6 @@ "ctxt": 0 }, "value": "T18", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -16683,7 +16354,6 @@ "ctxt": 0 }, "value": "DropFirst", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -16723,7 +16393,6 @@ "ctxt": 0 }, "value": "T19", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -16742,7 +16411,6 @@ "ctxt": 0 }, "value": "DropFirst", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -16782,7 +16450,6 @@ "ctxt": 0 }, "value": "T20", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -16801,7 +16468,6 @@ "ctxt": 0 }, "value": "Last", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -16896,7 +16562,6 @@ "ctxt": 0 }, "value": "T21", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -16915,7 +16580,6 @@ "ctxt": 0 }, "value": "Last", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -16992,7 +16656,6 @@ "ctxt": 0 }, "value": "T22", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -17011,7 +16674,6 @@ "ctxt": 0 }, "value": "Last", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -17070,7 +16732,6 @@ "ctxt": 0 }, "value": "T23", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -17089,7 +16750,6 @@ "ctxt": 0 }, "value": "Last", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -17200,7 +16860,6 @@ "ctxt": 0 }, "value": "T24", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -17219,7 +16878,6 @@ "ctxt": 0 }, "value": "Last", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -17312,7 +16970,6 @@ "ctxt": 0 }, "value": "T25", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -17331,7 +16988,6 @@ "ctxt": 0 }, "value": "Last", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -17398,7 +17054,6 @@ "ctxt": 0 }, "value": "T26", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -17417,7 +17072,6 @@ "ctxt": 0 }, "value": "Last", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -17465,7 +17119,6 @@ "ctxt": 0 }, "value": "T27", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -17484,7 +17137,6 @@ "ctxt": 0 }, "value": "Last", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -17524,7 +17176,6 @@ "ctxt": 0 }, "value": "T28", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -17543,7 +17194,6 @@ "ctxt": 0 }, "value": "Last", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -17583,7 +17233,6 @@ "ctxt": 0 }, "value": "T29", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -17602,7 +17251,6 @@ "ctxt": 0 }, "value": "Last", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -17642,7 +17290,6 @@ "ctxt": 0 }, "value": "T30", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -17661,7 +17308,6 @@ "ctxt": 0 }, "value": "DropLast", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -17756,7 +17402,6 @@ "ctxt": 0 }, "value": "T31", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -17775,7 +17420,6 @@ "ctxt": 0 }, "value": "DropLast", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -17852,7 +17496,6 @@ "ctxt": 0 }, "value": "T32", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -17871,7 +17514,6 @@ "ctxt": 0 }, "value": "DropLast", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -17930,7 +17572,6 @@ "ctxt": 0 }, "value": "T33", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -17949,7 +17590,6 @@ "ctxt": 0 }, "value": "DropLast", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -18060,7 +17700,6 @@ "ctxt": 0 }, "value": "T34", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -18079,7 +17718,6 @@ "ctxt": 0 }, "value": "DropLast", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -18172,7 +17810,6 @@ "ctxt": 0 }, "value": "T35", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -18191,7 +17828,6 @@ "ctxt": 0 }, "value": "DropLast", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -18258,7 +17894,6 @@ "ctxt": 0 }, "value": "T36", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -18277,7 +17912,6 @@ "ctxt": 0 }, "value": "DropLast", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -18325,7 +17959,6 @@ "ctxt": 0 }, "value": "T37", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -18344,7 +17977,6 @@ "ctxt": 0 }, "value": "DropLast", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -18384,7 +18016,6 @@ "ctxt": 0 }, "value": "T38", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -18403,7 +18034,6 @@ "ctxt": 0 }, "value": "DropLast", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -18443,7 +18073,6 @@ "ctxt": 0 }, "value": "T39", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -18462,7 +18091,6 @@ "ctxt": 0 }, "value": "DropLast", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -18502,7 +18130,6 @@ "ctxt": 0 }, "value": "R00", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -18521,7 +18148,6 @@ "ctxt": 0 }, "value": "First", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -18625,7 +18251,6 @@ "ctxt": 0 }, "value": "R01", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -18644,7 +18269,6 @@ "ctxt": 0 }, "value": "First", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -18730,7 +18354,6 @@ "ctxt": 0 }, "value": "R02", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -18749,7 +18372,6 @@ "ctxt": 0 }, "value": "First", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -18817,7 +18439,6 @@ "ctxt": 0 }, "value": "R03", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -18836,7 +18457,6 @@ "ctxt": 0 }, "value": "First", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -18956,7 +18576,6 @@ "ctxt": 0 }, "value": "R04", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -18975,7 +18594,6 @@ "ctxt": 0 }, "value": "First", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -19077,7 +18695,6 @@ "ctxt": 0 }, "value": "R05", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -19096,7 +18713,6 @@ "ctxt": 0 }, "value": "First", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -19153,7 +18769,6 @@ "ctxt": 0 }, "value": "R06", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -19172,7 +18787,6 @@ "ctxt": 0 }, "value": "First", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -19221,7 +18835,6 @@ "ctxt": 0 }, "value": "R10", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -19240,7 +18853,6 @@ "ctxt": 0 }, "value": "DropFirst", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -19344,7 +18956,6 @@ "ctxt": 0 }, "value": "R11", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -19363,7 +18974,6 @@ "ctxt": 0 }, "value": "DropFirst", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -19449,7 +19059,6 @@ "ctxt": 0 }, "value": "R12", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -19468,7 +19077,6 @@ "ctxt": 0 }, "value": "DropFirst", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -19536,7 +19144,6 @@ "ctxt": 0 }, "value": "R13", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -19555,7 +19162,6 @@ "ctxt": 0 }, "value": "DropFirst", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -19675,7 +19281,6 @@ "ctxt": 0 }, "value": "R14", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -19694,7 +19299,6 @@ "ctxt": 0 }, "value": "DropFirst", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -19796,7 +19400,6 @@ "ctxt": 0 }, "value": "R15", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -19815,7 +19418,6 @@ "ctxt": 0 }, "value": "DropFirst", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -19872,7 +19474,6 @@ "ctxt": 0 }, "value": "R16", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -19891,7 +19492,6 @@ "ctxt": 0 }, "value": "DropFirst", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -19940,7 +19540,6 @@ "ctxt": 0 }, "value": "R20", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -19959,7 +19558,6 @@ "ctxt": 0 }, "value": "Last", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -20063,7 +19661,6 @@ "ctxt": 0 }, "value": "R21", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -20082,7 +19679,6 @@ "ctxt": 0 }, "value": "Last", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -20168,7 +19764,6 @@ "ctxt": 0 }, "value": "R22", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -20187,7 +19782,6 @@ "ctxt": 0 }, "value": "Last", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -20255,7 +19849,6 @@ "ctxt": 0 }, "value": "R23", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -20274,7 +19867,6 @@ "ctxt": 0 }, "value": "Last", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -20394,7 +19986,6 @@ "ctxt": 0 }, "value": "R24", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -20413,7 +20004,6 @@ "ctxt": 0 }, "value": "Last", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -20515,7 +20105,6 @@ "ctxt": 0 }, "value": "R25", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -20534,7 +20123,6 @@ "ctxt": 0 }, "value": "Last", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -20591,7 +20179,6 @@ "ctxt": 0 }, "value": "R26", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -20610,7 +20197,6 @@ "ctxt": 0 }, "value": "Last", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -20659,7 +20245,6 @@ "ctxt": 0 }, "value": "R30", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -20678,7 +20263,6 @@ "ctxt": 0 }, "value": "DropLast", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -20782,7 +20366,6 @@ "ctxt": 0 }, "value": "R31", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -20801,7 +20384,6 @@ "ctxt": 0 }, "value": "DropLast", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -20887,7 +20469,6 @@ "ctxt": 0 }, "value": "R32", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -20906,7 +20487,6 @@ "ctxt": 0 }, "value": "DropLast", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -20974,7 +20554,6 @@ "ctxt": 0 }, "value": "R33", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -20993,7 +20572,6 @@ "ctxt": 0 }, "value": "DropLast", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -21113,7 +20691,6 @@ "ctxt": 0 }, "value": "R34", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -21132,7 +20709,6 @@ "ctxt": 0 }, "value": "DropLast", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -21234,7 +20810,6 @@ "ctxt": 0 }, "value": "R35", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -21253,7 +20828,6 @@ "ctxt": 0 }, "value": "DropLast", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -21310,7 +20884,6 @@ "ctxt": 0 }, "value": "R36", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -21329,7 +20902,6 @@ "ctxt": 0 }, "value": "DropLast", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -21372,7 +20944,6 @@ "ctxt": 0 }, "value": "curry", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -21393,6 +20964,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -21428,8 +21000,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -21476,7 +21048,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -21513,7 +21084,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -21548,15 +21118,13 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -21587,8 +21155,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -21612,7 +21180,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -21670,8 +21237,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -21695,7 +21262,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -21718,7 +21284,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -21736,7 +21301,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -21754,7 +21318,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -21794,7 +21357,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -21831,7 +21393,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -21868,7 +21429,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -21903,8 +21463,8 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -21922,6 +21482,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -21938,8 +21499,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -21949,6 +21509,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -21965,8 +21526,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -21976,6 +21536,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -21992,8 +21553,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "Identifier", @@ -22003,6 +21563,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -22027,8 +21588,7 @@ "kind": "string" } } - }, - "optional": false + } } ], "body": { @@ -22074,8 +21634,8 @@ "ctxt": 0 }, "value": "c0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -22092,7 +21652,6 @@ "ctxt": 0 }, "value": "curry", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -22106,7 +21665,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false } } @@ -22142,8 +21700,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -22160,7 +21718,6 @@ "ctxt": 0 }, "value": "curry", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -22174,7 +21731,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false } }, @@ -22222,8 +21778,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -22240,7 +21796,6 @@ "ctxt": 0 }, "value": "curry", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -22254,7 +21809,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false } }, @@ -22319,8 +21873,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -22337,7 +21891,6 @@ "ctxt": 0 }, "value": "curry", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -22351,7 +21904,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false } }, @@ -22428,8 +21980,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -22446,7 +21998,6 @@ "ctxt": 0 }, "value": "curry", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -22460,7 +22011,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false } }, @@ -22584,8 +22134,8 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -22603,6 +22153,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -22619,8 +22170,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -22630,6 +22180,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -22646,8 +22197,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, { "type": "RestElement", @@ -22669,8 +22219,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -22742,8 +22292,8 @@ "ctxt": 0 }, "value": "c10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -22760,7 +22310,6 @@ "ctxt": 0 }, "value": "curry", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -22774,7 +22323,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false } } @@ -22810,8 +22358,8 @@ "ctxt": 0 }, "value": "c11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -22828,7 +22376,6 @@ "ctxt": 0 }, "value": "curry", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -22842,7 +22389,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false } }, @@ -22890,8 +22436,8 @@ "ctxt": 0 }, "value": "c12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -22908,7 +22454,6 @@ "ctxt": 0 }, "value": "curry", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -22922,7 +22467,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false } }, @@ -22982,8 +22526,8 @@ "ctxt": 0 }, "value": "c13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -23000,7 +22544,6 @@ "ctxt": 0 }, "value": "curry", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -23014,7 +22557,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false } }, @@ -23108,8 +22650,8 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -23139,8 +22681,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -23212,8 +22754,8 @@ "ctxt": 0 }, "value": "c20", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -23230,7 +22772,6 @@ "ctxt": 0 }, "value": "curry", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -23244,7 +22785,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false } } @@ -23280,8 +22820,8 @@ "ctxt": 0 }, "value": "c21", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -23298,7 +22838,6 @@ "ctxt": 0 }, "value": "curry", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -23312,7 +22851,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false } }, @@ -23382,8 +22920,8 @@ "ctxt": 0 }, "value": "c22", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -23400,7 +22938,6 @@ "ctxt": 0 }, "value": "curry", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -23414,7 +22951,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false } }, @@ -23432,7 +22968,6 @@ "ctxt": 0 }, "value": "sa", - "typeAnnotation": null, "optional": false } } @@ -23453,7 +22988,6 @@ "ctxt": 0 }, "value": "curry2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -23474,6 +23008,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -23509,8 +23044,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -23557,7 +23092,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -23594,7 +23128,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -23629,15 +23162,13 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -23656,6 +23187,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -23701,7 +23233,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -23710,8 +23241,7 @@ } ] } - }, - "optional": false + } } }, { @@ -23730,6 +23260,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -23775,7 +23306,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -23784,8 +23314,7 @@ } ] } - }, - "optional": false + } } } ], @@ -23825,7 +23354,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -23843,7 +23371,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -23861,7 +23388,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -23896,7 +23422,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -23933,7 +23458,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -23970,7 +23494,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -23990,7 +23513,6 @@ "ctxt": 0 }, "value": "fn10", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -24011,6 +23533,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -24027,8 +23550,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -24047,6 +23569,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -24063,8 +23586,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -24083,6 +23605,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -24099,8 +23622,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -24162,7 +23684,6 @@ "ctxt": 0 }, "value": "curry2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -24176,7 +23697,6 @@ "ctxt": 0 }, "value": "fn10", - "typeAnnotation": null, "optional": false } }, @@ -24273,7 +23793,6 @@ "ctxt": 0 }, "value": "curry2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -24287,7 +23806,6 @@ "ctxt": 0 }, "value": "fn10", - "typeAnnotation": null, "optional": false } }, @@ -24372,7 +23890,6 @@ "ctxt": 0 }, "value": "ft", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -24393,6 +23910,7 @@ "ctxt": 0 }, "value": "t1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -24438,7 +23956,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24447,8 +23964,7 @@ } ] } - }, - "optional": false + } } }, { @@ -24467,6 +23983,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -24512,7 +24029,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24547,8 +24063,7 @@ } ] } - }, - "optional": false + } } } ], @@ -24584,7 +24099,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -24630,7 +24144,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -24659,7 +24172,6 @@ "ctxt": 0 }, "value": "ft", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -24787,7 +24299,6 @@ "ctxt": 0 }, "value": "ft", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -24903,7 +24414,6 @@ "ctxt": 0 }, "value": "ft", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -25027,7 +24537,6 @@ "ctxt": 0 }, "value": "ft", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -25151,7 +24660,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -25184,8 +24692,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -25232,7 +24740,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -25275,8 +24782,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -25300,7 +24807,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -25331,7 +24837,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -25377,7 +24882,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -25414,7 +24918,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -25460,7 +24963,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -25489,7 +24991,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -25521,7 +25022,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -25572,8 +25072,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -25583,8 +25083,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -25628,7 +25128,6 @@ "ctxt": 0 }, "value": "call", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -25646,7 +25145,6 @@ "ctxt": 0 }, "value": "sa", - "typeAnnotation": null, "optional": false } }, @@ -25680,8 +25178,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -25715,7 +25213,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -25736,6 +25233,7 @@ "ctxt": 0 }, "value": "args", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -25781,7 +25279,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -25816,8 +25313,7 @@ } ] } - }, - "optional": false + } } } ], @@ -25853,7 +25349,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -25907,7 +25402,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -25924,7 +25418,6 @@ "ctxt": 0 }, "value": "f21", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -25945,6 +25438,7 @@ "ctxt": 0 }, "value": "args", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -25990,7 +25484,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26025,8 +25518,7 @@ } ] } - }, - "optional": false + } } } ], @@ -26069,8 +25561,8 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -26087,7 +25579,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -26101,7 +25592,6 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, "optional": false } } @@ -26137,8 +25627,8 @@ "ctxt": 0 }, "value": "v2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -26155,7 +25645,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -26238,8 +25727,8 @@ "ctxt": 0 }, "value": "v3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -26256,7 +25745,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -26336,7 +25824,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -26372,7 +25859,6 @@ "ctxt": 0 }, "value": "f22", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -26393,6 +25879,7 @@ "ctxt": 0 }, "value": "args", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -26438,7 +25925,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26465,8 +25951,7 @@ } ] } - }, - "optional": false + } } } ], @@ -26502,7 +25987,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -26556,7 +26040,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26573,7 +26056,6 @@ "ctxt": 0 }, "value": "f22", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -26594,6 +26076,7 @@ "ctxt": 0 }, "value": "args", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -26639,7 +26122,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26648,8 +26130,7 @@ } ] } - }, - "optional": false + } } } ], @@ -26685,7 +26166,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -26739,7 +26219,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26756,7 +26235,6 @@ "ctxt": 0 }, "value": "f23", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -26777,6 +26255,7 @@ "ctxt": 0 }, "value": "args", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -26822,7 +26301,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -26849,8 +26327,7 @@ } ] } - }, - "optional": false + } } } ], @@ -26893,8 +26370,8 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -26911,7 +26388,6 @@ "ctxt": 0 }, "value": "f22", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -26925,7 +26401,6 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, "optional": false } } @@ -26961,8 +26436,8 @@ "ctxt": 0 }, "value": "v2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -26979,7 +26454,6 @@ "ctxt": 0 }, "value": "f22", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -27062,8 +26536,8 @@ "ctxt": 0 }, "value": "v3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -27080,7 +26554,6 @@ "ctxt": 0 }, "value": "f22", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -27160,7 +26633,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -27201,7 +26673,6 @@ "ctxt": 0 }, "value": "Desc", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -27228,7 +26699,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -27265,7 +26735,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -27298,7 +26767,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -27340,8 +26808,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -27365,7 +26833,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -27396,7 +26863,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -27422,7 +26888,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -27436,6 +26901,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -27458,7 +26924,6 @@ "ctxt": 0 }, "value": "Desc", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -27507,7 +26972,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -27544,7 +27008,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -27568,7 +27031,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -27576,8 +27038,7 @@ ] } } - }, - "optional": false + } }, { "type": "RestElement", @@ -27599,8 +27060,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -27624,7 +27085,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -27654,7 +27114,6 @@ "ctxt": 0 }, "value": "Desc", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -27703,7 +27162,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -27727,7 +27185,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -27759,7 +27216,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -27796,7 +27252,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -27833,7 +27288,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -27870,6 +27324,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -27892,7 +27347,6 @@ "ctxt": 0 }, "value": "Desc", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -27979,8 +27433,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -28012,8 +27465,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -28037,7 +27490,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -28048,7 +27500,6 @@ "ctxt": 0 }, "value": "bind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -28100,7 +27551,6 @@ "ctxt": 0 }, "value": "getUser", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -28121,6 +27571,7 @@ "ctxt": 0 }, "value": "id", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -28137,8 +27588,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -28157,6 +27607,7 @@ "ctxt": 0 }, "value": "options", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -28188,7 +27639,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -28216,8 +27666,7 @@ } ] } - }, - "optional": true + } } } ], @@ -28259,7 +27708,6 @@ "ctxt": 0 }, "value": "getOrgUser", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -28280,6 +27728,7 @@ "ctxt": 0 }, "value": "id", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -28296,8 +27745,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -28316,6 +27764,7 @@ "ctxt": 0 }, "value": "orgId", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -28332,8 +27781,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -28352,6 +27800,7 @@ "ctxt": 0 }, "value": "options", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -28383,7 +27832,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -28425,7 +27873,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -28453,8 +27900,7 @@ } ] } - }, - "optional": true + } } } ], @@ -28496,7 +27942,6 @@ "ctxt": 0 }, "value": "callApi", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -28517,6 +27962,7 @@ "ctxt": 0 }, "value": "method", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -28552,8 +27998,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -28600,7 +28046,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -28653,15 +28098,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -28714,8 +28157,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -28762,7 +28205,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -28789,7 +28231,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -28807,7 +28248,6 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, "optional": false } }, @@ -28859,7 +28299,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -28904,7 +28343,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -28944,7 +28382,6 @@ "ctxt": 0 }, "value": "callApi", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -28958,7 +28395,6 @@ "ctxt": 0 }, "value": "getUser", - "typeAnnotation": null, "optional": false } } @@ -28988,7 +28424,6 @@ "ctxt": 0 }, "value": "callApi", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -29002,7 +28437,6 @@ "ctxt": 0 }, "value": "getOrgUser", - "typeAnnotation": null, "optional": false } } @@ -29026,7 +28460,6 @@ "ctxt": 0 }, "value": "Numbers", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -29064,7 +28497,6 @@ "ctxt": 0 }, "value": "Unbounded", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -29106,7 +28538,6 @@ "ctxt": 0 }, "value": "Numbers", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -29159,6 +28590,7 @@ "ctxt": 0 }, "value": "data", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -29181,13 +28613,11 @@ "ctxt": 0 }, "value": "Unbounded", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -29243,7 +28673,6 @@ "ctxt": 0 }, "value": "U1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -29303,7 +28732,6 @@ "ctxt": 0 }, "value": "Numbers", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -29347,7 +28775,6 @@ "ctxt": 0 }, "value": "U2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -29430,7 +28857,6 @@ "ctxt": 0 }, "value": "Numbers", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -29478,7 +28904,6 @@ "ctxt": 0 }, "value": "U3", - "typeAnnotation": null, "optional": false }, "typeParams": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples1/input.ts.json index 90ba16d7cf96..ae0e41cc272b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -101,7 +99,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -158,7 +155,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -190,8 +186,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -208,7 +204,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -232,7 +227,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -269,8 +263,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples2/input.ts.json index e56266b17007..109d54cbf2c1 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples2/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,8 +85,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "FunctionExpression", @@ -97,7 +97,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "params": [], @@ -140,8 +139,8 @@ "ctxt": 0 }, "value": "intermediate", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -158,7 +157,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -191,8 +189,8 @@ "ctxt": 0 }, "value": "intermediate", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -248,7 +246,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples3/input.ts.json index 4a23387b97de..0f5dc71bf6b6 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples3/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -99,8 +99,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AssignmentExpression", @@ -118,8 +118,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -139,7 +139,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples4/input.ts.json index ff56c5fdf314..d2be4da7d7bf 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples4/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -99,8 +99,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AssignmentExpression", @@ -118,8 +118,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -139,7 +139,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -184,8 +183,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples5/input.ts.json index 5749056f011b..19573448009f 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples5/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -75,7 +75,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples6/input.ts.json index 0443402e3b65..f62dd76ade0e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples6/input.ts.json @@ -39,8 +39,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -75,7 +75,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -119,8 +118,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -161,8 +160,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples7/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples7/input.ts.json index f16ca34e5f5d..1525e500f227 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples7/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/tuple/wideningTuples7/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "FunctionExpression", @@ -44,7 +44,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "params": [], @@ -87,6 +86,7 @@ "ctxt": 0 }, "value": "intermediate", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -122,8 +122,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -153,8 +152,8 @@ "ctxt": 0 }, "value": "intermediate", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -174,7 +173,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeAliases/asiPreventsParsingAsTypeAlias01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeAliases/asiPreventsParsingAsTypeAlias01/input.ts.json index 33310bab842a..9dbcd27922d4 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeAliases/asiPreventsParsingAsTypeAlias01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeAliases/asiPreventsParsingAsTypeAlias01/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -64,8 +64,8 @@ "ctxt": 0 }, "value": "string", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -97,8 +97,8 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -121,7 +121,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeAliases/asiPreventsParsingAsTypeAlias02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeAliases/asiPreventsParsingAsTypeAlias02/input.ts.json index 1f7681e2d2e0..7c9db37e82f5 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeAliases/asiPreventsParsingAsTypeAlias02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeAliases/asiPreventsParsingAsTypeAlias02/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -64,8 +64,8 @@ "ctxt": 0 }, "value": "string", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -97,8 +97,8 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -122,7 +122,6 @@ "ctxt": 0 }, "value": "container", - "typeAnnotation": null, "optional": false }, "body": { @@ -149,7 +148,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeAliases/circularTypeAliasForUnionWithClass/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeAliases/circularTypeAliasForUnionWithClass/input.ts.json index 807b98da62e7..371d38382cb4 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeAliases/circularTypeAliasForUnionWithClass/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeAliases/circularTypeAliasForUnionWithClass/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,13 +54,11 @@ "ctxt": 0 }, "value": "T0", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -82,7 +81,6 @@ "ctxt": 0 }, "value": "T0", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -118,7 +116,6 @@ "ctxt": 0 }, "value": "I0", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -136,7 +133,6 @@ "ctxt": 0 }, "value": "I0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -162,7 +158,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -188,7 +183,6 @@ "ctxt": 0 }, "value": "T0", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -236,6 +230,7 @@ "ctxt": 0 }, "value": "v3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -258,13 +253,11 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -287,7 +280,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -323,7 +315,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -341,7 +332,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -363,6 +353,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -379,8 +370,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -405,7 +395,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -450,6 +439,7 @@ "ctxt": 0 }, "value": "v4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -472,13 +462,11 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -501,7 +489,6 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -537,7 +524,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -555,7 +541,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -577,6 +562,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -593,8 +579,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -619,7 +604,6 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeAliases/circularTypeAliasForUnionWithInterface/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeAliases/circularTypeAliasForUnionWithInterface/input.ts.json index b49f9bd1da0b..ede2babdcb69 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeAliases/circularTypeAliasForUnionWithInterface/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeAliases/circularTypeAliasForUnionWithInterface/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "v0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,13 +54,11 @@ "ctxt": 0 }, "value": "T0", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -82,7 +81,6 @@ "ctxt": 0 }, "value": "T0", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -118,7 +116,6 @@ "ctxt": 0 }, "value": "I0", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -141,7 +138,6 @@ "ctxt": 0 }, "value": "I0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -171,7 +167,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -200,7 +195,6 @@ "ctxt": 0 }, "value": "T0", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -236,6 +230,7 @@ "ctxt": 0 }, "value": "v1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -258,13 +253,11 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -287,7 +280,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -323,7 +315,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -346,7 +337,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -390,7 +380,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -426,6 +415,7 @@ "ctxt": 0 }, "value": "v2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -448,13 +438,11 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -477,7 +465,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -513,7 +500,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -536,7 +522,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -580,7 +565,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -616,6 +600,7 @@ "ctxt": 0 }, "value": "v3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -638,13 +623,11 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -667,7 +650,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -703,7 +685,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -726,7 +707,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -751,6 +731,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -767,8 +748,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -793,7 +773,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -834,6 +813,7 @@ "ctxt": 0 }, "value": "v4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -856,13 +836,11 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -885,7 +863,6 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -921,7 +898,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -944,7 +920,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -969,6 +944,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -985,8 +961,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1011,7 +986,6 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeAliases/classDoesNotDependOnBaseTypes/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeAliases/classDoesNotDependOnBaseTypes/input.ts.json index f3eca5237a94..d427c6db89a7 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeAliases/classDoesNotDependOnBaseTypes/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeAliases/classDoesNotDependOnBaseTypes/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "StringTree", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "StringTreeCollection", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -76,7 +74,6 @@ "ctxt": 0 }, "value": "StringTreeCollectionBase", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -98,6 +95,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -114,8 +112,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -140,7 +137,6 @@ "ctxt": 0 }, "value": "StringTree", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -170,7 +166,6 @@ "ctxt": 0 }, "value": "StringTreeCollection", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -189,7 +184,6 @@ "ctxt": 0 }, "value": "StringTreeCollectionBase", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -222,6 +216,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -244,13 +239,11 @@ "ctxt": 0 }, "value": "StringTree", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -288,7 +281,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -345,7 +337,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -405,7 +396,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -434,7 +424,6 @@ "ctxt": 0 }, "value": "StringTreeCollection", - "typeAnnotation": null, "optional": false }, "arguments": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeAliases/directDependenceBetweenTypeAliases/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeAliases/directDependenceBetweenTypeAliases/input.ts.json index c83e5008c201..032da94b523e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeAliases/directDependenceBetweenTypeAliases/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeAliases/directDependenceBetweenTypeAliases/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "T0", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -41,7 +40,6 @@ "ctxt": 0 }, "value": "T0", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -63,7 +61,6 @@ "ctxt": 0 }, "value": "T0_1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -82,7 +79,6 @@ "ctxt": 0 }, "value": "T0_2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -104,7 +100,6 @@ "ctxt": 0 }, "value": "T0_2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -123,7 +118,6 @@ "ctxt": 0 }, "value": "T0_3", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -145,7 +139,6 @@ "ctxt": 0 }, "value": "T0_3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -164,7 +157,6 @@ "ctxt": 0 }, "value": "T0_1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -185,7 +177,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -212,7 +203,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -247,7 +237,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -266,7 +255,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -292,7 +280,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -317,7 +304,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -344,7 +330,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -371,7 +356,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -407,7 +391,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -434,7 +417,6 @@ "ctxt": 0 }, "value": "T2_1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -468,7 +450,6 @@ "ctxt": 0 }, "value": "T2_1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -502,7 +483,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -528,7 +508,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -551,7 +530,6 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -604,7 +582,6 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -638,6 +615,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -667,14 +645,12 @@ "ctxt": 0 }, "value": "T5", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -705,7 +681,6 @@ "ctxt": 0 }, "value": "T5", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -724,7 +699,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -739,7 +713,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -775,7 +748,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -802,7 +774,6 @@ "ctxt": 0 }, "value": "T6", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -829,7 +800,6 @@ "ctxt": 0 }, "value": "T7", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -862,7 +832,6 @@ "ctxt": 0 }, "value": "T7", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -881,7 +850,6 @@ "ctxt": 0 }, "value": "yy", - "typeAnnotation": null, "optional": false } } @@ -911,6 +879,7 @@ "ctxt": 0 }, "value": "yy", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -974,7 +943,6 @@ "ctxt": 0 }, "value": "T8", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -983,8 +951,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1007,7 +974,6 @@ "ctxt": 0 }, "value": "T8", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1026,7 +992,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1052,7 +1017,6 @@ "ctxt": 0 }, "value": "T6", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1077,7 +1041,6 @@ "ctxt": 0 }, "value": "T9", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1112,7 +1075,6 @@ "ctxt": 0 }, "value": "T9", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1136,7 +1098,6 @@ "ctxt": 0 }, "value": "T10", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1172,7 +1133,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1201,7 +1161,6 @@ "ctxt": 0 }, "value": "T10", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1235,6 +1194,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1257,13 +1217,11 @@ "ctxt": 0 }, "value": "T10", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1306,7 +1264,6 @@ "ctxt": 0 }, "value": "T11", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1332,7 +1289,6 @@ "ctxt": 0 }, "value": "T12", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1355,7 +1311,6 @@ "ctxt": 0 }, "value": "T12", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1390,7 +1345,6 @@ "ctxt": 0 }, "value": "T13", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1433,7 +1387,6 @@ "ctxt": 0 }, "value": "T13", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1452,7 +1405,6 @@ "ctxt": 0 }, "value": "zz", - "typeAnnotation": null, "optional": false } } @@ -1482,6 +1434,7 @@ "ctxt": 0 }, "value": "zz", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1513,7 +1466,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1542,7 +1494,6 @@ "ctxt": 0 }, "value": "T11", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1552,8 +1503,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeAliases/genericTypeAliases/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeAliases/genericTypeAliases/input.ts.json index 394f3f594412..425de471a4ea 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeAliases/genericTypeAliases/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeAliases/genericTypeAliases/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "Tree", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -108,7 +105,6 @@ "ctxt": 0 }, "value": "left", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -137,7 +133,6 @@ "ctxt": 0 }, "value": "Tree", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -163,7 +158,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -190,7 +184,6 @@ "ctxt": 0 }, "value": "right", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -219,7 +212,6 @@ "ctxt": 0 }, "value": "Tree", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -245,7 +237,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -286,6 +277,7 @@ "ctxt": 0 }, "value": "tree", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -308,7 +300,6 @@ "ctxt": 0 }, "value": "Tree", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -331,8 +322,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -352,7 +342,6 @@ "ctxt": 0 }, "value": "left", - "typeAnnotation": null, "optional": false }, "value": { @@ -373,7 +362,6 @@ "ctxt": 0 }, "value": "left", - "typeAnnotation": null, "optional": false }, "value": { @@ -396,7 +384,6 @@ "ctxt": 0 }, "value": "right", - "typeAnnotation": null, "optional": false }, "value": { @@ -417,7 +404,6 @@ "ctxt": 0 }, "value": "left", - "typeAnnotation": null, "optional": false }, "value": { @@ -440,7 +426,6 @@ "ctxt": 0 }, "value": "right", - "typeAnnotation": null, "optional": false }, "value": { @@ -469,7 +454,6 @@ "ctxt": 0 }, "value": "right", - "typeAnnotation": null, "optional": false }, "value": { @@ -504,7 +488,6 @@ "ctxt": 0 }, "value": "Lazy", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -530,7 +513,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -561,7 +543,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -604,7 +585,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -640,6 +620,7 @@ "ctxt": 0 }, "value": "ls", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -662,7 +643,6 @@ "ctxt": 0 }, "value": "Lazy", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -685,8 +665,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -716,8 +695,8 @@ "ctxt": 0 }, "value": "ls", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -758,8 +737,8 @@ "ctxt": 0 }, "value": "ls", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -806,7 +785,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -832,7 +810,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -863,7 +840,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -892,7 +868,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -921,7 +896,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -947,7 +921,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -979,7 +952,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1005,7 +977,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1036,7 +1007,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1065,7 +1035,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1094,7 +1063,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1120,7 +1088,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1161,6 +1128,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1183,7 +1151,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1206,8 +1173,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1239,6 +1205,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1261,7 +1228,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1284,8 +1250,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1315,8 +1280,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1326,7 +1291,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1354,8 +1318,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1365,7 +1329,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1393,8 +1356,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -1435,8 +1398,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1456,7 +1419,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1501,8 +1463,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1522,7 +1484,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1543,7 +1504,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1593,6 +1553,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1615,7 +1576,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1638,8 +1598,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1669,8 +1628,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1706,8 +1665,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1727,7 +1686,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1767,8 +1725,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1788,7 +1746,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1809,7 +1766,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1845,7 +1801,6 @@ "ctxt": 0 }, "value": "Strange", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1871,7 +1826,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1914,6 +1868,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1936,7 +1891,6 @@ "ctxt": 0 }, "value": "Strange", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1959,8 +1913,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1990,8 +1943,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -2024,7 +1977,6 @@ "ctxt": 0 }, "value": "AB", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2051,7 +2003,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2072,7 +2023,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2105,7 +2055,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2134,7 +2083,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2158,7 +2106,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2187,7 +2134,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2214,7 +2160,6 @@ "ctxt": 0 }, "value": "Pair", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2240,7 +2185,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2263,7 +2207,6 @@ "ctxt": 0 }, "value": "AB", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2289,7 +2232,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2309,7 +2251,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2333,7 +2274,6 @@ "ctxt": 0 }, "value": "TaggedPair", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2360,7 +2300,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2384,7 +2323,6 @@ "ctxt": 0 }, "value": "Pair", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -2410,7 +2348,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2443,7 +2380,6 @@ "ctxt": 0 }, "value": "tag", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2497,6 +2433,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2519,7 +2456,6 @@ "ctxt": 0 }, "value": "TaggedPair", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2542,8 +2478,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2580,7 +2515,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -2591,7 +2525,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2637,7 +2570,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -2648,7 +2580,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2694,7 +2625,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "property": { @@ -2705,7 +2635,6 @@ "ctxt": 0 }, "value": "tag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2736,7 +2665,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2771,7 +2699,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2797,7 +2724,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2828,7 +2754,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2857,7 +2782,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2886,7 +2810,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2912,7 +2835,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2953,6 +2875,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2975,7 +2898,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3008,7 +2930,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3017,8 +2938,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3040,7 +2960,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3071,7 +2990,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3091,7 +3009,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3126,7 +3043,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3152,7 +3068,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3183,7 +3098,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3212,7 +3126,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3241,7 +3154,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3267,7 +3179,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3308,6 +3219,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3330,7 +3242,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3363,7 +3274,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3372,8 +3282,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3395,7 +3304,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3426,7 +3334,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3461,8 +3368,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3479,7 +3386,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3532,8 +3438,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3550,7 +3456,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3601,8 +3506,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3612,7 +3517,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeAliases/interfaceDoesNotDependOnBaseTypes/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeAliases/interfaceDoesNotDependOnBaseTypes/input.ts.json index 8998e04c3e2a..602927278d68 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeAliases/interfaceDoesNotDependOnBaseTypes/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeAliases/interfaceDoesNotDependOnBaseTypes/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,13 +54,11 @@ "ctxt": 0 }, "value": "StringTree", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -97,7 +96,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -153,7 +151,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -164,7 +161,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -220,7 +216,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -231,7 +226,6 @@ "ctxt": 0 }, "value": "push", - "typeAnnotation": null, "optional": false }, "computed": false @@ -291,7 +285,6 @@ "ctxt": 0 }, "value": "StringTree", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -327,7 +320,6 @@ "ctxt": 0 }, "value": "StringTreeArray", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -350,7 +342,6 @@ "ctxt": 0 }, "value": "StringTreeArray", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -371,7 +362,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -397,7 +387,6 @@ "ctxt": 0 }, "value": "StringTree", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeAliases/intrinsicKeyword/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeAliases/intrinsicKeyword/input.ts.json index 2bd88c33efae..5f269df434d4 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeAliases/intrinsicKeyword/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeAliases/intrinsicKeyword/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "e1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "intrinsic" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "e2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -111,7 +112,6 @@ "ctxt": 0 }, "value": "intrinsic", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -139,8 +139,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -163,7 +162,6 @@ "ctxt": 0 }, "value": "TE1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -201,7 +199,6 @@ "ctxt": 0 }, "value": "TE2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -227,7 +224,6 @@ "ctxt": 0 }, "value": "intrinsic", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -261,7 +257,6 @@ "ctxt": 0 }, "value": "TE3", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -287,7 +282,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -318,7 +312,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -340,7 +333,6 @@ "ctxt": 0 }, "value": "TE4", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -366,7 +358,6 @@ "ctxt": 0 }, "value": "intrinsic", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -408,7 +399,6 @@ "ctxt": 0 }, "value": "TE5", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -434,7 +424,6 @@ "ctxt": 0 }, "value": "intrinsic", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -478,7 +467,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -522,6 +510,7 @@ "ctxt": 0 }, "value": "intrinsic", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -546,7 +535,6 @@ "ctxt": 0 }, "value": "intrinsic", - "typeAnnotation": null, "optional": false }, "right": { @@ -557,14 +545,12 @@ "ctxt": 0 }, "value": "intrinsic", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -588,7 +574,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -609,6 +594,7 @@ "ctxt": 0 }, "value": "intrinsic", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -625,8 +611,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -659,7 +644,6 @@ "ctxt": 0 }, "value": "intrinsic", - "typeAnnotation": null, "optional": false } } @@ -680,7 +664,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -715,7 +698,6 @@ "ctxt": 0 }, "value": "intrinsic", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -754,6 +736,7 @@ "ctxt": 0 }, "value": "s1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -770,8 +753,7 @@ }, "kind": "intrinsic" } - }, - "optional": false + } }, "init": { "type": "StringLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeAliases/intrinsicTypes/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeAliases/intrinsicTypes/input.ts.json index 4cfec1e8ce23..a4b5e4f12f5e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeAliases/intrinsicTypes/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeAliases/intrinsicTypes/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "TU1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -41,7 +40,6 @@ "ctxt": 0 }, "value": "Uppercase", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "TU2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -113,7 +110,6 @@ "ctxt": 0 }, "value": "Uppercase", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -198,7 +194,6 @@ "ctxt": 0 }, "value": "TU3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -217,7 +212,6 @@ "ctxt": 0 }, "value": "Uppercase", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -257,7 +251,6 @@ "ctxt": 0 }, "value": "TU4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -276,7 +269,6 @@ "ctxt": 0 }, "value": "Uppercase", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -316,7 +308,6 @@ "ctxt": 0 }, "value": "TU5", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -335,7 +326,6 @@ "ctxt": 0 }, "value": "Uppercase", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -375,7 +365,6 @@ "ctxt": 0 }, "value": "TU6", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -394,7 +383,6 @@ "ctxt": 0 }, "value": "Uppercase", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -442,7 +430,6 @@ "ctxt": 0 }, "value": "TL1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -461,7 +448,6 @@ "ctxt": 0 }, "value": "Lowercase", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -514,7 +500,6 @@ "ctxt": 0 }, "value": "TL2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -533,7 +518,6 @@ "ctxt": 0 }, "value": "Lowercase", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -618,7 +602,6 @@ "ctxt": 0 }, "value": "TL3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -637,7 +620,6 @@ "ctxt": 0 }, "value": "Lowercase", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -677,7 +659,6 @@ "ctxt": 0 }, "value": "TL4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -696,7 +677,6 @@ "ctxt": 0 }, "value": "Lowercase", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -736,7 +716,6 @@ "ctxt": 0 }, "value": "TL5", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -755,7 +734,6 @@ "ctxt": 0 }, "value": "Lowercase", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -795,7 +773,6 @@ "ctxt": 0 }, "value": "TL6", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -814,7 +791,6 @@ "ctxt": 0 }, "value": "Lowercase", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -862,7 +838,6 @@ "ctxt": 0 }, "value": "TC1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -881,7 +856,6 @@ "ctxt": 0 }, "value": "Capitalize", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -934,7 +908,6 @@ "ctxt": 0 }, "value": "TC2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -953,7 +926,6 @@ "ctxt": 0 }, "value": "Capitalize", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1038,7 +1010,6 @@ "ctxt": 0 }, "value": "TC3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1057,7 +1028,6 @@ "ctxt": 0 }, "value": "Capitalize", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1097,7 +1067,6 @@ "ctxt": 0 }, "value": "TC4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1116,7 +1085,6 @@ "ctxt": 0 }, "value": "Capitalize", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1156,7 +1124,6 @@ "ctxt": 0 }, "value": "TC5", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1175,7 +1142,6 @@ "ctxt": 0 }, "value": "Capitalize", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1215,7 +1181,6 @@ "ctxt": 0 }, "value": "TC6", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1234,7 +1199,6 @@ "ctxt": 0 }, "value": "Capitalize", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1282,7 +1246,6 @@ "ctxt": 0 }, "value": "TN1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1301,7 +1264,6 @@ "ctxt": 0 }, "value": "Uncapitalize", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1354,7 +1316,6 @@ "ctxt": 0 }, "value": "TN2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1373,7 +1334,6 @@ "ctxt": 0 }, "value": "Uncapitalize", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1458,7 +1418,6 @@ "ctxt": 0 }, "value": "TN3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1477,7 +1436,6 @@ "ctxt": 0 }, "value": "Uncapitalize", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1517,7 +1475,6 @@ "ctxt": 0 }, "value": "TN4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1536,7 +1493,6 @@ "ctxt": 0 }, "value": "Uncapitalize", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1576,7 +1532,6 @@ "ctxt": 0 }, "value": "TN5", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1595,7 +1550,6 @@ "ctxt": 0 }, "value": "Uncapitalize", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1635,7 +1589,6 @@ "ctxt": 0 }, "value": "TN6", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1654,7 +1607,6 @@ "ctxt": 0 }, "value": "Uncapitalize", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1702,7 +1654,6 @@ "ctxt": 0 }, "value": "TX1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1728,7 +1679,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1759,7 +1709,6 @@ "ctxt": 0 }, "value": "Uppercase", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1800,7 +1749,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1904,7 +1852,6 @@ "ctxt": 0 }, "value": "TX2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1923,7 +1870,6 @@ "ctxt": 0 }, "value": "TX1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1976,7 +1922,6 @@ "ctxt": 0 }, "value": "TX3", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2002,7 +1947,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2033,7 +1977,6 @@ "ctxt": 0 }, "value": "Lowercase", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2074,7 +2017,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2178,7 +2120,6 @@ "ctxt": 0 }, "value": "TX4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2197,7 +2138,6 @@ "ctxt": 0 }, "value": "TX3", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2250,7 +2190,6 @@ "ctxt": 0 }, "value": "TX5", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2284,7 +2223,6 @@ "ctxt": 0 }, "value": "Uppercase", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2335,7 +2273,6 @@ "ctxt": 0 }, "value": "Lowercase", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2504,7 +2441,6 @@ "ctxt": 0 }, "value": "MyUppercase", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2530,7 +2466,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2566,7 +2501,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2587,6 +2521,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2603,8 +2538,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -2623,6 +2557,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2645,7 +2580,6 @@ "ctxt": 0 }, "value": "Uppercase", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2671,7 +2605,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2679,8 +2612,7 @@ ] } } - }, - "optional": false + } } }, { @@ -2699,6 +2631,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2721,7 +2654,6 @@ "ctxt": 0 }, "value": "Uppercase", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2747,7 +2679,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2755,8 +2686,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2797,8 +2727,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2808,7 +2738,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2836,8 +2765,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2847,7 +2776,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -2875,8 +2803,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2886,7 +2814,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -2914,8 +2841,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2925,7 +2852,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -2953,8 +2879,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2964,7 +2890,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -2992,8 +2917,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3003,7 +2928,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3035,7 +2959,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3064,7 +2987,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3082,7 +3004,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3103,7 +3024,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3124,6 +3044,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3146,7 +3067,6 @@ "ctxt": 0 }, "value": "Uppercase", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3172,7 +3092,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3180,8 +3099,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3224,6 +3142,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3285,8 +3204,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -3296,7 +3214,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3330,7 +3247,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3403,7 +3319,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3424,6 +3339,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3446,7 +3362,6 @@ "ctxt": 0 }, "value": "Uppercase", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3472,7 +3387,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3480,8 +3394,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3517,7 +3430,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3555,7 +3467,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3572,7 +3483,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3593,6 +3503,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3615,7 +3526,6 @@ "ctxt": 0 }, "value": "Uppercase", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3641,7 +3551,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3649,8 +3558,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3690,7 +3598,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3704,7 +3611,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3739,7 +3645,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeAliases/typeAliases/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeAliases/typeAliases/input.ts.json index 73c18a47d57b..eff9744826dc 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeAliases/typeAliases/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeAliases/typeAliases/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -61,6 +60,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -77,8 +77,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -110,6 +109,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -132,13 +132,11 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -161,7 +159,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -200,6 +197,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,8 +214,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -249,6 +246,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -271,13 +269,11 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -300,7 +296,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -339,6 +334,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -355,8 +351,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -388,6 +383,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -410,13 +406,11 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -439,7 +433,6 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -478,6 +471,7 @@ "ctxt": 0 }, "value": "x4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -494,8 +488,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -527,6 +520,7 @@ "ctxt": 0 }, "value": "x4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -549,13 +543,11 @@ "ctxt": 0 }, "value": "T4", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -578,7 +570,6 @@ "ctxt": 0 }, "value": "T5", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -617,6 +608,7 @@ "ctxt": 0 }, "value": "x5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -633,8 +625,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -666,6 +657,7 @@ "ctxt": 0 }, "value": "x5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -688,13 +680,11 @@ "ctxt": 0 }, "value": "T5", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -716,7 +706,6 @@ "ctxt": 0 }, "value": "I6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -746,7 +735,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -791,7 +779,6 @@ "ctxt": 0 }, "value": "T6", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -810,7 +797,6 @@ "ctxt": 0 }, "value": "I6", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -841,6 +827,7 @@ "ctxt": 0 }, "value": "x6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -863,13 +850,11 @@ "ctxt": 0 }, "value": "I6", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -901,6 +886,7 @@ "ctxt": 0 }, "value": "x6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -923,13 +909,11 @@ "ctxt": 0 }, "value": "T6", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -946,7 +930,6 @@ "ctxt": 0 }, "value": "C7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -972,7 +955,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1026,7 +1008,6 @@ "ctxt": 0 }, "value": "T7", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1045,7 +1026,6 @@ "ctxt": 0 }, "value": "C7", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1076,6 +1056,7 @@ "ctxt": 0 }, "value": "x7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1098,13 +1079,11 @@ "ctxt": 0 }, "value": "C7", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1136,6 +1115,7 @@ "ctxt": 0 }, "value": "x7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1158,13 +1138,11 @@ "ctxt": 0 }, "value": "T7", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1187,7 +1165,6 @@ "ctxt": 0 }, "value": "T8", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1245,6 +1222,7 @@ "ctxt": 0 }, "value": "x8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1280,8 +1258,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1313,6 +1290,7 @@ "ctxt": 0 }, "value": "x8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1335,13 +1313,11 @@ "ctxt": 0 }, "value": "T8", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1364,7 +1340,6 @@ "ctxt": 0 }, "value": "T9", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1421,6 +1396,7 @@ "ctxt": 0 }, "value": "x9", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1455,8 +1431,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1488,6 +1463,7 @@ "ctxt": 0 }, "value": "x9", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1510,13 +1486,11 @@ "ctxt": 0 }, "value": "T9", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1539,7 +1513,6 @@ "ctxt": 0 }, "value": "T10", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1567,7 +1540,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1621,6 +1593,7 @@ "ctxt": 0 }, "value": "x10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1652,7 +1625,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1680,8 +1652,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1713,6 +1684,7 @@ "ctxt": 0 }, "value": "x10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1735,13 +1707,11 @@ "ctxt": 0 }, "value": "T10", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1764,7 +1734,6 @@ "ctxt": 0 }, "value": "T11", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1831,6 +1800,7 @@ "ctxt": 0 }, "value": "x11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1875,8 +1845,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1908,6 +1877,7 @@ "ctxt": 0 }, "value": "x11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1930,13 +1900,11 @@ "ctxt": 0 }, "value": "T11", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1958,7 +1926,6 @@ "ctxt": 0 }, "value": "I13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1988,7 +1955,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2041,7 +2007,6 @@ "ctxt": 0 }, "value": "T13", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2060,7 +2025,6 @@ "ctxt": 0 }, "value": "I13", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2091,6 +2055,7 @@ "ctxt": 0 }, "value": "x13_1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2113,13 +2078,11 @@ "ctxt": 0 }, "value": "I13", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2151,6 +2114,7 @@ "ctxt": 0 }, "value": "x13_2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2173,13 +2137,11 @@ "ctxt": 0 }, "value": "T13", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2196,7 +2158,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2217,6 +2178,7 @@ "ctxt": 0 }, "value": "t1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2239,13 +2201,11 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2264,6 +2224,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2286,13 +2247,11 @@ "ctxt": 0 }, "value": "T13", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2328,7 +2287,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2346,7 +2304,6 @@ "ctxt": 0 }, "value": "I13", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2368,7 +2325,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2386,7 +2342,6 @@ "ctxt": 0 }, "value": "T13", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2435,7 +2390,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2449,7 +2403,6 @@ "ctxt": 0 }, "value": "x13_1", - "typeAnnotation": null, "optional": false } }, @@ -2463,7 +2416,6 @@ "ctxt": 0 }, "value": "x13_2", - "typeAnnotation": null, "optional": false } } @@ -2493,7 +2445,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2507,7 +2458,6 @@ "ctxt": 0 }, "value": "x13_2", - "typeAnnotation": null, "optional": false } }, @@ -2521,7 +2471,6 @@ "ctxt": 0 }, "value": "x13_1", - "typeAnnotation": null, "optional": false } } @@ -2545,7 +2494,6 @@ "ctxt": 0 }, "value": "T14", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2584,6 +2532,7 @@ "ctxt": 0 }, "value": "x14", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2606,13 +2555,11 @@ "ctxt": 0 }, "value": "T14", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2629,7 +2576,6 @@ "ctxt": 0 }, "value": "foo14_1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2650,6 +2596,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2672,13 +2619,11 @@ "ctxt": 0 }, "value": "T14", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2720,7 +2665,6 @@ "ctxt": 0 }, "value": "foo14_2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2741,6 +2685,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2770,8 +2715,7 @@ } } } - }, - "optional": false + } } } ], @@ -2813,7 +2757,6 @@ "ctxt": 0 }, "value": "foo14_2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2834,6 +2777,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2856,13 +2800,11 @@ "ctxt": 0 }, "value": "T14", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2910,7 +2852,6 @@ "ctxt": 0 }, "value": "Meters", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2941,7 +2882,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -2960,7 +2900,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "init": { @@ -2985,7 +2924,6 @@ "ctxt": 0 }, "value": "f15", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3006,6 +2944,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3022,8 +2961,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -3065,7 +3003,6 @@ "ctxt": 0 }, "value": "f15", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3086,6 +3023,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3108,13 +3046,11 @@ "ctxt": 0 }, "value": "Meters", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3182,7 +3118,6 @@ "ctxt": 0 }, "value": "f15", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3203,7 +3138,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3214,7 +3148,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3231,7 +3164,6 @@ "ctxt": 0 }, "value": "toLowerCase", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3256,7 +3188,6 @@ "ctxt": 0 }, "value": "StringAndBoolean", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3317,7 +3248,6 @@ "ctxt": 0 }, "value": "f16", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3338,6 +3268,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3360,13 +3291,11 @@ "ctxt": 0 }, "value": "StringAndBoolean", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3423,6 +3352,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3476,8 +3406,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3506,7 +3435,6 @@ "ctxt": 0 }, "value": "f16", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3520,7 +3448,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3553,6 +3480,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3575,13 +3503,11 @@ "ctxt": 0 }, "value": "StringAndBoolean", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -3662,7 +3588,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "property": { @@ -3684,7 +3609,6 @@ "ctxt": 0 }, "value": "toLowerCase", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeAliases/typeAliasesDoNotMerge/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeAliases/typeAliasesDoNotMerge/input.ts.json index 7e163d5f4157..6a34c2e06a90 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeAliases/typeAliasesDoNotMerge/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeAliases/typeAliasesDoNotMerge/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -60,7 +59,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeAliases/typeAliasesForObjectTypes/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeAliases/typeAliasesForObjectTypes/input.ts.json index fa6441cbc355..548a4aadee6b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeAliases/typeAliasesForObjectTypes/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeAliases/typeAliasesForObjectTypes/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -115,7 +112,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -145,7 +141,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -210,7 +204,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -262,7 +255,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -285,7 +277,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -313,7 +304,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -358,7 +348,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -386,7 +375,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -431,7 +419,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -457,7 +444,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -489,7 +475,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -518,7 +503,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/recurringTypeParamForContainerOfBase01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/recurringTypeParamForContainerOfBase01/input.ts.json index c310993889fa..110da2880202 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/recurringTypeParamForContainerOfBase01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/recurringTypeParamForContainerOfBase01/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "BoxOfFoo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -66,7 +64,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -92,7 +89,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -129,7 +125,6 @@ "ctxt": 0 }, "value": "item", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -158,7 +153,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -184,7 +178,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +204,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -229,7 +221,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -255,7 +246,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -292,7 +282,6 @@ "ctxt": 0 }, "value": "self", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -321,7 +310,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -347,7 +335,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -374,7 +361,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -392,7 +378,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -418,7 +403,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -446,7 +430,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -472,7 +455,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -505,7 +487,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -534,7 +515,6 @@ "ctxt": 0 }, "value": "BoxOfFoo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -560,7 +540,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/callGenericFunctionWithIncorrectNumberOfTypeArguments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/callGenericFunctionWithIncorrectNumberOfTypeArguments/input.ts.json index def266831e9e..46afee2c856e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/callGenericFunctionWithIncorrectNumberOfTypeArguments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/callGenericFunctionWithIncorrectNumberOfTypeArguments/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -106,13 +105,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -173,7 +170,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -194,7 +190,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -224,7 +219,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -256,8 +250,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -274,7 +268,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -357,8 +350,8 @@ "ctxt": 0 }, "value": "r1b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -375,7 +368,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -476,8 +468,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -495,6 +487,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -517,13 +510,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -533,6 +524,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -555,13 +547,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -615,7 +605,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -636,7 +625,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -666,7 +654,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -702,8 +689,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -720,7 +707,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -803,8 +789,8 @@ "ctxt": 0 }, "value": "r2b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -821,7 +807,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -922,6 +907,7 @@ "ctxt": 0 }, "value": "f3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -953,6 +939,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -975,13 +962,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -991,6 +976,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1013,13 +999,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1044,7 +1028,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1073,7 +1056,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1094,7 +1076,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1105,8 +1086,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1138,8 +1118,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1156,7 +1136,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1239,8 +1218,8 @@ "ctxt": 0 }, "value": "r3b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1257,7 +1236,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1343,7 +1321,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1369,7 +1346,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -1390,6 +1366,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1412,13 +1389,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1437,6 +1412,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1459,13 +1435,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1526,7 +1500,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1547,7 +1520,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1577,7 +1549,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1622,8 +1593,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1661,7 +1632,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1676,7 +1646,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1761,8 +1730,8 @@ "ctxt": 0 }, "value": "r4b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1800,7 +1769,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1815,7 +1783,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1908,7 +1875,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1938,7 +1904,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1952,6 +1917,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1974,13 +1940,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1990,6 +1954,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2012,13 +1977,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -2043,7 +2006,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2072,7 +2034,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2093,7 +2054,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2130,6 +2090,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2152,13 +2113,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2190,8 +2149,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2215,7 +2174,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -2226,7 +2184,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2311,8 +2268,8 @@ "ctxt": 0 }, "value": "r5b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2336,7 +2293,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -2347,7 +2303,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2435,7 +2390,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2461,7 +2415,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -2482,6 +2435,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2504,13 +2458,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2529,6 +2481,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2551,13 +2504,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2618,7 +2569,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2657,7 +2607,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2678,7 +2627,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2714,8 +2662,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2753,7 +2701,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2768,7 +2715,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2853,8 +2799,8 @@ "ctxt": 0 }, "value": "r6b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2892,7 +2838,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2907,7 +2852,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3000,7 +2944,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3027,7 +2970,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3048,7 +2990,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3081,7 +3022,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3095,6 +3035,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3117,13 +3058,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -3133,6 +3072,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3155,13 +3095,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -3186,7 +3124,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3222,6 +3159,7 @@ "ctxt": 0 }, "value": "i2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3244,7 +3182,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3276,8 +3213,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3309,8 +3245,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3334,7 +3270,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false }, "property": { @@ -3345,7 +3280,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3430,8 +3364,8 @@ "ctxt": 0 }, "value": "r7b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3455,7 +3389,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false }, "property": { @@ -3466,7 +3399,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/callGenericFunctionWithZeroTypeArguments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/callGenericFunctionWithZeroTypeArguments/input.ts.json index 56f22dc17318..fcbd1cc20cfc 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/callGenericFunctionWithZeroTypeArguments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/callGenericFunctionWithZeroTypeArguments/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -126,7 +124,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -156,7 +153,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -188,8 +184,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -206,7 +202,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -254,8 +249,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -273,6 +268,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -295,13 +291,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -355,7 +349,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -385,7 +378,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -421,8 +413,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -439,7 +431,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -487,6 +478,7 @@ "ctxt": 0 }, "value": "f3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -518,6 +510,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -540,13 +533,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -571,7 +562,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -600,7 +590,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -611,8 +600,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -644,8 +632,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -662,7 +650,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -695,7 +682,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -721,7 +707,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -742,6 +727,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -764,13 +750,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -831,7 +815,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -861,7 +844,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -906,8 +888,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -945,7 +927,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -960,7 +941,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1000,7 +980,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1030,7 +1009,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1044,6 +1022,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1066,13 +1045,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1097,7 +1074,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1126,7 +1102,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1163,6 +1138,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1185,13 +1161,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1223,8 +1197,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1248,7 +1222,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1259,7 +1232,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1294,7 +1266,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1320,7 +1291,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -1341,6 +1311,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1363,13 +1334,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1430,7 +1399,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1469,7 +1437,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1505,8 +1472,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1544,7 +1511,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1559,7 +1525,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1599,7 +1564,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1626,7 +1590,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1659,7 +1622,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1673,6 +1635,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1695,13 +1658,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1726,7 +1687,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1762,6 +1722,7 @@ "ctxt": 0 }, "value": "i2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1784,7 +1745,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1807,8 +1767,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1840,8 +1799,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1865,7 +1824,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1876,7 +1834,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/callNonGenericFunctionWithTypeArguments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/callNonGenericFunctionWithTypeArguments/input.ts.json index dd2540f4f590..ac24b6afc2a3 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/callNonGenericFunctionWithTypeArguments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/callNonGenericFunctionWithTypeArguments/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -120,8 +119,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -138,7 +137,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -204,8 +202,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -223,6 +221,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -239,8 +238,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -303,8 +301,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -321,7 +319,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -387,6 +384,7 @@ "ctxt": 0 }, "value": "f3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -418,6 +416,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -434,8 +433,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -459,8 +457,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -492,8 +489,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -510,7 +507,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -561,7 +557,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -587,7 +582,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -608,6 +602,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -624,8 +619,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -704,8 +698,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -743,7 +737,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -758,7 +751,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -816,7 +808,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -846,7 +837,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -860,6 +850,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -876,8 +867,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -927,6 +917,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -949,13 +940,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -987,8 +976,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1012,7 +1001,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1023,7 +1011,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1076,7 +1063,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1102,7 +1088,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -1123,6 +1108,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1139,8 +1125,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1219,8 +1204,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1258,7 +1243,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1273,7 +1257,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1331,7 +1314,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1361,7 +1343,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1375,6 +1356,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1391,8 +1373,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": null, @@ -1426,6 +1407,7 @@ "ctxt": 0 }, "value": "i2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1448,13 +1430,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1486,8 +1466,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1511,7 +1491,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1522,7 +1501,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1590,8 +1568,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -1623,8 +1601,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1641,7 +1619,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1694,6 +1671,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1710,8 +1688,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1743,8 +1720,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1761,7 +1738,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/constraintSatisfactionWithAny/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/constraintSatisfactionWithAny/input.ts.json index eeb8eac1c482..e14597194281 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/constraintSatisfactionWithAny/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/constraintSatisfactionWithAny/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -126,7 +124,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -175,7 +171,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -192,7 +187,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -213,6 +207,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -235,13 +230,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -302,7 +295,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -329,7 +321,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -383,7 +374,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -400,7 +390,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -421,6 +410,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -443,13 +433,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -510,7 +498,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -529,6 +516,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -551,13 +539,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -583,7 +569,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -635,7 +620,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -667,8 +651,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -697,7 +681,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -711,7 +694,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -741,7 +723,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -755,7 +736,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -785,7 +765,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -799,7 +778,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -832,6 +810,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -848,8 +827,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -878,7 +856,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -892,7 +869,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -940,7 +916,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -954,7 +929,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1002,7 +976,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1016,7 +989,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1052,7 +1024,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1078,7 +1049,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1100,6 +1070,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1122,13 +1093,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1170,7 +1139,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1188,7 +1156,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1225,8 +1192,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1243,7 +1210,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1257,7 +1223,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1293,8 +1258,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1311,7 +1276,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1325,7 +1289,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1364,7 +1327,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1390,7 +1352,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1412,6 +1373,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1434,13 +1396,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1482,7 +1442,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1509,7 +1468,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1569,8 +1527,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1587,7 +1545,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1601,7 +1558,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1637,8 +1593,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1655,7 +1611,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1669,7 +1624,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1708,7 +1662,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1734,7 +1687,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1756,6 +1708,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1778,13 +1731,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1826,7 +1777,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1845,6 +1795,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1867,13 +1818,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -1899,7 +1848,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1929,7 +1877,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1968,8 +1915,8 @@ "ctxt": 0 }, "value": "c7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1986,7 +1933,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2000,7 +1946,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2036,8 +1981,8 @@ "ctxt": 0 }, "value": "c8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2054,7 +1999,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2068,7 +2012,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/constraintSatisfactionWithAny2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/constraintSatisfactionWithAny2/input.ts.json index dfef81424b9f..75e8d3a438cd 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/constraintSatisfactionWithAny2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/constraintSatisfactionWithAny2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -101,7 +99,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -122,7 +119,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -141,6 +137,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -163,13 +160,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -195,7 +190,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -225,7 +219,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -258,7 +251,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -290,6 +282,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -306,8 +299,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -336,7 +328,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -350,7 +341,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -380,7 +370,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -394,7 +383,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/constraintSatisfactionWithEmptyObject/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/constraintSatisfactionWithEmptyObject/input.ts.json index 9c7c8f12c078..5f30a3d7bc3f 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/constraintSatisfactionWithEmptyObject/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/constraintSatisfactionWithEmptyObject/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -109,7 +107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -127,7 +124,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -163,8 +159,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -181,7 +177,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -229,8 +224,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -270,8 +265,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -288,7 +283,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -321,7 +315,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -347,7 +340,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -369,6 +361,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -391,13 +384,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -439,7 +430,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -457,7 +447,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -494,8 +483,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -512,7 +501,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -550,7 +538,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -577,7 +564,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -595,7 +581,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -629,7 +614,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -658,7 +642,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -694,6 +677,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -716,7 +700,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -739,8 +722,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -757,7 +739,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -778,6 +759,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -800,13 +782,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -850,7 +830,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -893,8 +872,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -911,7 +890,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -959,8 +937,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1000,8 +978,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1018,7 +996,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1051,7 +1028,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1077,7 +1053,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1099,6 +1074,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1121,13 +1097,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1169,7 +1143,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1213,8 +1186,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1231,7 +1204,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1269,7 +1241,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1296,7 +1267,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1337,7 +1307,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1366,7 +1335,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1402,6 +1370,7 @@ "ctxt": 0 }, "value": "i2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1424,7 +1393,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1447,8 +1415,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction/input.ts.json index d5aa25442ffe..4e1aaa5a2aac 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -98,7 +96,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -129,7 +126,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -147,7 +143,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -178,7 +173,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -269,6 +262,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -291,13 +285,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -314,7 +306,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -340,7 +331,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -403,6 +393,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -447,8 +438,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -480,6 +470,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -524,8 +515,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -557,6 +547,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -615,8 +606,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": { @@ -640,8 +631,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -673,8 +663,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -691,7 +681,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -712,7 +701,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -751,8 +739,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -769,7 +757,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -791,8 +778,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -803,7 +790,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -844,8 +830,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -862,7 +848,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -884,6 +869,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -908,8 +894,7 @@ "kind": "string" } } - }, - "optional": false + } } ], "body": { @@ -920,7 +905,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -961,8 +945,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -979,7 +963,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1005,8 +988,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -1039,7 +1022,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1083,8 +1065,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1101,7 +1083,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1127,6 +1108,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1151,8 +1133,7 @@ "kind": "string" } } - }, - "optional": false + } } } ], @@ -1185,7 +1166,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1229,8 +1209,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1247,7 +1227,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1261,7 +1240,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -1297,8 +1275,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1315,7 +1293,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1329,7 +1306,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } @@ -1365,8 +1341,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1383,7 +1359,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1397,7 +1372,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1433,8 +1407,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1451,7 +1425,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1465,7 +1438,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1491,7 +1463,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1518,7 +1489,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1551,6 +1521,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1573,13 +1544,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1604,7 +1573,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1640,6 +1608,7 @@ "ctxt": 0 }, "value": "i2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1662,7 +1631,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1685,8 +1653,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1703,7 +1670,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1729,7 +1695,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1755,7 +1720,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1797,7 +1761,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1833,6 +1796,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1864,6 +1828,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1886,13 +1851,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1917,7 +1880,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1946,7 +1908,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1957,8 +1918,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1990,6 +1950,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2021,6 +1982,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2043,13 +2005,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2074,7 +2034,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2103,7 +2062,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2114,8 +2072,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2147,6 +2104,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2178,6 +2136,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2200,13 +2159,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2231,7 +2188,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2260,7 +2216,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2285,6 +2240,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2307,13 +2263,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2323,6 +2277,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2345,13 +2300,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2376,7 +2329,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2405,7 +2357,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2416,8 +2367,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2449,8 +2399,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2467,7 +2417,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2489,6 +2438,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2511,13 +2461,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2528,7 +2476,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2556,7 +2503,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2599,8 +2545,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2617,7 +2563,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2643,6 +2588,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2665,13 +2611,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2704,7 +2648,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2735,7 +2678,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2778,8 +2720,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2796,7 +2738,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2818,6 +2759,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2840,13 +2782,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2857,7 +2797,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2885,7 +2824,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2903,7 +2841,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2947,8 +2884,8 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2965,7 +2902,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2987,6 +2923,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3009,13 +2946,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -3025,6 +2960,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3047,13 +2983,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -3064,7 +2998,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3092,7 +3025,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3113,7 +3045,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3156,8 +3087,8 @@ "ctxt": 0 }, "value": "r13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3174,7 +3105,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3188,7 +3118,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false } } @@ -3224,8 +3153,8 @@ "ctxt": 0 }, "value": "r14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3242,7 +3171,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3256,7 +3184,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false } } @@ -3292,8 +3219,8 @@ "ctxt": 0 }, "value": "r15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3310,7 +3237,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3324,7 +3250,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -3360,8 +3285,8 @@ "ctxt": 0 }, "value": "r16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3378,7 +3303,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3392,7 +3316,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false } } @@ -3418,7 +3341,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3439,7 +3361,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3469,7 +3390,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3523,6 +3443,7 @@ "ctxt": 0 }, "value": "f2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3545,13 +3466,11 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3583,8 +3502,8 @@ "ctxt": 0 }, "value": "r17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3601,7 +3520,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3615,7 +3533,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false } } @@ -3636,7 +3553,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3657,6 +3573,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3679,13 +3596,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3704,6 +3619,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3726,13 +3642,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3772,7 +3686,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3786,7 +3699,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3816,7 +3728,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3830,7 +3741,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -3865,7 +3775,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3922,7 +3831,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2/input.ts.json index 89ceb869c205..8b1ec7e629cd 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -98,7 +96,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -129,7 +126,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -147,7 +143,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -178,7 +173,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -207,7 +201,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -249,7 +242,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -316,7 +308,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -371,7 +362,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -392,6 +382,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -414,13 +405,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -453,7 +442,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -484,7 +472,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -503,6 +490,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -519,8 +507,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -568,7 +555,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -585,7 +571,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -611,7 +596,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -674,6 +658,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -705,6 +690,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -721,8 +707,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -746,8 +731,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -764,7 +748,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -790,7 +773,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -816,7 +798,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -858,7 +839,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -894,6 +874,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -925,6 +906,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -947,13 +929,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -978,7 +958,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1007,7 +986,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1018,8 +996,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1051,8 +1028,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1069,7 +1046,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1090,7 +1066,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1129,8 +1104,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1147,7 +1122,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1169,6 +1143,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1193,8 +1168,7 @@ "kind": "string" } } - }, - "optional": false + } } ], "body": { @@ -1205,7 +1179,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1246,8 +1219,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1264,7 +1237,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1278,7 +1250,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } @@ -1314,8 +1285,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1332,7 +1303,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1346,7 +1316,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1382,8 +1351,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1400,7 +1369,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1422,6 +1390,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1444,13 +1413,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1461,7 +1428,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1489,7 +1455,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1532,8 +1497,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1550,7 +1515,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1572,6 +1536,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1594,13 +1559,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1610,6 +1573,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1632,13 +1596,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1649,7 +1611,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1677,7 +1638,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1698,7 +1658,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1741,8 +1700,8 @@ "ctxt": 0 }, "value": "r13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1759,7 +1718,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1773,7 +1731,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false } } @@ -1809,8 +1766,8 @@ "ctxt": 0 }, "value": "r14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1827,7 +1784,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1841,7 +1797,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -1867,7 +1822,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1888,7 +1842,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1918,7 +1871,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1972,6 +1924,7 @@ "ctxt": 0 }, "value": "f2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1994,13 +1947,11 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2032,8 +1983,8 @@ "ctxt": 0 }, "value": "r16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2050,7 +2001,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2064,7 +2014,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false } } @@ -2085,7 +2034,6 @@ "ctxt": 0 }, "value": "fff", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2106,6 +2054,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2128,13 +2077,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2153,6 +2100,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2175,13 +2123,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2221,7 +2167,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2235,7 +2180,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2265,7 +2209,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2279,7 +2222,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -2314,7 +2256,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2371,7 +2312,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2389,7 +2329,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction3/input.ts.json index 977bbf1aa499..a9886c5dd805 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -98,7 +96,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -129,7 +126,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -148,6 +144,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -164,8 +161,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -213,7 +209,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -235,7 +230,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -304,6 +298,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -326,13 +321,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -349,7 +342,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -375,7 +367,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -438,6 +429,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -482,8 +474,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -515,6 +506,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -559,8 +551,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -592,6 +583,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -650,8 +642,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": { @@ -675,8 +667,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -708,8 +699,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -726,7 +717,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -748,8 +738,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -760,7 +750,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -801,8 +790,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -819,7 +808,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -841,6 +829,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -857,8 +846,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -869,7 +857,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -910,8 +897,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -928,7 +915,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -954,8 +940,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -988,7 +974,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1032,8 +1017,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1050,7 +1035,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1076,6 +1060,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1092,8 +1077,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1126,7 +1110,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1170,8 +1153,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1188,7 +1171,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1202,7 +1184,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -1238,8 +1219,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1256,7 +1237,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1270,7 +1250,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1296,7 +1275,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1323,7 +1301,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1356,6 +1333,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1378,13 +1356,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1409,7 +1385,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1445,6 +1420,7 @@ "ctxt": 0 }, "value": "i2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1467,7 +1443,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1490,8 +1465,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1508,7 +1482,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1534,7 +1507,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1560,7 +1532,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1602,7 +1573,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1638,6 +1608,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1669,6 +1640,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1691,13 +1663,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1722,7 +1692,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1751,7 +1720,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1762,8 +1730,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1795,6 +1762,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1826,6 +1794,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1848,13 +1817,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1879,7 +1846,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1908,7 +1874,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1919,8 +1884,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1952,6 +1916,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1983,6 +1948,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2005,13 +1971,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2036,7 +2000,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2065,7 +2028,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2090,6 +2052,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2112,13 +2075,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2128,6 +2089,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2150,13 +2112,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2181,7 +2141,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2210,7 +2169,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2221,8 +2179,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2254,8 +2211,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2272,7 +2229,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2298,6 +2254,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2320,13 +2277,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2359,7 +2314,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2390,7 +2344,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2433,8 +2386,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2451,7 +2404,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2473,6 +2425,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2495,13 +2448,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2512,7 +2463,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2540,7 +2490,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2591,8 +2540,8 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2609,7 +2558,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2623,7 +2571,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false } } @@ -2659,8 +2606,8 @@ "ctxt": 0 }, "value": "r15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2677,7 +2624,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2691,7 +2637,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/instantiateGenericClassWithWrongNumberOfTypeArguments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/instantiateGenericClassWithWrongNumberOfTypeArguments/input.ts.json index 1166e624f082..21e4e5e54276 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/instantiateGenericClassWithWrongNumberOfTypeArguments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/instantiateGenericClassWithWrongNumberOfTypeArguments/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -146,8 +142,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -211,7 +206,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -237,7 +231,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -263,7 +256,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -294,7 +286,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -320,7 +311,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -362,7 +352,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -383,7 +372,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -419,8 +407,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -437,7 +425,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/instantiateGenericClassWithZeroTypeArguments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/instantiateGenericClassWithZeroTypeArguments/input.ts.json index 46da872b655a..0aeb393e184a 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/instantiateGenericClassWithZeroTypeArguments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/instantiateGenericClassWithZeroTypeArguments/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -146,8 +142,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -210,7 +204,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -236,7 +229,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -267,7 +259,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -293,7 +284,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -335,7 +325,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -356,7 +345,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -392,8 +380,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -410,7 +398,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/instantiateNonGenericTypeWithTypeArguments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/instantiateNonGenericTypeWithTypeArguments/input.ts.json index aeba46cbf427..4fbb0c81fb03 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/instantiateNonGenericTypeWithTypeArguments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/instantiateNonGenericTypeWithTypeArguments/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -105,8 +103,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -123,7 +121,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -161,7 +158,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -227,8 +223,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -245,7 +241,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -298,6 +293,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -342,8 +338,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -375,8 +370,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -393,7 +388,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -446,6 +440,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -462,8 +457,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -495,8 +489,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -513,7 +507,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraint/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraint/input.ts.json index 37a1f28d4735..44eb2f120fa8 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraint/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraint/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -106,13 +105,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -145,7 +142,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -176,7 +172,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -197,7 +192,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -215,7 +209,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -246,7 +239,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -278,8 +270,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -296,7 +288,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -356,8 +347,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -374,7 +365,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -424,7 +414,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -454,7 +443,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -498,7 +486,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -519,7 +506,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -549,7 +535,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -603,6 +588,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -625,13 +611,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -663,6 +647,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -685,13 +670,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -723,8 +706,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -741,7 +724,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -755,7 +737,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -769,7 +750,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -805,8 +785,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -823,7 +803,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -847,7 +826,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -883,7 +861,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -906,7 +883,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -939,7 +915,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -960,6 +935,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -982,13 +958,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1007,6 +981,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1029,13 +1004,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1068,7 +1041,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1099,7 +1071,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1120,7 +1091,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1147,7 +1117,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1176,7 +1145,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1214,7 +1182,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1273,7 +1240,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1309,7 +1275,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "value": { @@ -1351,7 +1316,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1387,7 +1351,6 @@ "ctxt": 0 }, "value": "width", - "typeAnnotation": null, "optional": false }, "value": { @@ -1410,7 +1373,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "value": { @@ -1452,7 +1414,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1506,7 +1467,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraint2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraint2/input.ts.json index ca325f6464de..ae5d54f82661 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraint2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraint2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -106,13 +105,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -145,7 +142,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -176,7 +172,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -197,7 +192,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -215,7 +209,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -246,7 +239,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -275,7 +267,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -334,7 +325,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -381,7 +371,6 @@ "ctxt": 0 }, "value": "NumberVariant", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -402,7 +391,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -432,7 +420,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -486,6 +473,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -508,13 +496,11 @@ "ctxt": 0 }, "value": "NumberVariant", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -546,8 +532,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -564,7 +550,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -590,7 +575,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -611,7 +595,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -632,6 +615,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -654,13 +638,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -679,6 +661,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -701,13 +684,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -740,7 +721,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -771,7 +751,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -792,7 +771,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -819,7 +797,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -848,7 +825,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -886,7 +862,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -922,7 +897,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "value": { @@ -969,7 +943,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1005,7 +978,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "value": { @@ -1047,7 +1019,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraintTransitively/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraintTransitively/input.ts.json index 4a4bebdd2864..f0abda2870d0 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraintTransitively/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraintTransitively/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -241,7 +234,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -295,6 +287,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -317,13 +310,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -355,6 +346,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -377,13 +369,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -415,6 +405,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -437,13 +428,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -460,7 +449,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -481,6 +469,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -503,13 +492,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -528,6 +515,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -550,13 +538,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -575,6 +561,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -597,13 +584,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -636,7 +621,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -667,7 +651,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -688,7 +671,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -709,7 +691,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -739,7 +720,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -768,7 +748,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -834,7 +813,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -858,7 +836,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -894,7 +871,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -917,7 +893,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -958,7 +933,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -981,7 +955,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1009,7 +982,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -1051,7 +1023,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1065,7 +1036,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1079,7 +1049,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1093,7 +1062,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1123,7 +1091,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1137,7 +1104,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1151,7 +1117,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1175,7 +1140,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1198,7 +1162,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -1226,7 +1189,6 @@ "ctxt": 0 }, "value": "hm", - "typeAnnotation": null, "optional": false }, "value": { @@ -1268,7 +1230,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1290,6 +1251,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1306,8 +1268,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1317,8 +1278,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1354,8 +1315,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1412,7 +1373,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1433,6 +1393,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1455,13 +1416,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1480,6 +1439,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1502,13 +1462,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1527,6 +1485,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1549,13 +1508,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1588,7 +1545,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -1619,7 +1575,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1637,7 +1592,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1659,7 +1613,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1680,7 +1633,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1710,7 +1662,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1739,7 +1690,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1753,7 +1703,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1767,7 +1716,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1781,7 +1729,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1811,7 +1758,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1825,7 +1771,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1839,7 +1784,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1853,7 +1797,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1883,7 +1826,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1897,7 +1839,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1911,7 +1852,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1935,7 +1875,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1958,7 +1897,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -1986,7 +1924,6 @@ "ctxt": 0 }, "value": "hm", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraintTransitively2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraintTransitively2/input.ts.json index 074a1e0abaf0..b81ac5fd7784 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraintTransitively2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/typeParameterAsTypeParameterConstraintTransitively2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -241,7 +234,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -295,6 +287,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -317,13 +310,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -355,6 +346,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -377,13 +369,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -415,6 +405,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -437,13 +428,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -460,7 +449,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -481,6 +469,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -503,13 +492,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -528,6 +515,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -550,13 +538,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -575,6 +561,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -597,13 +584,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -636,7 +621,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -667,7 +651,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -688,7 +671,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -709,7 +691,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -739,7 +720,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -768,7 +748,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -839,7 +818,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -863,7 +841,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -899,7 +876,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -922,7 +898,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -963,7 +938,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -986,7 +960,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1009,7 +982,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -1051,7 +1023,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1065,7 +1036,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1079,7 +1049,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1093,7 +1062,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1123,7 +1091,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1137,7 +1104,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1161,7 +1127,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1184,7 +1149,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -1212,7 +1176,6 @@ "ctxt": 0 }, "value": "hm", - "typeAnnotation": null, "optional": false }, "value": { @@ -1238,7 +1201,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1268,7 +1230,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1290,6 +1251,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1306,8 +1268,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1317,6 +1278,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1333,8 +1295,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -1370,8 +1331,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -1381,6 +1342,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1397,8 +1359,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "body": { @@ -1455,7 +1416,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1476,6 +1436,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1498,13 +1459,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1523,6 +1482,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1545,13 +1505,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1570,6 +1528,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1592,13 +1551,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1631,7 +1588,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -1662,7 +1618,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1680,7 +1635,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1702,7 +1656,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1720,7 +1673,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1742,7 +1694,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1760,7 +1711,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1791,7 +1741,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1820,7 +1769,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1834,7 +1782,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1848,7 +1795,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1862,7 +1808,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1892,7 +1837,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1906,7 +1850,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1920,7 +1863,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1934,7 +1876,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints/input.ts.json index 3ee0eeb28d1f..a682cae6e476 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -64,6 +62,7 @@ "ctxt": 0 }, "value": "data", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -86,13 +85,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -123,7 +120,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -144,6 +140,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -166,13 +163,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -205,7 +200,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -236,7 +230,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -254,7 +247,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -297,7 +289,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -315,7 +306,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -342,7 +332,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -363,7 +352,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -393,7 +381,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -447,6 +434,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -469,13 +457,11 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -514,8 +500,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -532,7 +518,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -546,7 +531,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -582,8 +566,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -607,7 +591,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -618,7 +601,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -634,7 +616,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints2/input.ts.json index 5f4e32925248..ca42c36ded1f 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,13 +83,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -132,7 +129,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -150,7 +146,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -176,7 +171,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -216,8 +210,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -234,7 +228,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -282,8 +275,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -300,7 +293,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -321,7 +313,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints3/input.ts.json index 30afa54c5922..68f60898ed0c 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,13 +83,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -121,7 +118,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -142,6 +138,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -164,13 +161,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -198,7 +193,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -219,6 +213,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -241,13 +236,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -280,7 +273,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -311,7 +303,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -329,7 +320,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -355,7 +345,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false } } @@ -386,7 +375,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -404,7 +392,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -447,7 +434,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -474,7 +460,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -534,8 +519,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -552,7 +537,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -576,7 +560,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "value": { @@ -624,8 +607,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -649,7 +632,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -660,7 +642,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -686,7 +667,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "value": { @@ -709,7 +689,6 @@ "ctxt": 0 }, "value": "charAt", - "typeAnnotation": null, "optional": false }, "value": { @@ -728,6 +707,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -744,8 +724,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -821,8 +800,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -839,7 +818,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints4/input.ts.json index 5d7625a4732c..3f5a603b8ee0 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,13 +83,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -121,7 +118,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -142,6 +138,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -164,13 +161,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -198,7 +193,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -219,6 +213,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -241,13 +236,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -280,7 +273,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -311,7 +303,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -329,7 +320,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -355,7 +345,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false } } @@ -386,7 +375,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -404,7 +392,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -447,7 +434,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -474,7 +460,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -534,8 +519,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -552,7 +537,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -576,7 +560,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "value": { @@ -624,8 +607,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -649,7 +632,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -660,7 +642,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -715,8 +696,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -733,7 +714,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -757,7 +737,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "value": { @@ -780,7 +759,6 @@ "ctxt": 0 }, "value": "charAt", - "typeAnnotation": null, "optional": false }, "value": { @@ -799,6 +777,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -815,8 +794,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterAsBaseType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterAsBaseType/input.ts.json index 80e79c7539ca..c98c18014a28 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterAsBaseType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterAsBaseType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -35,7 +34,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -83,7 +80,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -102,7 +98,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -129,7 +124,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -150,7 +144,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -176,7 +169,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -203,7 +195,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -227,7 +218,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -258,7 +248,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -285,7 +274,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -306,7 +294,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -330,7 +317,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeArguments": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/innerTypeParameterShadowingOuterOne/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/innerTypeParameterShadowingOuterOne/input.ts.json index 8dd4c7e0becc..8fdc77ffde04 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/innerTypeParameterShadowingOuterOne/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/innerTypeParameterShadowingOuterOne/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -45,7 +44,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -89,6 +87,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -111,13 +110,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -153,7 +150,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -200,7 +195,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -218,7 +212,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -254,6 +247,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -276,13 +270,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -318,7 +310,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -329,7 +320,6 @@ "ctxt": 0 }, "value": "getDate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -365,7 +355,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -383,7 +372,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -404,7 +392,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -433,7 +420,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -477,6 +463,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -499,13 +486,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -541,7 +526,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -552,7 +536,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -588,7 +571,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -606,7 +588,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -628,7 +609,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -646,7 +626,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -682,6 +661,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -704,13 +684,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -746,7 +724,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -757,7 +734,6 @@ "ctxt": 0 }, "value": "getDate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -793,7 +769,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -811,7 +786,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -833,7 +807,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -851,7 +824,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/innerTypeParameterShadowingOuterOne2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/innerTypeParameterShadowingOuterOne2/input.ts.json index 9eb3412753e4..3115270a4891 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/innerTypeParameterShadowingOuterOne2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/innerTypeParameterShadowingOuterOne2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,6 +84,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -108,13 +107,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -150,7 +147,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -161,7 +157,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -197,7 +192,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -215,7 +209,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -247,7 +240,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "function": { @@ -291,6 +283,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -313,13 +306,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -355,7 +346,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -366,7 +356,6 @@ "ctxt": 0 }, "value": "getDate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -414,7 +403,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -432,7 +420,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -454,7 +441,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -480,7 +466,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "function": { @@ -524,6 +509,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -546,13 +532,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -588,7 +572,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -599,7 +582,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false @@ -635,7 +617,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -653,7 +634,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -675,7 +655,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -693,7 +672,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -725,7 +703,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "function": { @@ -769,6 +746,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -791,13 +769,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -833,7 +809,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -844,7 +819,6 @@ "ctxt": 0 }, "value": "getDate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -892,7 +866,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -910,7 +883,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -932,7 +904,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -950,7 +921,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints/input.ts.json index 24b2573c2152..70cceca919e6 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,6 +84,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -108,13 +107,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -146,8 +143,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -171,7 +168,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -220,7 +216,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -245,7 +240,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -256,7 +250,6 @@ "ctxt": 0 }, "value": "getDate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -305,7 +298,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -323,7 +315,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -360,8 +351,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -399,7 +390,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -426,7 +416,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -443,7 +432,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -470,7 +458,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -497,7 +484,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -515,7 +501,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -549,7 +534,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -578,7 +562,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -614,6 +597,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -636,7 +620,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -662,7 +645,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -670,8 +652,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -703,8 +684,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -735,7 +716,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -746,7 +726,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -759,7 +738,6 @@ "ctxt": 0 }, "value": "getDate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -796,8 +774,8 @@ "ctxt": 0 }, "value": "r2b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -828,7 +806,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -839,7 +816,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -892,6 +868,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -937,7 +914,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -966,7 +942,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -984,7 +959,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -996,8 +970,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1029,8 +1002,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1061,7 +1034,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1088,7 +1060,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1104,7 +1075,6 @@ "ctxt": 0 }, "value": "getDate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1141,8 +1111,8 @@ "ctxt": 0 }, "value": "r3b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1173,7 +1143,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1227,8 +1196,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1248,7 +1217,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1267,6 +1235,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1289,13 +1258,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1331,8 +1298,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1356,7 +1323,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1405,7 +1371,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1430,7 +1395,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1441,7 +1405,6 @@ "ctxt": 0 }, "value": "getDate", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1478,7 +1441,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1496,7 +1458,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1539,8 +1500,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1564,7 +1525,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1575,7 +1535,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1598,7 +1557,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints2/input.ts.json index d777e70a1a18..a877bd6bdda9 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -129,7 +127,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -155,7 +152,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -234,7 +230,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -252,7 +247,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -278,7 +272,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -322,6 +315,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -344,13 +338,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -382,8 +374,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -407,7 +399,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -456,7 +447,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -481,7 +471,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -492,7 +481,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -530,7 +518,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "function": { @@ -551,6 +538,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -573,13 +561,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -622,8 +608,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -647,7 +633,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -696,7 +681,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -721,7 +705,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -732,7 +715,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -781,7 +763,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -799,7 +780,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -821,7 +801,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -839,7 +818,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -876,8 +854,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -915,7 +893,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -942,7 +919,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -962,7 +938,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -979,7 +954,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1016,8 +990,8 @@ "ctxt": 0 }, "value": "r1b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1055,7 +1029,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1082,7 +1055,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1102,7 +1074,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1119,7 +1090,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1142,7 +1112,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1171,7 +1140,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1198,7 +1166,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1216,7 +1183,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1238,7 +1204,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1256,7 +1221,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1290,7 +1254,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1319,7 +1282,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1355,6 +1317,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1377,7 +1340,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1403,7 +1365,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1423,7 +1384,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1431,8 +1391,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1464,8 +1423,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1496,7 +1455,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1507,7 +1465,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1520,7 +1477,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1557,8 +1513,8 @@ "ctxt": 0 }, "value": "r2b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1589,7 +1545,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1600,7 +1555,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1653,6 +1607,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1698,7 +1653,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1727,7 +1681,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1745,7 +1698,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1767,7 +1719,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1785,7 +1736,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1811,6 +1761,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1833,13 +1784,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1864,7 +1813,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1893,7 +1841,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1911,7 +1858,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1933,7 +1879,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1951,7 +1896,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1977,6 +1921,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1999,13 +1944,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2015,6 +1958,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2037,13 +1981,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2068,7 +2010,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2097,7 +2038,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2115,7 +2055,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2137,7 +2076,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2155,7 +2093,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2167,8 +2104,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2200,8 +2136,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2232,7 +2168,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2259,7 +2194,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2279,7 +2213,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2295,7 +2228,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2332,8 +2264,8 @@ "ctxt": 0 }, "value": "r3b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2364,7 +2296,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2418,8 +2349,8 @@ "ctxt": 0 }, "value": "aB", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2436,7 +2367,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2471,8 +2401,8 @@ "ctxt": 0 }, "value": "r3c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2503,7 +2433,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2517,7 +2446,6 @@ "ctxt": 0 }, "value": "aB", - "typeAnnotation": null, "optional": false } }, @@ -2531,7 +2459,6 @@ "ctxt": 0 }, "value": "aB", - "typeAnnotation": null, "optional": false } } @@ -2546,7 +2473,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2583,8 +2509,8 @@ "ctxt": 0 }, "value": "r3d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2615,7 +2541,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2629,7 +2554,6 @@ "ctxt": 0 }, "value": "aB", - "typeAnnotation": null, "optional": false } }, @@ -2643,7 +2567,6 @@ "ctxt": 0 }, "value": "aB", - "typeAnnotation": null, "optional": false } } @@ -2698,8 +2621,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -2719,7 +2642,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -2738,6 +2660,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2760,13 +2683,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2776,6 +2697,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2798,13 +2720,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2840,8 +2760,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2865,7 +2785,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2914,7 +2833,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2939,7 +2857,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2950,7 +2867,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2987,7 +2903,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3005,7 +2920,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3027,7 +2941,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3045,7 +2958,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3088,8 +3000,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3113,7 +3025,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -3124,7 +3035,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3140,7 +3050,6 @@ "ctxt": 0 }, "value": "aB", - "typeAnnotation": null, "optional": false } }, @@ -3154,7 +3063,6 @@ "ctxt": 0 }, "value": "aB", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints3/input.ts.json index 59944e2fd0a2..0d1d93d13088 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -129,7 +127,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -155,7 +152,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -234,7 +230,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -252,7 +247,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -278,7 +272,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -322,6 +315,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -344,13 +338,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -382,8 +374,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -407,7 +399,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -456,7 +447,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -481,7 +471,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -492,7 +481,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -530,7 +518,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "function": { @@ -551,6 +538,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -573,13 +561,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -622,8 +608,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -647,7 +633,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -696,7 +681,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -721,7 +705,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -732,7 +715,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -781,7 +763,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -799,7 +780,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -821,7 +801,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -839,7 +818,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -876,8 +854,8 @@ "ctxt": 0 }, "value": "r1a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -915,7 +893,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -942,7 +919,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -962,7 +938,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -979,7 +954,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1016,8 +990,8 @@ "ctxt": 0 }, "value": "r1b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1055,7 +1029,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1082,7 +1055,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1102,7 +1074,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1119,7 +1090,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1142,7 +1112,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1171,7 +1140,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1198,7 +1166,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1216,7 +1183,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1238,7 +1204,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1256,7 +1221,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1290,7 +1254,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1319,7 +1282,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1355,6 +1317,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1377,7 +1340,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1403,7 +1365,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1423,7 +1384,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1431,8 +1391,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1464,8 +1423,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1496,7 +1455,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1507,7 +1465,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1520,7 +1477,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1557,8 +1513,8 @@ "ctxt": 0 }, "value": "r2b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1589,7 +1545,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1600,7 +1555,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1653,6 +1607,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1698,7 +1653,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1727,7 +1681,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1745,7 +1698,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1767,7 +1719,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1785,7 +1736,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1811,6 +1761,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1833,13 +1784,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1864,7 +1813,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1893,7 +1841,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1911,7 +1858,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1933,7 +1879,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1951,7 +1896,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1963,8 +1907,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1996,8 +1939,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2028,7 +1971,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2042,7 +1984,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2079,8 +2020,8 @@ "ctxt": 0 }, "value": "r3b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2111,7 +2052,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2165,8 +2105,8 @@ "ctxt": 0 }, "value": "r3c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2197,7 +2137,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2218,7 +2157,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2236,7 +2174,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2273,8 +2210,8 @@ "ctxt": 0 }, "value": "r3d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2305,7 +2242,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2326,7 +2262,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2384,8 +2319,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -2405,7 +2340,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -2424,6 +2358,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2446,13 +2381,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2488,8 +2421,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2513,7 +2446,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2562,7 +2494,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -2587,7 +2518,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2598,7 +2528,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2635,7 +2564,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2653,7 +2581,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2675,7 +2602,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2693,7 +2619,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2736,8 +2661,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2761,7 +2686,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2772,7 +2696,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2795,7 +2718,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints4/input.ts.json index 35b77e60e188..e0d92231c5a3 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,6 +84,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -108,13 +107,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -146,8 +143,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -171,7 +168,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -220,7 +216,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -245,7 +240,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -256,7 +250,6 @@ "ctxt": 0 }, "value": "notHere", - "typeAnnotation": null, "optional": false }, "computed": false @@ -305,7 +298,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -323,7 +315,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -360,8 +351,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -399,7 +390,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -426,7 +416,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -443,7 +432,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -470,7 +458,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -497,7 +484,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -515,7 +501,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -549,7 +534,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -578,7 +562,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -614,6 +597,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -636,7 +620,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -662,7 +645,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -670,8 +652,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -703,8 +684,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -735,7 +716,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -746,7 +726,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -759,7 +738,6 @@ "ctxt": 0 }, "value": "notHere", - "typeAnnotation": null, "optional": false }, "computed": false @@ -796,8 +774,8 @@ "ctxt": 0 }, "value": "r2b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -828,7 +806,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -839,7 +816,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -892,6 +868,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -937,7 +914,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -966,7 +942,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -984,7 +959,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -996,8 +970,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1029,6 +1002,7 @@ "ctxt": 0 }, "value": "r3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1045,8 +1019,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1077,7 +1050,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1091,7 +1063,6 @@ "ctxt": 0 }, "value": "notHere", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1128,6 +1099,7 @@ "ctxt": 0 }, "value": "r3b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1144,8 +1116,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1176,7 +1147,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1230,8 +1200,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1251,7 +1221,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1270,6 +1239,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1292,13 +1262,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1334,8 +1302,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1359,7 +1327,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1408,7 +1375,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1433,7 +1399,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1444,7 +1409,6 @@ "ctxt": 0 }, "value": "notHere", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1481,7 +1445,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1499,7 +1462,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1530,7 +1492,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1548,7 +1509,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -1587,7 +1547,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1598,7 +1557,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1614,7 +1572,6 @@ "ctxt": 0 }, "value": "notHere", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1654,8 +1611,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1679,7 +1636,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1690,7 +1646,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1713,7 +1668,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints5/input.ts.json index 1a955e5149ac..baaef07a33d2 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -129,7 +127,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -155,7 +152,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "function": { @@ -234,7 +230,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -252,7 +247,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -278,7 +272,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -322,6 +315,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -344,13 +338,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -382,8 +374,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -407,7 +399,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -464,7 +455,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -489,7 +479,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -500,7 +489,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -531,7 +519,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -542,7 +529,6 @@ "ctxt": 0 }, "value": "notHere", - "typeAnnotation": null, "optional": false }, "computed": false @@ -591,7 +577,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -609,7 +594,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -631,7 +615,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -649,7 +632,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -686,8 +668,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -725,7 +707,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -752,7 +733,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -772,7 +752,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -789,7 +768,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -816,7 +794,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -843,7 +820,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -861,7 +837,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -883,7 +858,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -901,7 +875,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -935,7 +908,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -964,7 +936,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1000,6 +971,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1022,7 +994,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1048,7 +1019,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1068,7 +1038,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1076,8 +1045,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1109,8 +1077,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1141,7 +1109,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1152,7 +1119,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1165,7 +1131,6 @@ "ctxt": 0 }, "value": "notHere", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1202,8 +1167,8 @@ "ctxt": 0 }, "value": "r2b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1234,7 +1199,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -1245,7 +1209,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1298,6 +1261,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1343,7 +1307,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1372,7 +1335,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1390,7 +1352,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1412,7 +1373,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1430,7 +1390,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1442,8 +1401,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1475,6 +1433,7 @@ "ctxt": 0 }, "value": "r3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1491,8 +1450,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1523,7 +1481,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1537,7 +1494,6 @@ "ctxt": 0 }, "value": "notHere", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1574,6 +1530,7 @@ "ctxt": 0 }, "value": "r3b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1590,8 +1547,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1622,7 +1578,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1676,8 +1631,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1697,7 +1652,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1716,6 +1670,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1738,13 +1693,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1780,8 +1733,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1805,7 +1758,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1854,7 +1806,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1879,7 +1830,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1890,7 +1840,6 @@ "ctxt": 0 }, "value": "notHere", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1927,7 +1876,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1945,7 +1893,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1967,7 +1914,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1985,7 +1931,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2016,7 +1961,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2034,7 +1978,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -2073,7 +2016,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2084,7 +2026,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2113,7 +2054,6 @@ "ctxt": 0 }, "value": "notHere", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2153,8 +2093,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2178,7 +2118,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2189,7 +2128,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2212,7 +2150,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithoutConstraints/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithoutConstraints/input.ts.json index 6881ce843825..06970b79aa23 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithoutConstraints/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithoutConstraints/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -86,6 +84,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -108,13 +107,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -146,8 +143,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -171,7 +168,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -220,7 +216,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -245,7 +240,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -256,7 +250,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -305,7 +298,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -341,8 +333,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -380,7 +372,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -413,7 +404,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -440,7 +430,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -467,7 +456,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -500,7 +488,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -529,7 +516,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -565,6 +551,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -587,7 +574,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -610,8 +596,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -643,8 +628,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -675,7 +660,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -686,7 +670,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -699,7 +682,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -736,8 +718,8 @@ "ctxt": 0 }, "value": "r2b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -768,7 +750,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -779,7 +760,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -832,6 +812,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -877,7 +858,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -906,7 +886,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -917,8 +896,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -950,6 +928,7 @@ "ctxt": 0 }, "value": "r3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -966,8 +945,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -998,7 +976,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1012,7 +989,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1049,6 +1025,7 @@ "ctxt": 0 }, "value": "r3b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1065,8 +1042,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -1097,7 +1073,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1151,8 +1126,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1172,7 +1147,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1191,6 +1165,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1213,13 +1188,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1255,8 +1228,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1280,7 +1253,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1329,7 +1301,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1354,7 +1325,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1365,7 +1335,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1402,7 +1371,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1444,8 +1412,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1469,7 +1437,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1480,7 +1447,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/staticMembersUsingClassTypeParameter/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/staticMembersUsingClassTypeParameter/input.ts.json index 42671321651e..07206c7272b4 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/staticMembersUsingClassTypeParameter/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/staticMembersUsingClassTypeParameter/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -99,7 +96,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -120,6 +116,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -142,13 +139,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -204,7 +199,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -225,7 +219,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -251,7 +244,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -277,7 +269,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -308,7 +299,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -329,6 +319,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -351,13 +342,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -413,7 +402,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -434,7 +422,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -455,7 +442,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -481,7 +467,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -507,7 +492,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -538,7 +522,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "function": { @@ -559,6 +542,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -581,13 +565,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -643,7 +625,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -661,7 +642,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/typeParameterDirectlyConstrainedToItself/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/typeParameterDirectlyConstrainedToItself/input.ts.json index 877cf80e0a79..213c6063420b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/typeParameterDirectlyConstrainedToItself/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/typeParameterDirectlyConstrainedToItself/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,7 +51,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -92,7 +89,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -128,7 +124,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -149,7 +144,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -167,7 +161,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -194,7 +187,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -221,7 +213,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -239,7 +230,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -274,7 +264,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -301,7 +290,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -322,7 +310,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -340,7 +327,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -370,7 +356,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -415,7 +400,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -433,7 +417,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -454,7 +437,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -499,7 +481,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -520,7 +501,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -538,7 +518,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -574,6 +553,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -637,7 +617,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -655,7 +634,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -713,7 +691,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -734,7 +711,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -752,7 +728,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -764,8 +739,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -797,8 +771,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -842,7 +816,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -860,7 +833,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -900,8 +872,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -945,7 +917,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -966,7 +937,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -984,7 +954,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself/input.ts.json index 58df8162878b..41ddf60939cd 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/typeParameterIndirectlyConstrainedToItself/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,7 +51,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -92,7 +89,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -110,7 +106,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -132,7 +127,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -168,7 +162,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -186,7 +179,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -208,7 +200,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -226,7 +217,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -248,7 +238,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -266,7 +255,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -293,7 +281,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -320,7 +307,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -338,7 +324,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -360,7 +345,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -378,7 +362,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -413,7 +396,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -440,7 +422,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -458,7 +439,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -480,7 +460,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -498,7 +477,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -520,7 +498,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -538,7 +515,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -568,7 +544,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -613,7 +588,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -631,7 +605,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -653,7 +626,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -671,7 +643,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -692,7 +663,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -737,7 +707,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -755,7 +724,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -777,7 +745,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -795,7 +762,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -817,7 +783,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -835,7 +800,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -871,6 +835,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -934,7 +899,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -952,7 +916,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -974,7 +937,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -992,7 +954,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1050,7 +1011,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1068,7 +1028,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1090,7 +1049,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1108,7 +1066,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1130,7 +1087,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1148,7 +1104,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1160,8 +1115,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1193,8 +1147,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1238,7 +1192,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1256,7 +1209,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1278,7 +1230,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1296,7 +1247,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1336,8 +1286,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -1381,7 +1331,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1399,7 +1348,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1421,7 +1369,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1439,7 +1386,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1461,7 +1407,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1479,7 +1424,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1504,7 +1448,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1540,7 +1483,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1558,7 +1500,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1580,7 +1521,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1598,7 +1538,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1620,7 +1559,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1638,7 +1576,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1666,7 +1603,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1692,7 +1628,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1738,7 +1673,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1804,7 +1738,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1849,7 +1782,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1867,7 +1799,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1893,7 +1824,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint/input.ts.json index 1cc40fdc71dc..75db656080fb 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/typeParameterUsedAsConstraint/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,7 +51,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -73,7 +71,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -91,7 +88,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -113,7 +109,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -149,7 +144,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -167,7 +161,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -189,7 +182,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -210,7 +202,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -246,7 +237,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -264,7 +254,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -286,7 +275,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -304,7 +292,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -326,7 +313,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -362,7 +348,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -380,7 +365,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -402,7 +386,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -420,7 +403,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -442,7 +424,6 @@ "ctxt": 0 }, "value": "C5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -478,7 +459,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -496,7 +476,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -518,7 +497,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -536,7 +514,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -558,7 +535,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -579,7 +555,6 @@ "ctxt": 0 }, "value": "C6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -615,7 +590,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -636,7 +610,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -654,7 +627,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -676,7 +648,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -694,7 +665,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -721,7 +691,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -748,7 +717,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -769,7 +737,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -787,7 +754,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -822,7 +788,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -849,7 +814,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -867,7 +831,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -889,7 +852,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -923,7 +885,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -950,7 +911,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -968,7 +928,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -990,7 +949,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1008,7 +966,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1043,7 +1000,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1070,7 +1026,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1088,7 +1043,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1110,7 +1064,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1128,7 +1081,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1163,7 +1115,6 @@ "ctxt": 0 }, "value": "I5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1190,7 +1141,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1208,7 +1158,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1230,7 +1179,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1248,7 +1196,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1270,7 +1217,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1304,7 +1250,6 @@ "ctxt": 0 }, "value": "I6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1331,7 +1276,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1352,7 +1296,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1370,7 +1313,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1392,7 +1334,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1410,7 +1351,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1440,7 +1380,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1485,7 +1424,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1506,7 +1444,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1524,7 +1461,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1545,7 +1481,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1590,7 +1525,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1608,7 +1542,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1630,7 +1563,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1650,7 +1582,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1695,7 +1626,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1713,7 +1643,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1735,7 +1664,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1753,7 +1681,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1774,7 +1701,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1819,7 +1745,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1837,7 +1762,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1859,7 +1783,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1877,7 +1800,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1898,7 +1820,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1943,7 +1864,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1961,7 +1881,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1983,7 +1902,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2001,7 +1919,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2023,7 +1940,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2043,7 +1959,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2088,7 +2003,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2109,7 +2023,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2127,7 +2040,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2149,7 +2061,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2167,7 +2078,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2203,8 +2113,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -2248,7 +2158,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2269,7 +2178,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2287,7 +2195,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2327,8 +2234,8 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -2372,7 +2279,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2390,7 +2296,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2412,7 +2317,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2451,8 +2355,8 @@ "ctxt": 0 }, "value": "e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -2496,7 +2400,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2514,7 +2417,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2536,7 +2438,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2554,7 +2455,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2594,8 +2494,8 @@ "ctxt": 0 }, "value": "e4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -2639,7 +2539,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2657,7 +2556,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2679,7 +2577,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2697,7 +2594,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2737,8 +2633,8 @@ "ctxt": 0 }, "value": "e5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -2782,7 +2678,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2800,7 +2695,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2822,7 +2716,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2840,7 +2733,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2862,7 +2754,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2901,8 +2792,8 @@ "ctxt": 0 }, "value": "e6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -2946,7 +2837,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2967,7 +2857,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2985,7 +2874,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3007,7 +2895,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3025,7 +2912,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3065,6 +2951,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3128,7 +3015,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3149,7 +3035,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3167,7 +3052,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3179,8 +3063,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3212,6 +3095,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3275,7 +3159,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3293,7 +3176,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3315,7 +3197,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3326,8 +3207,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3359,6 +3239,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3422,7 +3303,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3440,7 +3320,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3462,7 +3341,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3480,7 +3358,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3492,8 +3369,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3525,6 +3401,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3588,7 +3465,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3606,7 +3482,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3628,7 +3503,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3646,7 +3520,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3658,8 +3531,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3691,6 +3563,7 @@ "ctxt": 0 }, "value": "a5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3754,7 +3627,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3772,7 +3644,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3794,7 +3665,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3812,7 +3682,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3834,7 +3703,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3845,8 +3713,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3878,6 +3745,7 @@ "ctxt": 0 }, "value": "a6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3941,7 +3809,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3962,7 +3829,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3980,7 +3846,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4002,7 +3867,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4020,7 +3884,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4032,8 +3895,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/typeParametersAvailableInNestedScope/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/typeParametersAvailableInNestedScope/input.ts.json index 9ef18de71b05..69771d3792f8 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/typeParametersAvailableInNestedScope/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/typeParametersAvailableInNestedScope/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -99,7 +96,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -118,6 +114,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -140,13 +137,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -182,6 +177,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -204,13 +200,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -232,7 +226,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -263,7 +256,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -299,7 +291,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -328,7 +319,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -349,6 +339,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,13 +362,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -420,6 +409,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -442,13 +432,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -470,7 +458,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -501,7 +488,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -533,7 +519,6 @@ "ctxt": 0 }, "value": "temp", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -569,7 +554,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -619,7 +603,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -655,8 +638,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -673,7 +656,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -731,7 +713,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -742,7 +723,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false @@ -769,7 +749,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -780,7 +759,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -832,7 +810,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -843,7 +820,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false @@ -870,7 +846,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -881,7 +856,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/typeParametersAvailableInNestedScope2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/typeParametersAvailableInNestedScope2/input.ts.json index 4658dc2c4dfe..740f81517203 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/typeParametersAvailableInNestedScope2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/typeParametersAvailableInNestedScope2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -106,13 +105,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -140,7 +137,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -161,6 +157,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -183,13 +180,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -217,7 +212,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -238,6 +232,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -260,13 +255,11 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -309,6 +302,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -331,13 +325,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -369,6 +361,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -391,13 +384,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -429,6 +420,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -451,13 +443,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -491,7 +481,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -528,7 +517,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -565,7 +553,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -586,7 +573,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/typesWithDuplicateTypeParameters/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/typesWithDuplicateTypeParameters/input.ts.json index c8d53ece0fa7..8bf874693920 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/typesWithDuplicateTypeParameters/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeParameters/typeParameterLists/typesWithDuplicateTypeParameters/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,7 +51,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -73,7 +71,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -94,7 +91,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -151,7 +146,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -172,7 +166,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -198,7 +191,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -225,7 +217,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -246,7 +237,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -280,7 +270,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -307,7 +296,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -328,7 +316,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -349,7 +336,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -378,7 +364,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -423,7 +408,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -444,7 +428,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -464,7 +447,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -509,7 +491,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -530,7 +511,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -551,7 +531,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/apparentType/apparentTypeSubtyping/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/apparentType/apparentTypeSubtyping/input.ts.json index 06bfe0ae5fe7..dd8ac79dbc82 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/apparentType/apparentTypeSubtyping/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/apparentType/apparentTypeSubtyping/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -128,7 +124,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -150,7 +145,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -176,7 +170,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -202,7 +195,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -227,7 +219,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -254,7 +245,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -293,7 +283,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -319,7 +308,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -345,7 +333,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -376,7 +363,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": null, @@ -402,7 +388,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -435,7 +420,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -461,7 +445,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -487,7 +470,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -512,7 +494,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -539,7 +520,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -557,7 +537,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/apparentType/apparentTypeSupertype/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/apparentType/apparentTypeSupertype/input.ts.json index 8103cf17718f..fb7ad7cd360b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/apparentType/apparentTypeSupertype/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/apparentType/apparentTypeSupertype/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -142,7 +138,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -167,7 +162,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -194,7 +188,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -212,7 +205,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/anyAssignabilityInInheritance/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/anyAssignabilityInInheritance/input.ts.json index 541555eab298..91a48578b793 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/anyAssignabilityInInheritance/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/anyAssignabilityInInheritance/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -106,7 +105,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -160,6 +158,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -176,8 +175,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -194,7 +192,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -215,6 +212,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -231,8 +229,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -274,7 +271,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -295,6 +291,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -311,8 +308,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -369,8 +365,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -387,7 +383,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -401,7 +396,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -422,7 +416,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -443,6 +436,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -459,8 +453,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -502,7 +495,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -523,6 +515,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -539,8 +532,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -597,8 +589,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -615,7 +607,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -629,7 +620,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -650,7 +640,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -671,6 +660,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -687,8 +677,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -730,7 +719,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -751,6 +739,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -767,8 +756,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -825,8 +813,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -843,7 +831,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -857,7 +844,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -878,7 +864,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -899,6 +884,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -921,13 +907,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -963,7 +947,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -980,7 +963,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1001,6 +983,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1017,8 +1000,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1075,8 +1057,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1093,7 +1075,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1107,7 +1088,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1128,7 +1108,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1149,6 +1128,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1171,13 +1151,11 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1213,7 +1191,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1230,7 +1207,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1251,6 +1227,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1267,8 +1244,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1325,8 +1301,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1343,7 +1319,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1357,7 +1332,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1378,7 +1352,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1399,6 +1372,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1430,7 +1404,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1458,8 +1431,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1504,7 +1476,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1544,7 +1515,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1565,6 +1535,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1581,8 +1552,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1639,8 +1609,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1657,7 +1627,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1671,7 +1640,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1692,7 +1660,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1713,6 +1680,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1737,8 +1705,7 @@ "kind": "number" } } - }, - "optional": false + } } } ], @@ -1788,7 +1755,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1809,6 +1775,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1825,8 +1792,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1883,8 +1849,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1901,7 +1867,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1915,7 +1880,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1941,7 +1905,6 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1971,7 +1934,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2010,7 +1972,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2031,6 +1992,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2053,13 +2015,11 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2095,7 +2055,6 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2112,7 +2071,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2133,6 +2091,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2149,8 +2108,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2207,8 +2165,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2225,7 +2183,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2239,7 +2196,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2260,7 +2216,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2286,7 +2241,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2334,7 +2288,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2355,6 +2308,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2377,13 +2331,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2419,7 +2371,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2436,7 +2387,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2457,6 +2407,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2473,8 +2424,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2531,8 +2481,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2549,7 +2499,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2563,7 +2512,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2584,7 +2532,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2610,7 +2557,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2636,7 +2582,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2678,7 +2623,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2699,7 +2643,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2720,6 +2663,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2742,7 +2686,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2765,8 +2708,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2802,7 +2744,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2837,7 +2778,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2858,6 +2798,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2874,8 +2815,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2932,8 +2872,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2950,7 +2890,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2964,7 +2903,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2985,7 +2923,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3006,6 +2943,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3029,8 +2967,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeParams": null, @@ -3052,8 +2990,7 @@ } } } - }, - "optional": false + } } } ], @@ -3090,8 +3027,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeParams": null, @@ -3125,7 +3062,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3146,6 +3082,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3162,8 +3099,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3220,8 +3156,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3238,7 +3174,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3252,7 +3187,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3273,7 +3207,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3294,6 +3227,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3317,6 +3251,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3339,13 +3274,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3371,7 +3304,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3401,15 +3333,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -3446,6 +3376,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3468,13 +3399,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3500,7 +3429,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3530,7 +3458,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3549,7 +3476,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3570,6 +3496,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3586,8 +3513,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3644,8 +3570,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3662,7 +3588,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3676,7 +3601,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3704,7 +3628,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -3723,7 +3646,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -3740,7 +3662,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3761,6 +3682,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3783,13 +3705,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3825,7 +3745,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3842,7 +3761,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3863,6 +3781,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3879,8 +3798,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3937,8 +3855,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3955,7 +3873,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3969,7 +3886,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3990,7 +3906,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4032,7 +3947,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "body": { @@ -4075,8 +3989,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -4105,7 +4019,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4126,6 +4039,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4148,12 +4062,10 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4189,7 +4101,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -4205,7 +4116,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4226,6 +4136,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4242,8 +4153,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4300,8 +4210,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4318,7 +4228,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4332,7 +4241,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4353,7 +4261,6 @@ "ctxt": 0 }, "value": "CC", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4379,7 +4286,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -4434,7 +4340,6 @@ "ctxt": 0 }, "value": "CC", - "typeAnnotation": null, "optional": false }, "body": { @@ -4477,8 +4382,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -4507,7 +4412,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4528,6 +4432,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4550,13 +4455,11 @@ "ctxt": 0 }, "value": "CC", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4592,7 +4495,6 @@ "ctxt": 0 }, "value": "CC", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4609,7 +4511,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4630,6 +4531,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4646,8 +4548,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4704,8 +4605,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4722,7 +4623,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4736,7 +4636,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4757,7 +4656,6 @@ "ctxt": 0 }, "value": "foo17", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4778,6 +4676,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4800,13 +4699,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4842,7 +4739,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4859,7 +4755,6 @@ "ctxt": 0 }, "value": "foo17", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4880,6 +4775,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4896,8 +4792,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4954,8 +4849,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4972,7 +4867,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4986,7 +4880,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -5007,7 +4900,6 @@ "ctxt": 0 }, "value": "foo18", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5028,6 +4920,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5044,8 +4937,7 @@ }, "members": [] } - }, - "optional": false + } } } ], @@ -5087,7 +4979,6 @@ "ctxt": 0 }, "value": "foo18", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5108,6 +4999,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5124,8 +5016,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5182,8 +5073,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5200,7 +5091,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5214,7 +5104,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType/input.ts.json index d25d5c4f79ea..27d30b9f17b0 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -65,7 +65,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -91,7 +90,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -154,6 +152,7 @@ "ctxt": 0 }, "value": "ac", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -176,13 +175,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -204,7 +201,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -234,7 +230,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -288,6 +283,7 @@ "ctxt": 0 }, "value": "ai", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -310,13 +306,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -340,7 +334,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -359,7 +352,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -391,6 +383,7 @@ "ctxt": 0 }, "value": "ae", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -413,13 +406,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -451,6 +442,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -467,8 +459,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -478,7 +469,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -510,6 +500,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -526,8 +517,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -537,7 +527,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -569,6 +558,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -585,8 +575,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -596,7 +585,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -628,6 +616,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -650,13 +639,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -666,7 +653,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -698,6 +684,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -714,8 +701,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -725,7 +711,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -757,6 +742,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -773,8 +759,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -784,7 +769,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -816,6 +800,7 @@ "ctxt": 0 }, "value": "h", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -838,13 +823,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -854,7 +837,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -886,6 +868,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -902,8 +885,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -913,7 +895,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -945,6 +926,7 @@ "ctxt": 0 }, "value": "j", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -979,8 +961,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -990,7 +971,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1022,6 +1002,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1044,13 +1025,11 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1060,7 +1039,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1092,6 +1070,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1115,6 +1094,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1131,8 +1111,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1154,8 +1133,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1165,7 +1143,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1195,8 +1172,8 @@ "ctxt": 0 }, "value": "ac", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1206,7 +1183,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1234,8 +1210,8 @@ "ctxt": 0 }, "value": "ai", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1245,7 +1221,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1273,8 +1248,8 @@ "ctxt": 0 }, "value": "ae", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1284,7 +1259,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1314,6 +1288,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1338,8 +1313,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1349,7 +1323,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1381,6 +1354,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1412,7 +1386,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1440,8 +1413,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1451,7 +1423,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1483,6 +1454,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1506,6 +1478,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1528,13 +1501,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -1560,7 +1531,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1590,15 +1560,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1608,7 +1576,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1640,6 +1607,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1662,13 +1630,11 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1678,7 +1644,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1710,6 +1675,7 @@ "ctxt": 0 }, "value": "q", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1732,13 +1698,11 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1748,7 +1712,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1765,7 +1728,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1786,6 +1748,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1808,13 +1771,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1833,6 +1794,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1855,13 +1817,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1880,6 +1840,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1902,13 +1863,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1949,8 +1908,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1960,7 +1919,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1988,8 +1946,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1999,7 +1957,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2027,8 +1984,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2038,7 +1995,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2070,7 +2026,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2091,7 +2046,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2112,7 +2066,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2130,7 +2083,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType2/input.ts.json index fabd9a5e156b..5b7f5c29af6a 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -106,7 +105,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -150,7 +148,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -175,6 +172,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -191,8 +189,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -235,7 +232,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -279,7 +275,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -304,6 +299,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -320,8 +316,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -364,7 +359,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -408,7 +402,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -433,6 +426,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -449,8 +443,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -493,7 +486,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -537,7 +529,6 @@ "ctxt": 0 }, "value": "I5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -562,6 +553,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -578,8 +570,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -604,7 +595,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -633,7 +623,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -677,7 +666,6 @@ "ctxt": 0 }, "value": "I6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -702,6 +690,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -718,8 +707,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -744,7 +732,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -773,7 +760,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -817,7 +803,6 @@ "ctxt": 0 }, "value": "I7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -842,6 +827,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -858,8 +844,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -893,7 +878,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -945,7 +929,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -989,7 +972,6 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1014,6 +996,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1030,8 +1013,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1082,7 +1064,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1126,7 +1107,6 @@ "ctxt": 0 }, "value": "I9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1151,6 +1131,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1167,8 +1148,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1193,7 +1173,6 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1222,7 +1201,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1261,7 +1239,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1287,7 +1264,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1340,7 +1316,6 @@ "ctxt": 0 }, "value": "I10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1365,6 +1340,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1381,8 +1357,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1407,7 +1382,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1436,7 +1410,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1475,7 +1448,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1501,7 +1473,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1527,7 +1498,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1569,7 +1539,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1595,7 +1564,6 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1620,6 +1588,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1636,8 +1605,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1662,7 +1630,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1709,7 +1676,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1753,7 +1719,6 @@ "ctxt": 0 }, "value": "I12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1778,6 +1743,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1794,8 +1760,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1821,8 +1786,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeParams": null, @@ -1868,7 +1833,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1912,7 +1876,6 @@ "ctxt": 0 }, "value": "I13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1937,6 +1900,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1953,8 +1917,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1980,6 +1943,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2002,13 +1966,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -2034,7 +1996,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2064,7 +2025,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2095,7 +2055,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2141,7 +2100,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -2160,7 +2118,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -2182,7 +2139,6 @@ "ctxt": 0 }, "value": "I14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2207,6 +2163,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2223,8 +2180,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2249,7 +2205,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2278,7 +2233,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2317,7 +2271,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2359,7 +2312,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "body": { @@ -2402,8 +2354,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2437,7 +2389,6 @@ "ctxt": 0 }, "value": "I15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2462,6 +2413,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2478,8 +2430,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2504,7 +2455,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -2532,7 +2482,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2571,7 +2520,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2597,7 +2545,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2652,7 +2599,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "body": { @@ -2695,8 +2641,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2730,7 +2676,6 @@ "ctxt": 0 }, "value": "I16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2755,6 +2700,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2771,8 +2717,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2797,7 +2742,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -2825,7 +2769,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2869,7 +2812,6 @@ "ctxt": 0 }, "value": "I17", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2896,7 +2838,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2924,6 +2865,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2940,8 +2882,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2966,7 +2907,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2995,7 +2935,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3039,7 +2978,6 @@ "ctxt": 0 }, "value": "I18", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3066,7 +3004,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3087,7 +3024,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3105,7 +3041,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3134,6 +3069,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3150,8 +3086,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3176,7 +3111,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3205,7 +3139,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3249,7 +3182,6 @@ "ctxt": 0 }, "value": "I19", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3274,6 +3206,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3290,8 +3223,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3316,7 +3248,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3345,7 +3276,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3389,7 +3319,6 @@ "ctxt": 0 }, "value": "I20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3414,6 +3343,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3430,8 +3360,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3474,7 +3403,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatBetweenTupleAndArray/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatBetweenTupleAndArray/input.ts.json index 6a54325c24f8..c519bb13529b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatBetweenTupleAndArray/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatBetweenTupleAndArray/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "numStrTuple", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,8 +85,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -117,6 +117,7 @@ "ctxt": 0 }, "value": "numNumTuple", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -170,8 +171,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -203,6 +203,7 @@ "ctxt": 0 }, "value": "numEmptyObjTuple", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -256,8 +257,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -289,6 +289,7 @@ "ctxt": 0 }, "value": "emptyObjTuple", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -324,8 +325,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -357,6 +357,7 @@ "ctxt": 0 }, "value": "numArray", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -381,8 +382,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -414,6 +414,7 @@ "ctxt": 0 }, "value": "emptyObjArray", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -438,8 +439,7 @@ "members": [] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -469,8 +469,8 @@ "ctxt": 0 }, "value": "numArray", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -480,7 +480,6 @@ "ctxt": 0 }, "value": "numNumTuple", - "typeAnnotation": null, "optional": false } } @@ -508,8 +507,8 @@ "ctxt": 0 }, "value": "emptyObjArray", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -519,7 +518,6 @@ "ctxt": 0 }, "value": "emptyObjTuple", - "typeAnnotation": null, "optional": false } } @@ -547,8 +545,8 @@ "ctxt": 0 }, "value": "emptyObjArray", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -558,7 +556,6 @@ "ctxt": 0 }, "value": "numStrTuple", - "typeAnnotation": null, "optional": false } } @@ -586,8 +583,8 @@ "ctxt": 0 }, "value": "emptyObjArray", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -597,7 +594,6 @@ "ctxt": 0 }, "value": "numNumTuple", - "typeAnnotation": null, "optional": false } } @@ -625,8 +621,8 @@ "ctxt": 0 }, "value": "emptyObjArray", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -636,7 +632,6 @@ "ctxt": 0 }, "value": "numEmptyObjTuple", - "typeAnnotation": null, "optional": false } } @@ -664,8 +659,8 @@ "ctxt": 0 }, "value": "numArray", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -675,7 +670,6 @@ "ctxt": 0 }, "value": "numStrTuple", - "typeAnnotation": null, "optional": false } } @@ -703,8 +697,8 @@ "ctxt": 0 }, "value": "emptyObjTuple", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -714,7 +708,6 @@ "ctxt": 0 }, "value": "emptyObjArray", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures/input.ts.json index 73a6a6570618..d4f6c14a9aff 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,6 +50,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -67,8 +67,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -118,6 +117,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -140,13 +140,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,6 +176,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -209,6 +208,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -225,8 +225,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -250,8 +249,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -281,8 +279,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -292,7 +290,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -320,8 +317,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -331,7 +328,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -351,7 +347,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -381,6 +376,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -397,8 +393,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -448,6 +443,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -470,13 +466,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -508,6 +502,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -539,6 +534,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -555,8 +551,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -580,8 +575,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -611,8 +605,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -622,7 +616,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -650,8 +643,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -661,7 +654,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -689,8 +681,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -700,7 +692,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -728,8 +719,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -739,7 +730,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -767,8 +757,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -786,6 +776,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -808,13 +799,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -851,7 +840,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -886,8 +874,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -936,8 +924,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "FunctionExpression", @@ -959,6 +947,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -975,8 +964,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1048,8 +1036,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1067,6 +1055,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1089,13 +1078,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1132,7 +1119,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1167,8 +1153,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1217,8 +1203,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "FunctionExpression", @@ -1240,6 +1226,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1256,8 +1243,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1321,7 +1307,6 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1351,6 +1336,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1367,8 +1353,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1418,6 +1403,7 @@ "ctxt": 0 }, "value": "s2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1440,13 +1426,11 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1478,6 +1462,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1509,6 +1494,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1525,8 +1511,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1550,8 +1535,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1581,8 +1565,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1592,7 +1576,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -1620,8 +1603,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1631,7 +1614,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } } @@ -1659,8 +1641,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1678,6 +1660,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1694,8 +1677,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -1737,8 +1719,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "FunctionExpression", @@ -1760,6 +1742,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1776,8 +1759,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1849,8 +1831,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1860,7 +1842,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -1888,8 +1869,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1899,7 +1880,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } } @@ -1927,8 +1907,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1946,6 +1926,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1962,8 +1943,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -2005,8 +1985,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "FunctionExpression", @@ -2028,6 +2008,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2044,8 +2025,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2/input.ts.json index 58eac39c1d32..851b8f6de28d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -65,6 +63,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -81,8 +80,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -132,6 +130,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -154,13 +153,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -192,6 +189,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -223,7 +221,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -237,6 +234,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -253,8 +251,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -278,8 +275,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -309,8 +305,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -320,7 +316,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -348,8 +343,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -359,7 +354,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -379,7 +373,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -409,7 +402,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -423,6 +415,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -439,8 +432,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -490,6 +482,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -512,13 +505,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -550,6 +541,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -581,7 +573,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -595,6 +586,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -611,8 +603,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -636,8 +627,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -667,8 +657,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -678,7 +668,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -706,8 +695,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -717,7 +706,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -745,8 +733,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -756,7 +744,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -784,8 +771,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -795,7 +782,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -823,8 +809,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -844,7 +830,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -897,8 +882,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -918,7 +903,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -937,6 +921,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -959,13 +944,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1002,7 +985,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1040,8 +1022,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1061,7 +1043,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -1074,7 +1055,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [], @@ -1144,8 +1124,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1165,7 +1145,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1185,6 +1164,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1201,8 +1181,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1276,8 +1255,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1297,7 +1276,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -1350,8 +1328,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1371,7 +1349,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -1390,6 +1367,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1412,13 +1390,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1455,7 +1431,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1493,8 +1468,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1514,7 +1489,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -1537,6 +1511,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1553,8 +1528,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1629,8 +1603,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1679,8 +1653,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "FunctionExpression", @@ -1702,6 +1676,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1718,8 +1693,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1791,8 +1765,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1841,8 +1815,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "FunctionExpression", @@ -1864,6 +1838,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1880,8 +1855,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1945,7 +1919,6 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1975,7 +1948,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1989,6 +1961,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2005,8 +1978,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -2056,6 +2028,7 @@ "ctxt": 0 }, "value": "s2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2078,13 +2051,11 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2116,6 +2087,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2147,7 +2119,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2161,6 +2132,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2177,8 +2149,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -2202,8 +2173,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2233,8 +2203,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2244,7 +2214,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -2272,8 +2241,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2283,7 +2252,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } } @@ -2311,8 +2279,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -2330,6 +2298,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2346,8 +2315,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -2389,8 +2357,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "FunctionExpression", @@ -2412,6 +2380,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2428,8 +2397,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -2501,8 +2469,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2512,7 +2480,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -2540,8 +2507,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2551,7 +2518,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } } @@ -2579,8 +2545,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -2598,6 +2564,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2614,8 +2581,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -2657,8 +2623,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "FunctionExpression", @@ -2680,6 +2646,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2696,8 +2663,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures3/input.ts.json index 60d481e96ccf..92d19a25203f 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "OtherDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -284,7 +275,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": null, @@ -324,7 +314,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -357,6 +346,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -380,6 +370,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -396,8 +387,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -427,8 +417,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -460,6 +449,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -483,6 +473,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -499,8 +490,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -530,8 +520,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -563,6 +552,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -586,6 +576,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -602,8 +593,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -625,8 +615,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -658,6 +647,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -681,6 +671,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -697,8 +688,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -708,6 +698,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -724,8 +715,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -747,8 +737,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -780,6 +769,7 @@ "ctxt": 0 }, "value": "a5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -803,6 +793,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -826,6 +817,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -842,8 +834,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -865,8 +856,7 @@ } } } - }, - "optional": false + } } ], "typeParams": null, @@ -888,8 +878,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -921,6 +910,7 @@ "ctxt": 0 }, "value": "a6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -944,6 +934,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -967,6 +958,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -989,13 +981,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1021,15 +1011,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1055,15 +1043,13 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1095,6 +1081,7 @@ "ctxt": 0 }, "value": "a7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1118,6 +1105,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1141,6 +1129,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1163,13 +1152,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1195,15 +1182,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1230,6 +1215,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1252,13 +1238,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1284,7 +1268,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1293,8 +1276,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1326,6 +1308,7 @@ "ctxt": 0 }, "value": "a8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1349,6 +1332,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1372,6 +1356,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1394,13 +1379,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1426,15 +1409,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -1444,6 +1425,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1467,6 +1449,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1489,13 +1472,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1521,15 +1502,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1556,6 +1535,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1578,13 +1558,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1610,7 +1588,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1619,8 +1596,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1652,6 +1628,7 @@ "ctxt": 0 }, "value": "a9", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1675,6 +1652,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1698,6 +1676,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1720,13 +1699,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1752,15 +1729,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -1770,6 +1745,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1793,6 +1769,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1815,13 +1792,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1847,15 +1822,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1882,6 +1855,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1904,13 +1878,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1936,7 +1908,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1945,8 +1916,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1978,6 +1948,7 @@ "ctxt": 0 }, "value": "a10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2013,8 +1984,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2045,7 +2016,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2077,15 +2047,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2117,6 +2085,7 @@ "ctxt": 0 }, "value": "a11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2140,6 +2109,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2171,7 +2141,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2199,8 +2168,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -2210,6 +2178,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2241,7 +2210,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2283,7 +2251,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2311,8 +2278,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -2338,15 +2304,13 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2378,6 +2342,7 @@ "ctxt": 0 }, "value": "a12", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2401,6 +2366,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2423,7 +2389,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2449,7 +2414,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2457,8 +2421,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -2468,6 +2431,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2490,7 +2454,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2516,7 +2479,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2524,8 +2486,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -2551,7 +2512,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2577,7 +2537,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2587,8 +2546,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2620,6 +2578,7 @@ "ctxt": 0 }, "value": "a13", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2643,6 +2602,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2665,7 +2625,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2691,7 +2650,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2699,8 +2657,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -2710,6 +2667,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2732,7 +2690,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2758,7 +2715,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2766,8 +2722,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -2793,7 +2748,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2819,7 +2773,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2829,8 +2782,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2862,6 +2814,7 @@ "ctxt": 0 }, "value": "a14", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2885,6 +2838,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2916,7 +2870,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2958,7 +2911,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2986,8 +2938,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -3013,15 +2964,13 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3053,6 +3002,7 @@ "ctxt": 0 }, "value": "a15", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3084,6 +3034,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3100,8 +3051,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3147,6 +3097,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3163,8 +3114,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3196,8 +3146,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3229,6 +3178,7 @@ "ctxt": 0 }, "value": "a16", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3260,6 +3210,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3282,13 +3233,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3339,7 +3288,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3357,7 +3305,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3383,6 +3330,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3405,13 +3353,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3462,7 +3408,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3480,7 +3425,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3492,8 +3436,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3525,6 +3468,7 @@ "ctxt": 0 }, "value": "a17", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3556,6 +3500,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3579,6 +3524,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3595,8 +3541,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -3618,8 +3563,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3665,6 +3609,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3688,6 +3633,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3704,8 +3650,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -3727,8 +3672,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3760,8 +3704,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3793,6 +3736,7 @@ "ctxt": 0 }, "value": "a18", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3824,6 +3768,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3855,6 +3800,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3871,8 +3817,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3910,6 +3855,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3926,8 +3872,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3951,8 +3896,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3998,6 +3942,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4029,6 +3974,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4045,8 +3991,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4084,6 +4029,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4106,13 +4052,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4137,7 +4081,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4147,8 +4090,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4180,8 +4122,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -4213,6 +4154,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4236,6 +4178,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4258,13 +4201,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4290,7 +4231,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4327,7 +4267,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4335,8 +4274,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4366,8 +4304,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4377,7 +4315,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -4405,8 +4342,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4416,7 +4353,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4446,6 +4382,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4469,6 +4406,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4491,13 +4429,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4523,7 +4459,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4557,8 +4492,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4588,8 +4522,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4599,7 +4533,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -4627,8 +4560,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4638,7 +4571,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -4668,6 +4600,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4691,6 +4624,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4713,13 +4647,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4745,7 +4677,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4775,15 +4706,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4813,8 +4742,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4824,7 +4753,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } } @@ -4852,8 +4780,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4863,7 +4791,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } } @@ -4893,6 +4820,7 @@ "ctxt": 0 }, "value": "b4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4916,6 +4844,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4938,13 +4867,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -4954,6 +4881,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4976,13 +4904,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -5008,7 +4934,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5029,7 +4954,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5059,15 +4983,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5097,8 +5019,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5108,7 +5030,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } } @@ -5136,8 +5057,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5147,7 +5068,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } } @@ -5177,6 +5097,7 @@ "ctxt": 0 }, "value": "b5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5200,6 +5121,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5223,6 +5145,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5245,13 +5168,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5277,15 +5198,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -5311,7 +5230,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5332,7 +5250,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5362,15 +5279,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5400,8 +5315,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5411,7 +5326,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } } @@ -5439,8 +5353,8 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5450,7 +5364,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } } @@ -5480,6 +5393,7 @@ "ctxt": 0 }, "value": "b6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5503,6 +5417,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5526,6 +5441,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5548,13 +5464,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5580,15 +5494,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -5614,7 +5526,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5632,7 +5543,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5654,7 +5564,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5672,7 +5581,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5703,15 +5611,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5741,8 +5647,8 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5752,7 +5658,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } } @@ -5780,8 +5685,8 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5791,7 +5696,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } } @@ -5821,6 +5725,7 @@ "ctxt": 0 }, "value": "b7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5844,6 +5749,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5867,6 +5773,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5889,13 +5796,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5921,15 +5826,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -5955,7 +5858,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5973,7 +5875,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5995,7 +5896,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6013,7 +5913,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6045,6 +5944,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6067,13 +5967,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6099,7 +5997,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6108,8 +6005,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -6139,8 +6035,8 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6150,7 +6046,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } } @@ -6178,8 +6073,8 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6189,7 +6084,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } } @@ -6219,6 +6113,7 @@ "ctxt": 0 }, "value": "b8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6242,6 +6137,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6265,6 +6161,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6287,13 +6184,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6319,15 +6214,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -6337,6 +6230,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6360,6 +6254,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6382,13 +6277,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6414,15 +6307,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -6448,7 +6339,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6466,7 +6356,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6488,7 +6377,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6506,7 +6394,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6538,6 +6425,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6560,13 +6448,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6592,7 +6478,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6601,8 +6486,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -6632,8 +6516,8 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6643,7 +6527,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false } } @@ -6671,8 +6554,8 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6682,7 +6565,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false } } @@ -6712,6 +6594,7 @@ "ctxt": 0 }, "value": "b9", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6735,6 +6618,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6758,6 +6642,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6780,13 +6665,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6812,15 +6695,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -6830,6 +6711,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6853,6 +6735,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6884,7 +6767,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6926,7 +6808,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6954,8 +6835,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -6981,15 +6861,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -7015,7 +6893,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7033,7 +6910,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7055,7 +6931,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7073,7 +6948,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7105,6 +6979,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7127,13 +7002,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -7159,7 +7032,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7168,8 +7040,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -7199,8 +7070,8 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -7210,7 +7081,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false } } @@ -7238,8 +7108,8 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -7249,7 +7119,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false } } @@ -7279,6 +7148,7 @@ "ctxt": 0 }, "value": "b10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7314,8 +7184,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -7346,7 +7216,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7378,7 +7247,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7396,7 +7264,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7427,15 +7294,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -7465,8 +7330,8 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -7476,7 +7341,6 @@ "ctxt": 0 }, "value": "b10", - "typeAnnotation": null, "optional": false } } @@ -7504,8 +7368,8 @@ "ctxt": 0 }, "value": "b10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -7515,7 +7379,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false } } @@ -7545,6 +7408,7 @@ "ctxt": 0 }, "value": "b11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7568,6 +7432,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7590,13 +7455,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -7606,6 +7469,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7628,13 +7492,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -7660,7 +7522,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7678,7 +7539,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7709,15 +7569,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -7747,8 +7605,8 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -7758,7 +7616,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false } } @@ -7786,8 +7643,8 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -7797,7 +7654,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false } } @@ -7827,6 +7683,7 @@ "ctxt": 0 }, "value": "b12", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7850,6 +7707,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7872,7 +7730,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7898,7 +7755,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7906,8 +7762,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -7917,6 +7772,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7939,13 +7795,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -7971,7 +7825,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7989,7 +7842,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8015,7 +7867,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8049,7 +7900,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8075,7 +7925,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8085,8 +7934,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -8116,8 +7964,8 @@ "ctxt": 0 }, "value": "a12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -8127,7 +7975,6 @@ "ctxt": 0 }, "value": "b12", - "typeAnnotation": null, "optional": false } } @@ -8155,8 +8002,8 @@ "ctxt": 0 }, "value": "b12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -8166,7 +8013,6 @@ "ctxt": 0 }, "value": "a12", - "typeAnnotation": null, "optional": false } } @@ -8196,6 +8042,7 @@ "ctxt": 0 }, "value": "b13", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8219,6 +8066,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8241,7 +8089,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8267,7 +8114,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8275,8 +8121,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -8286,6 +8131,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8308,13 +8154,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -8340,7 +8184,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8358,7 +8201,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8384,7 +8226,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8418,15 +8259,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -8456,8 +8295,8 @@ "ctxt": 0 }, "value": "a13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -8467,7 +8306,6 @@ "ctxt": 0 }, "value": "b13", - "typeAnnotation": null, "optional": false } } @@ -8495,8 +8333,8 @@ "ctxt": 0 }, "value": "b13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -8506,7 +8344,6 @@ "ctxt": 0 }, "value": "a13", - "typeAnnotation": null, "optional": false } } @@ -8536,6 +8373,7 @@ "ctxt": 0 }, "value": "b14", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8559,6 +8397,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8590,7 +8429,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8619,7 +8457,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8643,7 +8480,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8672,7 +8508,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8682,8 +8517,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -8709,7 +8543,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8739,15 +8572,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -8777,8 +8608,8 @@ "ctxt": 0 }, "value": "a14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -8788,7 +8619,6 @@ "ctxt": 0 }, "value": "b14", - "typeAnnotation": null, "optional": false } } @@ -8816,8 +8646,8 @@ "ctxt": 0 }, "value": "b14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -8827,7 +8657,6 @@ "ctxt": 0 }, "value": "a14", - "typeAnnotation": null, "optional": false } } @@ -8857,6 +8686,7 @@ "ctxt": 0 }, "value": "b15", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8880,6 +8710,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8902,13 +8733,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -8934,7 +8763,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8971,7 +8799,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8979,8 +8806,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -9010,8 +8836,8 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -9021,7 +8847,6 @@ "ctxt": 0 }, "value": "b15", - "typeAnnotation": null, "optional": false } } @@ -9049,8 +8874,8 @@ "ctxt": 0 }, "value": "b15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -9060,7 +8885,6 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, "optional": false } } @@ -9090,6 +8914,7 @@ "ctxt": 0 }, "value": "b16", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9113,6 +8938,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9135,13 +8961,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -9167,7 +8991,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9185,7 +9008,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9220,8 +9042,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -9251,8 +9072,8 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -9262,7 +9083,6 @@ "ctxt": 0 }, "value": "b16", - "typeAnnotation": null, "optional": false } } @@ -9290,8 +9110,8 @@ "ctxt": 0 }, "value": "b16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -9301,7 +9121,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false } } @@ -9331,6 +9150,7 @@ "ctxt": 0 }, "value": "b17", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9354,6 +9174,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9377,6 +9198,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9399,13 +9221,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -9431,15 +9251,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -9465,7 +9283,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9502,7 +9319,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9510,8 +9326,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -9541,8 +9356,8 @@ "ctxt": 0 }, "value": "a17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -9552,7 +9367,6 @@ "ctxt": 0 }, "value": "b17", - "typeAnnotation": null, "optional": false } } @@ -9580,8 +9394,8 @@ "ctxt": 0 }, "value": "b17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -9591,7 +9405,6 @@ "ctxt": 0 }, "value": "a17", - "typeAnnotation": null, "optional": false } } @@ -9621,6 +9434,7 @@ "ctxt": 0 }, "value": "b18", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9644,6 +9458,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9667,6 +9482,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9689,13 +9505,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -9721,15 +9535,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -9755,7 +9567,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9792,7 +9603,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9800,8 +9610,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -9831,8 +9640,8 @@ "ctxt": 0 }, "value": "a18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -9842,7 +9651,6 @@ "ctxt": 0 }, "value": "b18", - "typeAnnotation": null, "optional": false } } @@ -9870,8 +9678,8 @@ "ctxt": 0 }, "value": "b18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -9881,7 +9689,6 @@ "ctxt": 0 }, "value": "a18", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures4/input.ts.json index c499b33956c7..57b0e1929c82 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures4/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Errors", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -118,7 +115,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -144,7 +140,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -202,7 +196,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -228,7 +221,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -268,7 +260,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -286,7 +277,6 @@ "ctxt": 0 }, "value": "OtherDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -312,7 +302,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": null, @@ -352,7 +341,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -377,7 +365,6 @@ "ctxt": 0 }, "value": "WithNonGenericSignaturesInBaseType", - "typeAnnotation": null, "optional": false }, "body": { @@ -413,6 +400,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -436,6 +424,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -452,8 +441,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -483,8 +471,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -516,6 +503,7 @@ "ctxt": 0 }, "value": "a7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -539,6 +527,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -562,6 +551,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -584,13 +574,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -616,15 +604,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -651,6 +637,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -673,13 +660,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -705,7 +690,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -714,8 +698,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -747,6 +730,7 @@ "ctxt": 0 }, "value": "a8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -770,6 +754,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -793,6 +778,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -815,13 +801,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -847,15 +831,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -865,6 +847,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -888,6 +871,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -910,13 +894,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -942,15 +924,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -977,6 +957,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -999,13 +980,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1031,7 +1010,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1040,8 +1018,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1073,6 +1050,7 @@ "ctxt": 0 }, "value": "a10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1108,8 +1086,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1140,7 +1118,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1172,15 +1149,13 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1212,6 +1187,7 @@ "ctxt": 0 }, "value": "a11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1235,6 +1211,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1266,7 +1243,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1294,8 +1270,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -1305,6 +1280,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1336,7 +1312,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1378,7 +1353,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1406,8 +1380,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -1433,15 +1406,13 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1473,6 +1444,7 @@ "ctxt": 0 }, "value": "a12", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1496,6 +1468,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1518,7 +1491,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1544,7 +1516,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1552,8 +1523,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -1563,6 +1533,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1585,7 +1556,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1611,7 +1581,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1619,8 +1588,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -1646,7 +1614,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1672,7 +1639,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1682,8 +1648,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1715,6 +1680,7 @@ "ctxt": 0 }, "value": "a14", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1746,6 +1712,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1762,8 +1729,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1809,6 +1775,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1825,8 +1792,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1858,8 +1824,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1891,6 +1856,7 @@ "ctxt": 0 }, "value": "a15", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1914,6 +1880,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1945,7 +1912,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1987,7 +1953,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2015,8 +1980,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -2038,8 +2002,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2071,6 +2034,7 @@ "ctxt": 0 }, "value": "a16", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2102,6 +2066,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2133,6 +2098,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2149,8 +2115,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2188,6 +2153,7 @@ "ctxt": 0 }, "value": "a", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2204,8 +2170,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -2229,8 +2194,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2276,6 +2240,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2307,6 +2272,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2323,8 +2289,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2362,6 +2327,7 @@ "ctxt": 0 }, "value": "a", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2378,8 +2344,7 @@ }, "kind": "boolean" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -2403,8 +2368,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2436,8 +2400,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2469,6 +2432,7 @@ "ctxt": 0 }, "value": "a17", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2500,6 +2464,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2531,6 +2496,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2553,13 +2519,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2584,7 +2548,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2613,7 +2576,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2631,7 +2593,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2657,6 +2618,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2679,13 +2641,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2710,7 +2670,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2739,7 +2698,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2757,7 +2715,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2769,8 +2726,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2816,6 +2772,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2847,6 +2804,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2869,13 +2827,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2900,7 +2856,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2929,7 +2884,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2947,7 +2901,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2973,6 +2926,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2995,13 +2949,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3026,7 +2978,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3055,7 +3006,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3073,7 +3023,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3085,8 +3034,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3118,8 +3066,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3151,6 +3098,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3174,6 +3122,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3196,13 +3145,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3228,7 +3175,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3249,7 +3195,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3286,7 +3231,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3294,8 +3238,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3325,8 +3268,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3336,7 +3279,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -3364,8 +3306,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3375,7 +3317,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -3405,6 +3346,7 @@ "ctxt": 0 }, "value": "b7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3428,6 +3370,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3451,6 +3394,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3473,13 +3417,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3505,15 +3447,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -3539,7 +3479,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3557,7 +3496,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3579,7 +3517,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3597,7 +3534,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3619,7 +3555,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3637,7 +3572,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3669,6 +3603,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3691,13 +3626,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3723,7 +3656,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3732,8 +3664,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3763,8 +3694,8 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3774,7 +3705,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } } @@ -3802,8 +3732,8 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3813,7 +3743,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } } @@ -3843,6 +3772,7 @@ "ctxt": 0 }, "value": "b8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3866,6 +3796,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3889,6 +3820,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3911,13 +3843,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3943,15 +3873,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -3961,6 +3889,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3984,6 +3913,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4015,7 +3945,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4043,8 +3972,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -4070,15 +3998,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -4104,7 +4030,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4122,7 +4047,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4144,7 +4068,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4162,7 +4085,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4194,6 +4116,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4216,13 +4139,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4248,7 +4169,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4257,8 +4177,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4288,8 +4207,8 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4299,7 +4218,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false } } @@ -4327,8 +4245,8 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4338,7 +4256,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false } } @@ -4368,6 +4285,7 @@ "ctxt": 0 }, "value": "b10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4403,8 +4321,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -4435,7 +4353,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4467,7 +4384,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4485,7 +4401,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4516,15 +4431,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4554,8 +4467,8 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4565,7 +4478,6 @@ "ctxt": 0 }, "value": "b10", - "typeAnnotation": null, "optional": false } } @@ -4593,8 +4505,8 @@ "ctxt": 0 }, "value": "b10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4604,7 +4516,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false } } @@ -4634,6 +4545,7 @@ "ctxt": 0 }, "value": "b11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4657,6 +4569,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4679,13 +4592,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -4695,6 +4606,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4717,13 +4629,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4749,7 +4659,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4767,7 +4676,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4798,15 +4706,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4836,8 +4742,8 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4847,7 +4753,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false } } @@ -4875,8 +4780,8 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4886,7 +4791,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false } } @@ -4916,6 +4820,7 @@ "ctxt": 0 }, "value": "b12", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4939,6 +4844,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4961,7 +4867,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4987,7 +4892,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4995,8 +4899,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -5006,6 +4909,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5028,7 +4932,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5054,7 +4957,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5062,8 +4964,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": { @@ -5089,7 +4990,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5107,7 +5007,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5133,7 +5032,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5167,15 +5065,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5205,8 +5101,8 @@ "ctxt": 0 }, "value": "a12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5216,7 +5112,6 @@ "ctxt": 0 }, "value": "b12", - "typeAnnotation": null, "optional": false } } @@ -5244,8 +5139,8 @@ "ctxt": 0 }, "value": "b12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5255,7 +5150,6 @@ "ctxt": 0 }, "value": "a12", - "typeAnnotation": null, "optional": false } } @@ -5285,6 +5179,7 @@ "ctxt": 0 }, "value": "b15", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5308,6 +5203,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5339,7 +5235,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5368,7 +5263,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5392,7 +5286,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5421,7 +5314,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5431,8 +5323,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -5458,7 +5349,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5488,15 +5378,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5526,8 +5414,8 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5537,7 +5425,6 @@ "ctxt": 0 }, "value": "b15", - "typeAnnotation": null, "optional": false } } @@ -5565,8 +5452,8 @@ "ctxt": 0 }, "value": "b15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5576,7 +5463,6 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, "optional": false } } @@ -5606,6 +5492,7 @@ "ctxt": 0 }, "value": "b15a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5629,6 +5516,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5660,7 +5548,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5689,7 +5576,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5713,7 +5599,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5742,7 +5627,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5752,8 +5636,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -5779,7 +5662,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5797,7 +5679,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5824,8 +5705,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5855,8 +5735,8 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5866,7 +5746,6 @@ "ctxt": 0 }, "value": "b15a", - "typeAnnotation": null, "optional": false } } @@ -5894,8 +5773,8 @@ "ctxt": 0 }, "value": "b15a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5905,7 +5784,6 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, "optional": false } } @@ -5935,6 +5813,7 @@ "ctxt": 0 }, "value": "b16", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5958,6 +5837,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5981,6 +5861,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6003,13 +5884,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6035,15 +5914,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -6069,7 +5946,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6106,7 +5982,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6114,8 +5989,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -6145,8 +6019,8 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6156,7 +6030,6 @@ "ctxt": 0 }, "value": "b16", - "typeAnnotation": null, "optional": false } } @@ -6184,8 +6057,8 @@ "ctxt": 0 }, "value": "b16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6195,7 +6068,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false } } @@ -6225,6 +6097,7 @@ "ctxt": 0 }, "value": "b17", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6248,6 +6121,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6271,6 +6145,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6293,13 +6168,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6325,15 +6198,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -6359,7 +6230,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6393,8 +6263,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -6424,8 +6293,8 @@ "ctxt": 0 }, "value": "a17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6435,7 +6304,6 @@ "ctxt": 0 }, "value": "b17", - "typeAnnotation": null, "optional": false } } @@ -6463,8 +6331,8 @@ "ctxt": 0 }, "value": "b17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6474,7 +6342,6 @@ "ctxt": 0 }, "value": "a17", - "typeAnnotation": null, "optional": false } } @@ -6499,7 +6366,6 @@ "ctxt": 0 }, "value": "WithGenericSignaturesInBaseType", - "typeAnnotation": null, "optional": false }, "body": { @@ -6535,6 +6401,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6558,6 +6425,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6580,13 +6448,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6612,7 +6478,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6649,7 +6514,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6657,8 +6521,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -6690,6 +6553,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6713,6 +6577,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6735,13 +6600,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6767,7 +6630,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6801,8 +6663,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -6832,8 +6693,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6843,7 +6704,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -6871,8 +6731,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6882,7 +6742,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -6912,6 +6771,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6935,6 +6795,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6957,13 +6818,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6989,7 +6848,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7023,8 +6881,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -7056,6 +6913,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7079,6 +6937,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7101,13 +6960,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -7133,7 +6990,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7170,7 +7026,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7178,8 +7033,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -7209,8 +7063,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -7220,7 +7074,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } } @@ -7248,8 +7101,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -7259,7 +7112,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures5/input.ts.json index 4f1b8a82553c..73b8ca301fed 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "OtherDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -284,7 +275,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": null, @@ -324,7 +314,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -357,6 +346,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -380,6 +370,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -402,13 +393,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -434,7 +423,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -471,7 +459,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -479,8 +466,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -512,6 +498,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -535,6 +522,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -557,13 +545,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -589,7 +575,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -623,8 +608,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -656,6 +640,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -679,6 +664,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -701,13 +687,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -733,7 +717,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -759,8 +742,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -792,6 +774,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -815,6 +798,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -837,13 +821,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -853,6 +835,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -875,13 +858,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -907,7 +888,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -928,7 +908,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -954,8 +933,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -987,6 +965,7 @@ "ctxt": 0 }, "value": "a5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1010,6 +989,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1033,6 +1013,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1055,13 +1036,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1087,15 +1066,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -1121,7 +1098,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1142,7 +1118,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1172,15 +1147,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1212,6 +1185,7 @@ "ctxt": 0 }, "value": "a6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1235,6 +1209,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1258,6 +1233,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1280,13 +1256,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1312,15 +1286,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -1346,7 +1318,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1364,7 +1335,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1395,15 +1365,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1435,6 +1403,7 @@ "ctxt": 0 }, "value": "a11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1458,6 +1427,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1489,7 +1459,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1518,7 +1487,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1528,8 +1496,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -1539,6 +1506,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1570,7 +1538,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1599,7 +1566,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1623,7 +1589,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1652,7 +1617,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1662,8 +1626,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -1689,7 +1652,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1719,15 +1681,13 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1759,6 +1719,7 @@ "ctxt": 0 }, "value": "a15", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1782,6 +1743,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1813,7 +1775,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1842,7 +1803,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1866,7 +1826,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1895,7 +1854,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1905,8 +1863,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -1932,7 +1889,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1969,7 +1925,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1977,8 +1932,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2010,6 +1964,7 @@ "ctxt": 0 }, "value": "a16", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2033,6 +1988,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2064,7 +2020,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2093,7 +2048,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2117,7 +2071,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2146,7 +2099,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2156,8 +2108,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -2183,7 +2134,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2201,7 +2151,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2239,7 +2188,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2247,8 +2195,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2280,6 +2227,7 @@ "ctxt": 0 }, "value": "a17", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2311,6 +2259,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2334,6 +2283,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2356,13 +2306,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2388,15 +2336,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2428,7 +2374,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2458,7 +2403,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2476,7 +2420,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2502,6 +2445,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2525,6 +2469,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2547,13 +2492,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2579,15 +2522,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2619,7 +2560,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2649,7 +2589,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2667,7 +2606,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2679,8 +2617,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2712,6 +2649,7 @@ "ctxt": 0 }, "value": "a18", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2743,6 +2681,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2774,6 +2713,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2796,13 +2736,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2827,7 +2765,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2856,7 +2793,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2874,7 +2810,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2900,6 +2835,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2922,13 +2858,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2953,7 +2887,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2982,7 +2915,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3000,7 +2932,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3012,8 +2943,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3059,6 +2989,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3090,6 +3021,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3112,13 +3044,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3143,7 +3073,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3172,7 +3101,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3190,7 +3118,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3216,6 +3143,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3238,13 +3166,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3269,7 +3195,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3298,7 +3223,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3316,7 +3240,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3328,8 +3251,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3361,8 +3283,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3394,6 +3315,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3417,6 +3339,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3439,13 +3362,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3471,7 +3392,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3508,7 +3428,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3516,8 +3435,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3547,8 +3465,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3558,7 +3476,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -3586,8 +3503,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3597,7 +3514,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3627,6 +3543,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3650,6 +3567,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3672,13 +3590,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3704,7 +3620,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3738,8 +3653,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3769,8 +3683,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3780,7 +3694,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -3808,8 +3721,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3819,7 +3732,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -3849,6 +3761,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3872,6 +3785,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3894,13 +3808,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3926,7 +3838,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3956,15 +3867,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3994,8 +3903,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4005,7 +3914,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } } @@ -4033,8 +3941,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4044,7 +3952,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } } @@ -4074,6 +3981,7 @@ "ctxt": 0 }, "value": "b4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4097,6 +4005,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4119,13 +4028,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -4135,6 +4042,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4157,13 +4065,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4189,7 +4095,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4210,7 +4115,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4236,8 +4140,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4267,8 +4170,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4278,7 +4181,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } } @@ -4306,8 +4208,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4317,7 +4219,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } } @@ -4347,6 +4248,7 @@ "ctxt": 0 }, "value": "b5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4370,6 +4272,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4393,6 +4296,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4415,13 +4319,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4447,15 +4349,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -4481,7 +4381,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4502,7 +4401,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4532,15 +4430,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4570,8 +4466,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4581,7 +4477,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } } @@ -4609,8 +4504,8 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4620,7 +4515,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } } @@ -4650,6 +4544,7 @@ "ctxt": 0 }, "value": "b6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4673,6 +4568,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4696,6 +4592,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4718,13 +4615,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4750,15 +4645,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -4784,7 +4677,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4802,7 +4694,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4824,7 +4715,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4842,7 +4732,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4873,15 +4762,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4911,8 +4798,8 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4922,7 +4809,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } } @@ -4950,8 +4836,8 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4961,7 +4847,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } } @@ -4991,6 +4876,7 @@ "ctxt": 0 }, "value": "b11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5014,6 +4900,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5045,7 +4932,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5074,7 +4960,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5084,8 +4969,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -5095,6 +4979,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5126,7 +5011,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5155,7 +5039,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5179,7 +5062,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5208,7 +5090,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5218,8 +5099,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -5245,7 +5125,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5266,7 +5145,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5296,15 +5174,13 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5334,8 +5210,8 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5345,7 +5221,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false } } @@ -5373,8 +5248,8 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5384,7 +5259,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false } } @@ -5414,6 +5288,7 @@ "ctxt": 0 }, "value": "b15", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5437,6 +5312,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5468,7 +5344,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5497,7 +5372,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5521,7 +5395,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5550,7 +5423,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5560,8 +5432,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -5587,7 +5458,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5608,7 +5478,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5645,7 +5514,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5653,8 +5521,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5684,8 +5551,8 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5695,7 +5562,6 @@ "ctxt": 0 }, "value": "b15", - "typeAnnotation": null, "optional": false } } @@ -5723,8 +5589,8 @@ "ctxt": 0 }, "value": "b15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5734,7 +5600,6 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, "optional": false } } @@ -5764,6 +5629,7 @@ "ctxt": 0 }, "value": "b16", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5787,6 +5653,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5818,7 +5685,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5847,7 +5713,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5871,7 +5736,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5900,7 +5764,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5910,8 +5773,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -5937,7 +5799,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5974,7 +5835,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5982,8 +5842,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -6013,8 +5872,8 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6024,7 +5883,6 @@ "ctxt": 0 }, "value": "b16", - "typeAnnotation": null, "optional": false } } @@ -6052,8 +5910,8 @@ "ctxt": 0 }, "value": "b15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6063,7 +5921,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false } } @@ -6093,6 +5950,7 @@ "ctxt": 0 }, "value": "b17", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6116,6 +5974,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6139,6 +5998,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6161,13 +6021,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6193,15 +6051,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -6227,7 +6083,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6264,7 +6119,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6272,8 +6126,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -6303,8 +6156,8 @@ "ctxt": 0 }, "value": "a17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6314,7 +6167,6 @@ "ctxt": 0 }, "value": "b17", - "typeAnnotation": null, "optional": false } } @@ -6342,8 +6194,8 @@ "ctxt": 0 }, "value": "b17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6353,7 +6205,6 @@ "ctxt": 0 }, "value": "a17", - "typeAnnotation": null, "optional": false } } @@ -6383,6 +6234,7 @@ "ctxt": 0 }, "value": "b18", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6406,6 +6258,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6429,6 +6282,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6451,13 +6305,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6483,7 +6335,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6513,15 +6364,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -6551,8 +6400,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -6582,8 +6430,8 @@ "ctxt": 0 }, "value": "a18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6593,7 +6441,6 @@ "ctxt": 0 }, "value": "b18", - "typeAnnotation": null, "optional": false } } @@ -6621,8 +6468,8 @@ "ctxt": 0 }, "value": "b18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6632,7 +6479,6 @@ "ctxt": 0 }, "value": "a18", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures6/input.ts.json index 43697e4c3f3e..c223d24850d0 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "OtherDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -284,7 +275,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": null, @@ -324,7 +314,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -347,7 +336,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -377,7 +365,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -407,6 +394,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -429,13 +417,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -461,7 +447,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -498,7 +483,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -525,7 +509,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -555,6 +538,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -577,13 +561,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -609,7 +591,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -662,7 +643,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -692,6 +672,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -714,13 +695,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -746,7 +725,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -791,7 +769,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -821,6 +798,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -843,13 +821,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -859,6 +835,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -881,13 +858,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -913,7 +888,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -934,7 +908,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -979,7 +952,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1009,6 +981,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1032,6 +1005,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1054,13 +1028,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1086,15 +1058,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -1120,7 +1090,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1141,7 +1110,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1171,7 +1139,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1197,7 +1164,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1227,6 +1193,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1250,6 +1217,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1272,13 +1240,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1304,15 +1270,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -1338,7 +1302,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1356,7 +1319,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1387,7 +1349,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1413,7 +1374,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1443,6 +1403,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1474,7 +1435,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1503,7 +1463,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1513,8 +1472,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -1524,6 +1482,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1555,7 +1514,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1584,7 +1542,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1608,7 +1565,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1637,7 +1593,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1647,8 +1602,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -1674,7 +1628,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1704,7 +1657,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1730,7 +1682,6 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1760,6 +1711,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1791,7 +1743,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1820,7 +1771,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1844,7 +1794,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1873,7 +1822,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1883,8 +1831,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -1910,7 +1857,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1947,7 +1893,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1974,7 +1919,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2004,6 +1948,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2035,7 +1980,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2064,7 +2008,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2088,7 +2031,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2117,7 +2059,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2127,8 +2068,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -2154,7 +2094,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2172,7 +2111,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2210,7 +2148,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2249,6 +2186,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2271,13 +2209,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2309,6 +2245,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2332,6 +2269,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2354,13 +2292,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -2386,7 +2322,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2423,7 +2358,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2431,8 +2365,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2469,7 +2402,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2480,7 +2412,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2493,7 +2424,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2521,8 +2451,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2539,7 +2469,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2550,7 +2479,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2582,6 +2510,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2605,6 +2534,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2627,13 +2557,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -2659,7 +2587,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2693,8 +2620,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2731,7 +2657,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2742,7 +2667,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2755,7 +2679,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -2783,8 +2706,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2801,7 +2724,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2812,7 +2734,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2844,6 +2765,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2867,6 +2789,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2889,13 +2812,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -2921,7 +2842,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2951,15 +2871,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2996,7 +2914,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3007,7 +2924,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3020,7 +2936,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } } @@ -3048,8 +2963,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -3066,7 +2981,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3077,7 +2991,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3109,6 +3022,7 @@ "ctxt": 0 }, "value": "b4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3132,6 +3046,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3154,13 +3069,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -3170,6 +3083,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3192,13 +3106,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3224,7 +3136,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3245,7 +3156,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3271,8 +3181,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3309,7 +3218,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3320,7 +3228,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3333,7 +3240,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } } @@ -3361,8 +3267,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -3379,7 +3285,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3390,7 +3295,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3422,6 +3326,7 @@ "ctxt": 0 }, "value": "b5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3445,6 +3350,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3468,6 +3374,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3490,13 +3397,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3522,15 +3427,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -3556,7 +3459,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3577,7 +3479,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3607,15 +3508,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3652,7 +3551,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3663,7 +3561,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3676,7 +3573,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } } @@ -3704,8 +3600,8 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -3722,7 +3618,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3733,7 +3628,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3765,6 +3659,7 @@ "ctxt": 0 }, "value": "b11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3788,6 +3683,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3819,7 +3715,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3848,7 +3743,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3858,8 +3752,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -3869,6 +3762,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3900,7 +3794,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3929,7 +3822,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3953,7 +3845,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3982,7 +3873,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3992,8 +3882,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -4019,7 +3908,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4040,7 +3928,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4070,15 +3957,13 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4115,7 +4000,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4126,7 +4010,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4139,7 +4022,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false } } @@ -4167,8 +4049,8 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -4185,7 +4067,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4196,7 +4077,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4228,6 +4108,7 @@ "ctxt": 0 }, "value": "b16", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4251,6 +4132,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4282,7 +4164,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4311,7 +4192,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4335,7 +4215,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4364,7 +4243,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4374,8 +4252,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -4401,7 +4278,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4438,7 +4314,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4446,8 +4321,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4484,7 +4358,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4495,7 +4368,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4508,7 +4380,6 @@ "ctxt": 0 }, "value": "b16", - "typeAnnotation": null, "optional": false } } @@ -4536,8 +4407,8 @@ "ctxt": 0 }, "value": "b16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -4554,7 +4425,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4565,7 +4435,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithOptionalParameters/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithOptionalParameters/input.ts.json index 0724db2a5eb1..1c1519673577 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithOptionalParameters/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithOptionalParameters/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -111,7 +109,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -141,6 +138,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -157,8 +155,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -199,7 +196,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -229,6 +225,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -245,8 +242,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -287,7 +283,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -317,6 +312,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -333,8 +329,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -344,6 +339,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -360,8 +356,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -402,7 +397,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -432,6 +426,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -448,8 +443,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -459,6 +453,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -475,8 +470,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -517,7 +511,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -547,6 +540,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -563,8 +557,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -574,6 +567,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -590,8 +584,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -644,6 +637,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -666,13 +660,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -704,6 +696,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -738,8 +731,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -769,8 +761,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -819,8 +811,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -838,6 +830,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -854,8 +847,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "body": { @@ -897,8 +889,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -916,6 +908,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -932,8 +925,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -975,8 +967,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -993,7 +985,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1004,7 +995,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1034,8 +1024,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1052,7 +1042,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1063,7 +1052,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1093,8 +1081,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1111,7 +1099,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1122,7 +1109,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1152,8 +1138,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1170,7 +1156,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1181,7 +1166,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1211,8 +1195,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1229,7 +1213,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1240,7 +1223,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1270,8 +1252,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1288,7 +1270,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1299,7 +1280,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1331,6 +1311,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1354,6 +1335,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1370,8 +1352,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -1393,8 +1374,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1424,8 +1404,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1474,8 +1454,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1493,6 +1473,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1509,8 +1490,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "body": { @@ -1552,8 +1532,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1571,6 +1551,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1587,8 +1568,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1630,8 +1610,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1648,7 +1628,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1659,7 +1638,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1689,8 +1667,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1707,7 +1685,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1718,7 +1695,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1748,8 +1724,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1766,7 +1742,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1777,7 +1752,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1807,8 +1781,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1825,7 +1799,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1836,7 +1809,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1866,8 +1838,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1884,7 +1856,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1895,7 +1866,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1925,8 +1895,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1943,7 +1913,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1954,7 +1923,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1986,6 +1954,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2009,6 +1978,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2025,8 +1995,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -2048,8 +2017,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2079,8 +2047,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -2129,8 +2097,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -2148,6 +2116,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2164,8 +2133,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "body": { @@ -2207,8 +2175,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -2226,6 +2194,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2242,8 +2211,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -2285,8 +2253,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -2304,6 +2272,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2320,8 +2289,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2331,6 +2299,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2347,8 +2316,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -2390,8 +2358,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2408,7 +2376,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2419,7 +2386,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2449,8 +2415,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2467,7 +2433,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2478,7 +2443,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2508,8 +2472,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2526,7 +2490,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2537,7 +2500,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2567,8 +2529,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2585,7 +2547,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2596,7 +2557,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2626,8 +2586,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2644,7 +2604,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2655,7 +2614,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2685,8 +2643,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2703,7 +2661,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2714,7 +2671,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2746,6 +2702,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2769,6 +2726,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2785,8 +2743,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2796,6 +2753,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2812,8 +2770,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -2835,8 +2792,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2866,8 +2822,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -2916,8 +2872,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -2935,6 +2891,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2951,8 +2908,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -2962,6 +2918,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2978,8 +2935,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "body": { @@ -3021,8 +2977,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -3040,6 +2996,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3056,8 +3013,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -3099,8 +3055,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -3118,6 +3074,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3134,8 +3091,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -3145,6 +3101,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3161,8 +3118,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -3204,8 +3160,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -3222,7 +3178,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -3233,7 +3188,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3263,8 +3217,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -3281,7 +3235,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -3292,7 +3245,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3322,8 +3274,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -3340,7 +3292,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -3351,7 +3302,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3381,8 +3331,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -3399,7 +3349,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -3410,7 +3359,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3440,8 +3388,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -3458,7 +3406,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -3469,7 +3416,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3499,8 +3445,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -3517,7 +3463,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -3528,7 +3473,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3560,6 +3504,7 @@ "ctxt": 0 }, "value": "a5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3583,6 +3528,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3599,8 +3545,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -3610,6 +3555,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3626,8 +3572,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -3649,8 +3594,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3680,8 +3624,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -3730,8 +3674,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -3749,6 +3693,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3765,8 +3710,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -3776,6 +3720,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3792,8 +3737,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "body": { @@ -3835,8 +3779,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -3854,6 +3798,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3870,8 +3815,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -3913,8 +3857,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -3932,6 +3876,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3948,8 +3893,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -3959,6 +3903,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3975,8 +3920,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -4018,8 +3962,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -4036,7 +3980,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -4047,7 +3990,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4077,8 +4019,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -4095,7 +4037,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -4106,7 +4047,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4136,8 +4076,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -4154,7 +4094,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -4165,7 +4104,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4195,8 +4133,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -4213,7 +4151,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -4224,7 +4161,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4254,8 +4190,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -4272,7 +4208,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -4283,7 +4218,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4313,8 +4247,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -4331,7 +4265,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -4342,7 +4275,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithRestParameters/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithRestParameters/input.ts.json index 726327cdd6a5..79c56e28472d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithRestParameters/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithRestParameters/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,8 +91,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -161,7 +159,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -191,6 +188,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -207,8 +205,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -230,8 +227,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -298,7 +295,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -328,6 +324,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -344,8 +341,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -355,6 +351,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +368,7 @@ }, "kind": "string" } - }, - "optional": true + } }, { "type": "RestElement", @@ -394,8 +390,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -462,7 +458,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -492,6 +487,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -508,8 +504,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -519,6 +514,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -535,8 +531,7 @@ }, "kind": "string" } - }, - "optional": true + } }, { "type": "RestElement", @@ -558,8 +553,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -638,6 +633,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -673,8 +669,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -722,8 +718,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -753,8 +748,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -803,8 +798,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -834,8 +829,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -903,8 +898,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -934,8 +929,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1003,8 +998,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1022,6 +1017,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1038,8 +1034,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "body": { @@ -1081,8 +1076,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1100,6 +1095,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1116,8 +1112,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -1127,6 +1122,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1143,8 +1139,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -1154,6 +1149,7 @@ "ctxt": 0 }, "value": "z", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1170,8 +1166,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "body": { @@ -1213,8 +1208,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1232,6 +1227,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1248,8 +1244,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1291,8 +1286,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1310,6 +1305,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1326,8 +1322,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "body": { @@ -1371,6 +1366,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1394,6 +1390,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1410,8 +1407,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -1433,8 +1429,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1482,8 +1478,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1513,8 +1508,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1563,8 +1558,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1594,8 +1589,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1663,8 +1658,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1682,6 +1677,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1698,8 +1694,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "body": { @@ -1741,8 +1736,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1760,6 +1755,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1776,8 +1772,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1819,8 +1814,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1838,6 +1833,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1854,8 +1850,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -1877,8 +1872,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1946,8 +1941,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1965,6 +1960,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1981,8 +1977,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -2004,8 +1999,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2073,8 +2068,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -2092,6 +2087,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2108,8 +2104,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2119,6 +2114,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2135,8 +2131,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -2178,8 +2173,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -2197,6 +2192,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2213,8 +2209,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2224,6 +2219,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2240,8 +2236,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "body": { @@ -2285,6 +2280,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2308,6 +2304,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2324,8 +2321,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2335,6 +2331,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2351,8 +2348,7 @@ }, "kind": "string" } - }, - "optional": true + } }, { "type": "RestElement", @@ -2374,8 +2370,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2423,8 +2419,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2454,8 +2449,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -2504,8 +2499,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -2523,6 +2518,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2539,8 +2535,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "body": { @@ -2582,8 +2577,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -2601,6 +2596,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2617,8 +2613,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -2660,8 +2655,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -2679,6 +2674,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2695,8 +2691,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2706,6 +2701,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2722,8 +2718,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -2765,8 +2760,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -2784,6 +2779,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2800,8 +2796,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2811,6 +2806,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2827,8 +2823,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -2838,6 +2833,7 @@ "ctxt": 0 }, "value": "z", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2854,8 +2850,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "body": { @@ -2897,8 +2892,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -2916,6 +2911,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2932,8 +2928,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -2955,8 +2950,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -3024,8 +3019,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -3043,6 +3038,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3059,8 +3055,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -3070,6 +3065,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3086,8 +3082,7 @@ }, "kind": "string" } - }, - "optional": true + } }, { "type": "Identifier", @@ -3097,6 +3092,7 @@ "ctxt": 0 }, "value": "z", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3113,8 +3109,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "body": { @@ -3158,6 +3153,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3181,6 +3177,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3197,8 +3194,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -3208,6 +3204,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3224,8 +3221,7 @@ }, "kind": "string" } - }, - "optional": true + } }, { "type": "RestElement", @@ -3247,8 +3243,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -3296,8 +3292,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3327,8 +3322,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -3377,8 +3372,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -3396,6 +3391,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3412,8 +3408,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -3423,6 +3418,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3439,8 +3435,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "body": { @@ -3482,8 +3477,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -3501,6 +3496,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3517,8 +3513,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -3560,8 +3555,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -3579,6 +3574,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3595,8 +3591,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -3606,6 +3601,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3622,8 +3618,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "body": { @@ -3665,8 +3660,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -3684,6 +3679,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3700,8 +3696,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -3711,6 +3706,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3727,8 +3723,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "body": { @@ -3770,8 +3765,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -3789,6 +3784,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3805,8 +3801,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -3828,8 +3823,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures/input.ts.json index 6410bbf921ef..bbccb712030e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,6 +50,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -67,8 +67,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -118,6 +117,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -140,13 +140,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,6 +176,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -209,6 +208,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -225,8 +225,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -250,8 +249,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -281,8 +279,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -292,7 +290,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -320,8 +317,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -331,7 +328,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -351,7 +347,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -381,6 +376,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -397,8 +393,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -448,6 +443,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -470,13 +466,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -508,6 +502,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -539,6 +534,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -555,8 +551,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -580,8 +575,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -611,8 +605,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -622,7 +616,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -650,8 +643,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -661,7 +654,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -689,8 +681,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -700,7 +692,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -728,8 +719,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -739,7 +730,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -759,7 +749,6 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -789,6 +778,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -805,8 +795,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -856,6 +845,7 @@ "ctxt": 0 }, "value": "s2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -878,13 +868,11 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -916,6 +904,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -947,6 +936,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -963,8 +953,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -988,8 +977,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1019,8 +1007,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1030,7 +1018,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -1058,8 +1045,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1069,7 +1056,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } } @@ -1097,8 +1083,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1116,6 +1102,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1132,8 +1119,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -1175,8 +1161,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "FunctionExpression", @@ -1198,6 +1184,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1214,8 +1201,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1287,8 +1273,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1298,7 +1284,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -1326,8 +1311,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1337,7 +1322,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } } @@ -1365,8 +1349,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1384,6 +1368,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1400,8 +1385,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -1443,8 +1427,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "FunctionExpression", @@ -1466,6 +1450,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1482,8 +1467,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2/input.ts.json index 398e9e19c911..87ad61cddcf6 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -81,6 +79,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -97,8 +96,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -152,6 +150,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -174,13 +173,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -212,6 +209,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -243,7 +241,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -273,6 +270,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -289,8 +287,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -318,8 +315,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -349,8 +345,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -360,7 +356,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -388,8 +383,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -399,7 +394,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -419,7 +413,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -449,7 +442,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -479,6 +471,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -495,8 +488,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -550,6 +542,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -572,13 +565,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -610,6 +601,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -641,7 +633,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -671,6 +662,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -687,8 +679,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -716,8 +707,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -747,8 +737,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -758,7 +748,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -786,8 +775,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -797,7 +786,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -825,8 +813,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -836,7 +824,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -864,8 +851,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -875,7 +862,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -903,8 +889,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -953,8 +939,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "FunctionExpression", @@ -976,6 +962,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -992,8 +979,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1065,8 +1051,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1115,8 +1101,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "FunctionExpression", @@ -1138,6 +1124,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1154,8 +1141,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1219,7 +1205,6 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1249,7 +1234,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1263,6 +1247,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1279,8 +1264,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -1330,6 +1314,7 @@ "ctxt": 0 }, "value": "s2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1352,13 +1337,11 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1390,6 +1373,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1421,7 +1405,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1435,6 +1418,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1451,8 +1435,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -1476,8 +1459,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1507,8 +1489,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1518,7 +1500,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -1546,8 +1527,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1557,7 +1538,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } } @@ -1585,8 +1565,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1604,6 +1584,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1620,8 +1601,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -1663,8 +1643,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "FunctionExpression", @@ -1686,6 +1666,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1702,8 +1683,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1775,8 +1755,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1786,7 +1766,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -1814,8 +1793,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1825,7 +1804,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } } @@ -1853,8 +1831,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrowFunctionExpression", @@ -1872,6 +1850,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1888,8 +1867,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -1931,8 +1909,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "FunctionExpression", @@ -1954,6 +1932,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1970,8 +1949,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures3/input.ts.json index 666c93467c93..c665a6a081a3 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "OtherDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -284,7 +275,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": null, @@ -324,7 +314,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -357,6 +346,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -380,6 +370,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -396,8 +387,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -428,8 +418,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -461,6 +450,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -484,6 +474,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -500,8 +491,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -532,8 +522,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -565,6 +554,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -588,6 +578,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -604,8 +595,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -628,8 +618,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -661,6 +650,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -684,6 +674,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -700,8 +691,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -711,6 +701,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -727,8 +718,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -751,8 +741,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -784,6 +773,7 @@ "ctxt": 0 }, "value": "a5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -807,6 +797,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -830,6 +821,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -846,8 +838,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -869,8 +860,7 @@ } } } - }, - "optional": false + } } ], "typeParams": null, @@ -893,8 +883,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -926,6 +915,7 @@ "ctxt": 0 }, "value": "a6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -949,6 +939,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -972,6 +963,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -994,13 +986,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1026,15 +1016,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1060,7 +1048,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1068,8 +1055,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -1101,6 +1087,7 @@ "ctxt": 0 }, "value": "a7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1124,6 +1111,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1147,6 +1135,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1169,13 +1158,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1201,15 +1188,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1236,6 +1221,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1258,13 +1244,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1290,7 +1274,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1300,8 +1283,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -1333,6 +1315,7 @@ "ctxt": 0 }, "value": "a8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1356,6 +1339,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1379,6 +1363,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1401,13 +1386,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1433,15 +1416,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -1451,6 +1432,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1474,6 +1456,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1496,13 +1479,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1528,15 +1509,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1563,6 +1542,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1585,13 +1565,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1617,7 +1595,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1627,8 +1604,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -1660,6 +1636,7 @@ "ctxt": 0 }, "value": "a9", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1683,6 +1660,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1706,6 +1684,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1728,13 +1707,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1760,15 +1737,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -1778,6 +1753,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1801,6 +1777,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1823,13 +1800,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1855,15 +1830,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1890,6 +1863,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1912,13 +1886,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1944,7 +1916,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1954,8 +1925,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -1987,6 +1957,7 @@ "ctxt": 0 }, "value": "a10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2022,8 +1993,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2054,7 +2025,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2086,7 +2056,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2094,8 +2063,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -2127,6 +2095,7 @@ "ctxt": 0 }, "value": "a11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2150,6 +2119,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2181,7 +2151,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2209,8 +2178,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -2220,6 +2188,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2251,7 +2220,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2293,7 +2261,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2321,8 +2288,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -2348,7 +2314,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2356,8 +2321,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -2389,6 +2353,7 @@ "ctxt": 0 }, "value": "a12", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2412,6 +2377,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2434,7 +2400,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2460,7 +2425,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2468,8 +2432,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -2479,6 +2442,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2501,7 +2465,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2527,7 +2490,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2535,8 +2497,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -2562,7 +2523,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2588,7 +2548,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2599,8 +2558,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -2632,6 +2590,7 @@ "ctxt": 0 }, "value": "a13", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2655,6 +2614,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2677,7 +2637,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2703,7 +2662,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2711,8 +2669,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -2722,6 +2679,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2744,7 +2702,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2770,7 +2727,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2778,8 +2734,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -2805,7 +2760,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2831,7 +2785,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2842,8 +2795,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -2875,6 +2827,7 @@ "ctxt": 0 }, "value": "a14", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2898,6 +2851,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2929,7 +2883,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2971,7 +2924,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2999,8 +2951,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -3026,7 +2977,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3034,8 +2984,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -3067,6 +3016,7 @@ "ctxt": 0 }, "value": "a15", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3098,6 +3048,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3114,8 +3065,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3161,6 +3111,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3177,8 +3128,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3210,8 +3160,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3243,6 +3192,7 @@ "ctxt": 0 }, "value": "a16", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3274,6 +3224,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3296,13 +3247,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3353,7 +3302,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3371,7 +3319,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3397,6 +3344,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3419,13 +3367,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3476,7 +3422,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3494,7 +3439,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3506,8 +3450,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3539,6 +3482,7 @@ "ctxt": 0 }, "value": "a17", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3570,6 +3514,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3593,6 +3538,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3609,8 +3555,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -3633,8 +3578,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3680,6 +3624,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3703,6 +3648,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3719,8 +3665,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -3743,8 +3688,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3776,8 +3720,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3809,6 +3752,7 @@ "ctxt": 0 }, "value": "a18", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3840,6 +3784,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3871,6 +3816,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3887,8 +3833,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3926,6 +3871,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3942,8 +3888,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3967,8 +3912,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4014,6 +3958,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4045,6 +3990,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4061,8 +4007,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4100,6 +4045,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4122,13 +4068,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4153,7 +4097,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4163,8 +4106,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4196,8 +4138,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -4229,6 +4170,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4252,6 +4194,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4274,13 +4217,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4306,7 +4247,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4343,7 +4283,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4352,8 +4291,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -4383,8 +4321,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4394,7 +4332,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -4422,8 +4359,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4433,7 +4370,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4463,6 +4399,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4486,6 +4423,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4508,13 +4446,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4540,7 +4476,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4575,8 +4510,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -4606,8 +4540,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4617,7 +4551,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -4645,8 +4578,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4656,7 +4589,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -4686,6 +4618,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4709,6 +4642,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4731,13 +4665,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4763,7 +4695,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4793,7 +4724,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4801,8 +4731,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -4832,8 +4761,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4843,7 +4772,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } } @@ -4871,8 +4799,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4882,7 +4810,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } } @@ -4912,6 +4839,7 @@ "ctxt": 0 }, "value": "b4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4935,6 +4863,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4957,13 +4886,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -4973,6 +4900,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4995,13 +4923,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -5027,7 +4953,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5048,7 +4973,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5078,7 +5002,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5086,8 +5009,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -5117,8 +5039,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5128,7 +5050,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } } @@ -5156,8 +5077,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5167,7 +5088,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } } @@ -5197,6 +5117,7 @@ "ctxt": 0 }, "value": "b5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5220,6 +5141,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5243,6 +5165,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5265,13 +5188,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5297,15 +5218,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -5331,7 +5250,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5352,7 +5270,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5382,7 +5299,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5390,8 +5306,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -5421,8 +5336,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5432,7 +5347,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } } @@ -5460,8 +5374,8 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5471,7 +5385,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } } @@ -5501,6 +5414,7 @@ "ctxt": 0 }, "value": "b6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5524,6 +5438,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5547,6 +5462,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5569,13 +5485,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5601,15 +5515,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -5635,7 +5547,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5653,7 +5564,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5675,7 +5585,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5693,7 +5602,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5724,7 +5632,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5732,8 +5639,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -5763,8 +5669,8 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5774,7 +5680,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } } @@ -5802,8 +5707,8 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5813,7 +5718,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } } @@ -5843,6 +5747,7 @@ "ctxt": 0 }, "value": "b7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5866,6 +5771,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5889,6 +5795,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5911,13 +5818,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5943,15 +5848,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -5977,7 +5880,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5995,7 +5897,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6017,7 +5918,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6035,7 +5935,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6067,6 +5966,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6089,13 +5989,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6121,7 +6019,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6131,8 +6028,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -6162,8 +6058,8 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6173,7 +6069,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } } @@ -6201,8 +6096,8 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6212,7 +6107,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } } @@ -6242,6 +6136,7 @@ "ctxt": 0 }, "value": "b8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6265,6 +6160,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6288,6 +6184,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6310,13 +6207,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6342,15 +6237,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -6360,6 +6253,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6383,6 +6277,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6405,13 +6300,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6437,15 +6330,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -6471,7 +6362,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6489,7 +6379,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6511,7 +6400,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6529,7 +6417,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6561,6 +6448,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6583,13 +6471,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6615,7 +6501,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6625,8 +6510,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -6656,8 +6540,8 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6667,7 +6551,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false } } @@ -6695,8 +6578,8 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6706,7 +6589,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false } } @@ -6736,6 +6618,7 @@ "ctxt": 0 }, "value": "b9", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6759,6 +6642,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6782,6 +6666,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6804,13 +6689,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6836,15 +6719,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -6854,6 +6735,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6877,6 +6759,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6908,7 +6791,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6950,7 +6832,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6978,8 +6859,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -7005,15 +6885,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -7039,7 +6917,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7057,7 +6934,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7079,7 +6955,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7097,7 +6972,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7129,6 +7003,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7151,13 +7026,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -7183,7 +7056,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7193,8 +7065,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -7224,8 +7095,8 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -7235,7 +7106,6 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, "optional": false } } @@ -7263,8 +7133,8 @@ "ctxt": 0 }, "value": "b9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -7274,7 +7144,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false } } @@ -7304,6 +7173,7 @@ "ctxt": 0 }, "value": "b10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7339,8 +7209,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -7371,7 +7241,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7403,7 +7272,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7421,7 +7289,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7452,7 +7319,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7460,8 +7326,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -7491,8 +7356,8 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -7502,7 +7367,6 @@ "ctxt": 0 }, "value": "b10", - "typeAnnotation": null, "optional": false } } @@ -7530,8 +7394,8 @@ "ctxt": 0 }, "value": "b10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -7541,7 +7405,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false } } @@ -7571,6 +7434,7 @@ "ctxt": 0 }, "value": "b11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7594,6 +7458,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7616,13 +7481,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -7632,6 +7495,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7654,13 +7518,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -7686,7 +7548,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7704,7 +7565,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7735,7 +7595,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7743,8 +7602,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -7774,8 +7632,8 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -7785,7 +7643,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false } } @@ -7813,8 +7670,8 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -7824,7 +7681,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false } } @@ -7854,6 +7710,7 @@ "ctxt": 0 }, "value": "b12", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7877,6 +7734,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7899,7 +7757,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7925,7 +7782,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7933,8 +7789,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -7944,6 +7799,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7966,13 +7822,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -7998,7 +7852,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8016,7 +7869,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8042,7 +7894,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8076,7 +7927,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8102,7 +7952,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8113,8 +7962,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -8144,8 +7992,8 @@ "ctxt": 0 }, "value": "a12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -8155,7 +8003,6 @@ "ctxt": 0 }, "value": "b12", - "typeAnnotation": null, "optional": false } } @@ -8183,8 +8030,8 @@ "ctxt": 0 }, "value": "b12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -8194,7 +8041,6 @@ "ctxt": 0 }, "value": "a12", - "typeAnnotation": null, "optional": false } } @@ -8224,6 +8070,7 @@ "ctxt": 0 }, "value": "b13", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8247,6 +8094,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8269,7 +8117,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8295,7 +8142,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8303,8 +8149,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -8314,6 +8159,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8336,13 +8182,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -8368,7 +8212,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8386,7 +8229,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8412,7 +8254,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8446,7 +8287,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8454,8 +8294,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -8485,8 +8324,8 @@ "ctxt": 0 }, "value": "a13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -8496,7 +8335,6 @@ "ctxt": 0 }, "value": "b13", - "typeAnnotation": null, "optional": false } } @@ -8524,8 +8362,8 @@ "ctxt": 0 }, "value": "b13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -8535,7 +8373,6 @@ "ctxt": 0 }, "value": "a13", - "typeAnnotation": null, "optional": false } } @@ -8565,6 +8402,7 @@ "ctxt": 0 }, "value": "b14", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8588,6 +8426,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8619,7 +8458,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8648,7 +8486,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8672,7 +8509,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8701,7 +8537,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8711,8 +8546,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -8738,7 +8572,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8768,7 +8601,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8776,8 +8608,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -8807,8 +8638,8 @@ "ctxt": 0 }, "value": "a14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -8818,7 +8649,6 @@ "ctxt": 0 }, "value": "b14", - "typeAnnotation": null, "optional": false } } @@ -8846,8 +8676,8 @@ "ctxt": 0 }, "value": "b14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -8857,7 +8687,6 @@ "ctxt": 0 }, "value": "a14", - "typeAnnotation": null, "optional": false } } @@ -8887,6 +8716,7 @@ "ctxt": 0 }, "value": "b15", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8910,6 +8740,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8932,13 +8763,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -8964,7 +8793,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9001,7 +8829,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9010,8 +8837,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -9041,8 +8867,8 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -9052,7 +8878,6 @@ "ctxt": 0 }, "value": "b15", - "typeAnnotation": null, "optional": false } } @@ -9080,8 +8905,8 @@ "ctxt": 0 }, "value": "b15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -9091,7 +8916,6 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, "optional": false } } @@ -9121,6 +8945,7 @@ "ctxt": 0 }, "value": "b16", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9144,6 +8969,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9166,13 +8992,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -9198,7 +9022,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9216,7 +9039,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9252,8 +9074,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -9283,8 +9104,8 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -9294,7 +9115,6 @@ "ctxt": 0 }, "value": "b16", - "typeAnnotation": null, "optional": false } } @@ -9322,8 +9142,8 @@ "ctxt": 0 }, "value": "b16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -9333,7 +9153,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false } } @@ -9363,6 +9182,7 @@ "ctxt": 0 }, "value": "b17", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9386,6 +9206,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9409,6 +9230,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9431,13 +9253,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -9463,7 +9283,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9471,8 +9290,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": { @@ -9498,7 +9316,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9535,7 +9352,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9544,8 +9360,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -9575,8 +9390,8 @@ "ctxt": 0 }, "value": "a17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -9586,7 +9401,6 @@ "ctxt": 0 }, "value": "b17", - "typeAnnotation": null, "optional": false } } @@ -9614,8 +9428,8 @@ "ctxt": 0 }, "value": "b17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -9625,7 +9439,6 @@ "ctxt": 0 }, "value": "a17", - "typeAnnotation": null, "optional": false } } @@ -9655,6 +9468,7 @@ "ctxt": 0 }, "value": "b18", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9678,6 +9492,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9701,6 +9516,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9723,13 +9539,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -9755,7 +9569,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9763,8 +9576,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": { @@ -9790,7 +9602,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9827,7 +9638,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9836,8 +9646,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -9867,8 +9676,8 @@ "ctxt": 0 }, "value": "a18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -9878,7 +9687,6 @@ "ctxt": 0 }, "value": "b18", - "typeAnnotation": null, "optional": false } } @@ -9906,8 +9714,8 @@ "ctxt": 0 }, "value": "b18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -9917,7 +9725,6 @@ "ctxt": 0 }, "value": "a18", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4/input.ts.json index 09c06074c1d2..f33627866db1 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Errors", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -118,7 +115,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -144,7 +140,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -202,7 +196,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -228,7 +221,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -268,7 +260,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -286,7 +277,6 @@ "ctxt": 0 }, "value": "OtherDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -312,7 +302,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": null, @@ -352,7 +341,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -377,7 +365,6 @@ "ctxt": 0 }, "value": "WithNonGenericSignaturesInBaseType", - "typeAnnotation": null, "optional": false }, "body": { @@ -413,6 +400,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -436,6 +424,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -452,8 +441,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -484,8 +472,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -517,6 +504,7 @@ "ctxt": 0 }, "value": "a7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -540,6 +528,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -563,6 +552,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -585,13 +575,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -617,15 +605,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -652,6 +638,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -674,13 +661,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -706,7 +691,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -716,8 +700,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -749,6 +732,7 @@ "ctxt": 0 }, "value": "a8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -772,6 +756,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -795,6 +780,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -817,13 +803,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -849,15 +833,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -867,6 +849,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -890,6 +873,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -912,13 +896,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -944,15 +926,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -979,6 +959,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1001,13 +982,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1033,7 +1012,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1043,8 +1021,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -1076,6 +1053,7 @@ "ctxt": 0 }, "value": "a10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1111,8 +1089,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1143,7 +1121,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1175,7 +1152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1183,8 +1159,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -1216,6 +1191,7 @@ "ctxt": 0 }, "value": "a11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1239,6 +1215,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1270,7 +1247,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1298,8 +1274,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -1309,6 +1284,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1340,7 +1316,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1382,7 +1357,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1410,8 +1384,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -1437,7 +1410,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1445,8 +1417,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -1478,6 +1449,7 @@ "ctxt": 0 }, "value": "a12", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1501,6 +1473,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1523,7 +1496,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1549,7 +1521,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1557,8 +1528,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -1568,6 +1538,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1590,7 +1561,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1616,7 +1586,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1624,8 +1593,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -1651,7 +1619,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1677,7 +1644,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1688,8 +1654,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -1721,6 +1686,7 @@ "ctxt": 0 }, "value": "a14", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1752,6 +1718,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1768,8 +1735,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1815,6 +1781,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1831,8 +1798,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1864,8 +1830,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1897,6 +1862,7 @@ "ctxt": 0 }, "value": "a15", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1920,6 +1886,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1951,7 +1918,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1993,7 +1959,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2021,8 +1986,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -2045,8 +2009,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -2078,6 +2041,7 @@ "ctxt": 0 }, "value": "a16", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2109,6 +2073,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2140,6 +2105,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2156,8 +2122,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2195,6 +2160,7 @@ "ctxt": 0 }, "value": "a", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2211,8 +2177,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -2236,8 +2201,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2283,6 +2247,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2314,6 +2279,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2330,8 +2296,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2369,6 +2334,7 @@ "ctxt": 0 }, "value": "a", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2385,8 +2351,7 @@ }, "kind": "boolean" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -2410,8 +2375,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2443,8 +2407,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2476,6 +2439,7 @@ "ctxt": 0 }, "value": "a17", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2507,6 +2471,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2538,6 +2503,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2560,13 +2526,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2591,7 +2555,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2620,7 +2583,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2638,7 +2600,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2664,6 +2625,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2686,13 +2648,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2717,7 +2677,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2746,7 +2705,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2764,7 +2722,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2776,8 +2733,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2823,6 +2779,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2854,6 +2811,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2876,13 +2834,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2907,7 +2863,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2936,7 +2891,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2954,7 +2908,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2980,6 +2933,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3002,13 +2956,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3033,7 +2985,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3062,7 +3013,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3080,7 +3030,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3092,8 +3041,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3125,8 +3073,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3158,6 +3105,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3181,6 +3129,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3203,13 +3152,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3235,7 +3182,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3256,7 +3202,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3293,7 +3238,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3302,8 +3246,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -3333,8 +3276,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3344,7 +3287,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -3372,8 +3314,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3383,7 +3325,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -3413,6 +3354,7 @@ "ctxt": 0 }, "value": "b7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3436,6 +3378,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3459,6 +3402,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3481,13 +3425,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3513,15 +3455,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -3547,7 +3487,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3565,7 +3504,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3587,7 +3525,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3605,7 +3542,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3627,7 +3563,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3645,7 +3580,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3677,6 +3611,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3699,13 +3634,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3731,7 +3664,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3741,8 +3673,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -3772,8 +3703,8 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3783,7 +3714,6 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, "optional": false } } @@ -3811,8 +3741,8 @@ "ctxt": 0 }, "value": "b7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3822,7 +3752,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false } } @@ -3852,6 +3781,7 @@ "ctxt": 0 }, "value": "b8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3875,6 +3805,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3898,6 +3829,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3920,13 +3852,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3952,15 +3882,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -3970,6 +3898,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3993,6 +3922,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4024,7 +3954,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4052,8 +3981,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -4079,15 +4007,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -4113,7 +4039,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4131,7 +4056,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4153,7 +4077,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4171,7 +4094,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4203,6 +4125,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4225,13 +4148,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4257,7 +4178,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4267,8 +4187,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -4298,8 +4217,8 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4309,7 +4228,6 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, "optional": false } } @@ -4337,8 +4255,8 @@ "ctxt": 0 }, "value": "b8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4348,7 +4266,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false } } @@ -4378,6 +4295,7 @@ "ctxt": 0 }, "value": "b10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4413,8 +4331,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -4445,7 +4363,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4477,7 +4394,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4495,7 +4411,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4526,7 +4441,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4534,8 +4448,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -4565,8 +4478,8 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4576,7 +4489,6 @@ "ctxt": 0 }, "value": "b10", - "typeAnnotation": null, "optional": false } } @@ -4604,8 +4516,8 @@ "ctxt": 0 }, "value": "b10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4615,7 +4527,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false } } @@ -4645,6 +4556,7 @@ "ctxt": 0 }, "value": "b11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4668,6 +4580,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4690,13 +4603,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -4706,6 +4617,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4728,13 +4640,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4760,7 +4670,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4778,7 +4687,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4809,7 +4717,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4817,8 +4724,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -4848,8 +4754,8 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4859,7 +4765,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false } } @@ -4887,8 +4792,8 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4898,7 +4803,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false } } @@ -4928,6 +4832,7 @@ "ctxt": 0 }, "value": "b12", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4951,6 +4856,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4973,7 +4879,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4999,7 +4904,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5007,8 +4911,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -5018,6 +4921,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5040,7 +4944,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5066,7 +4969,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5074,8 +4976,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": { @@ -5101,7 +5002,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5119,7 +5019,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5145,7 +5044,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5179,7 +5077,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5187,8 +5084,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -5218,8 +5114,8 @@ "ctxt": 0 }, "value": "a12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5229,7 +5125,6 @@ "ctxt": 0 }, "value": "b12", - "typeAnnotation": null, "optional": false } } @@ -5257,8 +5152,8 @@ "ctxt": 0 }, "value": "b12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5268,7 +5163,6 @@ "ctxt": 0 }, "value": "a12", - "typeAnnotation": null, "optional": false } } @@ -5298,6 +5192,7 @@ "ctxt": 0 }, "value": "b15", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5321,6 +5216,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5352,7 +5248,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5381,7 +5276,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5405,7 +5299,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5434,7 +5327,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5444,8 +5336,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -5471,7 +5362,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5501,7 +5391,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5509,8 +5398,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -5540,8 +5428,8 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5551,7 +5439,6 @@ "ctxt": 0 }, "value": "b15", - "typeAnnotation": null, "optional": false } } @@ -5579,8 +5466,8 @@ "ctxt": 0 }, "value": "b15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5590,7 +5477,6 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, "optional": false } } @@ -5620,6 +5506,7 @@ "ctxt": 0 }, "value": "b15a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5643,6 +5530,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5674,7 +5562,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5703,7 +5590,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5727,7 +5613,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5756,7 +5641,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5766,8 +5650,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -5793,7 +5676,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5811,7 +5693,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5839,8 +5720,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -5870,8 +5750,8 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5881,7 +5761,6 @@ "ctxt": 0 }, "value": "b15a", - "typeAnnotation": null, "optional": false } } @@ -5909,8 +5788,8 @@ "ctxt": 0 }, "value": "b15a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5920,7 +5799,6 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, "optional": false } } @@ -5950,6 +5828,7 @@ "ctxt": 0 }, "value": "b16", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5973,6 +5852,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5996,6 +5876,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6018,13 +5899,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6050,15 +5929,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -6084,7 +5961,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6121,7 +5997,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6130,8 +6005,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -6161,8 +6035,8 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6172,7 +6046,6 @@ "ctxt": 0 }, "value": "b16", - "typeAnnotation": null, "optional": false } } @@ -6200,8 +6073,8 @@ "ctxt": 0 }, "value": "b16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6211,7 +6084,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false } } @@ -6241,6 +6113,7 @@ "ctxt": 0 }, "value": "b17", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6264,6 +6137,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6287,6 +6161,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6309,13 +6184,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6341,15 +6214,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -6375,7 +6246,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6410,8 +6280,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -6441,8 +6310,8 @@ "ctxt": 0 }, "value": "a17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6452,7 +6321,6 @@ "ctxt": 0 }, "value": "b17", - "typeAnnotation": null, "optional": false } } @@ -6480,8 +6348,8 @@ "ctxt": 0 }, "value": "b17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6491,7 +6359,6 @@ "ctxt": 0 }, "value": "a17", - "typeAnnotation": null, "optional": false } } @@ -6516,7 +6383,6 @@ "ctxt": 0 }, "value": "WithGenericSignaturesInBaseType", - "typeAnnotation": null, "optional": false }, "body": { @@ -6552,6 +6418,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6575,6 +6442,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6597,13 +6465,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6629,7 +6495,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6666,7 +6531,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6675,8 +6539,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -6708,6 +6571,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6731,6 +6595,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6753,13 +6618,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6785,7 +6648,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6820,8 +6682,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -6851,8 +6712,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6862,7 +6723,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -6890,8 +6750,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6901,7 +6761,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -6931,6 +6790,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6954,6 +6814,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6976,13 +6837,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -7008,7 +6867,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7043,8 +6901,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -7076,6 +6933,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7099,6 +6957,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7121,13 +6980,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -7153,7 +7010,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7190,7 +7046,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7199,8 +7054,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -7230,8 +7084,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -7241,7 +7095,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } } @@ -7269,8 +7122,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -7280,7 +7133,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures5/input.ts.json index 3e6c5136af02..56a748eb4b56 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "OtherDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -284,7 +275,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": null, @@ -324,7 +314,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -357,6 +346,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -380,6 +370,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -402,13 +393,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -434,7 +423,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -471,7 +459,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -480,8 +467,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -513,6 +499,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -536,6 +523,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -558,13 +546,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -590,7 +576,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -625,8 +610,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -658,6 +642,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -681,6 +666,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -703,13 +689,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -735,7 +719,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -762,8 +745,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -795,6 +777,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -818,6 +801,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -840,13 +824,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -856,6 +838,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -878,13 +861,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -910,7 +891,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -931,7 +911,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -958,8 +937,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -991,6 +969,7 @@ "ctxt": 0 }, "value": "a5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1014,6 +993,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1037,6 +1017,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1059,13 +1040,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1091,7 +1070,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1099,8 +1077,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": { @@ -1126,7 +1103,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1147,7 +1123,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1177,7 +1152,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1185,8 +1159,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -1218,6 +1191,7 @@ "ctxt": 0 }, "value": "a6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1241,6 +1215,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1264,6 +1239,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1286,13 +1262,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1318,7 +1292,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1326,8 +1299,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": { @@ -1353,7 +1325,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1371,7 +1342,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1402,7 +1372,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1410,8 +1379,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -1443,6 +1411,7 @@ "ctxt": 0 }, "value": "a11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1466,6 +1435,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1497,7 +1467,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1526,7 +1495,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1536,8 +1504,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -1547,6 +1514,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1578,7 +1546,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1607,7 +1574,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1631,7 +1597,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1660,7 +1625,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1670,8 +1634,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -1697,7 +1660,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1727,7 +1689,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1735,8 +1696,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -1768,6 +1728,7 @@ "ctxt": 0 }, "value": "a15", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1791,6 +1752,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1822,7 +1784,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1851,7 +1812,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1875,7 +1835,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1904,7 +1863,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1914,8 +1872,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -1941,7 +1898,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1978,7 +1934,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1987,8 +1942,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -2020,6 +1974,7 @@ "ctxt": 0 }, "value": "a16", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2043,6 +1998,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2074,7 +2030,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2103,7 +2058,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2127,7 +2081,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2156,7 +2109,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2166,8 +2118,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -2193,7 +2144,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2211,7 +2161,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2249,7 +2198,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2258,8 +2206,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -2291,6 +2238,7 @@ "ctxt": 0 }, "value": "a17", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2322,6 +2270,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2345,6 +2294,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2367,13 +2317,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2399,7 +2347,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2407,8 +2354,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2440,7 +2386,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2470,7 +2415,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2488,7 +2432,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2514,6 +2457,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2537,6 +2481,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2559,13 +2504,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2591,7 +2534,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2599,8 +2541,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2632,7 +2573,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2662,7 +2602,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2680,7 +2619,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2692,8 +2630,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2725,6 +2662,7 @@ "ctxt": 0 }, "value": "a18", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2756,6 +2694,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2787,6 +2726,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2809,13 +2749,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2840,7 +2778,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2869,7 +2806,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2887,7 +2823,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2913,6 +2848,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2935,13 +2871,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2966,7 +2900,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2995,7 +2928,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3013,7 +2945,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3025,8 +2956,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3072,6 +3002,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3103,6 +3034,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3125,13 +3057,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3156,7 +3086,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3185,7 +3114,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3203,7 +3131,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3229,6 +3156,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3251,13 +3179,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3282,7 +3208,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3311,7 +3236,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3329,7 +3253,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3341,8 +3264,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3374,8 +3296,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3407,6 +3328,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3430,6 +3352,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3452,13 +3375,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3484,7 +3405,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3521,7 +3441,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3530,8 +3449,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -3561,8 +3479,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3572,7 +3490,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -3600,8 +3517,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3611,7 +3528,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3641,6 +3557,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3664,6 +3581,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3686,13 +3604,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3718,7 +3634,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3753,8 +3668,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -3784,8 +3698,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3795,7 +3709,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -3823,8 +3736,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3834,7 +3747,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -3864,6 +3776,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3887,6 +3800,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3909,13 +3823,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3941,7 +3853,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3971,7 +3882,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3979,8 +3889,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -4010,8 +3919,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4021,7 +3930,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } } @@ -4049,8 +3957,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4060,7 +3968,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } } @@ -4090,6 +3997,7 @@ "ctxt": 0 }, "value": "b4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4113,6 +4021,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4135,13 +4044,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -4151,6 +4058,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4173,13 +4081,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4205,7 +4111,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4226,7 +4131,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4253,8 +4157,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -4284,8 +4187,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4295,7 +4198,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } } @@ -4323,8 +4225,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4334,7 +4236,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false } } @@ -4364,6 +4265,7 @@ "ctxt": 0 }, "value": "b5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4387,6 +4289,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4410,6 +4313,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4432,13 +4336,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4464,7 +4366,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4472,8 +4373,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": { @@ -4499,7 +4399,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4520,7 +4419,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4550,7 +4448,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4558,8 +4455,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -4589,8 +4485,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4600,7 +4496,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } } @@ -4628,8 +4523,8 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4639,7 +4534,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false } } @@ -4669,6 +4563,7 @@ "ctxt": 0 }, "value": "b6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4692,6 +4587,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4715,6 +4611,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4737,13 +4634,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4769,7 +4664,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4777,8 +4671,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": { @@ -4804,7 +4697,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4822,7 +4714,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4844,7 +4735,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4862,7 +4752,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4893,7 +4782,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4901,8 +4789,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -4932,8 +4819,8 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4943,7 +4830,6 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, "optional": false } } @@ -4971,8 +4857,8 @@ "ctxt": 0 }, "value": "b6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4982,7 +4868,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false } } @@ -5012,6 +4897,7 @@ "ctxt": 0 }, "value": "b11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5035,6 +4921,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5066,7 +4953,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5095,7 +4981,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5105,8 +4990,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -5116,6 +5000,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5147,7 +5032,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5176,7 +5060,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5200,7 +5083,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5229,7 +5111,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5239,8 +5120,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -5266,7 +5146,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5287,7 +5166,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5317,7 +5195,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5325,8 +5202,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -5356,8 +5232,8 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5367,7 +5243,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false } } @@ -5395,8 +5270,8 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5406,7 +5281,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false } } @@ -5436,6 +5310,7 @@ "ctxt": 0 }, "value": "b15", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5459,6 +5334,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5490,7 +5366,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5519,7 +5394,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5543,7 +5417,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5572,7 +5445,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5582,8 +5454,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -5609,7 +5480,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5630,7 +5500,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5667,7 +5536,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5676,8 +5544,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -5707,8 +5574,8 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5718,7 +5585,6 @@ "ctxt": 0 }, "value": "b15", - "typeAnnotation": null, "optional": false } } @@ -5746,8 +5612,8 @@ "ctxt": 0 }, "value": "b15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5757,7 +5623,6 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, "optional": false } } @@ -5787,6 +5652,7 @@ "ctxt": 0 }, "value": "b16", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5810,6 +5676,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5841,7 +5708,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5870,7 +5736,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5894,7 +5759,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5923,7 +5787,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5933,8 +5796,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -5960,7 +5822,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5997,7 +5858,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6006,8 +5866,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -6037,8 +5896,8 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6048,7 +5907,6 @@ "ctxt": 0 }, "value": "b16", - "typeAnnotation": null, "optional": false } } @@ -6076,8 +5934,8 @@ "ctxt": 0 }, "value": "b15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6087,7 +5945,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false } } @@ -6117,6 +5974,7 @@ "ctxt": 0 }, "value": "b17", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6140,6 +5998,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6163,6 +6022,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6185,13 +6045,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6217,7 +6075,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6225,8 +6082,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": { @@ -6252,7 +6108,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6289,7 +6144,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6298,8 +6152,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -6329,8 +6182,8 @@ "ctxt": 0 }, "value": "a17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6340,7 +6193,6 @@ "ctxt": 0 }, "value": "b17", - "typeAnnotation": null, "optional": false } } @@ -6368,8 +6220,8 @@ "ctxt": 0 }, "value": "b17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6379,7 +6231,6 @@ "ctxt": 0 }, "value": "a17", - "typeAnnotation": null, "optional": false } } @@ -6409,6 +6260,7 @@ "ctxt": 0 }, "value": "b18", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6432,6 +6284,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6455,6 +6308,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6477,13 +6331,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6509,7 +6361,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6539,7 +6390,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6547,8 +6397,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": null, @@ -6579,8 +6428,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -6610,8 +6458,8 @@ "ctxt": 0 }, "value": "a18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6621,7 +6469,6 @@ "ctxt": 0 }, "value": "b18", - "typeAnnotation": null, "optional": false } } @@ -6649,8 +6496,8 @@ "ctxt": 0 }, "value": "b18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6660,7 +6507,6 @@ "ctxt": 0 }, "value": "a18", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures6/input.ts.json index 46e53d852c6a..e5d16599d41f 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "OtherDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -284,7 +275,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": null, @@ -324,7 +314,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -347,7 +336,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -377,7 +365,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -407,6 +394,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -429,13 +417,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -461,7 +447,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -498,7 +483,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -526,7 +510,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -556,6 +539,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -578,13 +562,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -610,7 +592,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -664,7 +645,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -694,6 +674,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -716,13 +697,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -748,7 +727,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -794,7 +772,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -824,6 +801,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -846,13 +824,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -862,6 +838,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -884,13 +861,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -916,7 +891,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -937,7 +911,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -983,7 +956,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1013,6 +985,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1036,6 +1009,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1058,13 +1032,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1090,15 +1062,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -1124,7 +1094,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1145,7 +1114,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1175,7 +1143,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1202,7 +1169,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1232,6 +1198,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1255,6 +1222,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1277,13 +1245,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1309,15 +1275,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -1343,7 +1307,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1361,7 +1324,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1392,7 +1354,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1419,7 +1380,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1449,6 +1409,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1480,7 +1441,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1509,7 +1469,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1519,8 +1478,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -1530,6 +1488,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1561,7 +1520,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1590,7 +1548,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1614,7 +1571,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1643,7 +1599,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1653,8 +1608,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -1680,7 +1634,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1710,7 +1663,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1737,7 +1689,6 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1767,6 +1718,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1798,7 +1750,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1827,7 +1778,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1851,7 +1801,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1880,7 +1829,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1890,8 +1838,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -1917,7 +1864,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1954,7 +1900,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1982,7 +1927,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2012,6 +1956,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2043,7 +1988,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2072,7 +2016,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2096,7 +2039,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2125,7 +2067,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2135,8 +2076,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -2162,7 +2102,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2180,7 +2119,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2218,7 +2156,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2258,6 +2195,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2280,13 +2218,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2318,6 +2254,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2341,6 +2278,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2363,13 +2301,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -2395,7 +2331,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2432,7 +2367,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2441,8 +2375,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -2479,7 +2412,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2490,7 +2422,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2503,7 +2434,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2531,8 +2461,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2549,7 +2479,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2560,7 +2489,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2592,6 +2520,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2615,6 +2544,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2637,13 +2567,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -2669,7 +2597,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2704,8 +2631,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -2742,7 +2668,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2753,7 +2678,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2766,7 +2690,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -2794,8 +2717,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2812,7 +2735,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2823,7 +2745,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2855,6 +2776,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2878,6 +2800,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2900,13 +2823,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -2932,7 +2853,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2962,7 +2882,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2970,8 +2889,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -3008,7 +2926,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3019,7 +2936,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3032,7 +2948,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } } @@ -3060,8 +2975,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -3078,7 +2993,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3089,7 +3003,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3121,6 +3034,7 @@ "ctxt": 0 }, "value": "b4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3144,6 +3058,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3166,13 +3081,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -3182,6 +3095,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3204,13 +3118,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3236,7 +3148,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3257,7 +3168,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3284,8 +3194,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -3322,7 +3231,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3333,7 +3241,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3346,7 +3253,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } } @@ -3374,8 +3280,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -3392,7 +3298,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3403,7 +3308,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3435,6 +3339,7 @@ "ctxt": 0 }, "value": "b5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3458,6 +3363,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3481,6 +3387,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3503,13 +3410,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3535,15 +3440,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -3569,7 +3472,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3590,7 +3492,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3620,7 +3521,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3628,8 +3528,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -3666,7 +3565,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3677,7 +3575,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3690,7 +3587,6 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, "optional": false } } @@ -3718,8 +3614,8 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -3736,7 +3632,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -3747,7 +3642,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3779,6 +3673,7 @@ "ctxt": 0 }, "value": "b11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3802,6 +3697,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3833,7 +3729,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3862,7 +3757,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3872,8 +3766,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -3883,6 +3776,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3914,7 +3808,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3943,7 +3836,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3967,7 +3859,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3996,7 +3887,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4006,8 +3896,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -4033,7 +3922,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4054,7 +3942,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4084,7 +3971,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4092,8 +3978,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -4130,7 +4015,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4141,7 +4025,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4154,7 +4037,6 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, "optional": false } } @@ -4182,8 +4064,8 @@ "ctxt": 0 }, "value": "b11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -4200,7 +4082,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4211,7 +4092,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4243,6 +4123,7 @@ "ctxt": 0 }, "value": "b16", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4266,6 +4147,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4297,7 +4179,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4326,7 +4207,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4350,7 +4230,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4379,7 +4258,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4389,8 +4267,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -4416,7 +4293,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4453,7 +4329,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4462,8 +4337,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -4500,7 +4374,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4511,7 +4384,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4524,7 +4396,6 @@ "ctxt": 0 }, "value": "b16", - "typeAnnotation": null, "optional": false } } @@ -4552,8 +4423,8 @@ "ctxt": 0 }, "value": "b16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -4570,7 +4441,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -4581,7 +4451,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignaturesWithOptionalParameters/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignaturesWithOptionalParameters/input.ts.json index 57420edac80e..9748c0799d4a 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignaturesWithOptionalParameters/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignaturesWithOptionalParameters/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -112,7 +110,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -142,6 +139,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -158,8 +156,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -201,7 +198,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -231,6 +227,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -247,8 +244,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -290,7 +286,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -320,6 +315,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -336,8 +332,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -347,6 +342,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -363,8 +359,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -406,7 +401,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -436,6 +430,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -452,8 +447,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -463,6 +457,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -479,8 +474,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -522,7 +516,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -552,6 +545,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -568,8 +562,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -579,6 +572,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -595,8 +589,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -650,6 +643,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -672,13 +666,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -710,6 +702,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -745,8 +738,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -776,8 +768,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -794,7 +786,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -805,7 +796,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -835,8 +825,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -853,7 +843,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -864,7 +853,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -894,8 +882,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -912,7 +900,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -923,7 +910,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -953,8 +939,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -971,7 +957,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -982,7 +967,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1012,8 +996,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1030,7 +1014,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1041,7 +1024,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1071,8 +1053,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1089,7 +1071,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1100,7 +1081,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1132,6 +1112,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1155,6 +1136,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1171,8 +1153,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -1195,8 +1176,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -1226,8 +1206,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1244,7 +1224,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1255,7 +1234,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1285,8 +1263,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1303,7 +1281,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1314,7 +1291,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1344,8 +1320,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1362,7 +1338,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1373,7 +1348,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1403,8 +1377,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1421,7 +1395,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1432,7 +1405,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1462,8 +1434,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1480,7 +1452,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1491,7 +1462,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1521,8 +1491,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1539,7 +1509,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1550,7 +1519,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1582,6 +1550,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1605,6 +1574,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1621,8 +1591,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1645,8 +1614,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -1676,8 +1644,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1694,7 +1662,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1705,7 +1672,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1735,8 +1701,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1753,7 +1719,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1764,7 +1729,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1794,8 +1758,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1812,7 +1776,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1823,7 +1786,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1853,8 +1815,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1871,7 +1833,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1882,7 +1843,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1912,8 +1872,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1930,7 +1890,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1941,7 +1900,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1971,8 +1929,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1989,7 +1947,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2000,7 +1957,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2032,6 +1988,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2055,6 +2012,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2071,8 +2029,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2082,6 +2039,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2098,8 +2056,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -2122,8 +2079,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -2153,8 +2109,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2171,7 +2127,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2182,7 +2137,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2212,8 +2166,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2230,7 +2184,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2241,7 +2194,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2271,8 +2223,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2289,7 +2241,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2300,7 +2251,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2330,8 +2280,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2348,7 +2298,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2359,7 +2308,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2389,8 +2337,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2407,7 +2355,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2418,7 +2365,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2448,8 +2394,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2466,7 +2412,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2477,7 +2422,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2509,6 +2453,7 @@ "ctxt": 0 }, "value": "a5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2532,6 +2477,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2548,8 +2494,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -2559,6 +2504,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2575,8 +2521,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -2599,8 +2544,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -2630,8 +2574,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2648,7 +2592,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2659,7 +2602,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2689,8 +2631,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2707,7 +2649,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2718,7 +2659,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2748,8 +2688,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2766,7 +2706,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2777,7 +2716,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2807,8 +2745,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2825,7 +2763,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2836,7 +2773,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2866,8 +2802,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2884,7 +2820,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2895,7 +2830,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2925,8 +2859,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -2943,7 +2877,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -2954,7 +2887,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithDiscriminatedUnion/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithDiscriminatedUnion/input.ts.json index ee47e028a9c4..6669ec1cad8d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithDiscriminatedUnion/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithDiscriminatedUnion/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Example1", - "typeAnnotation": null, "optional": false }, "body": { @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -78,7 +76,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -120,7 +117,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -165,7 +161,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -201,7 +196,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -251,7 +245,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -303,7 +296,6 @@ "ctxt": 0 }, "value": "done", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -353,7 +345,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -409,6 +400,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -431,13 +423,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -469,6 +459,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -491,13 +482,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -527,8 +516,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -538,7 +527,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -563,7 +551,6 @@ "ctxt": 0 }, "value": "Example2", - "typeAnnotation": null, "optional": false }, "body": { @@ -590,7 +577,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -618,7 +604,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -695,7 +680,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -748,7 +732,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -784,7 +767,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -834,7 +816,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -921,7 +902,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -971,7 +951,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1031,7 +1010,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1081,7 +1059,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1172,6 +1149,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1194,13 +1172,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1232,6 +1208,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1254,13 +1231,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1290,8 +1265,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1301,7 +1276,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -1326,7 +1300,6 @@ "ctxt": 0 }, "value": "Example3", - "typeAnnotation": null, "optional": false }, "body": { @@ -1353,7 +1326,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1381,7 +1353,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1458,7 +1429,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1511,7 +1481,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1547,7 +1516,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1597,7 +1565,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1684,7 +1651,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1734,7 +1700,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1821,7 +1786,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1871,7 +1835,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1935,6 +1898,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1957,13 +1921,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1995,6 +1957,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2017,13 +1980,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2053,8 +2014,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2064,7 +2025,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -2089,7 +2049,6 @@ "ctxt": 0 }, "value": "Example4", - "typeAnnotation": null, "optional": false }, "body": { @@ -2116,7 +2075,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2144,7 +2102,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2221,7 +2178,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2274,7 +2230,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2310,7 +2265,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2360,7 +2314,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2447,7 +2400,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2497,7 +2449,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2557,7 +2508,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2607,7 +2557,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2684,7 +2633,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2740,6 +2688,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2762,13 +2711,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2800,6 +2747,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2822,13 +2770,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2858,8 +2804,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2869,7 +2815,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -2894,7 +2839,6 @@ "ctxt": 0 }, "value": "Example5", - "typeAnnotation": null, "optional": false }, "body": { @@ -2921,7 +2865,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3003,7 +2946,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3031,7 +2973,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3060,7 +3001,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3084,7 +3024,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3113,7 +3052,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3137,7 +3075,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3166,7 +3103,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3193,7 +3129,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3229,7 +3164,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3279,7 +3213,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3308,7 +3241,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3332,7 +3264,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3361,7 +3292,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3395,7 +3325,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3445,7 +3374,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3474,7 +3402,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3498,7 +3425,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3527,7 +3453,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3561,7 +3486,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3611,7 +3535,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3640,7 +3563,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3664,7 +3586,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3693,7 +3614,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3727,7 +3647,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3756,7 +3675,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3780,7 +3698,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3830,7 +3747,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3859,7 +3775,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3893,7 +3808,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3922,7 +3836,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3946,7 +3859,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3996,7 +3908,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4025,7 +3936,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4059,7 +3969,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4088,7 +3997,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4112,7 +4020,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4162,7 +4069,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4191,7 +4097,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4225,7 +4130,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4254,7 +4158,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4278,7 +4181,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4307,7 +4209,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4331,7 +4232,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4391,7 +4291,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4420,7 +4319,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4444,7 +4342,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4473,7 +4370,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4497,7 +4393,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4557,7 +4452,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4586,7 +4480,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4610,7 +4503,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4639,7 +4531,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4663,7 +4554,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4727,6 +4617,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4749,13 +4640,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -4787,6 +4676,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4809,13 +4699,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -4845,8 +4733,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -4856,7 +4744,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -4881,7 +4768,6 @@ "ctxt": 0 }, "value": "GH14865", - "typeAnnotation": null, "optional": false }, "body": { @@ -4908,7 +4794,6 @@ "ctxt": 0 }, "value": "Style1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -4944,7 +4829,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4999,7 +4883,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5051,7 +4934,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5106,7 +4988,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5153,7 +5034,6 @@ "ctxt": 0 }, "value": "Style2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -5181,7 +5061,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5268,7 +5147,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5322,6 +5200,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5344,13 +5223,11 @@ "ctxt": 0 }, "value": "Style2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -5370,7 +5247,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "value": { @@ -5398,7 +5274,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "value": { @@ -5447,6 +5322,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5469,13 +5345,11 @@ "ctxt": 0 }, "value": "Style1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -5504,7 +5378,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -5515,7 +5388,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5543,7 +5415,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -5554,7 +5425,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5583,8 +5453,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -5594,7 +5464,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -5619,7 +5488,6 @@ "ctxt": 0 }, "value": "GH30170", - "typeAnnotation": null, "optional": false }, "body": { @@ -5645,7 +5513,6 @@ "ctxt": 0 }, "value": "Blue", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5675,7 +5542,6 @@ "ctxt": 0 }, "value": "color", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5732,7 +5598,6 @@ "ctxt": 0 }, "value": "Yellow", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5762,7 +5627,6 @@ "ctxt": 0 }, "value": "color", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5814,7 +5678,6 @@ "ctxt": 0 }, "value": "draw", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5835,6 +5698,7 @@ "ctxt": 0 }, "value": "val", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5865,7 +5729,6 @@ "ctxt": 0 }, "value": "Blue", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5885,15 +5748,13 @@ "ctxt": 0 }, "value": "Yellow", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -5927,7 +5788,6 @@ "ctxt": 0 }, "value": "drawWithColor", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5948,6 +5808,7 @@ "ctxt": 0 }, "value": "currentColor", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6018,8 +5879,7 @@ } ] } - }, - "optional": false + } } } ], @@ -6059,7 +5919,6 @@ "ctxt": 0 }, "value": "draw", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6083,7 +5942,6 @@ "ctxt": 0 }, "value": "color", - "typeAnnotation": null, "optional": false }, "value": { @@ -6094,7 +5952,6 @@ "ctxt": 0 }, "value": "currentColor", - "typeAnnotation": null, "optional": false } } @@ -6132,7 +5989,6 @@ "ctxt": 0 }, "value": "GH12052", - "typeAnnotation": null, "optional": false }, "body": { @@ -6158,7 +6014,6 @@ "ctxt": 0 }, "value": "ILinearAxis", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6188,7 +6043,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6245,7 +6099,6 @@ "ctxt": 0 }, "value": "ICategoricalAxis", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6275,7 +6128,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6333,7 +6185,6 @@ "ctxt": 0 }, "value": "IAxis", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -6360,7 +6211,6 @@ "ctxt": 0 }, "value": "ILinearAxis", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6380,7 +6230,6 @@ "ctxt": 0 }, "value": "ICategoricalAxis", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6404,7 +6253,6 @@ "ctxt": 0 }, "value": "IAxisType", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -6473,7 +6321,6 @@ "ctxt": 0 }, "value": "getAxisType", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6618,7 +6465,6 @@ "ctxt": 0 }, "value": "IAxisType", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6650,6 +6496,7 @@ "ctxt": 0 }, "value": "bad", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6672,13 +6519,11 @@ "ctxt": 0 }, "value": "IAxis", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -6698,7 +6543,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "value": { @@ -6716,7 +6560,6 @@ "ctxt": 0 }, "value": "getAxisType", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -6754,6 +6597,7 @@ "ctxt": 0 }, "value": "good", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6776,13 +6620,11 @@ "ctxt": 0 }, "value": "IAxis", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -6802,7 +6644,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "value": { @@ -6813,7 +6654,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -6853,7 +6693,6 @@ "ctxt": 0 }, "value": "good", - "typeAnnotation": null, "optional": false }, "property": { @@ -6864,7 +6703,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6884,7 +6722,6 @@ "ctxt": 0 }, "value": "getAxisType", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -6912,7 +6749,6 @@ "ctxt": 0 }, "value": "GH18421", - "typeAnnotation": null, "optional": false }, "body": { @@ -6938,7 +6774,6 @@ "ctxt": 0 }, "value": "ThingTypeOne", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6968,7 +6803,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7025,7 +6859,6 @@ "ctxt": 0 }, "value": "ThingTypeTwo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7055,7 +6888,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7113,7 +6945,6 @@ "ctxt": 0 }, "value": "ThingType", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -7188,7 +7019,6 @@ "ctxt": 0 }, "value": "Thing", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -7215,7 +7045,6 @@ "ctxt": 0 }, "value": "ThingTypeOne", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7235,7 +7064,6 @@ "ctxt": 0 }, "value": "ThingTypeTwo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7253,7 +7081,6 @@ "ctxt": 0 }, "value": "makeNewThing", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7274,6 +7101,7 @@ "ctxt": 0 }, "value": "thingType", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7296,13 +7124,11 @@ "ctxt": 0 }, "value": "ThingType", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -7345,7 +7171,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "value": { @@ -7356,7 +7181,6 @@ "ctxt": 0 }, "value": "thingType", - "typeAnnotation": null, "optional": false } } @@ -7390,7 +7214,6 @@ "ctxt": 0 }, "value": "Thing", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7417,7 +7240,6 @@ "ctxt": 0 }, "value": "GH15907", - "typeAnnotation": null, "optional": false }, "body": { @@ -7444,7 +7266,6 @@ "ctxt": 0 }, "value": "Action", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -7480,7 +7301,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7545,7 +7365,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7599,7 +7418,6 @@ "ctxt": 0 }, "value": "dispatchAction", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7620,6 +7438,7 @@ "ctxt": 0 }, "value": "action", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7642,13 +7461,11 @@ "ctxt": 0 }, "value": "Action", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -7713,8 +7530,8 @@ "ctxt": 0 }, "value": "active", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BooleanLiteral", @@ -7751,7 +7568,6 @@ "ctxt": 0 }, "value": "dispatchAction", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7775,7 +7591,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "value": { @@ -7800,7 +7615,6 @@ "ctxt": 0 }, "value": "active", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -7861,7 +7675,6 @@ "ctxt": 0 }, "value": "GH20889", - "typeAnnotation": null, "optional": false }, "body": { @@ -7887,7 +7700,6 @@ "ctxt": 0 }, "value": "A1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7917,7 +7729,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7974,7 +7785,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8004,7 +7814,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8062,7 +7871,6 @@ "ctxt": 0 }, "value": "AU", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -8089,7 +7897,6 @@ "ctxt": 0 }, "value": "A1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8109,7 +7916,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8127,7 +7933,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8148,6 +7953,7 @@ "ctxt": 0 }, "value": "obj1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8170,13 +7976,11 @@ "ctxt": 0 }, "value": "AU", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -8219,6 +8023,7 @@ "ctxt": 0 }, "value": "obj2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8241,13 +8046,11 @@ "ctxt": 0 }, "value": "AU", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -8267,7 +8070,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "value": { @@ -8285,7 +8087,6 @@ "ctxt": 0 }, "value": "obj1", - "typeAnnotation": null, "optional": false }, "property": { @@ -8296,7 +8097,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8335,7 +8135,6 @@ "ctxt": 0 }, "value": "GH39357", - "typeAnnotation": null, "optional": false }, "body": { @@ -8362,7 +8161,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -8570,7 +8368,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -8676,6 +8473,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8698,13 +8496,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -8736,6 +8532,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8758,13 +8555,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -8797,7 +8592,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -8831,7 +8625,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -8868,7 +8661,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures/input.ts.json index 8484175ea82c..197b3635aa2e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,6 +55,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -76,13 +78,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -108,7 +108,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -142,7 +141,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -193,8 +191,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -226,6 +223,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -249,6 +247,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -278,14 +277,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": { @@ -311,7 +308,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -338,7 +334,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -388,8 +383,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -419,8 +413,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -430,7 +424,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } } @@ -458,8 +451,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -469,7 +462,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures2/input.ts.json index db4d19764411..cb471b7c2045 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,6 +50,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -73,13 +73,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "RestElement", @@ -101,8 +99,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -140,7 +138,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -190,7 +187,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -217,7 +213,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -247,6 +242,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -269,13 +265,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "RestElement", @@ -297,8 +291,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -329,7 +323,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -378,7 +371,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -415,6 +407,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -437,13 +430,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -475,6 +466,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -497,13 +489,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -533,8 +523,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -544,7 +534,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -572,8 +561,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -583,7 +572,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures3/input.ts.json index 24a94f2e5e38..4c60d9df419c 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures3/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -102,6 +99,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -125,6 +123,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -147,13 +146,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -180,6 +177,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -202,13 +200,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -234,7 +230,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -243,8 +238,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -269,7 +263,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -298,7 +291,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -335,6 +327,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -358,6 +351,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -380,13 +374,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -412,7 +404,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -443,6 +434,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -465,13 +457,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -497,7 +487,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -527,7 +516,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -553,7 +541,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -573,7 +560,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -585,8 +571,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -618,6 +603,7 @@ "ctxt": 0 }, "value": "h", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -641,6 +627,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -663,13 +650,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -695,7 +680,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -726,6 +710,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -748,13 +733,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -780,7 +763,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -819,6 +801,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -842,6 +825,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -864,13 +848,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -897,6 +879,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -919,13 +902,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -951,7 +932,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -960,8 +940,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -986,7 +965,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1015,7 +993,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1030,8 +1007,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1061,8 +1037,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1072,7 +1048,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures4/input.ts.json index ba47ba9dacf9..f4dc4d3c9fe0 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignatures4/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -146,6 +142,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -169,6 +166,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -191,13 +189,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -223,7 +219,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -241,7 +236,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -267,7 +261,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -297,8 +290,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -330,6 +322,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -353,6 +346,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -375,13 +369,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -407,7 +399,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -425,7 +416,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -451,7 +441,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -477,7 +466,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -510,8 +498,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -541,8 +528,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -552,7 +539,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -580,8 +566,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -591,7 +577,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignaturesWithOptionalParameters/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignaturesWithOptionalParameters/input.ts.json index 91202e73a7d0..a814fbd3441c 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignaturesWithOptionalParameters/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignaturesWithOptionalParameters/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "ClassTypeParam", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -112,7 +109,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -145,7 +141,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "value": null, @@ -172,6 +167,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -194,13 +190,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -226,7 +220,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -259,7 +252,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "value": null, @@ -286,6 +278,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -308,13 +301,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -340,7 +331,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -373,7 +363,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "value": null, @@ -400,6 +389,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -422,13 +412,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -438,6 +426,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -460,13 +449,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -492,7 +479,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -525,7 +511,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "value": null, @@ -552,6 +537,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -574,13 +560,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } }, { "type": "Identifier", @@ -590,6 +574,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -612,13 +597,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -644,7 +627,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -677,7 +659,6 @@ "ctxt": 0 }, "value": "init", - "typeAnnotation": null, "optional": false }, "value": { @@ -734,7 +715,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -800,7 +780,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -821,6 +800,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -843,13 +823,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "body": { @@ -905,7 +883,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -926,6 +903,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -948,13 +926,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1010,7 +986,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1076,7 +1051,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1097,6 +1071,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1119,13 +1094,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "body": { @@ -1181,7 +1154,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1202,6 +1174,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1224,13 +1197,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1286,7 +1257,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1352,7 +1322,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1373,6 +1342,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1395,13 +1365,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "body": { @@ -1457,7 +1425,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1478,6 +1445,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1500,13 +1468,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1562,7 +1528,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1583,6 +1548,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1605,13 +1571,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1621,6 +1585,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1643,13 +1608,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1705,7 +1668,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1771,7 +1733,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1792,6 +1753,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1814,13 +1776,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } }, { "type": "Identifier", @@ -1830,6 +1790,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1852,13 +1813,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "body": { @@ -1914,7 +1873,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1935,6 +1893,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1957,13 +1916,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2019,7 +1976,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2040,6 +1996,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2062,13 +2019,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2078,6 +2033,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2100,13 +2056,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2162,7 +2116,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2228,7 +2181,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2249,6 +2201,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2271,13 +2224,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } }, { "type": "Identifier", @@ -2287,6 +2238,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2309,13 +2261,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "body": { @@ -2371,7 +2321,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2392,6 +2341,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2414,13 +2364,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2476,7 +2424,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2497,6 +2444,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2519,13 +2467,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2535,6 +2481,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2557,13 +2504,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2625,7 +2570,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2656,7 +2600,6 @@ "ctxt": 0 }, "value": "GenericSignaturesInvalid", - "typeAnnotation": null, "optional": false }, "body": { @@ -2677,7 +2620,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2703,7 +2645,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2745,7 +2686,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2775,7 +2715,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2808,7 +2747,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2835,6 +2773,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2857,13 +2796,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -2889,7 +2826,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2919,7 +2855,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2952,7 +2887,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2979,6 +2913,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3001,13 +2936,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3033,7 +2966,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3063,7 +2995,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3096,7 +3027,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3123,6 +3053,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3145,13 +3076,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -3161,6 +3090,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3183,13 +3113,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -3215,7 +3143,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3245,7 +3172,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3278,7 +3204,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3305,6 +3230,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3327,13 +3253,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } }, { "type": "Identifier", @@ -3343,6 +3267,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3365,13 +3290,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -3397,7 +3320,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3427,7 +3349,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3462,7 +3383,6 @@ "ctxt": 0 }, "value": "Target", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3488,7 +3408,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3530,7 +3449,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3563,7 +3481,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3590,6 +3507,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3612,13 +3530,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -3644,7 +3560,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3677,7 +3592,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3704,6 +3618,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3726,13 +3641,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3758,7 +3671,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3791,7 +3703,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3818,6 +3729,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3840,13 +3752,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -3856,6 +3766,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3878,13 +3789,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -3910,7 +3819,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3943,7 +3851,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3970,6 +3877,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3992,13 +3900,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } }, { "type": "Identifier", @@ -4008,6 +3914,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4030,13 +3937,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -4062,7 +3967,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4106,7 +4010,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4127,7 +4030,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4171,6 +4073,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4193,13 +4096,11 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -4231,6 +4132,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4253,7 +4155,6 @@ "ctxt": 0 }, "value": "Target", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4279,7 +4180,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4287,8 +4187,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4325,7 +4224,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -4336,7 +4234,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4356,7 +4253,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -4367,7 +4263,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4404,7 +4299,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -4415,7 +4309,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4435,7 +4328,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -4446,7 +4338,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4483,7 +4374,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -4494,7 +4384,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4514,7 +4403,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -4525,7 +4413,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4562,7 +4449,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -4573,7 +4459,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4593,7 +4478,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -4604,7 +4488,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4641,7 +4524,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -4652,7 +4534,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4672,7 +4553,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -4683,7 +4563,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4720,7 +4599,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -4731,7 +4609,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4751,7 +4628,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -4762,7 +4638,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4799,7 +4674,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -4810,7 +4684,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4830,7 +4703,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -4841,7 +4713,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4878,7 +4749,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -4889,7 +4759,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4909,7 +4778,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -4920,7 +4788,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4957,7 +4824,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -4968,7 +4834,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4988,7 +4853,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -4999,7 +4863,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5036,7 +4899,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -5047,7 +4909,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5067,7 +4928,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -5078,7 +4938,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5115,7 +4974,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -5126,7 +4984,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5146,7 +5003,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -5157,7 +5013,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5194,7 +5049,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -5205,7 +5059,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5225,7 +5078,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -5236,7 +5088,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5273,7 +5124,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -5284,7 +5134,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5304,7 +5153,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -5315,7 +5163,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5352,7 +5199,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -5363,7 +5209,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5383,7 +5228,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -5394,7 +5238,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5431,7 +5274,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -5442,7 +5284,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5462,7 +5303,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -5473,7 +5313,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5510,7 +5349,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -5521,7 +5359,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5541,7 +5378,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -5552,7 +5388,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5589,7 +5424,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -5600,7 +5434,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5620,7 +5453,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -5631,7 +5463,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5668,7 +5499,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -5679,7 +5509,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5699,7 +5528,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -5710,7 +5538,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5747,7 +5574,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -5758,7 +5584,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5778,7 +5603,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -5789,7 +5613,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5826,7 +5649,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -5837,7 +5659,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5857,7 +5678,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -5868,7 +5688,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5905,7 +5724,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -5916,7 +5734,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5936,7 +5753,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -5947,7 +5763,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5984,7 +5799,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -5995,7 +5809,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6015,7 +5828,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -6026,7 +5838,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6063,7 +5874,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -6074,7 +5884,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6094,7 +5903,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -6105,7 +5913,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6142,7 +5949,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -6153,7 +5959,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6173,7 +5978,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -6184,7 +5988,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6221,7 +6024,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -6232,7 +6034,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6252,7 +6053,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "property": { @@ -6263,7 +6063,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6297,7 +6096,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6327,7 +6125,6 @@ "ctxt": 0 }, "value": "GenericSignaturesValid", - "typeAnnotation": null, "optional": false }, "body": { @@ -6348,7 +6145,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6374,7 +6170,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -6416,7 +6211,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6446,7 +6240,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6479,7 +6272,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "value": null, @@ -6506,6 +6298,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6528,13 +6321,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -6560,7 +6351,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6590,7 +6380,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6623,7 +6412,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "value": null, @@ -6650,6 +6438,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6672,13 +6461,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6704,7 +6491,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6734,7 +6520,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6767,7 +6552,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "value": null, @@ -6794,6 +6578,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6816,13 +6601,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -6832,6 +6615,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6854,13 +6638,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -6886,7 +6668,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6916,7 +6697,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6949,7 +6729,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "value": null, @@ -6976,6 +6755,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6998,13 +6778,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } }, { "type": "Identifier", @@ -7014,6 +6792,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7036,13 +6815,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -7068,7 +6845,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7098,7 +6874,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7131,7 +6906,6 @@ "ctxt": 0 }, "value": "init", - "typeAnnotation": null, "optional": false }, "value": { @@ -7188,7 +6962,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7234,7 +7007,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7284,7 +7056,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7305,6 +7076,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7327,13 +7099,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "body": { @@ -7369,7 +7139,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7419,7 +7188,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7440,6 +7208,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7462,13 +7231,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -7504,7 +7271,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7554,7 +7320,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7600,7 +7365,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7650,7 +7414,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7671,6 +7434,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7693,13 +7457,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "body": { @@ -7735,7 +7497,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7785,7 +7546,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7806,6 +7566,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7828,13 +7589,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -7870,7 +7629,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7920,7 +7678,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7966,7 +7723,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8016,7 +7772,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8037,6 +7792,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8059,13 +7815,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "body": { @@ -8101,7 +7855,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8151,7 +7904,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8172,6 +7924,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8194,13 +7947,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -8236,7 +7987,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8286,7 +8036,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8307,6 +8056,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8329,13 +8079,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -8345,6 +8093,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8367,13 +8116,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -8409,7 +8156,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8459,7 +8205,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8505,7 +8250,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8555,7 +8299,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8576,6 +8319,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8598,13 +8342,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } }, { "type": "Identifier", @@ -8614,6 +8356,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8636,13 +8379,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "body": { @@ -8678,7 +8419,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8728,7 +8468,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8749,6 +8488,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8771,13 +8511,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -8813,7 +8551,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8863,7 +8600,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8884,6 +8620,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8906,13 +8643,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -8922,6 +8657,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8944,13 +8680,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -8986,7 +8720,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9036,7 +8769,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9082,7 +8814,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9132,7 +8863,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9153,6 +8883,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9175,13 +8906,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } }, { "type": "Identifier", @@ -9191,6 +8920,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9213,13 +8943,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "body": { @@ -9255,7 +8983,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9305,7 +9032,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9326,6 +9052,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9348,13 +9075,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -9390,7 +9115,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9440,7 +9164,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9461,6 +9184,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9483,13 +9207,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -9499,6 +9221,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9521,13 +9244,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -9563,7 +9284,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer/input.ts.json index ccfbb0e153a3..3d92f8583469 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -241,7 +234,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -280,7 +272,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -302,6 +293,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -318,8 +310,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -344,7 +335,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -389,6 +379,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -411,13 +402,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -449,6 +438,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -475,6 +465,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -491,8 +482,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -517,7 +507,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -532,8 +521,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -563,8 +551,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -574,7 +562,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -602,8 +589,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -613,7 +600,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -643,6 +629,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -669,6 +656,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -685,8 +673,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -711,7 +698,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -726,8 +712,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -757,8 +742,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -768,7 +753,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -796,8 +780,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -807,7 +791,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -829,7 +812,6 @@ "ctxt": 0 }, "value": "Generics", - "typeAnnotation": null, "optional": false }, "body": { @@ -850,7 +832,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -872,6 +853,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -888,8 +870,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -914,7 +895,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -953,7 +933,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -971,7 +950,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -993,7 +971,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1015,6 +992,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1031,8 +1009,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1057,7 +1034,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1079,7 +1055,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1107,7 +1082,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1126,7 +1100,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1170,6 +1143,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1192,7 +1166,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1218,7 +1191,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1226,8 +1198,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1259,6 +1230,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1285,6 +1257,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1301,8 +1274,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1327,7 +1299,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1342,8 +1313,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1373,8 +1343,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1384,7 +1354,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1412,8 +1381,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1423,7 +1392,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1453,6 +1421,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1479,6 +1448,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1495,8 +1465,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1521,7 +1490,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1536,8 +1504,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1567,8 +1534,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1578,7 +1545,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -1606,8 +1572,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1617,7 +1583,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1647,6 +1612,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1673,6 +1639,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1689,8 +1656,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1715,7 +1681,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1730,8 +1695,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1761,8 +1725,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1772,7 +1736,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } } @@ -1800,8 +1763,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1811,7 +1774,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1843,7 +1805,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1861,7 +1822,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer2/input.ts.json index 87b79db99157..4a3e25c67248 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -241,7 +234,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -285,7 +277,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -310,6 +301,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -326,8 +318,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -352,7 +343,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -393,6 +383,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -415,13 +406,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -453,6 +442,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -479,6 +469,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -495,8 +486,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -521,7 +511,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -536,8 +525,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -567,8 +555,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -578,7 +566,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -606,8 +593,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -617,7 +604,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -647,6 +633,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -673,6 +660,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -689,8 +677,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -715,7 +702,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -730,8 +716,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -761,8 +746,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -772,7 +757,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -800,8 +784,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -811,7 +795,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -833,7 +816,6 @@ "ctxt": 0 }, "value": "Generics", - "typeAnnotation": null, "optional": false }, "body": { @@ -859,7 +841,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -886,7 +867,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -904,7 +884,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -933,6 +912,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -949,8 +929,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -975,7 +954,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1006,7 +984,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1027,7 +1004,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1053,7 +1029,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1081,6 +1056,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1097,8 +1073,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1123,7 +1098,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1149,7 +1123,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1193,6 +1166,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1215,7 +1189,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1241,7 +1214,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1249,8 +1221,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1282,6 +1253,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1308,6 +1280,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1324,8 +1297,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1350,7 +1322,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1365,8 +1336,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1396,8 +1366,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1407,7 +1377,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1435,8 +1404,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1446,7 +1415,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1476,6 +1444,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1502,6 +1471,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1518,8 +1488,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1544,7 +1513,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1559,8 +1527,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1590,8 +1557,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1601,7 +1568,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -1629,8 +1595,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1640,7 +1606,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1670,6 +1635,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1696,6 +1662,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1712,8 +1679,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1738,7 +1704,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1753,8 +1718,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1784,8 +1748,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1795,7 +1759,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } } @@ -1823,8 +1786,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1834,7 +1797,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1866,7 +1828,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1884,7 +1845,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer3/input.ts.json index 7bcdb4244f4f..fe57466f1ee8 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer3/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -241,7 +234,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -280,7 +272,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -302,6 +293,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -318,8 +310,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -344,7 +335,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -389,6 +379,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -411,13 +402,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -449,6 +438,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -475,6 +465,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -491,8 +482,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -517,7 +507,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -532,8 +521,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -563,8 +551,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -574,7 +562,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -602,8 +589,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -613,7 +600,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -628,7 +614,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -650,6 +635,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -666,8 +652,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -692,7 +677,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -714,7 +698,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -747,6 +730,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -773,6 +757,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -789,8 +774,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -815,7 +799,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -830,8 +813,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -861,8 +843,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -872,7 +854,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -900,8 +881,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -911,7 +892,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -933,7 +913,6 @@ "ctxt": 0 }, "value": "Generics", - "typeAnnotation": null, "optional": false }, "body": { @@ -954,7 +933,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -976,6 +954,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -992,8 +971,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1018,7 +996,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1057,7 +1034,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1075,7 +1051,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1097,7 +1072,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1141,6 +1115,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1163,7 +1138,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1189,7 +1163,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1197,8 +1170,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1230,6 +1202,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1256,6 +1229,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1272,8 +1246,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1298,7 +1271,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1313,8 +1285,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1344,8 +1315,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1355,7 +1326,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1383,8 +1353,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1394,7 +1364,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1424,6 +1393,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1450,6 +1420,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1466,8 +1437,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1492,7 +1462,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1507,8 +1476,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1538,8 +1506,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1549,7 +1517,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -1577,8 +1544,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1588,7 +1555,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1620,7 +1586,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1638,7 +1603,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers/input.ts.json index ef23b10b9b99..0ce954d10220 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "SimpleTypes", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -118,7 +115,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -144,7 +140,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -207,6 +202,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -229,13 +225,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -267,6 +261,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -289,13 +284,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -317,7 +310,6 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -347,7 +339,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -391,7 +382,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -421,7 +411,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -475,6 +464,7 @@ "ctxt": 0 }, "value": "s2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -497,13 +487,11 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -535,6 +523,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -557,13 +546,11 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -595,6 +582,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -626,7 +614,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -654,8 +641,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -687,6 +673,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -718,7 +705,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -746,8 +732,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -779,8 +764,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -800,7 +785,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -849,8 +833,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -870,7 +854,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -917,8 +900,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -928,7 +911,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -956,8 +938,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -967,7 +949,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -995,8 +976,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1006,7 +987,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -1034,8 +1014,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1045,7 +1025,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1073,8 +1052,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1084,7 +1063,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1112,8 +1090,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1123,7 +1101,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -1151,8 +1128,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1162,7 +1139,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -1190,8 +1166,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1201,7 +1177,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1229,8 +1204,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1240,7 +1215,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1268,8 +1242,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1279,7 +1253,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1307,8 +1280,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1318,7 +1291,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1346,8 +1318,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1357,7 +1329,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -1385,8 +1356,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1396,7 +1367,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -1424,8 +1394,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1435,7 +1405,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1463,8 +1432,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1474,7 +1443,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -1502,8 +1470,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1513,7 +1481,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1541,8 +1508,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1552,7 +1519,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1580,8 +1546,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1591,7 +1557,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1619,8 +1584,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1630,7 +1595,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -1655,7 +1619,6 @@ "ctxt": 0 }, "value": "ObjectTypes", - "typeAnnotation": null, "optional": false }, "body": { @@ -1676,7 +1639,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1702,7 +1664,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1728,7 +1689,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1761,7 +1721,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1787,7 +1746,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1813,7 +1771,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1861,6 +1818,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1883,13 +1841,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1921,6 +1877,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1943,13 +1900,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1971,7 +1926,6 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2001,7 +1955,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2030,7 +1983,6 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2056,7 +2008,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2086,7 +2037,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2115,7 +2065,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2151,6 +2100,7 @@ "ctxt": 0 }, "value": "s2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2173,13 +2123,11 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2211,6 +2159,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2233,13 +2182,11 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2271,6 +2218,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2302,7 +2250,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2331,7 +2278,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2340,8 +2286,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2373,6 +2318,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2404,7 +2350,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2433,7 +2378,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2442,8 +2386,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2475,8 +2418,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -2496,7 +2439,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -2507,7 +2449,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -2542,8 +2483,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -2563,7 +2504,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -2574,7 +2514,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -2607,8 +2546,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2618,7 +2557,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -2646,8 +2584,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2657,7 +2595,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -2685,8 +2622,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2696,7 +2633,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -2724,8 +2660,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2735,7 +2671,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -2763,8 +2698,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2774,7 +2709,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -2802,8 +2736,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2813,7 +2747,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -2841,8 +2774,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2852,7 +2785,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -2880,8 +2812,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2891,7 +2823,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2919,8 +2850,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2930,7 +2861,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -2958,8 +2888,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2969,7 +2899,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2997,8 +2926,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3008,7 +2937,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3036,8 +2964,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3047,7 +2975,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -3075,8 +3002,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3086,7 +3013,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -3114,8 +3040,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3125,7 +3051,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -3153,8 +3078,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3164,7 +3089,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -3192,8 +3116,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3203,7 +3127,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -3231,8 +3154,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3242,7 +3165,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -3270,8 +3192,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3281,7 +3203,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -3309,8 +3230,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3320,7 +3241,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers2/input.ts.json index 10376d4d0536..3fe3248be74e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -179,6 +175,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -201,13 +198,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -239,6 +234,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -261,13 +257,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -289,7 +283,6 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -319,7 +312,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -361,7 +353,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -405,7 +396,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -435,7 +425,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -477,7 +466,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -531,6 +519,7 @@ "ctxt": 0 }, "value": "s2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -553,13 +542,11 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -591,6 +578,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -613,13 +601,11 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -651,6 +637,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -682,7 +669,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -724,7 +710,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -752,8 +737,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -785,6 +769,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -816,7 +801,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -858,7 +842,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -886,8 +869,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -919,8 +901,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -940,7 +922,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -989,8 +970,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1010,7 +991,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1057,8 +1037,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1068,7 +1048,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -1096,8 +1075,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1107,7 +1086,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -1135,8 +1113,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1146,7 +1124,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -1174,8 +1151,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1185,7 +1162,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1213,8 +1189,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1224,7 +1200,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1252,8 +1227,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1263,7 +1238,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -1291,8 +1265,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1302,7 +1276,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -1330,8 +1303,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1341,7 +1314,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1369,8 +1341,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1380,7 +1352,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1408,8 +1379,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1419,7 +1390,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1447,8 +1417,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1458,7 +1428,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1486,8 +1455,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1497,7 +1466,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -1525,8 +1493,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1536,7 +1504,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -1564,8 +1531,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1575,7 +1542,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1603,8 +1569,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1614,7 +1580,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -1642,8 +1607,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1653,7 +1618,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1681,8 +1645,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1692,7 +1656,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1720,8 +1683,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1731,7 +1694,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1759,8 +1721,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1770,7 +1732,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers3/input.ts.json index 34ca9c3253cc..d64093bbba6e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -94,7 +92,6 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -111,7 +108,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -137,7 +133,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -189,7 +184,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -221,6 +215,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -243,13 +238,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -281,6 +274,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -303,13 +297,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -331,7 +323,6 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -361,7 +352,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -403,7 +393,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -447,7 +436,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -477,7 +465,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -519,7 +506,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -573,6 +559,7 @@ "ctxt": 0 }, "value": "s2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -595,13 +582,11 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -633,6 +618,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -655,13 +641,11 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -693,6 +677,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -724,7 +709,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -766,7 +750,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -794,8 +777,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -827,6 +809,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -858,7 +841,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -900,7 +882,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -928,8 +909,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -961,6 +941,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -983,13 +964,11 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1009,7 +988,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1058,6 +1036,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1080,13 +1059,11 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1106,7 +1083,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1153,8 +1129,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1164,7 +1140,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -1192,8 +1167,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1203,7 +1178,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -1231,8 +1205,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1242,7 +1216,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -1270,8 +1243,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1281,7 +1254,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1309,8 +1281,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1320,7 +1292,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1348,8 +1319,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1359,7 +1330,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -1387,8 +1357,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1398,7 +1368,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -1426,8 +1395,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1437,7 +1406,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1465,8 +1433,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1476,7 +1444,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1504,8 +1471,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1515,7 +1482,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1543,8 +1509,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1554,7 +1520,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1582,8 +1547,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1593,7 +1558,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -1621,8 +1585,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1632,7 +1596,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -1660,8 +1623,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1671,7 +1634,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1699,8 +1661,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1710,7 +1672,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -1738,8 +1699,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1749,7 +1710,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1777,8 +1737,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1788,7 +1748,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1816,8 +1775,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1827,7 +1786,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1855,8 +1813,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1866,7 +1824,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4/input.ts.json index a6d63c765647..14080bd1488d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "OnlyDerived", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -118,7 +115,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -144,7 +140,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -202,7 +196,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -228,7 +221,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -268,7 +260,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -286,7 +277,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -312,7 +302,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -338,7 +327,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -371,7 +359,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -397,7 +384,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -423,7 +409,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -471,6 +456,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -493,13 +479,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -531,6 +515,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -553,13 +538,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -581,7 +564,6 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -611,7 +593,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -640,7 +621,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -666,7 +646,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -696,7 +675,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -725,7 +703,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -761,6 +738,7 @@ "ctxt": 0 }, "value": "s2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -783,13 +761,11 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -821,6 +797,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -843,13 +820,11 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -881,6 +856,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -912,7 +888,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -941,7 +916,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -951,8 +925,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -984,6 +957,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1015,7 +989,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1044,7 +1017,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1054,8 +1026,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1087,8 +1058,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1108,7 +1079,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1126,7 +1096,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1164,8 +1133,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1185,7 +1154,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1203,7 +1171,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1239,8 +1206,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1250,7 +1217,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -1278,8 +1244,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1289,7 +1255,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -1317,8 +1282,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1328,7 +1293,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -1356,8 +1320,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1367,7 +1331,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1395,8 +1358,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1406,7 +1369,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1434,8 +1396,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1445,7 +1407,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -1473,8 +1434,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1484,7 +1445,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -1512,8 +1472,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1523,7 +1483,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1551,8 +1510,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1562,7 +1521,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1590,8 +1548,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1601,7 +1559,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1629,8 +1586,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1640,7 +1597,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1668,8 +1624,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1679,7 +1635,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -1707,8 +1662,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1718,7 +1673,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -1746,8 +1700,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1757,7 +1711,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1785,8 +1738,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1796,7 +1749,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -1824,8 +1776,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1835,7 +1787,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1863,8 +1814,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1874,7 +1825,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1902,8 +1852,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1913,7 +1863,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1941,8 +1890,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1952,7 +1901,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -1977,7 +1925,6 @@ "ctxt": 0 }, "value": "WithBase", - "typeAnnotation": null, "optional": false }, "body": { @@ -1998,7 +1945,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2024,7 +1970,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2072,7 +2017,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2098,7 +2042,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2138,7 +2081,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2156,7 +2098,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2182,7 +2123,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2222,7 +2162,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2240,7 +2179,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2266,7 +2204,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2292,7 +2229,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2325,7 +2261,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2351,7 +2286,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2377,7 +2311,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2425,6 +2358,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2447,13 +2381,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2485,6 +2417,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2507,13 +2440,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2535,7 +2466,6 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2565,7 +2495,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2594,7 +2523,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2620,7 +2548,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2650,7 +2577,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2679,7 +2605,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2715,6 +2640,7 @@ "ctxt": 0 }, "value": "s2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2737,13 +2663,11 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2775,6 +2699,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2797,13 +2722,11 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2835,6 +2758,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2866,7 +2790,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2895,7 +2818,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2905,8 +2827,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2938,6 +2859,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2969,7 +2891,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2998,7 +2919,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3008,8 +2928,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3041,8 +2960,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -3062,7 +2981,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -3080,7 +2998,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3118,8 +3035,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -3139,7 +3056,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -3157,7 +3073,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3193,8 +3108,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3204,7 +3119,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -3232,8 +3146,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3243,7 +3157,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -3271,8 +3184,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3282,7 +3195,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -3310,8 +3222,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3321,7 +3233,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -3349,8 +3260,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3360,7 +3271,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -3388,8 +3298,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3399,7 +3309,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -3427,8 +3336,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3438,7 +3347,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -3466,8 +3374,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3477,7 +3385,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -3505,8 +3412,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3516,7 +3423,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -3544,8 +3450,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3555,7 +3461,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -3583,8 +3488,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3594,7 +3499,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3622,8 +3526,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3633,7 +3537,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -3661,8 +3564,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3672,7 +3575,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -3700,8 +3602,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3711,7 +3613,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -3739,8 +3640,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3750,7 +3651,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -3778,8 +3678,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3789,7 +3689,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -3817,8 +3716,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3828,7 +3727,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -3856,8 +3754,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3867,7 +3765,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -3895,8 +3792,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3906,7 +3803,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers5/input.ts.json index dbc3ed86885f..f07a741d1bb8 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -105,6 +103,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -127,13 +126,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -155,7 +152,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -185,7 +181,6 @@ "ctxt": 0 }, "value": "fooo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -239,6 +234,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -261,13 +257,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -297,8 +291,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -308,7 +302,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -336,8 +329,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -347,7 +340,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersAccessibility/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersAccessibility/input.ts.json index b6f338be770a..8e95e3a1d3dc 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersAccessibility/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersAccessibility/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "TargetIsPublic", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -123,7 +120,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -153,7 +149,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -207,6 +202,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -238,7 +234,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -266,8 +261,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -299,6 +293,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -321,13 +316,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -359,6 +352,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -381,13 +375,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -404,7 +396,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -430,7 +421,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -478,7 +468,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -504,7 +493,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -567,6 +555,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -589,13 +578,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -627,6 +614,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -649,13 +637,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -685,8 +671,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -696,7 +682,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -724,8 +709,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -735,7 +720,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -763,8 +747,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -774,7 +758,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -802,8 +785,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -813,7 +796,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -841,8 +823,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -852,7 +834,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -880,8 +861,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -891,7 +872,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -919,8 +899,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -930,7 +910,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -958,8 +937,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -969,7 +948,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -997,8 +975,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1008,7 +986,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1036,8 +1013,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1047,7 +1024,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1075,8 +1051,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1086,7 +1062,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -1114,8 +1089,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1125,7 +1100,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -1153,8 +1127,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1164,7 +1138,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1192,8 +1165,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1203,7 +1176,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1231,8 +1203,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1242,7 +1214,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -1270,8 +1241,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1281,7 +1252,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -1309,8 +1279,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1320,7 +1290,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1348,8 +1317,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1359,7 +1328,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1387,8 +1355,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1398,7 +1366,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -1426,8 +1393,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1437,7 +1404,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -1465,8 +1431,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1476,7 +1442,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -1501,7 +1466,6 @@ "ctxt": 0 }, "value": "TargetIsPublic", - "typeAnnotation": null, "optional": false }, "body": { @@ -1522,7 +1486,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1548,7 +1511,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1601,7 +1563,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1622,7 +1583,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1663,6 +1623,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1694,7 +1655,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1722,8 +1682,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1755,6 +1714,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1777,13 +1737,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1815,6 +1773,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1837,13 +1796,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1860,7 +1817,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1886,7 +1842,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1934,7 +1889,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1960,7 +1914,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2023,6 +1976,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2045,13 +1999,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2083,6 +2035,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2105,13 +2058,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2141,8 +2092,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2152,7 +2103,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2180,8 +2130,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2191,7 +2141,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -2219,8 +2168,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2230,7 +2179,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -2258,8 +2206,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2269,7 +2217,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -2297,8 +2244,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2308,7 +2255,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2336,8 +2282,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2347,7 +2293,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -2375,8 +2320,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2386,7 +2331,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -2414,8 +2358,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2425,7 +2369,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -2453,8 +2396,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2464,7 +2407,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2492,8 +2434,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2503,7 +2445,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2531,8 +2472,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2542,7 +2483,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2570,8 +2510,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2581,7 +2521,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -2609,8 +2548,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2620,7 +2559,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -2648,8 +2586,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2659,7 +2597,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -2687,8 +2624,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2698,7 +2635,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2726,8 +2662,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2737,7 +2673,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2765,8 +2700,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2776,7 +2711,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -2804,8 +2738,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2815,7 +2749,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -2843,8 +2776,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2854,7 +2787,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2882,8 +2814,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2893,7 +2825,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2921,8 +2852,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2932,7 +2863,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -2960,8 +2890,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2971,7 +2901,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -2999,8 +2928,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3010,7 +2939,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersNumericNames/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersNumericNames/input.ts.json index 4f6f2902fd5d..1b755dfab2de 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersNumericNames/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersNumericNames/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -175,6 +173,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -197,13 +196,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -235,6 +232,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -257,13 +255,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -285,7 +281,6 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -355,7 +350,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -399,7 +393,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -469,7 +462,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -523,6 +515,7 @@ "ctxt": 0 }, "value": "s2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -545,13 +538,11 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -583,6 +574,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -605,13 +597,11 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -643,6 +633,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -714,7 +705,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -742,8 +732,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -775,6 +764,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -846,7 +836,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -874,8 +863,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -907,8 +895,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -975,8 +963,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1041,8 +1029,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1052,7 +1040,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -1080,8 +1067,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1091,7 +1078,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -1119,8 +1105,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1130,7 +1116,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -1158,8 +1143,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1169,7 +1154,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1197,8 +1181,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1208,7 +1192,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1236,8 +1219,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1247,7 +1230,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -1275,8 +1257,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1286,7 +1268,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -1314,8 +1295,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1325,7 +1306,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1353,8 +1333,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1364,7 +1344,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1392,8 +1371,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1403,7 +1382,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1431,8 +1409,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1442,7 +1420,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1470,8 +1447,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1481,7 +1458,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -1509,8 +1485,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1520,7 +1496,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -1548,8 +1523,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1559,7 +1534,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1587,8 +1561,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1598,7 +1572,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -1626,8 +1599,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1637,7 +1610,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1665,8 +1637,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1676,7 +1648,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1704,8 +1675,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1715,7 +1686,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1743,8 +1713,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1754,7 +1724,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality/input.ts.json index b94870388ecb..8f3f499d881d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -265,7 +257,6 @@ "ctxt": 0 }, "value": "TargetHasOptional", - "typeAnnotation": null, "optional": false }, "body": { @@ -291,7 +282,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -321,7 +311,6 @@ "ctxt": 0 }, "value": "opt", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -350,7 +339,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -386,6 +374,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -408,13 +397,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -446,6 +433,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -477,7 +465,6 @@ "ctxt": 0 }, "value": "opt", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -506,7 +493,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -516,8 +502,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -549,6 +534,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -571,12 +557,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -596,7 +580,6 @@ "ctxt": 0 }, "value": "opt", - "typeAnnotation": null, "optional": false }, "value": { @@ -614,7 +597,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -642,7 +624,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -672,7 +653,6 @@ "ctxt": 0 }, "value": "opt", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -701,7 +681,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -727,7 +706,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -757,7 +735,6 @@ "ctxt": 0 }, "value": "opt", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -786,7 +763,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -812,7 +788,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -842,7 +817,6 @@ "ctxt": 0 }, "value": "opt", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -871,7 +845,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -907,6 +880,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -929,13 +903,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -967,6 +939,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -989,13 +962,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1027,6 +998,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1049,13 +1021,11 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1085,8 +1055,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1096,7 +1066,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -1124,8 +1093,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1135,7 +1104,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -1163,8 +1131,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1174,7 +1142,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -1202,8 +1169,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1213,7 +1180,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1241,8 +1207,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1252,7 +1218,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -1280,8 +1245,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1291,7 +1256,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -1319,8 +1283,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1330,7 +1294,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -1358,8 +1321,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1369,7 +1332,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1397,8 +1359,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1408,7 +1370,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -1436,8 +1397,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1447,7 +1408,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -1475,8 +1435,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1486,7 +1446,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -1514,8 +1473,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1525,7 +1484,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1553,8 +1511,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1564,7 +1522,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1589,7 +1546,6 @@ "ctxt": 0 }, "value": "SourceHasOptional", - "typeAnnotation": null, "optional": false }, "body": { @@ -1615,7 +1571,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1645,7 +1600,6 @@ "ctxt": 0 }, "value": "opt", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1674,7 +1628,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1710,6 +1663,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1732,13 +1686,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1770,6 +1722,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1801,7 +1754,6 @@ "ctxt": 0 }, "value": "opt", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1830,7 +1782,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1840,8 +1791,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1873,8 +1823,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1894,7 +1844,6 @@ "ctxt": 0 }, "value": "opt", - "typeAnnotation": null, "optional": false }, "value": { @@ -1912,7 +1861,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1940,7 +1888,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1970,7 +1917,6 @@ "ctxt": 0 }, "value": "opt", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1999,7 +1945,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2025,7 +1970,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2055,7 +1999,6 @@ "ctxt": 0 }, "value": "opt", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2084,7 +2027,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2110,7 +2052,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2140,7 +2081,6 @@ "ctxt": 0 }, "value": "opt", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2169,7 +2109,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2205,6 +2144,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2227,13 +2167,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2265,6 +2203,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2287,13 +2226,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2325,6 +2262,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2347,13 +2285,11 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2383,8 +2319,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2394,7 +2330,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -2422,8 +2357,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2433,7 +2368,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -2461,8 +2395,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2472,7 +2406,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -2500,8 +2433,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2511,7 +2444,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2539,8 +2471,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2550,7 +2482,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -2578,8 +2509,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2589,7 +2520,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -2617,8 +2547,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2628,7 +2558,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -2656,8 +2585,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2667,7 +2596,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -2695,8 +2623,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2706,7 +2634,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -2734,8 +2661,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2745,7 +2672,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -2773,8 +2699,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2784,7 +2710,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -2812,8 +2737,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2823,7 +2748,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2851,8 +2775,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2862,7 +2786,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2/input.ts.json index f3a645323417..1025337bbafb 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -265,7 +257,6 @@ "ctxt": 0 }, "value": "TargetHasOptional", - "typeAnnotation": null, "optional": false }, "body": { @@ -291,7 +282,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -321,7 +311,6 @@ "ctxt": 0 }, "value": "opt", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -350,7 +339,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -386,6 +374,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -408,13 +397,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -446,6 +433,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -477,7 +465,6 @@ "ctxt": 0 }, "value": "opt", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -506,7 +493,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -516,8 +502,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -549,6 +534,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -571,12 +557,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -596,7 +580,6 @@ "ctxt": 0 }, "value": "opt", - "typeAnnotation": null, "optional": false }, "value": { @@ -614,7 +597,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -642,7 +624,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -672,7 +653,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -701,7 +681,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -727,7 +706,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -757,7 +735,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -786,7 +763,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -812,7 +788,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -842,7 +817,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -871,7 +845,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -907,6 +880,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -929,13 +903,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -967,6 +939,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -989,13 +962,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1027,6 +998,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1049,13 +1021,11 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1085,8 +1055,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1096,7 +1066,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -1124,8 +1093,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1135,7 +1104,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -1163,8 +1131,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1174,7 +1142,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -1202,8 +1169,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1213,7 +1180,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -1241,8 +1207,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1252,7 +1218,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -1280,8 +1245,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1291,7 +1256,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -1319,8 +1283,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1330,7 +1294,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -1358,8 +1321,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1369,7 +1332,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -1397,8 +1359,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1408,7 +1370,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -1436,8 +1397,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1447,7 +1408,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1475,8 +1435,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1486,7 +1446,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1514,8 +1473,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1525,7 +1484,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1553,8 +1511,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1564,7 +1522,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1589,7 +1546,6 @@ "ctxt": 0 }, "value": "SourceHasOptional", - "typeAnnotation": null, "optional": false }, "body": { @@ -1615,7 +1571,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1645,7 +1600,6 @@ "ctxt": 0 }, "value": "opt", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1674,7 +1628,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1710,6 +1663,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1732,13 +1686,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1770,6 +1722,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1801,7 +1754,6 @@ "ctxt": 0 }, "value": "opt", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1830,7 +1782,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1840,8 +1791,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1873,8 +1823,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1894,7 +1844,6 @@ "ctxt": 0 }, "value": "opt", - "typeAnnotation": null, "optional": false }, "value": { @@ -1912,7 +1861,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1940,7 +1888,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1970,7 +1917,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1999,7 +1945,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2025,7 +1970,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2055,7 +1999,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2084,7 +2027,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2110,7 +2052,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2140,7 +2081,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2169,7 +2109,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2205,6 +2144,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2227,13 +2167,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2265,6 +2203,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2287,13 +2226,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2325,6 +2262,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2347,13 +2285,11 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2383,8 +2319,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2394,7 +2330,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -2422,8 +2357,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2433,7 +2368,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -2461,8 +2395,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2472,7 +2406,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -2500,8 +2433,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2511,7 +2444,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2539,8 +2471,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2550,7 +2482,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -2578,8 +2509,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2589,7 +2520,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -2617,8 +2547,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2628,7 +2558,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -2656,8 +2585,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2667,7 +2596,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -2695,8 +2623,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2706,7 +2634,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -2734,8 +2661,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2745,7 +2672,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -2773,8 +2699,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2784,7 +2710,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -2812,8 +2737,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2823,7 +2748,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2851,8 +2775,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2862,7 +2786,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames/input.ts.json index d7a5911d755c..b62030f80880 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "JustStrings", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -121,7 +119,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -213,6 +210,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -235,13 +233,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -273,6 +269,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -295,13 +292,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -323,7 +318,6 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -398,7 +392,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -442,7 +435,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -517,7 +509,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -571,6 +562,7 @@ "ctxt": 0 }, "value": "s2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -593,13 +585,11 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -631,6 +621,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -653,13 +644,11 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -691,6 +680,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -767,7 +757,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -795,8 +784,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -828,6 +816,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -904,7 +893,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -932,8 +920,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -965,8 +952,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1038,8 +1025,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1109,8 +1096,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1120,7 +1107,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -1148,8 +1134,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1159,7 +1145,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -1187,8 +1172,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1198,7 +1183,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -1226,8 +1210,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1237,7 +1221,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1265,8 +1248,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1276,7 +1259,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1304,8 +1286,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1315,7 +1297,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -1343,8 +1324,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1354,7 +1335,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -1382,8 +1362,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1393,7 +1373,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1421,8 +1400,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1432,7 +1411,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1460,8 +1438,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1471,7 +1449,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1499,8 +1476,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1510,7 +1487,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1538,8 +1514,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1549,7 +1525,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -1577,8 +1552,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1588,7 +1563,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -1616,8 +1590,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1627,7 +1601,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1655,8 +1628,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1666,7 +1639,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -1694,8 +1666,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1705,7 +1677,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1733,8 +1704,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1744,7 +1715,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1772,8 +1742,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1783,7 +1753,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -1811,8 +1780,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1822,7 +1791,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -1847,7 +1815,6 @@ "ctxt": 0 }, "value": "NumbersAndStrings", - "typeAnnotation": null, "optional": false }, "body": { @@ -1868,7 +1835,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1945,7 +1911,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2032,6 +1997,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2054,13 +2020,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2092,6 +2056,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2114,13 +2079,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2142,7 +2105,6 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2217,7 +2179,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2261,7 +2222,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2331,7 +2291,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2385,6 +2344,7 @@ "ctxt": 0 }, "value": "s2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2407,13 +2367,11 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2445,6 +2403,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2467,13 +2426,11 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2505,6 +2462,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2581,7 +2539,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2609,8 +2566,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2642,6 +2598,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2713,7 +2670,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2741,8 +2697,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2774,8 +2729,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -2847,8 +2802,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -2913,8 +2868,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2924,7 +2879,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -2952,8 +2906,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2963,7 +2917,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -2991,8 +2944,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3002,7 +2955,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -3030,8 +2982,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3041,7 +2993,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -3069,8 +3020,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3080,7 +3031,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -3108,8 +3058,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3119,7 +3069,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -3147,8 +3096,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3158,7 +3107,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -3186,8 +3134,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3197,7 +3145,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -3225,8 +3172,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3236,7 +3183,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -3264,8 +3210,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3275,7 +3221,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -3303,8 +3248,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3314,7 +3259,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3342,8 +3286,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3353,7 +3297,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -3381,8 +3324,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3392,7 +3335,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -3420,8 +3362,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3431,7 +3373,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -3459,8 +3400,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3470,7 +3411,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -3498,8 +3438,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3509,7 +3449,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -3537,8 +3476,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3548,7 +3487,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -3576,8 +3514,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3587,7 +3525,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -3615,8 +3552,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3626,7 +3563,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -3654,8 +3590,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3665,7 +3601,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer/input.ts.json index 03b29cd63a5d..f1115159ddce 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -241,7 +234,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -280,7 +272,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -302,6 +293,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -318,8 +310,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -344,7 +335,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -389,6 +379,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -411,13 +402,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -449,6 +438,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -475,6 +465,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -491,8 +482,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -517,7 +507,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -532,8 +521,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -563,8 +551,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -574,7 +562,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -602,8 +589,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -613,7 +600,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -643,6 +629,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -669,6 +656,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -685,8 +673,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -711,7 +698,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -726,8 +712,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -757,8 +742,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -768,7 +753,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -796,8 +780,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -807,7 +791,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -829,7 +812,6 @@ "ctxt": 0 }, "value": "Generics", - "typeAnnotation": null, "optional": false }, "body": { @@ -850,7 +832,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -872,6 +853,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -888,8 +870,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -914,7 +895,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -953,7 +933,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -971,7 +950,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -993,7 +971,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1015,6 +992,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1031,8 +1009,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1057,7 +1034,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1079,7 +1055,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1107,7 +1082,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1141,6 +1115,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1167,6 +1142,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1183,8 +1159,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1209,7 +1184,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1224,8 +1198,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1257,6 +1230,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1279,7 +1253,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1305,7 +1278,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1313,8 +1285,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1344,8 +1315,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1355,7 +1326,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } } @@ -1383,8 +1353,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1394,7 +1364,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } } @@ -1409,7 +1378,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1431,6 +1399,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1447,8 +1416,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1473,7 +1441,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1495,7 +1462,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1523,7 +1489,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1557,6 +1522,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1583,6 +1549,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1599,8 +1566,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1625,7 +1591,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1640,8 +1605,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1671,8 +1635,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1682,7 +1646,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -1710,8 +1673,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1721,7 +1684,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } } @@ -1736,7 +1698,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1780,6 +1741,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1806,6 +1768,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1822,8 +1785,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1848,7 +1810,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1863,8 +1824,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1896,6 +1856,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1918,7 +1879,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1944,7 +1904,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1952,8 +1911,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1983,8 +1941,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1994,7 +1952,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } } @@ -2022,8 +1979,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2033,7 +1990,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } } @@ -2063,6 +2019,7 @@ "ctxt": 0 }, "value": "b4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2089,6 +2046,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2105,8 +2063,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2131,7 +2088,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2146,8 +2102,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2177,8 +2132,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2188,7 +2143,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } } @@ -2216,8 +2170,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2227,7 +2181,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } } @@ -2259,7 +2212,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2277,7 +2229,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer2/input.ts.json index 92f7ea601470..806a082ce8e8 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -241,7 +234,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -285,7 +277,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -310,6 +301,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -326,8 +318,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -352,7 +343,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -393,6 +383,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -415,13 +406,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -453,6 +442,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -479,6 +469,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -495,8 +486,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -521,7 +511,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -536,8 +525,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -567,8 +555,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -578,7 +566,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -606,8 +593,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -617,7 +604,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -647,6 +633,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -673,6 +660,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -689,8 +677,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -715,7 +702,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -730,8 +716,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -761,8 +746,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -772,7 +757,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -800,8 +784,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -811,7 +795,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -833,7 +816,6 @@ "ctxt": 0 }, "value": "Generics", - "typeAnnotation": null, "optional": false }, "body": { @@ -859,7 +841,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -886,7 +867,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -904,7 +884,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -933,6 +912,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -949,8 +929,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -975,7 +954,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1006,7 +984,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1027,7 +1004,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1053,7 +1029,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1081,6 +1056,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1097,8 +1073,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1123,7 +1098,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1164,6 +1138,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1190,6 +1165,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1206,8 +1182,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1232,7 +1207,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1247,8 +1221,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1280,6 +1253,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1302,7 +1276,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1328,7 +1301,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1336,8 +1308,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1367,8 +1338,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1378,7 +1349,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } } @@ -1406,8 +1376,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1417,7 +1387,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } } @@ -1437,7 +1406,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1458,7 +1426,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1484,7 +1451,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1512,6 +1478,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1528,8 +1495,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1554,7 +1520,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1595,6 +1560,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1621,6 +1587,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1637,8 +1604,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1663,7 +1629,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1678,8 +1643,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1709,8 +1673,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1720,7 +1684,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -1748,8 +1711,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1759,7 +1722,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } } @@ -1774,7 +1736,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1818,6 +1779,7 @@ "ctxt": 0 }, "value": "b3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1844,6 +1806,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1860,8 +1823,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1886,7 +1848,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1901,8 +1862,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1934,6 +1894,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1956,7 +1917,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1982,7 +1942,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1990,8 +1949,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2021,8 +1979,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2032,7 +1990,6 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, "optional": false } } @@ -2060,8 +2017,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2071,7 +2028,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } } @@ -2101,6 +2057,7 @@ "ctxt": 0 }, "value": "b4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2127,6 +2084,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2143,8 +2101,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2169,7 +2126,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2184,8 +2140,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2215,8 +2170,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2226,7 +2181,6 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, "optional": false } } @@ -2254,8 +2208,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2265,7 +2219,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false } } @@ -2297,7 +2250,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2315,7 +2267,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer3/input.ts.json index a3313c68bcb3..a76a121efd20 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer3/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -241,7 +234,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -295,6 +287,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -317,13 +310,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -355,6 +346,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -381,6 +373,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -397,8 +390,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -427,8 +419,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -458,8 +449,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -469,7 +460,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } } @@ -497,8 +487,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -508,7 +498,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -530,7 +519,6 @@ "ctxt": 0 }, "value": "Generics", - "typeAnnotation": null, "optional": false }, "body": { @@ -551,7 +539,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -573,6 +560,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -589,8 +577,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -615,7 +602,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -654,7 +640,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -672,7 +657,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -694,7 +678,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -738,6 +721,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -760,7 +744,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -786,7 +769,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -794,8 +776,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -827,6 +808,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -853,6 +835,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -869,8 +852,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -899,8 +881,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -930,8 +911,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -941,7 +922,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -969,8 +949,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -980,7 +960,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1012,7 +991,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1030,7 +1008,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance/input.ts.json index 0d414ae5c74b..2b33af41338b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "CallSignature", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -79,6 +77,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -95,8 +94,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -134,6 +132,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -150,8 +149,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -161,6 +159,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -177,8 +176,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -218,7 +216,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -239,7 +236,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -269,6 +265,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -285,8 +282,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -324,6 +320,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -340,8 +337,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -351,6 +347,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -367,8 +364,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -406,6 +402,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -428,13 +425,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -477,7 +472,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -504,7 +498,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -534,6 +527,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -550,8 +544,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -591,7 +584,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -612,7 +604,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -642,6 +633,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -658,8 +650,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -699,7 +690,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -720,7 +710,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -750,6 +739,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -772,13 +762,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -821,7 +809,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -853,7 +840,6 @@ "ctxt": 0 }, "value": "MemberWithCallSignature", - "typeAnnotation": null, "optional": false }, "body": { @@ -879,7 +865,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -909,7 +894,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -939,6 +923,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -955,8 +940,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -997,7 +981,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1027,6 +1010,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1043,8 +1027,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1054,6 +1037,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1070,8 +1054,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1112,7 +1095,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1142,6 +1124,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1164,13 +1147,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -1196,7 +1177,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1243,7 +1223,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1264,7 +1243,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1294,7 +1272,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1324,6 +1301,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1340,8 +1318,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1382,7 +1359,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1412,6 +1388,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1428,8 +1405,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1439,6 +1415,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1455,8 +1432,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1497,7 +1473,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1527,6 +1502,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1549,13 +1525,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -1581,7 +1555,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1628,7 +1601,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1658,7 +1630,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1688,6 +1659,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1704,8 +1676,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1746,7 +1717,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1776,6 +1746,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1798,13 +1769,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -1830,7 +1799,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1860,7 +1828,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1888,7 +1855,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1909,7 +1875,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1939,7 +1904,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1969,6 +1933,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1985,8 +1950,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -2029,7 +1993,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2050,7 +2013,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2080,7 +2042,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2110,6 +2071,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2132,13 +2094,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -2164,7 +2124,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance2/input.ts.json index dde6a99a04f6..ea62bcdb2a83 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "OtherDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -284,7 +275,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": null, @@ -324,7 +314,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -347,7 +336,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -377,7 +365,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -407,6 +394,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -423,8 +411,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -473,7 +460,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -503,6 +489,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -519,8 +506,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -569,7 +555,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -599,6 +584,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -615,8 +601,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -657,7 +642,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -687,6 +671,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -703,8 +688,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -714,6 +698,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -730,8 +715,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -772,7 +756,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -802,6 +785,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -825,6 +809,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -841,8 +826,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -864,8 +848,7 @@ } } } - }, - "optional": false + } } ], "typeParams": null, @@ -906,7 +889,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -936,6 +918,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -959,6 +942,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -981,13 +965,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1013,15 +995,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1047,7 +1027,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1073,7 +1052,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1103,6 +1081,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1126,6 +1105,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1148,13 +1128,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1180,15 +1158,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1215,6 +1191,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1237,13 +1214,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1269,7 +1244,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1297,7 +1271,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1327,6 +1300,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1350,6 +1324,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1372,13 +1347,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1404,15 +1377,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -1422,6 +1393,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1445,6 +1417,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1467,13 +1440,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1499,15 +1470,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1534,6 +1503,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1556,13 +1526,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1588,7 +1556,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1616,7 +1583,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1646,6 +1612,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1669,6 +1636,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1691,13 +1659,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1723,15 +1689,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -1741,6 +1705,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1764,6 +1729,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1786,13 +1752,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1818,15 +1782,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1853,6 +1815,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1875,13 +1838,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1907,7 +1868,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1935,7 +1895,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1977,8 +1936,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2009,7 +1968,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2041,7 +1999,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2067,7 +2024,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2097,6 +2053,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2128,7 +2085,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2156,8 +2112,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -2167,6 +2122,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2198,7 +2154,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2240,7 +2195,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2268,8 +2222,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -2295,7 +2248,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2321,7 +2273,6 @@ "ctxt": 0 }, "value": "a12", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2351,6 +2302,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2373,7 +2325,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2399,7 +2350,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2407,8 +2357,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -2418,6 +2367,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2440,7 +2390,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2466,7 +2415,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2474,8 +2422,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -2501,7 +2448,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2527,7 +2473,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2556,7 +2501,6 @@ "ctxt": 0 }, "value": "a13", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2586,6 +2530,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2608,7 +2553,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2634,7 +2578,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2642,8 +2585,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -2653,6 +2595,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2675,7 +2618,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2701,7 +2643,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2709,8 +2650,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -2736,7 +2676,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2762,7 +2701,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2791,7 +2729,6 @@ "ctxt": 0 }, "value": "a14", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2821,6 +2758,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2852,7 +2790,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2894,7 +2831,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2922,8 +2858,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -2949,7 +2884,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2975,7 +2909,6 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3013,6 +2946,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3029,8 +2963,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3076,6 +3009,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3092,8 +3026,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3144,7 +3077,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3182,6 +3114,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3204,13 +3137,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3261,7 +3192,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3279,7 +3209,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3305,6 +3234,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3327,13 +3257,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3384,7 +3312,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3402,7 +3329,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3433,7 +3359,6 @@ "ctxt": 0 }, "value": "a17", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3471,6 +3396,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3494,6 +3420,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3510,8 +3437,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -3533,8 +3459,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3580,6 +3505,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3603,6 +3529,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3619,8 +3546,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -3642,8 +3568,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3694,7 +3619,6 @@ "ctxt": 0 }, "value": "a18", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3732,6 +3656,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3763,6 +3688,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3779,8 +3705,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3818,6 +3743,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3834,8 +3760,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3859,8 +3784,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3906,6 +3830,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3937,6 +3862,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3953,8 +3879,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3992,6 +3917,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4014,13 +3940,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4045,7 +3969,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4055,8 +3978,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4109,7 +4031,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4130,7 +4051,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -4160,7 +4080,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4190,6 +4109,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4212,13 +4132,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4244,7 +4162,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4281,7 +4198,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4308,7 +4224,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4338,6 +4253,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4360,13 +4276,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4392,7 +4306,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4445,7 +4358,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4475,6 +4387,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4497,13 +4410,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4529,7 +4440,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4559,7 +4469,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4585,7 +4494,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4615,6 +4523,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4637,13 +4546,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -4653,6 +4560,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4675,13 +4583,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4707,7 +4613,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4728,7 +4633,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4758,7 +4662,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4784,7 +4687,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4814,6 +4716,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4837,6 +4740,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4859,13 +4763,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4891,15 +4793,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -4925,7 +4825,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4946,7 +4845,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4976,7 +4874,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5002,7 +4899,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5032,6 +4928,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5055,6 +4952,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5077,13 +4975,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5109,15 +5005,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -5143,7 +5037,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5161,7 +5054,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5183,7 +5075,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5201,7 +5092,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5232,7 +5122,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5258,7 +5147,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5288,6 +5176,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5311,6 +5200,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5333,13 +5223,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5365,15 +5253,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -5399,7 +5285,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5417,7 +5302,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5439,7 +5323,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5457,7 +5340,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5489,6 +5371,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5511,13 +5394,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5543,7 +5424,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5571,7 +5451,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5601,6 +5480,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5624,6 +5504,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5646,13 +5527,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5678,15 +5557,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -5696,6 +5573,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5719,6 +5597,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5741,13 +5620,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5773,15 +5650,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -5807,7 +5682,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5825,7 +5699,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5847,7 +5720,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5865,7 +5737,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5897,6 +5768,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5919,13 +5791,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5951,7 +5821,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5979,7 +5848,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6009,6 +5877,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6032,6 +5901,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6054,13 +5924,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6086,15 +5954,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -6104,6 +5970,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6127,6 +5994,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6158,7 +6026,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6200,7 +6067,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6228,8 +6094,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -6255,15 +6120,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -6289,7 +6152,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6307,7 +6169,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6329,7 +6190,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6347,7 +6207,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6379,6 +6238,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6401,13 +6261,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6433,7 +6291,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6461,7 +6318,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6503,8 +6359,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -6535,7 +6391,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6567,7 +6422,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6585,7 +6439,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6616,7 +6469,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6642,7 +6494,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6672,6 +6523,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6694,13 +6546,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -6710,6 +6560,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6732,13 +6583,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6764,7 +6613,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6782,7 +6630,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6813,7 +6660,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6839,7 +6685,6 @@ "ctxt": 0 }, "value": "a12", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6869,6 +6714,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6891,7 +6737,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6917,7 +6762,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6925,8 +6769,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -6936,6 +6779,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6958,13 +6802,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6990,7 +6832,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7008,7 +6849,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7034,7 +6874,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7068,7 +6907,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7094,7 +6932,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7123,7 +6960,6 @@ "ctxt": 0 }, "value": "a13", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7153,6 +6989,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7175,7 +7012,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7201,7 +7037,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7209,8 +7044,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -7220,6 +7054,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7242,13 +7077,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -7274,7 +7107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7292,7 +7124,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7318,7 +7149,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7352,7 +7182,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7378,7 +7207,6 @@ "ctxt": 0 }, "value": "a14", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7408,6 +7236,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7439,7 +7268,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7468,7 +7296,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7492,7 +7319,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7521,7 +7347,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7531,8 +7356,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -7558,7 +7382,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7579,7 +7402,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7609,7 +7431,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7635,7 +7456,6 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7665,6 +7485,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7687,13 +7508,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -7719,7 +7538,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7756,7 +7574,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7783,7 +7600,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7813,6 +7629,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7835,13 +7652,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -7867,7 +7682,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7885,7 +7699,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7939,7 +7752,6 @@ "ctxt": 0 }, "value": "a17", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7969,6 +7781,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7992,6 +7805,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8014,13 +7828,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -8046,15 +7858,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -8080,7 +7890,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8117,7 +7926,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8144,7 +7952,6 @@ "ctxt": 0 }, "value": "a18", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8174,6 +7981,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8197,6 +8005,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8219,13 +8028,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -8251,15 +8058,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -8285,7 +8090,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8322,7 +8126,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance3/input.ts.json index 4cb8d6044c23..6288d22d9794 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance3/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Errors", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -118,7 +115,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -144,7 +140,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -202,7 +196,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -228,7 +221,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -268,7 +260,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -286,7 +277,6 @@ "ctxt": 0 }, "value": "OtherDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -312,7 +302,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": null, @@ -352,7 +341,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -377,7 +365,6 @@ "ctxt": 0 }, "value": "WithNonGenericSignaturesInBaseType", - "typeAnnotation": null, "optional": false }, "body": { @@ -403,7 +390,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -433,7 +419,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -463,6 +448,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -479,8 +465,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -529,7 +514,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -559,6 +543,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -582,6 +567,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -604,13 +590,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -636,15 +620,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -671,6 +653,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -693,13 +676,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -725,7 +706,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -753,7 +733,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -783,6 +762,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -806,6 +786,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -828,13 +809,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -860,15 +839,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -878,6 +855,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -901,6 +879,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -923,13 +902,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -955,15 +932,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -990,6 +965,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1012,13 +988,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1044,7 +1018,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1072,7 +1045,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1114,8 +1086,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1146,7 +1118,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1178,7 +1149,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1204,7 +1174,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1234,6 +1203,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1265,7 +1235,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1293,8 +1262,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -1304,6 +1272,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1335,7 +1304,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1377,7 +1345,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1405,8 +1372,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -1432,7 +1398,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1458,7 +1423,6 @@ "ctxt": 0 }, "value": "a12", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1488,6 +1452,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1510,7 +1475,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1536,7 +1500,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1544,8 +1507,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -1555,6 +1517,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1577,7 +1540,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1603,7 +1565,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1611,8 +1572,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -1638,7 +1598,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1664,7 +1623,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1693,7 +1651,6 @@ "ctxt": 0 }, "value": "a14", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1731,6 +1688,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1747,8 +1705,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1794,6 +1751,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1810,8 +1768,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1862,7 +1819,6 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1892,6 +1848,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1923,7 +1880,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1965,7 +1921,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1993,8 +1948,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -2035,7 +1989,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2073,6 +2026,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2104,6 +2058,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2120,8 +2075,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2159,6 +2113,7 @@ "ctxt": 0 }, "value": "a", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2175,8 +2130,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -2200,8 +2154,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2247,6 +2200,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2278,6 +2232,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2294,8 +2249,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2333,6 +2287,7 @@ "ctxt": 0 }, "value": "a", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2349,8 +2304,7 @@ }, "kind": "boolean" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -2374,8 +2328,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2426,7 +2379,6 @@ "ctxt": 0 }, "value": "a17", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2464,6 +2416,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2495,6 +2448,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2517,13 +2471,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2548,7 +2500,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2577,7 +2528,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2595,7 +2545,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2621,6 +2570,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2643,13 +2593,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2674,7 +2622,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2703,7 +2650,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2721,7 +2667,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2733,8 +2678,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2780,6 +2724,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2811,6 +2756,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2833,13 +2779,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2864,7 +2808,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2893,7 +2836,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2911,7 +2853,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2937,6 +2878,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2959,13 +2901,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2990,7 +2930,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3019,7 +2958,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3037,7 +2975,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3049,8 +2986,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3103,7 +3039,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3124,7 +3059,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3154,7 +3088,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3184,6 +3117,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3206,13 +3140,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3238,7 +3170,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3259,7 +3190,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3296,7 +3226,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3325,7 +3254,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3352,7 +3280,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3373,7 +3300,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3397,7 +3323,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3427,7 +3352,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3457,6 +3381,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3479,13 +3404,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3518,7 +3441,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3547,7 +3469,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3568,7 +3489,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3598,7 +3518,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3628,6 +3547,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3651,6 +3571,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3673,13 +3594,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3705,15 +3624,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -3739,7 +3656,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3757,7 +3673,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3779,7 +3694,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3797,7 +3711,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3819,7 +3732,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3837,7 +3749,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3869,6 +3780,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3891,13 +3803,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3923,7 +3833,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3953,7 +3862,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3974,7 +3882,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -4004,7 +3911,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4034,6 +3940,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4057,6 +3964,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4079,13 +3987,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4111,15 +4017,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -4129,6 +4033,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4152,6 +4057,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4183,7 +4089,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4211,8 +4116,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -4238,15 +4142,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -4272,7 +4174,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4290,7 +4191,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4312,7 +4212,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4330,7 +4229,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4362,6 +4260,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4384,13 +4283,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4416,7 +4313,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4446,7 +4342,6 @@ "ctxt": 0 }, "value": "I4B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4467,7 +4362,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -4497,7 +4391,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4539,8 +4432,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -4571,7 +4464,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4603,7 +4495,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4621,7 +4512,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4652,7 +4542,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4680,7 +4569,6 @@ "ctxt": 0 }, "value": "I4C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4701,7 +4589,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -4731,7 +4618,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4761,6 +4647,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4783,13 +4670,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -4799,6 +4684,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4821,13 +4707,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4853,7 +4737,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4871,7 +4754,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4902,7 +4784,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4930,7 +4811,6 @@ "ctxt": 0 }, "value": "I4E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4951,7 +4831,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -4981,7 +4860,6 @@ "ctxt": 0 }, "value": "a12", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5011,6 +4889,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5033,7 +4912,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5059,7 +4937,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5067,8 +4944,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -5078,6 +4954,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5100,7 +4977,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5126,7 +5002,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5134,8 +5009,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": { @@ -5161,7 +5035,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5179,7 +5052,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5205,7 +5077,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5239,7 +5110,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5267,7 +5137,6 @@ "ctxt": 0 }, "value": "I6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5288,7 +5157,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -5318,7 +5186,6 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5348,6 +5215,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5379,7 +5247,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5408,7 +5275,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5432,7 +5298,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5461,7 +5326,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5471,8 +5335,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -5498,7 +5361,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5528,7 +5390,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5556,7 +5417,6 @@ "ctxt": 0 }, "value": "I7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5577,7 +5437,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -5607,7 +5466,6 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5637,6 +5495,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5668,7 +5527,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5697,7 +5555,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5721,7 +5578,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5750,7 +5606,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5760,8 +5615,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -5787,7 +5641,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5805,7 +5658,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5853,7 +5705,6 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5874,7 +5725,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -5904,7 +5754,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5934,6 +5783,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5957,6 +5807,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5979,13 +5830,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6011,15 +5860,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -6045,7 +5892,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6082,7 +5928,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6111,7 +5956,6 @@ "ctxt": 0 }, "value": "I9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6132,7 +5976,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -6162,7 +6005,6 @@ "ctxt": 0 }, "value": "a17", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6192,6 +6034,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6215,6 +6058,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6237,13 +6081,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6269,15 +6111,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -6303,7 +6143,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6363,7 +6202,6 @@ "ctxt": 0 }, "value": "WithGenericSignaturesInBaseType", - "typeAnnotation": null, "optional": false }, "body": { @@ -6389,7 +6227,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6419,7 +6256,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6449,6 +6285,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6471,13 +6308,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6503,7 +6338,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6540,7 +6374,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6569,7 +6402,6 @@ "ctxt": 0 }, "value": "I6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6590,7 +6422,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -6620,7 +6451,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6650,6 +6480,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6672,13 +6503,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6704,7 +6533,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6759,7 +6587,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6789,7 +6616,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6819,6 +6645,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6841,13 +6668,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6873,7 +6698,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6928,7 +6752,6 @@ "ctxt": 0 }, "value": "I7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6949,7 +6772,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -6979,7 +6801,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7009,6 +6830,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7031,13 +6853,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -7063,7 +6883,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7100,7 +6919,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance4/input.ts.json index 31d8fb19f827..bd642af0d49a 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "OtherDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -284,7 +275,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": null, @@ -324,7 +314,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -347,7 +336,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -377,7 +365,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -407,6 +394,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -429,13 +417,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -461,7 +447,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -498,7 +483,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -525,7 +509,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -555,6 +538,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -577,13 +561,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -609,7 +591,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -662,7 +643,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -692,6 +672,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -714,13 +695,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -746,7 +725,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -791,7 +769,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -821,6 +798,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -843,13 +821,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -859,6 +835,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -881,13 +858,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -913,7 +888,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -934,7 +908,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -979,7 +952,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1009,6 +981,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1032,6 +1005,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1054,13 +1028,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1086,15 +1058,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -1120,7 +1090,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1141,7 +1110,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1171,7 +1139,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1197,7 +1164,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1227,6 +1193,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1250,6 +1217,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1272,13 +1240,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1304,15 +1270,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -1338,7 +1302,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1356,7 +1319,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1387,7 +1349,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1413,7 +1374,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1443,6 +1403,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1474,7 +1435,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1503,7 +1463,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1513,8 +1472,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -1524,6 +1482,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1555,7 +1514,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1584,7 +1542,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1608,7 +1565,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1637,7 +1593,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1647,8 +1602,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -1674,7 +1628,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1704,7 +1657,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1730,7 +1682,6 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1760,6 +1711,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1791,7 +1743,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1820,7 +1771,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1844,7 +1794,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1873,7 +1822,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1883,8 +1831,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -1910,7 +1857,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1947,7 +1893,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1974,7 +1919,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2004,6 +1948,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2035,7 +1980,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2064,7 +2008,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2088,7 +2031,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2117,7 +2059,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2127,8 +2068,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -2154,7 +2094,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2172,7 +2111,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2210,7 +2148,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2237,7 +2174,6 @@ "ctxt": 0 }, "value": "a17", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2275,6 +2211,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2298,6 +2235,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2320,13 +2258,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2352,15 +2288,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2392,7 +2326,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2422,7 +2355,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2440,7 +2372,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2466,6 +2397,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2489,6 +2421,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2511,13 +2444,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2543,15 +2474,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2583,7 +2512,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2613,7 +2541,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2631,7 +2558,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2662,7 +2588,6 @@ "ctxt": 0 }, "value": "a18", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2700,6 +2625,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2731,6 +2657,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2753,13 +2680,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2784,7 +2709,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2813,7 +2737,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2831,7 +2754,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2857,6 +2779,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2879,13 +2802,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2910,7 +2831,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2939,7 +2859,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2957,7 +2876,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2969,8 +2887,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3016,6 +2933,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3047,6 +2965,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3069,13 +2988,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3100,7 +3017,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3129,7 +3045,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3147,7 +3062,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3173,6 +3087,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3195,13 +3110,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3226,7 +3139,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3255,7 +3167,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3273,7 +3184,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3285,8 +3195,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3339,7 +3248,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3360,7 +3268,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3390,7 +3297,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3420,6 +3326,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3442,13 +3349,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3474,7 +3379,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3511,7 +3415,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3538,7 +3441,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3568,6 +3470,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3590,13 +3493,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3622,7 +3523,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3675,7 +3575,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3705,6 +3604,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3727,13 +3627,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3759,7 +3657,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3789,7 +3686,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3815,7 +3711,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3845,6 +3740,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3867,13 +3763,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -3883,6 +3777,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3905,13 +3800,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3937,7 +3830,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3958,7 +3850,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4003,7 +3894,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4033,6 +3923,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4056,6 +3947,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4078,13 +3970,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4110,15 +4000,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -4144,7 +4032,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4165,7 +4052,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4195,7 +4081,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4221,7 +4106,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4251,6 +4135,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4274,6 +4159,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4296,13 +4182,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4328,15 +4212,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -4362,7 +4244,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4380,7 +4261,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4402,7 +4282,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4420,7 +4299,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4451,7 +4329,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4477,7 +4354,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4507,6 +4383,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4538,7 +4415,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4567,7 +4443,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4577,8 +4452,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -4588,6 +4462,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4619,7 +4494,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4648,7 +4522,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4672,7 +4545,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4701,7 +4573,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4711,8 +4582,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -4738,7 +4608,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4759,7 +4628,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4789,7 +4657,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4815,7 +4682,6 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4845,6 +4711,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4876,7 +4743,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4905,7 +4771,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4929,7 +4794,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4958,7 +4822,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4968,8 +4831,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -4995,7 +4857,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5016,7 +4877,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5053,7 +4913,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5080,7 +4939,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5110,6 +4968,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5141,7 +5000,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5170,7 +5028,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5194,7 +5051,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5223,7 +5079,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5233,8 +5088,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -5260,7 +5114,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5297,7 +5150,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5324,7 +5176,6 @@ "ctxt": 0 }, "value": "a17", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5354,6 +5205,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5377,6 +5229,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5399,13 +5252,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5431,15 +5282,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -5465,7 +5314,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5502,7 +5350,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5529,7 +5376,6 @@ "ctxt": 0 }, "value": "a18", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5559,6 +5405,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5582,6 +5429,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5604,13 +5452,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -5636,7 +5482,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5666,15 +5511,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance5/input.ts.json index 6f9e9f83fa51..3ab62aa97707 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "OtherDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -284,7 +275,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": null, @@ -324,7 +314,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -347,7 +336,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -377,7 +365,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -407,6 +394,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -423,8 +411,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -473,7 +460,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -503,6 +489,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -519,8 +506,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -569,7 +555,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -599,6 +584,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -615,8 +601,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -657,7 +642,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -687,6 +671,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -703,8 +688,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -714,6 +698,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -730,8 +715,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -772,7 +756,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -802,6 +785,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -825,6 +809,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -841,8 +826,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -864,8 +848,7 @@ } } } - }, - "optional": false + } } ], "typeParams": null, @@ -906,7 +889,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -936,6 +918,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -959,6 +942,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -981,13 +965,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1013,15 +995,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1047,7 +1027,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1073,7 +1052,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1103,6 +1081,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1126,6 +1105,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1148,13 +1128,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1180,15 +1158,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1215,6 +1191,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1237,13 +1214,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1269,7 +1244,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1297,7 +1271,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1327,6 +1300,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1350,6 +1324,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1372,13 +1347,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1404,15 +1377,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -1422,6 +1393,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1445,6 +1417,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1467,13 +1440,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1499,15 +1470,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1534,6 +1503,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1556,13 +1526,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1588,7 +1556,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1616,7 +1583,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1646,6 +1612,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1669,6 +1636,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1691,13 +1659,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1723,15 +1689,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -1741,6 +1705,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1764,6 +1729,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1786,13 +1752,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1818,15 +1782,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1853,6 +1815,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1875,13 +1838,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1907,7 +1868,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1935,7 +1895,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1977,8 +1936,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2009,7 +1968,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2041,7 +1999,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2067,7 +2024,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2097,6 +2053,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2128,7 +2085,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2156,8 +2112,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -2167,6 +2122,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2198,7 +2154,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2240,7 +2195,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2268,8 +2222,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -2295,7 +2248,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2321,7 +2273,6 @@ "ctxt": 0 }, "value": "a12", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2351,6 +2302,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2373,7 +2325,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2399,7 +2350,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2407,8 +2357,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -2418,6 +2367,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2440,7 +2390,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2466,7 +2415,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2474,8 +2422,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -2501,7 +2448,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2527,7 +2473,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2556,7 +2501,6 @@ "ctxt": 0 }, "value": "a13", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2586,6 +2530,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2608,7 +2553,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2634,7 +2578,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2642,8 +2585,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -2653,6 +2595,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2675,7 +2618,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2701,7 +2643,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2709,8 +2650,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -2736,7 +2676,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2762,7 +2701,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2791,7 +2729,6 @@ "ctxt": 0 }, "value": "a14", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2821,6 +2758,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2852,7 +2790,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2894,7 +2831,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2922,8 +2858,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -2949,7 +2884,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2977,7 +2911,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2998,7 +2931,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3028,7 +2960,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3058,6 +2989,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3080,13 +3012,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3112,7 +3042,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3149,7 +3078,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3178,7 +3106,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3199,7 +3126,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3229,7 +3155,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3259,6 +3184,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3281,13 +3207,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3313,7 +3237,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3350,7 +3273,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3377,7 +3299,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3407,6 +3328,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3429,13 +3351,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3461,7 +3381,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3514,7 +3433,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3544,6 +3462,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3566,13 +3485,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3598,7 +3515,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3628,7 +3544,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3654,7 +3569,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3684,6 +3598,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3706,13 +3621,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -3722,6 +3635,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3744,13 +3658,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3776,7 +3688,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3797,7 +3708,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3827,7 +3737,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3853,7 +3762,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3883,6 +3791,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3906,6 +3815,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3928,13 +3838,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3960,15 +3868,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -3994,7 +3900,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4015,7 +3920,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4045,7 +3949,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4071,7 +3974,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4101,6 +4003,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4124,6 +4027,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4146,13 +4050,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4178,15 +4080,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -4212,7 +4112,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4230,7 +4129,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4252,7 +4150,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4270,7 +4167,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4301,7 +4197,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4327,7 +4222,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4357,6 +4251,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4380,6 +4275,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4402,13 +4298,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4434,15 +4328,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -4468,7 +4360,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4486,7 +4377,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4508,7 +4398,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4526,7 +4415,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4558,6 +4446,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4580,13 +4469,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4612,7 +4499,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4640,7 +4526,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4670,6 +4555,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4693,6 +4579,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4715,13 +4602,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4747,15 +4632,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -4765,6 +4648,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4788,6 +4672,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4810,13 +4695,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4842,15 +4725,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -4876,7 +4757,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4894,7 +4774,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4916,7 +4795,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4934,7 +4812,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4966,6 +4843,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4988,13 +4866,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5020,7 +4896,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5048,7 +4923,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5078,6 +4952,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5101,6 +4976,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5123,13 +4999,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5155,15 +5029,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -5173,6 +5045,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5196,6 +5069,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5227,7 +5101,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5269,7 +5142,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5297,8 +5169,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -5324,15 +5195,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -5358,7 +5227,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5376,7 +5244,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5398,7 +5265,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5416,7 +5282,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5448,6 +5313,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5470,13 +5336,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5502,7 +5366,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5530,7 +5393,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5572,8 +5434,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -5604,7 +5466,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5636,7 +5497,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5654,7 +5514,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5685,7 +5544,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5711,7 +5569,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5741,6 +5598,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5763,13 +5621,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -5779,6 +5635,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5801,13 +5658,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -5833,7 +5688,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5851,7 +5705,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5882,7 +5735,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5908,7 +5760,6 @@ "ctxt": 0 }, "value": "a12", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5938,6 +5789,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5960,7 +5812,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5986,7 +5837,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5994,8 +5844,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -6005,6 +5854,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6027,13 +5877,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6059,7 +5907,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6077,7 +5924,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6103,7 +5949,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6137,7 +5982,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6163,7 +6007,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6192,7 +6035,6 @@ "ctxt": 0 }, "value": "a13", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6222,6 +6064,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6244,7 +6087,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6270,7 +6112,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6278,8 +6119,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -6289,6 +6129,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6311,13 +6152,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6343,7 +6182,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6361,7 +6199,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6387,7 +6224,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6421,7 +6257,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6447,7 +6282,6 @@ "ctxt": 0 }, "value": "a14", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6477,6 +6311,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6508,7 +6343,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6537,7 +6371,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6561,7 +6394,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6590,7 +6422,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6600,8 +6431,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -6627,7 +6457,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6648,7 +6477,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6678,7 +6506,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance6/input.ts.json index 907fd0924ff9..b34f5b31e304 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "OtherDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -284,7 +275,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": null, @@ -324,7 +314,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -347,7 +336,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -377,7 +365,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -407,6 +394,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -429,13 +417,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -461,7 +447,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -498,7 +483,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -525,7 +509,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -555,6 +538,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -577,13 +561,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -609,7 +591,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -662,7 +643,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -692,6 +672,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -714,13 +695,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -746,7 +725,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -791,7 +769,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -821,6 +798,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -843,13 +821,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -859,6 +835,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -881,13 +858,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -913,7 +888,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -934,7 +908,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -979,7 +952,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1009,6 +981,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1032,6 +1005,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1054,13 +1028,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1086,15 +1058,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -1120,7 +1090,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1141,7 +1110,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1171,7 +1139,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1197,7 +1164,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1227,6 +1193,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1250,6 +1217,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1272,13 +1240,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1304,15 +1270,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -1338,7 +1302,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1356,7 +1319,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1387,7 +1349,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1413,7 +1374,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1443,6 +1403,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1474,7 +1435,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1503,7 +1463,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1513,8 +1472,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -1524,6 +1482,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1555,7 +1514,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1584,7 +1542,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1608,7 +1565,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1637,7 +1593,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1647,8 +1602,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -1674,7 +1628,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1704,7 +1657,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1730,7 +1682,6 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1760,6 +1711,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1791,7 +1743,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1820,7 +1771,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1844,7 +1794,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1873,7 +1822,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1883,8 +1831,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -1910,7 +1857,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1947,7 +1893,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1974,7 +1919,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2004,6 +1948,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2035,7 +1980,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2064,7 +2008,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2088,7 +2031,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2117,7 +2059,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2127,8 +2068,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -2154,7 +2094,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2172,7 +2111,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2210,7 +2148,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2239,7 +2176,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2266,7 +2202,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2290,7 +2225,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2320,7 +2254,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2350,6 +2283,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2372,13 +2306,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2411,7 +2343,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2440,7 +2371,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2467,7 +2397,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2491,7 +2420,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2521,7 +2449,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2551,6 +2478,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2573,13 +2501,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2630,7 +2556,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2657,7 +2582,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2681,7 +2605,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2711,7 +2634,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2741,6 +2663,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2763,13 +2686,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2795,7 +2716,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2823,7 +2743,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2850,7 +2769,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2874,7 +2792,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2904,7 +2821,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2934,6 +2850,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2956,13 +2873,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2972,6 +2887,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2994,13 +2910,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3026,7 +2940,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3073,7 +2986,6 @@ "ctxt": 0 }, "value": "I5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3100,7 +3012,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3124,7 +3035,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3154,7 +3064,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3184,6 +3093,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3207,6 +3117,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3229,13 +3140,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3261,15 +3170,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -3295,7 +3202,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3325,7 +3231,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3353,7 +3258,6 @@ "ctxt": 0 }, "value": "I7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3380,7 +3284,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3404,7 +3307,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3434,7 +3336,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3464,6 +3365,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3495,7 +3397,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3524,7 +3425,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3534,8 +3434,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -3545,6 +3444,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3576,7 +3476,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3605,7 +3504,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3629,7 +3527,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3658,7 +3555,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3668,8 +3564,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -3695,7 +3590,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3725,7 +3619,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3753,7 +3646,6 @@ "ctxt": 0 }, "value": "I9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3780,7 +3672,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3804,7 +3695,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3834,7 +3724,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3864,6 +3753,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3895,7 +3785,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3924,7 +3813,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3948,7 +3836,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3977,7 +3864,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3987,8 +3873,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -4021,7 +3906,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance/input.ts.json index 86710df6f18e..8f7e4f8a1f40 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "ConstructSignature", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -79,6 +77,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -95,8 +94,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -134,6 +132,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -150,8 +149,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -161,6 +159,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -177,8 +176,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -218,7 +216,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -239,7 +236,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -269,6 +265,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -285,8 +282,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -324,6 +320,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -340,8 +337,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -351,6 +347,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -367,8 +364,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -408,7 +404,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -438,6 +433,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -454,8 +450,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -495,7 +490,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -516,7 +510,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -546,6 +539,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -562,8 +556,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -603,7 +596,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -624,7 +616,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -654,6 +645,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -676,13 +668,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -725,7 +715,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -757,7 +746,6 @@ "ctxt": 0 }, "value": "MemberWithConstructSignature", - "typeAnnotation": null, "optional": false }, "body": { @@ -783,7 +771,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -813,7 +800,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -843,6 +829,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -859,8 +846,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -902,7 +888,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -932,6 +917,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -948,8 +934,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -959,6 +944,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -975,8 +961,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1018,7 +1003,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1048,6 +1032,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1070,13 +1055,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -1102,7 +1085,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1160,6 +1142,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1182,13 +1165,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1220,8 +1201,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1245,7 +1226,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "property": { @@ -1256,7 +1236,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1296,7 +1275,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1317,7 +1295,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1347,7 +1324,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1377,6 +1353,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1393,8 +1370,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1436,7 +1412,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1466,6 +1441,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1482,8 +1458,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1493,6 +1468,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1509,8 +1485,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1552,7 +1527,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1582,6 +1556,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1604,13 +1579,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -1636,7 +1609,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1684,7 +1656,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1714,7 +1685,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1744,6 +1714,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1760,8 +1731,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1803,7 +1773,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1833,6 +1802,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1855,13 +1825,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -1887,7 +1855,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1917,7 +1884,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1946,7 +1912,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1967,7 +1932,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1997,7 +1961,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2027,6 +1990,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2043,8 +2007,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -2088,7 +2051,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2109,7 +2071,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2139,7 +2100,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2169,6 +2129,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2191,13 +2152,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -2223,7 +2182,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance2/input.ts.json index 18a72fadea01..7c0e874952af 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "OtherDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -284,7 +275,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": null, @@ -324,7 +314,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -347,7 +336,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -377,7 +365,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -407,6 +394,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -423,8 +411,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -474,7 +461,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -504,6 +490,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -520,8 +507,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -571,7 +557,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -601,6 +586,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -617,8 +603,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -660,7 +645,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -690,6 +674,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -706,8 +691,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -717,6 +701,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -733,8 +718,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -776,7 +760,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -806,6 +789,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -829,6 +813,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -845,8 +830,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -868,8 +852,7 @@ } } } - }, - "optional": false + } } ], "typeParams": null, @@ -911,7 +894,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -941,6 +923,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -964,6 +947,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -986,13 +970,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1018,15 +1000,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1052,7 +1032,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1079,7 +1058,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1109,6 +1087,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1132,6 +1111,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1154,13 +1134,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1186,15 +1164,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1221,6 +1197,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1243,13 +1220,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1275,7 +1250,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1304,7 +1278,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1334,6 +1307,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1357,6 +1331,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1379,13 +1354,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1411,15 +1384,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -1429,6 +1400,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1452,6 +1424,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1474,13 +1447,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1506,15 +1477,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1541,6 +1510,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1563,13 +1533,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1595,7 +1563,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1624,7 +1591,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1654,6 +1620,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1677,6 +1644,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1699,13 +1667,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1731,15 +1697,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -1749,6 +1713,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1772,6 +1737,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1794,13 +1760,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1826,15 +1790,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1861,6 +1823,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1883,13 +1846,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1915,7 +1876,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1944,7 +1904,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1986,8 +1945,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2018,7 +1977,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2050,7 +2008,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2077,7 +2034,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2107,6 +2063,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2138,7 +2095,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2166,8 +2122,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -2177,6 +2132,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2208,7 +2164,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2250,7 +2205,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2278,8 +2232,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -2305,7 +2258,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2332,7 +2284,6 @@ "ctxt": 0 }, "value": "a12", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2362,6 +2313,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2384,7 +2336,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2410,7 +2361,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2418,8 +2368,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -2429,6 +2378,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2451,7 +2401,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2477,7 +2426,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2485,8 +2433,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -2512,7 +2459,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2538,7 +2484,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2568,7 +2513,6 @@ "ctxt": 0 }, "value": "a13", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2598,6 +2542,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2620,7 +2565,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2646,7 +2590,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2654,8 +2597,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -2665,6 +2607,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2687,7 +2630,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2713,7 +2655,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2721,8 +2662,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -2748,7 +2688,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2774,7 +2713,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2804,7 +2742,6 @@ "ctxt": 0 }, "value": "a14", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2834,6 +2771,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2865,7 +2803,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2907,7 +2844,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2935,8 +2871,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -2962,7 +2897,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2989,7 +2923,6 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3027,6 +2960,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3043,8 +2977,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3090,6 +3023,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3106,8 +3040,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3158,7 +3091,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3196,6 +3128,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3218,13 +3151,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3275,7 +3206,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3293,7 +3223,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3319,6 +3248,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3341,13 +3271,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3398,7 +3326,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3416,7 +3343,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3447,7 +3373,6 @@ "ctxt": 0 }, "value": "a17", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3485,6 +3410,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3508,6 +3434,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3524,8 +3451,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -3548,8 +3474,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3595,6 +3520,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3618,6 +3544,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3634,8 +3561,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -3658,8 +3584,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3710,7 +3635,6 @@ "ctxt": 0 }, "value": "a18", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3748,6 +3672,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3779,6 +3704,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3795,8 +3721,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3834,6 +3759,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3850,8 +3776,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3875,8 +3800,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3922,6 +3846,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3953,6 +3878,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3969,8 +3895,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4008,6 +3933,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4030,13 +3956,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4061,7 +3985,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4071,8 +3994,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4125,7 +4047,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4146,7 +4067,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -4176,7 +4096,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4206,6 +4125,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4228,13 +4148,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4260,7 +4178,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4297,7 +4214,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4325,7 +4241,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4355,6 +4270,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4377,13 +4293,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4409,7 +4323,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4463,7 +4376,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4493,6 +4405,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4515,13 +4428,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4547,7 +4458,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4577,7 +4487,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4604,7 +4513,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4634,6 +4542,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4656,13 +4565,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -4672,6 +4579,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4694,13 +4602,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4726,7 +4632,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4747,7 +4652,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4777,7 +4681,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4804,7 +4707,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4834,6 +4736,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4857,6 +4760,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4879,13 +4783,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4911,15 +4813,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -4945,7 +4845,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4966,7 +4865,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4996,7 +4894,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5023,7 +4920,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5053,6 +4949,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5076,6 +4973,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5098,13 +4996,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5130,15 +5026,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -5164,7 +5058,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5182,7 +5075,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5204,7 +5096,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5222,7 +5113,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5253,7 +5143,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5280,7 +5169,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5310,6 +5198,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5333,6 +5222,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5355,13 +5245,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5387,15 +5275,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -5421,7 +5307,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5439,7 +5324,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5461,7 +5345,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5479,7 +5362,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5511,6 +5393,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5533,13 +5416,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5565,7 +5446,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5594,7 +5474,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5624,6 +5503,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5647,6 +5527,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5669,13 +5550,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5701,15 +5580,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -5719,6 +5596,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5742,6 +5620,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5764,13 +5643,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5796,15 +5673,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -5830,7 +5705,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5848,7 +5722,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5870,7 +5743,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5888,7 +5760,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5920,6 +5791,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5942,13 +5814,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5974,7 +5844,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6003,7 +5872,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6033,6 +5901,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6056,6 +5925,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6078,13 +5948,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6110,15 +5978,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -6128,6 +5994,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6151,6 +6018,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6182,7 +6050,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6224,7 +6091,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6252,8 +6118,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -6279,15 +6144,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -6313,7 +6176,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6331,7 +6193,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6353,7 +6214,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6371,7 +6231,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6403,6 +6262,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6425,13 +6285,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6457,7 +6315,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6486,7 +6343,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6528,8 +6384,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -6560,7 +6416,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6592,7 +6447,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6610,7 +6464,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6641,7 +6494,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6668,7 +6520,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6698,6 +6549,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6720,13 +6572,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -6736,6 +6586,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6758,13 +6609,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6790,7 +6639,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6808,7 +6656,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6839,7 +6686,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6866,7 +6712,6 @@ "ctxt": 0 }, "value": "a12", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6896,6 +6741,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6918,7 +6764,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6944,7 +6789,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6952,8 +6796,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -6963,6 +6806,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6985,13 +6829,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -7017,7 +6859,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7035,7 +6876,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7061,7 +6901,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7095,7 +6934,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7121,7 +6959,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7151,7 +6988,6 @@ "ctxt": 0 }, "value": "a13", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7181,6 +7017,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7203,7 +7040,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7229,7 +7065,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7237,8 +7072,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -7248,6 +7082,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7270,13 +7105,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -7302,7 +7135,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7320,7 +7152,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7346,7 +7177,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7380,7 +7210,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7407,7 +7236,6 @@ "ctxt": 0 }, "value": "a14", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7437,6 +7265,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7468,7 +7297,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7497,7 +7325,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7521,7 +7348,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7550,7 +7376,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7560,8 +7385,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -7587,7 +7411,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7608,7 +7431,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7638,7 +7460,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7665,7 +7486,6 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7695,6 +7515,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7717,13 +7538,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -7749,7 +7568,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7786,7 +7604,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7814,7 +7631,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7844,6 +7660,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7866,13 +7683,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -7898,7 +7713,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7916,7 +7730,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7971,7 +7784,6 @@ "ctxt": 0 }, "value": "a17", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8001,6 +7813,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8024,6 +7837,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8046,13 +7860,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -8078,7 +7890,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8086,8 +7897,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": { @@ -8113,7 +7923,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8150,7 +7959,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8178,7 +7986,6 @@ "ctxt": 0 }, "value": "a18", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8208,6 +8015,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8231,6 +8039,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8253,13 +8062,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -8285,7 +8092,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8293,8 +8099,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": { @@ -8320,7 +8125,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8357,7 +8161,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance3/input.ts.json index 9038e8d6905a..7bc9c41a92cb 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance3/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Errors", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -118,7 +115,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -144,7 +140,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -202,7 +196,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -228,7 +221,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -268,7 +260,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -286,7 +277,6 @@ "ctxt": 0 }, "value": "OtherDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -312,7 +302,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": null, @@ -352,7 +341,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -377,7 +365,6 @@ "ctxt": 0 }, "value": "WithNonGenericSignaturesInBaseType", - "typeAnnotation": null, "optional": false }, "body": { @@ -403,7 +390,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -433,7 +419,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -463,6 +448,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -479,8 +465,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -530,7 +515,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -560,6 +544,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -583,6 +568,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -605,13 +591,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -637,15 +621,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -672,6 +654,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -694,13 +677,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -726,7 +707,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -755,7 +735,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -785,6 +764,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -808,6 +788,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -830,13 +811,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -862,15 +841,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -880,6 +857,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -903,6 +881,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -925,13 +904,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -957,15 +934,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -992,6 +967,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1014,13 +990,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1046,7 +1020,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1075,7 +1048,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1117,8 +1089,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1149,7 +1121,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1181,7 +1152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1208,7 +1178,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1238,6 +1207,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1269,7 +1239,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1297,8 +1266,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -1308,6 +1276,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1339,7 +1308,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1381,7 +1349,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1409,8 +1376,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -1436,7 +1402,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1463,7 +1428,6 @@ "ctxt": 0 }, "value": "a12", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1493,6 +1457,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1515,7 +1480,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1541,7 +1505,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1549,8 +1512,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -1560,6 +1522,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1582,7 +1545,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1608,7 +1570,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1616,8 +1577,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -1643,7 +1603,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1669,7 +1628,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1699,7 +1657,6 @@ "ctxt": 0 }, "value": "a14", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1737,6 +1694,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1753,8 +1711,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1800,6 +1757,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1816,8 +1774,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1868,7 +1825,6 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1898,6 +1854,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1929,7 +1886,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1971,7 +1927,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1999,8 +1954,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -2042,7 +1996,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2080,6 +2033,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2111,6 +2065,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2127,8 +2082,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2166,6 +2120,7 @@ "ctxt": 0 }, "value": "a", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2182,8 +2137,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -2207,8 +2161,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2254,6 +2207,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2285,6 +2239,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2301,8 +2256,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2340,6 +2294,7 @@ "ctxt": 0 }, "value": "a", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2356,8 +2311,7 @@ }, "kind": "boolean" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -2381,8 +2335,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2435,7 +2388,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2456,7 +2408,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2486,7 +2437,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2516,6 +2466,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2538,13 +2489,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -2570,7 +2519,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2591,7 +2539,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2628,7 +2575,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2658,7 +2604,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2685,7 +2630,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2706,7 +2650,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2730,7 +2673,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2760,7 +2702,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2790,6 +2731,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2812,13 +2754,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2851,7 +2791,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2881,7 +2820,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2902,7 +2840,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2932,7 +2869,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2962,6 +2898,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2985,6 +2922,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3007,13 +2945,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3039,15 +2975,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -3073,7 +3007,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3091,7 +3024,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3113,7 +3045,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3131,7 +3062,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3153,7 +3083,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3171,7 +3100,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3203,6 +3131,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3225,13 +3154,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3257,7 +3184,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3288,7 +3214,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3309,7 +3234,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3339,7 +3263,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3369,6 +3292,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3392,6 +3316,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3414,13 +3339,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3446,15 +3369,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -3464,6 +3385,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3487,6 +3409,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3518,7 +3441,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3546,8 +3468,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -3573,15 +3494,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -3607,7 +3526,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3625,7 +3543,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3647,7 +3564,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3665,7 +3581,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3697,6 +3612,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3719,13 +3635,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3751,7 +3665,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3782,7 +3695,6 @@ "ctxt": 0 }, "value": "I4B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3803,7 +3715,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3833,7 +3744,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3875,8 +3785,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -3907,7 +3817,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3939,7 +3848,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3957,7 +3865,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3988,7 +3895,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4017,7 +3923,6 @@ "ctxt": 0 }, "value": "I4C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4038,7 +3943,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -4068,7 +3972,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4098,6 +4001,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4120,13 +4024,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -4136,6 +4038,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4158,13 +4061,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4190,7 +4091,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4208,7 +4108,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4239,7 +4138,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4268,7 +4166,6 @@ "ctxt": 0 }, "value": "I4E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4289,7 +4186,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -4319,7 +4215,6 @@ "ctxt": 0 }, "value": "a12", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4349,6 +4244,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4371,7 +4267,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4397,7 +4292,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4405,8 +4299,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -4416,6 +4309,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4438,7 +4332,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4464,7 +4357,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4472,8 +4364,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": { @@ -4499,7 +4390,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4517,7 +4407,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4543,7 +4432,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4577,7 +4465,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4606,7 +4493,6 @@ "ctxt": 0 }, "value": "I6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4627,7 +4513,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -4657,7 +4542,6 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4687,6 +4571,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4718,7 +4603,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4747,7 +4631,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4771,7 +4654,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4800,7 +4682,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4810,8 +4691,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -4837,7 +4717,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4867,7 +4746,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4896,7 +4774,6 @@ "ctxt": 0 }, "value": "I7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4917,7 +4794,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -4947,7 +4823,6 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4977,6 +4852,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5008,7 +4884,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5037,7 +4912,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5061,7 +4935,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5090,7 +4963,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5100,8 +4972,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -5127,7 +4998,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5145,7 +5015,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5194,7 +5063,6 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5215,7 +5083,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -5245,7 +5112,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5275,6 +5141,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5298,6 +5165,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5320,13 +5188,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5352,7 +5218,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5360,8 +5225,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": { @@ -5387,7 +5251,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5424,7 +5287,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5459,7 +5321,6 @@ "ctxt": 0 }, "value": "WithGenericSignaturesInBaseType", - "typeAnnotation": null, "optional": false }, "body": { @@ -5485,7 +5346,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5515,7 +5375,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5545,6 +5404,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5567,13 +5427,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -5599,7 +5457,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5636,7 +5493,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5666,7 +5522,6 @@ "ctxt": 0 }, "value": "I6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5687,7 +5542,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -5717,7 +5571,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5747,6 +5600,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5769,13 +5623,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -5801,7 +5653,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5857,7 +5708,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5887,7 +5737,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5917,6 +5766,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5939,13 +5789,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -5971,7 +5819,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6027,7 +5874,6 @@ "ctxt": 0 }, "value": "I7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6048,7 +5894,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -6078,7 +5923,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6108,6 +5952,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6130,13 +5975,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6162,7 +6005,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6199,7 +6041,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6229,7 +6070,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6259,7 +6099,6 @@ "ctxt": 0 }, "value": "a14", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6297,6 +6136,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6319,13 +6159,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -6376,7 +6214,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6394,7 +6231,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6420,6 +6256,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6442,13 +6279,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -6499,7 +6334,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6517,7 +6351,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6550,7 +6383,6 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6571,7 +6403,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -6601,7 +6432,6 @@ "ctxt": 0 }, "value": "a14", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6631,6 +6461,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6653,13 +6484,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6685,7 +6514,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6703,7 +6531,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance4/input.ts.json index 6072f9bc91fe..72660d294b7a 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "OtherDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -284,7 +275,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": null, @@ -324,7 +314,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -347,7 +336,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -377,7 +365,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -407,6 +394,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -429,13 +417,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -461,7 +447,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -498,7 +483,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -526,7 +510,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -556,6 +539,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -578,13 +562,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -610,7 +592,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -664,7 +645,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -694,6 +674,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -716,13 +697,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -748,7 +727,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -794,7 +772,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -824,6 +801,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -846,13 +824,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -862,6 +838,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -884,13 +861,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -916,7 +891,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -937,7 +911,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -983,7 +956,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1013,6 +985,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1036,6 +1009,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1058,13 +1032,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1090,15 +1062,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -1124,7 +1094,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1145,7 +1114,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1175,7 +1143,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1202,7 +1169,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1232,6 +1198,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1255,6 +1222,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1277,13 +1245,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1309,15 +1275,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -1343,7 +1307,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1361,7 +1324,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1392,7 +1354,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1419,7 +1380,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1449,6 +1409,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1480,7 +1441,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1509,7 +1469,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1519,8 +1478,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -1530,6 +1488,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1561,7 +1520,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1590,7 +1548,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1614,7 +1571,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1643,7 +1599,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1653,8 +1608,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -1680,7 +1634,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1710,7 +1663,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1737,7 +1689,6 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1767,6 +1718,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1798,7 +1750,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1827,7 +1778,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1851,7 +1801,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1880,7 +1829,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1890,8 +1838,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -1917,7 +1864,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1954,7 +1900,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1982,7 +1927,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2012,6 +1956,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2043,7 +1988,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2072,7 +2016,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2096,7 +2039,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2125,7 +2067,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2135,8 +2076,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -2162,7 +2102,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2180,7 +2119,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2218,7 +2156,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2246,7 +2183,6 @@ "ctxt": 0 }, "value": "a17", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2284,6 +2220,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2306,13 +2243,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2344,7 +2279,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2374,7 +2308,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2392,7 +2325,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2418,6 +2350,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2440,13 +2373,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2478,7 +2409,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2508,7 +2438,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2526,7 +2455,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2557,7 +2485,6 @@ "ctxt": 0 }, "value": "a18", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2595,6 +2522,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2617,13 +2545,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2674,7 +2600,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2692,7 +2617,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2718,6 +2642,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2740,13 +2665,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2797,7 +2720,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2815,7 +2737,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2846,7 +2767,6 @@ "ctxt": 0 }, "value": "a19", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2884,6 +2804,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2907,6 +2828,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2929,13 +2851,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2961,7 +2881,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2969,8 +2888,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3002,7 +2920,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3032,7 +2949,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3050,7 +2966,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3076,6 +2991,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3099,6 +3015,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3121,13 +3038,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3153,7 +3068,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3161,8 +3075,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3194,7 +3107,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3224,7 +3136,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3242,7 +3153,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3273,7 +3183,6 @@ "ctxt": 0 }, "value": "a20", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3311,6 +3220,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3342,6 +3252,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3364,13 +3275,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3395,7 +3304,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3424,7 +3332,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3442,7 +3349,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3468,6 +3374,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3490,13 +3397,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3521,7 +3426,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3550,7 +3454,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3568,7 +3471,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3580,8 +3482,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3627,6 +3528,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3658,6 +3560,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3680,13 +3583,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3711,7 +3612,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3740,7 +3640,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3758,7 +3657,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3784,6 +3682,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3806,13 +3705,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3837,7 +3734,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3866,7 +3762,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3884,7 +3779,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3896,8 +3790,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3950,7 +3843,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3971,7 +3863,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -4001,7 +3892,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4031,6 +3921,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4053,13 +3944,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4085,7 +3974,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4122,7 +4010,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4150,7 +4037,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4180,6 +4066,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4202,13 +4089,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4234,7 +4119,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4288,7 +4172,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4318,6 +4201,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4340,13 +4224,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4372,7 +4254,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4402,7 +4283,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4429,7 +4309,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4459,6 +4338,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4481,13 +4361,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -4497,6 +4375,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4519,13 +4398,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4551,7 +4428,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4572,7 +4448,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4618,7 +4493,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4648,6 +4522,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4671,6 +4546,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4693,13 +4569,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4725,15 +4599,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -4759,7 +4631,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4780,7 +4651,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4810,7 +4680,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4837,7 +4706,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4867,6 +4735,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4890,6 +4759,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4912,13 +4782,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4944,15 +4812,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -4978,7 +4844,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4996,7 +4861,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5018,7 +4882,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5036,7 +4899,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5067,7 +4929,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5094,7 +4955,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5124,6 +4984,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5155,7 +5016,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5184,7 +5044,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5194,8 +5053,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -5205,6 +5063,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5236,7 +5095,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5265,7 +5123,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5289,7 +5146,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5318,7 +5174,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5328,8 +5183,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -5355,7 +5209,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5376,7 +5229,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5406,7 +5258,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5433,7 +5284,6 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5463,6 +5313,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5494,7 +5345,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5523,7 +5373,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5547,7 +5396,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5576,7 +5424,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5586,8 +5433,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -5613,7 +5459,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5634,7 +5479,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5671,7 +5515,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5699,7 +5542,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5729,6 +5571,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5760,7 +5603,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5789,7 +5631,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5813,7 +5654,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5842,7 +5682,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5852,8 +5691,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -5879,7 +5717,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5916,7 +5753,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5944,7 +5780,6 @@ "ctxt": 0 }, "value": "a17", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5974,6 +5809,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5996,13 +5832,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6028,7 +5862,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6046,7 +5879,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6084,7 +5916,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6112,7 +5943,6 @@ "ctxt": 0 }, "value": "a18", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6142,6 +5972,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6164,13 +5995,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6196,7 +6025,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6214,7 +6042,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6269,7 +6096,6 @@ "ctxt": 0 }, "value": "a19", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6299,6 +6125,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6322,6 +6149,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6344,13 +6172,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6376,7 +6202,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6384,8 +6209,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": { @@ -6411,7 +6235,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6429,7 +6252,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6467,7 +6289,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6495,7 +6316,6 @@ "ctxt": 0 }, "value": "a20", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6525,6 +6345,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6548,6 +6369,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6570,13 +6392,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6602,7 +6422,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6620,7 +6439,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6651,7 +6469,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6659,8 +6476,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance5/input.ts.json index cafbf753febe..2f55d981eb4e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "OtherDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -284,7 +275,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": null, @@ -324,7 +314,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -347,7 +336,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -377,7 +365,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -407,6 +394,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -423,8 +411,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -474,7 +461,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -504,6 +490,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -520,8 +507,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -571,7 +557,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -601,6 +586,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -617,8 +603,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -660,7 +645,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -690,6 +674,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -706,8 +691,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -717,6 +701,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -733,8 +718,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -776,7 +760,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -806,6 +789,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -829,6 +813,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -845,8 +830,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -868,8 +852,7 @@ } } } - }, - "optional": false + } } ], "typeParams": null, @@ -911,7 +894,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -941,6 +923,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -964,6 +947,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -986,13 +970,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1018,15 +1000,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1052,7 +1032,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1079,7 +1058,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1109,6 +1087,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1132,6 +1111,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1154,13 +1134,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1186,15 +1164,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1221,6 +1197,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1243,13 +1220,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1275,7 +1250,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1304,7 +1278,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1334,6 +1307,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1357,6 +1331,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1379,13 +1354,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1411,15 +1384,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -1429,6 +1400,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1452,6 +1424,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1474,13 +1447,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1506,15 +1477,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1541,6 +1510,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1563,13 +1533,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1595,7 +1563,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1624,7 +1591,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1654,6 +1620,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1677,6 +1644,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1699,13 +1667,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1731,15 +1697,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -1749,6 +1713,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1772,6 +1737,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1794,13 +1760,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1826,15 +1790,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1861,6 +1823,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1883,13 +1846,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1915,7 +1876,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1944,7 +1904,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1986,8 +1945,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2018,7 +1977,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2050,7 +2008,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2077,7 +2034,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2107,6 +2063,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2138,7 +2095,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2166,8 +2122,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -2177,6 +2132,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2208,7 +2164,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2250,7 +2205,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2278,8 +2232,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -2305,7 +2258,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2332,7 +2284,6 @@ "ctxt": 0 }, "value": "a12", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2362,6 +2313,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2384,7 +2336,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2410,7 +2361,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2418,8 +2368,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -2429,6 +2378,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2451,7 +2401,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2477,7 +2426,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2485,8 +2433,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -2512,7 +2459,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2538,7 +2484,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2568,7 +2513,6 @@ "ctxt": 0 }, "value": "a13", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2598,6 +2542,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2620,7 +2565,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2646,7 +2590,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2654,8 +2597,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -2665,6 +2607,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2687,7 +2630,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2713,7 +2655,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2721,8 +2662,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -2748,7 +2688,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2774,7 +2713,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2804,7 +2742,6 @@ "ctxt": 0 }, "value": "a14", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2834,6 +2771,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2865,7 +2803,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2907,7 +2844,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2935,8 +2871,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -2962,7 +2897,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2991,7 +2925,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3012,7 +2945,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3042,7 +2974,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3072,6 +3003,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3094,13 +3026,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3126,7 +3056,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3163,7 +3092,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3193,7 +3121,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3214,7 +3141,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3244,7 +3170,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3274,6 +3199,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3296,13 +3222,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3328,7 +3252,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3365,7 +3288,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3393,7 +3315,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3423,6 +3344,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3445,13 +3367,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3477,7 +3397,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3531,7 +3450,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3561,6 +3479,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3583,13 +3502,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3615,7 +3532,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3645,7 +3561,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3672,7 +3587,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3702,6 +3616,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3724,13 +3639,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -3740,6 +3653,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3762,13 +3676,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3794,7 +3706,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3815,7 +3726,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3845,7 +3755,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3872,7 +3781,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3902,6 +3810,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3925,6 +3834,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3947,13 +3857,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3979,15 +3887,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -4013,7 +3919,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4034,7 +3939,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4064,7 +3968,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4091,7 +3994,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4121,6 +4023,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4144,6 +4047,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4166,13 +4070,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4198,15 +4100,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -4232,7 +4132,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4250,7 +4149,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4272,7 +4170,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4290,7 +4187,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4321,7 +4217,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4348,7 +4243,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4378,6 +4272,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4401,6 +4296,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4423,13 +4319,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4455,15 +4349,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -4489,7 +4381,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4507,7 +4398,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4529,7 +4419,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4547,7 +4436,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4579,6 +4467,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4601,13 +4490,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4633,7 +4520,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4662,7 +4548,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4692,6 +4577,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4715,6 +4601,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4737,13 +4624,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4769,15 +4654,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -4787,6 +4670,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4810,6 +4694,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4832,13 +4717,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4864,15 +4747,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -4898,7 +4779,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4916,7 +4796,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4938,7 +4817,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4956,7 +4834,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4988,6 +4865,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5010,13 +4888,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5042,7 +4918,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5071,7 +4946,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5101,6 +4975,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5124,6 +4999,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5146,13 +5022,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5178,15 +5052,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -5196,6 +5068,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5219,6 +5092,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5250,7 +5124,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5292,7 +5165,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5320,8 +5192,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -5347,15 +5218,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -5381,7 +5250,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5399,7 +5267,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5421,7 +5288,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5439,7 +5305,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5471,6 +5336,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5493,13 +5359,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5525,7 +5389,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5554,7 +5417,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5596,8 +5458,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -5628,7 +5490,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5660,7 +5521,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5678,7 +5538,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5709,7 +5568,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5736,7 +5594,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5766,6 +5623,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5788,13 +5646,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -5804,6 +5660,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5826,13 +5683,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -5858,7 +5713,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5876,7 +5730,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5907,7 +5760,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5934,7 +5786,6 @@ "ctxt": 0 }, "value": "a12", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5964,6 +5815,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5986,7 +5838,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6012,7 +5863,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6020,8 +5870,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -6031,6 +5880,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6053,13 +5903,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6085,7 +5933,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6103,7 +5950,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6129,7 +5975,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6163,7 +6008,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6189,7 +6033,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6219,7 +6062,6 @@ "ctxt": 0 }, "value": "a13", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6249,6 +6091,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6271,7 +6114,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6297,7 +6139,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6305,8 +6146,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -6316,6 +6156,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6338,13 +6179,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6370,7 +6209,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6388,7 +6226,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6414,7 +6251,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6448,7 +6284,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6475,7 +6310,6 @@ "ctxt": 0 }, "value": "a14", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6505,6 +6339,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6536,7 +6371,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6565,7 +6399,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6589,7 +6422,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6618,7 +6450,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6628,8 +6459,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -6655,7 +6485,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6676,7 +6505,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6706,7 +6534,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance6/input.ts.json index 1317e125eb05..3248cd7713ad 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "OtherDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -284,7 +275,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": null, @@ -324,7 +314,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -347,7 +336,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -377,7 +365,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -407,6 +394,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -429,13 +417,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -461,7 +447,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -498,7 +483,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -526,7 +510,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -556,6 +539,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -578,13 +562,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -610,7 +592,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -664,7 +645,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -694,6 +674,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -716,13 +697,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -748,7 +727,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -794,7 +772,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -824,6 +801,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -846,13 +824,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -862,6 +838,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -884,13 +861,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -916,7 +891,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -937,7 +911,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -983,7 +956,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1013,6 +985,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1036,6 +1009,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1058,13 +1032,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1090,15 +1062,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -1124,7 +1094,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1145,7 +1114,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1175,7 +1143,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1202,7 +1169,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1232,6 +1198,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1255,6 +1222,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1277,13 +1245,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1309,15 +1275,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -1343,7 +1307,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1361,7 +1324,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1392,7 +1354,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1419,7 +1380,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1449,6 +1409,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1480,7 +1441,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1509,7 +1469,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1519,8 +1478,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -1530,6 +1488,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1561,7 +1520,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1590,7 +1548,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1614,7 +1571,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1643,7 +1599,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1653,8 +1608,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -1680,7 +1634,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1710,7 +1663,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1737,7 +1689,6 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1767,6 +1718,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1798,7 +1750,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1827,7 +1778,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1851,7 +1801,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1880,7 +1829,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1890,8 +1838,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -1917,7 +1864,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1954,7 +1900,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1982,7 +1927,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2012,6 +1956,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2043,7 +1988,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2072,7 +2016,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2096,7 +2039,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2125,7 +2067,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2135,8 +2076,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -2162,7 +2102,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2180,7 +2119,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2218,7 +2156,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2248,7 +2185,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2275,7 +2211,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2299,7 +2234,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2329,7 +2263,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2359,6 +2292,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2381,13 +2315,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2420,7 +2352,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2450,7 +2381,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2477,7 +2407,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2501,7 +2430,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2531,7 +2459,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2561,6 +2488,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2583,13 +2511,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2641,7 +2567,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2668,7 +2593,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2692,7 +2616,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2722,7 +2645,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2752,6 +2674,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2774,13 +2697,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2806,7 +2727,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2835,7 +2755,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2862,7 +2781,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2886,7 +2804,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2916,7 +2833,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2946,6 +2862,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2968,13 +2885,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2984,6 +2899,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3006,13 +2922,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3038,7 +2952,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3086,7 +2999,6 @@ "ctxt": 0 }, "value": "I5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3113,7 +3025,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3137,7 +3048,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3167,7 +3077,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3197,6 +3106,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3220,6 +3130,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3242,13 +3153,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3274,15 +3183,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -3308,7 +3215,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3338,7 +3244,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3367,7 +3272,6 @@ "ctxt": 0 }, "value": "I7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3394,7 +3298,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3418,7 +3321,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3448,7 +3350,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3478,6 +3379,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3509,7 +3411,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3538,7 +3439,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3548,8 +3448,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -3559,6 +3458,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3590,7 +3490,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3619,7 +3518,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3643,7 +3541,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3672,7 +3569,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3682,8 +3578,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -3709,7 +3604,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3739,7 +3633,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3768,7 +3661,6 @@ "ctxt": 0 }, "value": "I9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3795,7 +3687,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3819,7 +3710,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3849,7 +3739,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3879,6 +3768,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3910,7 +3800,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3939,7 +3828,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3963,7 +3851,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3992,7 +3879,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4002,8 +3888,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -4036,7 +3921,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/covariantCallbacks/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/covariantCallbacks/input.ts.json index f4be7a835595..0501f30be26d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/covariantCallbacks/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/covariantCallbacks/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "then", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,6 +92,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -118,6 +116,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -140,13 +139,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -168,8 +165,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": { @@ -217,7 +213,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -247,7 +242,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -291,7 +285,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -312,7 +305,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -342,7 +334,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -381,7 +372,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -402,6 +392,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -424,7 +415,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -450,7 +440,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -458,8 +447,7 @@ ] } } - }, - "optional": false + } } }, { @@ -478,6 +466,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -500,7 +489,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -526,7 +514,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -534,8 +521,7 @@ ] } } - }, - "optional": false + } } } ], @@ -576,8 +562,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -587,7 +573,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -615,8 +600,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -626,7 +611,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -648,7 +632,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -669,6 +652,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -691,7 +675,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -717,7 +700,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -725,8 +707,7 @@ ] } } - }, - "optional": false + } } }, { @@ -745,6 +726,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -767,7 +749,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -793,7 +774,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -801,8 +781,7 @@ ] } } - }, - "optional": false + } } } ], @@ -843,8 +822,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -854,7 +833,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -882,8 +860,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -893,7 +871,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -920,7 +897,6 @@ "ctxt": 0 }, "value": "AList1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -950,7 +926,6 @@ "ctxt": 0 }, "value": "forEach", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -964,6 +939,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -987,6 +963,7 @@ "ctxt": 0 }, "value": "item", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1009,13 +986,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1037,8 +1012,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": { @@ -1078,7 +1052,6 @@ "ctxt": 0 }, "value": "BList1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1108,7 +1081,6 @@ "ctxt": 0 }, "value": "forEach", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1122,6 +1094,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1145,6 +1118,7 @@ "ctxt": 0 }, "value": "item", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1167,13 +1141,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1195,8 +1167,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": { @@ -1231,7 +1202,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1252,6 +1222,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1274,13 +1245,11 @@ "ctxt": 0 }, "value": "AList1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1299,6 +1268,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1321,13 +1291,11 @@ "ctxt": 0 }, "value": "BList1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1368,8 +1336,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1379,7 +1347,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1407,8 +1374,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1418,7 +1385,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1445,7 +1411,6 @@ "ctxt": 0 }, "value": "AList2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1475,7 +1440,6 @@ "ctxt": 0 }, "value": "forEach", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1489,6 +1453,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1512,6 +1477,7 @@ "ctxt": 0 }, "value": "item", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1534,13 +1500,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1562,8 +1526,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": { @@ -1603,7 +1566,6 @@ "ctxt": 0 }, "value": "BList2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1633,7 +1595,6 @@ "ctxt": 0 }, "value": "forEach", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1647,6 +1608,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1670,6 +1632,7 @@ "ctxt": 0 }, "value": "item", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1692,13 +1655,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1720,8 +1681,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": { @@ -1756,7 +1716,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1777,6 +1736,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1799,13 +1759,11 @@ "ctxt": 0 }, "value": "AList2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1824,6 +1782,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1846,13 +1805,11 @@ "ctxt": 0 }, "value": "BList2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1893,8 +1850,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1904,7 +1861,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1932,8 +1888,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1943,7 +1899,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1970,7 +1925,6 @@ "ctxt": 0 }, "value": "AList3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2000,7 +1954,6 @@ "ctxt": 0 }, "value": "forEach", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2014,6 +1967,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2037,6 +1991,7 @@ "ctxt": 0 }, "value": "item", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2059,13 +2014,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2087,8 +2040,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": { @@ -2128,7 +2080,6 @@ "ctxt": 0 }, "value": "BList3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2158,7 +2109,6 @@ "ctxt": 0 }, "value": "forEach", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2172,6 +2122,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2195,6 +2146,7 @@ "ctxt": 0 }, "value": "item", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2217,13 +2169,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2233,6 +2183,7 @@ "ctxt": 0 }, "value": "context", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2249,8 +2200,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "typeParams": null, @@ -2272,8 +2222,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": { @@ -2308,7 +2257,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2329,6 +2277,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2351,13 +2300,11 @@ "ctxt": 0 }, "value": "AList3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2376,6 +2323,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2398,13 +2346,11 @@ "ctxt": 0 }, "value": "BList3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2445,8 +2391,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2456,7 +2402,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2484,8 +2429,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2495,7 +2440,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2522,7 +2466,6 @@ "ctxt": 0 }, "value": "AList4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2552,7 +2495,6 @@ "ctxt": 0 }, "value": "forEach", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2566,6 +2508,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2589,6 +2532,7 @@ "ctxt": 0 }, "value": "item", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2611,13 +2555,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2643,15 +2585,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeAnn": { @@ -2691,7 +2631,6 @@ "ctxt": 0 }, "value": "BList4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2721,7 +2660,6 @@ "ctxt": 0 }, "value": "forEach", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2735,6 +2673,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2758,6 +2697,7 @@ "ctxt": 0 }, "value": "item", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2780,13 +2720,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2812,15 +2750,13 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeAnn": { @@ -2855,7 +2791,6 @@ "ctxt": 0 }, "value": "f14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2876,6 +2811,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2898,13 +2834,11 @@ "ctxt": 0 }, "value": "AList4", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2923,6 +2857,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2945,13 +2880,11 @@ "ctxt": 0 }, "value": "BList4", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2992,8 +2925,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3003,7 +2936,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -3031,8 +2963,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3042,7 +2974,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/enumAssignability/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/enumAssignability/input.ts.json index 66850a13681c..ab2aee9dcacc 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/enumAssignability/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/enumAssignability/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -66,7 +64,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "members": [ @@ -85,7 +82,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -117,8 +113,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -135,7 +131,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -146,7 +141,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -180,8 +174,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -198,7 +192,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "property": { @@ -209,7 +202,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -241,8 +233,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -252,7 +244,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -280,8 +271,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -291,7 +282,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -319,8 +309,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -356,8 +346,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -395,6 +385,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -411,8 +402,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -422,7 +412,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "definite": false @@ -452,8 +441,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -463,7 +452,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -485,7 +473,6 @@ "ctxt": 0 }, "value": "Others", - "typeAnnotation": null, "optional": false }, "body": { @@ -521,6 +508,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -537,8 +525,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -548,7 +535,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "definite": false @@ -565,7 +551,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -591,7 +576,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -654,6 +638,7 @@ "ctxt": 0 }, "value": "ac", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -676,13 +661,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -704,7 +687,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -734,7 +716,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -788,6 +769,7 @@ "ctxt": 0 }, "value": "ai", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -810,13 +792,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -848,6 +828,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -864,8 +845,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -875,7 +855,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "definite": false @@ -907,6 +886,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -923,8 +903,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -934,7 +913,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "definite": false @@ -966,6 +944,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -982,8 +961,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -993,7 +971,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1025,6 +1002,7 @@ "ctxt": 0 }, "value": "ee", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1047,13 +1025,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1063,7 +1039,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1095,6 +1070,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1111,8 +1087,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1122,7 +1097,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1154,6 +1128,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1170,8 +1145,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1181,7 +1155,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1213,6 +1186,7 @@ "ctxt": 0 }, "value": "h", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1235,13 +1209,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1251,7 +1223,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1283,6 +1254,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1299,8 +1271,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1310,7 +1281,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1342,6 +1312,7 @@ "ctxt": 0 }, "value": "j", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1376,8 +1347,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1387,7 +1357,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1419,6 +1388,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1441,13 +1411,11 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1457,7 +1425,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1489,6 +1456,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1512,6 +1480,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1528,8 +1497,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1551,8 +1519,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1562,7 +1529,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1592,8 +1558,8 @@ "ctxt": 0 }, "value": "ac", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1603,7 +1569,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -1631,8 +1596,8 @@ "ctxt": 0 }, "value": "ai", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1642,7 +1607,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -1672,6 +1636,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1696,8 +1661,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1707,7 +1671,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1739,6 +1702,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1770,7 +1734,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1798,8 +1761,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1809,7 +1771,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1841,6 +1802,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1864,6 +1826,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1886,13 +1849,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -1918,7 +1879,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1948,15 +1908,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1966,7 +1924,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1998,6 +1955,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2020,13 +1978,11 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2036,7 +1992,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2068,6 +2023,7 @@ "ctxt": 0 }, "value": "q", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2090,13 +2046,11 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2106,7 +2060,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2123,7 +2076,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2144,6 +2096,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2166,13 +2119,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2191,6 +2142,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2213,13 +2165,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2238,6 +2188,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2260,13 +2211,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2307,8 +2256,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2318,7 +2267,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -2346,8 +2294,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2357,7 +2305,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -2385,8 +2332,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2396,7 +2343,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -2426,6 +2372,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2448,13 +2395,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2464,7 +2409,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2496,6 +2440,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2518,13 +2463,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2534,7 +2477,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2568,7 +2510,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2589,7 +2530,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2607,7 +2547,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2629,7 +2568,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2647,7 +2585,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2669,7 +2606,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2687,7 +2623,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2709,7 +2644,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2727,7 +2661,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/enumAssignabilityInInheritance/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/enumAssignabilityInInheritance/input.ts.json index 46bbb744eea8..cff7cacdbc2c 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/enumAssignabilityInInheritance/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/enumAssignabilityInInheritance/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -64,7 +62,6 @@ "ctxt": 0 }, "value": "I0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -89,6 +86,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -105,8 +103,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -131,7 +128,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -160,7 +156,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -189,7 +184,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -210,7 +204,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -231,6 +224,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -253,13 +247,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -295,7 +287,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -312,7 +303,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -333,6 +323,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -349,8 +340,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -392,7 +382,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -413,6 +402,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -429,8 +419,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -487,8 +476,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -505,7 +494,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -526,7 +514,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -537,7 +524,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -575,8 +561,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -593,7 +579,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -641,8 +626,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -659,7 +644,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -708,7 +692,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -729,6 +712,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -745,8 +729,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -788,7 +771,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -809,6 +791,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -831,13 +814,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -873,7 +854,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -905,8 +885,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -923,7 +903,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -944,7 +923,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -955,7 +933,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -978,7 +955,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -999,6 +975,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1015,8 +992,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -1058,7 +1034,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1079,6 +1054,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1101,13 +1077,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1143,7 +1117,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1175,8 +1148,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1193,7 +1166,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1214,7 +1186,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1225,7 +1196,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1248,7 +1218,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1269,6 +1238,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1291,13 +1261,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1333,7 +1301,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1350,7 +1317,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1371,6 +1337,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1393,13 +1360,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1435,7 +1400,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1467,8 +1431,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1485,7 +1449,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1506,7 +1469,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1517,7 +1479,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1540,7 +1501,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1561,6 +1521,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1583,13 +1544,11 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1625,7 +1584,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1642,7 +1600,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1663,6 +1620,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1685,13 +1643,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1727,7 +1683,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1759,8 +1714,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1777,7 +1732,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1798,7 +1752,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1809,7 +1762,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1832,7 +1784,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1853,6 +1804,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1884,7 +1836,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1912,8 +1863,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1958,7 +1908,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1998,7 +1947,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2019,6 +1967,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2041,13 +1990,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2083,7 +2030,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2115,8 +2061,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2133,7 +2079,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2154,7 +2099,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2165,7 +2109,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2188,7 +2131,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2209,6 +2151,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2233,8 +2176,7 @@ "kind": "number" } } - }, - "optional": false + } } } ], @@ -2284,7 +2226,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2305,6 +2246,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2327,13 +2269,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2369,7 +2309,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2401,8 +2340,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2419,7 +2358,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2440,7 +2378,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2451,7 +2388,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2479,7 +2415,6 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2509,7 +2444,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2548,7 +2482,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2569,6 +2502,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2591,13 +2525,11 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2633,7 +2565,6 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2650,7 +2581,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2671,6 +2601,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2693,13 +2624,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2735,7 +2664,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2767,8 +2695,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2785,7 +2713,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2806,7 +2733,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2817,7 +2743,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2840,7 +2765,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2866,7 +2790,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2914,7 +2837,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2935,6 +2857,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2957,13 +2880,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2999,7 +2920,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3016,7 +2936,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3037,6 +2956,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3059,13 +2979,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3101,7 +3019,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3133,8 +3050,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3151,7 +3068,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3172,7 +3088,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3183,7 +3098,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3206,7 +3120,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3232,7 +3145,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3258,7 +3170,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3300,7 +3211,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3321,7 +3231,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3342,6 +3251,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3364,7 +3274,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3387,8 +3296,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3424,7 +3332,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3459,7 +3366,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3480,6 +3386,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3502,13 +3409,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3544,7 +3449,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3576,8 +3480,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3594,7 +3498,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3615,7 +3518,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3626,7 +3528,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3649,7 +3550,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3670,6 +3570,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3693,8 +3594,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeParams": null, @@ -3716,8 +3617,7 @@ } } } - }, - "optional": false + } } } ], @@ -3754,8 +3654,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeParams": null, @@ -3789,7 +3689,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3810,6 +3709,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3832,13 +3732,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3874,7 +3772,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3906,8 +3803,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3924,7 +3821,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3945,7 +3841,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3956,7 +3851,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3979,7 +3873,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4000,6 +3893,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4023,6 +3917,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4045,13 +3940,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4077,7 +3970,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4107,15 +3999,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -4152,6 +4042,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4174,13 +4065,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4206,7 +4095,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4236,7 +4124,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4255,7 +4142,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4276,6 +4162,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4298,13 +4185,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4340,7 +4225,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4372,8 +4256,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4390,7 +4274,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4411,7 +4294,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4422,7 +4304,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4452,7 +4333,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "members": [ @@ -4471,7 +4351,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -4488,7 +4367,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4509,6 +4387,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4531,13 +4410,11 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4573,7 +4450,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4590,7 +4466,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4611,6 +4486,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4633,13 +4509,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4675,7 +4549,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4707,8 +4580,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4725,7 +4598,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4746,7 +4618,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4757,7 +4628,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4780,7 +4650,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4822,7 +4691,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "body": { @@ -4865,8 +4733,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -4895,7 +4763,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4916,6 +4783,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4938,12 +4806,10 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4979,7 +4845,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -4995,7 +4860,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5016,6 +4880,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5038,13 +4903,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5080,7 +4943,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5112,8 +4974,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5130,7 +4992,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5151,7 +5012,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -5162,7 +5022,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5185,7 +5044,6 @@ "ctxt": 0 }, "value": "CC", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5211,7 +5069,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -5266,7 +5123,6 @@ "ctxt": 0 }, "value": "CC", - "typeAnnotation": null, "optional": false }, "body": { @@ -5309,8 +5165,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -5339,7 +5195,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5360,6 +5215,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5382,13 +5238,11 @@ "ctxt": 0 }, "value": "CC", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5424,7 +5278,6 @@ "ctxt": 0 }, "value": "CC", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5441,7 +5294,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5462,6 +5314,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5484,13 +5337,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5526,7 +5377,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5558,8 +5408,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5576,7 +5426,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5597,7 +5446,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -5608,7 +5456,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5631,7 +5478,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5652,6 +5498,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5674,13 +5521,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5716,7 +5561,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5733,7 +5577,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5754,6 +5597,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5776,13 +5620,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5818,7 +5660,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5850,8 +5691,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5868,7 +5709,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5889,7 +5729,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -5900,7 +5739,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5923,7 +5761,6 @@ "ctxt": 0 }, "value": "foo17", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5944,6 +5781,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5960,8 +5798,7 @@ }, "members": [] } - }, - "optional": false + } } } ], @@ -6003,7 +5840,6 @@ "ctxt": 0 }, "value": "foo17", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -6024,6 +5860,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6046,13 +5883,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6088,7 +5923,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6120,8 +5954,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6138,7 +5972,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6159,7 +5992,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6170,7 +6002,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/everyTypeAssignableToAny/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/everyTypeAssignableToAny/input.ts.json index 4409a939539f..359b2a566e3d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/everyTypeAssignableToAny/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/everyTypeAssignableToAny/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -65,7 +65,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -91,7 +90,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -154,6 +152,7 @@ "ctxt": 0 }, "value": "ac", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -176,13 +175,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -204,7 +201,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -234,7 +230,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -288,6 +283,7 @@ "ctxt": 0 }, "value": "ai", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -310,13 +306,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -340,7 +334,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -359,7 +352,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -391,6 +383,7 @@ "ctxt": 0 }, "value": "ae", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -413,13 +406,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -451,6 +442,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -467,8 +459,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -500,6 +491,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -516,8 +508,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -549,6 +540,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -565,8 +557,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -598,6 +589,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -620,13 +612,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -658,6 +648,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -674,8 +665,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -707,6 +697,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -723,8 +714,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -756,6 +746,7 @@ "ctxt": 0 }, "value": "h", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -778,13 +769,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -816,6 +805,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -832,8 +822,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": null, "definite": false @@ -865,6 +854,7 @@ "ctxt": 0 }, "value": "j", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -899,8 +889,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -932,6 +921,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -954,13 +944,11 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -992,6 +980,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1015,6 +1004,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1031,8 +1021,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1054,8 +1043,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1087,6 +1075,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1111,8 +1100,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1144,6 +1132,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1175,7 +1164,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1203,8 +1191,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1236,6 +1223,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1259,6 +1247,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1281,13 +1270,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -1313,7 +1300,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1343,15 +1329,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1383,6 +1367,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1405,13 +1390,11 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1443,6 +1426,7 @@ "ctxt": 0 }, "value": "q", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1465,13 +1449,11 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1501,8 +1483,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1512,7 +1494,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1540,8 +1521,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1551,7 +1532,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1579,8 +1559,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1590,7 +1570,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -1618,8 +1597,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1629,7 +1608,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -1657,8 +1635,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1668,7 +1646,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -1696,8 +1673,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1707,7 +1684,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } } @@ -1735,8 +1711,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1746,7 +1722,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false } } @@ -1774,8 +1749,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1785,7 +1760,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -1813,8 +1787,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1824,7 +1798,6 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, "optional": false } } @@ -1852,8 +1825,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1863,7 +1836,6 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, "optional": false } } @@ -1891,8 +1863,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1902,7 +1874,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false } } @@ -1930,8 +1901,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1941,7 +1912,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -1969,8 +1939,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1980,7 +1950,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false } } @@ -2008,8 +1977,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2019,7 +1988,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -2047,8 +2015,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2058,7 +2026,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false } } @@ -2086,8 +2053,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2097,7 +2064,6 @@ "ctxt": 0 }, "value": "ac", - "typeAnnotation": null, "optional": false } } @@ -2125,8 +2091,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2136,7 +2102,6 @@ "ctxt": 0 }, "value": "ai", - "typeAnnotation": null, "optional": false } } @@ -2164,8 +2129,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2175,7 +2140,6 @@ "ctxt": 0 }, "value": "ae", - "typeAnnotation": null, "optional": false } } @@ -2190,7 +2154,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2211,6 +2174,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2233,13 +2197,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2258,6 +2220,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2280,13 +2243,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2305,6 +2266,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2327,13 +2289,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2374,8 +2334,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2385,7 +2345,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2413,8 +2372,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2424,7 +2383,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -2452,8 +2410,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2463,7 +2421,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -2495,7 +2452,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2516,7 +2472,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2537,7 +2492,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2555,7 +2509,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/genericCallWithObjectTypeArgsAndInitializers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/genericCallWithObjectTypeArgsAndInitializers/input.ts.json index 5cdc4bb22b68..be29de0bbc56 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/genericCallWithObjectTypeArgsAndInitializers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/genericCallWithObjectTypeArgsAndInitializers/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -44,6 +43,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,13 +66,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "right": { "type": "NullLiteral", @@ -115,7 +113,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -146,7 +143,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -166,7 +162,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -194,6 +189,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -216,13 +212,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "right": { "type": "Identifier", @@ -232,7 +226,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -268,7 +261,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -299,7 +291,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -319,7 +310,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -347,6 +337,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -369,13 +360,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "right": { "type": "NumericLiteral", @@ -430,7 +419,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -448,7 +436,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -469,7 +456,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -490,6 +476,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -512,13 +499,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -544,6 +529,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -566,13 +552,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "right": { "type": "Identifier", @@ -582,7 +566,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -629,7 +612,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -650,7 +632,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -668,7 +649,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -689,7 +669,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -710,6 +689,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -732,13 +712,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -764,6 +742,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -786,13 +765,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "right": { "type": "Identifier", @@ -802,7 +779,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -849,7 +825,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -870,7 +845,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -888,7 +862,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -909,7 +882,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -930,6 +902,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -952,13 +925,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -977,6 +948,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -999,13 +971,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1031,6 +1001,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1053,13 +1024,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "right": { "type": "Identifier", @@ -1069,7 +1038,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1116,7 +1084,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1137,7 +1104,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1155,7 +1121,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1177,7 +1142,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1195,7 +1159,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1216,7 +1179,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1237,6 +1199,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1259,13 +1222,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1291,6 +1252,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1313,13 +1275,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "right": { "type": "Identifier", @@ -1329,7 +1289,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -1376,7 +1335,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1397,7 +1355,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1415,7 +1372,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1437,7 +1393,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1455,7 +1410,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/nullAssignableToEveryType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/nullAssignableToEveryType/input.ts.json index 923e41bc77ad..c1b5b445962c 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/nullAssignableToEveryType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/nullAssignableToEveryType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -105,6 +103,7 @@ "ctxt": 0 }, "value": "ac", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -127,13 +126,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -155,7 +152,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -185,7 +181,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -239,6 +234,7 @@ "ctxt": 0 }, "value": "ai", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -261,13 +257,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -291,7 +285,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -310,7 +303,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -342,6 +334,7 @@ "ctxt": 0 }, "value": "ae", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -364,13 +357,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -402,6 +393,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -418,8 +410,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -458,6 +449,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -474,8 +466,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -514,6 +505,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -530,8 +522,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -570,6 +561,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -592,13 +584,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -637,6 +627,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -653,8 +644,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -693,6 +683,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -709,8 +700,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -749,6 +739,7 @@ "ctxt": 0 }, "value": "h", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -771,13 +762,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -816,6 +805,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -832,8 +822,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -872,6 +861,7 @@ "ctxt": 0 }, "value": "j", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -906,8 +896,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -946,6 +935,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -968,13 +958,11 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -1013,6 +1001,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1036,6 +1025,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1052,8 +1042,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1075,8 +1064,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -1113,8 +1101,8 @@ "ctxt": 0 }, "value": "ac", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -1149,8 +1137,8 @@ "ctxt": 0 }, "value": "ai", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -1185,8 +1173,8 @@ "ctxt": 0 }, "value": "ae", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -1223,6 +1211,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1247,8 +1236,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -1287,6 +1275,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1318,7 +1307,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1346,8 +1334,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -1386,6 +1373,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1409,6 +1397,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1431,13 +1420,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -1463,7 +1450,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1493,15 +1479,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -1540,6 +1524,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1562,13 +1547,11 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -1607,6 +1590,7 @@ "ctxt": 0 }, "value": "q", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1629,13 +1613,11 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -1659,7 +1641,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1680,6 +1661,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1702,13 +1684,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1727,6 +1707,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1749,13 +1730,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1774,6 +1753,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1796,13 +1776,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1843,8 +1821,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -1879,8 +1857,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -1915,8 +1893,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -1955,7 +1933,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1976,7 +1953,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1997,7 +1973,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2015,7 +1990,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/nullAssignedToUndefined/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/nullAssignedToUndefined/input.ts.json index aad33f1ce2a0..6cc396fb56d0 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/nullAssignedToUndefined/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/nullAssignedToUndefined/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AssignmentExpression", @@ -50,8 +50,8 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -91,6 +91,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -113,12 +114,10 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "NullLiteral", diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/numberAssignableToEnum/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/numberAssignableToEnum/input.ts.json index bc24390d398d..96c90c09f7b1 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/numberAssignableToEnum/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/numberAssignableToEnum/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -74,6 +72,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -90,8 +89,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -123,6 +121,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,13 +144,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -181,8 +178,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -192,7 +189,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } } @@ -220,8 +216,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -231,7 +227,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/optionalPropertyAssignableToStringIndexSignature/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/optionalPropertyAssignableToStringIndexSignature/input.ts.json index c524ef0ca9aa..38760e770e9c 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/optionalPropertyAssignableToStringIndexSignature/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/optionalPropertyAssignableToStringIndexSignature/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "optionalProperties", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,8 +90,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -123,6 +122,7 @@ "ctxt": 0 }, "value": "undefinedProperties", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -154,7 +154,6 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -201,8 +200,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -234,6 +232,7 @@ "ctxt": 0 }, "value": "stringDictionary", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -260,6 +259,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -276,8 +276,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -306,8 +305,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -337,8 +335,8 @@ "ctxt": 0 }, "value": "stringDictionary", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -348,7 +346,6 @@ "ctxt": 0 }, "value": "optionalProperties", - "typeAnnotation": null, "optional": false } } @@ -376,8 +373,8 @@ "ctxt": 0 }, "value": "stringDictionary", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -387,7 +384,6 @@ "ctxt": 0 }, "value": "undefinedProperties", - "typeAnnotation": null, "optional": false } } @@ -417,6 +413,7 @@ "ctxt": 0 }, "value": "probablyArray", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -443,6 +440,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -459,8 +457,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -489,8 +486,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -522,6 +518,7 @@ "ctxt": 0 }, "value": "numberLiteralKeys", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -579,8 +576,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -610,8 +606,8 @@ "ctxt": 0 }, "value": "probablyArray", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -621,7 +617,6 @@ "ctxt": 0 }, "value": "numberLiteralKeys", - "typeAnnotation": null, "optional": false } } @@ -651,6 +646,7 @@ "ctxt": 0 }, "value": "optionalUndefined", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -682,7 +678,6 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -710,8 +705,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -743,6 +737,7 @@ "ctxt": 0 }, "value": "dict", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -769,6 +764,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,8 +781,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -815,8 +810,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -826,7 +820,6 @@ "ctxt": 0 }, "value": "optionalUndefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -843,7 +836,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -887,6 +879,7 @@ "ctxt": 0 }, "value": "optional", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -918,7 +911,6 @@ "ctxt": 0 }, "value": "k1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -947,7 +939,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -957,8 +948,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "TsNonNullExpression", @@ -975,7 +965,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1008,6 +997,7 @@ "ctxt": 0 }, "value": "dict", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1034,6 +1024,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1050,8 +1041,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1084,7 +1074,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1110,8 +1099,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1121,7 +1109,6 @@ "ctxt": 0 }, "value": "optional", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1155,7 +1142,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/typeParameterAssignability/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/typeParameterAssignability/input.ts.json index 19ec17500b7f..ec1b124b057d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/typeParameterAssignability/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/typeParameterAssignability/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -106,13 +105,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -153,8 +150,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -164,7 +161,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -192,8 +188,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -203,7 +199,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -235,7 +230,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -256,7 +250,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2/input.ts.json index d30cb2672d18..935a008a7f8c 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/typeParameterAssignability2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -106,13 +105,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -153,8 +150,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -164,7 +161,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -192,8 +188,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -203,7 +199,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -235,7 +230,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -256,7 +250,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -274,7 +267,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -295,7 +287,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -316,6 +307,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -338,13 +330,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -363,6 +353,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -385,13 +376,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -432,8 +421,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -443,7 +432,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -471,8 +459,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -482,7 +470,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -514,7 +501,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -532,7 +518,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -554,7 +539,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -574,7 +558,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -595,6 +578,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -617,13 +601,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -642,6 +624,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -664,13 +647,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -689,6 +670,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -711,13 +693,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -758,8 +738,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -769,7 +749,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -797,8 +776,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -808,7 +787,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -836,8 +814,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -847,7 +825,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -875,8 +852,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -886,7 +863,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -914,8 +890,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -925,7 +901,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -953,8 +928,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -964,7 +939,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -996,7 +970,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1014,7 +987,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1036,7 +1008,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1054,7 +1025,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1076,7 +1046,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1096,7 +1065,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1117,6 +1085,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1139,13 +1108,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1164,6 +1131,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1186,13 +1154,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1211,6 +1177,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1233,13 +1200,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1280,8 +1245,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1291,7 +1256,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -1319,8 +1283,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1330,7 +1294,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -1358,8 +1321,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -1376,7 +1339,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1407,8 +1369,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1418,7 +1380,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -1446,8 +1407,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1457,7 +1418,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -1485,8 +1445,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -1503,7 +1463,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1534,8 +1493,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1545,7 +1504,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -1573,8 +1531,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1584,7 +1542,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -1612,8 +1569,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -1630,7 +1587,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1663,6 +1619,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1685,13 +1642,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1721,8 +1676,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1732,7 +1687,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -1760,8 +1714,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1771,7 +1725,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -1799,8 +1752,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1810,7 +1763,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -1842,7 +1794,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1860,7 +1811,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1882,7 +1832,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1900,7 +1849,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1922,7 +1870,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1940,7 +1887,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1961,7 +1907,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1982,6 +1927,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2004,13 +1950,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2029,6 +1973,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2051,13 +1996,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2076,6 +2019,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2098,13 +2042,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2145,8 +2087,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2156,7 +2098,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -2184,8 +2125,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2195,7 +2136,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -2223,8 +2163,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -2241,7 +2181,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2272,8 +2211,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2283,7 +2222,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -2311,8 +2249,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2322,7 +2260,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -2350,8 +2287,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -2368,7 +2305,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2399,8 +2335,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2410,7 +2346,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -2438,8 +2373,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2449,7 +2384,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -2477,8 +2411,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -2495,7 +2429,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2528,6 +2461,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2550,13 +2484,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2586,8 +2518,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2597,7 +2529,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -2625,8 +2556,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2636,7 +2567,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -2664,8 +2594,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2675,7 +2605,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -2707,7 +2636,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2725,7 +2653,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2747,7 +2674,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2765,7 +2691,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2787,7 +2712,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2805,7 +2729,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2826,7 +2749,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2847,6 +2769,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2869,13 +2792,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2894,6 +2815,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2916,13 +2838,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2941,6 +2861,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2963,13 +2884,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3010,8 +2929,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3021,7 +2940,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -3049,8 +2967,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3060,7 +2978,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -3088,8 +3005,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3099,7 +3016,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -3127,8 +3043,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3138,7 +3054,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } } @@ -3166,8 +3081,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3177,7 +3092,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -3205,8 +3119,8 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3216,7 +3130,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -3248,7 +3161,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3266,7 +3178,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3288,7 +3199,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3309,7 +3219,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/typeParameterAssignability3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/typeParameterAssignability3/input.ts.json index 841bfceb7758..abcae05074eb 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/typeParameterAssignability3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/typeParameterAssignability3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -111,6 +108,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -133,13 +131,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -158,6 +154,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,13 +177,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -229,6 +224,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -251,13 +247,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -289,6 +283,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -311,13 +306,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -347,8 +340,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -358,7 +351,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -386,8 +378,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -397,7 +389,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -425,8 +416,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -436,7 +427,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -464,8 +454,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -475,7 +465,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -503,8 +492,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -514,7 +503,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -542,8 +530,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -553,7 +541,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -585,7 +572,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -603,7 +589,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -625,7 +610,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -643,7 +627,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -664,7 +647,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -690,7 +672,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "value": null, @@ -716,7 +697,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -747,7 +727,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "value": null, @@ -773,7 +752,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -804,7 +782,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "value": { @@ -861,7 +838,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -889,7 +865,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "computed": false @@ -934,7 +909,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "computed": false @@ -962,7 +936,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1013,7 +986,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1031,7 +1003,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1053,7 +1024,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1071,7 +1041,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/undefinedAssignableToEveryType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/undefinedAssignableToEveryType/input.ts.json index 0a70207122fc..56efed2761f0 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/undefinedAssignableToEveryType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/undefinedAssignableToEveryType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -105,6 +103,7 @@ "ctxt": 0 }, "value": "ac", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -127,13 +126,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -155,7 +152,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -185,7 +181,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -239,6 +234,7 @@ "ctxt": 0 }, "value": "ai", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -261,13 +257,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -291,7 +285,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -310,7 +303,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -342,6 +334,7 @@ "ctxt": 0 }, "value": "ae", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -364,13 +357,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -402,6 +393,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -418,8 +410,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -429,7 +420,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -461,6 +451,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -477,8 +468,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -488,7 +478,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -520,6 +509,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -536,8 +526,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -547,7 +536,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -579,6 +567,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -601,13 +590,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -617,7 +604,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -649,6 +635,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -665,8 +652,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -676,7 +662,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -708,6 +693,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -724,8 +710,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -735,7 +720,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -767,6 +751,7 @@ "ctxt": 0 }, "value": "h", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -789,13 +774,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -805,7 +788,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -837,6 +819,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -853,8 +836,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -864,7 +846,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -896,6 +877,7 @@ "ctxt": 0 }, "value": "j", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -930,8 +912,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -941,7 +922,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -973,6 +953,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -995,13 +976,11 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1011,7 +990,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1043,6 +1021,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1066,6 +1045,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1082,8 +1062,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1105,8 +1084,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1116,7 +1094,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1146,8 +1123,8 @@ "ctxt": 0 }, "value": "ac", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1157,7 +1134,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1185,8 +1161,8 @@ "ctxt": 0 }, "value": "ai", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1196,7 +1172,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1224,8 +1199,8 @@ "ctxt": 0 }, "value": "ae", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1235,7 +1210,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1265,6 +1239,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1289,8 +1264,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1300,7 +1274,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1332,6 +1305,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1363,7 +1337,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1391,8 +1364,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1402,7 +1374,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1434,6 +1405,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1457,6 +1429,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1479,13 +1452,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -1511,7 +1482,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1541,15 +1511,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1559,7 +1527,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1591,6 +1558,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1613,13 +1581,11 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1629,7 +1595,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1661,6 +1626,7 @@ "ctxt": 0 }, "value": "q", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1683,13 +1649,11 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1699,7 +1663,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1716,7 +1679,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1737,6 +1699,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1759,13 +1722,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1784,6 +1745,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1806,13 +1768,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1831,6 +1791,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1853,13 +1814,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1900,8 +1859,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1911,7 +1870,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1939,8 +1897,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1950,7 +1908,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1978,8 +1935,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1989,7 +1946,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2021,7 +1977,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2042,7 +1997,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2063,7 +2017,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2081,7 +2034,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/unionTypesAssignability/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/unionTypesAssignability/input.ts.json index 393195a51378..59a4912588be 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/unionTypesAssignability/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/assignmentCompatibility/unionTypesAssignability/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "unionNumberString", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -84,7 +84,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -111,7 +110,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -137,7 +135,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "function": { @@ -177,7 +174,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -195,7 +191,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -221,7 +216,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "function": { @@ -261,7 +255,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -294,6 +287,7 @@ "ctxt": 0 }, "value": "unionDE", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -324,7 +318,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -344,15 +337,13 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -384,6 +375,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -400,8 +392,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -433,6 +424,7 @@ "ctxt": 0 }, "value": "str", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -449,8 +441,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -482,6 +473,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -504,13 +496,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -542,6 +532,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -564,13 +555,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -602,6 +591,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -624,13 +614,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -660,8 +648,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -671,7 +659,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -699,8 +686,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -710,7 +697,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -738,8 +724,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -749,7 +735,6 @@ "ctxt": 0 }, "value": "unionDE", - "typeAnnotation": null, "optional": false } } @@ -777,8 +762,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -788,7 +773,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -816,8 +800,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -827,7 +811,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -855,8 +838,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -866,7 +849,6 @@ "ctxt": 0 }, "value": "unionDE", - "typeAnnotation": null, "optional": false } } @@ -894,8 +876,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -905,7 +887,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -933,8 +914,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -944,7 +925,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -972,8 +952,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -983,7 +963,6 @@ "ctxt": 0 }, "value": "unionDE", - "typeAnnotation": null, "optional": false } } @@ -1011,8 +990,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1022,7 +1001,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false } } @@ -1050,8 +1028,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1061,7 +1039,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false } } @@ -1089,8 +1066,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1100,7 +1077,6 @@ "ctxt": 0 }, "value": "unionNumberString", - "typeAnnotation": null, "optional": false } } @@ -1128,8 +1104,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1139,7 +1115,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false } } @@ -1167,8 +1142,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1178,7 +1153,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false } } @@ -1206,8 +1180,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1217,7 +1191,6 @@ "ctxt": 0 }, "value": "unionNumberString", - "typeAnnotation": null, "optional": false } } @@ -1245,8 +1218,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1256,7 +1229,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1284,8 +1256,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1295,7 +1267,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1323,8 +1294,8 @@ "ctxt": 0 }, "value": "unionDE", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1334,7 +1305,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1362,8 +1332,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1373,7 +1343,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -1401,8 +1370,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1412,7 +1381,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -1440,8 +1408,8 @@ "ctxt": 0 }, "value": "unionDE", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1451,7 +1419,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -1479,8 +1446,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1490,7 +1457,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -1518,8 +1484,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1529,7 +1495,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -1557,8 +1522,8 @@ "ctxt": 0 }, "value": "unionDE", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1568,7 +1533,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -1596,8 +1560,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1607,7 +1571,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false } } @@ -1635,8 +1598,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1646,7 +1609,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false } } @@ -1674,8 +1636,8 @@ "ctxt": 0 }, "value": "unionNumberString", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1685,7 +1647,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false } } @@ -1713,8 +1674,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1724,7 +1685,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false } } @@ -1752,8 +1712,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1763,7 +1723,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false } } @@ -1791,8 +1750,8 @@ "ctxt": 0 }, "value": "unionNumberString", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1802,7 +1761,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false } } @@ -1832,6 +1790,7 @@ "ctxt": 0 }, "value": "anyVar", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1848,8 +1807,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1879,8 +1837,8 @@ "ctxt": 0 }, "value": "anyVar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1890,7 +1848,6 @@ "ctxt": 0 }, "value": "unionDE", - "typeAnnotation": null, "optional": false } } @@ -1918,8 +1875,8 @@ "ctxt": 0 }, "value": "anyVar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1929,7 +1886,6 @@ "ctxt": 0 }, "value": "unionNumberString", - "typeAnnotation": null, "optional": false } } @@ -1957,8 +1913,8 @@ "ctxt": 0 }, "value": "unionDE", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1968,7 +1924,6 @@ "ctxt": 0 }, "value": "anyVar", - "typeAnnotation": null, "optional": false } } @@ -1996,8 +1951,8 @@ "ctxt": 0 }, "value": "unionNumberString", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2007,7 +1962,6 @@ "ctxt": 0 }, "value": "anyVar", - "typeAnnotation": null, "optional": false } } @@ -2035,8 +1989,8 @@ "ctxt": 0 }, "value": "unionDE", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -2071,8 +2025,8 @@ "ctxt": 0 }, "value": "unionNumberString", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NullLiteral", @@ -2107,8 +2061,8 @@ "ctxt": 0 }, "value": "unionDE", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2118,7 +2072,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2146,8 +2099,8 @@ "ctxt": 0 }, "value": "unionNumberString", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2157,7 +2110,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2172,7 +2124,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2193,6 +2144,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2215,13 +2167,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2240,6 +2190,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2262,13 +2213,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2309,8 +2258,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2320,7 +2269,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -2348,8 +2296,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2359,7 +2307,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -2389,6 +2336,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2419,7 +2367,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2439,15 +2386,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2477,8 +2422,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2488,7 +2433,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -2516,8 +2460,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2527,7 +2471,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -2555,8 +2498,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2566,7 +2509,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2594,8 +2536,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2605,7 +2547,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2633,8 +2574,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2644,7 +2585,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2676,7 +2616,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2697,7 +2636,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/arrayLiteralWithMultipleBestCommonTypes/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/arrayLiteralWithMultipleBestCommonTypes/input.ts.json index ce9ae6d29258..c3153866d804 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/arrayLiteralWithMultipleBestCommonTypes/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/arrayLiteralWithMultipleBestCommonTypes/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -104,7 +104,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -132,8 +131,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -165,6 +163,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -196,7 +195,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -238,7 +236,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -266,8 +263,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -299,6 +295,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -330,7 +327,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -372,7 +368,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -400,8 +395,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -433,8 +427,8 @@ "ctxt": 0 }, "value": "as", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -454,7 +448,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -468,7 +461,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -503,8 +495,8 @@ "ctxt": 0 }, "value": "bs", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -524,7 +516,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -538,7 +529,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -573,8 +563,8 @@ "ctxt": 0 }, "value": "cs", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -594,7 +584,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -608,7 +597,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -622,7 +610,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -657,8 +644,8 @@ "ctxt": 0 }, "value": "ds", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -686,6 +673,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -708,13 +696,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -750,6 +736,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -766,8 +753,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -816,8 +802,8 @@ "ctxt": 0 }, "value": "es", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -845,6 +831,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -861,8 +848,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -898,6 +884,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -920,13 +907,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -975,8 +960,8 @@ "ctxt": 0 }, "value": "fs", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1004,6 +989,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1035,7 +1021,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1077,7 +1062,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1105,8 +1089,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -1142,6 +1125,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1173,7 +1157,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1215,7 +1198,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1243,8 +1225,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -1293,8 +1274,8 @@ "ctxt": 0 }, "value": "gs", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1322,6 +1303,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1353,7 +1335,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1395,7 +1376,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1423,8 +1403,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -1460,6 +1439,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1491,7 +1471,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1533,7 +1512,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1561,8 +1539,7 @@ } ] } - }, - "optional": false + } } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/bestCommonTypeOfConditionalExpressions/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/bestCommonTypeOfConditionalExpressions/input.ts.json index 5256d24d2784..2a656505bb68 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/bestCommonTypeOfConditionalExpressions/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/bestCommonTypeOfConditionalExpressions/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -104,7 +104,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -132,8 +131,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -165,6 +163,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -196,7 +195,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -238,7 +236,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -266,8 +263,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -284,7 +280,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -310,7 +305,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -358,7 +352,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -384,7 +377,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -424,7 +416,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -442,7 +433,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -468,7 +458,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -508,7 +497,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -541,6 +529,7 @@ "ctxt": 0 }, "value": "base", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -563,13 +552,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -601,6 +588,7 @@ "ctxt": 0 }, "value": "derived", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -623,13 +611,11 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -661,6 +647,7 @@ "ctxt": 0 }, "value": "derived2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -683,13 +670,11 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -721,8 +706,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -788,8 +773,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -855,8 +840,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -882,7 +867,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -893,7 +877,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -926,8 +909,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -953,7 +936,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -964,7 +946,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -997,8 +978,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1032,6 +1013,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1048,8 +1030,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1082,6 +1063,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1104,13 +1086,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1157,6 +1137,7 @@ "ctxt": 0 }, "value": "r7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1180,6 +1161,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1202,13 +1184,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1230,8 +1210,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -1265,6 +1244,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1281,8 +1261,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1315,6 +1294,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1337,13 +1317,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1390,8 +1368,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1425,6 +1403,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1447,13 +1426,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1486,6 +1463,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1502,8 +1480,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1550,6 +1527,7 @@ "ctxt": 0 }, "value": "r10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1572,13 +1550,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ConditionalExpression", @@ -1604,7 +1580,6 @@ "ctxt": 0 }, "value": "derived", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1615,7 +1590,6 @@ "ctxt": 0 }, "value": "derived2", - "typeAnnotation": null, "optional": false } }, @@ -1648,8 +1622,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1675,7 +1649,6 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1686,7 +1659,6 @@ "ctxt": 0 }, "value": "derived2", - "typeAnnotation": null, "optional": false } }, @@ -1704,7 +1676,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1725,6 +1696,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1747,13 +1719,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1772,6 +1742,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1794,13 +1765,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1849,7 +1818,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1860,7 +1828,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -1892,7 +1859,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1913,7 +1879,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1943,7 +1908,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/bestCommonTypeOfConditionalExpressions2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/bestCommonTypeOfConditionalExpressions2/input.ts.json index d740aed32a90..82f2a32ccfd1 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/bestCommonTypeOfConditionalExpressions2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/bestCommonTypeOfConditionalExpressions2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -273,6 +265,7 @@ "ctxt": 0 }, "value": "base", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -295,13 +288,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -333,6 +324,7 @@ "ctxt": 0 }, "value": "derived", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -355,13 +347,11 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -393,6 +383,7 @@ "ctxt": 0 }, "value": "derived2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -415,13 +406,11 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -453,8 +442,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -525,8 +514,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -552,7 +541,6 @@ "ctxt": 0 }, "value": "derived", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -563,7 +551,6 @@ "ctxt": 0 }, "value": "derived2", - "typeAnnotation": null, "optional": false } }, @@ -581,7 +568,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -602,6 +588,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -624,13 +611,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -649,6 +634,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -671,13 +657,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -726,7 +710,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -737,7 +720,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -769,7 +751,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -790,7 +771,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -810,7 +790,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -831,6 +810,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -853,13 +833,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -878,6 +856,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -900,13 +879,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -955,7 +932,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -966,7 +942,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -998,7 +973,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1016,7 +990,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1038,7 +1011,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1058,7 +1030,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1079,6 +1050,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1101,13 +1073,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1126,6 +1096,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1148,13 +1119,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1203,7 +1172,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1214,7 +1182,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -1246,7 +1213,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1264,7 +1230,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1286,7 +1251,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1304,7 +1268,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1326,7 +1289,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/bestCommonTypeOfTuple/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/bestCommonTypeOfTuple/input.ts.json index e1d8804172bd..ce234bfac485 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/bestCommonTypeOfTuple/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/bestCommonTypeOfTuple/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -127,7 +126,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -148,6 +146,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -164,8 +163,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -233,7 +231,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -254,6 +251,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -270,8 +268,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -346,7 +343,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "members": [ @@ -365,7 +361,6 @@ "ctxt": 0 }, "value": "one", - "typeAnnotation": null, "optional": false }, "init": null @@ -389,7 +384,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "members": [ @@ -408,7 +402,6 @@ "ctxt": 0 }, "value": "two", - "typeAnnotation": null, "optional": false }, "init": null @@ -440,6 +433,7 @@ "ctxt": 0 }, "value": "t1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -479,6 +473,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -495,8 +490,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -543,6 +537,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -559,8 +554,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -585,8 +579,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -618,6 +611,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -656,7 +650,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -685,7 +678,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -693,8 +685,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -726,6 +717,7 @@ "ctxt": 0 }, "value": "t3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -779,8 +771,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -812,6 +803,7 @@ "ctxt": 0 }, "value": "t4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -850,7 +842,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -879,7 +870,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -905,8 +895,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -936,8 +925,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -957,7 +946,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } }, @@ -971,7 +959,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false } } @@ -1002,8 +989,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -1030,7 +1017,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1041,7 +1027,6 @@ "ctxt": 0 }, "value": "one", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1064,7 +1049,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1075,7 +1059,6 @@ "ctxt": 0 }, "value": "two", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1108,8 +1091,8 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -1141,7 +1124,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1172,8 +1154,8 @@ "ctxt": 0 }, "value": "t4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -1200,7 +1182,6 @@ "ctxt": 0 }, "value": "E1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1211,7 +1192,6 @@ "ctxt": 0 }, "value": "one", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1234,7 +1214,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1245,7 +1224,6 @@ "ctxt": 0 }, "value": "two", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1292,8 +1270,8 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1310,7 +1288,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1353,8 +1330,8 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1371,7 +1348,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1414,8 +1390,8 @@ "ctxt": 0 }, "value": "e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1432,7 +1408,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1475,8 +1450,8 @@ "ctxt": 0 }, "value": "e4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1493,7 +1468,6 @@ "ctxt": 0 }, "value": "t4", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/bestCommonTypeOfTuple2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/bestCommonTypeOfTuple2/input.ts.json index 04f3f74d1889..d08e74782dd1 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/bestCommonTypeOfTuple2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/bestCommonTypeOfTuple2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,7 +51,6 @@ "ctxt": 0 }, "value": "base1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -82,7 +80,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -105,7 +102,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -167,7 +162,6 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -184,7 +178,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -210,7 +203,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -246,7 +238,6 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -263,7 +254,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -289,7 +279,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": null, @@ -325,7 +314,6 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -342,7 +330,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -368,7 +355,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": null, @@ -392,7 +378,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -410,7 +395,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -436,7 +420,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "value": { @@ -479,7 +462,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -515,7 +497,6 @@ "ctxt": 0 }, "value": "base1", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -532,7 +513,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -558,7 +538,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "value": { @@ -601,7 +580,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": null, @@ -625,7 +603,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -658,6 +635,7 @@ "ctxt": 0 }, "value": "t1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -696,7 +674,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -725,7 +702,6 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -733,8 +709,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -766,6 +741,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -804,7 +780,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -833,7 +808,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -841,8 +815,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -874,6 +847,7 @@ "ctxt": 0 }, "value": "t3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -912,7 +886,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -941,7 +914,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -949,8 +921,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -982,6 +953,7 @@ "ctxt": 0 }, "value": "t4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1020,7 +992,6 @@ "ctxt": 0 }, "value": "base1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1049,7 +1020,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1057,8 +1027,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1090,6 +1059,7 @@ "ctxt": 0 }, "value": "t5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1128,7 +1098,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1157,7 +1126,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1165,8 +1133,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1198,8 +1165,8 @@ "ctxt": 0 }, "value": "e11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1216,7 +1183,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1259,8 +1225,8 @@ "ctxt": 0 }, "value": "e21", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1277,7 +1243,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1320,8 +1285,8 @@ "ctxt": 0 }, "value": "e31", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1338,7 +1303,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1381,8 +1345,8 @@ "ctxt": 0 }, "value": "e41", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1399,7 +1363,6 @@ "ctxt": 0 }, "value": "t4", - "typeAnnotation": null, "optional": false }, "property": { @@ -1442,8 +1405,8 @@ "ctxt": 0 }, "value": "e51", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1460,7 +1423,6 @@ "ctxt": 0 }, "value": "t5", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements/input.ts.json index 77fa74bf7fd7..55a87aa21c41 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -128,7 +127,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -284,7 +282,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -352,8 +349,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -407,7 +404,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -475,8 +471,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -538,7 +534,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -613,7 +608,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -634,6 +628,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -656,13 +651,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -681,6 +674,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -703,13 +697,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -766,7 +758,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -795,7 +786,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -829,7 +819,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -850,7 +839,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -870,7 +858,6 @@ "ctxt": 0 }, "value": "f8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -891,6 +878,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -913,13 +901,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -938,6 +924,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -960,13 +947,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1023,7 +1008,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1052,7 +1036,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1086,7 +1069,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1104,7 +1086,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1126,7 +1107,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1144,7 +1124,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1166,7 +1145,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements2/input.ts.json index 9807174e1ee9..9b0e55804584 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/functionWithMultipleReturnStatements2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -122,7 +121,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -272,7 +270,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -340,8 +337,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "body": { "type": "BlockStatement", @@ -366,7 +363,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -418,7 +414,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -476,7 +471,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -500,7 +494,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -521,6 +514,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -543,13 +537,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -606,7 +598,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -666,7 +657,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -701,6 +691,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -732,7 +723,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -774,7 +764,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -802,8 +791,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -835,6 +823,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -866,7 +855,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -908,7 +896,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -936,8 +923,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -954,7 +940,6 @@ "ctxt": 0 }, "value": "f9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1012,7 +997,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1041,7 +1025,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1065,7 +1048,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1123,7 +1105,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1152,7 +1133,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1176,7 +1156,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1242,6 +1221,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1258,8 +1238,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1310,6 +1289,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1332,13 +1312,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1376,7 +1354,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1442,6 +1419,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1464,13 +1442,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1521,6 +1497,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1537,8 +1514,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/heterogeneousArrayLiterals/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/heterogeneousArrayLiterals/input.ts.json index be547223fb75..5c8070083b17 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/heterogeneousArrayLiterals/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/bestCommonType/heterogeneousArrayLiterals/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -102,8 +102,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -167,8 +167,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -249,8 +249,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -315,8 +315,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -348,7 +348,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false } } @@ -383,8 +382,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -462,8 +461,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -559,8 +558,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -590,7 +589,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -613,7 +611,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -654,7 +651,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -701,8 +697,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -732,7 +728,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -755,7 +750,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -796,7 +790,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -848,8 +841,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -945,8 +938,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1037,8 +1030,8 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1128,8 +1121,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1249,8 +1242,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1357,7 +1350,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1383,7 +1375,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1431,7 +1422,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1457,7 +1447,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1497,7 +1486,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1515,7 +1503,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1541,7 +1528,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1581,7 +1567,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1614,6 +1599,7 @@ "ctxt": 0 }, "value": "base", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1636,13 +1622,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1674,6 +1658,7 @@ "ctxt": 0 }, "value": "derived", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1696,13 +1681,11 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1734,6 +1717,7 @@ "ctxt": 0 }, "value": "derived2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1756,13 +1740,11 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1786,7 +1768,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "body": { @@ -1822,8 +1803,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1853,7 +1834,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1864,7 +1844,6 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, "optional": false } }, @@ -1878,7 +1857,6 @@ "ctxt": 0 }, "value": "basear", - "typeAnnotation": null, "optional": false }, "value": { @@ -1889,7 +1867,6 @@ "ctxt": 0 }, "value": "derived", - "typeAnnotation": null, "optional": false } } @@ -1916,7 +1893,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1927,7 +1903,6 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, "optional": false } } @@ -1965,8 +1940,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1996,7 +1971,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -2007,7 +1981,6 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, "optional": false } }, @@ -2021,7 +1994,6 @@ "ctxt": 0 }, "value": "basear", - "typeAnnotation": null, "optional": false }, "value": { @@ -2032,7 +2004,6 @@ "ctxt": 0 }, "value": "derived", - "typeAnnotation": null, "optional": false } } @@ -2059,7 +2030,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -2070,7 +2040,6 @@ "ctxt": 0 }, "value": "derived", - "typeAnnotation": null, "optional": false } } @@ -2108,8 +2077,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -2137,7 +2106,6 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2164,7 +2132,6 @@ "ctxt": 0 }, "value": "derived", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2204,8 +2171,8 @@ "ctxt": 0 }, "value": "k", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -2233,7 +2200,6 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2298,8 +2264,8 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -2327,7 +2293,6 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2391,8 +2356,8 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -2420,7 +2385,6 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2447,7 +2411,6 @@ "ctxt": 0 }, "value": "derived", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2511,8 +2474,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -2550,7 +2513,6 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2590,7 +2552,6 @@ "ctxt": 0 }, "value": "derived", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2633,8 +2594,8 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -2654,7 +2615,6 @@ "ctxt": 0 }, "value": "derived", - "typeAnnotation": null, "optional": false } }, @@ -2668,7 +2628,6 @@ "ctxt": 0 }, "value": "derived2", - "typeAnnotation": null, "optional": false } } @@ -2703,8 +2662,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -2724,7 +2683,6 @@ "ctxt": 0 }, "value": "derived", - "typeAnnotation": null, "optional": false } }, @@ -2738,7 +2696,6 @@ "ctxt": 0 }, "value": "derived2", - "typeAnnotation": null, "optional": false } }, @@ -2752,7 +2709,6 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, "optional": false } } @@ -2787,8 +2743,8 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -2826,7 +2782,6 @@ "ctxt": 0 }, "value": "derived2", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2866,7 +2821,6 @@ "ctxt": 0 }, "value": "derived", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2904,7 +2858,6 @@ "ctxt": 0 }, "value": "WithContextualType", - "typeAnnotation": null, "optional": false }, "body": { @@ -2940,6 +2893,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2969,14 +2923,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -2996,7 +2948,6 @@ "ctxt": 0 }, "value": "derived", - "typeAnnotation": null, "optional": false } }, @@ -3010,7 +2961,6 @@ "ctxt": 0 }, "value": "derived2", - "typeAnnotation": null, "optional": false } } @@ -3045,6 +2995,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3074,14 +3025,12 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -3133,6 +3082,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3162,14 +3112,12 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -3209,6 +3157,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3261,7 +3210,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3272,8 +3220,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -3301,7 +3248,6 @@ "ctxt": 0 }, "value": "derived", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3328,7 +3274,6 @@ "ctxt": 0 }, "value": "derived2", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3356,7 +3301,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3377,6 +3321,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3399,13 +3344,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3424,6 +3367,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3446,13 +3390,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3495,8 +3437,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -3516,7 +3458,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -3530,7 +3471,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -3565,8 +3505,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -3586,7 +3526,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -3632,8 +3571,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -3653,7 +3592,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -3667,7 +3605,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -3702,8 +3639,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -3723,7 +3660,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -3770,8 +3706,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -3799,7 +3735,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3826,7 +3761,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3866,8 +3800,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -3895,7 +3829,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3922,7 +3855,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3988,7 +3920,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4009,7 +3940,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4029,7 +3959,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4050,6 +3979,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4072,13 +4002,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -4097,6 +4025,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4119,13 +4048,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4168,8 +4095,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -4189,7 +4116,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4203,7 +4129,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -4238,8 +4163,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -4259,7 +4184,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4305,8 +4229,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -4326,7 +4250,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4340,7 +4263,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -4375,8 +4297,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -4396,7 +4318,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4443,8 +4364,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -4472,7 +4393,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4499,7 +4419,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4539,8 +4458,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -4568,7 +4487,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4595,7 +4513,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4659,8 +4576,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -4680,7 +4597,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4694,7 +4610,6 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, "optional": false } } @@ -4729,8 +4644,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -4750,7 +4665,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -4764,7 +4678,6 @@ "ctxt": 0 }, "value": "derived", - "typeAnnotation": null, "optional": false } } @@ -4799,8 +4712,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -4820,7 +4733,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -4834,7 +4746,6 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, "optional": false } } @@ -4869,8 +4780,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -4890,7 +4801,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -4904,7 +4814,6 @@ "ctxt": 0 }, "value": "derived", - "typeAnnotation": null, "optional": false } } @@ -4941,7 +4850,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4959,7 +4867,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4981,7 +4888,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4999,7 +4905,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5020,7 +4925,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5041,6 +4945,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5063,13 +4968,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -5088,6 +4991,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5110,13 +5014,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5159,8 +5061,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -5180,7 +5082,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -5194,7 +5095,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -5229,8 +5129,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -5250,7 +5150,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -5296,8 +5195,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -5317,7 +5216,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -5331,7 +5229,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -5366,8 +5263,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -5387,7 +5284,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -5434,8 +5330,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -5463,7 +5359,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5490,7 +5385,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5530,8 +5424,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -5559,7 +5453,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5586,7 +5479,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "async": false, @@ -5650,8 +5542,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -5671,7 +5563,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -5685,7 +5576,6 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, "optional": false } } @@ -5720,8 +5610,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -5741,7 +5631,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -5755,7 +5644,6 @@ "ctxt": 0 }, "value": "derived", - "typeAnnotation": null, "optional": false } } @@ -5790,8 +5678,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -5811,7 +5699,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -5825,7 +5712,6 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, "optional": false } } @@ -5860,8 +5746,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -5881,7 +5767,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -5895,7 +5780,6 @@ "ctxt": 0 }, "value": "derived", - "typeAnnotation": null, "optional": false } } @@ -5932,7 +5816,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5950,7 +5833,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5972,7 +5854,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5990,7 +5871,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6011,7 +5891,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6032,6 +5911,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6054,13 +5934,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -6079,6 +5957,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6101,13 +5980,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6150,8 +6027,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -6171,7 +6048,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -6185,7 +6061,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -6220,8 +6095,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -6241,7 +6116,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -6287,8 +6161,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -6308,7 +6182,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -6322,7 +6195,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -6357,8 +6229,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -6378,7 +6250,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -6425,8 +6296,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -6454,7 +6325,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "async": false, @@ -6481,7 +6351,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "async": false, @@ -6521,8 +6390,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -6550,7 +6419,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "async": false, @@ -6577,7 +6445,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "async": false, @@ -6641,8 +6508,8 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -6662,7 +6529,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -6676,7 +6542,6 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, "optional": false } } @@ -6711,8 +6576,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -6732,7 +6597,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -6746,7 +6610,6 @@ "ctxt": 0 }, "value": "derived", - "typeAnnotation": null, "optional": false } } @@ -6781,8 +6644,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -6802,7 +6665,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -6816,7 +6678,6 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, "optional": false } } @@ -6851,8 +6712,8 @@ "ctxt": 0 }, "value": "j", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -6872,7 +6733,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -6886,7 +6746,6 @@ "ctxt": 0 }, "value": "derived", - "typeAnnotation": null, "optional": false } } @@ -6921,6 +6780,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6950,14 +6810,12 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -6977,7 +6835,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -6991,7 +6848,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -7028,7 +6884,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7046,7 +6901,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7068,7 +6922,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7086,7 +6939,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/equalityStrictNulls/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/equalityStrictNulls/input.ts.json index 872680c1d135..7412639eb8c3 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/equalityStrictNulls/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/equalityStrictNulls/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -95,7 +94,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -106,7 +104,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -155,7 +151,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -193,7 +188,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -204,7 +198,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -242,7 +235,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -253,7 +245,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -291,7 +282,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -337,7 +327,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -383,7 +372,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -429,7 +417,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -475,7 +462,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -486,7 +472,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -524,7 +509,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -535,7 +519,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -573,7 +556,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -584,7 +566,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -622,7 +603,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -633,7 +613,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -679,7 +658,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -725,7 +703,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -771,7 +748,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -817,7 +793,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -849,7 +824,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -891,7 +865,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -902,7 +875,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -940,7 +912,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -994,7 +965,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1069,7 +1039,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1090,6 +1059,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1106,8 +1076,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -1126,6 +1095,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1142,8 +1112,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } }, { @@ -1162,6 +1131,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1193,7 +1163,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1221,8 +1190,7 @@ } ] } - }, - "optional": false + } } }, { @@ -1241,6 +1209,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1276,8 +1245,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1318,7 +1286,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "right": { @@ -1364,7 +1331,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "right": { @@ -1410,7 +1376,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -1456,7 +1421,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "right": { @@ -1496,7 +1460,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1517,6 +1480,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1533,8 +1497,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1575,7 +1538,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1586,7 +1548,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1624,7 +1585,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1635,7 +1595,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1673,7 +1632,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1684,7 +1642,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1722,7 +1679,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -1733,7 +1689,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1765,7 +1720,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1786,6 +1740,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1802,8 +1757,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1836,7 +1790,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -1882,7 +1835,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "consequent": [ diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/equalityWithIntersectionTypes01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/equalityWithIntersectionTypes01/input.ts.json index 53262dd88cf2..9faf7d4f3c27 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/equalityWithIntersectionTypes01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/equalityWithIntersectionTypes01/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -220,7 +214,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -274,8 +267,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -295,7 +288,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "value": { @@ -318,7 +310,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "value": { @@ -341,7 +332,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false }, "value": { @@ -385,6 +375,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -415,7 +406,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -435,15 +425,13 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -453,7 +441,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -485,6 +472,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -507,13 +495,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -523,7 +509,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -561,7 +546,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -572,7 +556,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } }, @@ -592,7 +575,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "right": { @@ -603,7 +585,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -648,7 +629,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -659,7 +639,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } }, @@ -679,7 +658,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "right": { @@ -690,7 +668,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -735,7 +712,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -746,7 +722,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } }, @@ -766,7 +741,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "right": { @@ -777,7 +751,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -822,7 +795,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -833,7 +805,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } }, @@ -853,7 +824,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "right": { @@ -864,7 +834,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/equalityWithUnionTypes01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/equalityWithUnionTypes01/input.ts.json index c17b909428c9..ee1d9dfe5c4e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/equalityWithUnionTypes01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/equalityWithUnionTypes01/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -200,8 +195,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -221,7 +216,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "value": { @@ -244,7 +238,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "value": { @@ -288,6 +281,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -327,15 +321,13 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -345,7 +337,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -377,6 +368,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -399,13 +391,11 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -415,7 +405,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -453,7 +442,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -464,7 +452,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } }, @@ -484,7 +471,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "right": { @@ -495,7 +481,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -540,7 +525,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -551,7 +535,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } }, @@ -571,7 +554,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "right": { @@ -582,7 +564,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -627,7 +608,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -638,7 +618,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } }, @@ -658,7 +637,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "right": { @@ -669,7 +647,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -714,7 +691,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -725,7 +701,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } }, @@ -745,7 +720,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "right": { @@ -756,7 +730,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/independentPropertyVariance/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/independentPropertyVariance/input.ts.json index 089be99d69c7..d89d0221e9a1 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/independentPropertyVariance/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/independentPropertyVariance/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -112,7 +112,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -140,8 +139,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -173,6 +171,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -204,7 +203,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -246,7 +244,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -287,8 +284,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -318,7 +314,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -329,7 +324,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/optionalProperties01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/optionalProperties01/input.ts.json index ae0b22e20319..f9ab53728440 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/optionalProperties01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/optionalProperties01/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "required1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "required2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -135,7 +132,6 @@ "ctxt": 0 }, "value": "optional", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -189,8 +185,8 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -217,7 +213,6 @@ "ctxt": 0 }, "value": "required1", - "typeAnnotation": null, "optional": false }, "value": { @@ -252,7 +247,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -287,8 +281,8 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsAsExpression", @@ -315,7 +309,6 @@ "ctxt": 0 }, "value": "required1", - "typeAnnotation": null, "optional": false }, "value": { @@ -343,7 +336,6 @@ "ctxt": 0 }, "value": "optional", - "typeAnnotation": null, "optional": false }, "value": { @@ -378,7 +370,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/optionalProperties02/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/optionalProperties02/input.ts.json index b67c9ad7d9e3..210a8bc4b22b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/optionalProperties02/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/optionalProperties02/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -154,7 +151,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -165,7 +161,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -186,7 +181,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/switchCaseWithIntersectionTypes01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/switchCaseWithIntersectionTypes01/input.ts.json index eb740e31cdce..ec4c4654898b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/switchCaseWithIntersectionTypes01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/switchCaseWithIntersectionTypes01/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "strAndNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -99,6 +99,7 @@ "ctxt": 0 }, "value": "numAndBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -134,8 +135,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -167,6 +167,7 @@ "ctxt": 0 }, "value": "str", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -183,8 +184,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -216,6 +216,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -232,8 +233,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -265,6 +265,7 @@ "ctxt": 0 }, "value": "bool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -281,8 +282,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -304,7 +304,6 @@ "ctxt": 0 }, "value": "strAndNum", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -323,7 +322,6 @@ "ctxt": 0 }, "value": "strAndNum", - "typeAnnotation": null, "optional": false }, "consequent": [ @@ -353,7 +351,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false }, "consequent": [] @@ -373,7 +370,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false }, "consequent": [ @@ -403,7 +399,6 @@ "ctxt": 0 }, "value": "numAndBool", - "typeAnnotation": null, "optional": false }, "consequent": [ @@ -433,7 +428,6 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, "optional": false }, "consequent": [ diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/switchCaseWithUnionTypes01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/switchCaseWithUnionTypes01/input.ts.json index cc3cfc6b1787..faa8208980cb 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/switchCaseWithUnionTypes01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/switchCaseWithUnionTypes01/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -99,6 +99,7 @@ "ctxt": 0 }, "value": "numOrBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -134,8 +135,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -167,6 +167,7 @@ "ctxt": 0 }, "value": "str", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -183,8 +184,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -216,6 +216,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -232,8 +233,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -265,6 +265,7 @@ "ctxt": 0 }, "value": "bool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -281,8 +282,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -304,7 +304,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -323,7 +322,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false }, "consequent": [ @@ -353,7 +351,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false }, "consequent": [] @@ -373,7 +370,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false }, "consequent": [ @@ -403,7 +399,6 @@ "ctxt": 0 }, "value": "numOrBool", - "typeAnnotation": null, "optional": false }, "consequent": [ @@ -433,7 +428,6 @@ "ctxt": 0 }, "value": "bool", - "typeAnnotation": null, "optional": false }, "consequent": [ diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/typeAssertionsWithIntersectionTypes01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/typeAssertionsWithIntersectionTypes01/input.ts.json index a16218b01255..bad57ae0bb92 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/typeAssertionsWithIntersectionTypes01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/typeAssertionsWithIntersectionTypes01/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -220,7 +214,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -274,8 +267,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -295,7 +288,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "value": { @@ -318,7 +310,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "value": { @@ -341,7 +332,6 @@ "ctxt": 0 }, "value": "p3", - "typeAnnotation": null, "optional": false }, "value": { @@ -385,6 +375,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -415,7 +406,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -435,15 +425,13 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -453,7 +441,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -485,6 +472,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -507,13 +495,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -523,7 +509,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -555,8 +540,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -573,7 +558,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -599,7 +583,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -619,7 +602,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -656,8 +638,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -674,7 +656,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -692,7 +673,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -727,8 +707,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -745,7 +725,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -763,7 +742,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -798,8 +776,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -816,7 +794,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -834,7 +811,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/typeAssertionsWithUnionTypes01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/typeAssertionsWithUnionTypes01/input.ts.json index ae91a2310de0..725005747d4d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/typeAssertionsWithUnionTypes01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/comparable/typeAssertionsWithUnionTypes01/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -200,8 +195,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -221,7 +216,6 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, "optional": false }, "value": { @@ -244,7 +238,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false }, "value": { @@ -288,6 +281,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -327,15 +321,13 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -345,7 +337,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -377,6 +368,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -399,13 +391,11 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -415,7 +405,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -447,8 +436,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -465,7 +454,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -500,7 +488,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -537,8 +524,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -555,7 +542,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -597,8 +583,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -615,7 +601,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -633,7 +618,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -668,8 +652,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsTypeAssertion", @@ -686,7 +670,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -704,7 +687,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/instanceOf/narrowingConstrainedTypeVariable/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/instanceOf/narrowingConstrainedTypeVariable/input.ts.json index 353acaf328f7..4b55665499ea 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/instanceOf/narrowingConstrainedTypeVariable/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/instanceOf/narrowingConstrainedTypeVariable/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -64,6 +62,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -94,7 +93,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -110,8 +108,7 @@ } ] } - }, - "optional": false + } } } ], @@ -152,7 +149,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -163,7 +159,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -200,6 +195,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -222,13 +218,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -238,7 +232,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "definite": false @@ -280,6 +273,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -296,8 +290,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -307,7 +300,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "definite": false @@ -344,7 +336,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -362,7 +353,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -399,7 +389,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -426,7 +415,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -447,6 +435,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -477,7 +466,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -497,15 +485,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -546,7 +532,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -557,7 +542,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -594,6 +578,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -616,13 +601,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -632,7 +615,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "definite": false @@ -674,6 +656,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -696,13 +679,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -712,7 +693,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "definite": false @@ -749,7 +729,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -767,7 +746,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -789,7 +767,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -807,7 +784,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -828,7 +804,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -854,7 +829,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -921,7 +895,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -942,6 +915,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -972,7 +946,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1001,7 +974,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1031,8 +1003,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1073,7 +1044,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "right": { @@ -1084,7 +1054,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false } }, @@ -1121,6 +1090,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1143,13 +1113,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1159,7 +1127,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1201,6 +1168,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1232,7 +1200,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1260,8 +1227,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1271,7 +1237,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1308,7 +1273,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1326,7 +1290,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/instanceOf/narrowingGenericTypeFromInstanceof01/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/instanceOf/narrowingGenericTypeFromInstanceof01/input.ts.json index 2ded842cac77..20b02c6e95be 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/instanceOf/narrowingGenericTypeFromInstanceof01/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/instanceOf/narrowingGenericTypeFromInstanceof01/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -64,6 +62,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -80,8 +79,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -123,7 +121,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -180,7 +176,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -201,7 +196,6 @@ "ctxt": 0 }, "value": "acceptA", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -222,6 +216,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -244,7 +239,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -270,7 +264,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -278,8 +271,7 @@ ] } } - }, - "optional": false + } } } ], @@ -323,7 +315,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -343,7 +334,6 @@ "ctxt": 0 }, "value": "acceptB", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -364,6 +354,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -386,7 +377,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -412,7 +402,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -420,8 +409,7 @@ ] } } - }, - "optional": false + } } } ], @@ -465,7 +453,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -485,7 +472,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -506,6 +492,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -536,7 +523,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -562,7 +548,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -585,7 +570,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -611,7 +595,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -621,8 +604,7 @@ } ] } - }, - "optional": false + } } } ], @@ -663,7 +645,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -674,7 +655,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -708,7 +688,6 @@ "ctxt": 0 }, "value": "acceptA", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -722,7 +701,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -757,7 +735,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -768,7 +745,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -802,7 +778,6 @@ "ctxt": 0 }, "value": "acceptA", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -816,7 +791,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -851,7 +825,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -862,7 +835,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -896,7 +868,6 @@ "ctxt": 0 }, "value": "acceptB", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -910,7 +881,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -945,7 +915,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -956,7 +925,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -990,7 +958,6 @@ "ctxt": 0 }, "value": "acceptB", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1004,7 +971,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1043,7 +1009,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/arrayLiteralsWithRecursiveGenerics/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/arrayLiteralsWithRecursiveGenerics/input.ts.json index 32687748a006..ee0d752a2d97 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/arrayLiteralsWithRecursiveGenerics/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/arrayLiteralsWithRecursiveGenerics/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -99,7 +96,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "value": null, @@ -125,7 +121,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -151,7 +146,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -177,7 +171,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -225,7 +218,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -246,7 +238,6 @@ "ctxt": 0 }, "value": "DerivedList", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -272,7 +263,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -298,7 +288,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -323,7 +312,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -350,7 +338,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -381,7 +368,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -400,7 +386,6 @@ "ctxt": 0 }, "value": "MyList", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -426,7 +411,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "value": null, @@ -452,7 +436,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -483,7 +466,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "value": null, @@ -509,7 +491,6 @@ "ctxt": 0 }, "value": "MyList", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -535,7 +516,6 @@ "ctxt": 0 }, "value": "MyList", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -561,7 +541,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -609,7 +588,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -645,6 +623,7 @@ "ctxt": 0 }, "value": "list", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -667,7 +646,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -690,8 +668,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -723,6 +700,7 @@ "ctxt": 0 }, "value": "list2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -745,7 +723,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -768,8 +745,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -801,6 +777,7 @@ "ctxt": 0 }, "value": "myList", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -823,7 +800,6 @@ "ctxt": 0 }, "value": "MyList", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -846,8 +822,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -879,8 +854,8 @@ "ctxt": 0 }, "value": "xs", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -900,7 +875,6 @@ "ctxt": 0 }, "value": "list", - "typeAnnotation": null, "optional": false } }, @@ -914,7 +888,6 @@ "ctxt": 0 }, "value": "myList", - "typeAnnotation": null, "optional": false } } @@ -949,8 +922,8 @@ "ctxt": 0 }, "value": "ys", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -970,7 +943,6 @@ "ctxt": 0 }, "value": "list", - "typeAnnotation": null, "optional": false } }, @@ -984,7 +956,6 @@ "ctxt": 0 }, "value": "list2", - "typeAnnotation": null, "optional": false } } @@ -1019,8 +990,8 @@ "ctxt": 0 }, "value": "zs", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1040,7 +1011,6 @@ "ctxt": 0 }, "value": "list", - "typeAnnotation": null, "optional": false } }, @@ -1086,6 +1056,7 @@ "ctxt": 0 }, "value": "myDerivedList", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1108,7 +1079,6 @@ "ctxt": 0 }, "value": "DerivedList", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1131,8 +1101,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1164,8 +1133,8 @@ "ctxt": 0 }, "value": "as", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1185,7 +1154,6 @@ "ctxt": 0 }, "value": "list", - "typeAnnotation": null, "optional": false } }, @@ -1199,7 +1167,6 @@ "ctxt": 0 }, "value": "myDerivedList", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/infiniteExpansionThroughInstantiation/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/infiniteExpansionThroughInstantiation/input.ts.json index f5f09d3d92e6..c19a9100361f 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/infiniteExpansionThroughInstantiation/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/infiniteExpansionThroughInstantiation/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -134,7 +130,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -163,7 +158,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -189,7 +183,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -216,7 +209,6 @@ "ctxt": 0 }, "value": "owner", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -245,7 +237,6 @@ "ctxt": 0 }, "value": "OwnerList", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -271,7 +262,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -300,7 +290,6 @@ "ctxt": 0 }, "value": "OwnerList", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -327,7 +316,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -351,7 +339,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -377,7 +364,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -403,7 +389,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -439,7 +424,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -493,6 +477,7 @@ "ctxt": 0 }, "value": "list", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -515,7 +500,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -538,8 +522,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -571,6 +554,7 @@ "ctxt": 0 }, "value": "ownerList", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -593,7 +577,6 @@ "ctxt": 0 }, "value": "OwnerList", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -616,8 +599,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -647,8 +629,8 @@ "ctxt": 0 }, "value": "list", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -658,7 +640,6 @@ "ctxt": 0 }, "value": "ownerList", - "typeAnnotation": null, "optional": false } } @@ -673,7 +654,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -694,6 +674,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -716,13 +697,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -765,6 +744,7 @@ "ctxt": 0 }, "value": "list", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -787,7 +767,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -813,7 +792,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -821,8 +799,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -854,6 +831,7 @@ "ctxt": 0 }, "value": "ownerList", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -876,7 +854,6 @@ "ctxt": 0 }, "value": "OwnerList", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -902,7 +879,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -910,8 +886,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -941,8 +916,8 @@ "ctxt": 0 }, "value": "list", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -952,7 +927,6 @@ "ctxt": 0 }, "value": "ownerList", - "typeAnnotation": null, "optional": false } } @@ -984,7 +958,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/infiniteExpansionThroughInstantiation2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/infiniteExpansionThroughInstantiation2/input.ts.json index 56da45909beb..4ac9007534dd 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/infiniteExpansionThroughInstantiation2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/infiniteExpansionThroughInstantiation2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "AA", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -66,7 +64,6 @@ "ctxt": 0 }, "value": "AA", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -92,7 +89,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -129,7 +125,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -158,7 +153,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -184,7 +178,6 @@ "ctxt": 0 }, "value": "BB", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -205,7 +198,6 @@ "ctxt": 0 }, "value": "AA", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -231,7 +223,6 @@ "ctxt": 0 }, "value": "AA", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -257,7 +248,6 @@ "ctxt": 0 }, "value": "BB", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/infiniteExpansionThroughTypeInference/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/infiniteExpansionThroughTypeInference/input.ts.json index 1a56d8a69a23..8ba33211bf02 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/infiniteExpansionThroughTypeInference/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/infiniteExpansionThroughTypeInference/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -136,7 +132,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -162,7 +157,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -192,7 +186,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -221,7 +214,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -242,7 +234,6 @@ "ctxt": 0 }, "value": "ff", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -263,6 +254,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -285,7 +277,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -311,7 +302,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -319,8 +309,7 @@ ] } } - }, - "optional": false + } } } ], @@ -360,7 +349,6 @@ "ctxt": 0 }, "value": "ff", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -374,7 +362,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } } @@ -409,7 +396,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/nominalSubtypeCheckOfTypeParameter/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/nominalSubtypeCheckOfTypeParameter/input.ts.json index 643daeb402f2..d7c2e731a080 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/nominalSubtypeCheckOfTypeParameter/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/nominalSubtypeCheckOfTypeParameter/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "BinaryTuple", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -102,7 +99,6 @@ "ctxt": 0 }, "value": "first", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -155,7 +150,6 @@ "ctxt": 0 }, "value": "second", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -184,7 +178,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -210,7 +203,6 @@ "ctxt": 0 }, "value": "Sequence", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -237,7 +229,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -270,7 +261,6 @@ "ctxt": 0 }, "value": "hasNext", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -311,7 +301,6 @@ "ctxt": 0 }, "value": "pop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -339,7 +328,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -363,7 +351,6 @@ "ctxt": 0 }, "value": "zip", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -377,6 +364,7 @@ "ctxt": 0 }, "value": "seq", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -399,7 +387,6 @@ "ctxt": 0 }, "value": "Sequence", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -425,7 +412,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -433,8 +419,7 @@ ] } } - }, - "optional": false + } } ], "typeAnn": { @@ -459,7 +444,6 @@ "ctxt": 0 }, "value": "Sequence", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -485,7 +469,6 @@ "ctxt": 0 }, "value": "BinaryTuple", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -511,7 +494,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -531,7 +513,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -566,7 +547,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -593,7 +573,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -620,7 +599,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -644,7 +622,6 @@ "ctxt": 0 }, "value": "Sequence", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -670,7 +647,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -703,7 +679,6 @@ "ctxt": 0 }, "value": "getLength", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -744,7 +719,6 @@ "ctxt": 0 }, "value": "zip", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -758,6 +732,7 @@ "ctxt": 0 }, "value": "seq", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -780,7 +755,6 @@ "ctxt": 0 }, "value": "Sequence", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -806,7 +780,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -814,8 +787,7 @@ ] } } - }, - "optional": false + } } ], "typeAnn": { @@ -840,7 +812,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -866,7 +837,6 @@ "ctxt": 0 }, "value": "BinaryTuple", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -892,7 +862,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -912,7 +881,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -947,7 +915,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/nominalSubtypeCheckOfTypeParameter2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/nominalSubtypeCheckOfTypeParameter2/input.ts.json index 9f2781826cce..99d7349102dd 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/nominalSubtypeCheckOfTypeParameter2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/nominalSubtypeCheckOfTypeParameter2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -136,7 +132,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -163,7 +158,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -187,7 +181,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -213,7 +206,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -246,7 +238,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -275,7 +266,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -301,7 +291,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -328,7 +317,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -352,7 +340,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -378,7 +365,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -429,7 +415,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -458,7 +443,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -484,7 +468,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -511,7 +494,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -544,7 +526,6 @@ "ctxt": 0 }, "value": "bam", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -573,7 +554,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -599,7 +579,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -626,7 +605,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -650,7 +628,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -676,7 +653,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -702,7 +678,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -738,7 +713,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -767,7 +741,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/objectTypeWithRecursiveWrappedProperty/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/objectTypeWithRecursiveWrappedProperty/input.ts.json index 02003a33ac0e..a276dd0c41d7 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/objectTypeWithRecursiveWrappedProperty/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/objectTypeWithRecursiveWrappedProperty/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -99,7 +96,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "value": null, @@ -125,7 +121,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -151,7 +146,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -177,7 +171,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -225,7 +218,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -261,8 +253,8 @@ "ctxt": 0 }, "value": "list1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -279,7 +271,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -332,8 +323,8 @@ "ctxt": 0 }, "value": "list2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -350,7 +341,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -403,8 +393,8 @@ "ctxt": 0 }, "value": "list3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -421,7 +411,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -472,8 +461,8 @@ "ctxt": 0 }, "value": "list1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -483,7 +472,6 @@ "ctxt": 0 }, "value": "list2", - "typeAnnotation": null, "optional": false } } @@ -511,8 +499,8 @@ "ctxt": 0 }, "value": "list1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -522,7 +510,6 @@ "ctxt": 0 }, "value": "list3", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/objectTypeWithRecursiveWrappedProperty2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/objectTypeWithRecursiveWrappedProperty2/input.ts.json index 02003a33ac0e..a276dd0c41d7 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/objectTypeWithRecursiveWrappedProperty2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/objectTypeWithRecursiveWrappedProperty2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -99,7 +96,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "value": null, @@ -125,7 +121,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -151,7 +146,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -177,7 +171,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -225,7 +218,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -261,8 +253,8 @@ "ctxt": 0 }, "value": "list1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -279,7 +271,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -332,8 +323,8 @@ "ctxt": 0 }, "value": "list2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -350,7 +341,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -403,8 +393,8 @@ "ctxt": 0 }, "value": "list3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -421,7 +411,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -472,8 +461,8 @@ "ctxt": 0 }, "value": "list1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -483,7 +472,6 @@ "ctxt": 0 }, "value": "list2", - "typeAnnotation": null, "optional": false } } @@ -511,8 +499,8 @@ "ctxt": 0 }, "value": "list1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -522,7 +510,6 @@ "ctxt": 0 }, "value": "list3", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/objectTypeWithRecursiveWrappedPropertyCheckedNominally/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/objectTypeWithRecursiveWrappedPropertyCheckedNominally/input.ts.json index 04795db88bff..7e63ff228eaf 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/objectTypeWithRecursiveWrappedPropertyCheckedNominally/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/objectTypeWithRecursiveWrappedPropertyCheckedNominally/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -99,7 +96,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "value": null, @@ -125,7 +121,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -151,7 +146,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -177,7 +171,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -225,7 +218,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -246,7 +238,6 @@ "ctxt": 0 }, "value": "MyList", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -272,7 +263,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "value": null, @@ -298,7 +288,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -329,7 +318,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "value": null, @@ -355,7 +343,6 @@ "ctxt": 0 }, "value": "MyList", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -381,7 +368,6 @@ "ctxt": 0 }, "value": "MyList", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -407,7 +393,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -455,7 +440,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -491,8 +475,8 @@ "ctxt": 0 }, "value": "list1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -509,7 +493,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -562,8 +545,8 @@ "ctxt": 0 }, "value": "list2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -580,7 +563,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -633,8 +615,8 @@ "ctxt": 0 }, "value": "myList1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -651,7 +633,6 @@ "ctxt": 0 }, "value": "MyList", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -704,8 +685,8 @@ "ctxt": 0 }, "value": "myList2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -722,7 +703,6 @@ "ctxt": 0 }, "value": "MyList", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -773,8 +753,8 @@ "ctxt": 0 }, "value": "list1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -784,7 +764,6 @@ "ctxt": 0 }, "value": "myList1", - "typeAnnotation": null, "optional": false } } @@ -812,8 +791,8 @@ "ctxt": 0 }, "value": "list1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -823,7 +802,6 @@ "ctxt": 0 }, "value": "myList2", - "typeAnnotation": null, "optional": false } } @@ -851,8 +829,8 @@ "ctxt": 0 }, "value": "list2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -862,7 +840,6 @@ "ctxt": 0 }, "value": "myList1", - "typeAnnotation": null, "optional": false } } @@ -890,8 +867,8 @@ "ctxt": 0 }, "value": "list2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -901,7 +878,6 @@ "ctxt": 0 }, "value": "myList2", - "typeAnnotation": null, "optional": false } } @@ -931,8 +907,8 @@ "ctxt": 0 }, "value": "rList1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -949,7 +925,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -976,7 +951,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1031,8 +1005,8 @@ "ctxt": 0 }, "value": "rMyList1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1049,7 +1023,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1076,7 +1049,6 @@ "ctxt": 0 }, "value": "MyList", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1129,8 +1101,8 @@ "ctxt": 0 }, "value": "rList1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1140,7 +1112,6 @@ "ctxt": 0 }, "value": "rMyList1", - "typeAnnotation": null, "optional": false } } @@ -1155,7 +1126,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1176,6 +1146,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1198,13 +1169,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1223,6 +1192,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1245,13 +1215,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1292,8 +1260,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1303,7 +1271,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -1331,8 +1298,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1342,7 +1309,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -1372,6 +1338,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1394,7 +1361,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1417,8 +1383,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1450,6 +1415,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1472,7 +1438,6 @@ "ctxt": 0 }, "value": "MyList", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1495,8 +1460,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1526,8 +1490,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1537,7 +1501,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -1565,8 +1528,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1576,7 +1539,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -1604,8 +1566,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1615,7 +1577,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -1643,8 +1604,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1654,7 +1615,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -1686,7 +1646,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1704,7 +1663,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1744,7 +1702,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1762,7 +1719,6 @@ "ctxt": 0 }, "value": "MyList", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1801,7 +1757,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1822,6 +1777,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1844,13 +1800,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1869,6 +1823,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1891,13 +1846,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1938,8 +1891,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1949,7 +1902,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -1977,8 +1929,8 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -1988,7 +1940,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -2018,6 +1969,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2040,7 +1992,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2063,8 +2014,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2096,6 +2046,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2118,7 +2069,6 @@ "ctxt": 0 }, "value": "MyList", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2141,8 +2091,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2172,8 +2121,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2183,7 +2132,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -2211,8 +2159,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2222,7 +2170,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -2250,8 +2197,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2261,7 +2208,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -2289,8 +2235,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2300,7 +2246,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -2332,7 +2277,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2350,7 +2294,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2372,7 +2315,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2390,7 +2332,6 @@ "ctxt": 0 }, "value": "MyList", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/recursiveTypeInGenericConstraint/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/recursiveTypeInGenericConstraint/input.ts.json index d84e110d91c1..5f51cccc922a 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/recursiveTypeInGenericConstraint/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/recursiveTypeInGenericConstraint/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -94,7 +91,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -120,7 +116,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -168,7 +163,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -189,7 +183,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -215,7 +208,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -241,7 +233,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -283,7 +274,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -301,7 +291,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -327,7 +316,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -352,7 +340,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -378,7 +365,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -404,7 +390,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -430,7 +415,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -456,7 +440,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -504,7 +487,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -540,8 +522,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -558,7 +540,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -585,7 +566,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/recursiveTypeReferences1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/recursiveTypeReferences1/input.ts.json index d9fe5e83b539..028603dc20ce 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/recursiveTypeReferences1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/recursiveTypeReferences1/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "ValueOrArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -99,7 +96,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -125,7 +121,6 @@ "ctxt": 0 }, "value": "ValueOrArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -151,7 +146,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -190,6 +184,7 @@ "ctxt": 0 }, "value": "a0", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -212,7 +207,6 @@ "ctxt": 0 }, "value": "ValueOrArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -235,8 +229,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -276,6 +269,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -298,7 +292,6 @@ "ctxt": 0 }, "value": "ValueOrArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -321,8 +314,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -490,7 +482,6 @@ "ctxt": 0 }, "value": "HypertextNode", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -564,6 +555,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -580,8 +572,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -648,7 +639,6 @@ "ctxt": 0 }, "value": "HypertextNode", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -686,6 +676,7 @@ "ctxt": 0 }, "value": "hypertextNode", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -708,13 +699,11 @@ "ctxt": 0 }, "value": "HypertextNode", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -761,7 +750,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": { @@ -829,7 +817,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": { @@ -917,7 +904,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "value": { @@ -980,7 +966,6 @@ "ctxt": 0 }, "value": "Json", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1050,7 +1035,6 @@ "ctxt": 0 }, "value": "Json", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1075,6 +1059,7 @@ "ctxt": 0 }, "value": "key", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1091,8 +1076,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1117,7 +1101,6 @@ "ctxt": 0 }, "value": "Json", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1160,6 +1143,7 @@ "ctxt": 0 }, "value": "data", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1182,13 +1166,11 @@ "ctxt": 0 }, "value": "Json", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1208,7 +1190,6 @@ "ctxt": 0 }, "value": "caption", - "typeAnnotation": null, "optional": false }, "value": { @@ -1236,7 +1217,6 @@ "ctxt": 0 }, "value": "location", - "typeAnnotation": null, "optional": false }, "value": { @@ -1257,7 +1237,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1280,7 +1259,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1306,7 +1284,6 @@ "ctxt": 0 }, "value": "values", - "typeAnnotation": null, "optional": false }, "value": { @@ -1401,7 +1378,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1428,7 +1404,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1461,7 +1436,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1490,7 +1464,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1525,7 +1498,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1544,7 +1516,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1570,7 +1541,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1595,7 +1565,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1614,7 +1583,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1640,7 +1608,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1666,7 +1633,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1694,7 +1660,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1713,7 +1678,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1739,7 +1703,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1765,7 +1728,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1791,7 +1753,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1816,7 +1777,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1837,6 +1797,7 @@ "ctxt": 0 }, "value": "t1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1859,13 +1820,11 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1884,6 +1843,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1906,13 +1866,11 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1931,6 +1889,7 @@ "ctxt": 0 }, "value": "t3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1953,13 +1912,11 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2000,8 +1957,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2011,7 +1968,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -2039,8 +1995,8 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2050,7 +2006,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false } } @@ -2078,8 +2033,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2089,7 +2044,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2117,8 +2071,8 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2128,7 +2082,6 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, "optional": false } } @@ -2156,8 +2109,8 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2167,7 +2120,6 @@ "ctxt": 0 }, "value": "t1", - "typeAnnotation": null, "optional": false } } @@ -2195,8 +2147,8 @@ "ctxt": 0 }, "value": "t3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2206,7 +2158,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false } } @@ -2234,7 +2185,6 @@ "ctxt": 0 }, "value": "Box1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2261,7 +2211,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2287,7 +2236,6 @@ "ctxt": 0 }, "value": "Box1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2332,6 +2280,7 @@ "ctxt": 0 }, "value": "b10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2354,13 +2303,11 @@ "ctxt": 0 }, "value": "Box1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -2400,6 +2347,7 @@ "ctxt": 0 }, "value": "b11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2422,13 +2370,11 @@ "ctxt": 0 }, "value": "Box1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -2448,7 +2394,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -2492,6 +2437,7 @@ "ctxt": 0 }, "value": "b12", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2514,13 +2460,11 @@ "ctxt": 0 }, "value": "Box1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -2540,7 +2484,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -2561,7 +2504,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -2582,7 +2524,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -2623,7 +2564,6 @@ "ctxt": 0 }, "value": "Box2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2642,7 +2582,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2676,7 +2615,6 @@ "ctxt": 0 }, "value": "Box2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2721,6 +2659,7 @@ "ctxt": 0 }, "value": "b20", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2743,13 +2682,11 @@ "ctxt": 0 }, "value": "Box2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "NumericLiteral", @@ -2789,6 +2726,7 @@ "ctxt": 0 }, "value": "b21", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2811,13 +2749,11 @@ "ctxt": 0 }, "value": "Box2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -2837,7 +2773,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -2881,6 +2816,7 @@ "ctxt": 0 }, "value": "b22", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2903,13 +2839,11 @@ "ctxt": 0 }, "value": "Box2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -2929,7 +2863,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -2950,7 +2883,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -2971,7 +2903,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -3012,7 +2943,6 @@ "ctxt": 0 }, "value": "RecArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3038,7 +2968,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3061,7 +2990,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3095,7 +3023,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3115,7 +3042,6 @@ "ctxt": 0 }, "value": "RecArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3141,7 +3067,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3165,7 +3090,6 @@ "ctxt": 0 }, "value": "flat", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3186,6 +3110,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3208,7 +3133,6 @@ "ctxt": 0 }, "value": "RecArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3234,7 +3158,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3242,8 +3165,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3279,7 +3201,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3309,7 +3230,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3335,7 +3255,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3355,7 +3274,6 @@ "ctxt": 0 }, "value": "flat1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3376,6 +3294,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3398,7 +3317,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3432,7 +3350,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3452,7 +3369,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3478,7 +3394,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3491,8 +3406,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3528,7 +3442,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3558,7 +3471,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3584,7 +3496,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3604,7 +3515,6 @@ "ctxt": 0 }, "value": "flat2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3625,6 +3535,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3647,7 +3558,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3681,7 +3591,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3701,7 +3610,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3735,7 +3643,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3755,7 +3662,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3781,7 +3687,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3799,8 +3704,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3836,7 +3740,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3866,7 +3769,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3892,7 +3794,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3924,7 +3825,6 @@ "ctxt": 0 }, "value": "flat", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4029,7 +3929,6 @@ "ctxt": 0 }, "value": "flat", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4110,7 +4009,6 @@ "ctxt": 0 }, "value": "flat", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4295,7 +4193,6 @@ "ctxt": 0 }, "value": "flat", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4392,7 +4289,6 @@ "ctxt": 0 }, "value": "flat", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4489,7 +4385,6 @@ "ctxt": 0 }, "value": "flat", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4574,7 +4469,6 @@ "ctxt": 0 }, "value": "flat1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4679,7 +4573,6 @@ "ctxt": 0 }, "value": "flat1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4760,7 +4653,6 @@ "ctxt": 0 }, "value": "flat1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4857,7 +4749,6 @@ "ctxt": 0 }, "value": "flat1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4954,7 +4845,6 @@ "ctxt": 0 }, "value": "flat1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5039,7 +4929,6 @@ "ctxt": 0 }, "value": "flat2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5144,7 +5033,6 @@ "ctxt": 0 }, "value": "flat2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5225,7 +5113,6 @@ "ctxt": 0 }, "value": "flat2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5322,7 +5209,6 @@ "ctxt": 0 }, "value": "flat2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5419,7 +5305,6 @@ "ctxt": 0 }, "value": "flat2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5498,7 +5383,6 @@ "ctxt": 0 }, "value": "T10", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -5524,7 +5408,6 @@ "ctxt": 0 }, "value": "T10", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5547,7 +5430,6 @@ "ctxt": 0 }, "value": "T11", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -5581,7 +5463,6 @@ "ctxt": 0 }, "value": "T11", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5605,7 +5486,6 @@ "ctxt": 0 }, "value": "T12", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -5638,7 +5518,6 @@ "ctxt": 0 }, "value": "T12", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5662,7 +5541,6 @@ "ctxt": 0 }, "value": "T13", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -5696,7 +5574,6 @@ "ctxt": 0 }, "value": "T13", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5730,7 +5607,6 @@ "ctxt": 0 }, "value": "T14", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -5764,7 +5640,6 @@ "ctxt": 0 }, "value": "T14", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5794,7 +5669,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5841,7 +5715,6 @@ "ctxt": 0 }, "value": "T15", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5867,7 +5740,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5897,7 +5769,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5933,7 +5804,6 @@ "ctxt": 0 }, "value": "T15", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5959,7 +5829,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5995,7 +5864,6 @@ "ctxt": 0 }, "value": "ValueOrArray1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6021,7 +5889,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6052,7 +5919,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6079,7 +5945,6 @@ "ctxt": 0 }, "value": "ValueOrArray1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6105,7 +5970,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6133,7 +5997,6 @@ "ctxt": 0 }, "value": "ValueOrArray2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6159,7 +6022,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6190,7 +6052,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6217,7 +6078,6 @@ "ctxt": 0 }, "value": "ValueOrArray2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6243,7 +6103,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6265,7 +6124,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -6286,6 +6144,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6308,7 +6167,6 @@ "ctxt": 0 }, "value": "ValueOrArray1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6334,7 +6192,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6342,8 +6199,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6379,7 +6235,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6409,7 +6264,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6441,6 +6295,7 @@ "ctxt": 0 }, "value": "ra1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6463,7 +6318,6 @@ "ctxt": 0 }, "value": "ValueOrArray2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6486,8 +6340,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -6519,8 +6372,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6537,7 +6390,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6551,7 +6403,6 @@ "ctxt": 0 }, "value": "ra1", - "typeAnnotation": null, "optional": false } } @@ -6578,7 +6429,6 @@ "ctxt": 0 }, "value": "NumberOrArray1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6604,7 +6454,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6635,7 +6484,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6662,7 +6510,6 @@ "ctxt": 0 }, "value": "ValueOrArray1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6688,7 +6535,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6716,7 +6562,6 @@ "ctxt": 0 }, "value": "NumberOrArray2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6742,7 +6587,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6773,7 +6617,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6800,7 +6643,6 @@ "ctxt": 0 }, "value": "ValueOrArray2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6826,7 +6668,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6848,7 +6689,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -6869,6 +6709,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6891,7 +6732,6 @@ "ctxt": 0 }, "value": "ValueOrArray1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6917,7 +6757,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6925,8 +6764,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6962,7 +6800,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6992,7 +6829,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7024,6 +6860,7 @@ "ctxt": 0 }, "value": "ra2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7046,7 +6883,6 @@ "ctxt": 0 }, "value": "ValueOrArray2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7069,8 +6905,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -7102,8 +6937,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7120,7 +6955,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7134,7 +6968,6 @@ "ctxt": 0 }, "value": "ra2", - "typeAnnotation": null, "optional": false } } @@ -7161,7 +6994,6 @@ "ctxt": 0 }, "value": "Tree", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -7203,7 +7035,6 @@ "ctxt": 0 }, "value": "HTMLHeadingElement", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7232,7 +7063,6 @@ "ctxt": 0 }, "value": "Tree", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7252,7 +7082,6 @@ "ctxt": 0 }, "value": "parse", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7273,6 +7102,7 @@ "ctxt": 0 }, "value": "node", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7295,13 +7125,11 @@ "ctxt": 0 }, "value": "Tree", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -7327,6 +7155,7 @@ "ctxt": 0 }, "value": "index", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7351,8 +7180,7 @@ "kind": "number" } } - }, - "optional": false + } }, "right": { "type": "ArrayExpression", @@ -7403,7 +7231,6 @@ "ctxt": 0 }, "value": "html", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7448,7 +7275,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "property": { @@ -7459,7 +7285,6 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7491,8 +7316,8 @@ "ctxt": 0 }, "value": "el", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -7502,8 +7327,8 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "optional": false, @@ -7517,8 +7342,8 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -7554,8 +7379,8 @@ "ctxt": 0 }, "value": "idx", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -7579,7 +7404,6 @@ "ctxt": 0 }, "value": "index", - "typeAnnotation": null, "optional": false } }, @@ -7601,7 +7425,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "right": { @@ -7643,7 +7466,6 @@ "ctxt": 0 }, "value": "html", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7691,7 +7513,6 @@ "ctxt": 0 }, "value": "html", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7732,7 +7553,6 @@ "ctxt": 0 }, "value": "href", - "typeAnnotation": null, "optional": false }, "value": { @@ -7758,7 +7578,6 @@ "ctxt": 0 }, "value": "el", - "typeAnnotation": null, "optional": false }, "property": { @@ -7769,7 +7588,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7863,7 +7681,6 @@ "ctxt": 0 }, "value": "rel", - "typeAnnotation": null, "optional": false }, "value": { @@ -7919,7 +7736,6 @@ "ctxt": 0 }, "value": "idx", - "typeAnnotation": null, "optional": false }, "property": { @@ -7930,7 +7746,6 @@ "ctxt": 0 }, "value": "join", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7984,7 +7799,6 @@ "ctxt": 0 }, "value": "el", - "typeAnnotation": null, "optional": false }, "property": { @@ -7995,7 +7809,6 @@ "ctxt": 0 }, "value": "textContent", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8038,7 +7851,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false }, "property": { @@ -8049,7 +7861,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8079,7 +7890,6 @@ "ctxt": 0 }, "value": "parse", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8093,7 +7903,6 @@ "ctxt": 0 }, "value": "children", - "typeAnnotation": null, "optional": false } }, @@ -8107,7 +7916,6 @@ "ctxt": 0 }, "value": "idx", - "typeAnnotation": null, "optional": false } } @@ -8129,7 +7937,6 @@ "ctxt": 0 }, "value": "frag", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -8187,7 +7994,6 @@ "ctxt": 0 }, "value": "HTMLUListElement", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8204,7 +8010,6 @@ "ctxt": 0 }, "value": "cons", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8225,6 +8030,7 @@ "ctxt": 0 }, "value": "hs", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8254,14 +8060,12 @@ "ctxt": 0 }, "value": "HTMLHeadingElement", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -8322,7 +8126,6 @@ "ctxt": 0 }, "value": "hs", - "typeAnnotation": null, "optional": false }, "property": { @@ -8333,7 +8136,6 @@ "ctxt": 0 }, "value": "reduce", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8357,8 +8159,8 @@ "ctxt": 0 }, "value": "hss", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -8368,8 +8170,8 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -8405,8 +8207,8 @@ "ctxt": 0 }, "value": "hs", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "TsNonNullExpression", @@ -8437,7 +8239,6 @@ "ctxt": 0 }, "value": "hss", - "typeAnnotation": null, "optional": false }, "property": { @@ -8448,7 +8249,6 @@ "ctxt": 0 }, "value": "pop", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8506,7 +8306,6 @@ "ctxt": 0 }, "value": "hs", - "typeAnnotation": null, "optional": false }, "property": { @@ -8517,7 +8316,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8555,7 +8353,6 @@ "ctxt": 0 }, "value": "level", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8569,7 +8366,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false } } @@ -8591,7 +8387,6 @@ "ctxt": 0 }, "value": "level", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8612,7 +8407,6 @@ "ctxt": 0 }, "value": "hs", - "typeAnnotation": null, "optional": false }, "property": { @@ -8647,7 +8441,6 @@ "ctxt": 0 }, "value": "concat", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8661,7 +8454,6 @@ "ctxt": 0 }, "value": "hss", - "typeAnnotation": null, "optional": false } }, @@ -8692,7 +8484,6 @@ "ctxt": 0 }, "value": "concat", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8706,7 +8497,6 @@ "ctxt": 0 }, "value": "hs", - "typeAnnotation": null, "optional": false } }, @@ -8730,7 +8520,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false } } @@ -8762,7 +8551,6 @@ "ctxt": 0 }, "value": "concat", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8776,7 +8564,6 @@ "ctxt": 0 }, "value": "hss", - "typeAnnotation": null, "optional": false } }, @@ -8800,7 +8587,6 @@ "ctxt": 0 }, "value": "hs", - "typeAnnotation": null, "optional": false } }, @@ -8824,7 +8610,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false } } @@ -8910,7 +8695,6 @@ "ctxt": 0 }, "value": "HTMLHeadingElement", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8928,7 +8712,6 @@ "ctxt": 0 }, "value": "reduce", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8952,8 +8735,8 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -8963,8 +8746,8 @@ "ctxt": 0 }, "value": "hs", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -8997,7 +8780,6 @@ "ctxt": 0 }, "value": "hs", - "typeAnnotation": null, "optional": false }, "property": { @@ -9008,7 +8790,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9031,7 +8812,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -9049,7 +8829,6 @@ "ctxt": 0 }, "value": "concat", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9063,7 +8842,6 @@ "ctxt": 0 }, "value": "node", - "typeAnnotation": null, "optional": false } }, @@ -9118,7 +8896,6 @@ "ctxt": 0 }, "value": "hs", - "typeAnnotation": null, "optional": false }, "property": { @@ -9129,7 +8906,6 @@ "ctxt": 0 }, "value": "shift", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9156,7 +8932,6 @@ "ctxt": 0 }, "value": "cons", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9170,7 +8945,6 @@ "ctxt": 0 }, "value": "hs", - "typeAnnotation": null, "optional": false } } @@ -9216,7 +8990,6 @@ "ctxt": 0 }, "value": "Tree", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9277,7 +9050,6 @@ "ctxt": 0 }, "value": "Tree", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9313,7 +9085,6 @@ "ctxt": 0 }, "value": "Tree", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9330,7 +9101,6 @@ "ctxt": 0 }, "value": "level", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9351,6 +9121,7 @@ "ctxt": 0 }, "value": "h", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9373,13 +9144,11 @@ "ctxt": 0 }, "value": "HTMLHeadingElement", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -9419,7 +9188,6 @@ "ctxt": 0 }, "value": "assert", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9440,7 +9208,6 @@ "ctxt": 0 }, "value": "isFinite", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9476,7 +9243,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "property": { @@ -9487,7 +9253,6 @@ "ctxt": 0 }, "value": "tagName", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9550,7 +9315,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "property": { @@ -9561,7 +9325,6 @@ "ctxt": 0 }, "value": "tagName", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/recursiveTypeReferences2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/recursiveTypeReferences2/input.ts.json index c168aad3d5a3..7260eb5a1f75 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/recursiveTypeReferences2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/recursiveTypeReferences2/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/recursiveTypesUsedAsFunctionParameters/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/recursiveTypesUsedAsFunctionParameters/input.ts.json index ba4b73e1aaee..3ab5751f6ee7 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/recursiveTypesUsedAsFunctionParameters/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/recursiveTypes/recursiveTypesUsedAsFunctionParameters/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -99,7 +96,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "value": null, @@ -125,7 +121,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -151,7 +146,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -177,7 +171,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -225,7 +218,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -246,7 +238,6 @@ "ctxt": 0 }, "value": "MyList", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -272,7 +263,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "value": null, @@ -298,7 +288,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -329,7 +318,6 @@ "ctxt": 0 }, "value": "next", - "typeAnnotation": null, "optional": false }, "value": null, @@ -355,7 +343,6 @@ "ctxt": 0 }, "value": "MyList", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -381,7 +368,6 @@ "ctxt": 0 }, "value": "MyList", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -407,7 +393,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -455,7 +440,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -476,7 +460,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -497,6 +480,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -519,7 +503,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -545,7 +528,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -553,8 +535,7 @@ ] } } - }, - "optional": false + } } } ], @@ -590,7 +571,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -610,7 +590,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -631,6 +610,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -653,7 +633,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -679,7 +658,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -687,8 +665,7 @@ ] } } - }, - "optional": false + } } } ], @@ -724,7 +701,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -744,7 +720,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -765,6 +740,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -787,7 +763,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -813,7 +788,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -821,8 +795,7 @@ ] } } - }, - "optional": false + } } } ], @@ -866,7 +839,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -886,7 +858,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -907,6 +878,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -929,7 +901,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -955,7 +926,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -963,8 +933,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1000,7 +969,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1020,7 +988,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1041,6 +1008,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1063,7 +1031,6 @@ "ctxt": 0 }, "value": "MyList", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1089,7 +1056,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1097,8 +1063,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1134,7 +1099,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1154,7 +1118,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1175,6 +1138,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1191,8 +1155,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1236,7 +1199,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1256,7 +1218,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1285,7 +1246,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1306,6 +1266,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1328,13 +1289,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1370,7 +1329,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1390,7 +1348,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1411,6 +1368,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1433,7 +1391,6 @@ "ctxt": 0 }, "value": "MyList", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1459,7 +1416,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1467,8 +1423,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1512,7 +1467,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1532,7 +1486,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1553,6 +1506,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1575,13 +1529,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1617,7 +1569,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1637,7 +1588,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1658,6 +1608,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1680,7 +1631,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1706,7 +1656,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1714,8 +1663,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1759,7 +1707,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1779,7 +1726,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1800,6 +1746,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1822,13 +1769,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1864,7 +1809,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1900,7 +1844,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1921,6 +1864,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1943,7 +1887,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1969,7 +1912,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1977,8 +1919,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2014,7 +1955,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2050,7 +1990,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2071,6 +2010,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2093,7 +2033,6 @@ "ctxt": 0 }, "value": "MyList", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2119,7 +2058,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2127,8 +2065,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2164,7 +2101,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2200,7 +2136,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2221,6 +2156,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2237,8 +2173,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2299,7 +2234,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2350,6 +2284,7 @@ "ctxt": 0 }, "value": "list", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2372,7 +2307,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2395,8 +2329,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2428,6 +2361,7 @@ "ctxt": 0 }, "value": "myList", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2450,7 +2384,6 @@ "ctxt": 0 }, "value": "MyList", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2473,8 +2406,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2506,8 +2438,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2524,7 +2456,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2538,7 +2469,6 @@ "ctxt": 0 }, "value": "list", - "typeAnnotation": null, "optional": false } } @@ -2574,8 +2504,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2592,7 +2522,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2606,7 +2535,6 @@ "ctxt": 0 }, "value": "myList", - "typeAnnotation": null, "optional": false } } @@ -2644,7 +2572,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2662,7 +2589,6 @@ "ctxt": 0 }, "value": "List", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2688,7 +2614,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2713,7 +2638,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/enumIsNotASubtypeOfAnythingButNumber/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/enumIsNotASubtypeOfAnythingButNumber/input.ts.json index 5005c2a37978..13227bb7eb54 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/enumIsNotASubtypeOfAnythingButNumber/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/enumIsNotASubtypeOfAnythingButNumber/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -64,7 +62,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -89,6 +86,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -105,8 +103,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -149,7 +146,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -178,7 +174,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -204,7 +199,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -229,6 +223,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -245,8 +240,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -289,7 +283,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -318,7 +311,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -344,7 +336,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -369,6 +360,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -385,8 +377,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -429,7 +420,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -458,7 +448,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -484,7 +473,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -509,6 +497,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -525,8 +514,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -569,7 +557,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -598,7 +585,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -624,7 +610,6 @@ "ctxt": 0 }, "value": "I5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -649,6 +634,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -665,8 +651,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -691,7 +676,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -720,7 +704,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -749,7 +732,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -775,7 +757,6 @@ "ctxt": 0 }, "value": "I6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -800,6 +781,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -816,8 +798,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -842,7 +823,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -871,7 +851,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -900,7 +879,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -926,7 +904,6 @@ "ctxt": 0 }, "value": "I7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -951,6 +928,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -967,8 +945,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1002,7 +979,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1054,7 +1030,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1083,7 +1058,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1109,7 +1083,6 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1134,6 +1107,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1150,8 +1124,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1202,7 +1175,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1231,7 +1203,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1257,7 +1228,6 @@ "ctxt": 0 }, "value": "I9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1282,6 +1252,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1298,8 +1269,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1324,7 +1294,6 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1353,7 +1322,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1382,7 +1350,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1403,7 +1370,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1429,7 +1395,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1482,7 +1447,6 @@ "ctxt": 0 }, "value": "I10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1507,6 +1471,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1523,8 +1488,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1549,7 +1513,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1578,7 +1541,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1607,7 +1569,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1628,7 +1589,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1654,7 +1614,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1680,7 +1639,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1722,7 +1680,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1748,7 +1705,6 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1773,6 +1729,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1789,8 +1746,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1815,7 +1771,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1862,7 +1817,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1891,7 +1845,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1917,7 +1870,6 @@ "ctxt": 0 }, "value": "I12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1942,6 +1894,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1958,8 +1911,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1985,8 +1937,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeParams": null, @@ -2032,7 +1984,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2061,7 +2012,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2087,7 +2037,6 @@ "ctxt": 0 }, "value": "I13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2112,6 +2061,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2128,8 +2078,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2155,6 +2104,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2177,13 +2127,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -2209,7 +2157,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2239,7 +2186,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2270,7 +2216,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2299,7 +2244,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2327,7 +2271,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "members": [ @@ -2346,7 +2289,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -2368,7 +2310,6 @@ "ctxt": 0 }, "value": "I14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2393,6 +2334,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2409,8 +2351,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2435,7 +2376,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2464,7 +2404,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2493,7 +2432,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2514,7 +2452,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2556,7 +2493,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "body": { @@ -2599,8 +2535,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2634,7 +2570,6 @@ "ctxt": 0 }, "value": "I15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2659,6 +2594,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2675,8 +2611,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2701,7 +2636,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -2729,7 +2663,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2758,7 +2691,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2779,7 +2711,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2805,7 +2736,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2860,7 +2790,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "body": { @@ -2903,8 +2832,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2938,7 +2867,6 @@ "ctxt": 0 }, "value": "I16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2963,6 +2891,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2979,8 +2908,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3005,7 +2933,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -3033,7 +2960,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3062,7 +2988,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3088,7 +3013,6 @@ "ctxt": 0 }, "value": "I17", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3115,7 +3039,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3143,6 +3066,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3159,8 +3083,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3185,7 +3108,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3214,7 +3136,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3243,7 +3164,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3269,7 +3189,6 @@ "ctxt": 0 }, "value": "I18", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3296,7 +3215,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3317,7 +3235,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3335,7 +3252,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3364,6 +3280,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3380,8 +3297,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3406,7 +3322,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3435,7 +3350,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3464,7 +3378,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3490,7 +3403,6 @@ "ctxt": 0 }, "value": "I19", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3515,6 +3427,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3531,8 +3444,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3557,7 +3469,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3586,7 +3497,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3615,7 +3525,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3641,7 +3550,6 @@ "ctxt": 0 }, "value": "I20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3666,6 +3574,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3682,8 +3591,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3726,7 +3634,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3755,7 +3662,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/nullIsSubtypeOfEverythingButUndefined/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/nullIsSubtypeOfEverythingButUndefined/input.ts.json index cc575a2b2a7f..e67fa88e4d04 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/nullIsSubtypeOfEverythingButUndefined/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/nullIsSubtypeOfEverythingButUndefined/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "r0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -96,8 +96,8 @@ "ctxt": 0 }, "value": "r0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -161,6 +161,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -183,12 +184,10 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -220,8 +219,8 @@ "ctxt": 0 }, "value": "r0b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -247,7 +246,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -288,8 +286,8 @@ "ctxt": 0 }, "value": "r0b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -323,7 +321,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -356,8 +353,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -422,8 +419,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -488,8 +485,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -559,8 +556,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -630,8 +627,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -696,8 +693,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -762,8 +759,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -796,7 +793,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -840,8 +836,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -882,7 +878,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -918,8 +913,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -985,8 +980,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1052,8 +1047,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1089,7 +1084,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1142,8 +1136,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1187,7 +1181,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1232,8 +1225,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1311,8 +1304,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1390,8 +1383,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1425,6 +1418,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1447,13 +1441,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1479,7 +1471,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1510,7 +1501,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1558,8 +1548,8 @@ "ctxt": 0 }, "value": "r8b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1601,6 +1591,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1623,13 +1614,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1655,7 +1644,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1686,7 +1674,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1716,7 +1703,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1746,7 +1732,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1800,6 +1785,7 @@ "ctxt": 0 }, "value": "i1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1822,13 +1808,11 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1860,8 +1844,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1887,7 +1871,6 @@ "ctxt": 0 }, "value": "i1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1928,8 +1911,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1963,7 +1946,6 @@ "ctxt": 0 }, "value": "i1", - "typeAnnotation": null, "optional": false } }, @@ -1981,7 +1963,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2007,7 +1988,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2070,6 +2050,7 @@ "ctxt": 0 }, "value": "c1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2092,13 +2073,11 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2130,8 +2109,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2157,7 +2136,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2198,8 +2176,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2233,7 +2211,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } }, @@ -2251,7 +2228,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2277,7 +2253,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2303,7 +2278,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2345,7 +2319,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2381,6 +2354,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2403,7 +2377,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2426,8 +2399,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2459,8 +2431,8 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2486,7 +2458,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2527,8 +2498,8 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2562,7 +2533,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false } }, @@ -2587,7 +2557,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -2606,7 +2575,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -2638,8 +2606,8 @@ "ctxt": 0 }, "value": "r13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2665,7 +2633,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2706,8 +2673,8 @@ "ctxt": 0 }, "value": "r13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2741,7 +2708,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false } }, @@ -2774,8 +2740,8 @@ "ctxt": 0 }, "value": "r14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2808,7 +2774,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2819,7 +2784,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2862,8 +2826,8 @@ "ctxt": 0 }, "value": "r14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2904,7 +2868,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2915,7 +2878,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2935,7 +2897,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2977,7 +2938,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "body": { @@ -3020,8 +2980,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -3065,6 +3025,7 @@ "ctxt": 0 }, "value": "af", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3087,12 +3048,10 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3124,8 +3083,8 @@ "ctxt": 0 }, "value": "r15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3151,7 +3110,6 @@ "ctxt": 0 }, "value": "af", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3192,8 +3150,8 @@ "ctxt": 0 }, "value": "r15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3227,7 +3185,6 @@ "ctxt": 0 }, "value": "af", - "typeAnnotation": null, "optional": false } }, @@ -3245,7 +3202,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3271,7 +3227,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3326,7 +3281,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "body": { @@ -3369,8 +3323,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -3414,6 +3368,7 @@ "ctxt": 0 }, "value": "ac", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3436,12 +3391,10 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3473,8 +3426,8 @@ "ctxt": 0 }, "value": "r16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3500,7 +3453,6 @@ "ctxt": 0 }, "value": "ac", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3541,8 +3493,8 @@ "ctxt": 0 }, "value": "r16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3576,7 +3528,6 @@ "ctxt": 0 }, "value": "ac", - "typeAnnotation": null, "optional": false } }, @@ -3594,7 +3545,6 @@ "ctxt": 0 }, "value": "f17", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3615,6 +3565,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3637,13 +3588,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3686,8 +3635,8 @@ "ctxt": 0 }, "value": "r17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3713,7 +3662,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3754,8 +3702,8 @@ "ctxt": 0 }, "value": "r17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3789,7 +3737,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3824,7 +3771,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3844,7 +3790,6 @@ "ctxt": 0 }, "value": "f18", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3865,6 +3810,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3887,13 +3833,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3936,8 +3880,8 @@ "ctxt": 0 }, "value": "r18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3963,7 +3907,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -4004,8 +3947,8 @@ "ctxt": 0 }, "value": "r18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -4039,7 +3982,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -4074,7 +4016,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4095,7 +4036,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4130,8 +4070,8 @@ "ctxt": 0 }, "value": "r19", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -4164,7 +4104,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4208,8 +4147,8 @@ "ctxt": 0 }, "value": "r19", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -4250,7 +4189,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4286,8 +4224,8 @@ "ctxt": 0 }, "value": "r20", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -4352,8 +4290,8 @@ "ctxt": 0 }, "value": "r20", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString/input.ts.json index 8a1b1f453f72..916c9dc7eb86 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +66,7 @@ } } } - }, - "optional": false + } } } ], @@ -93,7 +92,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -114,6 +112,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -130,8 +129,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -157,7 +155,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -178,6 +175,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -194,8 +192,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -229,7 +226,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -250,6 +246,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -279,8 +276,7 @@ } } } - }, - "optional": false + } } } ], @@ -306,7 +302,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -327,6 +322,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -343,8 +339,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -370,7 +365,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -391,6 +385,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -407,8 +402,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -442,7 +436,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -463,6 +456,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -492,8 +486,7 @@ } } } - }, - "optional": false + } } } ], @@ -519,7 +512,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -540,6 +532,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -562,13 +555,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -594,7 +585,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -615,6 +605,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -631,8 +622,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -666,7 +656,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -687,6 +676,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -716,8 +706,7 @@ } } } - }, - "optional": false + } } } ], @@ -743,7 +732,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -764,6 +752,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -780,8 +769,7 @@ }, "members": [] } - }, - "optional": false + } } } ], @@ -807,7 +795,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -828,6 +815,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -844,8 +832,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -879,7 +866,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -900,6 +886,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -929,8 +916,7 @@ } } } - }, - "optional": false + } } } ], @@ -956,7 +942,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -977,6 +962,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -993,8 +979,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1020,7 +1005,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1041,6 +1025,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1057,8 +1042,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1092,7 +1076,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1113,6 +1096,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1142,8 +1126,7 @@ } } } - }, - "optional": false + } } } ], @@ -1169,7 +1152,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1190,6 +1172,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1206,8 +1189,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -1233,7 +1215,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1254,6 +1235,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1270,8 +1252,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1305,7 +1286,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1326,6 +1306,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1355,8 +1336,7 @@ } } } - }, - "optional": false + } } } ], @@ -1382,7 +1362,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1403,6 +1382,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1425,13 +1405,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1457,7 +1435,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1478,6 +1455,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1494,8 +1472,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1529,7 +1506,6 @@ "ctxt": 0 }, "value": "f8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1550,6 +1526,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1579,8 +1556,7 @@ } } } - }, - "optional": false + } } } ], @@ -1606,7 +1582,6 @@ "ctxt": 0 }, "value": "f8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1627,6 +1602,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1649,13 +1625,11 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1681,7 +1655,6 @@ "ctxt": 0 }, "value": "f8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1702,6 +1675,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1718,8 +1692,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1753,7 +1726,6 @@ "ctxt": 0 }, "value": "f9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1774,6 +1746,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1803,8 +1776,7 @@ } } } - }, - "optional": false + } } } ], @@ -1830,7 +1802,6 @@ "ctxt": 0 }, "value": "f9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1851,6 +1822,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1885,8 +1857,7 @@ } } } - }, - "optional": false + } } } ], @@ -1912,7 +1883,6 @@ "ctxt": 0 }, "value": "f9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1933,6 +1903,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1949,8 +1920,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1984,7 +1954,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2010,7 +1979,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "function": { @@ -2089,7 +2057,6 @@ "ctxt": 0 }, "value": "charAt", - "typeAnnotation": null, "optional": false }, "function": { @@ -2110,6 +2077,7 @@ "ctxt": 0 }, "value": "pos", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2126,8 +2094,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -2205,7 +2172,6 @@ "ctxt": 0 }, "value": "charCodeAt", - "typeAnnotation": null, "optional": false }, "function": { @@ -2226,6 +2192,7 @@ "ctxt": 0 }, "value": "index", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2242,8 +2209,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -2321,7 +2287,6 @@ "ctxt": 0 }, "value": "concat", - "typeAnnotation": null, "optional": false }, "function": { @@ -2354,8 +2319,8 @@ "ctxt": 0 }, "value": "strings", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2459,7 +2424,6 @@ "ctxt": 0 }, "value": "indexOf", - "typeAnnotation": null, "optional": false }, "function": { @@ -2480,6 +2444,7 @@ "ctxt": 0 }, "value": "searchString", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2496,8 +2461,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -2516,6 +2480,7 @@ "ctxt": 0 }, "value": "position", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2532,8 +2497,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -2611,7 +2575,6 @@ "ctxt": 0 }, "value": "lastIndexOf", - "typeAnnotation": null, "optional": false }, "function": { @@ -2632,6 +2595,7 @@ "ctxt": 0 }, "value": "searchString", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2648,8 +2612,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -2668,6 +2631,7 @@ "ctxt": 0 }, "value": "position", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2684,8 +2648,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -2763,7 +2726,6 @@ "ctxt": 0 }, "value": "localeCompare", - "typeAnnotation": null, "optional": false }, "function": { @@ -2784,6 +2746,7 @@ "ctxt": 0 }, "value": "that", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2800,8 +2763,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -2879,7 +2841,6 @@ "ctxt": 0 }, "value": "match", - "typeAnnotation": null, "optional": false }, "function": { @@ -2900,6 +2861,7 @@ "ctxt": 0 }, "value": "regexp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2916,8 +2878,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3003,7 +2964,6 @@ "ctxt": 0 }, "value": "replace", - "typeAnnotation": null, "optional": false }, "function": { @@ -3024,6 +2984,7 @@ "ctxt": 0 }, "value": "searchValue", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3040,8 +3001,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -3060,6 +3020,7 @@ "ctxt": 0 }, "value": "replaceValue", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3076,8 +3037,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3155,7 +3115,6 @@ "ctxt": 0 }, "value": "search", - "typeAnnotation": null, "optional": false }, "function": { @@ -3176,6 +3135,7 @@ "ctxt": 0 }, "value": "regexp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3192,8 +3152,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3271,7 +3230,6 @@ "ctxt": 0 }, "value": "slice", - "typeAnnotation": null, "optional": false }, "function": { @@ -3292,6 +3250,7 @@ "ctxt": 0 }, "value": "start", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3308,8 +3267,7 @@ }, "kind": "number" } - }, - "optional": true + } } }, { @@ -3328,6 +3286,7 @@ "ctxt": 0 }, "value": "end", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3344,8 +3303,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -3423,7 +3381,6 @@ "ctxt": 0 }, "value": "split", - "typeAnnotation": null, "optional": false }, "function": { @@ -3444,6 +3401,7 @@ "ctxt": 0 }, "value": "separator", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3460,8 +3418,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -3480,6 +3437,7 @@ "ctxt": 0 }, "value": "limit", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3496,8 +3454,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -3583,7 +3540,6 @@ "ctxt": 0 }, "value": "substring", - "typeAnnotation": null, "optional": false }, "function": { @@ -3604,6 +3560,7 @@ "ctxt": 0 }, "value": "start", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3620,8 +3577,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -3640,6 +3596,7 @@ "ctxt": 0 }, "value": "end", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3656,8 +3613,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -3735,7 +3691,6 @@ "ctxt": 0 }, "value": "toLowerCase", - "typeAnnotation": null, "optional": false }, "function": { @@ -3814,7 +3769,6 @@ "ctxt": 0 }, "value": "toLocaleLowerCase", - "typeAnnotation": null, "optional": false }, "function": { @@ -3893,7 +3847,6 @@ "ctxt": 0 }, "value": "toUpperCase", - "typeAnnotation": null, "optional": false }, "function": { @@ -3972,7 +3925,6 @@ "ctxt": 0 }, "value": "toLocaleUpperCase", - "typeAnnotation": null, "optional": false }, "function": { @@ -4051,7 +4003,6 @@ "ctxt": 0 }, "value": "trim", - "typeAnnotation": null, "optional": false }, "function": { @@ -4130,7 +4081,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "value": null, @@ -4176,7 +4126,6 @@ "ctxt": 0 }, "value": "substr", - "typeAnnotation": null, "optional": false }, "function": { @@ -4197,6 +4146,7 @@ "ctxt": 0 }, "value": "from", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4213,8 +4163,7 @@ }, "kind": "number" } - }, - "optional": false + } } }, { @@ -4233,6 +4182,7 @@ "ctxt": 0 }, "value": "length", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4249,8 +4199,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -4328,7 +4277,6 @@ "ctxt": 0 }, "value": "valueOf", - "typeAnnotation": null, "optional": false }, "function": { @@ -4403,6 +4351,7 @@ "ctxt": 0 }, "value": "index", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4419,8 +4368,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4468,7 +4416,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -4485,7 +4432,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4506,6 +4452,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4535,8 +4482,7 @@ } } } - }, - "optional": false + } } } ], @@ -4562,7 +4508,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4583,6 +4528,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4605,13 +4551,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4637,7 +4581,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4658,6 +4601,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4674,8 +4618,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4714,7 +4657,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4735,7 +4677,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -4765,7 +4706,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4804,7 +4744,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4825,6 +4764,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4854,8 +4794,7 @@ } } } - }, - "optional": false + } } } ], @@ -4881,7 +4820,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4902,6 +4840,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4924,13 +4863,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4956,7 +4893,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4977,6 +4913,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4993,8 +4930,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5028,7 +4964,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5049,6 +4984,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5078,8 +5014,7 @@ } } } - }, - "optional": false + } } } ], @@ -5115,7 +5050,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5135,7 +5069,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5156,6 +5089,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5178,13 +5112,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5220,7 +5152,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5240,7 +5171,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5261,6 +5191,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5277,8 +5208,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5322,7 +5252,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5342,7 +5271,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5363,6 +5291,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5392,8 +5321,7 @@ } } } - }, - "optional": false + } } } ], @@ -5429,7 +5357,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5447,7 +5374,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5468,7 +5394,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5489,6 +5414,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5511,13 +5437,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5553,7 +5477,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5571,7 +5494,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5592,7 +5514,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5613,6 +5534,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5629,8 +5551,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5674,7 +5595,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5692,7 +5612,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5720,7 +5639,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -5739,7 +5657,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -5756,7 +5673,6 @@ "ctxt": 0 }, "value": "f14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5777,6 +5693,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5806,8 +5723,7 @@ } } } - }, - "optional": false + } } } ], @@ -5833,7 +5749,6 @@ "ctxt": 0 }, "value": "f14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5854,6 +5769,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5876,13 +5792,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5908,7 +5822,6 @@ "ctxt": 0 }, "value": "f14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5929,6 +5842,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5945,8 +5859,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5980,7 +5893,6 @@ "ctxt": 0 }, "value": "f15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6001,6 +5913,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6030,8 +5943,7 @@ } } } - }, - "optional": false + } } } ], @@ -6067,7 +5979,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6088,7 +5999,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6106,7 +6016,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6127,7 +6036,6 @@ "ctxt": 0 }, "value": "f15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6148,6 +6056,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6170,13 +6079,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6212,7 +6119,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6233,7 +6139,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6251,7 +6156,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6272,7 +6176,6 @@ "ctxt": 0 }, "value": "f15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6293,6 +6196,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6309,8 +6213,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -6354,7 +6257,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6375,7 +6277,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6393,7 +6294,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6414,7 +6314,6 @@ "ctxt": 0 }, "value": "f16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6435,6 +6334,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6464,8 +6364,7 @@ } } } - }, - "optional": false + } } } ], @@ -6501,7 +6400,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6519,7 +6417,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6541,7 +6438,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6559,7 +6455,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6580,7 +6475,6 @@ "ctxt": 0 }, "value": "f16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6601,6 +6495,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6623,13 +6518,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6665,7 +6558,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6683,7 +6575,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6705,7 +6596,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6723,7 +6613,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6744,7 +6633,6 @@ "ctxt": 0 }, "value": "f16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6765,6 +6653,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6781,8 +6670,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -6826,7 +6714,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6844,7 +6731,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6866,7 +6752,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6884,7 +6769,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfAny/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfAny/input.ts.json index 1308d17ff3f7..82ec8c1d0343 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfAny/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfAny/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -46,6 +45,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,8 +62,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -106,7 +105,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -150,7 +148,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -175,6 +172,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -191,8 +189,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -235,7 +232,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -279,7 +275,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -304,6 +299,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -320,8 +316,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -364,7 +359,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -408,7 +402,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -433,6 +426,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -449,8 +443,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -493,7 +486,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -537,7 +529,6 @@ "ctxt": 0 }, "value": "I5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -562,6 +553,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -578,8 +570,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -622,7 +613,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -651,7 +641,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -677,7 +666,6 @@ "ctxt": 0 }, "value": "I6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -702,6 +690,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -718,8 +707,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -762,7 +750,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -791,7 +778,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -817,7 +803,6 @@ "ctxt": 0 }, "value": "I7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -842,6 +827,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -858,8 +844,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -902,7 +887,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -940,7 +924,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -989,7 +972,6 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1014,6 +996,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1030,8 +1013,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1074,7 +1056,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1126,7 +1107,6 @@ "ctxt": 0 }, "value": "I9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1151,6 +1131,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1167,8 +1148,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1211,7 +1191,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1240,7 +1219,6 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1261,7 +1239,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1287,7 +1264,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1340,7 +1316,6 @@ "ctxt": 0 }, "value": "I10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1365,6 +1340,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1381,8 +1357,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1425,7 +1400,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1454,7 +1428,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1475,7 +1448,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1501,7 +1473,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1527,7 +1498,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1569,7 +1539,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1595,7 +1564,6 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1620,6 +1588,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1636,8 +1605,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1680,7 +1648,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1709,7 +1676,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1753,7 +1719,6 @@ "ctxt": 0 }, "value": "I12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1778,6 +1743,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1794,8 +1760,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1838,7 +1803,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1868,8 +1832,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeParams": null, @@ -1912,7 +1876,6 @@ "ctxt": 0 }, "value": "I13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1937,6 +1900,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1953,8 +1917,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1997,7 +1960,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2027,6 +1989,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2049,13 +2012,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -2081,7 +2042,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2111,7 +2071,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2141,7 +2100,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -2160,7 +2118,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -2182,7 +2139,6 @@ "ctxt": 0 }, "value": "I14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2207,6 +2163,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2223,8 +2180,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2267,7 +2223,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2296,7 +2251,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2317,7 +2271,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2359,7 +2312,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "body": { @@ -2402,8 +2354,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2437,7 +2389,6 @@ "ctxt": 0 }, "value": "I15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2462,6 +2413,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2478,8 +2430,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2522,7 +2473,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2551,7 +2501,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -2571,7 +2520,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2597,7 +2545,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2652,7 +2599,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "body": { @@ -2695,8 +2641,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2730,7 +2676,6 @@ "ctxt": 0 }, "value": "I16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2755,6 +2700,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2771,8 +2717,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2815,7 +2760,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2844,7 +2788,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -2869,7 +2812,6 @@ "ctxt": 0 }, "value": "I17", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2896,7 +2838,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2924,6 +2865,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2940,8 +2882,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2984,7 +2925,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3013,7 +2953,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3039,7 +2978,6 @@ "ctxt": 0 }, "value": "I18", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3066,7 +3004,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3087,7 +3024,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3115,6 +3051,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3131,8 +3068,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3175,7 +3111,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3204,7 +3139,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3230,7 +3164,6 @@ "ctxt": 0 }, "value": "I19", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3255,6 +3188,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3271,8 +3205,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3315,7 +3248,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3344,7 +3276,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3370,7 +3301,6 @@ "ctxt": 0 }, "value": "I20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3395,6 +3325,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3411,8 +3342,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3455,7 +3385,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameter/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameter/input.ts.json index c363b333dec9..944f329baa11 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameter/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameter/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -157,7 +152,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -183,7 +177,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -208,7 +201,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -235,7 +227,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -256,7 +247,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -287,7 +277,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -306,7 +295,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -327,6 +315,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -349,13 +338,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -374,6 +361,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -396,13 +384,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -445,8 +431,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -472,7 +458,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -483,7 +468,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -516,8 +500,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -543,7 +527,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -554,7 +537,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -589,7 +571,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -610,7 +591,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -635,7 +615,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -665,7 +644,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -704,7 +682,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -730,7 +707,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -778,7 +754,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -804,7 +779,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -830,7 +804,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -872,7 +845,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -900,7 +872,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -919,7 +890,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -936,7 +906,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -978,7 +947,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "body": { @@ -1021,8 +989,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1051,7 +1019,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1077,7 +1044,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1132,7 +1098,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "body": { @@ -1175,8 +1140,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1205,7 +1170,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1226,6 +1190,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1248,13 +1213,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1273,6 +1236,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1295,13 +1259,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1344,8 +1306,8 @@ "ctxt": 0 }, "value": "r0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1371,7 +1333,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1412,8 +1373,8 @@ "ctxt": 0 }, "value": "r0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1447,7 +1408,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1480,6 +1440,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1502,12 +1463,10 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1539,8 +1498,8 @@ "ctxt": 0 }, "value": "r0b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1566,7 +1525,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1577,7 +1535,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1610,8 +1567,8 @@ "ctxt": 0 }, "value": "r0b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1637,7 +1594,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1648,7 +1604,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -1681,8 +1636,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1717,7 +1672,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1750,8 +1704,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1777,7 +1731,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1819,8 +1772,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1860,7 +1813,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1893,8 +1845,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1920,7 +1872,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1967,8 +1918,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2003,7 +1954,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2036,8 +1986,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2063,7 +2013,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2105,8 +2054,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2139,7 +2088,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2153,7 +2101,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2186,8 +2133,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2213,7 +2160,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2231,7 +2177,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2267,8 +2212,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2304,7 +2249,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2337,8 +2281,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2364,7 +2308,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2407,8 +2350,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2444,7 +2387,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -2467,7 +2409,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2500,8 +2441,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2527,7 +2468,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2548,7 +2488,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -2593,8 +2532,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2642,7 +2581,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2675,8 +2613,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2702,7 +2640,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2757,8 +2694,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2792,6 +2729,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2814,13 +2752,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2846,7 +2782,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2877,7 +2812,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2895,7 +2829,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2928,8 +2861,8 @@ "ctxt": 0 }, "value": "r8b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2955,7 +2888,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2974,6 +2906,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2996,13 +2929,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -3028,7 +2959,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3059,7 +2989,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3099,6 +3028,7 @@ "ctxt": 0 }, "value": "i1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3121,13 +3051,11 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3159,8 +3087,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3186,7 +3114,6 @@ "ctxt": 0 }, "value": "i1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3197,7 +3124,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3230,8 +3156,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3257,7 +3183,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3268,7 +3193,6 @@ "ctxt": 0 }, "value": "i1", - "typeAnnotation": null, "optional": false } }, @@ -3301,6 +3225,7 @@ "ctxt": 0 }, "value": "c1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3323,13 +3248,11 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3361,8 +3284,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3388,7 +3311,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3399,7 +3321,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3432,8 +3353,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3459,7 +3380,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3470,7 +3390,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } }, @@ -3503,6 +3422,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3525,7 +3445,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3548,8 +3467,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3581,8 +3499,8 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3608,7 +3526,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3619,7 +3536,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3652,8 +3568,8 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3679,7 +3595,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3690,7 +3605,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false } }, @@ -3723,8 +3637,8 @@ "ctxt": 0 }, "value": "r13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3750,7 +3664,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3761,7 +3674,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3794,8 +3706,8 @@ "ctxt": 0 }, "value": "r13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3821,7 +3733,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3832,7 +3743,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false } }, @@ -3865,8 +3775,8 @@ "ctxt": 0 }, "value": "r14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3899,7 +3809,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -3910,7 +3819,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3923,7 +3831,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3956,8 +3863,8 @@ "ctxt": 0 }, "value": "r14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3983,7 +3890,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -4001,7 +3907,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -4012,7 +3917,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4047,6 +3951,7 @@ "ctxt": 0 }, "value": "af", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4069,12 +3974,10 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4106,8 +4009,8 @@ "ctxt": 0 }, "value": "r15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -4133,7 +4036,6 @@ "ctxt": 0 }, "value": "af", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -4144,7 +4046,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -4177,8 +4078,8 @@ "ctxt": 0 }, "value": "r15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -4204,7 +4105,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -4215,7 +4115,6 @@ "ctxt": 0 }, "value": "af", - "typeAnnotation": null, "optional": false } }, @@ -4248,6 +4147,7 @@ "ctxt": 0 }, "value": "ac", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4270,12 +4170,10 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4307,8 +4205,8 @@ "ctxt": 0 }, "value": "r16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -4334,7 +4232,6 @@ "ctxt": 0 }, "value": "ac", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -4345,7 +4242,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -4378,8 +4274,8 @@ "ctxt": 0 }, "value": "r16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -4405,7 +4301,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -4416,7 +4311,6 @@ "ctxt": 0 }, "value": "ac", - "typeAnnotation": null, "optional": false } }, @@ -4434,7 +4328,6 @@ "ctxt": 0 }, "value": "f17", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4455,6 +4348,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4477,13 +4371,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4526,8 +4418,8 @@ "ctxt": 0 }, "value": "r17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -4553,7 +4445,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -4564,7 +4455,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4597,8 +4487,8 @@ "ctxt": 0 }, "value": "r17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -4624,7 +4514,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -4635,7 +4524,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -4670,7 +4558,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4690,7 +4577,6 @@ "ctxt": 0 }, "value": "f18", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4711,6 +4597,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4733,13 +4620,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4782,8 +4667,8 @@ "ctxt": 0 }, "value": "r18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -4809,7 +4694,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -4820,7 +4704,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4853,8 +4736,8 @@ "ctxt": 0 }, "value": "r18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -4880,7 +4763,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -4891,7 +4773,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -4926,7 +4807,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4947,7 +4827,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4965,7 +4844,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5001,8 +4879,8 @@ "ctxt": 0 }, "value": "r19", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -5035,7 +4913,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -5049,7 +4926,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5082,8 +4958,8 @@ "ctxt": 0 }, "value": "r19", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -5109,7 +4985,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -5127,7 +5002,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -5163,8 +5037,8 @@ "ctxt": 0 }, "value": "r20", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -5199,7 +5073,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5232,8 +5105,8 @@ "ctxt": 0 }, "value": "r20", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -5259,7 +5132,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -5303,7 +5175,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5324,7 +5195,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints/input.ts.json index bb92a7faa2c4..9586d93f8698 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -153,6 +148,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -169,8 +165,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -195,7 +190,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -223,7 +217,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -249,7 +242,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -274,7 +266,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -301,7 +292,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -319,7 +309,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -341,7 +330,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -372,7 +360,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -391,7 +378,6 @@ "ctxt": 0 }, "value": "D2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -413,6 +399,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -429,8 +416,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -455,7 +441,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -483,7 +468,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -509,7 +493,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -534,7 +517,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -561,7 +543,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -579,7 +560,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -601,7 +581,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -632,7 +611,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -651,7 +629,6 @@ "ctxt": 0 }, "value": "D3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -673,6 +650,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -689,8 +667,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -715,7 +692,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -743,7 +719,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -769,7 +744,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -794,7 +768,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -821,7 +794,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -839,7 +811,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -861,7 +832,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -892,7 +862,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -911,7 +880,6 @@ "ctxt": 0 }, "value": "D4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -933,6 +901,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -949,8 +918,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -975,7 +943,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1003,7 +970,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1029,7 +995,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1054,7 +1019,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1081,7 +1045,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1099,7 +1062,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1121,7 +1083,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1152,7 +1113,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1171,7 +1131,6 @@ "ctxt": 0 }, "value": "D5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1193,6 +1152,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1209,8 +1169,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1235,7 +1194,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1263,7 +1221,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1289,7 +1246,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1314,7 +1270,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1341,7 +1296,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1359,7 +1313,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1381,7 +1334,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1399,7 +1351,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1421,7 +1372,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1452,7 +1402,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1471,7 +1420,6 @@ "ctxt": 0 }, "value": "D6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1493,6 +1441,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1509,8 +1458,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1535,7 +1483,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1563,7 +1510,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1589,7 +1535,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1614,7 +1559,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1641,7 +1585,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1659,7 +1602,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1681,7 +1623,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1699,7 +1640,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1721,7 +1661,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1752,7 +1691,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1771,7 +1709,6 @@ "ctxt": 0 }, "value": "D7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1793,6 +1730,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1809,8 +1747,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1835,7 +1772,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1863,7 +1799,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1889,7 +1824,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1914,7 +1848,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1941,7 +1874,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1959,7 +1891,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1981,7 +1912,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1999,7 +1929,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2021,7 +1950,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2052,7 +1980,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2071,7 +1998,6 @@ "ctxt": 0 }, "value": "D8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2093,6 +2019,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2109,8 +2036,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2135,7 +2061,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2163,7 +2088,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2189,7 +2113,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2214,7 +2137,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2241,7 +2163,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2259,7 +2180,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2281,7 +2201,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2299,7 +2218,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2321,7 +2239,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2352,7 +2269,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2371,7 +2287,6 @@ "ctxt": 0 }, "value": "D9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2393,6 +2308,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2409,8 +2325,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2435,7 +2350,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2463,7 +2377,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2489,7 +2402,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2514,7 +2426,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2541,7 +2452,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2559,7 +2469,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2581,7 +2490,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2599,7 +2507,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2621,7 +2528,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2652,7 +2558,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2671,7 +2576,6 @@ "ctxt": 0 }, "value": "D10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2693,6 +2597,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2709,8 +2614,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2735,7 +2639,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2763,7 +2666,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2789,7 +2691,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2814,7 +2715,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2841,7 +2741,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2859,7 +2758,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2881,7 +2779,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2899,7 +2796,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2921,7 +2817,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2952,7 +2847,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2971,7 +2865,6 @@ "ctxt": 0 }, "value": "D11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2993,6 +2886,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3009,8 +2903,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3035,7 +2928,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3063,7 +2955,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3089,7 +2980,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3114,7 +3004,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -3141,7 +3030,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3159,7 +3047,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3181,7 +3068,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3199,7 +3085,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3221,7 +3106,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3252,7 +3136,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3271,7 +3154,6 @@ "ctxt": 0 }, "value": "D12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3293,6 +3175,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3309,8 +3192,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3335,7 +3217,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3363,7 +3244,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3389,7 +3269,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3414,7 +3293,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -3441,7 +3319,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3459,7 +3336,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3481,7 +3357,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3499,7 +3374,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3521,7 +3395,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3552,7 +3425,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3571,7 +3443,6 @@ "ctxt": 0 }, "value": "D13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3593,6 +3464,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3609,8 +3481,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3635,7 +3506,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3663,7 +3533,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3689,7 +3558,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3714,7 +3582,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -3741,7 +3608,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3759,7 +3625,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3781,7 +3646,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3799,7 +3663,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3821,7 +3684,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3852,7 +3714,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3871,7 +3732,6 @@ "ctxt": 0 }, "value": "D14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3893,6 +3753,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3909,8 +3770,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3935,7 +3795,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3963,7 +3822,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3989,7 +3847,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4014,7 +3871,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -4041,7 +3897,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4059,7 +3914,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4081,7 +3935,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4099,7 +3952,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4121,7 +3973,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4139,7 +3990,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4171,7 +4021,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4190,7 +4039,6 @@ "ctxt": 0 }, "value": "D15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4212,6 +4060,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4228,8 +4077,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4254,7 +4102,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4282,7 +4129,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -4308,7 +4154,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4333,7 +4178,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -4360,7 +4204,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4378,7 +4221,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4400,7 +4242,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4418,7 +4259,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4440,7 +4280,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4458,7 +4297,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4490,7 +4328,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4509,7 +4346,6 @@ "ctxt": 0 }, "value": "D16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4531,6 +4367,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4547,8 +4384,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4573,7 +4409,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4601,7 +4436,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -4627,7 +4461,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4652,7 +4485,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -4679,7 +4511,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4697,7 +4528,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4719,7 +4549,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4737,7 +4566,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4759,7 +4587,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4777,7 +4604,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4809,7 +4635,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4828,7 +4653,6 @@ "ctxt": 0 }, "value": "D17", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4850,6 +4674,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4866,8 +4691,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4892,7 +4716,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4920,7 +4743,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -4946,7 +4768,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4971,7 +4792,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -4998,7 +4818,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5016,7 +4835,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5038,7 +4856,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5056,7 +4873,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5078,7 +4894,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5096,7 +4911,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5128,7 +4942,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5147,7 +4960,6 @@ "ctxt": 0 }, "value": "D18", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5169,6 +4981,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5185,8 +4998,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -5211,7 +5023,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5239,7 +5050,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -5265,7 +5075,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5290,7 +5099,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -5317,7 +5125,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5335,7 +5142,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5357,7 +5163,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5375,7 +5180,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5397,7 +5201,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5415,7 +5218,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5447,7 +5249,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5466,7 +5267,6 @@ "ctxt": 0 }, "value": "D19", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5488,6 +5288,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5504,8 +5305,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -5530,7 +5330,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5558,7 +5357,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -5584,7 +5382,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5609,7 +5406,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -5636,7 +5432,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5654,7 +5449,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5676,7 +5470,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5694,7 +5487,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5716,7 +5508,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5734,7 +5525,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5766,7 +5556,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5785,7 +5574,6 @@ "ctxt": 0 }, "value": "D20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5807,6 +5595,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5823,8 +5612,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -5849,7 +5637,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5877,7 +5664,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -5903,7 +5689,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5928,7 +5713,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -5955,7 +5739,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5973,7 +5756,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5995,7 +5777,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6013,7 +5794,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6035,7 +5815,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6053,7 +5832,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6085,7 +5863,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6104,7 +5881,6 @@ "ctxt": 0 }, "value": "D21", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6126,6 +5902,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6142,8 +5919,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -6168,7 +5944,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6196,7 +5971,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -6222,7 +5996,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6247,7 +6020,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -6274,7 +6046,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6292,7 +6063,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6314,7 +6084,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6332,7 +6101,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6354,7 +6122,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6372,7 +6139,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6404,7 +6170,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6423,7 +6188,6 @@ "ctxt": 0 }, "value": "D22", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6445,6 +6209,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6461,8 +6226,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -6487,7 +6251,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6515,7 +6278,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -6541,7 +6303,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6566,7 +6327,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -6593,7 +6353,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6611,7 +6370,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6633,7 +6391,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6651,7 +6408,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6673,7 +6429,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6691,7 +6446,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6723,7 +6477,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6742,7 +6495,6 @@ "ctxt": 0 }, "value": "D23", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6764,6 +6516,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6780,8 +6533,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -6806,7 +6558,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6834,7 +6585,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -6860,7 +6610,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6885,7 +6634,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -6912,7 +6660,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6930,7 +6677,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6952,7 +6698,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6970,7 +6715,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6992,7 +6736,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7010,7 +6753,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7042,7 +6784,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7061,7 +6802,6 @@ "ctxt": 0 }, "value": "D24", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7083,6 +6823,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7099,8 +6840,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -7125,7 +6865,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7153,7 +6892,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -7179,7 +6917,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7204,7 +6941,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -7231,7 +6967,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7249,7 +6984,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7271,7 +7005,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7289,7 +7022,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7311,7 +7043,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7329,7 +7060,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7361,7 +7091,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7380,7 +7109,6 @@ "ctxt": 0 }, "value": "D25", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7402,6 +7130,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7418,8 +7147,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -7444,7 +7172,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7472,7 +7199,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -7498,7 +7224,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7523,7 +7248,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -7550,7 +7274,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7568,7 +7291,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7590,7 +7312,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7608,7 +7329,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7630,7 +7350,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7648,7 +7367,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7680,7 +7398,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7699,7 +7416,6 @@ "ctxt": 0 }, "value": "D26", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7721,6 +7437,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7737,8 +7454,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -7763,7 +7479,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7791,7 +7506,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -7817,7 +7531,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7842,7 +7555,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -7869,7 +7581,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7887,7 +7598,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7909,7 +7619,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7927,7 +7636,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7949,7 +7657,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7967,7 +7674,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7999,7 +7705,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8018,7 +7723,6 @@ "ctxt": 0 }, "value": "D27", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8040,6 +7744,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8056,8 +7761,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -8082,7 +7786,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8110,7 +7813,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -8136,7 +7838,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8161,7 +7862,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -8188,7 +7888,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8206,7 +7905,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8228,7 +7926,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8246,7 +7943,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8268,7 +7964,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8286,7 +7981,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8318,7 +8012,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8337,7 +8030,6 @@ "ctxt": 0 }, "value": "D28", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8359,6 +8051,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8375,8 +8068,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -8401,7 +8093,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8429,7 +8120,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -8455,7 +8145,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8480,7 +8169,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -8507,7 +8195,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8525,7 +8212,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8547,7 +8233,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8565,7 +8250,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8587,7 +8271,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8605,7 +8288,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8637,7 +8319,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8656,7 +8337,6 @@ "ctxt": 0 }, "value": "D29", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8678,6 +8358,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8694,8 +8375,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -8720,7 +8400,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8748,7 +8427,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -8774,7 +8452,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8799,7 +8476,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -8826,7 +8502,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8844,7 +8519,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8866,7 +8540,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8884,7 +8557,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8906,7 +8578,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8924,7 +8595,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8956,7 +8626,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints2/input.ts.json index 77a79d97219e..cd72950f17b5 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -106,13 +105,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -155,8 +152,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -182,7 +179,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -193,7 +189,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -226,8 +221,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -253,7 +248,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -264,7 +258,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -299,7 +292,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -317,7 +309,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -339,7 +330,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -359,7 +349,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -380,6 +369,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -402,13 +392,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -427,6 +415,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -449,13 +438,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -474,6 +461,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -496,13 +484,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -545,8 +531,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -572,7 +558,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -583,7 +568,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -616,8 +600,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -643,7 +627,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -654,7 +637,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -687,8 +669,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -714,7 +696,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -725,7 +706,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -758,8 +738,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -785,7 +765,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -796,7 +775,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } }, @@ -829,8 +807,8 @@ "ctxt": 0 }, "value": "r2a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -856,7 +834,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -867,7 +844,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -900,8 +876,8 @@ "ctxt": 0 }, "value": "r2b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -927,7 +903,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -938,7 +913,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } }, @@ -973,7 +947,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -991,7 +964,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1013,7 +985,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1031,7 +1002,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1053,7 +1023,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1073,7 +1042,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1094,6 +1062,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1116,13 +1085,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1141,6 +1108,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1163,13 +1131,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1212,8 +1178,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1239,7 +1205,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1250,7 +1215,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -1283,8 +1247,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1310,7 +1274,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1321,7 +1284,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1354,8 +1316,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1381,7 +1343,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1399,7 +1360,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1435,8 +1395,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1469,7 +1429,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1483,7 +1442,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1516,8 +1474,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1543,7 +1501,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1561,7 +1518,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1597,8 +1553,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1631,7 +1587,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1645,7 +1600,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -1680,7 +1634,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1698,7 +1651,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1720,7 +1672,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1738,7 +1689,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1764,7 +1714,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1794,7 +1743,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1833,7 +1781,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1859,7 +1806,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1907,7 +1853,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1933,7 +1878,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1959,7 +1903,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2001,7 +1944,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2029,7 +1971,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -2048,7 +1989,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -2065,7 +2005,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2107,7 +2046,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "body": { @@ -2150,8 +2088,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2180,7 +2118,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2206,7 +2143,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2261,7 +2197,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "body": { @@ -2304,8 +2239,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2334,7 +2269,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2355,6 +2289,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2377,13 +2312,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2426,8 +2359,8 @@ "ctxt": 0 }, "value": "r0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2453,7 +2386,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2494,8 +2426,8 @@ "ctxt": 0 }, "value": "r0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2529,7 +2461,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2562,6 +2493,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2584,12 +2516,10 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2621,8 +2551,8 @@ "ctxt": 0 }, "value": "r0b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2648,7 +2578,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2659,7 +2588,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2692,8 +2620,8 @@ "ctxt": 0 }, "value": "r0b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2719,7 +2647,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2730,7 +2657,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -2765,7 +2691,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2783,7 +2708,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2804,7 +2728,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2825,6 +2748,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2847,13 +2771,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2896,8 +2818,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2932,7 +2854,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2965,8 +2886,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2992,7 +2913,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3036,7 +2956,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3054,7 +2973,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3075,7 +2993,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3096,6 +3013,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3118,13 +3036,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3167,8 +3083,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3208,7 +3124,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3241,8 +3156,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3268,7 +3183,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3317,7 +3231,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3335,7 +3248,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3356,7 +3268,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3377,6 +3288,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3399,13 +3311,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3448,8 +3358,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3484,7 +3394,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3517,8 +3426,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3544,7 +3453,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3588,7 +3496,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3606,7 +3513,6 @@ "ctxt": 0 }, "value": "Boolean", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3627,7 +3533,6 @@ "ctxt": 0 }, "value": "f8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3648,6 +3553,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3670,13 +3576,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3719,8 +3623,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3753,7 +3657,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3767,7 +3670,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3800,8 +3702,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -3827,7 +3729,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -3845,7 +3746,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3883,7 +3783,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3901,7 +3800,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3922,7 +3820,6 @@ "ctxt": 0 }, "value": "f9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3943,6 +3840,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3965,13 +3863,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4014,8 +3910,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -4051,7 +3947,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -4084,8 +3979,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -4111,7 +4006,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -4156,7 +4050,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4174,7 +4067,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4195,7 +4087,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4216,6 +4107,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4238,13 +4130,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4287,8 +4177,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -4324,7 +4214,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -4347,7 +4236,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -4380,8 +4268,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -4407,7 +4295,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -4428,7 +4315,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -4475,7 +4361,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4502,7 +4387,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4546,7 +4430,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4567,6 +4450,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4589,13 +4473,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4638,8 +4520,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -4687,7 +4569,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -4720,8 +4601,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -4747,7 +4628,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -4804,7 +4684,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4850,7 +4729,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4871,6 +4749,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4893,13 +4772,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4942,8 +4819,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -4977,6 +4854,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4999,13 +4877,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -5031,7 +4907,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5062,7 +4937,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5080,7 +4954,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5113,8 +4986,8 @@ "ctxt": 0 }, "value": "r8b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -5140,7 +5013,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -5159,6 +5031,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5181,13 +5054,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -5213,7 +5084,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5244,7 +5114,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5286,7 +5155,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5305,6 +5173,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5327,13 +5196,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -5359,7 +5226,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5389,7 +5255,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5412,7 +5277,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5433,6 +5297,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5455,13 +5320,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5504,6 +5367,7 @@ "ctxt": 0 }, "value": "i1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5526,13 +5390,11 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -5564,8 +5426,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -5591,7 +5453,6 @@ "ctxt": 0 }, "value": "i1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -5602,7 +5463,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5635,8 +5495,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -5662,7 +5522,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -5673,7 +5532,6 @@ "ctxt": 0 }, "value": "i1", - "typeAnnotation": null, "optional": false } }, @@ -5708,7 +5566,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5726,7 +5583,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5747,7 +5603,6 @@ "ctxt": 0 }, "value": "f14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5768,6 +5623,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5790,13 +5646,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5839,6 +5693,7 @@ "ctxt": 0 }, "value": "c1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5861,13 +5716,11 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -5899,8 +5752,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -5926,7 +5779,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -5937,7 +5789,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5970,8 +5821,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -5997,7 +5848,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -6008,7 +5858,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } }, @@ -6043,7 +5892,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6061,7 +5909,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6082,7 +5929,6 @@ "ctxt": 0 }, "value": "f15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6103,6 +5949,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6125,13 +5972,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6174,6 +6019,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6196,7 +6042,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6219,8 +6064,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -6252,8 +6096,8 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -6279,7 +6123,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -6290,7 +6133,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -6323,8 +6165,8 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -6350,7 +6192,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -6361,7 +6202,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false } }, @@ -6396,7 +6236,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6414,7 +6253,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6453,7 +6291,6 @@ "ctxt": 0 }, "value": "f16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6474,6 +6311,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6496,13 +6334,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6545,8 +6381,8 @@ "ctxt": 0 }, "value": "r13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -6572,7 +6408,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -6583,7 +6418,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -6616,8 +6450,8 @@ "ctxt": 0 }, "value": "r13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -6643,7 +6477,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -6654,7 +6487,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false } }, @@ -6687,8 +6519,8 @@ "ctxt": 0 }, "value": "r14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -6721,7 +6553,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6732,7 +6563,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6745,7 +6575,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -6778,8 +6607,8 @@ "ctxt": 0 }, "value": "r14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -6805,7 +6634,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -6823,7 +6651,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -6834,7 +6661,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6871,7 +6697,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6889,7 +6714,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6910,7 +6734,6 @@ "ctxt": 0 }, "value": "f17", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6931,6 +6754,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6953,13 +6777,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -7002,6 +6824,7 @@ "ctxt": 0 }, "value": "af", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7024,12 +6847,10 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -7061,8 +6882,8 @@ "ctxt": 0 }, "value": "r15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -7088,7 +6909,6 @@ "ctxt": 0 }, "value": "af", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -7099,7 +6919,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -7132,8 +6951,8 @@ "ctxt": 0 }, "value": "r15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -7159,7 +6978,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -7170,7 +6988,6 @@ "ctxt": 0 }, "value": "af", - "typeAnnotation": null, "optional": false } }, @@ -7205,7 +7022,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7223,7 +7039,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } }, @@ -7243,7 +7058,6 @@ "ctxt": 0 }, "value": "f18", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7264,6 +7078,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7286,13 +7101,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -7335,6 +7148,7 @@ "ctxt": 0 }, "value": "ac", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7357,12 +7171,10 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": null, "definite": false @@ -7394,8 +7206,8 @@ "ctxt": 0 }, "value": "r16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -7421,7 +7233,6 @@ "ctxt": 0 }, "value": "ac", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -7432,7 +7243,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -7465,8 +7275,8 @@ "ctxt": 0 }, "value": "r16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -7492,7 +7302,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -7503,7 +7312,6 @@ "ctxt": 0 }, "value": "ac", - "typeAnnotation": null, "optional": false } }, @@ -7538,7 +7346,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7556,7 +7363,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -7576,7 +7382,6 @@ "ctxt": 0 }, "value": "f19", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7597,6 +7402,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7619,13 +7425,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -7653,7 +7457,6 @@ "ctxt": 0 }, "value": "f17", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7674,6 +7477,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7696,13 +7500,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -7745,8 +7547,8 @@ "ctxt": 0 }, "value": "r17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -7772,7 +7574,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -7783,7 +7584,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -7816,8 +7616,8 @@ "ctxt": 0 }, "value": "r17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -7843,7 +7643,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -7854,7 +7653,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -7889,7 +7687,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7907,7 +7704,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7928,7 +7724,6 @@ "ctxt": 0 }, "value": "f18", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7949,6 +7744,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7971,13 +7767,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -8020,8 +7814,8 @@ "ctxt": 0 }, "value": "r18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -8047,7 +7841,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -8058,7 +7851,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -8091,8 +7883,8 @@ "ctxt": 0 }, "value": "r18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -8118,7 +7910,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -8129,7 +7920,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -8164,7 +7954,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8182,7 +7971,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8204,7 +7992,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8222,7 +8009,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8260,7 +8046,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8280,7 +8065,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8301,6 +8085,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8323,13 +8108,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -8372,8 +8155,8 @@ "ctxt": 0 }, "value": "r19", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -8406,7 +8189,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -8420,7 +8202,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -8453,8 +8234,8 @@ "ctxt": 0 }, "value": "r19", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -8480,7 +8261,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -8498,7 +8278,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -8536,7 +8315,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8554,7 +8332,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8575,7 +8352,6 @@ "ctxt": 0 }, "value": "f21", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8596,6 +8372,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8618,13 +8395,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -8667,8 +8442,8 @@ "ctxt": 0 }, "value": "r20", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -8703,7 +8478,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -8736,8 +8510,8 @@ "ctxt": 0 }, "value": "r20", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -8763,7 +8537,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -8807,7 +8580,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8825,7 +8597,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints3/input.ts.json index 63f70712d5a5..1181a1018b48 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -106,13 +105,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -131,6 +128,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -153,13 +151,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -202,8 +198,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -229,7 +225,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -240,7 +235,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -273,8 +267,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -300,7 +294,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -311,7 +304,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -344,8 +336,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -371,7 +363,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -382,7 +373,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -415,8 +405,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -442,7 +432,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -453,7 +442,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -486,8 +474,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -513,7 +501,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -524,7 +511,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -557,8 +543,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -584,7 +570,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -595,7 +580,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -630,7 +614,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -648,7 +631,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -670,7 +652,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -691,7 +672,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints4/input.ts.json index 5aea514b6670..0e2c169d6974 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -111,6 +108,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -133,13 +131,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -158,6 +154,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,13 +177,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -205,6 +200,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -227,13 +223,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -276,8 +270,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -303,7 +297,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -314,7 +307,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -347,8 +339,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -374,7 +366,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -385,7 +376,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -418,8 +408,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -445,7 +435,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -456,7 +445,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -489,8 +477,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -516,7 +504,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -527,7 +514,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -560,8 +546,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -587,7 +573,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -598,7 +583,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -631,8 +615,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -658,7 +642,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -669,7 +652,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -702,8 +684,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -729,7 +711,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -747,7 +728,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -783,8 +763,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -817,7 +797,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -831,7 +810,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -864,8 +842,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -891,7 +869,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -909,7 +886,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -945,8 +921,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -979,7 +955,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -993,7 +968,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -1026,8 +1000,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1053,7 +1027,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1071,7 +1044,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1107,8 +1079,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1141,7 +1113,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1155,7 +1126,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -1190,7 +1160,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1208,7 +1177,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1230,7 +1198,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1248,7 +1215,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1270,7 +1236,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1290,7 +1255,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1316,7 +1280,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1342,7 +1305,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1384,7 +1346,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1405,7 +1366,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1427,6 +1387,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1443,8 +1404,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1469,7 +1429,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1497,7 +1456,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1523,7 +1481,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1548,7 +1505,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1575,7 +1531,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1593,7 +1548,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1615,7 +1569,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1633,7 +1586,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1655,7 +1607,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1686,7 +1637,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1705,7 +1655,6 @@ "ctxt": 0 }, "value": "D2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1727,6 +1676,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1743,8 +1693,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1769,7 +1718,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1797,7 +1745,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1823,7 +1770,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1848,7 +1794,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1875,7 +1820,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1893,7 +1837,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1915,7 +1858,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1933,7 +1875,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1955,7 +1896,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1986,7 +1926,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2005,7 +1944,6 @@ "ctxt": 0 }, "value": "D3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2027,6 +1965,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2043,8 +1982,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2069,7 +2007,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2097,7 +2034,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2123,7 +2059,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2148,7 +2083,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2175,7 +2109,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2193,7 +2126,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2215,7 +2147,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2233,7 +2164,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2255,7 +2185,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2286,7 +2215,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2305,7 +2233,6 @@ "ctxt": 0 }, "value": "D4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2327,6 +2254,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2343,8 +2271,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2369,7 +2296,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2397,7 +2323,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2423,7 +2348,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2448,7 +2372,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2475,7 +2398,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2493,7 +2415,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2515,7 +2436,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2533,7 +2453,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2555,7 +2474,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2586,7 +2504,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2605,7 +2522,6 @@ "ctxt": 0 }, "value": "D5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2627,6 +2543,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2643,8 +2560,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2669,7 +2585,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2697,7 +2612,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2723,7 +2637,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2748,7 +2661,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2775,7 +2687,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2793,7 +2704,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2815,7 +2725,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2833,7 +2742,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2855,7 +2763,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2886,7 +2793,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2905,7 +2811,6 @@ "ctxt": 0 }, "value": "D6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2927,6 +2832,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2943,8 +2849,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2969,7 +2874,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2997,7 +2901,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3023,7 +2926,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3048,7 +2950,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -3075,7 +2976,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3093,7 +2993,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3115,7 +3014,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3133,7 +3031,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3155,7 +3052,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3186,7 +3082,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3205,7 +3100,6 @@ "ctxt": 0 }, "value": "D7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3227,6 +3121,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3243,8 +3138,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3269,7 +3163,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3297,7 +3190,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3323,7 +3215,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3348,7 +3239,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -3375,7 +3265,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3393,7 +3282,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3415,7 +3303,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3433,7 +3320,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3455,7 +3341,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3486,7 +3371,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3505,7 +3389,6 @@ "ctxt": 0 }, "value": "D8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3527,6 +3410,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3543,8 +3427,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3569,7 +3452,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3597,7 +3479,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3623,7 +3504,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3648,7 +3528,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -3675,7 +3554,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3693,7 +3571,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3715,7 +3592,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3733,7 +3609,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3755,7 +3630,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3786,7 +3660,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3805,7 +3678,6 @@ "ctxt": 0 }, "value": "D9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3827,6 +3699,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3843,8 +3716,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3869,7 +3741,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3897,7 +3768,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3923,7 +3793,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3948,7 +3817,6 @@ "ctxt": 0 }, "value": "B1", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -3975,7 +3843,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3993,7 +3860,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4015,7 +3881,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4033,7 +3898,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4055,7 +3919,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4086,7 +3949,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints/input.ts.json index d7e5aef39042..23d7a541469b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -152,6 +147,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -174,13 +170,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -199,6 +193,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -221,13 +216,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -246,6 +239,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -268,13 +262,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -317,8 +309,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -344,7 +336,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -355,7 +346,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -388,8 +378,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -415,7 +405,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -426,7 +415,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -459,8 +447,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -486,7 +474,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -497,7 +484,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -530,8 +516,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -557,7 +543,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -568,7 +553,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -601,8 +585,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -628,7 +612,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -639,7 +622,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -672,8 +654,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -699,7 +681,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -710,7 +691,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -743,8 +723,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -770,7 +750,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -788,7 +767,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -815,7 +793,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -853,8 +830,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -887,7 +864,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -914,7 +890,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -930,7 +905,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -963,8 +937,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -990,7 +964,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1008,7 +981,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1035,7 +1007,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1073,8 +1044,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1107,7 +1078,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1134,7 +1104,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1150,7 +1119,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -1183,8 +1151,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1210,7 +1178,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1228,7 +1195,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1255,7 +1221,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1293,8 +1258,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1327,7 +1292,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1354,7 +1318,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1370,7 +1333,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -1403,8 +1365,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1430,7 +1392,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1448,7 +1409,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1475,7 +1435,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1513,8 +1472,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1547,7 +1506,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1574,7 +1532,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1590,7 +1547,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -1623,8 +1579,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1650,7 +1606,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1668,7 +1623,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1695,7 +1649,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1733,8 +1686,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1767,7 +1720,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1794,7 +1746,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1810,7 +1761,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -1843,8 +1793,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1870,7 +1820,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1888,7 +1837,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1915,7 +1863,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1953,8 +1900,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1987,7 +1934,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2014,7 +1960,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2030,7 +1975,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -2063,8 +2007,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2090,7 +2034,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2108,7 +2051,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2135,7 +2077,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2173,8 +2114,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2207,7 +2148,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2234,7 +2174,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2250,7 +2189,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } }, @@ -2283,8 +2221,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2310,7 +2248,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2328,7 +2265,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2355,7 +2291,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2393,8 +2328,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2427,7 +2362,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2454,7 +2388,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2470,7 +2403,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } }, @@ -2503,8 +2435,8 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2530,7 +2462,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2548,7 +2479,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2575,7 +2505,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2613,8 +2542,8 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2647,7 +2576,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2674,7 +2602,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2690,7 +2617,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false } }, @@ -2725,7 +2651,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2743,7 +2668,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2769,7 +2693,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2794,7 +2717,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2812,7 +2734,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2838,7 +2759,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2863,7 +2783,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2881,7 +2800,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2907,7 +2825,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2938,7 +2855,6 @@ "ctxt": 0 }, "value": "M1", - "typeAnnotation": null, "optional": false }, "body": { @@ -2959,7 +2875,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2985,7 +2900,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3011,7 +2925,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3053,7 +2966,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3074,7 +2986,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3096,6 +3007,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3112,8 +3024,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3138,7 +3049,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3166,7 +3076,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3192,7 +3101,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3217,7 +3125,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -3244,7 +3151,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3262,7 +3168,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3288,7 +3193,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3313,7 +3217,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3331,7 +3234,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3357,7 +3259,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3382,7 +3283,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3400,7 +3300,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3426,7 +3325,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3461,7 +3359,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3480,7 +3377,6 @@ "ctxt": 0 }, "value": "D2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3502,6 +3398,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3518,8 +3415,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3544,7 +3440,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3572,7 +3467,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -3598,7 +3492,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3623,7 +3516,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -3650,7 +3542,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3668,7 +3559,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3694,7 +3584,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3719,7 +3608,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3737,7 +3625,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3763,7 +3650,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3788,7 +3674,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3806,7 +3691,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3832,7 +3716,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3867,7 +3750,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3886,7 +3768,6 @@ "ctxt": 0 }, "value": "D3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3908,6 +3789,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3924,8 +3806,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3950,7 +3831,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3978,7 +3858,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -4004,7 +3883,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4029,7 +3907,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -4056,7 +3933,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4074,7 +3950,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4100,7 +3975,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4125,7 +3999,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4143,7 +4016,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4169,7 +4041,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4194,7 +4065,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4212,7 +4082,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4238,7 +4107,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4273,7 +4141,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4292,7 +4159,6 @@ "ctxt": 0 }, "value": "D4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4314,6 +4180,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4330,8 +4197,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4356,7 +4222,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4384,7 +4249,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -4410,7 +4274,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4435,7 +4298,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -4462,7 +4324,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4480,7 +4341,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4506,7 +4366,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4531,7 +4390,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4549,7 +4407,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4575,7 +4432,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4600,7 +4456,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4618,7 +4473,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4644,7 +4498,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4679,7 +4532,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4698,7 +4550,6 @@ "ctxt": 0 }, "value": "D5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4720,6 +4571,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4736,8 +4588,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4762,7 +4613,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4790,7 +4640,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -4816,7 +4665,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4841,7 +4689,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -4868,7 +4715,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4886,7 +4732,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4912,7 +4757,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4937,7 +4781,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4955,7 +4798,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4981,7 +4823,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5006,7 +4847,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5024,7 +4864,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5050,7 +4889,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5085,7 +4923,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5104,7 +4941,6 @@ "ctxt": 0 }, "value": "D6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5126,6 +4962,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5142,8 +4979,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -5168,7 +5004,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5196,7 +5031,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -5222,7 +5056,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5247,7 +5080,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -5274,7 +5106,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5292,7 +5123,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5318,7 +5148,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5343,7 +5172,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5361,7 +5189,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5387,7 +5214,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5412,7 +5238,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5430,7 +5255,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5456,7 +5280,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5491,7 +5314,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5510,7 +5332,6 @@ "ctxt": 0 }, "value": "D7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5532,6 +5353,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5548,8 +5370,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -5574,7 +5395,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5602,7 +5422,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -5628,7 +5447,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5653,7 +5471,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -5680,7 +5497,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5698,7 +5514,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5724,7 +5539,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5749,7 +5563,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5767,7 +5580,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5793,7 +5605,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5818,7 +5629,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5836,7 +5646,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5862,7 +5671,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5897,7 +5705,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5916,7 +5723,6 @@ "ctxt": 0 }, "value": "D8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5938,6 +5744,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5954,8 +5761,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -5980,7 +5786,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6008,7 +5813,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -6034,7 +5838,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6059,7 +5862,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -6086,7 +5888,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6104,7 +5905,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6130,7 +5930,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6155,7 +5954,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6173,7 +5971,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6199,7 +5996,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6224,7 +6020,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6242,7 +6037,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6268,7 +6062,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6303,7 +6096,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6322,7 +6114,6 @@ "ctxt": 0 }, "value": "D9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6344,6 +6135,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6360,8 +6152,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -6386,7 +6177,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6414,7 +6204,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -6440,7 +6229,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6465,7 +6253,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -6492,7 +6279,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6510,7 +6296,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6536,7 +6321,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6561,7 +6345,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6579,7 +6362,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6605,7 +6387,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6630,7 +6411,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6648,7 +6428,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6674,7 +6453,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6709,7 +6487,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6738,7 +6515,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -6759,7 +6535,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6785,7 +6560,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -6811,7 +6585,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6837,7 +6610,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6882,7 +6654,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6903,7 +6674,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6925,6 +6695,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6941,8 +6712,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -6967,7 +6737,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6995,7 +6764,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -7021,7 +6789,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7046,7 +6813,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -7073,7 +6839,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7091,7 +6856,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7117,7 +6881,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7142,7 +6905,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7160,7 +6922,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7186,7 +6947,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7211,7 +6971,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7229,7 +6988,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7255,7 +7013,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7290,7 +7047,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7309,7 +7065,6 @@ "ctxt": 0 }, "value": "D2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7331,6 +7086,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7347,8 +7103,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -7373,7 +7128,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7401,7 +7155,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -7427,7 +7180,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7452,7 +7204,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -7479,7 +7230,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7497,7 +7247,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7523,7 +7272,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7548,7 +7296,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7566,7 +7313,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7592,7 +7338,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7617,7 +7362,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7635,7 +7379,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7661,7 +7404,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7696,7 +7438,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7715,7 +7456,6 @@ "ctxt": 0 }, "value": "D3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7737,6 +7477,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7753,8 +7494,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -7779,7 +7519,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7807,7 +7546,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -7833,7 +7571,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7858,7 +7595,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -7885,7 +7621,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7903,7 +7638,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7929,7 +7663,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7954,7 +7687,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7972,7 +7704,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7998,7 +7729,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8023,7 +7753,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8041,7 +7770,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8067,7 +7795,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8102,7 +7829,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8121,7 +7847,6 @@ "ctxt": 0 }, "value": "D4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8143,6 +7868,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8159,8 +7885,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -8185,7 +7910,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8213,7 +7937,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -8239,7 +7962,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8264,7 +7986,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -8291,7 +8012,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8309,7 +8029,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8335,7 +8054,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8360,7 +8078,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8378,7 +8095,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8404,7 +8120,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8429,7 +8144,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8447,7 +8161,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8473,7 +8186,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8508,7 +8220,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8527,7 +8238,6 @@ "ctxt": 0 }, "value": "D5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8549,6 +8259,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8565,8 +8276,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -8591,7 +8301,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8619,7 +8328,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -8645,7 +8353,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8670,7 +8377,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -8697,7 +8403,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8715,7 +8420,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8741,7 +8445,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8766,7 +8469,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8784,7 +8486,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8810,7 +8511,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8835,7 +8535,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8853,7 +8552,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8879,7 +8577,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8914,7 +8611,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8933,7 +8629,6 @@ "ctxt": 0 }, "value": "D6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8955,6 +8650,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8971,8 +8667,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -8997,7 +8692,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9025,7 +8719,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -9051,7 +8744,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9076,7 +8768,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -9103,7 +8794,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9121,7 +8811,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9147,7 +8836,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9172,7 +8860,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9190,7 +8877,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9216,7 +8902,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9241,7 +8926,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9259,7 +8943,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9285,7 +8968,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9320,7 +9002,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9339,7 +9020,6 @@ "ctxt": 0 }, "value": "D7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9361,6 +9041,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9377,8 +9058,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -9403,7 +9083,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9431,7 +9110,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -9457,7 +9135,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9482,7 +9159,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -9509,7 +9185,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9527,7 +9202,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9553,7 +9227,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9578,7 +9251,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9596,7 +9268,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9622,7 +9293,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9647,7 +9317,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9665,7 +9334,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9691,7 +9359,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9726,7 +9393,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9745,7 +9411,6 @@ "ctxt": 0 }, "value": "D8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9767,6 +9432,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9783,8 +9449,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -9809,7 +9474,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9837,7 +9501,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -9863,7 +9526,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9888,7 +9550,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -9915,7 +9576,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9933,7 +9593,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9959,7 +9618,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9984,7 +9642,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10002,7 +9659,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10028,7 +9684,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10053,7 +9708,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10071,7 +9725,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10097,7 +9750,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10132,7 +9784,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10151,7 +9802,6 @@ "ctxt": 0 }, "value": "D9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10173,6 +9823,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10189,8 +9840,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -10215,7 +9865,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10243,7 +9892,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -10269,7 +9917,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10294,7 +9941,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -10321,7 +9967,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10339,7 +9984,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10365,7 +10009,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10390,7 +10033,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10408,7 +10050,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10434,7 +10075,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10459,7 +10099,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10477,7 +10116,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -10503,7 +10141,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10538,7 +10175,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfUnion/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfUnion/input.ts.json index 3a4b16741b0e..f9d0b562ec2f 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfUnion/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypesOfUnion/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, "optional": false }, "init": null @@ -84,7 +81,6 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -109,6 +105,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -125,8 +122,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -174,7 +170,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +195,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -248,7 +242,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -274,7 +267,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -300,7 +292,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -342,7 +333,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -363,7 +353,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -405,7 +394,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "body": { @@ -448,8 +436,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -478,7 +466,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -504,7 +491,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -559,7 +545,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "body": { @@ -602,8 +587,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -637,7 +622,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -664,7 +648,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -692,6 +675,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -708,8 +692,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -771,7 +754,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -813,7 +795,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -855,7 +836,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -897,7 +877,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -939,7 +918,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -968,7 +946,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -992,7 +969,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1021,7 +997,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1045,7 +1020,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1074,7 +1048,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1098,7 +1071,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1136,7 +1108,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1183,7 +1154,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1212,7 +1182,6 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1236,7 +1205,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1265,7 +1233,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1289,7 +1256,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1318,7 +1284,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1360,7 +1325,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1390,8 +1354,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeParams": null, @@ -1432,7 +1396,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1462,6 +1425,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1484,13 +1448,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -1516,7 +1478,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1546,7 +1507,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1572,7 +1532,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1601,7 +1560,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -1624,7 +1582,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1653,7 +1610,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -1676,7 +1632,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1705,7 +1660,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1729,7 +1683,6 @@ "ctxt": 0 }, "value": "foo17", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1758,7 +1711,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1782,7 +1734,6 @@ "ctxt": 0 }, "value": "foo18", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1826,7 +1777,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1853,7 +1803,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1881,6 +1830,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1897,8 +1847,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1931,7 +1880,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1971,7 +1919,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2013,7 +1960,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2055,7 +2001,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2097,7 +2042,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2139,7 +2083,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2168,7 +2111,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2192,7 +2134,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2221,7 +2162,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2245,7 +2185,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2274,7 +2213,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2298,7 +2236,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2336,7 +2273,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2383,7 +2319,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2412,7 +2347,6 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2436,7 +2370,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2465,7 +2398,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2489,7 +2421,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2518,7 +2449,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2560,7 +2490,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2590,8 +2519,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeParams": null, @@ -2632,7 +2561,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2662,6 +2590,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2684,13 +2613,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -2716,7 +2643,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2746,7 +2672,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2772,7 +2697,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2801,7 +2725,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -2824,7 +2747,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2853,7 +2775,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -2876,7 +2797,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2905,7 +2825,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2929,7 +2848,6 @@ "ctxt": 0 }, "value": "foo17", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2958,7 +2876,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2982,7 +2899,6 @@ "ctxt": 0 }, "value": "foo18", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures/input.ts.json index 2e69504b3c23..00df7ab49e8e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "CallSignature", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -65,6 +63,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -88,6 +87,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +104,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -127,8 +126,7 @@ } } } - }, - "optional": false + } } } ], @@ -164,7 +162,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false } } @@ -180,7 +177,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -201,6 +197,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -217,8 +214,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -275,8 +271,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -293,7 +289,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -315,6 +310,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -331,8 +327,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -382,8 +377,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -400,7 +395,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -422,6 +416,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -444,13 +439,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -492,7 +485,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -520,7 +512,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -541,6 +532,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -564,6 +556,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -580,8 +573,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -591,6 +583,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -607,8 +600,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -630,8 +622,7 @@ } } } - }, - "optional": false + } } } ], @@ -667,7 +658,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false } } @@ -683,7 +673,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -704,6 +693,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -720,8 +710,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -778,8 +767,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -796,7 +785,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -818,6 +806,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -834,8 +823,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -845,6 +833,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -861,8 +850,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -912,8 +900,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -930,7 +918,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -952,6 +939,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -974,13 +962,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1022,7 +1008,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures2/input.ts.json index 1ca1f0373124..bb38c7910160 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "OtherDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -284,7 +275,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": null, @@ -324,7 +314,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -342,7 +331,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -363,6 +351,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -386,6 +375,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -402,8 +392,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -433,8 +422,7 @@ } } } - }, - "optional": false + } } } ], @@ -470,7 +458,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -486,7 +473,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -507,6 +493,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -523,8 +510,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -566,7 +552,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -587,6 +572,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -610,6 +596,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -626,8 +613,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -657,8 +643,7 @@ } } } - }, - "optional": false + } } } ], @@ -694,7 +679,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -710,7 +694,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -731,6 +714,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -747,8 +731,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -790,7 +773,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -811,6 +793,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -834,6 +817,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -850,8 +834,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -873,8 +856,7 @@ } } } - }, - "optional": false + } } } ], @@ -910,7 +892,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -926,7 +907,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -947,6 +927,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -963,8 +944,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1006,7 +986,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1027,6 +1006,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1050,6 +1030,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1066,8 +1047,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1077,6 +1057,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1093,8 +1074,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1116,8 +1096,7 @@ } } } - }, - "optional": false + } } } ], @@ -1153,7 +1132,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1169,7 +1147,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1190,6 +1167,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1206,8 +1184,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1249,7 +1226,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1270,6 +1246,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1293,6 +1270,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1316,6 +1294,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1332,8 +1311,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -1355,8 +1333,7 @@ } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1378,8 +1355,7 @@ } } } - }, - "optional": false + } } } ], @@ -1415,7 +1391,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1431,7 +1406,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1452,6 +1426,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1468,8 +1443,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1511,7 +1485,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1532,6 +1505,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1555,6 +1529,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1578,6 +1553,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1600,13 +1576,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1632,15 +1606,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1666,15 +1638,13 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -1710,7 +1680,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1726,7 +1695,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1747,6 +1715,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1763,8 +1732,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1806,7 +1774,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1827,6 +1794,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1850,6 +1818,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1873,6 +1842,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1895,13 +1865,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1927,15 +1895,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1962,6 +1928,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1984,13 +1951,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2016,7 +1981,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2025,8 +1989,7 @@ } } } - }, - "optional": false + } } } ], @@ -2062,7 +2025,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2078,7 +2040,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2099,6 +2060,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2115,8 +2077,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2158,7 +2119,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2179,6 +2139,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2202,6 +2163,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2225,6 +2187,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2247,13 +2210,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2279,15 +2240,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -2297,6 +2256,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2320,6 +2280,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2342,13 +2303,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2374,15 +2333,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -2409,6 +2366,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2431,13 +2389,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2463,7 +2419,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2472,8 +2427,7 @@ } } } - }, - "optional": false + } } } ], @@ -2509,7 +2463,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2525,7 +2478,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2546,6 +2498,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2562,8 +2515,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2605,7 +2557,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2626,6 +2577,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2649,6 +2601,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2672,6 +2625,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2694,13 +2648,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2726,15 +2678,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -2744,6 +2694,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2767,6 +2718,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2789,13 +2741,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2821,15 +2771,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -2856,6 +2804,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2878,13 +2827,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2910,7 +2857,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2919,8 +2865,7 @@ } } } - }, - "optional": false + } } } ], @@ -2956,7 +2901,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2972,7 +2916,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2993,6 +2936,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3009,8 +2953,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3052,7 +2995,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3073,6 +3015,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3108,8 +3051,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -3140,7 +3083,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3172,15 +3114,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -3216,7 +3156,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3232,7 +3171,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3253,6 +3191,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3269,8 +3208,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3312,7 +3250,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3333,6 +3270,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3356,6 +3294,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3387,7 +3326,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3415,8 +3353,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -3426,6 +3363,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3457,7 +3395,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3499,7 +3436,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3527,8 +3463,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -3554,15 +3489,13 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -3598,7 +3531,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3614,7 +3546,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3635,6 +3566,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3651,8 +3583,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3694,7 +3625,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3715,6 +3645,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3738,6 +3669,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3760,7 +3692,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3786,7 +3717,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3794,8 +3724,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -3805,6 +3734,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3827,7 +3757,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3853,7 +3782,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3861,8 +3789,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -3888,7 +3815,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3914,7 +3840,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3924,8 +3849,7 @@ } } } - }, - "optional": false + } } } ], @@ -3961,7 +3885,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3977,7 +3900,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3998,6 +3920,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4014,8 +3937,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4057,7 +3979,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4078,6 +3999,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4101,6 +4023,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4123,7 +4046,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4149,7 +4071,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4157,8 +4078,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -4168,6 +4088,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4190,7 +4111,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4216,7 +4136,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4224,8 +4143,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -4251,7 +4169,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4277,7 +4194,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4287,8 +4203,7 @@ } } } - }, - "optional": false + } } } ], @@ -4324,7 +4239,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4340,7 +4254,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4361,6 +4274,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4377,8 +4291,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4420,7 +4333,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4441,6 +4353,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4464,6 +4377,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4495,7 +4409,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4537,7 +4450,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4565,8 +4477,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -4592,15 +4503,13 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -4636,7 +4545,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4652,7 +4560,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4673,6 +4580,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4689,8 +4597,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4732,7 +4639,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4753,6 +4659,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4784,6 +4691,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4800,8 +4708,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4847,6 +4754,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4863,8 +4771,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4896,8 +4803,7 @@ } ] } - }, - "optional": false + } } } ], @@ -4933,7 +4839,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4949,7 +4854,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4970,6 +4874,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4986,8 +4891,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5029,7 +4933,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5050,6 +4953,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5081,6 +4985,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5103,13 +5008,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -5160,7 +5063,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5178,7 +5080,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5204,6 +5105,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5226,13 +5128,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -5283,7 +5183,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5301,7 +5200,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5313,8 +5211,7 @@ } ] } - }, - "optional": false + } } } ], @@ -5350,7 +5247,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -5366,7 +5262,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5387,6 +5282,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5403,8 +5299,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5446,7 +5341,6 @@ "ctxt": 0 }, "value": "foo17", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5467,6 +5361,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5498,6 +5393,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5521,6 +5417,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5537,8 +5434,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -5560,8 +5456,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -5607,6 +5502,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5630,6 +5526,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5646,8 +5543,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -5669,8 +5565,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -5702,8 +5597,7 @@ } ] } - }, - "optional": false + } } } ], @@ -5739,7 +5633,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -5755,7 +5648,6 @@ "ctxt": 0 }, "value": "foo17", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5776,6 +5668,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5792,8 +5685,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5835,7 +5727,6 @@ "ctxt": 0 }, "value": "foo18", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5856,6 +5747,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5887,6 +5779,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5918,6 +5811,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5934,8 +5828,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -5973,6 +5866,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5989,8 +5883,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -6014,8 +5907,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -6061,6 +5953,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6092,6 +5985,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6108,8 +6002,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -6147,6 +6040,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6169,13 +6063,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -6200,7 +6092,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6210,8 +6101,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -6243,8 +6133,7 @@ } ] } - }, - "optional": false + } } } ], @@ -6280,7 +6169,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -6296,7 +6184,6 @@ "ctxt": 0 }, "value": "foo18", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -6317,6 +6204,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6333,8 +6221,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -6391,8 +6278,8 @@ "ctxt": 0 }, "value": "r1arg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -6410,6 +6297,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6432,13 +6320,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -6459,7 +6345,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -6490,7 +6375,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6529,8 +6413,8 @@ "ctxt": 0 }, "value": "r1arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -6548,6 +6432,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6564,8 +6449,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -6624,8 +6508,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6642,7 +6526,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6656,7 +6539,6 @@ "ctxt": 0 }, "value": "r1arg1", - "typeAnnotation": null, "optional": false } } @@ -6692,8 +6574,8 @@ "ctxt": 0 }, "value": "r1a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -6713,7 +6595,6 @@ "ctxt": 0 }, "value": "r1arg2", - "typeAnnotation": null, "optional": false } }, @@ -6727,7 +6608,6 @@ "ctxt": 0 }, "value": "r1arg1", - "typeAnnotation": null, "optional": false } } @@ -6762,8 +6642,8 @@ "ctxt": 0 }, "value": "r1b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -6783,7 +6663,6 @@ "ctxt": 0 }, "value": "r1arg1", - "typeAnnotation": null, "optional": false } }, @@ -6797,7 +6676,6 @@ "ctxt": 0 }, "value": "r1arg2", - "typeAnnotation": null, "optional": false } } @@ -6832,8 +6710,8 @@ "ctxt": 0 }, "value": "r2arg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -6851,6 +6729,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6873,13 +6752,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -6934,7 +6811,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6973,8 +6849,8 @@ "ctxt": 0 }, "value": "r2arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -6992,6 +6868,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7008,8 +6885,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -7073,8 +6949,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7091,7 +6967,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7105,7 +6980,6 @@ "ctxt": 0 }, "value": "r2arg1", - "typeAnnotation": null, "optional": false } } @@ -7141,8 +7015,8 @@ "ctxt": 0 }, "value": "r2a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -7162,7 +7036,6 @@ "ctxt": 0 }, "value": "r2arg1", - "typeAnnotation": null, "optional": false } }, @@ -7176,7 +7049,6 @@ "ctxt": 0 }, "value": "r2arg2", - "typeAnnotation": null, "optional": false } } @@ -7211,8 +7083,8 @@ "ctxt": 0 }, "value": "r2b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -7232,7 +7104,6 @@ "ctxt": 0 }, "value": "r2arg2", - "typeAnnotation": null, "optional": false } }, @@ -7246,7 +7117,6 @@ "ctxt": 0 }, "value": "r2arg1", - "typeAnnotation": null, "optional": false } } @@ -7281,8 +7151,8 @@ "ctxt": 0 }, "value": "r3arg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -7300,6 +7170,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7322,13 +7193,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -7339,7 +7208,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -7367,7 +7235,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7406,8 +7273,8 @@ "ctxt": 0 }, "value": "r3arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -7425,6 +7292,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7441,8 +7309,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -7488,8 +7355,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7506,7 +7373,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7520,7 +7386,6 @@ "ctxt": 0 }, "value": "r3arg1", - "typeAnnotation": null, "optional": false } } @@ -7556,8 +7421,8 @@ "ctxt": 0 }, "value": "r3a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -7577,7 +7442,6 @@ "ctxt": 0 }, "value": "r3arg1", - "typeAnnotation": null, "optional": false } }, @@ -7591,7 +7455,6 @@ "ctxt": 0 }, "value": "r3arg2", - "typeAnnotation": null, "optional": false } } @@ -7626,8 +7489,8 @@ "ctxt": 0 }, "value": "r3b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -7647,7 +7510,6 @@ "ctxt": 0 }, "value": "r3arg2", - "typeAnnotation": null, "optional": false } }, @@ -7661,7 +7523,6 @@ "ctxt": 0 }, "value": "r3arg1", - "typeAnnotation": null, "optional": false } } @@ -7696,8 +7557,8 @@ "ctxt": 0 }, "value": "r4arg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -7715,6 +7576,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7737,13 +7599,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -7753,6 +7613,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7775,13 +7636,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -7792,7 +7651,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -7820,7 +7678,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7841,7 +7698,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7880,8 +7736,8 @@ "ctxt": 0 }, "value": "r4arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -7899,6 +7755,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7915,8 +7772,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -7926,6 +7782,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7942,8 +7799,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -7994,8 +7850,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -8012,7 +7868,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8026,7 +7881,6 @@ "ctxt": 0 }, "value": "r4arg1", - "typeAnnotation": null, "optional": false } } @@ -8062,8 +7916,8 @@ "ctxt": 0 }, "value": "r4a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -8083,7 +7937,6 @@ "ctxt": 0 }, "value": "r4arg1", - "typeAnnotation": null, "optional": false } }, @@ -8097,7 +7950,6 @@ "ctxt": 0 }, "value": "r4arg2", - "typeAnnotation": null, "optional": false } } @@ -8132,8 +7984,8 @@ "ctxt": 0 }, "value": "r4b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -8153,7 +8005,6 @@ "ctxt": 0 }, "value": "r4arg2", - "typeAnnotation": null, "optional": false } }, @@ -8167,7 +8018,6 @@ "ctxt": 0 }, "value": "r4arg1", - "typeAnnotation": null, "optional": false } } @@ -8202,8 +8052,8 @@ "ctxt": 0 }, "value": "r5arg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -8221,6 +8071,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8244,6 +8095,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8266,13 +8118,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -8298,15 +8148,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "body": { @@ -8339,7 +8187,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8370,7 +8217,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8391,7 +8237,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8430,8 +8275,8 @@ "ctxt": 0 }, "value": "r5arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -8449,6 +8294,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8472,6 +8318,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8488,8 +8335,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -8511,8 +8357,7 @@ } } } - }, - "optional": false + } } ], "body": { @@ -8563,8 +8408,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -8581,7 +8426,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8595,7 +8439,6 @@ "ctxt": 0 }, "value": "r5arg1", - "typeAnnotation": null, "optional": false } } @@ -8631,8 +8474,8 @@ "ctxt": 0 }, "value": "r5a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -8652,7 +8495,6 @@ "ctxt": 0 }, "value": "r5arg1", - "typeAnnotation": null, "optional": false } }, @@ -8666,7 +8508,6 @@ "ctxt": 0 }, "value": "r5arg2", - "typeAnnotation": null, "optional": false } } @@ -8701,8 +8542,8 @@ "ctxt": 0 }, "value": "r5b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -8722,7 +8563,6 @@ "ctxt": 0 }, "value": "r5arg2", - "typeAnnotation": null, "optional": false } }, @@ -8736,7 +8576,6 @@ "ctxt": 0 }, "value": "r5arg1", - "typeAnnotation": null, "optional": false } } @@ -8771,8 +8610,8 @@ "ctxt": 0 }, "value": "r6arg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -8790,6 +8629,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8813,6 +8653,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8835,13 +8676,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -8867,15 +8706,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "body": { @@ -8908,7 +8745,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8939,7 +8775,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8957,7 +8792,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8979,7 +8813,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8997,7 +8830,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9037,8 +8869,8 @@ "ctxt": 0 }, "value": "r6arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -9056,6 +8888,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9079,6 +8912,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9101,13 +8935,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -9133,15 +8965,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "body": { @@ -9174,7 +9004,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9214,8 +9043,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9232,7 +9061,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9246,7 +9074,6 @@ "ctxt": 0 }, "value": "r6arg1", - "typeAnnotation": null, "optional": false } } @@ -9282,8 +9109,8 @@ "ctxt": 0 }, "value": "r6a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -9303,7 +9130,6 @@ "ctxt": 0 }, "value": "r6arg1", - "typeAnnotation": null, "optional": false } }, @@ -9317,7 +9143,6 @@ "ctxt": 0 }, "value": "r6arg2", - "typeAnnotation": null, "optional": false } } @@ -9352,8 +9177,8 @@ "ctxt": 0 }, "value": "r6b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -9373,7 +9198,6 @@ "ctxt": 0 }, "value": "r6arg2", - "typeAnnotation": null, "optional": false } }, @@ -9387,7 +9211,6 @@ "ctxt": 0 }, "value": "r6arg1", - "typeAnnotation": null, "optional": false } } @@ -9422,8 +9245,8 @@ "ctxt": 0 }, "value": "r7arg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -9441,6 +9264,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9464,6 +9288,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9486,13 +9311,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -9518,15 +9341,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "body": { @@ -9545,6 +9366,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9567,13 +9389,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -9606,7 +9426,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9642,7 +9461,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9660,7 +9478,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9682,7 +9499,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9700,7 +9516,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9740,8 +9555,8 @@ "ctxt": 0 }, "value": "r7arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -9759,6 +9574,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9782,6 +9598,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9804,13 +9621,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -9836,15 +9651,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "body": { @@ -9863,6 +9676,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9885,13 +9699,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -9924,7 +9736,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9969,8 +9780,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9987,7 +9798,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -10001,7 +9811,6 @@ "ctxt": 0 }, "value": "r7arg1", - "typeAnnotation": null, "optional": false } } @@ -10037,8 +9846,8 @@ "ctxt": 0 }, "value": "r7a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -10058,7 +9867,6 @@ "ctxt": 0 }, "value": "r7arg1", - "typeAnnotation": null, "optional": false } }, @@ -10072,7 +9880,6 @@ "ctxt": 0 }, "value": "r7arg2", - "typeAnnotation": null, "optional": false } } @@ -10107,8 +9914,8 @@ "ctxt": 0 }, "value": "r7b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -10128,7 +9935,6 @@ "ctxt": 0 }, "value": "r7arg2", - "typeAnnotation": null, "optional": false } }, @@ -10142,7 +9948,6 @@ "ctxt": 0 }, "value": "r7arg1", - "typeAnnotation": null, "optional": false } } @@ -10177,8 +9982,8 @@ "ctxt": 0 }, "value": "r8arg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -10196,6 +10001,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10219,6 +10025,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10241,13 +10048,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -10273,15 +10078,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -10291,6 +10094,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10314,6 +10118,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10336,13 +10141,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -10368,15 +10171,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "body": { @@ -10395,6 +10196,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10417,13 +10219,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -10456,7 +10256,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10492,7 +10291,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10510,7 +10308,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10532,7 +10329,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10550,7 +10346,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10590,8 +10385,8 @@ "ctxt": 0 }, "value": "r8arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -10609,6 +10404,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10632,6 +10428,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10654,13 +10451,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -10686,15 +10481,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -10704,6 +10497,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10727,6 +10521,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10749,13 +10544,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -10781,15 +10574,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "body": { @@ -10808,6 +10599,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10830,13 +10622,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -10869,7 +10659,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10914,8 +10703,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -10932,7 +10721,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -10946,7 +10734,6 @@ "ctxt": 0 }, "value": "r8arg1", - "typeAnnotation": null, "optional": false } } @@ -10982,8 +10769,8 @@ "ctxt": 0 }, "value": "r8a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -11003,7 +10790,6 @@ "ctxt": 0 }, "value": "r8arg1", - "typeAnnotation": null, "optional": false } }, @@ -11017,7 +10803,6 @@ "ctxt": 0 }, "value": "r8arg2", - "typeAnnotation": null, "optional": false } } @@ -11052,8 +10837,8 @@ "ctxt": 0 }, "value": "r8b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -11073,7 +10858,6 @@ "ctxt": 0 }, "value": "r8arg2", - "typeAnnotation": null, "optional": false } }, @@ -11087,7 +10871,6 @@ "ctxt": 0 }, "value": "r8arg1", - "typeAnnotation": null, "optional": false } } @@ -11122,8 +10905,8 @@ "ctxt": 0 }, "value": "r9arg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -11141,6 +10924,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11164,6 +10948,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11186,13 +10971,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -11218,15 +11001,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -11236,6 +11017,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11259,6 +11041,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11290,7 +11073,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -11332,7 +11114,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -11360,8 +11141,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -11387,15 +11167,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "body": { @@ -11414,6 +11192,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11436,13 +11215,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -11475,7 +11252,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11511,7 +11287,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -11529,7 +11304,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11551,7 +11325,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -11569,7 +11342,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11609,8 +11381,8 @@ "ctxt": 0 }, "value": "r9arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -11628,6 +11400,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11651,6 +11424,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11673,13 +11447,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -11705,15 +11477,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -11723,6 +11493,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11746,6 +11517,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11768,13 +11540,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -11800,15 +11570,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "body": { @@ -11827,6 +11595,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11849,13 +11618,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -11888,7 +11655,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11933,8 +11699,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -11951,7 +11717,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -11965,7 +11730,6 @@ "ctxt": 0 }, "value": "r9arg1", - "typeAnnotation": null, "optional": false } } @@ -12001,8 +11765,8 @@ "ctxt": 0 }, "value": "r9a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -12022,7 +11786,6 @@ "ctxt": 0 }, "value": "r9arg1", - "typeAnnotation": null, "optional": false } }, @@ -12036,7 +11799,6 @@ "ctxt": 0 }, "value": "r9arg2", - "typeAnnotation": null, "optional": false } } @@ -12071,8 +11833,8 @@ "ctxt": 0 }, "value": "r9b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -12092,7 +11854,6 @@ "ctxt": 0 }, "value": "r9arg2", - "typeAnnotation": null, "optional": false } }, @@ -12106,7 +11867,6 @@ "ctxt": 0 }, "value": "r9arg1", - "typeAnnotation": null, "optional": false } } @@ -12141,8 +11901,8 @@ "ctxt": 0 }, "value": "r10arg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -12172,8 +11932,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -12204,7 +11964,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12228,7 +11987,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -12267,7 +12025,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -12285,7 +12042,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12325,8 +12081,8 @@ "ctxt": 0 }, "value": "r10arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -12356,8 +12112,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -12388,7 +12144,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12427,7 +12182,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12467,8 +12221,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -12485,7 +12239,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -12499,7 +12252,6 @@ "ctxt": 0 }, "value": "r10arg1", - "typeAnnotation": null, "optional": false } } @@ -12535,8 +12287,8 @@ "ctxt": 0 }, "value": "r10a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -12556,7 +12308,6 @@ "ctxt": 0 }, "value": "r10arg1", - "typeAnnotation": null, "optional": false } }, @@ -12570,7 +12321,6 @@ "ctxt": 0 }, "value": "r10arg2", - "typeAnnotation": null, "optional": false } } @@ -12605,8 +12355,8 @@ "ctxt": 0 }, "value": "r10b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -12626,7 +12376,6 @@ "ctxt": 0 }, "value": "r10arg2", - "typeAnnotation": null, "optional": false } }, @@ -12640,7 +12389,6 @@ "ctxt": 0 }, "value": "r10arg1", - "typeAnnotation": null, "optional": false } } @@ -12675,8 +12423,8 @@ "ctxt": 0 }, "value": "r11arg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -12694,6 +12442,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12716,13 +12465,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -12732,6 +12479,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12754,13 +12502,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -12771,7 +12517,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -12799,7 +12544,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -12817,7 +12561,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12857,8 +12600,8 @@ "ctxt": 0 }, "value": "r11arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -12876,6 +12619,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12907,7 +12651,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -12935,8 +12678,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -12946,6 +12688,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12977,7 +12720,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -13019,7 +12761,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -13047,8 +12788,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -13081,7 +12821,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13121,8 +12860,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -13139,7 +12878,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -13153,7 +12891,6 @@ "ctxt": 0 }, "value": "r11arg1", - "typeAnnotation": null, "optional": false } } @@ -13189,8 +12926,8 @@ "ctxt": 0 }, "value": "r11a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -13210,7 +12947,6 @@ "ctxt": 0 }, "value": "r11arg1", - "typeAnnotation": null, "optional": false } }, @@ -13224,7 +12960,6 @@ "ctxt": 0 }, "value": "r11arg2", - "typeAnnotation": null, "optional": false } } @@ -13259,8 +12994,8 @@ "ctxt": 0 }, "value": "r11b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -13280,7 +13015,6 @@ "ctxt": 0 }, "value": "r11arg2", - "typeAnnotation": null, "optional": false } }, @@ -13294,7 +13028,6 @@ "ctxt": 0 }, "value": "r11arg1", - "typeAnnotation": null, "optional": false } } @@ -13329,8 +13062,8 @@ "ctxt": 0 }, "value": "r12arg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -13348,6 +13081,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13370,7 +13104,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13396,7 +13129,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13404,8 +13136,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -13415,6 +13146,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13437,13 +13169,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -13476,7 +13206,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13502,7 +13231,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13536,7 +13264,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -13554,7 +13281,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13580,7 +13306,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13623,8 +13348,8 @@ "ctxt": 0 }, "value": "r12arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -13642,6 +13367,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13664,7 +13390,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13690,7 +13415,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13698,8 +13422,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -13709,6 +13432,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13731,7 +13455,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13757,7 +13480,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13765,8 +13487,7 @@ ] } } - }, - "optional": false + } } ], "body": { @@ -13799,7 +13520,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13825,7 +13545,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13868,8 +13587,8 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -13886,7 +13605,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -13900,7 +13618,6 @@ "ctxt": 0 }, "value": "r12arg1", - "typeAnnotation": null, "optional": false } } @@ -13936,8 +13653,8 @@ "ctxt": 0 }, "value": "r12a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -13957,7 +13674,6 @@ "ctxt": 0 }, "value": "r12arg1", - "typeAnnotation": null, "optional": false } }, @@ -13971,7 +13687,6 @@ "ctxt": 0 }, "value": "r12arg2", - "typeAnnotation": null, "optional": false } } @@ -14006,8 +13721,8 @@ "ctxt": 0 }, "value": "r12b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -14027,7 +13742,6 @@ "ctxt": 0 }, "value": "r12arg2", - "typeAnnotation": null, "optional": false } }, @@ -14041,7 +13755,6 @@ "ctxt": 0 }, "value": "r12arg1", - "typeAnnotation": null, "optional": false } } @@ -14076,8 +13789,8 @@ "ctxt": 0 }, "value": "r13arg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -14095,6 +13808,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -14117,7 +13831,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14143,7 +13856,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14151,8 +13863,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -14162,6 +13873,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -14184,13 +13896,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -14201,7 +13911,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "async": false, @@ -14229,7 +13938,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -14247,7 +13955,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14273,7 +13980,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14316,8 +14022,8 @@ "ctxt": 0 }, "value": "r13arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -14335,6 +14041,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -14357,7 +14064,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14383,7 +14089,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14391,8 +14096,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -14402,6 +14106,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -14424,7 +14129,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14450,7 +14154,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14458,8 +14161,7 @@ ] } } - }, - "optional": false + } } ], "body": { @@ -14492,7 +14194,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14518,7 +14219,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14561,8 +14261,8 @@ "ctxt": 0 }, "value": "r13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -14579,7 +14279,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -14593,7 +14292,6 @@ "ctxt": 0 }, "value": "r13arg1", - "typeAnnotation": null, "optional": false } } @@ -14629,8 +14327,8 @@ "ctxt": 0 }, "value": "r13a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -14650,7 +14348,6 @@ "ctxt": 0 }, "value": "r13arg1", - "typeAnnotation": null, "optional": false } }, @@ -14664,7 +14361,6 @@ "ctxt": 0 }, "value": "r13arg2", - "typeAnnotation": null, "optional": false } } @@ -14699,8 +14395,8 @@ "ctxt": 0 }, "value": "r13b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -14720,7 +14416,6 @@ "ctxt": 0 }, "value": "r13arg2", - "typeAnnotation": null, "optional": false } }, @@ -14734,7 +14429,6 @@ "ctxt": 0 }, "value": "r13arg1", - "typeAnnotation": null, "optional": false } } @@ -14769,8 +14463,8 @@ "ctxt": 0 }, "value": "r14arg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -14788,6 +14482,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -14819,7 +14514,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -14848,7 +14542,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14872,7 +14565,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -14901,7 +14593,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14911,8 +14602,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -14930,7 +14620,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -14941,7 +14630,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -14971,7 +14659,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -15010,8 +14697,8 @@ "ctxt": 0 }, "value": "r14arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -15029,6 +14716,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -15060,7 +14748,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -15102,7 +14789,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -15130,8 +14816,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -15164,7 +14849,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -15204,8 +14888,8 @@ "ctxt": 0 }, "value": "r14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -15222,7 +14906,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -15236,7 +14919,6 @@ "ctxt": 0 }, "value": "r14arg1", - "typeAnnotation": null, "optional": false } } @@ -15272,8 +14954,8 @@ "ctxt": 0 }, "value": "r14a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -15293,7 +14975,6 @@ "ctxt": 0 }, "value": "r14arg1", - "typeAnnotation": null, "optional": false } }, @@ -15307,7 +14988,6 @@ "ctxt": 0 }, "value": "r14arg2", - "typeAnnotation": null, "optional": false } } @@ -15342,8 +15022,8 @@ "ctxt": 0 }, "value": "r14b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -15363,7 +15043,6 @@ "ctxt": 0 }, "value": "r14arg2", - "typeAnnotation": null, "optional": false } }, @@ -15377,7 +15056,6 @@ "ctxt": 0 }, "value": "r14arg1", - "typeAnnotation": null, "optional": false } } @@ -15412,8 +15090,8 @@ "ctxt": 0 }, "value": "r15arg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -15431,6 +15109,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -15453,13 +15132,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -15499,7 +15176,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -15531,7 +15207,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -15570,8 +15245,8 @@ "ctxt": 0 }, "value": "r15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -15588,7 +15263,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -15602,7 +15276,6 @@ "ctxt": 0 }, "value": "r15arg1", - "typeAnnotation": null, "optional": false } } @@ -15638,8 +15311,8 @@ "ctxt": 0 }, "value": "r16arg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -15657,6 +15330,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -15679,13 +15353,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -15735,7 +15407,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -15753,7 +15424,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -15793,8 +15463,8 @@ "ctxt": 0 }, "value": "r16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -15811,7 +15481,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -15825,7 +15494,6 @@ "ctxt": 0 }, "value": "r16arg1", - "typeAnnotation": null, "optional": false } } @@ -15861,8 +15529,8 @@ "ctxt": 0 }, "value": "r17arg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -15880,6 +15548,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -15903,6 +15572,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -15925,13 +15595,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -15957,15 +15625,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "body": { @@ -16005,7 +15671,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -16037,7 +15702,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -16076,8 +15740,8 @@ "ctxt": 0 }, "value": "r17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -16094,7 +15758,6 @@ "ctxt": 0 }, "value": "foo17", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -16108,7 +15771,6 @@ "ctxt": 0 }, "value": "r17arg1", - "typeAnnotation": null, "optional": false } } @@ -16144,8 +15806,8 @@ "ctxt": 0 }, "value": "r18arg1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -16163,6 +15825,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -16186,6 +15849,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -16208,13 +15872,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -16240,15 +15902,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "body": { @@ -16288,7 +15948,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -16320,7 +15979,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -16359,8 +16017,8 @@ "ctxt": 0 }, "value": "r18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -16377,7 +16035,6 @@ "ctxt": 0 }, "value": "foo18", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -16391,7 +16048,6 @@ "ctxt": 0 }, "value": "r18arg1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures3/input.ts.json index d99c3db18223..336753d2d68b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures3/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Errors", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -118,7 +115,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -144,7 +140,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -202,7 +196,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -228,7 +221,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -268,7 +260,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -286,7 +277,6 @@ "ctxt": 0 }, "value": "OtherDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -312,7 +302,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": null, @@ -352,7 +341,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -370,7 +358,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -391,6 +378,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -414,6 +402,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -430,8 +419,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -461,8 +449,7 @@ } } } - }, - "optional": false + } } } ], @@ -498,7 +485,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -514,7 +500,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -535,6 +520,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -551,8 +537,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -594,7 +579,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -615,6 +599,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -638,6 +623,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -661,6 +647,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -683,13 +670,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -715,15 +700,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -750,6 +733,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -772,13 +756,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -804,7 +786,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -813,8 +794,7 @@ } } } - }, - "optional": false + } } } ], @@ -850,7 +830,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -866,7 +845,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -887,6 +865,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -903,8 +882,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -946,7 +924,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -967,6 +944,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -990,6 +968,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1013,6 +992,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1035,13 +1015,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1067,15 +1045,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -1085,6 +1061,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1108,6 +1085,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1130,13 +1108,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1162,15 +1138,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1197,6 +1171,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1219,13 +1194,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1251,7 +1224,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1260,8 +1232,7 @@ } } } - }, - "optional": false + } } } ], @@ -1297,7 +1268,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1313,7 +1283,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1334,6 +1303,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1350,8 +1320,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1393,7 +1362,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1414,6 +1382,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1449,8 +1418,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1481,7 +1450,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1513,15 +1481,13 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -1557,7 +1523,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1573,7 +1538,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1594,6 +1558,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1610,8 +1575,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1653,7 +1617,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1674,6 +1637,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1697,6 +1661,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1728,7 +1693,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1756,8 +1720,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -1767,6 +1730,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1798,7 +1762,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1840,7 +1803,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1868,8 +1830,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -1895,15 +1856,13 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -1939,7 +1898,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1955,7 +1913,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1976,6 +1933,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1992,8 +1950,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2035,7 +1992,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2056,6 +2012,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2079,6 +2036,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2101,7 +2059,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2127,7 +2084,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2135,8 +2091,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -2146,6 +2101,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2168,7 +2124,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2194,7 +2149,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2202,8 +2156,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -2229,7 +2182,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2255,7 +2207,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2265,8 +2216,7 @@ } } } - }, - "optional": false + } } } ], @@ -2302,7 +2252,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -2318,7 +2267,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2339,6 +2287,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2355,8 +2304,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2398,7 +2346,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2419,6 +2366,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2442,6 +2390,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2473,7 +2422,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2515,7 +2463,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2543,8 +2490,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -2566,8 +2512,7 @@ } } } - }, - "optional": false + } } } ], @@ -2603,7 +2548,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -2619,7 +2563,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2640,6 +2583,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2656,8 +2600,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2699,7 +2642,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2720,6 +2662,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2751,6 +2694,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2782,6 +2726,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2798,8 +2743,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2837,6 +2781,7 @@ "ctxt": 0 }, "value": "a", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2853,8 +2798,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -2878,8 +2822,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2925,6 +2868,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2956,6 +2900,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2972,8 +2917,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3011,6 +2955,7 @@ "ctxt": 0 }, "value": "a", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3027,8 +2972,7 @@ }, "kind": "boolean" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -3052,8 +2996,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3085,8 +3028,7 @@ } ] } - }, - "optional": false + } } } ], @@ -3122,7 +3064,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -3138,7 +3079,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3159,6 +3099,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3175,8 +3116,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3218,7 +3158,6 @@ "ctxt": 0 }, "value": "foo17", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3239,6 +3178,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3270,6 +3210,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3301,6 +3242,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3323,13 +3265,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3354,7 +3294,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3383,7 +3322,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3401,7 +3339,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3427,6 +3364,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3449,13 +3387,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3480,7 +3416,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3509,7 +3444,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3527,7 +3461,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3539,8 +3472,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3586,6 +3518,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3617,6 +3550,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3639,13 +3573,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3670,7 +3602,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3699,7 +3630,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3717,7 +3647,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3743,6 +3672,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3765,13 +3695,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3796,7 +3724,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3825,7 +3752,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3843,7 +3769,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3855,8 +3780,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3888,8 +3812,7 @@ } ] } - }, - "optional": false + } } } ], @@ -3925,7 +3848,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -3941,7 +3863,6 @@ "ctxt": 0 }, "value": "foo17", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3962,6 +3883,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3978,8 +3900,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4036,8 +3957,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4054,7 +3975,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4076,6 +3996,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4098,13 +4019,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -4144,7 +4063,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4176,7 +4094,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4197,7 +4114,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4240,8 +4156,8 @@ "ctxt": 0 }, "value": "r1a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -4269,6 +4185,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4285,8 +4202,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -4340,6 +4256,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4362,13 +4279,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -4408,7 +4323,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4440,7 +4354,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4461,7 +4374,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4503,8 +4415,8 @@ "ctxt": 0 }, "value": "r1b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -4532,6 +4444,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4554,13 +4467,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -4600,7 +4511,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4632,7 +4542,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4653,7 +4562,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4682,6 +4590,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4698,8 +4607,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -4766,8 +4674,8 @@ "ctxt": 0 }, "value": "r2arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -4785,6 +4693,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4808,6 +4717,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4830,13 +4740,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4862,15 +4770,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "body": { @@ -4889,6 +4795,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4911,13 +4818,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -4950,7 +4855,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4986,7 +4890,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5004,7 +4907,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5026,7 +4928,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5044,7 +4945,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5066,7 +4966,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5084,7 +4983,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5124,8 +5022,8 @@ "ctxt": 0 }, "value": "r2arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -5143,6 +5041,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5166,6 +5065,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5188,13 +5088,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5220,15 +5118,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "body": { @@ -5247,6 +5143,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5269,13 +5166,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -5308,7 +5203,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5353,8 +5247,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5371,7 +5265,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5385,7 +5278,6 @@ "ctxt": 0 }, "value": "r2arg", - "typeAnnotation": null, "optional": false } } @@ -5421,8 +5313,8 @@ "ctxt": 0 }, "value": "r2a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -5442,7 +5334,6 @@ "ctxt": 0 }, "value": "r2arg2", - "typeAnnotation": null, "optional": false } }, @@ -5456,7 +5347,6 @@ "ctxt": 0 }, "value": "r2arg", - "typeAnnotation": null, "optional": false } } @@ -5491,8 +5381,8 @@ "ctxt": 0 }, "value": "r2b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -5512,7 +5402,6 @@ "ctxt": 0 }, "value": "r2arg", - "typeAnnotation": null, "optional": false } }, @@ -5526,7 +5415,6 @@ "ctxt": 0 }, "value": "r2arg2", - "typeAnnotation": null, "optional": false } } @@ -5561,8 +5449,8 @@ "ctxt": 0 }, "value": "r3arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -5580,6 +5468,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5603,6 +5492,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5625,13 +5515,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5657,15 +5545,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -5675,6 +5561,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5698,6 +5585,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5729,7 +5617,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5757,8 +5644,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -5784,15 +5670,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "body": { @@ -5811,6 +5695,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5833,13 +5718,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -5872,7 +5755,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5908,7 +5790,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5926,7 +5807,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5948,7 +5828,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5966,7 +5845,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6006,8 +5884,8 @@ "ctxt": 0 }, "value": "r3arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -6025,6 +5903,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6048,6 +5927,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6070,13 +5950,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6102,15 +5980,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -6120,6 +5996,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6143,6 +6020,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6165,13 +6043,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6197,15 +6073,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "body": { @@ -6224,6 +6098,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6246,13 +6121,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -6285,7 +6158,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6330,8 +6202,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6348,7 +6220,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6362,7 +6233,6 @@ "ctxt": 0 }, "value": "r3arg", - "typeAnnotation": null, "optional": false } } @@ -6398,8 +6268,8 @@ "ctxt": 0 }, "value": "r3a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -6419,7 +6289,6 @@ "ctxt": 0 }, "value": "r3arg2", - "typeAnnotation": null, "optional": false } }, @@ -6433,7 +6302,6 @@ "ctxt": 0 }, "value": "r3arg", - "typeAnnotation": null, "optional": false } } @@ -6468,8 +6336,8 @@ "ctxt": 0 }, "value": "r3b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -6489,7 +6357,6 @@ "ctxt": 0 }, "value": "r3arg", - "typeAnnotation": null, "optional": false } }, @@ -6503,7 +6370,6 @@ "ctxt": 0 }, "value": "r3arg2", - "typeAnnotation": null, "optional": false } } @@ -6538,8 +6404,8 @@ "ctxt": 0 }, "value": "r4arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -6569,8 +6435,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -6601,7 +6467,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6640,7 +6505,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6671,7 +6535,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6689,7 +6552,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6729,8 +6591,8 @@ "ctxt": 0 }, "value": "r4arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -6760,8 +6622,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -6792,7 +6654,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6831,7 +6692,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6871,8 +6731,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6889,7 +6749,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6903,7 +6762,6 @@ "ctxt": 0 }, "value": "r4arg", - "typeAnnotation": null, "optional": false } } @@ -6939,8 +6797,8 @@ "ctxt": 0 }, "value": "r4a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -6960,7 +6818,6 @@ "ctxt": 0 }, "value": "r4arg2", - "typeAnnotation": null, "optional": false } }, @@ -6974,7 +6831,6 @@ "ctxt": 0 }, "value": "r4arg", - "typeAnnotation": null, "optional": false } } @@ -7009,8 +6865,8 @@ "ctxt": 0 }, "value": "r4b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -7030,7 +6886,6 @@ "ctxt": 0 }, "value": "r4arg", - "typeAnnotation": null, "optional": false } }, @@ -7044,7 +6899,6 @@ "ctxt": 0 }, "value": "r4arg2", - "typeAnnotation": null, "optional": false } } @@ -7079,8 +6933,8 @@ "ctxt": 0 }, "value": "r5arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -7098,6 +6952,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7120,13 +6975,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -7136,6 +6989,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7158,13 +7012,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -7197,7 +7049,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7228,7 +7079,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7246,7 +7096,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7286,8 +7135,8 @@ "ctxt": 0 }, "value": "r5arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -7305,6 +7154,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7336,7 +7186,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7364,8 +7213,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -7375,6 +7223,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7406,7 +7255,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7448,7 +7296,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7476,8 +7323,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -7510,7 +7356,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7550,8 +7395,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7568,7 +7413,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7582,7 +7426,6 @@ "ctxt": 0 }, "value": "r5arg", - "typeAnnotation": null, "optional": false } } @@ -7618,8 +7461,8 @@ "ctxt": 0 }, "value": "r5a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -7639,7 +7482,6 @@ "ctxt": 0 }, "value": "r5arg2", - "typeAnnotation": null, "optional": false } }, @@ -7653,7 +7495,6 @@ "ctxt": 0 }, "value": "r5arg", - "typeAnnotation": null, "optional": false } } @@ -7688,8 +7529,8 @@ "ctxt": 0 }, "value": "r5b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -7709,7 +7550,6 @@ "ctxt": 0 }, "value": "r5arg", - "typeAnnotation": null, "optional": false } }, @@ -7723,7 +7563,6 @@ "ctxt": 0 }, "value": "r5arg2", - "typeAnnotation": null, "optional": false } } @@ -7758,8 +7597,8 @@ "ctxt": 0 }, "value": "r6arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -7777,6 +7616,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7799,7 +7639,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7825,7 +7664,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7833,8 +7671,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -7844,6 +7681,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7866,7 +7704,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7892,7 +7729,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7900,8 +7736,7 @@ ] } } - }, - "optional": false + } } ], "body": { @@ -7934,7 +7769,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7960,7 +7794,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8003,8 +7836,8 @@ "ctxt": 0 }, "value": "r6arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -8022,6 +7855,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8044,7 +7878,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8070,7 +7903,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8078,8 +7910,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -8089,6 +7920,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8111,7 +7943,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8137,7 +7968,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8145,8 +7975,7 @@ ] } } - }, - "optional": false + } } ], "body": { @@ -8179,7 +8008,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8210,7 +8038,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -8228,7 +8055,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8254,7 +8080,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8297,8 +8122,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -8315,7 +8140,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8329,7 +8153,6 @@ "ctxt": 0 }, "value": "r6arg", - "typeAnnotation": null, "optional": false } } @@ -8365,8 +8188,8 @@ "ctxt": 0 }, "value": "r6a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -8386,7 +8209,6 @@ "ctxt": 0 }, "value": "r6arg2", - "typeAnnotation": null, "optional": false } }, @@ -8400,7 +8222,6 @@ "ctxt": 0 }, "value": "r6arg", - "typeAnnotation": null, "optional": false } } @@ -8435,8 +8256,8 @@ "ctxt": 0 }, "value": "r6b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -8456,7 +8277,6 @@ "ctxt": 0 }, "value": "r6arg", - "typeAnnotation": null, "optional": false } }, @@ -8470,7 +8290,6 @@ "ctxt": 0 }, "value": "r6arg2", - "typeAnnotation": null, "optional": false } } @@ -8505,8 +8324,8 @@ "ctxt": 0 }, "value": "r7arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -8524,6 +8343,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8555,7 +8375,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8584,7 +8403,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8608,7 +8426,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8637,7 +8454,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8647,8 +8463,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -8681,7 +8496,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8712,7 +8526,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8751,8 +8564,8 @@ "ctxt": 0 }, "value": "r7arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -8770,6 +8583,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8801,7 +8615,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8843,7 +8656,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8871,8 +8683,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -8918,8 +8729,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -8936,7 +8747,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8950,7 +8760,6 @@ "ctxt": 0 }, "value": "r7arg", - "typeAnnotation": null, "optional": false } } @@ -8986,8 +8795,8 @@ "ctxt": 0 }, "value": "r7a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -9007,7 +8816,6 @@ "ctxt": 0 }, "value": "r7arg2", - "typeAnnotation": null, "optional": false } }, @@ -9021,7 +8829,6 @@ "ctxt": 0 }, "value": "r7arg", - "typeAnnotation": null, "optional": false } } @@ -9056,8 +8863,8 @@ "ctxt": 0 }, "value": "r7b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -9077,7 +8884,6 @@ "ctxt": 0 }, "value": "r7arg", - "typeAnnotation": null, "optional": false } }, @@ -9091,7 +8897,6 @@ "ctxt": 0 }, "value": "r7arg2", - "typeAnnotation": null, "optional": false } } @@ -9126,8 +8931,8 @@ "ctxt": 0 }, "value": "r7arg3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -9145,6 +8950,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9176,7 +8982,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9205,7 +9010,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9229,7 +9033,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9258,7 +9061,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9268,8 +9070,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -9306,7 +9107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9324,7 +9124,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9364,8 +9163,8 @@ "ctxt": 0 }, "value": "r7c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9382,7 +9181,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9396,7 +9194,6 @@ "ctxt": 0 }, "value": "r7arg3", - "typeAnnotation": null, "optional": false } } @@ -9432,8 +9229,8 @@ "ctxt": 0 }, "value": "r7d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -9453,7 +9250,6 @@ "ctxt": 0 }, "value": "r7arg2", - "typeAnnotation": null, "optional": false } }, @@ -9467,7 +9263,6 @@ "ctxt": 0 }, "value": "r7arg3", - "typeAnnotation": null, "optional": false } } @@ -9502,8 +9297,8 @@ "ctxt": 0 }, "value": "r7e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -9523,7 +9318,6 @@ "ctxt": 0 }, "value": "r7arg3", - "typeAnnotation": null, "optional": false } }, @@ -9537,7 +9331,6 @@ "ctxt": 0 }, "value": "r7arg2", - "typeAnnotation": null, "optional": false } } @@ -9572,8 +9365,8 @@ "ctxt": 0 }, "value": "r8arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -9591,6 +9384,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9614,6 +9408,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9636,13 +9431,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -9668,15 +9461,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "body": { @@ -9716,7 +9507,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9748,7 +9538,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9787,8 +9576,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9805,7 +9594,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9819,7 +9607,6 @@ "ctxt": 0 }, "value": "r8arg", - "typeAnnotation": null, "optional": false } } @@ -9855,8 +9642,8 @@ "ctxt": 0 }, "value": "r9arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -9874,6 +9661,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9897,6 +9685,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9919,13 +9708,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -9951,15 +9738,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "body": { @@ -10020,7 +9805,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10059,8 +9843,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -10077,7 +9861,6 @@ "ctxt": 0 }, "value": "foo17", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -10091,7 +9874,6 @@ "ctxt": 0 }, "value": "r9arg", - "typeAnnotation": null, "optional": false } } @@ -10122,7 +9904,6 @@ "ctxt": 0 }, "value": "WithGenericSignaturesInBaseType", - "typeAnnotation": null, "optional": false }, "body": { @@ -10143,7 +9924,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -10164,6 +9944,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10187,6 +9968,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10209,13 +9991,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -10241,7 +10021,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10278,7 +10057,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10286,8 +10064,7 @@ } } } - }, - "optional": false + } } } ], @@ -10323,7 +10100,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -10339,7 +10115,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -10360,6 +10135,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10376,8 +10152,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -10434,8 +10209,8 @@ "ctxt": 0 }, "value": "r2arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -10453,6 +10228,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10475,13 +10251,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -10536,7 +10310,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10575,8 +10348,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -10593,7 +10366,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -10607,7 +10379,6 @@ "ctxt": 0 }, "value": "r2arg2", - "typeAnnotation": null, "optional": false } } @@ -10628,7 +10399,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -10649,6 +10419,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10672,6 +10443,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10694,13 +10466,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -10726,7 +10496,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10760,8 +10529,7 @@ } } } - }, - "optional": false + } } } ], @@ -10797,7 +10565,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -10813,7 +10580,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -10834,6 +10600,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10850,8 +10617,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -10908,8 +10674,8 @@ "ctxt": 0 }, "value": "r3arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -10927,6 +10693,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10949,13 +10716,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -10995,7 +10760,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11027,7 +10791,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -11066,8 +10829,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -11084,7 +10847,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -11098,7 +10860,6 @@ "ctxt": 0 }, "value": "r3arg2", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures4/input.ts.json index 7cd1f6fec3cb..f8caf9811fdd 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "OtherDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -284,7 +275,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": null, @@ -324,7 +314,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -342,7 +331,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -363,6 +351,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -386,6 +375,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -408,13 +398,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -440,7 +428,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -477,7 +464,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -485,8 +471,7 @@ } } } - }, - "optional": false + } } } ], @@ -512,7 +497,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -533,6 +517,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -549,8 +534,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -592,7 +576,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -613,6 +596,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -636,6 +620,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -658,13 +643,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -690,7 +673,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -724,8 +706,7 @@ } } } - }, - "optional": false + } } } ], @@ -751,7 +732,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -772,6 +752,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -788,8 +769,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -831,7 +811,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -852,6 +831,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -875,6 +855,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -897,13 +878,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -929,7 +908,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -955,8 +933,7 @@ } } } - }, - "optional": false + } } } ], @@ -982,7 +959,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1003,6 +979,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1019,8 +996,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1062,7 +1038,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1083,6 +1058,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1106,6 +1082,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1128,13 +1105,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1144,6 +1119,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1166,13 +1142,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -1198,7 +1172,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1219,7 +1192,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1245,8 +1217,7 @@ } } } - }, - "optional": false + } } } ], @@ -1272,7 +1243,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1293,6 +1263,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1309,8 +1280,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1352,7 +1322,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1373,6 +1342,7 @@ "ctxt": 0 }, "value": "a5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1396,6 +1366,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1419,6 +1390,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1441,13 +1413,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1473,15 +1443,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -1507,7 +1475,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1528,7 +1495,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1558,15 +1524,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -1592,7 +1556,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1613,6 +1576,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1629,8 +1593,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1672,7 +1635,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1693,6 +1655,7 @@ "ctxt": 0 }, "value": "a6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1716,6 +1679,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1739,6 +1703,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1761,13 +1726,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1793,15 +1756,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -1827,7 +1788,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1845,7 +1805,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1876,15 +1835,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -1910,7 +1867,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1931,6 +1887,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1947,8 +1904,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1990,7 +1946,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2011,6 +1966,7 @@ "ctxt": 0 }, "value": "a11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2034,6 +1990,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2065,7 +2022,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2094,7 +2050,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2104,8 +2059,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -2115,6 +2069,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2146,7 +2101,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2175,7 +2129,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2199,7 +2152,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2228,7 +2180,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2238,8 +2189,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -2265,7 +2215,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2295,15 +2244,13 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -2329,7 +2276,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2350,6 +2296,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2366,8 +2313,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2409,7 +2355,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2430,6 +2375,7 @@ "ctxt": 0 }, "value": "a15", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2453,6 +2399,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2484,7 +2431,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2513,7 +2459,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2537,7 +2482,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2566,7 +2510,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2576,8 +2519,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -2603,7 +2545,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2640,7 +2581,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2648,8 +2588,7 @@ } } } - }, - "optional": false + } } } ], @@ -2675,7 +2614,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2696,6 +2634,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2712,8 +2651,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2755,7 +2693,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2776,6 +2713,7 @@ "ctxt": 0 }, "value": "a16", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2799,6 +2737,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2830,7 +2769,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2859,7 +2797,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2883,7 +2820,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2912,7 +2848,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2922,8 +2857,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -2949,7 +2883,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2967,7 +2900,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3005,7 +2937,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3013,8 +2944,7 @@ } } } - }, - "optional": false + } } } ], @@ -3040,7 +2970,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3061,6 +2990,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3077,8 +3007,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3120,7 +3049,6 @@ "ctxt": 0 }, "value": "foo17", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3141,6 +3069,7 @@ "ctxt": 0 }, "value": "a17", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3172,6 +3101,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3195,6 +3125,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3217,13 +3148,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3249,15 +3178,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3289,7 +3216,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3319,7 +3245,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3337,7 +3262,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3363,6 +3287,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3386,6 +3311,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3408,13 +3334,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3440,15 +3364,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3480,7 +3402,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3510,7 +3431,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3528,7 +3448,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3540,8 +3459,7 @@ } ] } - }, - "optional": false + } } } ], @@ -3567,7 +3485,6 @@ "ctxt": 0 }, "value": "foo17", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3588,6 +3505,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3604,8 +3522,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3647,7 +3564,6 @@ "ctxt": 0 }, "value": "foo18", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3668,6 +3584,7 @@ "ctxt": 0 }, "value": "a18", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3699,6 +3616,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3730,6 +3648,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3752,13 +3671,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3783,7 +3700,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3812,7 +3728,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3830,7 +3745,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3856,6 +3770,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3878,13 +3793,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3909,7 +3822,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3938,7 +3850,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3956,7 +3867,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3968,8 +3878,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4015,6 +3924,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4046,6 +3956,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4068,13 +3979,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4099,7 +4008,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4128,7 +4036,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4146,7 +4053,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4172,6 +4078,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4194,13 +4101,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4225,7 +4130,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4254,7 +4158,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4272,7 +4175,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4284,8 +4186,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4317,8 +4218,7 @@ } ] } - }, - "optional": false + } } } ], @@ -4344,7 +4244,6 @@ "ctxt": 0 }, "value": "foo18", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4365,6 +4264,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4381,8 +4281,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4439,8 +4338,8 @@ "ctxt": 0 }, "value": "r1arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -4458,6 +4357,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4480,13 +4380,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -4526,7 +4424,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4558,7 +4455,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4597,8 +4493,8 @@ "ctxt": 0 }, "value": "r1arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -4616,6 +4512,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4638,13 +4535,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -4684,7 +4579,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4716,7 +4610,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4755,8 +4648,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4773,7 +4666,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4787,7 +4679,6 @@ "ctxt": 0 }, "value": "r1arg", - "typeAnnotation": null, "optional": false } } @@ -4823,8 +4714,8 @@ "ctxt": 0 }, "value": "r1a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -4844,7 +4735,6 @@ "ctxt": 0 }, "value": "r1arg", - "typeAnnotation": null, "optional": false } }, @@ -4858,7 +4748,6 @@ "ctxt": 0 }, "value": "r1arg2", - "typeAnnotation": null, "optional": false } } @@ -4893,8 +4782,8 @@ "ctxt": 0 }, "value": "r1b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -4914,7 +4803,6 @@ "ctxt": 0 }, "value": "r1arg2", - "typeAnnotation": null, "optional": false } }, @@ -4928,7 +4816,6 @@ "ctxt": 0 }, "value": "r1arg", - "typeAnnotation": null, "optional": false } } @@ -4963,8 +4850,8 @@ "ctxt": 0 }, "value": "r2arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -4982,6 +4869,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5004,13 +4892,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -5065,7 +4951,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5104,8 +4989,8 @@ "ctxt": 0 }, "value": "r2arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -5123,6 +5008,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5145,13 +5031,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -5206,7 +5090,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5245,8 +5128,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5263,7 +5146,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5277,7 +5159,6 @@ "ctxt": 0 }, "value": "r2arg", - "typeAnnotation": null, "optional": false } } @@ -5313,8 +5194,8 @@ "ctxt": 0 }, "value": "r2a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -5334,7 +5215,6 @@ "ctxt": 0 }, "value": "r2arg", - "typeAnnotation": null, "optional": false } }, @@ -5348,7 +5228,6 @@ "ctxt": 0 }, "value": "r2arg2", - "typeAnnotation": null, "optional": false } } @@ -5383,8 +5262,8 @@ "ctxt": 0 }, "value": "r2b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -5404,7 +5283,6 @@ "ctxt": 0 }, "value": "r2arg2", - "typeAnnotation": null, "optional": false } }, @@ -5418,7 +5296,6 @@ "ctxt": 0 }, "value": "r2arg", - "typeAnnotation": null, "optional": false } } @@ -5453,8 +5330,8 @@ "ctxt": 0 }, "value": "r3arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -5472,6 +5349,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5494,13 +5372,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -5533,7 +5409,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5564,7 +5439,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5603,8 +5477,8 @@ "ctxt": 0 }, "value": "r3arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -5622,6 +5496,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5644,13 +5519,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -5687,7 +5560,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5726,8 +5598,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5744,7 +5616,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5758,7 +5629,6 @@ "ctxt": 0 }, "value": "r3arg", - "typeAnnotation": null, "optional": false } } @@ -5794,8 +5664,8 @@ "ctxt": 0 }, "value": "r3a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -5815,7 +5685,6 @@ "ctxt": 0 }, "value": "r3arg", - "typeAnnotation": null, "optional": false } }, @@ -5829,7 +5698,6 @@ "ctxt": 0 }, "value": "r3arg2", - "typeAnnotation": null, "optional": false } } @@ -5864,8 +5732,8 @@ "ctxt": 0 }, "value": "r3b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -5885,7 +5753,6 @@ "ctxt": 0 }, "value": "r3arg2", - "typeAnnotation": null, "optional": false } }, @@ -5899,7 +5766,6 @@ "ctxt": 0 }, "value": "r3arg", - "typeAnnotation": null, "optional": false } } @@ -5934,8 +5800,8 @@ "ctxt": 0 }, "value": "r4arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -5953,6 +5819,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5975,13 +5842,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -5991,6 +5856,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6013,13 +5879,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -6061,7 +5925,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6082,7 +5945,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6121,8 +5983,8 @@ "ctxt": 0 }, "value": "r4arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -6140,6 +6002,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6162,13 +6025,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -6178,6 +6039,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6200,13 +6062,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -6248,7 +6108,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6269,7 +6128,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6308,8 +6166,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6326,7 +6184,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6340,7 +6197,6 @@ "ctxt": 0 }, "value": "r4arg", - "typeAnnotation": null, "optional": false } } @@ -6376,8 +6232,8 @@ "ctxt": 0 }, "value": "r4a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -6397,7 +6253,6 @@ "ctxt": 0 }, "value": "r4arg", - "typeAnnotation": null, "optional": false } }, @@ -6411,7 +6266,6 @@ "ctxt": 0 }, "value": "r4arg2", - "typeAnnotation": null, "optional": false } } @@ -6446,8 +6300,8 @@ "ctxt": 0 }, "value": "r4b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -6467,7 +6321,6 @@ "ctxt": 0 }, "value": "r4arg2", - "typeAnnotation": null, "optional": false } }, @@ -6481,7 +6334,6 @@ "ctxt": 0 }, "value": "r4arg", - "typeAnnotation": null, "optional": false } } @@ -6516,8 +6368,8 @@ "ctxt": 0 }, "value": "r5arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -6535,6 +6387,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6558,6 +6411,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6580,13 +6434,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6612,15 +6464,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "body": { @@ -6653,7 +6503,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6684,7 +6533,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6705,7 +6553,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6744,8 +6591,8 @@ "ctxt": 0 }, "value": "r5arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -6763,6 +6610,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6786,6 +6634,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6808,13 +6657,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6840,15 +6687,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "body": { @@ -6881,7 +6726,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6912,7 +6756,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6933,7 +6776,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6972,8 +6814,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6990,7 +6832,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7004,7 +6845,6 @@ "ctxt": 0 }, "value": "r5arg", - "typeAnnotation": null, "optional": false } } @@ -7040,8 +6880,8 @@ "ctxt": 0 }, "value": "r5a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -7061,7 +6901,6 @@ "ctxt": 0 }, "value": "r5arg", - "typeAnnotation": null, "optional": false } }, @@ -7075,7 +6914,6 @@ "ctxt": 0 }, "value": "r5arg2", - "typeAnnotation": null, "optional": false } } @@ -7110,8 +6948,8 @@ "ctxt": 0 }, "value": "r5b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -7131,7 +6969,6 @@ "ctxt": 0 }, "value": "r5arg2", - "typeAnnotation": null, "optional": false } }, @@ -7145,7 +6982,6 @@ "ctxt": 0 }, "value": "r5arg", - "typeAnnotation": null, "optional": false } } @@ -7180,8 +7016,8 @@ "ctxt": 0 }, "value": "r6arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -7199,6 +7035,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7222,6 +7059,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7244,13 +7082,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -7276,15 +7112,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "body": { @@ -7317,7 +7151,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7348,7 +7181,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7366,7 +7198,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7388,7 +7219,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7406,7 +7236,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7446,8 +7275,8 @@ "ctxt": 0 }, "value": "r6arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -7465,6 +7294,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7488,6 +7318,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7510,13 +7341,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -7542,15 +7371,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "body": { @@ -7583,7 +7410,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7614,7 +7440,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7632,7 +7457,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7672,8 +7496,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7690,7 +7514,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7704,7 +7527,6 @@ "ctxt": 0 }, "value": "r6arg", - "typeAnnotation": null, "optional": false } } @@ -7740,8 +7562,8 @@ "ctxt": 0 }, "value": "r6a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -7761,7 +7583,6 @@ "ctxt": 0 }, "value": "r6arg", - "typeAnnotation": null, "optional": false } }, @@ -7775,7 +7596,6 @@ "ctxt": 0 }, "value": "r6arg2", - "typeAnnotation": null, "optional": false } } @@ -7810,8 +7630,8 @@ "ctxt": 0 }, "value": "r6b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -7831,7 +7651,6 @@ "ctxt": 0 }, "value": "r6arg2", - "typeAnnotation": null, "optional": false } }, @@ -7845,7 +7664,6 @@ "ctxt": 0 }, "value": "r6arg", - "typeAnnotation": null, "optional": false } } @@ -7880,8 +7698,8 @@ "ctxt": 0 }, "value": "r11arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -7899,6 +7717,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7930,7 +7749,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7959,7 +7777,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7969,8 +7786,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -7980,6 +7796,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8011,7 +7828,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8040,7 +7856,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8064,7 +7879,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8093,7 +7907,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8103,8 +7916,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -8137,7 +7949,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8168,7 +7979,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8189,7 +7999,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8228,8 +8037,8 @@ "ctxt": 0 }, "value": "r11arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -8247,6 +8056,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8278,7 +8088,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8307,7 +8116,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8317,8 +8125,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -8328,6 +8135,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8359,7 +8167,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8388,7 +8195,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8412,7 +8218,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8441,7 +8246,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8451,8 +8255,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -8485,7 +8288,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8516,7 +8318,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8555,8 +8356,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -8573,7 +8374,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8587,7 +8387,6 @@ "ctxt": 0 }, "value": "r11arg", - "typeAnnotation": null, "optional": false } } @@ -8623,8 +8422,8 @@ "ctxt": 0 }, "value": "r11a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -8644,7 +8443,6 @@ "ctxt": 0 }, "value": "r11arg", - "typeAnnotation": null, "optional": false } }, @@ -8658,7 +8456,6 @@ "ctxt": 0 }, "value": "r11arg2", - "typeAnnotation": null, "optional": false } } @@ -8693,8 +8490,8 @@ "ctxt": 0 }, "value": "r11b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -8714,7 +8511,6 @@ "ctxt": 0 }, "value": "r11arg2", - "typeAnnotation": null, "optional": false } }, @@ -8728,7 +8524,6 @@ "ctxt": 0 }, "value": "r11arg", - "typeAnnotation": null, "optional": false } } @@ -8763,8 +8558,8 @@ "ctxt": 0 }, "value": "r15arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -8782,6 +8577,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8813,7 +8609,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8842,7 +8637,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8866,7 +8660,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8895,7 +8688,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8905,8 +8697,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -8946,7 +8737,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8978,7 +8768,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8999,7 +8788,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9038,8 +8826,8 @@ "ctxt": 0 }, "value": "r15arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -9057,6 +8845,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9088,7 +8877,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9117,7 +8905,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9141,7 +8928,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9170,7 +8956,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9180,8 +8965,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -9221,7 +9005,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9253,7 +9036,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9292,8 +9074,8 @@ "ctxt": 0 }, "value": "r15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9310,7 +9092,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9324,7 +9105,6 @@ "ctxt": 0 }, "value": "r15arg", - "typeAnnotation": null, "optional": false } } @@ -9360,8 +9140,8 @@ "ctxt": 0 }, "value": "r15a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -9381,7 +9161,6 @@ "ctxt": 0 }, "value": "r15arg", - "typeAnnotation": null, "optional": false } }, @@ -9395,7 +9174,6 @@ "ctxt": 0 }, "value": "r15arg2", - "typeAnnotation": null, "optional": false } } @@ -9430,8 +9208,8 @@ "ctxt": 0 }, "value": "r15b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -9451,7 +9229,6 @@ "ctxt": 0 }, "value": "r15arg2", - "typeAnnotation": null, "optional": false } }, @@ -9465,7 +9242,6 @@ "ctxt": 0 }, "value": "r15arg", - "typeAnnotation": null, "optional": false } } @@ -9500,8 +9276,8 @@ "ctxt": 0 }, "value": "r16arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -9519,6 +9295,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9550,7 +9327,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9579,7 +9355,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9603,7 +9378,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9632,7 +9406,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9642,8 +9415,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -9683,7 +9455,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9715,7 +9486,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9733,7 +9503,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9773,8 +9542,8 @@ "ctxt": 0 }, "value": "r16arg2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -9792,6 +9561,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9823,7 +9593,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9852,7 +9621,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9876,7 +9644,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9905,7 +9672,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9915,8 +9681,7 @@ } ] } - }, - "optional": false + } } ], "body": { @@ -9956,7 +9721,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9988,7 +9752,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10006,7 +9769,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10046,8 +9808,8 @@ "ctxt": 0 }, "value": "r16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -10064,7 +9826,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -10078,7 +9839,6 @@ "ctxt": 0 }, "value": "r16arg", - "typeAnnotation": null, "optional": false } } @@ -10114,8 +9874,8 @@ "ctxt": 0 }, "value": "r16a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -10135,7 +9895,6 @@ "ctxt": 0 }, "value": "r16arg", - "typeAnnotation": null, "optional": false } }, @@ -10149,7 +9908,6 @@ "ctxt": 0 }, "value": "r16arg2", - "typeAnnotation": null, "optional": false } } @@ -10184,8 +9942,8 @@ "ctxt": 0 }, "value": "r16b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -10205,7 +9963,6 @@ "ctxt": 0 }, "value": "r16arg2", - "typeAnnotation": null, "optional": false } }, @@ -10219,7 +9976,6 @@ "ctxt": 0 }, "value": "r16arg", - "typeAnnotation": null, "optional": false } } @@ -10254,8 +10010,8 @@ "ctxt": 0 }, "value": "r17arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -10273,6 +10029,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10296,6 +10053,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10318,13 +10076,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -10350,15 +10106,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "body": { @@ -10398,7 +10152,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10430,7 +10183,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10469,8 +10221,8 @@ "ctxt": 0 }, "value": "r17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -10487,7 +10239,6 @@ "ctxt": 0 }, "value": "foo17", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -10501,7 +10252,6 @@ "ctxt": 0 }, "value": "r17arg", - "typeAnnotation": null, "optional": false } } @@ -10537,8 +10287,8 @@ "ctxt": 0 }, "value": "r18arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -10556,6 +10306,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10579,6 +10330,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10601,13 +10353,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -10633,7 +10383,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10663,15 +10412,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "body": { @@ -10741,8 +10488,8 @@ "ctxt": 0 }, "value": "r18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -10759,7 +10506,6 @@ "ctxt": 0 }, "value": "foo18", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -10773,7 +10519,6 @@ "ctxt": 0 }, "value": "r18arg", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesA/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesA/input.ts.json index bfce9d600975..81e73dcec90d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesA/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesA/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -76,8 +77,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -99,8 +99,7 @@ } } } - }, - "optional": false + } } } ], @@ -136,7 +135,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false } } @@ -167,8 +165,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -185,7 +183,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -207,6 +204,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -223,8 +221,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithOptionalParameters/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithOptionalParameters/input.ts.json index 6559cf9774f9..a45813472b7f 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithOptionalParameters/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithOptionalParameters/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -111,7 +109,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -141,6 +138,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -157,8 +155,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -199,7 +196,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -229,6 +225,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -245,8 +242,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -287,7 +283,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -317,6 +312,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -333,8 +329,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -344,6 +339,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -360,8 +356,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -402,7 +397,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -432,6 +426,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -448,8 +443,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -459,6 +453,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -475,8 +470,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -519,7 +513,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -540,7 +533,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -570,7 +562,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -632,7 +623,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -653,7 +643,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -683,7 +672,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -713,6 +701,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -729,8 +718,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -773,7 +761,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -794,7 +781,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -824,7 +810,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -854,6 +839,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -870,8 +856,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -914,7 +899,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -935,7 +919,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -965,7 +948,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1027,7 +1009,6 @@ "ctxt": 0 }, "value": "I5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1048,7 +1029,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1078,7 +1058,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1108,6 +1087,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1124,8 +1104,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -1168,7 +1147,6 @@ "ctxt": 0 }, "value": "I6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1189,7 +1167,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1219,7 +1196,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1249,6 +1225,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1265,8 +1242,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1309,7 +1285,6 @@ "ctxt": 0 }, "value": "I7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1330,7 +1305,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1360,7 +1334,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1422,7 +1395,6 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1443,7 +1415,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1473,7 +1444,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1503,6 +1473,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1519,8 +1490,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -1563,7 +1533,6 @@ "ctxt": 0 }, "value": "I9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1584,7 +1553,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1614,7 +1582,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1644,6 +1611,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1660,8 +1628,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1704,7 +1671,6 @@ "ctxt": 0 }, "value": "I10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1725,7 +1691,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1755,7 +1720,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1785,6 +1749,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1801,8 +1766,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1812,6 +1776,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1828,8 +1793,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1872,7 +1836,6 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1893,7 +1856,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1923,7 +1885,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1985,7 +1946,6 @@ "ctxt": 0 }, "value": "I12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2006,7 +1966,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2036,7 +1995,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2066,6 +2024,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2082,8 +2041,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -2093,6 +2051,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2109,8 +2068,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -2153,7 +2111,6 @@ "ctxt": 0 }, "value": "I13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2174,7 +2131,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2204,7 +2160,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2234,6 +2189,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2250,8 +2206,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -2294,7 +2249,6 @@ "ctxt": 0 }, "value": "I14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2315,7 +2269,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2345,7 +2298,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2375,6 +2327,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2391,8 +2344,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2402,6 +2354,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2418,8 +2371,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -2462,7 +2414,6 @@ "ctxt": 0 }, "value": "I15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2483,7 +2434,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2513,7 +2463,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2575,7 +2524,6 @@ "ctxt": 0 }, "value": "I16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2596,7 +2544,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2626,7 +2573,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2656,6 +2602,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2672,8 +2619,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -2683,6 +2629,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2699,8 +2646,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -2743,7 +2689,6 @@ "ctxt": 0 }, "value": "I17", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2764,7 +2709,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2794,7 +2738,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2824,6 +2767,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2840,8 +2784,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -2884,7 +2827,6 @@ "ctxt": 0 }, "value": "I18", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2905,7 +2847,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2935,7 +2876,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2965,6 +2905,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2981,8 +2922,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2992,6 +2932,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3008,8 +2949,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithRestParameters/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithRestParameters/input.ts.json index c87edcbba120..72349bcec9c4 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithRestParameters/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithRestParameters/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,8 +91,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -161,7 +159,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -191,6 +188,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -207,8 +205,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -230,8 +227,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -298,7 +295,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -328,6 +324,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -344,8 +341,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -355,6 +351,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -371,8 +368,7 @@ }, "kind": "string" } - }, - "optional": true + } }, { "type": "RestElement", @@ -394,8 +390,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -462,7 +458,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -492,6 +487,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -508,8 +504,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -519,6 +514,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -535,8 +531,7 @@ }, "kind": "string" } - }, - "optional": true + } }, { "type": "RestElement", @@ -558,8 +553,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -628,7 +623,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -649,7 +643,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -679,7 +672,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -741,7 +733,6 @@ "ctxt": 0 }, "value": "I1B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -762,7 +753,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -792,7 +782,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -834,8 +823,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -904,7 +893,6 @@ "ctxt": 0 }, "value": "I1C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -925,7 +913,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -955,7 +942,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -997,8 +983,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1067,7 +1053,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1088,7 +1073,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1118,7 +1102,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1148,6 +1131,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1164,8 +1148,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -1208,7 +1191,6 @@ "ctxt": 0 }, "value": "I2B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1229,7 +1211,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1259,7 +1240,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1289,6 +1269,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1305,8 +1286,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -1316,6 +1296,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1332,8 +1313,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -1343,6 +1323,7 @@ "ctxt": 0 }, "value": "z", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1359,8 +1340,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -1403,7 +1383,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1424,7 +1403,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1454,7 +1432,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1484,6 +1461,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1500,8 +1478,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1544,7 +1521,6 @@ "ctxt": 0 }, "value": "I3B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1565,7 +1541,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1595,7 +1570,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1625,6 +1599,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1641,8 +1616,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "typeParams": null, @@ -1685,7 +1659,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1706,7 +1679,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1736,7 +1708,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1798,7 +1769,6 @@ "ctxt": 0 }, "value": "I4B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1819,7 +1789,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1849,7 +1818,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1891,8 +1859,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1961,7 +1929,6 @@ "ctxt": 0 }, "value": "I5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1982,7 +1949,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2012,7 +1978,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2042,6 +2007,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2058,8 +2024,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -2102,7 +2067,6 @@ "ctxt": 0 }, "value": "I6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2123,7 +2087,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2153,7 +2116,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2183,6 +2145,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2199,8 +2162,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -2243,7 +2205,6 @@ "ctxt": 0 }, "value": "I6B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2264,7 +2225,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2294,7 +2254,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2324,6 +2283,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2340,8 +2300,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -2363,8 +2322,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2433,7 +2392,6 @@ "ctxt": 0 }, "value": "I6C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2454,7 +2412,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2484,7 +2441,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2514,6 +2470,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2530,8 +2487,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -2553,8 +2509,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2623,7 +2579,6 @@ "ctxt": 0 }, "value": "I6D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2644,7 +2599,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2674,7 +2628,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2704,6 +2657,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2720,8 +2674,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2731,6 +2684,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2747,8 +2701,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -2791,7 +2744,6 @@ "ctxt": 0 }, "value": "I6E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2812,7 +2764,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2842,7 +2793,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2872,6 +2822,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2888,8 +2839,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2899,6 +2849,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2915,8 +2866,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -2959,7 +2909,6 @@ "ctxt": 0 }, "value": "I7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2980,7 +2929,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3010,7 +2958,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3072,7 +3019,6 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3093,7 +3039,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3123,7 +3068,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3153,6 +3097,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3169,8 +3114,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -3213,7 +3157,6 @@ "ctxt": 0 }, "value": "I9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3234,7 +3177,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3264,7 +3206,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3294,6 +3235,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3310,8 +3252,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -3354,7 +3295,6 @@ "ctxt": 0 }, "value": "I10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3375,7 +3315,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3405,7 +3344,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3435,6 +3373,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3451,8 +3390,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -3462,6 +3400,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3478,8 +3417,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -3522,7 +3460,6 @@ "ctxt": 0 }, "value": "I10B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3543,7 +3480,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3573,7 +3509,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3603,6 +3538,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3619,8 +3555,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -3630,6 +3565,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3646,8 +3582,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -3657,6 +3592,7 @@ "ctxt": 0 }, "value": "z", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3673,8 +3609,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -3717,7 +3652,6 @@ "ctxt": 0 }, "value": "I10C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3738,7 +3672,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3768,7 +3701,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3798,6 +3730,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3814,8 +3747,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -3837,8 +3769,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -3907,7 +3839,6 @@ "ctxt": 0 }, "value": "I10D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3928,7 +3859,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3958,7 +3888,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3988,6 +3917,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4004,8 +3934,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -4015,6 +3944,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4031,8 +3961,7 @@ }, "kind": "string" } - }, - "optional": true + } }, { "type": "Identifier", @@ -4042,6 +3971,7 @@ "ctxt": 0 }, "value": "z", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4058,8 +3988,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "typeParams": null, @@ -4102,7 +4031,6 @@ "ctxt": 0 }, "value": "I10E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4123,7 +4051,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -4153,7 +4080,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4183,6 +4109,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4199,8 +4126,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -4222,8 +4148,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -4292,7 +4218,6 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4313,7 +4238,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -4343,7 +4267,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4405,7 +4328,6 @@ "ctxt": 0 }, "value": "I12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4426,7 +4348,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -4456,7 +4377,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4486,6 +4406,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4502,8 +4423,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -4513,6 +4433,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4529,8 +4450,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -4573,7 +4493,6 @@ "ctxt": 0 }, "value": "I13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4594,7 +4513,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -4624,7 +4542,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4654,6 +4571,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4670,8 +4588,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -4714,7 +4631,6 @@ "ctxt": 0 }, "value": "I14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4735,7 +4651,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -4765,7 +4680,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4795,6 +4709,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4811,8 +4726,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -4822,6 +4736,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4838,8 +4753,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -4882,7 +4796,6 @@ "ctxt": 0 }, "value": "I15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4903,7 +4816,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -4933,7 +4845,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4963,6 +4874,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4979,8 +4891,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -4990,6 +4901,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5006,8 +4918,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "typeParams": null, @@ -5050,7 +4961,6 @@ "ctxt": 0 }, "value": "I16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5071,7 +4981,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -5101,7 +5010,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5131,6 +5039,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5147,8 +5056,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "RestElement", @@ -5170,8 +5078,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -5240,7 +5148,6 @@ "ctxt": 0 }, "value": "I17", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5261,7 +5168,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -5291,7 +5197,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5333,8 +5238,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithSpecializedSignatures/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithSpecializedSignatures/input.ts.json index 51e32a0fa0b4..80b44a9b73e2 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithSpecializedSignatures/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithSpecializedSignatures/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "CallSignature", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -79,6 +77,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -108,8 +107,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -147,6 +145,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -163,8 +162,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -174,6 +172,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -190,8 +189,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -231,7 +229,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -252,7 +249,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -282,6 +278,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -311,8 +308,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -350,6 +346,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -366,8 +363,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -377,6 +373,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -393,8 +390,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -432,6 +428,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -454,13 +451,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -503,7 +498,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -530,7 +524,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -560,6 +553,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -589,8 +583,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -628,6 +621,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -644,8 +638,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -685,7 +678,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -706,7 +698,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -736,6 +727,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -765,8 +757,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -804,6 +795,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -820,8 +812,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -861,7 +852,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -882,7 +872,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -912,6 +901,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -934,13 +924,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -983,7 +971,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1015,7 +1002,6 @@ "ctxt": 0 }, "value": "MemberWithCallSignature", - "typeAnnotation": null, "optional": false }, "body": { @@ -1041,7 +1027,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1071,7 +1056,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1109,6 +1093,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1138,8 +1123,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1177,6 +1161,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1193,8 +1178,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1237,7 +1221,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1275,6 +1258,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1304,8 +1288,7 @@ } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -1315,6 +1298,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1331,8 +1315,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1370,6 +1353,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1386,8 +1370,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1397,6 +1380,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1413,8 +1397,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1457,7 +1440,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1487,6 +1469,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1509,13 +1492,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -1541,7 +1522,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1588,7 +1568,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1609,7 +1588,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1639,7 +1617,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1669,6 +1646,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1685,8 +1663,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -1727,7 +1704,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1757,6 +1733,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1773,8 +1750,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1784,6 +1760,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1800,8 +1777,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1842,7 +1818,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1872,6 +1847,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1894,13 +1870,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -1926,7 +1900,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1973,7 +1946,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2003,7 +1975,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2041,6 +2012,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2070,8 +2042,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2109,6 +2080,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2125,8 +2097,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2169,7 +2140,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2199,6 +2169,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2221,13 +2192,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -2253,7 +2222,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2283,7 +2251,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2311,7 +2278,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2332,7 +2298,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2362,7 +2327,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2392,6 +2356,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2408,8 +2373,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -2452,7 +2416,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2473,7 +2436,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2503,7 +2465,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2533,6 +2494,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2555,13 +2517,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -2587,7 +2547,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures/input.ts.json index 1918cb69abe4..30a90bf00e7a 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "ConstructSignature", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -65,6 +63,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -88,6 +87,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -104,8 +104,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -128,8 +127,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -165,7 +163,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false } } @@ -181,7 +178,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -202,6 +198,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -218,8 +215,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -276,6 +272,7 @@ "ctxt": 0 }, "value": "rarg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -299,6 +296,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -315,8 +313,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -339,8 +336,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -372,8 +368,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -390,7 +386,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -404,7 +399,6 @@ "ctxt": 0 }, "value": "rarg1", - "typeAnnotation": null, "optional": false } } @@ -440,6 +434,7 @@ "ctxt": 0 }, "value": "rarg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -463,6 +458,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -485,13 +481,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -517,7 +511,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -544,8 +537,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -577,8 +569,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -595,7 +587,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -609,7 +600,6 @@ "ctxt": 0 }, "value": "rarg2", - "typeAnnotation": null, "optional": false } } @@ -630,7 +620,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -651,6 +640,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -674,6 +664,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -690,8 +681,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -701,6 +691,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -717,8 +708,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -741,8 +731,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -778,7 +767,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false } } @@ -794,7 +782,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -815,6 +802,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -831,8 +819,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -889,6 +876,7 @@ "ctxt": 0 }, "value": "r3arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -912,6 +900,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -928,8 +917,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -939,6 +927,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -955,8 +944,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -979,8 +967,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -1012,8 +999,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1030,7 +1017,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1044,7 +1030,6 @@ "ctxt": 0 }, "value": "r3arg1", - "typeAnnotation": null, "optional": false } } @@ -1080,6 +1065,7 @@ "ctxt": 0 }, "value": "r4arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1103,6 +1089,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1125,13 +1112,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -1157,7 +1142,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1184,8 +1168,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -1217,8 +1200,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1235,7 +1218,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1249,7 +1231,6 @@ "ctxt": 0 }, "value": "r4arg1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures2/input.ts.json index 42d264a19afb..9404d1bb51c9 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "OtherDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -284,7 +275,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": null, @@ -324,7 +314,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -342,7 +331,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -363,6 +351,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -386,6 +375,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -402,8 +392,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -434,8 +423,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -471,7 +459,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -487,7 +474,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -508,6 +494,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -524,8 +511,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -567,7 +553,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -588,6 +573,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -611,6 +597,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -627,8 +614,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -659,8 +645,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -696,7 +681,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -712,7 +696,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -733,6 +716,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -749,8 +733,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -792,7 +775,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -813,6 +795,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -836,6 +819,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -852,8 +836,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -876,8 +859,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -913,7 +895,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -929,7 +910,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -950,6 +930,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -966,8 +947,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1009,7 +989,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1030,6 +1009,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1053,6 +1033,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1069,8 +1050,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1080,6 +1060,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1096,8 +1077,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1120,8 +1100,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -1157,7 +1136,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1173,7 +1151,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1194,6 +1171,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1210,8 +1188,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1253,7 +1230,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1274,6 +1250,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1297,6 +1274,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1320,6 +1298,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1336,8 +1315,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -1360,8 +1338,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": null, @@ -1384,8 +1361,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -1421,7 +1397,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1437,7 +1412,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1458,6 +1432,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1474,8 +1449,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1517,7 +1491,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1538,6 +1511,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1561,6 +1535,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1584,6 +1559,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1606,13 +1582,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1638,7 +1612,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1646,8 +1619,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": null, @@ -1673,7 +1645,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1681,8 +1652,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -1718,7 +1688,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1734,7 +1703,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1755,6 +1723,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1771,8 +1740,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1814,7 +1782,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1835,6 +1802,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1858,6 +1826,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1881,6 +1850,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1903,13 +1873,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1935,7 +1903,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1943,8 +1910,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": null, @@ -1971,6 +1937,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1993,13 +1960,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2025,7 +1990,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2036,8 +2000,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -2073,7 +2036,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2089,7 +2051,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2110,6 +2071,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2126,8 +2088,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2169,7 +2130,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2190,6 +2150,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2213,6 +2174,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2236,6 +2198,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2258,13 +2221,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2290,7 +2251,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2298,8 +2258,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, { "type": "Identifier", @@ -2309,6 +2268,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2332,6 +2292,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2354,13 +2315,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2386,7 +2345,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2394,8 +2352,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": null, @@ -2422,6 +2379,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2444,13 +2402,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2476,7 +2432,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2487,8 +2442,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -2524,7 +2478,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2540,7 +2493,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2561,6 +2513,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2577,8 +2530,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2620,7 +2572,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2641,6 +2592,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2664,6 +2616,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2687,6 +2640,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2709,13 +2663,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2741,7 +2693,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2749,8 +2700,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, { "type": "Identifier", @@ -2760,6 +2710,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2783,6 +2734,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2805,13 +2757,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2837,7 +2787,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2845,8 +2794,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": null, @@ -2873,6 +2821,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2895,13 +2844,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2927,7 +2874,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2938,8 +2884,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -2975,7 +2920,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2991,7 +2935,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3012,6 +2955,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3028,8 +2972,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3071,7 +3014,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3092,6 +3034,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3127,8 +3070,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -3159,7 +3102,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3191,7 +3133,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3199,8 +3140,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -3236,7 +3176,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3252,7 +3191,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3273,6 +3211,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3289,8 +3228,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3332,7 +3270,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3353,6 +3290,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3376,6 +3314,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3407,7 +3346,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3435,8 +3373,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -3446,6 +3383,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3477,7 +3415,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3519,7 +3456,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3547,8 +3483,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -3574,7 +3509,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3582,8 +3516,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -3619,7 +3552,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3635,7 +3567,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3656,6 +3587,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3672,8 +3604,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3715,7 +3646,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3736,6 +3666,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3759,6 +3690,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3781,7 +3713,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3807,7 +3738,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3815,8 +3745,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -3826,6 +3755,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3848,7 +3778,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3874,7 +3803,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3882,8 +3810,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -3909,7 +3836,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3935,7 +3861,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3946,8 +3871,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -3983,7 +3907,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3999,7 +3922,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4020,6 +3942,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4036,8 +3959,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4079,7 +4001,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4100,6 +4021,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4123,6 +4045,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4145,7 +4068,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4171,7 +4093,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4179,8 +4100,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -4190,6 +4110,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4212,7 +4133,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4238,7 +4158,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4246,8 +4165,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -4273,7 +4191,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4299,7 +4216,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4310,8 +4226,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -4347,7 +4262,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4363,7 +4277,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4384,6 +4297,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4400,8 +4314,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4443,7 +4356,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4464,6 +4376,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4487,6 +4400,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4518,7 +4432,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4560,7 +4473,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4588,8 +4500,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -4615,7 +4526,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4623,8 +4533,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -4660,7 +4569,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4676,7 +4584,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4697,6 +4604,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4713,8 +4621,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4756,7 +4663,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4777,6 +4683,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4808,6 +4715,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4824,8 +4732,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4871,6 +4778,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4887,8 +4795,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4920,8 +4827,7 @@ } ] } - }, - "optional": false + } } } ], @@ -4957,7 +4863,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4973,7 +4878,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4994,6 +4898,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5010,8 +4915,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5053,7 +4957,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5074,6 +4977,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5105,6 +5009,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5127,13 +5032,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -5184,7 +5087,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5202,7 +5104,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5228,6 +5129,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5250,13 +5152,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -5307,7 +5207,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5325,7 +5224,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5337,8 +5235,7 @@ } ] } - }, - "optional": false + } } } ], @@ -5374,7 +5271,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -5390,7 +5286,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5411,6 +5306,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5427,8 +5323,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5470,7 +5365,6 @@ "ctxt": 0 }, "value": "foo17", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5491,6 +5385,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5522,6 +5417,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5545,6 +5441,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5561,8 +5458,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -5584,8 +5480,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -5631,6 +5526,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5654,6 +5550,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5670,8 +5567,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -5693,8 +5589,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -5726,8 +5621,7 @@ } ] } - }, - "optional": false + } } } ], @@ -5763,7 +5657,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -5779,7 +5672,6 @@ "ctxt": 0 }, "value": "foo17", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5800,6 +5692,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5816,8 +5709,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5859,7 +5751,6 @@ "ctxt": 0 }, "value": "foo18", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5880,6 +5771,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5911,6 +5803,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5942,6 +5835,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5958,8 +5852,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -5997,6 +5890,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6013,8 +5907,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -6038,8 +5931,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -6085,6 +5977,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6116,6 +6009,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6132,8 +6026,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -6171,6 +6064,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6193,13 +6087,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -6224,7 +6116,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6234,8 +6125,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -6267,8 +6157,7 @@ } ] } - }, - "optional": false + } } } ], @@ -6304,7 +6193,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -6320,7 +6208,6 @@ "ctxt": 0 }, "value": "foo18", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -6341,6 +6228,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6357,8 +6245,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -6415,6 +6302,7 @@ "ctxt": 0 }, "value": "r1arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6438,6 +6326,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6460,13 +6349,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6492,7 +6379,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6529,7 +6415,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6538,8 +6423,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -6571,6 +6455,7 @@ "ctxt": 0 }, "value": "r1arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6594,6 +6479,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6610,8 +6496,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -6642,8 +6527,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -6675,8 +6559,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6693,7 +6577,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6707,7 +6590,6 @@ "ctxt": 0 }, "value": "r1arg1", - "typeAnnotation": null, "optional": false } } @@ -6743,8 +6625,8 @@ "ctxt": 0 }, "value": "r1a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -6764,7 +6646,6 @@ "ctxt": 0 }, "value": "r1arg2", - "typeAnnotation": null, "optional": false } }, @@ -6778,7 +6659,6 @@ "ctxt": 0 }, "value": "r1arg1", - "typeAnnotation": null, "optional": false } } @@ -6813,8 +6693,8 @@ "ctxt": 0 }, "value": "r1b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -6834,7 +6714,6 @@ "ctxt": 0 }, "value": "r1arg1", - "typeAnnotation": null, "optional": false } }, @@ -6848,7 +6727,6 @@ "ctxt": 0 }, "value": "r1arg2", - "typeAnnotation": null, "optional": false } } @@ -6883,6 +6761,7 @@ "ctxt": 0 }, "value": "r2arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6906,6 +6785,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6928,13 +6808,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6960,7 +6838,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6995,8 +6872,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -7028,6 +6904,7 @@ "ctxt": 0 }, "value": "r2arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7051,6 +6928,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7067,8 +6945,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -7099,8 +6976,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -7132,8 +7008,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7150,7 +7026,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7164,7 +7039,6 @@ "ctxt": 0 }, "value": "r2arg1", - "typeAnnotation": null, "optional": false } } @@ -7200,8 +7074,8 @@ "ctxt": 0 }, "value": "r2a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -7221,7 +7095,6 @@ "ctxt": 0 }, "value": "r2arg1", - "typeAnnotation": null, "optional": false } }, @@ -7235,7 +7108,6 @@ "ctxt": 0 }, "value": "r2arg2", - "typeAnnotation": null, "optional": false } } @@ -7270,8 +7142,8 @@ "ctxt": 0 }, "value": "r2b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -7291,7 +7163,6 @@ "ctxt": 0 }, "value": "r2arg2", - "typeAnnotation": null, "optional": false } }, @@ -7305,7 +7176,6 @@ "ctxt": 0 }, "value": "r2arg1", - "typeAnnotation": null, "optional": false } } @@ -7340,6 +7210,7 @@ "ctxt": 0 }, "value": "r3arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7363,6 +7234,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7385,13 +7257,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -7417,7 +7287,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7447,7 +7316,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7455,8 +7323,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -7488,6 +7355,7 @@ "ctxt": 0 }, "value": "r3arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7511,6 +7379,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7527,8 +7396,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -7551,8 +7419,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -7584,8 +7451,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7602,7 +7469,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7616,7 +7482,6 @@ "ctxt": 0 }, "value": "r3arg1", - "typeAnnotation": null, "optional": false } } @@ -7652,8 +7517,8 @@ "ctxt": 0 }, "value": "r3a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -7673,7 +7538,6 @@ "ctxt": 0 }, "value": "r3arg1", - "typeAnnotation": null, "optional": false } }, @@ -7687,7 +7551,6 @@ "ctxt": 0 }, "value": "r3arg2", - "typeAnnotation": null, "optional": false } } @@ -7722,8 +7585,8 @@ "ctxt": 0 }, "value": "r3b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -7743,7 +7606,6 @@ "ctxt": 0 }, "value": "r3arg2", - "typeAnnotation": null, "optional": false } }, @@ -7757,7 +7619,6 @@ "ctxt": 0 }, "value": "r3arg1", - "typeAnnotation": null, "optional": false } } @@ -7792,6 +7653,7 @@ "ctxt": 0 }, "value": "r4arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7815,6 +7677,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7837,13 +7700,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -7853,6 +7714,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7875,13 +7737,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -7907,7 +7767,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7928,7 +7787,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7958,7 +7816,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7966,8 +7823,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -7999,6 +7855,7 @@ "ctxt": 0 }, "value": "r4arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8022,6 +7879,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8038,8 +7896,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -8049,6 +7906,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8065,8 +7923,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -8089,8 +7946,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -8122,8 +7978,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -8140,7 +7996,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8154,7 +8009,6 @@ "ctxt": 0 }, "value": "r4arg1", - "typeAnnotation": null, "optional": false } } @@ -8190,8 +8044,8 @@ "ctxt": 0 }, "value": "r4a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -8211,7 +8065,6 @@ "ctxt": 0 }, "value": "r4arg1", - "typeAnnotation": null, "optional": false } }, @@ -8225,7 +8078,6 @@ "ctxt": 0 }, "value": "r4arg2", - "typeAnnotation": null, "optional": false } } @@ -8260,8 +8112,8 @@ "ctxt": 0 }, "value": "r4b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -8281,7 +8133,6 @@ "ctxt": 0 }, "value": "r4arg2", - "typeAnnotation": null, "optional": false } }, @@ -8295,7 +8146,6 @@ "ctxt": 0 }, "value": "r4arg1", - "typeAnnotation": null, "optional": false } } @@ -8330,6 +8180,7 @@ "ctxt": 0 }, "value": "r5arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8353,6 +8204,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8376,6 +8228,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8398,13 +8251,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -8430,7 +8281,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8438,8 +8288,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": { @@ -8465,7 +8314,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8486,7 +8334,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8516,7 +8363,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8524,8 +8370,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -8557,6 +8402,7 @@ "ctxt": 0 }, "value": "r5arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8580,6 +8426,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8603,6 +8450,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8619,8 +8467,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -8643,8 +8490,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": null, @@ -8667,8 +8513,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -8700,8 +8545,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -8718,7 +8563,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8732,7 +8576,6 @@ "ctxt": 0 }, "value": "r5arg1", - "typeAnnotation": null, "optional": false } } @@ -8768,8 +8611,8 @@ "ctxt": 0 }, "value": "r5a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -8789,7 +8632,6 @@ "ctxt": 0 }, "value": "r5arg1", - "typeAnnotation": null, "optional": false } }, @@ -8803,7 +8645,6 @@ "ctxt": 0 }, "value": "r5arg2", - "typeAnnotation": null, "optional": false } } @@ -8838,8 +8679,8 @@ "ctxt": 0 }, "value": "r5b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -8859,7 +8700,6 @@ "ctxt": 0 }, "value": "r5arg2", - "typeAnnotation": null, "optional": false } }, @@ -8873,7 +8713,6 @@ "ctxt": 0 }, "value": "r5arg1", - "typeAnnotation": null, "optional": false } } @@ -8908,6 +8747,7 @@ "ctxt": 0 }, "value": "r6arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8931,6 +8771,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8954,6 +8795,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8976,13 +8818,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -9008,7 +8848,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9016,8 +8855,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": { @@ -9043,7 +8881,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9061,7 +8898,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9083,7 +8919,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9101,7 +8936,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9132,7 +8966,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9140,8 +8973,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -9173,6 +9005,7 @@ "ctxt": 0 }, "value": "r6arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9196,6 +9029,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9219,6 +9053,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9241,13 +9076,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -9273,7 +9106,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9281,8 +9113,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": null, @@ -9308,7 +9139,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9316,8 +9146,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -9349,8 +9178,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9367,7 +9196,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9381,7 +9209,6 @@ "ctxt": 0 }, "value": "r6arg1", - "typeAnnotation": null, "optional": false } } @@ -9417,8 +9244,8 @@ "ctxt": 0 }, "value": "r6a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -9438,7 +9265,6 @@ "ctxt": 0 }, "value": "r6arg1", - "typeAnnotation": null, "optional": false } }, @@ -9452,7 +9278,6 @@ "ctxt": 0 }, "value": "r6arg2", - "typeAnnotation": null, "optional": false } } @@ -9487,8 +9312,8 @@ "ctxt": 0 }, "value": "r6b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -9508,7 +9333,6 @@ "ctxt": 0 }, "value": "r6arg2", - "typeAnnotation": null, "optional": false } }, @@ -9522,7 +9346,6 @@ "ctxt": 0 }, "value": "r6arg1", - "typeAnnotation": null, "optional": false } } @@ -9557,6 +9380,7 @@ "ctxt": 0 }, "value": "r7arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9580,6 +9404,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9603,6 +9428,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9625,13 +9451,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -9657,7 +9481,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9665,8 +9488,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": { @@ -9692,7 +9514,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9710,7 +9531,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9732,7 +9552,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9750,7 +9569,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9782,6 +9600,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9804,13 +9623,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -9836,7 +9653,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9847,8 +9663,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -9880,6 +9695,7 @@ "ctxt": 0 }, "value": "r7arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9903,6 +9719,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9926,6 +9743,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9948,13 +9766,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -9980,7 +9796,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9988,8 +9803,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": null, @@ -10016,6 +9830,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10038,13 +9853,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -10070,7 +9883,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10081,8 +9893,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -10114,8 +9925,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -10132,7 +9943,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -10146,7 +9956,6 @@ "ctxt": 0 }, "value": "r7arg1", - "typeAnnotation": null, "optional": false } } @@ -10182,8 +9991,8 @@ "ctxt": 0 }, "value": "r7a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -10203,7 +10012,6 @@ "ctxt": 0 }, "value": "r7arg1", - "typeAnnotation": null, "optional": false } }, @@ -10217,7 +10025,6 @@ "ctxt": 0 }, "value": "r7arg2", - "typeAnnotation": null, "optional": false } } @@ -10252,8 +10059,8 @@ "ctxt": 0 }, "value": "r7b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -10273,7 +10080,6 @@ "ctxt": 0 }, "value": "r7arg2", - "typeAnnotation": null, "optional": false } }, @@ -10287,7 +10093,6 @@ "ctxt": 0 }, "value": "r7arg1", - "typeAnnotation": null, "optional": false } } @@ -10322,6 +10127,7 @@ "ctxt": 0 }, "value": "r8arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10345,6 +10151,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10368,6 +10175,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10390,13 +10198,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -10422,7 +10228,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10430,8 +10235,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, { "type": "Identifier", @@ -10441,6 +10245,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10464,6 +10269,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10486,13 +10292,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -10518,7 +10322,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10526,8 +10329,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": { @@ -10553,7 +10355,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10571,7 +10372,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10593,7 +10393,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -10611,7 +10410,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10643,6 +10441,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10665,13 +10464,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -10697,7 +10494,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10708,8 +10504,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -10741,6 +10536,7 @@ "ctxt": 0 }, "value": "r8arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10764,6 +10560,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10787,6 +10584,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10809,13 +10607,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -10841,7 +10637,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10849,8 +10644,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, { "type": "Identifier", @@ -10860,6 +10654,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10883,6 +10678,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10905,13 +10701,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -10937,7 +10731,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10945,8 +10738,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": null, @@ -10973,6 +10765,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10995,13 +10788,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -11027,7 +10818,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11038,8 +10828,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -11071,8 +10860,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -11089,7 +10878,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -11103,7 +10891,6 @@ "ctxt": 0 }, "value": "r8arg1", - "typeAnnotation": null, "optional": false } } @@ -11139,8 +10926,8 @@ "ctxt": 0 }, "value": "r8a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -11160,7 +10947,6 @@ "ctxt": 0 }, "value": "r8arg1", - "typeAnnotation": null, "optional": false } }, @@ -11174,7 +10960,6 @@ "ctxt": 0 }, "value": "r8arg2", - "typeAnnotation": null, "optional": false } } @@ -11209,8 +10994,8 @@ "ctxt": 0 }, "value": "r8b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -11230,7 +11015,6 @@ "ctxt": 0 }, "value": "r8arg2", - "typeAnnotation": null, "optional": false } }, @@ -11244,7 +11028,6 @@ "ctxt": 0 }, "value": "r8arg1", - "typeAnnotation": null, "optional": false } } @@ -11279,6 +11062,7 @@ "ctxt": 0 }, "value": "r9arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11302,6 +11086,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11325,6 +11110,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11347,13 +11133,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -11379,7 +11163,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11387,8 +11170,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, { "type": "Identifier", @@ -11398,6 +11180,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11421,6 +11204,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11452,7 +11236,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -11494,7 +11277,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -11522,8 +11304,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -11549,15 +11330,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -11583,7 +11362,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -11601,7 +11379,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11623,7 +11400,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -11641,7 +11417,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11673,6 +11448,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11695,13 +11471,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -11727,7 +11501,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11738,8 +11511,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -11771,6 +11543,7 @@ "ctxt": 0 }, "value": "r9arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11794,6 +11567,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11817,6 +11591,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11839,13 +11614,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -11871,7 +11644,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11879,8 +11651,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, { "type": "Identifier", @@ -11890,6 +11661,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11913,6 +11685,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11935,13 +11708,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -11967,7 +11738,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11975,8 +11745,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": null, @@ -12003,6 +11772,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12025,13 +11795,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -12057,7 +11825,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12068,8 +11835,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -12101,8 +11867,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -12119,7 +11885,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -12133,7 +11898,6 @@ "ctxt": 0 }, "value": "r9arg1", - "typeAnnotation": null, "optional": false } } @@ -12169,8 +11933,8 @@ "ctxt": 0 }, "value": "r9a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -12190,7 +11954,6 @@ "ctxt": 0 }, "value": "r9arg1", - "typeAnnotation": null, "optional": false } }, @@ -12204,7 +11967,6 @@ "ctxt": 0 }, "value": "r9arg2", - "typeAnnotation": null, "optional": false } } @@ -12239,8 +12001,8 @@ "ctxt": 0 }, "value": "r9b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -12260,7 +12022,6 @@ "ctxt": 0 }, "value": "r9arg2", - "typeAnnotation": null, "optional": false } }, @@ -12274,7 +12035,6 @@ "ctxt": 0 }, "value": "r9arg1", - "typeAnnotation": null, "optional": false } } @@ -12309,6 +12069,7 @@ "ctxt": 0 }, "value": "r10arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12344,8 +12105,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -12376,7 +12137,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12408,7 +12168,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -12426,7 +12185,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12457,7 +12215,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12465,8 +12222,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -12498,6 +12254,7 @@ "ctxt": 0 }, "value": "r10arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12533,8 +12290,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -12565,7 +12322,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12597,7 +12353,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12605,8 +12360,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -12638,8 +12392,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -12656,7 +12410,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -12670,7 +12423,6 @@ "ctxt": 0 }, "value": "r10arg1", - "typeAnnotation": null, "optional": false } } @@ -12706,8 +12458,8 @@ "ctxt": 0 }, "value": "r10a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -12727,7 +12479,6 @@ "ctxt": 0 }, "value": "r10arg1", - "typeAnnotation": null, "optional": false } }, @@ -12741,7 +12492,6 @@ "ctxt": 0 }, "value": "r10arg2", - "typeAnnotation": null, "optional": false } } @@ -12776,8 +12526,8 @@ "ctxt": 0 }, "value": "r10b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -12797,7 +12547,6 @@ "ctxt": 0 }, "value": "r10arg2", - "typeAnnotation": null, "optional": false } }, @@ -12811,7 +12560,6 @@ "ctxt": 0 }, "value": "r10arg1", - "typeAnnotation": null, "optional": false } } @@ -12846,6 +12594,7 @@ "ctxt": 0 }, "value": "r11arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12869,6 +12618,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12891,13 +12641,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -12907,6 +12655,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12929,13 +12678,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -12961,7 +12708,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -12979,7 +12725,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13010,7 +12755,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13018,8 +12762,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -13051,6 +12794,7 @@ "ctxt": 0 }, "value": "r11arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13074,6 +12818,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13105,7 +12850,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -13133,8 +12877,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -13144,6 +12887,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13175,7 +12919,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -13217,7 +12960,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -13245,8 +12987,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -13272,7 +13013,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13280,8 +13020,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -13313,8 +13052,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -13331,7 +13070,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -13345,7 +13083,6 @@ "ctxt": 0 }, "value": "r11arg1", - "typeAnnotation": null, "optional": false } } @@ -13381,8 +13118,8 @@ "ctxt": 0 }, "value": "r11a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -13402,7 +13139,6 @@ "ctxt": 0 }, "value": "r11arg1", - "typeAnnotation": null, "optional": false } }, @@ -13416,7 +13152,6 @@ "ctxt": 0 }, "value": "r11arg2", - "typeAnnotation": null, "optional": false } } @@ -13451,8 +13186,8 @@ "ctxt": 0 }, "value": "r11b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -13472,7 +13207,6 @@ "ctxt": 0 }, "value": "r11arg2", - "typeAnnotation": null, "optional": false } }, @@ -13486,7 +13220,6 @@ "ctxt": 0 }, "value": "r11arg1", - "typeAnnotation": null, "optional": false } } @@ -13521,6 +13254,7 @@ "ctxt": 0 }, "value": "r12arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13544,6 +13278,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13566,7 +13301,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13592,7 +13326,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13600,8 +13333,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -13611,6 +13343,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13633,13 +13366,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -13665,7 +13396,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -13683,7 +13413,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13709,7 +13438,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13743,7 +13471,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13769,7 +13496,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13780,8 +13506,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -13813,6 +13538,7 @@ "ctxt": 0 }, "value": "r12arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13836,6 +13562,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13858,7 +13585,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13884,7 +13610,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13892,8 +13617,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -13903,6 +13627,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13925,7 +13650,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -13951,7 +13675,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13959,8 +13682,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -13986,7 +13708,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14012,7 +13733,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14023,8 +13743,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -14056,8 +13775,8 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -14074,7 +13793,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -14088,7 +13806,6 @@ "ctxt": 0 }, "value": "r12arg1", - "typeAnnotation": null, "optional": false } } @@ -14124,8 +13841,8 @@ "ctxt": 0 }, "value": "r12a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -14145,7 +13862,6 @@ "ctxt": 0 }, "value": "r12arg1", - "typeAnnotation": null, "optional": false } }, @@ -14159,7 +13875,6 @@ "ctxt": 0 }, "value": "r12arg2", - "typeAnnotation": null, "optional": false } } @@ -14194,8 +13909,8 @@ "ctxt": 0 }, "value": "r12b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -14215,7 +13930,6 @@ "ctxt": 0 }, "value": "r12arg2", - "typeAnnotation": null, "optional": false } }, @@ -14229,7 +13943,6 @@ "ctxt": 0 }, "value": "r12arg1", - "typeAnnotation": null, "optional": false } } @@ -14264,6 +13977,7 @@ "ctxt": 0 }, "value": "r13arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -14287,6 +14001,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -14309,7 +14024,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14335,7 +14049,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14343,8 +14056,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -14354,6 +14066,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -14376,13 +14089,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -14408,7 +14119,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -14426,7 +14136,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14452,7 +14161,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14486,7 +14194,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14494,8 +14201,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -14527,6 +14233,7 @@ "ctxt": 0 }, "value": "r13arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -14550,6 +14257,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -14572,7 +14280,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14598,7 +14305,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14606,8 +14312,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -14617,6 +14322,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -14639,7 +14345,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14665,7 +14370,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14673,8 +14377,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -14700,7 +14403,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -14726,7 +14428,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -14737,8 +14438,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -14770,8 +14470,8 @@ "ctxt": 0 }, "value": "r13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -14788,7 +14488,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -14802,7 +14501,6 @@ "ctxt": 0 }, "value": "r13arg1", - "typeAnnotation": null, "optional": false } } @@ -14838,8 +14536,8 @@ "ctxt": 0 }, "value": "r13a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -14859,7 +14557,6 @@ "ctxt": 0 }, "value": "r13arg1", - "typeAnnotation": null, "optional": false } }, @@ -14873,7 +14570,6 @@ "ctxt": 0 }, "value": "r13arg2", - "typeAnnotation": null, "optional": false } } @@ -14908,8 +14604,8 @@ "ctxt": 0 }, "value": "r13b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -14929,7 +14625,6 @@ "ctxt": 0 }, "value": "r13arg2", - "typeAnnotation": null, "optional": false } }, @@ -14943,7 +14638,6 @@ "ctxt": 0 }, "value": "r13arg1", - "typeAnnotation": null, "optional": false } } @@ -14978,6 +14672,7 @@ "ctxt": 0 }, "value": "r14arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -15001,6 +14696,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -15032,7 +14728,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -15061,7 +14756,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -15085,7 +14779,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -15114,7 +14807,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -15124,8 +14816,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -15151,7 +14842,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -15181,7 +14871,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -15189,8 +14878,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -15222,6 +14910,7 @@ "ctxt": 0 }, "value": "r14arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -15245,6 +14934,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -15276,7 +14966,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -15318,7 +15007,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -15346,8 +15034,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -15373,7 +15060,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -15381,8 +15067,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -15414,8 +15099,8 @@ "ctxt": 0 }, "value": "r14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -15432,7 +15117,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -15446,7 +15130,6 @@ "ctxt": 0 }, "value": "r14arg1", - "typeAnnotation": null, "optional": false } } @@ -15482,8 +15165,8 @@ "ctxt": 0 }, "value": "r14a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -15503,7 +15186,6 @@ "ctxt": 0 }, "value": "r14arg1", - "typeAnnotation": null, "optional": false } }, @@ -15517,7 +15199,6 @@ "ctxt": 0 }, "value": "r14arg2", - "typeAnnotation": null, "optional": false } } @@ -15552,8 +15233,8 @@ "ctxt": 0 }, "value": "r14b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -15573,7 +15254,6 @@ "ctxt": 0 }, "value": "r14arg2", - "typeAnnotation": null, "optional": false } }, @@ -15587,7 +15267,6 @@ "ctxt": 0 }, "value": "r14arg1", - "typeAnnotation": null, "optional": false } } @@ -15622,6 +15301,7 @@ "ctxt": 0 }, "value": "r15arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -15645,6 +15325,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -15667,13 +15348,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -15699,7 +15378,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -15736,7 +15414,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -15745,8 +15422,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -15778,8 +15454,8 @@ "ctxt": 0 }, "value": "r15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -15796,7 +15472,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -15810,7 +15485,6 @@ "ctxt": 0 }, "value": "r15arg1", - "typeAnnotation": null, "optional": false } } @@ -15846,6 +15520,7 @@ "ctxt": 0 }, "value": "r16arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -15869,6 +15544,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -15891,13 +15567,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -15923,7 +15597,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -15941,7 +15614,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -15977,8 +15649,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -16010,8 +15681,8 @@ "ctxt": 0 }, "value": "r16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -16028,7 +15699,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -16042,7 +15712,6 @@ "ctxt": 0 }, "value": "r16arg1", - "typeAnnotation": null, "optional": false } } @@ -16078,6 +15747,7 @@ "ctxt": 0 }, "value": "r17arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -16101,6 +15771,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -16124,6 +15795,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -16146,13 +15818,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -16178,15 +15848,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -16212,7 +15880,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -16249,7 +15916,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -16258,8 +15924,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -16291,8 +15956,8 @@ "ctxt": 0 }, "value": "r17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -16309,7 +15974,6 @@ "ctxt": 0 }, "value": "foo17", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -16323,7 +15987,6 @@ "ctxt": 0 }, "value": "r17arg1", - "typeAnnotation": null, "optional": false } } @@ -16359,6 +16022,7 @@ "ctxt": 0 }, "value": "r18arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -16382,6 +16046,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -16405,6 +16070,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -16427,13 +16093,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -16459,15 +16123,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -16493,7 +16155,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -16530,7 +16191,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -16539,8 +16199,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -16572,8 +16231,8 @@ "ctxt": 0 }, "value": "r18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -16590,7 +16249,6 @@ "ctxt": 0 }, "value": "foo18", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -16604,7 +16262,6 @@ "ctxt": 0 }, "value": "r18arg1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures3/input.ts.json index 764e79e192f2..97af5ffec3b0 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures3/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "Errors", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -118,7 +115,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -144,7 +140,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -202,7 +196,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -228,7 +221,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -268,7 +260,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -286,7 +277,6 @@ "ctxt": 0 }, "value": "OtherDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -312,7 +302,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": null, @@ -352,7 +341,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -370,7 +358,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -391,6 +378,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -414,6 +402,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -430,8 +419,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -462,8 +450,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -499,7 +486,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -515,7 +501,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -536,6 +521,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -552,8 +538,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -595,7 +580,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -616,6 +600,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -639,6 +624,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -662,6 +648,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -684,13 +671,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -716,7 +701,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -724,8 +708,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": null, @@ -752,6 +735,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -774,13 +758,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -806,7 +788,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -817,8 +798,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -854,7 +834,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -870,7 +849,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -891,6 +869,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -907,8 +886,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -950,7 +928,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -971,6 +948,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -994,6 +972,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1017,6 +996,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1039,13 +1019,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1071,7 +1049,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1079,8 +1056,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, { "type": "Identifier", @@ -1090,6 +1066,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1113,6 +1090,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1135,13 +1113,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1167,7 +1143,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1175,8 +1150,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": null, @@ -1203,6 +1177,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1225,13 +1200,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1257,7 +1230,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1268,8 +1240,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -1305,7 +1276,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1321,7 +1291,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1342,6 +1311,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1358,8 +1328,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1401,7 +1370,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1422,6 +1390,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1457,8 +1426,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -1489,7 +1458,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1521,7 +1489,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1529,8 +1496,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -1566,7 +1532,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1582,7 +1547,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1603,6 +1567,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1619,8 +1584,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1662,7 +1626,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1683,6 +1646,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1706,6 +1670,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1737,7 +1702,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1765,8 +1729,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -1776,6 +1739,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1807,7 +1771,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1849,7 +1812,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1877,8 +1839,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -1904,7 +1865,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1912,8 +1872,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -1949,7 +1908,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1965,7 +1923,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1986,6 +1943,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2002,8 +1960,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2045,7 +2002,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2066,6 +2022,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2089,6 +2046,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2111,7 +2069,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2137,7 +2094,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2145,8 +2101,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -2156,6 +2111,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2178,7 +2134,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2204,7 +2159,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2212,8 +2166,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -2239,7 +2192,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2265,7 +2217,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2276,8 +2227,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -2313,7 +2263,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -2329,7 +2278,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2350,6 +2298,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2366,8 +2315,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2409,7 +2357,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2430,6 +2377,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2453,6 +2401,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2484,7 +2433,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2526,7 +2474,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2554,8 +2501,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -2578,8 +2524,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -2615,7 +2560,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -2631,7 +2575,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2652,6 +2595,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2668,8 +2612,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2711,7 +2654,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2732,6 +2674,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2763,6 +2706,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2794,6 +2738,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2810,8 +2755,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2849,6 +2793,7 @@ "ctxt": 0 }, "value": "a", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2865,8 +2810,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -2890,8 +2834,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2937,6 +2880,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2968,6 +2912,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2984,8 +2929,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3023,6 +2967,7 @@ "ctxt": 0 }, "value": "a", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3039,8 +2984,7 @@ }, "kind": "boolean" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -3064,8 +3008,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3097,8 +3040,7 @@ } ] } - }, - "optional": false + } } } ], @@ -3134,7 +3076,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -3150,7 +3091,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3171,6 +3111,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3187,8 +3128,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3230,7 +3170,6 @@ "ctxt": 0 }, "value": "foo17", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3251,6 +3190,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3282,6 +3222,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3313,6 +3254,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3335,13 +3277,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3366,7 +3306,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3395,7 +3334,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3413,7 +3351,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3439,6 +3376,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3461,13 +3399,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3492,7 +3428,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3521,7 +3456,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3539,7 +3473,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3551,8 +3484,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3598,6 +3530,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3629,6 +3562,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3651,13 +3585,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3682,7 +3614,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3711,7 +3642,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3729,7 +3659,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3755,6 +3684,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3777,13 +3707,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3808,7 +3736,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3837,7 +3764,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3855,7 +3781,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3867,8 +3792,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3900,8 +3824,7 @@ } ] } - }, - "optional": false + } } } ], @@ -3937,7 +3860,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -3953,7 +3875,6 @@ "ctxt": 0 }, "value": "foo17", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3974,6 +3895,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3990,8 +3912,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4048,6 +3969,7 @@ "ctxt": 0 }, "value": "r1arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4071,6 +3993,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4093,13 +4016,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4125,7 +4046,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4146,7 +4066,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4183,7 +4102,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4192,8 +4110,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -4225,6 +4142,7 @@ "ctxt": 0 }, "value": "r1arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4248,6 +4166,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4264,8 +4183,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -4296,8 +4214,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -4329,8 +4246,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4347,7 +4264,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4361,7 +4277,6 @@ "ctxt": 0 }, "value": "r1arg1", - "typeAnnotation": null, "optional": false } } @@ -4397,8 +4312,8 @@ "ctxt": 0 }, "value": "r1a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -4418,7 +4333,6 @@ "ctxt": 0 }, "value": "r1arg2", - "typeAnnotation": null, "optional": false } }, @@ -4432,7 +4346,6 @@ "ctxt": 0 }, "value": "r1arg1", - "typeAnnotation": null, "optional": false } } @@ -4467,8 +4380,8 @@ "ctxt": 0 }, "value": "r1b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -4488,7 +4401,6 @@ "ctxt": 0 }, "value": "r1arg1", - "typeAnnotation": null, "optional": false } }, @@ -4502,7 +4414,6 @@ "ctxt": 0 }, "value": "r1arg2", - "typeAnnotation": null, "optional": false } } @@ -4537,6 +4448,7 @@ "ctxt": 0 }, "value": "r2arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4560,6 +4472,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4583,6 +4496,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4605,13 +4519,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4637,7 +4549,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4645,8 +4556,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": { @@ -4672,7 +4582,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4690,7 +4599,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4712,7 +4620,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4730,7 +4637,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4752,7 +4658,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4770,7 +4675,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4802,6 +4706,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4824,13 +4729,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4856,7 +4759,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4867,8 +4769,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -4900,6 +4801,7 @@ "ctxt": 0 }, "value": "r2arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4923,6 +4825,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4946,6 +4849,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4968,13 +4872,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5000,7 +4902,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5008,8 +4909,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": null, @@ -5036,6 +4936,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5058,13 +4959,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5090,7 +4989,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5101,8 +4999,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -5134,8 +5031,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5152,7 +5049,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5166,7 +5062,6 @@ "ctxt": 0 }, "value": "r2arg1", - "typeAnnotation": null, "optional": false } } @@ -5202,8 +5097,8 @@ "ctxt": 0 }, "value": "r2a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -5223,7 +5118,6 @@ "ctxt": 0 }, "value": "r2arg2", - "typeAnnotation": null, "optional": false } }, @@ -5237,7 +5131,6 @@ "ctxt": 0 }, "value": "r2arg1", - "typeAnnotation": null, "optional": false } } @@ -5272,8 +5165,8 @@ "ctxt": 0 }, "value": "r2b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -5293,7 +5186,6 @@ "ctxt": 0 }, "value": "r2arg1", - "typeAnnotation": null, "optional": false } }, @@ -5307,7 +5199,6 @@ "ctxt": 0 }, "value": "r2arg2", - "typeAnnotation": null, "optional": false } } @@ -5342,6 +5233,7 @@ "ctxt": 0 }, "value": "r3arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5365,6 +5257,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5388,6 +5281,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5410,13 +5304,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5442,7 +5334,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5450,8 +5341,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, { "type": "Identifier", @@ -5461,6 +5351,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5484,6 +5375,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5515,7 +5407,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5543,8 +5434,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -5570,15 +5460,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -5604,7 +5492,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5622,7 +5509,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5644,7 +5530,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5662,7 +5547,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5694,6 +5578,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5716,13 +5601,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5748,7 +5631,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5759,8 +5641,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -5792,6 +5673,7 @@ "ctxt": 0 }, "value": "r3arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5815,6 +5697,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5838,6 +5721,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5860,13 +5744,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5892,15 +5774,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -5910,6 +5790,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5933,6 +5814,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5955,13 +5837,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5987,7 +5867,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5995,8 +5874,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": null, @@ -6023,6 +5901,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6045,13 +5924,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6077,7 +5954,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6088,8 +5964,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -6121,8 +5996,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6139,7 +6014,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6153,7 +6027,6 @@ "ctxt": 0 }, "value": "r3arg1", - "typeAnnotation": null, "optional": false } } @@ -6189,8 +6062,8 @@ "ctxt": 0 }, "value": "r3a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -6210,7 +6083,6 @@ "ctxt": 0 }, "value": "r3arg2", - "typeAnnotation": null, "optional": false } }, @@ -6224,7 +6096,6 @@ "ctxt": 0 }, "value": "r3arg1", - "typeAnnotation": null, "optional": false } } @@ -6259,8 +6130,8 @@ "ctxt": 0 }, "value": "r3b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -6280,7 +6151,6 @@ "ctxt": 0 }, "value": "r3arg1", - "typeAnnotation": null, "optional": false } }, @@ -6294,7 +6164,6 @@ "ctxt": 0 }, "value": "r3arg2", - "typeAnnotation": null, "optional": false } } @@ -6329,6 +6198,7 @@ "ctxt": 0 }, "value": "r4arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6364,8 +6234,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -6396,7 +6266,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6428,7 +6297,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6446,7 +6314,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6477,7 +6344,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6485,8 +6351,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -6518,6 +6383,7 @@ "ctxt": 0 }, "value": "r4arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6553,8 +6419,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -6585,7 +6451,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6617,7 +6482,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6625,8 +6489,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -6658,8 +6521,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6676,7 +6539,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6690,7 +6552,6 @@ "ctxt": 0 }, "value": "r4arg1", - "typeAnnotation": null, "optional": false } } @@ -6726,8 +6587,8 @@ "ctxt": 0 }, "value": "r4a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -6747,7 +6608,6 @@ "ctxt": 0 }, "value": "r4arg2", - "typeAnnotation": null, "optional": false } }, @@ -6761,7 +6621,6 @@ "ctxt": 0 }, "value": "r4arg1", - "typeAnnotation": null, "optional": false } } @@ -6796,8 +6655,8 @@ "ctxt": 0 }, "value": "r4b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -6817,7 +6676,6 @@ "ctxt": 0 }, "value": "r4arg1", - "typeAnnotation": null, "optional": false } }, @@ -6831,7 +6689,6 @@ "ctxt": 0 }, "value": "r4arg2", - "typeAnnotation": null, "optional": false } } @@ -6866,6 +6723,7 @@ "ctxt": 0 }, "value": "r5arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6889,6 +6747,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6911,13 +6770,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -6927,6 +6784,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6949,13 +6807,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6981,7 +6837,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6999,7 +6854,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7030,7 +6884,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7038,8 +6891,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -7071,6 +6923,7 @@ "ctxt": 0 }, "value": "r5arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7094,6 +6947,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7125,7 +6979,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7153,8 +7006,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -7164,6 +7016,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7195,7 +7048,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7237,7 +7089,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7265,8 +7116,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -7292,7 +7142,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7300,8 +7149,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -7333,8 +7181,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7351,7 +7199,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7365,7 +7212,6 @@ "ctxt": 0 }, "value": "r5arg1", - "typeAnnotation": null, "optional": false } } @@ -7401,8 +7247,8 @@ "ctxt": 0 }, "value": "r5a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -7422,7 +7268,6 @@ "ctxt": 0 }, "value": "r5arg2", - "typeAnnotation": null, "optional": false } }, @@ -7436,7 +7281,6 @@ "ctxt": 0 }, "value": "r5arg1", - "typeAnnotation": null, "optional": false } } @@ -7471,8 +7315,8 @@ "ctxt": 0 }, "value": "r5b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -7492,7 +7336,6 @@ "ctxt": 0 }, "value": "r5arg1", - "typeAnnotation": null, "optional": false } }, @@ -7506,7 +7349,6 @@ "ctxt": 0 }, "value": "r5arg2", - "typeAnnotation": null, "optional": false } } @@ -7541,6 +7383,7 @@ "ctxt": 0 }, "value": "r6arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7564,6 +7407,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7586,7 +7430,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7612,7 +7455,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7620,8 +7462,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -7631,6 +7472,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7653,7 +7495,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7679,7 +7520,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7687,8 +7527,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -7714,7 +7553,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7740,7 +7578,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7751,8 +7588,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -7784,6 +7620,7 @@ "ctxt": 0 }, "value": "r6arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7807,6 +7644,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7829,7 +7667,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7855,7 +7692,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7863,8 +7699,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -7874,6 +7709,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7896,7 +7732,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7922,7 +7757,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7930,8 +7764,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": { @@ -7957,7 +7790,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7975,7 +7807,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8001,7 +7832,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8035,7 +7865,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8043,8 +7872,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -8076,8 +7904,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -8094,7 +7922,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8108,7 +7935,6 @@ "ctxt": 0 }, "value": "r6arg1", - "typeAnnotation": null, "optional": false } } @@ -8144,8 +7970,8 @@ "ctxt": 0 }, "value": "r6a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -8165,7 +7991,6 @@ "ctxt": 0 }, "value": "r6arg2", - "typeAnnotation": null, "optional": false } }, @@ -8179,7 +8004,6 @@ "ctxt": 0 }, "value": "r6arg1", - "typeAnnotation": null, "optional": false } } @@ -8214,8 +8038,8 @@ "ctxt": 0 }, "value": "r6b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -8235,7 +8059,6 @@ "ctxt": 0 }, "value": "r6arg1", - "typeAnnotation": null, "optional": false } }, @@ -8249,7 +8072,6 @@ "ctxt": 0 }, "value": "r6arg2", - "typeAnnotation": null, "optional": false } } @@ -8284,6 +8106,7 @@ "ctxt": 0 }, "value": "r7arg1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8307,6 +8130,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8338,7 +8162,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8367,7 +8190,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8391,7 +8213,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8420,7 +8241,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8430,8 +8250,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -8457,7 +8276,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8487,7 +8305,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8495,8 +8312,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -8528,6 +8344,7 @@ "ctxt": 0 }, "value": "r7arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8551,6 +8368,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8582,7 +8400,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8624,7 +8441,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8652,8 +8468,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -8676,8 +8491,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -8709,8 +8523,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -8727,7 +8541,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8741,7 +8554,6 @@ "ctxt": 0 }, "value": "r7arg1", - "typeAnnotation": null, "optional": false } } @@ -8777,8 +8589,8 @@ "ctxt": 0 }, "value": "r7a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -8798,7 +8610,6 @@ "ctxt": 0 }, "value": "r7arg2", - "typeAnnotation": null, "optional": false } }, @@ -8812,7 +8623,6 @@ "ctxt": 0 }, "value": "r7arg1", - "typeAnnotation": null, "optional": false } } @@ -8847,8 +8657,8 @@ "ctxt": 0 }, "value": "r7b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -8868,7 +8678,6 @@ "ctxt": 0 }, "value": "r7arg1", - "typeAnnotation": null, "optional": false } }, @@ -8882,7 +8691,6 @@ "ctxt": 0 }, "value": "r7arg2", - "typeAnnotation": null, "optional": false } } @@ -8917,6 +8725,7 @@ "ctxt": 0 }, "value": "r7arg3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8940,6 +8749,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8971,7 +8781,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9000,7 +8809,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9024,7 +8832,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9053,7 +8860,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9063,8 +8869,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -9090,7 +8895,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9108,7 +8912,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9136,8 +8939,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -9169,8 +8971,8 @@ "ctxt": 0 }, "value": "r7c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9187,7 +8989,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9201,7 +9002,6 @@ "ctxt": 0 }, "value": "r7arg3", - "typeAnnotation": null, "optional": false } } @@ -9237,8 +9037,8 @@ "ctxt": 0 }, "value": "r7d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -9258,7 +9058,6 @@ "ctxt": 0 }, "value": "r7arg2", - "typeAnnotation": null, "optional": false } }, @@ -9272,7 +9071,6 @@ "ctxt": 0 }, "value": "r7arg3", - "typeAnnotation": null, "optional": false } } @@ -9307,8 +9105,8 @@ "ctxt": 0 }, "value": "r7e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -9328,7 +9126,6 @@ "ctxt": 0 }, "value": "r7arg3", - "typeAnnotation": null, "optional": false } }, @@ -9342,7 +9139,6 @@ "ctxt": 0 }, "value": "r7arg2", - "typeAnnotation": null, "optional": false } } @@ -9377,6 +9173,7 @@ "ctxt": 0 }, "value": "r8arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9400,6 +9197,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9423,6 +9221,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9445,13 +9244,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -9477,7 +9274,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9485,8 +9281,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": { @@ -9512,7 +9307,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9549,7 +9343,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9558,8 +9351,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -9591,8 +9383,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9609,7 +9401,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9623,7 +9414,6 @@ "ctxt": 0 }, "value": "r8arg", - "typeAnnotation": null, "optional": false } } @@ -9659,6 +9449,7 @@ "ctxt": 0 }, "value": "r9arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9682,6 +9473,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9705,6 +9497,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9727,13 +9520,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -9759,7 +9550,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9767,8 +9557,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": { @@ -9794,7 +9583,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9829,8 +9617,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -9862,8 +9649,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9880,7 +9667,6 @@ "ctxt": 0 }, "value": "foo17", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9894,7 +9680,6 @@ "ctxt": 0 }, "value": "r9arg", - "typeAnnotation": null, "optional": false } } @@ -9925,7 +9710,6 @@ "ctxt": 0 }, "value": "WithGenericSignaturesInBaseType", - "typeAnnotation": null, "optional": false }, "body": { @@ -9946,7 +9730,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -9967,6 +9750,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9990,6 +9774,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10012,13 +9797,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -10044,7 +9827,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10081,7 +9863,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10090,8 +9871,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -10127,7 +9907,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -10143,7 +9922,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -10164,6 +9942,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10180,8 +9959,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -10238,6 +10016,7 @@ "ctxt": 0 }, "value": "r2arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10261,6 +10040,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10283,13 +10063,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -10315,7 +10093,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10350,8 +10127,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -10383,8 +10159,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -10401,7 +10177,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -10415,7 +10190,6 @@ "ctxt": 0 }, "value": "r2arg2", - "typeAnnotation": null, "optional": false } } @@ -10436,7 +10210,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -10457,6 +10230,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10480,6 +10254,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10502,13 +10277,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -10534,7 +10307,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10569,8 +10341,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -10606,7 +10377,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -10622,7 +10392,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -10643,6 +10412,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10659,8 +10429,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -10717,6 +10486,7 @@ "ctxt": 0 }, "value": "r3arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10740,6 +10510,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10762,13 +10533,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -10794,7 +10563,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10831,7 +10599,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10840,8 +10607,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -10873,8 +10639,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -10891,7 +10657,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -10905,7 +10670,6 @@ "ctxt": 0 }, "value": "r3arg2", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures4/input.ts.json index 69d6d953fdf5..7840f8b8095d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "OtherDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -284,7 +275,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": null, @@ -324,7 +314,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -342,7 +331,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -363,6 +351,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -386,6 +375,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -408,13 +398,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -440,7 +428,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -477,7 +464,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -486,8 +472,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -513,7 +498,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -534,6 +518,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -550,8 +535,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -593,7 +577,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -614,6 +597,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -637,6 +621,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -659,13 +644,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -691,7 +674,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -726,8 +708,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -753,7 +734,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -774,6 +754,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -790,8 +771,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -833,7 +813,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -854,6 +833,7 @@ "ctxt": 0 }, "value": "a3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -877,6 +857,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -899,13 +880,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -931,7 +910,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -958,8 +936,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -985,7 +962,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1006,6 +982,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1022,8 +999,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1065,7 +1041,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1086,6 +1061,7 @@ "ctxt": 0 }, "value": "a4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1109,6 +1085,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1131,13 +1108,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1147,6 +1122,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1169,13 +1145,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -1201,7 +1175,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1222,7 +1195,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1249,8 +1221,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -1276,7 +1247,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1297,6 +1267,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1313,8 +1284,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1356,7 +1326,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1377,6 +1346,7 @@ "ctxt": 0 }, "value": "a5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1400,6 +1370,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1423,6 +1394,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1445,13 +1417,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1477,7 +1447,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1485,8 +1454,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": { @@ -1512,7 +1480,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1533,7 +1500,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1563,7 +1529,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1571,8 +1536,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -1598,7 +1562,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1619,6 +1582,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1635,8 +1599,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1678,7 +1641,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1699,6 +1661,7 @@ "ctxt": 0 }, "value": "a6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1722,6 +1685,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1745,6 +1709,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1767,13 +1732,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1799,7 +1762,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1807,8 +1769,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": { @@ -1834,7 +1795,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1852,7 +1812,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1883,7 +1842,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1891,8 +1849,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -1918,7 +1875,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1939,6 +1895,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1955,8 +1912,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1998,7 +1954,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2019,6 +1974,7 @@ "ctxt": 0 }, "value": "a11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2042,6 +1998,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2073,7 +2030,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2102,7 +2058,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2112,8 +2067,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -2123,6 +2077,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2154,7 +2109,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2183,7 +2137,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2207,7 +2160,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2236,7 +2188,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2246,8 +2197,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -2273,7 +2223,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2303,7 +2252,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2311,8 +2259,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -2338,7 +2285,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2359,6 +2305,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2375,8 +2322,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2418,7 +2364,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2439,6 +2384,7 @@ "ctxt": 0 }, "value": "a15", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2462,6 +2408,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2493,7 +2440,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2522,7 +2468,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2546,7 +2491,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2575,7 +2519,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2585,8 +2528,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -2612,7 +2554,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2649,7 +2590,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2658,8 +2598,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -2685,7 +2624,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2706,6 +2644,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2722,8 +2661,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2765,7 +2703,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2786,6 +2723,7 @@ "ctxt": 0 }, "value": "a16", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2809,6 +2747,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2840,7 +2779,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2869,7 +2807,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2893,7 +2830,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2922,7 +2858,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2932,8 +2867,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -2959,7 +2893,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2977,7 +2910,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3015,7 +2947,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3024,8 +2955,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -3051,7 +2981,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3072,6 +3001,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3088,8 +3018,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3131,7 +3060,6 @@ "ctxt": 0 }, "value": "foo17", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3152,6 +3080,7 @@ "ctxt": 0 }, "value": "a17", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3183,6 +3112,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3206,6 +3136,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3228,13 +3159,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3260,7 +3189,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3268,8 +3196,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3301,7 +3228,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3331,7 +3257,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3349,7 +3274,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3375,6 +3299,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3398,6 +3323,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3420,13 +3346,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3452,7 +3376,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3460,8 +3383,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3493,7 +3415,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3523,7 +3444,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3541,7 +3461,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3553,8 +3472,7 @@ } ] } - }, - "optional": false + } } } ], @@ -3580,7 +3498,6 @@ "ctxt": 0 }, "value": "foo17", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3601,6 +3518,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3617,8 +3535,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3660,7 +3577,6 @@ "ctxt": 0 }, "value": "foo18", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3681,6 +3597,7 @@ "ctxt": 0 }, "value": "a18", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3712,6 +3629,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3743,6 +3661,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3765,13 +3684,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3796,7 +3713,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3825,7 +3741,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3843,7 +3758,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3869,6 +3783,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3891,13 +3806,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3922,7 +3835,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3951,7 +3863,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3969,7 +3880,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3981,8 +3891,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4028,6 +3937,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4059,6 +3969,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4081,13 +3992,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4112,7 +4021,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4141,7 +4049,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4159,7 +4066,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4185,6 +4091,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4207,13 +4114,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4238,7 +4143,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4267,7 +4171,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4285,7 +4188,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4297,8 +4199,7 @@ } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4330,8 +4231,7 @@ } ] } - }, - "optional": false + } } } ], @@ -4357,7 +4257,6 @@ "ctxt": 0 }, "value": "foo18", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4378,6 +4277,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4394,8 +4294,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4452,6 +4351,7 @@ "ctxt": 0 }, "value": "r1arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4475,6 +4375,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4497,13 +4398,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4529,7 +4428,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4566,7 +4464,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4575,8 +4472,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -4608,6 +4504,7 @@ "ctxt": 0 }, "value": "r1arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4631,6 +4528,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4653,13 +4551,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -4685,7 +4581,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4722,7 +4617,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4731,8 +4625,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -4764,8 +4657,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4782,7 +4675,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4796,7 +4688,6 @@ "ctxt": 0 }, "value": "r1arg", - "typeAnnotation": null, "optional": false } } @@ -4832,8 +4723,8 @@ "ctxt": 0 }, "value": "r1a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -4853,7 +4744,6 @@ "ctxt": 0 }, "value": "r1arg", - "typeAnnotation": null, "optional": false } }, @@ -4867,7 +4757,6 @@ "ctxt": 0 }, "value": "r1arg2", - "typeAnnotation": null, "optional": false } } @@ -4902,8 +4791,8 @@ "ctxt": 0 }, "value": "r1b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -4923,7 +4812,6 @@ "ctxt": 0 }, "value": "r1arg2", - "typeAnnotation": null, "optional": false } }, @@ -4937,7 +4825,6 @@ "ctxt": 0 }, "value": "r1arg", - "typeAnnotation": null, "optional": false } } @@ -4972,6 +4859,7 @@ "ctxt": 0 }, "value": "r2arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4995,6 +4883,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5017,13 +4906,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -5049,7 +4936,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5084,8 +4970,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -5117,6 +5002,7 @@ "ctxt": 0 }, "value": "r2arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5140,6 +5026,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5162,13 +5049,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -5194,7 +5079,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5229,8 +5113,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -5262,8 +5145,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5280,7 +5163,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5294,7 +5176,6 @@ "ctxt": 0 }, "value": "r2arg", - "typeAnnotation": null, "optional": false } } @@ -5330,8 +5211,8 @@ "ctxt": 0 }, "value": "r2a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -5351,7 +5232,6 @@ "ctxt": 0 }, "value": "r2arg", - "typeAnnotation": null, "optional": false } }, @@ -5365,7 +5245,6 @@ "ctxt": 0 }, "value": "r2arg2", - "typeAnnotation": null, "optional": false } } @@ -5400,8 +5279,8 @@ "ctxt": 0 }, "value": "r2b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -5421,7 +5300,6 @@ "ctxt": 0 }, "value": "r2arg2", - "typeAnnotation": null, "optional": false } }, @@ -5435,7 +5313,6 @@ "ctxt": 0 }, "value": "r2arg", - "typeAnnotation": null, "optional": false } } @@ -5470,6 +5347,7 @@ "ctxt": 0 }, "value": "r3arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5493,6 +5371,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5515,13 +5394,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -5547,7 +5424,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5577,7 +5453,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5585,8 +5460,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -5618,6 +5492,7 @@ "ctxt": 0 }, "value": "r3arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5641,6 +5516,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5663,13 +5539,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -5695,7 +5569,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5722,8 +5595,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -5755,8 +5627,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5773,7 +5645,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5787,7 +5658,6 @@ "ctxt": 0 }, "value": "r3arg", - "typeAnnotation": null, "optional": false } } @@ -5823,8 +5693,8 @@ "ctxt": 0 }, "value": "r3a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -5844,7 +5714,6 @@ "ctxt": 0 }, "value": "r3arg", - "typeAnnotation": null, "optional": false } }, @@ -5858,7 +5727,6 @@ "ctxt": 0 }, "value": "r3arg2", - "typeAnnotation": null, "optional": false } } @@ -5893,8 +5761,8 @@ "ctxt": 0 }, "value": "r3b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -5914,7 +5782,6 @@ "ctxt": 0 }, "value": "r3arg2", - "typeAnnotation": null, "optional": false } }, @@ -5928,7 +5795,6 @@ "ctxt": 0 }, "value": "r3arg", - "typeAnnotation": null, "optional": false } } @@ -5963,6 +5829,7 @@ "ctxt": 0 }, "value": "r4arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5986,6 +5853,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6008,13 +5876,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -6024,6 +5890,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6046,13 +5913,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6078,7 +5943,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6099,7 +5963,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6126,8 +5989,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -6159,6 +6021,7 @@ "ctxt": 0 }, "value": "r4arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6182,6 +6045,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6204,13 +6068,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -6220,6 +6082,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6242,13 +6105,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6274,7 +6135,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6295,7 +6155,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6322,8 +6181,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -6355,8 +6213,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6373,7 +6231,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6387,7 +6244,6 @@ "ctxt": 0 }, "value": "r4arg", - "typeAnnotation": null, "optional": false } } @@ -6423,8 +6279,8 @@ "ctxt": 0 }, "value": "r4a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -6444,7 +6300,6 @@ "ctxt": 0 }, "value": "r4arg", - "typeAnnotation": null, "optional": false } }, @@ -6458,7 +6313,6 @@ "ctxt": 0 }, "value": "r4arg2", - "typeAnnotation": null, "optional": false } } @@ -6493,8 +6347,8 @@ "ctxt": 0 }, "value": "r4b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -6514,7 +6368,6 @@ "ctxt": 0 }, "value": "r4arg2", - "typeAnnotation": null, "optional": false } }, @@ -6528,7 +6381,6 @@ "ctxt": 0 }, "value": "r4arg", - "typeAnnotation": null, "optional": false } } @@ -6563,6 +6415,7 @@ "ctxt": 0 }, "value": "r5arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6586,6 +6439,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6609,6 +6463,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6631,13 +6486,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6663,7 +6516,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6671,8 +6523,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": { @@ -6698,7 +6549,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6719,7 +6569,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6749,7 +6598,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6757,8 +6605,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -6790,6 +6637,7 @@ "ctxt": 0 }, "value": "r5arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6813,6 +6661,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6836,6 +6685,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6858,13 +6708,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6890,7 +6738,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6898,8 +6745,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": { @@ -6925,7 +6771,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6946,7 +6791,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6976,7 +6820,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6984,8 +6827,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -7017,8 +6859,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7035,7 +6877,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7049,7 +6890,6 @@ "ctxt": 0 }, "value": "r5arg", - "typeAnnotation": null, "optional": false } } @@ -7085,8 +6925,8 @@ "ctxt": 0 }, "value": "r5a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -7106,7 +6946,6 @@ "ctxt": 0 }, "value": "r5arg", - "typeAnnotation": null, "optional": false } }, @@ -7120,7 +6959,6 @@ "ctxt": 0 }, "value": "r5arg2", - "typeAnnotation": null, "optional": false } } @@ -7155,8 +6993,8 @@ "ctxt": 0 }, "value": "r5b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -7176,7 +7014,6 @@ "ctxt": 0 }, "value": "r5arg2", - "typeAnnotation": null, "optional": false } }, @@ -7190,7 +7027,6 @@ "ctxt": 0 }, "value": "r5arg", - "typeAnnotation": null, "optional": false } } @@ -7225,6 +7061,7 @@ "ctxt": 0 }, "value": "r6arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7248,6 +7085,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7271,6 +7109,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7293,13 +7132,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -7325,7 +7162,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7333,8 +7169,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": { @@ -7360,7 +7195,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7378,7 +7212,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7400,7 +7233,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7418,7 +7250,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7449,7 +7280,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7457,8 +7287,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -7490,6 +7319,7 @@ "ctxt": 0 }, "value": "r6arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7513,6 +7343,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7536,6 +7367,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7558,13 +7390,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -7590,7 +7420,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7598,8 +7427,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": { @@ -7625,7 +7453,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -7643,7 +7470,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7674,7 +7500,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7682,8 +7507,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -7715,8 +7539,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -7733,7 +7557,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7747,7 +7570,6 @@ "ctxt": 0 }, "value": "r6arg", - "typeAnnotation": null, "optional": false } } @@ -7783,8 +7605,8 @@ "ctxt": 0 }, "value": "r6a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -7804,7 +7626,6 @@ "ctxt": 0 }, "value": "r6arg", - "typeAnnotation": null, "optional": false } }, @@ -7818,7 +7639,6 @@ "ctxt": 0 }, "value": "r6arg2", - "typeAnnotation": null, "optional": false } } @@ -7853,8 +7673,8 @@ "ctxt": 0 }, "value": "r6b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -7874,7 +7694,6 @@ "ctxt": 0 }, "value": "r6arg2", - "typeAnnotation": null, "optional": false } }, @@ -7888,7 +7707,6 @@ "ctxt": 0 }, "value": "r6arg", - "typeAnnotation": null, "optional": false } } @@ -7923,6 +7741,7 @@ "ctxt": 0 }, "value": "r11arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7946,6 +7765,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7977,7 +7797,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8006,7 +7825,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8016,8 +7834,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -8027,6 +7844,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8058,7 +7876,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8087,7 +7904,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8111,7 +7927,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8140,7 +7955,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8150,8 +7964,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -8177,7 +7990,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8198,7 +8010,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8228,7 +8039,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8236,8 +8046,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -8269,6 +8078,7 @@ "ctxt": 0 }, "value": "r11arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8292,6 +8102,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8323,7 +8134,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8352,7 +8162,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8362,8 +8171,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -8373,6 +8181,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8404,7 +8213,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8433,7 +8241,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8457,7 +8264,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8486,7 +8292,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8496,8 +8301,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -8523,7 +8327,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8553,7 +8356,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8561,8 +8363,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -8594,8 +8395,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -8612,7 +8413,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8626,7 +8426,6 @@ "ctxt": 0 }, "value": "r11arg", - "typeAnnotation": null, "optional": false } } @@ -8662,8 +8461,8 @@ "ctxt": 0 }, "value": "r11a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -8683,7 +8482,6 @@ "ctxt": 0 }, "value": "r11arg", - "typeAnnotation": null, "optional": false } }, @@ -8697,7 +8495,6 @@ "ctxt": 0 }, "value": "r11arg2", - "typeAnnotation": null, "optional": false } } @@ -8732,8 +8529,8 @@ "ctxt": 0 }, "value": "r11b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -8753,7 +8550,6 @@ "ctxt": 0 }, "value": "r11arg2", - "typeAnnotation": null, "optional": false } }, @@ -8767,7 +8563,6 @@ "ctxt": 0 }, "value": "r11arg", - "typeAnnotation": null, "optional": false } } @@ -8802,6 +8597,7 @@ "ctxt": 0 }, "value": "r15arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8825,6 +8621,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8856,7 +8653,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8885,7 +8681,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8909,7 +8704,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8938,7 +8732,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8948,8 +8741,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -8975,7 +8767,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8996,7 +8787,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9033,7 +8823,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9042,8 +8831,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -9075,6 +8863,7 @@ "ctxt": 0 }, "value": "r15arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9098,6 +8887,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9129,7 +8919,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9158,7 +8947,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9182,7 +8970,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9211,7 +8998,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9221,8 +9007,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -9248,7 +9033,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9285,7 +9069,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9294,8 +9077,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -9327,8 +9109,8 @@ "ctxt": 0 }, "value": "r15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -9345,7 +9127,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -9359,7 +9140,6 @@ "ctxt": 0 }, "value": "r15arg", - "typeAnnotation": null, "optional": false } } @@ -9395,8 +9175,8 @@ "ctxt": 0 }, "value": "r15a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -9416,7 +9196,6 @@ "ctxt": 0 }, "value": "r15arg", - "typeAnnotation": null, "optional": false } }, @@ -9430,7 +9209,6 @@ "ctxt": 0 }, "value": "r15arg2", - "typeAnnotation": null, "optional": false } } @@ -9465,8 +9243,8 @@ "ctxt": 0 }, "value": "r15b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -9486,7 +9264,6 @@ "ctxt": 0 }, "value": "r15arg2", - "typeAnnotation": null, "optional": false } }, @@ -9500,7 +9277,6 @@ "ctxt": 0 }, "value": "r15arg", - "typeAnnotation": null, "optional": false } } @@ -9535,6 +9311,7 @@ "ctxt": 0 }, "value": "r16arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9558,6 +9335,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9589,7 +9367,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9618,7 +9395,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9642,7 +9418,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9671,7 +9446,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9681,8 +9455,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -9708,7 +9481,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9726,7 +9498,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9764,7 +9535,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9773,8 +9543,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -9806,6 +9575,7 @@ "ctxt": 0 }, "value": "r16arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9829,6 +9599,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9860,7 +9631,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9889,7 +9659,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9913,7 +9682,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9942,7 +9710,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9952,8 +9719,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -9979,7 +9745,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -9997,7 +9762,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10035,7 +9799,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10044,8 +9807,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -10077,8 +9839,8 @@ "ctxt": 0 }, "value": "r16", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -10095,7 +9857,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -10109,7 +9870,6 @@ "ctxt": 0 }, "value": "r16arg", - "typeAnnotation": null, "optional": false } } @@ -10145,8 +9905,8 @@ "ctxt": 0 }, "value": "r16a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -10166,7 +9926,6 @@ "ctxt": 0 }, "value": "r16arg", - "typeAnnotation": null, "optional": false } }, @@ -10180,7 +9939,6 @@ "ctxt": 0 }, "value": "r16arg2", - "typeAnnotation": null, "optional": false } } @@ -10215,8 +9973,8 @@ "ctxt": 0 }, "value": "r16b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -10236,7 +9994,6 @@ "ctxt": 0 }, "value": "r16arg2", - "typeAnnotation": null, "optional": false } }, @@ -10250,7 +10007,6 @@ "ctxt": 0 }, "value": "r16arg", - "typeAnnotation": null, "optional": false } } @@ -10285,6 +10041,7 @@ "ctxt": 0 }, "value": "r17arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10308,6 +10065,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10331,6 +10089,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10353,13 +10112,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -10385,7 +10142,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10393,8 +10149,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": { @@ -10420,7 +10175,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10457,7 +10211,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10466,8 +10219,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -10499,8 +10251,8 @@ "ctxt": 0 }, "value": "r17", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -10517,7 +10269,6 @@ "ctxt": 0 }, "value": "foo17", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -10531,7 +10282,6 @@ "ctxt": 0 }, "value": "r17arg", - "typeAnnotation": null, "optional": false } } @@ -10567,6 +10317,7 @@ "ctxt": 0 }, "value": "r18arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10590,6 +10341,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10613,6 +10365,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10635,13 +10388,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -10667,7 +10418,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10697,7 +10447,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10705,8 +10454,7 @@ }, "isAbstract": false } - }, - "optional": false + } } ], "typeParams": null, @@ -10737,8 +10485,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -10770,8 +10517,8 @@ "ctxt": 0 }, "value": "r18", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -10788,7 +10535,6 @@ "ctxt": 0 }, "value": "foo18", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -10802,7 +10548,6 @@ "ctxt": 0 }, "value": "r18arg", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures5/input.ts.json index cafbf753febe..2f55d981eb4e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "OtherDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -284,7 +275,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": null, @@ -324,7 +314,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -347,7 +336,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -377,7 +365,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -407,6 +394,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -423,8 +411,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -474,7 +461,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -504,6 +490,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -520,8 +507,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -571,7 +557,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -601,6 +586,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -617,8 +603,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -660,7 +645,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -690,6 +674,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -706,8 +691,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -717,6 +701,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -733,8 +718,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -776,7 +760,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -806,6 +789,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -829,6 +813,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -845,8 +830,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -868,8 +852,7 @@ } } } - }, - "optional": false + } } ], "typeParams": null, @@ -911,7 +894,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -941,6 +923,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -964,6 +947,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -986,13 +970,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1018,15 +1000,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1052,7 +1032,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1079,7 +1058,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1109,6 +1087,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1132,6 +1111,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1154,13 +1134,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1186,15 +1164,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1221,6 +1197,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1243,13 +1220,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1275,7 +1250,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1304,7 +1278,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1334,6 +1307,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1357,6 +1331,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1379,13 +1354,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1411,15 +1384,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -1429,6 +1400,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1452,6 +1424,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1474,13 +1447,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1506,15 +1477,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1541,6 +1510,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1563,13 +1533,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1595,7 +1563,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1624,7 +1591,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1654,6 +1620,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1677,6 +1644,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1699,13 +1667,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1731,15 +1697,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -1749,6 +1713,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1772,6 +1737,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1794,13 +1760,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1826,15 +1790,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": null, @@ -1861,6 +1823,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1883,13 +1846,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1915,7 +1876,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1944,7 +1904,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1986,8 +1945,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -2018,7 +1977,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2050,7 +2008,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2077,7 +2034,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2107,6 +2063,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2138,7 +2095,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2166,8 +2122,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -2177,6 +2132,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2208,7 +2164,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2250,7 +2205,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2278,8 +2232,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -2305,7 +2258,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2332,7 +2284,6 @@ "ctxt": 0 }, "value": "a12", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2362,6 +2313,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2384,7 +2336,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2410,7 +2361,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2418,8 +2368,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -2429,6 +2378,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2451,7 +2401,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2477,7 +2426,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2485,8 +2433,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -2512,7 +2459,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2538,7 +2484,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2568,7 +2513,6 @@ "ctxt": 0 }, "value": "a13", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2598,6 +2542,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2620,7 +2565,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2646,7 +2590,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2654,8 +2597,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -2665,6 +2607,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2687,7 +2630,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2713,7 +2655,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2721,8 +2662,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": null, @@ -2748,7 +2688,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2774,7 +2713,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2804,7 +2742,6 @@ "ctxt": 0 }, "value": "a14", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2834,6 +2771,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2865,7 +2803,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2907,7 +2844,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2935,8 +2871,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -2962,7 +2897,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2991,7 +2925,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3012,7 +2945,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3042,7 +2974,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3072,6 +3003,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3094,13 +3026,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3126,7 +3056,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3163,7 +3092,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3193,7 +3121,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3214,7 +3141,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3244,7 +3170,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3274,6 +3199,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3296,13 +3222,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3328,7 +3252,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3365,7 +3288,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3393,7 +3315,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3423,6 +3344,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3445,13 +3367,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3477,7 +3397,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3531,7 +3450,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3561,6 +3479,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3583,13 +3502,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3615,7 +3532,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3645,7 +3561,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3672,7 +3587,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3702,6 +3616,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3724,13 +3639,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -3740,6 +3653,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3762,13 +3676,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3794,7 +3706,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3815,7 +3726,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3845,7 +3755,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3872,7 +3781,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3902,6 +3810,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3925,6 +3834,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3947,13 +3857,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3979,15 +3887,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -4013,7 +3919,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4034,7 +3939,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4064,7 +3968,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4091,7 +3994,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4121,6 +4023,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4144,6 +4047,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4166,13 +4070,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4198,15 +4100,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -4232,7 +4132,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4250,7 +4149,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4272,7 +4170,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4290,7 +4187,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4321,7 +4217,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4348,7 +4243,6 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4378,6 +4272,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4401,6 +4296,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4423,13 +4319,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4455,15 +4349,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -4489,7 +4381,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4507,7 +4398,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4529,7 +4419,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4547,7 +4436,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4579,6 +4467,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4601,13 +4490,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4633,7 +4520,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4662,7 +4548,6 @@ "ctxt": 0 }, "value": "a8", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4692,6 +4577,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4715,6 +4601,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4737,13 +4624,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4769,15 +4654,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -4787,6 +4670,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4810,6 +4694,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4832,13 +4717,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4864,15 +4747,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -4898,7 +4779,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4916,7 +4796,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4938,7 +4817,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4956,7 +4834,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4988,6 +4865,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5010,13 +4888,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5042,7 +4918,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5071,7 +4946,6 @@ "ctxt": 0 }, "value": "a9", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5101,6 +4975,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5124,6 +4999,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5146,13 +5022,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5178,15 +5052,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -5196,6 +5068,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5219,6 +5092,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5250,7 +5124,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5292,7 +5165,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5320,8 +5192,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -5347,15 +5218,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -5381,7 +5250,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5399,7 +5267,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5421,7 +5288,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5439,7 +5305,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5471,6 +5336,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5493,13 +5359,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5525,7 +5389,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5554,7 +5417,6 @@ "ctxt": 0 }, "value": "a10", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5596,8 +5458,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -5628,7 +5490,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5660,7 +5521,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5678,7 +5538,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5709,7 +5568,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5736,7 +5594,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5766,6 +5623,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5788,13 +5646,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -5804,6 +5660,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5826,13 +5683,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -5858,7 +5713,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5876,7 +5730,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5907,7 +5760,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5934,7 +5786,6 @@ "ctxt": 0 }, "value": "a12", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5964,6 +5815,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5986,7 +5838,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6012,7 +5863,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6020,8 +5870,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -6031,6 +5880,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6053,13 +5903,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6085,7 +5933,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6103,7 +5950,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6129,7 +5975,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6163,7 +6008,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6189,7 +6033,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6219,7 +6062,6 @@ "ctxt": 0 }, "value": "a13", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6249,6 +6091,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6271,7 +6114,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6297,7 +6139,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6305,8 +6146,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -6316,6 +6156,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6338,13 +6179,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6370,7 +6209,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6388,7 +6226,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6414,7 +6251,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6448,7 +6284,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6475,7 +6310,6 @@ "ctxt": 0 }, "value": "a14", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6505,6 +6339,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6536,7 +6371,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6565,7 +6399,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6589,7 +6422,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6618,7 +6450,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6628,8 +6459,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -6655,7 +6485,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6676,7 +6505,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6706,7 +6534,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures6/input.ts.json index 1317e125eb05..3248cd7713ad 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures6/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "OtherDerived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -284,7 +275,6 @@ "ctxt": 0 }, "value": "bing", - "typeAnnotation": null, "optional": false }, "value": null, @@ -324,7 +314,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -347,7 +336,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -377,7 +365,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -407,6 +394,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -429,13 +417,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -461,7 +447,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -498,7 +483,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -526,7 +510,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -556,6 +539,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -578,13 +562,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -610,7 +592,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -664,7 +645,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -694,6 +674,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -716,13 +697,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -748,7 +727,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -794,7 +772,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -824,6 +801,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -846,13 +824,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -862,6 +838,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -884,13 +861,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -916,7 +891,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -937,7 +911,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -983,7 +956,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1013,6 +985,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1036,6 +1009,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1058,13 +1032,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1090,15 +1062,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -1124,7 +1094,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1145,7 +1114,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1175,7 +1143,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1202,7 +1169,6 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1232,6 +1198,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1255,6 +1222,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1277,13 +1245,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1309,15 +1275,13 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -1343,7 +1307,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1361,7 +1324,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1392,7 +1354,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1419,7 +1380,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1449,6 +1409,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1480,7 +1441,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1509,7 +1469,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1519,8 +1478,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -1530,6 +1488,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1561,7 +1520,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1590,7 +1548,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1614,7 +1571,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1643,7 +1599,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1653,8 +1608,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -1680,7 +1634,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1710,7 +1663,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1737,7 +1689,6 @@ "ctxt": 0 }, "value": "a15", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1767,6 +1718,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1798,7 +1750,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1827,7 +1778,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1851,7 +1801,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1880,7 +1829,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1890,8 +1838,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -1917,7 +1864,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1954,7 +1900,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1982,7 +1927,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2012,6 +1956,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2043,7 +1988,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2072,7 +2016,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2096,7 +2039,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2125,7 +2067,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2135,8 +2076,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -2162,7 +2102,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2180,7 +2119,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2218,7 +2156,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2248,7 +2185,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2275,7 +2211,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2299,7 +2234,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2329,7 +2263,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2359,6 +2292,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2381,13 +2315,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2420,7 +2352,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2450,7 +2381,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2477,7 +2407,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2501,7 +2430,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2531,7 +2459,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2561,6 +2488,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2583,13 +2511,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2641,7 +2567,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2668,7 +2593,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2692,7 +2616,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2722,7 +2645,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2752,6 +2674,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2774,13 +2697,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2806,7 +2727,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2835,7 +2755,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2862,7 +2781,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2886,7 +2804,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2916,7 +2833,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2946,6 +2862,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2968,13 +2885,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2984,6 +2899,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3006,13 +2922,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3038,7 +2952,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3086,7 +2999,6 @@ "ctxt": 0 }, "value": "I5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3113,7 +3025,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3137,7 +3048,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3167,7 +3077,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3197,6 +3106,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3220,6 +3130,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3242,13 +3153,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3274,15 +3183,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -3308,7 +3215,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3338,7 +3244,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3367,7 +3272,6 @@ "ctxt": 0 }, "value": "I7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3394,7 +3298,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3418,7 +3321,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3448,7 +3350,6 @@ "ctxt": 0 }, "value": "a11", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3478,6 +3379,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3509,7 +3411,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3538,7 +3439,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3548,8 +3448,7 @@ } ] } - }, - "optional": false + } }, { "type": "Identifier", @@ -3559,6 +3458,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3590,7 +3490,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3619,7 +3518,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3643,7 +3541,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3672,7 +3569,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3682,8 +3578,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -3709,7 +3604,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3739,7 +3633,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3768,7 +3661,6 @@ "ctxt": 0 }, "value": "I9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3795,7 +3687,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3819,7 +3710,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -3849,7 +3739,6 @@ "ctxt": 0 }, "value": "a16", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3879,6 +3768,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3910,7 +3800,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3939,7 +3828,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3963,7 +3851,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3992,7 +3879,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4002,8 +3888,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -4036,7 +3921,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignaturesWithOptionalParameters/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignaturesWithOptionalParameters/input.ts.json index 8a8491da28af..ac19407c8bc3 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignaturesWithOptionalParameters/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignaturesWithOptionalParameters/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -112,7 +110,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -142,6 +139,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -158,8 +156,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -201,7 +198,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -231,6 +227,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -247,8 +244,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -290,7 +286,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -320,6 +315,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -336,8 +332,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -347,6 +342,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -363,8 +359,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -406,7 +401,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -436,6 +430,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -452,8 +447,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -463,6 +457,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -479,8 +474,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -524,7 +518,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -545,7 +538,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -575,7 +567,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -638,7 +629,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -659,7 +649,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -689,7 +678,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -719,6 +707,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -735,8 +724,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -780,7 +768,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -801,7 +788,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -831,7 +817,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -861,6 +846,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -877,8 +863,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -922,7 +907,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -943,7 +927,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -973,7 +956,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1036,7 +1018,6 @@ "ctxt": 0 }, "value": "I5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1057,7 +1038,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1087,7 +1067,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1117,6 +1096,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1133,8 +1113,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -1178,7 +1157,6 @@ "ctxt": 0 }, "value": "I6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1199,7 +1177,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1229,7 +1206,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1259,6 +1235,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1275,8 +1252,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1320,7 +1296,6 @@ "ctxt": 0 }, "value": "I7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1341,7 +1316,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1371,7 +1345,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1434,7 +1407,6 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1455,7 +1427,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1485,7 +1456,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1515,6 +1485,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1531,8 +1502,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -1576,7 +1546,6 @@ "ctxt": 0 }, "value": "I9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1597,7 +1566,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1627,7 +1595,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1657,6 +1624,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1673,8 +1641,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1718,7 +1685,6 @@ "ctxt": 0 }, "value": "I10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1739,7 +1705,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1769,7 +1734,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1799,6 +1763,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1815,8 +1780,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1826,6 +1790,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1842,8 +1807,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1887,7 +1851,6 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1908,7 +1871,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1938,7 +1900,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2001,7 +1962,6 @@ "ctxt": 0 }, "value": "I12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2022,7 +1982,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2052,7 +2011,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2082,6 +2040,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2098,8 +2057,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -2109,6 +2067,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2125,8 +2084,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -2170,7 +2128,6 @@ "ctxt": 0 }, "value": "I13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2191,7 +2148,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2221,7 +2177,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2251,6 +2206,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2267,8 +2223,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -2312,7 +2267,6 @@ "ctxt": 0 }, "value": "I14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2333,7 +2287,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2363,7 +2316,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2393,6 +2345,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2409,8 +2362,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2420,6 +2372,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2436,8 +2389,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -2481,7 +2433,6 @@ "ctxt": 0 }, "value": "I15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2502,7 +2453,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2532,7 +2482,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2595,7 +2544,6 @@ "ctxt": 0 }, "value": "I16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2616,7 +2564,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2646,7 +2593,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2676,6 +2622,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2692,8 +2639,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "Identifier", @@ -2703,6 +2649,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2719,8 +2666,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeParams": null, @@ -2764,7 +2710,6 @@ "ctxt": 0 }, "value": "I17", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2785,7 +2730,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2815,7 +2759,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2845,6 +2788,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2861,8 +2805,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -2906,7 +2849,6 @@ "ctxt": 0 }, "value": "I18", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2927,7 +2869,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2957,7 +2898,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2987,6 +2927,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3003,8 +2944,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -3014,6 +2954,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3030,8 +2971,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignaturesWithSpecializedSignatures/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignaturesWithSpecializedSignatures/input.ts.json index 007b63062b84..3ead8c6df698 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignaturesWithSpecializedSignatures/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignaturesWithSpecializedSignatures/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "CallSignature", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -79,6 +77,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -108,8 +107,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -147,6 +145,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -163,8 +162,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -174,6 +172,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -190,8 +189,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -231,7 +229,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -252,7 +249,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -282,6 +278,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -311,8 +308,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -350,6 +346,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -366,8 +363,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -377,6 +373,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -393,8 +390,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -432,6 +428,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -454,13 +451,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -503,7 +498,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -530,7 +524,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -560,6 +553,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -589,8 +583,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -628,6 +621,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -644,8 +638,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -685,7 +678,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -706,7 +698,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -736,6 +727,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -765,8 +757,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -804,6 +795,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -820,8 +812,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -861,7 +852,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -882,7 +872,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -912,6 +901,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -934,13 +924,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -983,7 +971,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1015,7 +1002,6 @@ "ctxt": 0 }, "value": "MemberWithCallSignature", - "typeAnnotation": null, "optional": false }, "body": { @@ -1041,7 +1027,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1071,7 +1056,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1109,6 +1093,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1138,8 +1123,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1177,6 +1161,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1193,8 +1178,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1237,7 +1221,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1275,6 +1258,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1304,8 +1288,7 @@ } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -1315,6 +1298,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1331,8 +1315,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1370,6 +1353,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1386,8 +1370,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1397,6 +1380,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1413,8 +1397,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1457,7 +1440,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1487,6 +1469,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1509,13 +1492,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -1541,7 +1522,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1589,7 +1569,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1610,7 +1589,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1640,7 +1618,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1670,6 +1647,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1686,8 +1664,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -1729,7 +1706,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1759,6 +1735,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1775,8 +1752,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1786,6 +1762,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1802,8 +1779,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -1845,7 +1821,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1875,6 +1850,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1897,13 +1873,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -1929,7 +1903,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1977,7 +1950,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2007,7 +1979,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2045,6 +2016,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2074,8 +2046,7 @@ } } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2113,6 +2084,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2129,8 +2101,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2173,7 +2144,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2203,6 +2173,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2225,13 +2196,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -2257,7 +2226,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2287,7 +2255,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2316,7 +2283,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2337,7 +2303,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2367,7 +2332,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2397,6 +2361,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2413,8 +2378,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -2458,7 +2422,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2479,7 +2442,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -2509,7 +2471,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2539,6 +2500,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2561,13 +2523,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -2593,7 +2553,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithGenericCallSignaturesWithOptionalParameters/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithGenericCallSignaturesWithOptionalParameters/input.ts.json index 35a7a70c0986..c522556fb232 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithGenericCallSignaturesWithOptionalParameters/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithGenericCallSignaturesWithOptionalParameters/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "ClassTypeParam", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -76,7 +74,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -154,7 +150,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -180,7 +175,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -210,6 +204,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -232,13 +227,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -264,7 +257,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -290,7 +282,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -320,6 +311,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -342,13 +334,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -374,7 +364,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -400,7 +389,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -430,6 +418,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -452,13 +441,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -468,6 +455,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -490,13 +478,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -522,7 +508,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -548,7 +533,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -578,6 +562,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -600,13 +585,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } }, { "type": "Identifier", @@ -616,6 +599,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -638,13 +622,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -670,7 +652,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -698,7 +679,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -725,7 +705,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -749,7 +728,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -775,7 +753,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -808,7 +785,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -853,7 +829,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -881,7 +856,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -908,7 +882,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -932,7 +905,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -958,7 +930,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -991,7 +962,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1021,6 +991,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1043,13 +1014,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -1075,7 +1044,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1103,7 +1071,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1130,7 +1097,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1154,7 +1120,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1180,7 +1145,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1213,7 +1177,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1243,6 +1206,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1265,13 +1229,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1297,7 +1259,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1325,7 +1286,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1352,7 +1312,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1376,7 +1335,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1402,7 +1360,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1435,7 +1392,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1480,7 +1436,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1508,7 +1463,6 @@ "ctxt": 0 }, "value": "I5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1535,7 +1489,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1559,7 +1512,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1585,7 +1537,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1618,7 +1569,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1648,6 +1598,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1670,13 +1621,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -1702,7 +1651,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1730,7 +1678,6 @@ "ctxt": 0 }, "value": "I6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1757,7 +1704,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1781,7 +1727,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1807,7 +1752,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1840,7 +1784,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1870,6 +1813,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1892,13 +1836,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1924,7 +1866,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1952,7 +1893,6 @@ "ctxt": 0 }, "value": "I7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1979,7 +1919,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2003,7 +1942,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -2029,7 +1967,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2062,7 +1999,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2107,7 +2043,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2135,7 +2070,6 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2162,7 +2096,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2186,7 +2119,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -2212,7 +2144,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2245,7 +2176,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2275,6 +2205,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2297,13 +2228,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -2329,7 +2258,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2357,7 +2285,6 @@ "ctxt": 0 }, "value": "I9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2384,7 +2311,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2408,7 +2334,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -2434,7 +2359,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2467,7 +2391,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2497,6 +2420,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2519,13 +2443,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2551,7 +2473,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2579,7 +2500,6 @@ "ctxt": 0 }, "value": "I10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2606,7 +2526,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2630,7 +2549,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -2656,7 +2574,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2689,7 +2606,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2719,6 +2635,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2741,13 +2658,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2757,6 +2672,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2779,13 +2695,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2811,7 +2725,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2839,7 +2752,6 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2866,7 +2778,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2890,7 +2801,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -2916,7 +2826,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2949,7 +2858,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2994,7 +2902,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3022,7 +2929,6 @@ "ctxt": 0 }, "value": "I12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3049,7 +2955,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3073,7 +2978,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -3099,7 +3003,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3132,7 +3035,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3162,6 +3064,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3184,13 +3087,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } }, { "type": "Identifier", @@ -3200,6 +3101,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3222,13 +3124,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -3254,7 +3154,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3282,7 +3181,6 @@ "ctxt": 0 }, "value": "I13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3309,7 +3207,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3333,7 +3230,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -3359,7 +3255,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3392,7 +3287,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3422,6 +3316,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3444,13 +3339,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3476,7 +3369,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3504,7 +3396,6 @@ "ctxt": 0 }, "value": "I14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3531,7 +3422,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3555,7 +3445,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -3581,7 +3470,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3614,7 +3502,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3644,6 +3531,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3666,13 +3554,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -3682,6 +3568,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3704,13 +3591,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3736,7 +3621,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3764,7 +3648,6 @@ "ctxt": 0 }, "value": "I15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3791,7 +3674,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3815,7 +3697,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -3841,7 +3722,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3874,7 +3754,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3919,7 +3798,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3947,7 +3825,6 @@ "ctxt": 0 }, "value": "I16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3974,7 +3851,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3998,7 +3874,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -4024,7 +3899,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4057,7 +3931,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4087,6 +3960,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4109,13 +3983,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } }, { "type": "Identifier", @@ -4125,6 +3997,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4147,13 +4020,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -4179,7 +4050,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4207,7 +4077,6 @@ "ctxt": 0 }, "value": "I17", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4234,7 +4103,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4258,7 +4126,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -4284,7 +4151,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4317,7 +4183,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4347,6 +4212,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4369,13 +4235,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4401,7 +4265,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4429,7 +4292,6 @@ "ctxt": 0 }, "value": "I18", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4456,7 +4318,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4480,7 +4341,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -4506,7 +4366,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4539,7 +4398,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4569,6 +4427,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4591,13 +4450,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -4607,6 +4464,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4629,13 +4487,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4661,7 +4517,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4694,7 +4549,6 @@ "ctxt": 0 }, "value": "GenericSignaturesInvalid", - "typeAnnotation": null, "optional": false }, "body": { @@ -4720,7 +4574,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4750,7 +4603,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4795,7 +4647,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4825,7 +4676,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4851,7 +4701,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4881,6 +4730,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4903,13 +4753,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -4935,7 +4783,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4965,7 +4812,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4991,7 +4837,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5021,6 +4866,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5043,13 +4889,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -5075,7 +4919,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5105,7 +4948,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5131,7 +4973,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5161,6 +5002,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5183,13 +5025,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -5199,6 +5039,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5221,13 +5062,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -5253,7 +5092,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5283,7 +5121,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5309,7 +5146,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5339,6 +5175,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5361,13 +5198,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } }, { "type": "Identifier", @@ -5377,6 +5212,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5399,13 +5235,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -5431,7 +5265,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5461,7 +5294,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5489,7 +5321,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5516,7 +5347,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5540,7 +5370,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -5570,7 +5399,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5615,7 +5443,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5643,7 +5470,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5670,7 +5496,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5694,7 +5519,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -5724,7 +5548,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5754,6 +5577,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5776,13 +5600,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -5808,7 +5630,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5836,7 +5657,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5863,7 +5683,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5887,7 +5706,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -5917,7 +5735,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5947,6 +5764,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5969,13 +5787,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6001,7 +5817,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6029,7 +5844,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6056,7 +5870,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6080,7 +5893,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -6110,7 +5922,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6155,7 +5966,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6183,7 +5993,6 @@ "ctxt": 0 }, "value": "I5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6210,7 +6019,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6234,7 +6042,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -6264,7 +6071,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6294,6 +6100,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6316,13 +6123,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -6348,7 +6153,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6376,7 +6180,6 @@ "ctxt": 0 }, "value": "I6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6403,7 +6206,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6427,7 +6229,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -6457,7 +6258,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6487,6 +6287,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6509,13 +6310,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6541,7 +6340,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6569,7 +6367,6 @@ "ctxt": 0 }, "value": "I7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6596,7 +6393,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6620,7 +6416,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -6650,7 +6445,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6695,7 +6489,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6723,7 +6516,6 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6750,7 +6542,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6774,7 +6565,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -6804,7 +6594,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6834,6 +6623,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6856,13 +6646,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -6888,7 +6676,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6916,7 +6703,6 @@ "ctxt": 0 }, "value": "I9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6943,7 +6729,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6967,7 +6752,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -6997,7 +6781,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7027,6 +6810,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7049,13 +6833,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -7081,7 +6863,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7109,7 +6890,6 @@ "ctxt": 0 }, "value": "I10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7136,7 +6916,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7160,7 +6939,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -7190,7 +6968,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7220,6 +6997,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7242,13 +7020,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -7258,6 +7034,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7280,13 +7057,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -7312,7 +7087,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7340,7 +7114,6 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7367,7 +7140,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7391,7 +7163,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -7421,7 +7192,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7466,7 +7236,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7494,7 +7263,6 @@ "ctxt": 0 }, "value": "I12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7521,7 +7289,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7545,7 +7312,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -7575,7 +7341,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7605,6 +7370,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7627,13 +7393,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } }, { "type": "Identifier", @@ -7643,6 +7407,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7665,13 +7430,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -7697,7 +7460,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7725,7 +7487,6 @@ "ctxt": 0 }, "value": "I13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7752,7 +7513,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7776,7 +7536,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -7806,7 +7565,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7836,6 +7594,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7858,13 +7617,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -7890,7 +7647,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7918,7 +7674,6 @@ "ctxt": 0 }, "value": "I14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7945,7 +7700,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7969,7 +7723,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -7999,7 +7752,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8029,6 +7781,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8051,13 +7804,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -8067,6 +7818,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8089,13 +7841,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -8121,7 +7871,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8149,7 +7898,6 @@ "ctxt": 0 }, "value": "I15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8176,7 +7924,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8200,7 +7947,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -8230,7 +7976,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8275,7 +8020,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8303,7 +8047,6 @@ "ctxt": 0 }, "value": "I16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8330,7 +8073,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8354,7 +8096,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -8384,7 +8125,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8414,6 +8154,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8436,13 +8177,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } }, { "type": "Identifier", @@ -8452,6 +8191,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8474,13 +8214,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -8506,7 +8244,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8534,7 +8271,6 @@ "ctxt": 0 }, "value": "I17", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8561,7 +8297,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8585,7 +8320,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -8615,7 +8349,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8645,6 +8378,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8667,13 +8401,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -8699,7 +8431,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8727,7 +8458,6 @@ "ctxt": 0 }, "value": "I18", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8754,7 +8484,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8778,7 +8507,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -8808,7 +8536,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8838,6 +8565,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8860,13 +8588,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -8876,6 +8602,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8898,13 +8625,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -8930,7 +8655,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8963,7 +8687,6 @@ "ctxt": 0 }, "value": "GenericSignaturesValid", - "typeAnnotation": null, "optional": false }, "body": { @@ -8989,7 +8712,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9019,7 +8741,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9064,7 +8785,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9094,7 +8814,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9120,7 +8839,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9150,6 +8868,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9172,13 +8891,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -9204,7 +8921,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9234,7 +8950,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9260,7 +8975,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9290,6 +9004,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9312,13 +9027,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -9344,7 +9057,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9374,7 +9086,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9400,7 +9111,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9430,6 +9140,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9452,13 +9163,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -9468,6 +9177,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9490,13 +9200,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -9522,7 +9230,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9552,7 +9259,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9578,7 +9284,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9608,6 +9313,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9630,13 +9336,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } }, { "type": "Identifier", @@ -9646,6 +9350,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9668,13 +9373,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -9700,7 +9403,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9730,7 +9432,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9758,7 +9459,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9779,7 +9479,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -9809,7 +9508,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9854,7 +9552,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9884,7 +9581,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9912,7 +9608,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9933,7 +9628,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -9963,7 +9657,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9993,6 +9686,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10015,13 +9709,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -10047,7 +9739,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10077,7 +9768,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10105,7 +9795,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10126,7 +9815,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -10156,7 +9844,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -10186,6 +9873,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10208,13 +9896,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -10240,7 +9926,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10270,7 +9955,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10298,7 +9982,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10319,7 +10002,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -10349,7 +10031,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -10394,7 +10075,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10424,7 +10104,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10452,7 +10131,6 @@ "ctxt": 0 }, "value": "I5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10473,7 +10151,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -10503,7 +10180,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -10533,6 +10209,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10555,13 +10232,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -10587,7 +10262,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10617,7 +10291,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10645,7 +10318,6 @@ "ctxt": 0 }, "value": "I6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10666,7 +10338,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -10696,7 +10367,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -10726,6 +10396,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10748,13 +10419,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -10780,7 +10449,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10810,7 +10478,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10838,7 +10505,6 @@ "ctxt": 0 }, "value": "I7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10859,7 +10525,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -10889,7 +10554,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -10934,7 +10598,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10964,7 +10627,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10992,7 +10654,6 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -11013,7 +10674,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -11043,7 +10703,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -11073,6 +10732,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11095,13 +10755,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -11127,7 +10785,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -11157,7 +10814,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11185,7 +10841,6 @@ "ctxt": 0 }, "value": "I9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -11206,7 +10861,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -11236,7 +10890,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -11266,6 +10919,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11288,13 +10942,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -11320,7 +10972,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -11350,7 +11001,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11378,7 +11028,6 @@ "ctxt": 0 }, "value": "I10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -11399,7 +11048,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -11429,7 +11077,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -11459,6 +11106,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11481,13 +11129,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -11497,6 +11143,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11519,13 +11166,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -11551,7 +11196,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -11581,7 +11225,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11609,7 +11252,6 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -11630,7 +11272,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -11660,7 +11301,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -11705,7 +11345,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -11735,7 +11374,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11763,7 +11401,6 @@ "ctxt": 0 }, "value": "I12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -11784,7 +11421,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -11814,7 +11450,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -11844,6 +11479,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11866,13 +11502,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } }, { "type": "Identifier", @@ -11882,6 +11516,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11904,13 +11539,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -11936,7 +11569,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -11966,7 +11598,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11994,7 +11625,6 @@ "ctxt": 0 }, "value": "I13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -12015,7 +11645,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -12045,7 +11674,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -12075,6 +11703,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12097,13 +11726,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -12129,7 +11756,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -12159,7 +11785,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12187,7 +11812,6 @@ "ctxt": 0 }, "value": "I14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -12208,7 +11832,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -12238,7 +11861,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -12268,6 +11890,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12290,13 +11913,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -12306,6 +11927,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12328,13 +11950,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -12360,7 +11980,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -12390,7 +12009,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12418,7 +12036,6 @@ "ctxt": 0 }, "value": "I15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -12439,7 +12056,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -12469,7 +12085,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -12514,7 +12129,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -12544,7 +12158,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12572,7 +12185,6 @@ "ctxt": 0 }, "value": "I16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -12593,7 +12205,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -12623,7 +12234,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -12653,6 +12263,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12675,13 +12286,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } }, { "type": "Identifier", @@ -12691,6 +12300,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12713,13 +12323,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -12745,7 +12353,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -12775,7 +12382,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12803,7 +12409,6 @@ "ctxt": 0 }, "value": "I17", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -12824,7 +12429,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -12854,7 +12458,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -12884,6 +12487,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12906,13 +12510,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -12938,7 +12540,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -12968,7 +12569,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12996,7 +12596,6 @@ "ctxt": 0 }, "value": "I18", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -13017,7 +12616,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -13047,7 +12645,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -13077,6 +12674,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13099,13 +12697,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -13115,6 +12711,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13137,13 +12734,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -13169,7 +12764,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -13199,7 +12793,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithGenericConstructSignaturesWithOptionalParameters/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithGenericConstructSignaturesWithOptionalParameters/input.ts.json index c46d95b80439..9c1c871a0423 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithGenericConstructSignaturesWithOptionalParameters/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithGenericConstructSignaturesWithOptionalParameters/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "ClassTypeParam", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -76,7 +74,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -154,7 +150,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -181,7 +176,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -211,6 +205,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -233,13 +228,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -265,7 +258,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -292,7 +284,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -322,6 +313,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -344,13 +336,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -376,7 +366,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -403,7 +392,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -433,6 +421,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -455,13 +444,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -471,6 +458,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -493,13 +481,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -525,7 +511,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -552,7 +537,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -582,6 +566,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -604,13 +589,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } }, { "type": "Identifier", @@ -620,6 +603,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -642,13 +626,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -674,7 +656,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -703,7 +684,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -730,7 +710,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -754,7 +733,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -780,7 +758,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -813,7 +790,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -858,7 +834,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -887,7 +862,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -914,7 +888,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -938,7 +911,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -964,7 +936,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -997,7 +968,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1027,6 +997,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1049,13 +1020,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -1081,7 +1050,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1110,7 +1078,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1137,7 +1104,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1161,7 +1127,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1187,7 +1152,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1220,7 +1184,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1250,6 +1213,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1272,13 +1236,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1304,7 +1266,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1333,7 +1294,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1360,7 +1320,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1384,7 +1343,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1410,7 +1368,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1443,7 +1400,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1488,7 +1444,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1517,7 +1472,6 @@ "ctxt": 0 }, "value": "I5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1544,7 +1498,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1568,7 +1521,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1594,7 +1546,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1627,7 +1578,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1657,6 +1607,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1679,13 +1630,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -1711,7 +1660,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1740,7 +1688,6 @@ "ctxt": 0 }, "value": "I6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1767,7 +1714,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1791,7 +1737,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1817,7 +1762,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1850,7 +1794,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1880,6 +1823,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1902,13 +1846,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1934,7 +1876,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1963,7 +1904,6 @@ "ctxt": 0 }, "value": "I7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1990,7 +1930,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2014,7 +1953,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -2040,7 +1978,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2073,7 +2010,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2118,7 +2054,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2147,7 +2082,6 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2174,7 +2108,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2198,7 +2131,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -2224,7 +2156,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2257,7 +2188,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2287,6 +2217,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2309,13 +2240,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -2341,7 +2270,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2370,7 +2298,6 @@ "ctxt": 0 }, "value": "I9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2397,7 +2324,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2421,7 +2347,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -2447,7 +2372,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2480,7 +2404,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2510,6 +2433,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2532,13 +2456,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2564,7 +2486,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2593,7 +2514,6 @@ "ctxt": 0 }, "value": "I10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2620,7 +2540,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2644,7 +2563,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -2670,7 +2588,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2703,7 +2620,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2733,6 +2649,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2755,13 +2672,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2771,6 +2686,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2793,13 +2709,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2825,7 +2739,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2854,7 +2767,6 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2881,7 +2793,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2905,7 +2816,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -2931,7 +2841,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2964,7 +2873,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3009,7 +2917,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3038,7 +2945,6 @@ "ctxt": 0 }, "value": "I12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3065,7 +2971,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3089,7 +2994,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -3115,7 +3019,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3148,7 +3051,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3178,6 +3080,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3200,13 +3103,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } }, { "type": "Identifier", @@ -3216,6 +3117,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3238,13 +3140,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -3270,7 +3170,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3299,7 +3198,6 @@ "ctxt": 0 }, "value": "I13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3326,7 +3224,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3350,7 +3247,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -3376,7 +3272,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3409,7 +3304,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3439,6 +3333,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3461,13 +3356,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3493,7 +3386,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3522,7 +3414,6 @@ "ctxt": 0 }, "value": "I14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3549,7 +3440,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3573,7 +3463,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -3599,7 +3488,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3632,7 +3520,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3662,6 +3549,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3684,13 +3572,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -3700,6 +3586,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3722,13 +3609,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3754,7 +3639,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3783,7 +3667,6 @@ "ctxt": 0 }, "value": "I15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3810,7 +3693,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3834,7 +3716,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -3860,7 +3741,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3893,7 +3773,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3938,7 +3817,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3967,7 +3845,6 @@ "ctxt": 0 }, "value": "I16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3994,7 +3871,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4018,7 +3894,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -4044,7 +3919,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4077,7 +3951,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4107,6 +3980,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4129,13 +4003,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } }, { "type": "Identifier", @@ -4145,6 +4017,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4167,13 +4040,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -4199,7 +4070,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4228,7 +4098,6 @@ "ctxt": 0 }, "value": "I17", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4255,7 +4124,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4279,7 +4147,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -4305,7 +4172,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4338,7 +4204,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4368,6 +4233,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4390,13 +4256,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4422,7 +4286,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4451,7 +4314,6 @@ "ctxt": 0 }, "value": "I18", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4478,7 +4340,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4502,7 +4363,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -4528,7 +4388,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4561,7 +4420,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4591,6 +4449,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4613,13 +4472,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -4629,6 +4486,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4651,13 +4509,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4683,7 +4539,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4717,7 +4572,6 @@ "ctxt": 0 }, "value": "GenericSignaturesInvalid", - "typeAnnotation": null, "optional": false }, "body": { @@ -4743,7 +4597,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4773,7 +4626,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4818,7 +4670,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4848,7 +4699,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4875,7 +4725,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4905,6 +4754,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4927,13 +4777,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -4959,7 +4807,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4989,7 +4836,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5016,7 +4862,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5046,6 +4891,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5068,13 +4914,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -5100,7 +4944,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5130,7 +4973,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5157,7 +4999,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5187,6 +5028,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5209,13 +5051,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -5225,6 +5065,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5247,13 +5088,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -5279,7 +5118,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5309,7 +5147,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5336,7 +5173,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5366,6 +5202,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5388,13 +5225,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } }, { "type": "Identifier", @@ -5404,6 +5239,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5426,13 +5262,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -5458,7 +5292,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5488,7 +5321,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5517,7 +5349,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5544,7 +5375,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5568,7 +5398,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -5598,7 +5427,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5643,7 +5471,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5672,7 +5499,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5699,7 +5525,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5723,7 +5548,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -5753,7 +5577,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5783,6 +5606,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5805,13 +5629,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -5837,7 +5659,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5866,7 +5687,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5893,7 +5713,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5917,7 +5736,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -5947,7 +5765,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5977,6 +5794,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5999,13 +5817,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6031,7 +5847,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6060,7 +5875,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6087,7 +5901,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6111,7 +5924,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -6141,7 +5953,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6186,7 +5997,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6215,7 +6025,6 @@ "ctxt": 0 }, "value": "I5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6242,7 +6051,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6266,7 +6074,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -6296,7 +6103,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6326,6 +6132,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6348,13 +6155,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -6380,7 +6185,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6409,7 +6213,6 @@ "ctxt": 0 }, "value": "I6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6436,7 +6239,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6460,7 +6262,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -6490,7 +6291,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6520,6 +6320,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6542,13 +6343,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -6574,7 +6373,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6603,7 +6401,6 @@ "ctxt": 0 }, "value": "I7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6630,7 +6427,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6654,7 +6450,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -6684,7 +6479,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6729,7 +6523,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6758,7 +6551,6 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6785,7 +6577,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6809,7 +6600,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -6839,7 +6629,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6869,6 +6658,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6891,13 +6681,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -6923,7 +6711,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6952,7 +6739,6 @@ "ctxt": 0 }, "value": "I9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6979,7 +6765,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7003,7 +6788,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -7033,7 +6817,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7063,6 +6846,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7085,13 +6869,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -7117,7 +6899,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7146,7 +6927,6 @@ "ctxt": 0 }, "value": "I10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7173,7 +6953,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7197,7 +6976,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -7227,7 +7005,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7257,6 +7034,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7279,13 +7057,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -7295,6 +7071,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7317,13 +7094,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -7349,7 +7124,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7378,7 +7152,6 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7405,7 +7178,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7429,7 +7201,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -7459,7 +7230,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7504,7 +7274,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7533,7 +7302,6 @@ "ctxt": 0 }, "value": "I12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7560,7 +7328,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7584,7 +7351,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -7614,7 +7380,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7644,6 +7409,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7666,13 +7432,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } }, { "type": "Identifier", @@ -7682,6 +7446,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7704,13 +7469,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -7736,7 +7499,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7765,7 +7527,6 @@ "ctxt": 0 }, "value": "I13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7792,7 +7553,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -7816,7 +7576,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -7846,7 +7605,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7876,6 +7634,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7898,13 +7657,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -7930,7 +7687,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7959,7 +7715,6 @@ "ctxt": 0 }, "value": "I14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7986,7 +7741,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8010,7 +7764,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -8040,7 +7793,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8070,6 +7822,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8092,13 +7845,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -8108,6 +7859,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8130,13 +7882,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -8162,7 +7912,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8191,7 +7940,6 @@ "ctxt": 0 }, "value": "I15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8218,7 +7966,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8242,7 +7989,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -8272,7 +8018,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8317,7 +8062,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8346,7 +8090,6 @@ "ctxt": 0 }, "value": "I16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8373,7 +8116,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8397,7 +8139,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -8427,7 +8168,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8457,6 +8197,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8479,13 +8220,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } }, { "type": "Identifier", @@ -8495,6 +8234,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8517,13 +8257,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": null, @@ -8549,7 +8287,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8578,7 +8315,6 @@ "ctxt": 0 }, "value": "I17", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8605,7 +8341,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8629,7 +8364,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -8659,7 +8393,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8689,6 +8422,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8711,13 +8445,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -8743,7 +8475,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8772,7 +8503,6 @@ "ctxt": 0 }, "value": "I18", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8799,7 +8529,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -8823,7 +8552,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -8853,7 +8581,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -8883,6 +8610,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8905,13 +8633,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -8921,6 +8647,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8943,13 +8670,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -8975,7 +8700,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9009,7 +8733,6 @@ "ctxt": 0 }, "value": "GenericSignaturesValid", - "typeAnnotation": null, "optional": false }, "body": { @@ -9035,7 +8758,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9065,7 +8787,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9110,7 +8831,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9140,7 +8860,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9167,7 +8886,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9197,6 +8915,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9219,13 +8938,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -9251,7 +8968,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9281,7 +8997,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9308,7 +9023,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9338,6 +9052,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9360,13 +9075,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -9392,7 +9105,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9422,7 +9134,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9449,7 +9160,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9479,6 +9189,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9501,13 +9212,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -9517,6 +9226,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9539,13 +9249,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -9571,7 +9279,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9601,7 +9308,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9628,7 +9334,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9658,6 +9363,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9680,13 +9386,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } }, { "type": "Identifier", @@ -9696,6 +9400,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9718,13 +9423,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -9750,7 +9453,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9780,7 +9482,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9809,7 +9510,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9830,7 +9530,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -9860,7 +9559,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9905,7 +9603,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -9935,7 +9632,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -9964,7 +9660,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9985,7 +9680,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -10015,7 +9709,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -10045,6 +9738,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10067,13 +9761,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -10099,7 +9791,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10129,7 +9820,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10158,7 +9848,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10179,7 +9868,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -10209,7 +9897,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -10239,6 +9926,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10261,13 +9949,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -10293,7 +9979,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10323,7 +10008,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10352,7 +10036,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10373,7 +10056,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -10403,7 +10085,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -10448,7 +10129,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10478,7 +10158,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10507,7 +10186,6 @@ "ctxt": 0 }, "value": "I5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10528,7 +10206,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -10558,7 +10235,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -10588,6 +10264,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10610,13 +10287,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -10642,7 +10317,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10672,7 +10346,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10701,7 +10374,6 @@ "ctxt": 0 }, "value": "I6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10722,7 +10394,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -10752,7 +10423,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -10782,6 +10452,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10804,13 +10475,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -10836,7 +10505,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -10866,7 +10534,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10895,7 +10562,6 @@ "ctxt": 0 }, "value": "I7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10916,7 +10582,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -10946,7 +10611,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -10991,7 +10655,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -11021,7 +10684,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11050,7 +10712,6 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -11071,7 +10732,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -11101,7 +10761,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -11131,6 +10790,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11153,13 +10813,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -11185,7 +10843,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -11215,7 +10872,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11244,7 +10900,6 @@ "ctxt": 0 }, "value": "I9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -11265,7 +10920,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -11295,7 +10949,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -11325,6 +10978,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11347,13 +11001,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -11379,7 +11031,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -11409,7 +11060,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11438,7 +11088,6 @@ "ctxt": 0 }, "value": "I10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -11459,7 +11108,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -11489,7 +11137,6 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -11519,6 +11166,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11541,13 +11189,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -11557,6 +11203,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11579,13 +11226,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -11611,7 +11256,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -11641,7 +11285,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11670,7 +11313,6 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -11691,7 +11333,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -11721,7 +11362,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -11766,7 +11406,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -11796,7 +11435,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -11825,7 +11463,6 @@ "ctxt": 0 }, "value": "I12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -11846,7 +11483,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -11876,7 +11512,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -11906,6 +11541,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11928,13 +11564,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } }, { "type": "Identifier", @@ -11944,6 +11578,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -11966,13 +11601,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -11998,7 +11631,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -12028,7 +11660,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12057,7 +11688,6 @@ "ctxt": 0 }, "value": "I13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -12078,7 +11708,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -12108,7 +11737,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -12138,6 +11766,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12160,13 +11789,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -12192,7 +11819,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -12222,7 +11848,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12251,7 +11876,6 @@ "ctxt": 0 }, "value": "I14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -12272,7 +11896,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -12302,7 +11925,6 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -12332,6 +11954,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12354,13 +11977,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -12370,6 +11991,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12392,13 +12014,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -12424,7 +12044,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -12454,7 +12073,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12483,7 +12101,6 @@ "ctxt": 0 }, "value": "I15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -12504,7 +12121,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -12534,7 +12150,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -12579,7 +12194,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -12609,7 +12223,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12638,7 +12251,6 @@ "ctxt": 0 }, "value": "I16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -12659,7 +12271,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -12689,7 +12300,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -12719,6 +12329,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12741,13 +12352,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } }, { "type": "Identifier", @@ -12757,6 +12366,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12779,13 +12389,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeParams": { @@ -12811,7 +12419,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -12841,7 +12448,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -12870,7 +12476,6 @@ "ctxt": 0 }, "value": "I17", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -12891,7 +12496,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -12921,7 +12525,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -12951,6 +12554,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -12973,13 +12577,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -13005,7 +12607,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -13035,7 +12636,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -13064,7 +12664,6 @@ "ctxt": 0 }, "value": "I18", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -13085,7 +12684,6 @@ "ctxt": 0 }, "value": "Base2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -13115,7 +12713,6 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -13145,6 +12742,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13167,13 +12765,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -13183,6 +12779,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -13205,13 +12802,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -13237,7 +12832,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -13267,7 +12861,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer/input.ts.json index dc2f23bc2de8..92251ff3a1df 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -241,7 +234,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -280,7 +272,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -302,6 +293,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -318,8 +310,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -344,7 +335,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -374,7 +364,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -396,6 +385,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -412,8 +402,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -438,7 +427,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -460,7 +448,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -478,7 +465,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -500,6 +486,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -516,8 +503,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -542,7 +528,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -564,7 +549,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -589,7 +573,6 @@ "ctxt": 0 }, "value": "Generics", - "typeAnnotation": null, "optional": false }, "body": { @@ -610,7 +593,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -632,6 +614,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -648,8 +631,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -674,7 +656,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -713,7 +694,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -731,7 +711,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -753,7 +732,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -775,6 +753,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -791,8 +770,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -817,7 +795,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -839,7 +816,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -867,7 +843,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -886,7 +861,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -908,6 +882,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -924,8 +899,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -950,7 +924,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -972,7 +945,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1000,7 +972,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1019,7 +990,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1041,6 +1011,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1057,8 +1028,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1083,7 +1053,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1105,7 +1074,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1132,7 +1100,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1150,7 +1117,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1182,7 +1148,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1201,7 +1166,6 @@ "ctxt": 0 }, "value": "B4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1223,6 +1187,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1239,8 +1204,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1265,7 +1229,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1287,7 +1250,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1314,7 +1276,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1332,7 +1293,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1364,7 +1324,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer2/input.ts.json index ef27d4aa8a97..c219cd28aede 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -241,7 +234,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -285,7 +277,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -310,6 +301,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -326,8 +318,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -352,7 +343,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -383,7 +373,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -404,7 +393,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -429,6 +417,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -445,8 +434,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -471,7 +459,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -502,7 +489,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -523,7 +509,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -548,6 +533,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -564,8 +550,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -590,7 +575,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -623,7 +607,6 @@ "ctxt": 0 }, "value": "Generics", - "typeAnnotation": null, "optional": false }, "body": { @@ -649,7 +632,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -676,7 +658,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -694,7 +675,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -723,6 +703,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -739,8 +720,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -765,7 +745,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -796,7 +775,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -817,7 +795,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -843,7 +820,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -871,6 +847,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -887,8 +864,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -913,7 +889,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -944,7 +919,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -965,7 +939,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -991,7 +964,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1019,6 +991,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1035,8 +1008,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1061,7 +1033,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1092,7 +1063,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1119,7 +1089,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1137,7 +1106,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1162,7 +1130,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1188,7 +1155,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1216,6 +1182,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1232,8 +1199,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1258,7 +1224,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1289,7 +1254,6 @@ "ctxt": 0 }, "value": "B4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1316,7 +1280,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1334,7 +1297,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1359,7 +1321,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1385,7 +1346,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1413,6 +1373,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1429,8 +1390,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1455,7 +1415,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1486,7 +1445,6 @@ "ctxt": 0 }, "value": "B5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1513,7 +1471,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1531,7 +1488,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1556,7 +1512,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1582,7 +1537,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1610,6 +1564,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1626,8 +1581,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1652,7 +1606,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer3/input.ts.json index 5ec9f7b26ce1..de81316510d5 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer3/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -241,7 +234,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -280,7 +272,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -302,6 +293,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -318,8 +310,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -344,7 +335,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -374,7 +364,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -396,6 +385,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -412,8 +402,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -438,7 +427,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -460,7 +448,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -478,7 +465,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -500,6 +486,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -516,8 +503,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -542,7 +528,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -564,7 +549,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -589,7 +573,6 @@ "ctxt": 0 }, "value": "Generics", - "typeAnnotation": null, "optional": false }, "body": { @@ -610,7 +593,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -632,6 +614,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -648,8 +631,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -674,7 +656,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -713,7 +694,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -731,7 +711,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -753,7 +732,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -775,6 +753,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -791,8 +770,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -817,7 +795,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -839,7 +816,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -867,7 +843,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -886,7 +861,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -908,6 +882,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -924,8 +899,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -950,7 +924,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -972,7 +945,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1000,7 +972,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1019,7 +990,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1041,6 +1011,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1057,8 +1028,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1083,7 +1053,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1105,7 +1074,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1132,7 +1100,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1150,7 +1117,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1182,7 +1148,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1201,7 +1166,6 @@ "ctxt": 0 }, "value": "B4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1223,6 +1187,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1239,8 +1204,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1265,7 +1229,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1287,7 +1250,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1314,7 +1276,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1332,7 +1293,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1364,7 +1324,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1383,7 +1342,6 @@ "ctxt": 0 }, "value": "B5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1405,6 +1363,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1421,8 +1380,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1447,7 +1405,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1469,7 +1426,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1496,7 +1452,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1514,7 +1469,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1546,7 +1500,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer4/input.ts.json index 2e226b505c8a..72a992e3790c 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer4/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -241,7 +234,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -280,7 +272,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -302,6 +293,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -318,8 +310,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -344,7 +335,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -374,7 +364,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -396,6 +385,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -412,8 +402,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -449,7 +438,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -474,7 +462,6 @@ "ctxt": 0 }, "value": "Generics", - "typeAnnotation": null, "optional": false }, "body": { @@ -495,7 +482,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -517,6 +503,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -533,8 +520,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -559,7 +545,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -598,7 +583,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -616,7 +600,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -638,7 +621,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -660,6 +642,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -676,8 +659,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -713,7 +695,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -741,7 +722,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -760,7 +740,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -782,6 +761,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -798,8 +778,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -835,7 +814,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -862,7 +840,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -880,7 +857,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -912,7 +888,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer5/input.ts.json index 55849ef4f863..081a7a36c7b6 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer5/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -241,7 +234,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -285,7 +277,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -310,6 +301,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -326,8 +318,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -352,7 +343,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -378,7 +368,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -400,6 +389,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -416,8 +406,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -442,7 +431,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -476,7 +464,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -493,7 +480,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -515,6 +501,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -531,8 +518,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -557,7 +543,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -591,7 +576,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -615,7 +599,6 @@ "ctxt": 0 }, "value": "Generics", - "typeAnnotation": null, "optional": false }, "body": { @@ -641,7 +624,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -668,7 +650,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -686,7 +667,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -715,6 +695,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -731,8 +712,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -757,7 +737,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -783,7 +762,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -805,6 +783,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -821,8 +800,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -847,7 +825,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -881,7 +858,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -907,7 +883,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -927,7 +902,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -949,6 +923,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -965,8 +940,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -991,7 +965,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1025,7 +998,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1051,7 +1023,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1071,7 +1042,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1093,6 +1063,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1109,8 +1080,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1135,7 +1105,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1174,7 +1143,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1192,7 +1160,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1218,7 +1185,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1244,7 +1210,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1264,7 +1229,6 @@ "ctxt": 0 }, "value": "B4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1286,6 +1250,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1302,8 +1267,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1328,7 +1292,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1367,7 +1330,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1385,7 +1347,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1411,7 +1372,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1437,7 +1397,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1457,7 +1416,6 @@ "ctxt": 0 }, "value": "B5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1479,6 +1437,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1495,8 +1454,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1521,7 +1479,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1560,7 +1517,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1578,7 +1534,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1604,7 +1559,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1630,7 +1584,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers/input.ts.json index 5e8434ce091a..9ac9ea732477 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -284,7 +275,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -310,7 +300,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -341,7 +330,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -367,7 +355,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -400,7 +387,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -426,7 +412,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -452,7 +437,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -483,7 +467,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -523,7 +506,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -541,7 +523,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -591,7 +572,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -646,7 +626,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -679,7 +658,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -729,7 +707,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -798,7 +775,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -816,7 +792,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -871,7 +846,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -931,7 +905,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -964,7 +937,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1019,7 +991,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1093,7 +1064,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1118,7 +1088,6 @@ "ctxt": 0 }, "value": "TwoLevels", - "typeAnnotation": null, "optional": false }, "body": { @@ -1139,7 +1108,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1165,7 +1133,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1191,7 +1158,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1222,7 +1188,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1248,7 +1213,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1281,7 +1245,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1307,7 +1270,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1333,7 +1295,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1364,7 +1325,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1404,7 +1364,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1422,7 +1381,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1472,7 +1430,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1527,7 +1484,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1560,7 +1516,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1610,7 +1565,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1679,7 +1633,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1697,7 +1650,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1752,7 +1704,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1812,7 +1763,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1845,7 +1795,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1900,7 +1849,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1974,7 +1922,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers2/input.ts.json index 074316bcd247..0d65084b9bff 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -192,7 +187,6 @@ "ctxt": 0 }, "value": "NotOptional", - "typeAnnotation": null, "optional": false }, "body": { @@ -218,7 +212,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -248,7 +241,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -277,7 +269,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -301,7 +292,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -330,7 +320,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -356,7 +345,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -377,7 +365,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -407,7 +394,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -436,7 +422,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -460,7 +445,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -504,7 +488,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -561,7 +544,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -612,7 +594,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -638,7 +619,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -659,7 +639,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -716,7 +695,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -782,7 +760,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -844,7 +821,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -900,7 +876,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -926,7 +901,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -947,7 +921,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1009,7 +982,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1085,7 +1057,6 @@ "ctxt": 0 }, "value": "Optional", - "typeAnnotation": null, "optional": false }, "body": { @@ -1111,7 +1082,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1141,7 +1111,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1170,7 +1139,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1194,7 +1162,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1223,7 +1190,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1249,7 +1215,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1270,7 +1235,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1300,7 +1264,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1329,7 +1292,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1353,7 +1315,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1397,7 +1358,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1454,7 +1414,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1505,7 +1464,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1531,7 +1489,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1552,7 +1509,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1609,7 +1565,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1675,7 +1630,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1737,7 +1691,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1793,7 +1746,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1819,7 +1771,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1840,7 +1791,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1902,7 +1852,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers3/input.ts.json index b6754bf18b65..d8139c0ff68e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers3/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -192,7 +187,6 @@ "ctxt": 0 }, "value": "NotOptional", - "typeAnnotation": null, "optional": false }, "body": { @@ -218,7 +212,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -248,7 +241,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -277,7 +269,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -301,7 +292,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -330,7 +320,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -356,7 +345,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -377,7 +365,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -407,7 +394,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -436,7 +422,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -460,7 +445,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -489,7 +473,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -515,7 +498,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -572,7 +554,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -623,7 +604,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -649,7 +629,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -670,7 +649,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -727,7 +705,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -778,7 +755,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -804,7 +780,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -866,7 +841,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -922,7 +896,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -948,7 +921,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -969,7 +941,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1031,7 +1002,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1087,7 +1057,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1118,7 +1087,6 @@ "ctxt": 0 }, "value": "Optional", - "typeAnnotation": null, "optional": false }, "body": { @@ -1144,7 +1112,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1174,7 +1141,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1203,7 +1169,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1227,7 +1192,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1256,7 +1220,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1282,7 +1245,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1303,7 +1265,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1333,7 +1294,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1362,7 +1322,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1386,7 +1345,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1415,7 +1373,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1441,7 +1398,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1498,7 +1454,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1549,7 +1504,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1575,7 +1529,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1596,7 +1549,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1653,7 +1605,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1704,7 +1655,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1730,7 +1680,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1792,7 +1741,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1848,7 +1796,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1874,7 +1821,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1895,7 +1841,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1957,7 +1902,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2013,7 +1957,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers4/input.ts.json index ca469af4ab88..6ca6e10e4413 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -226,7 +219,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -259,7 +251,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -285,7 +276,6 @@ "ctxt": 0 }, "value": "fooo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -311,7 +301,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -336,7 +325,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -354,7 +342,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -404,7 +391,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -437,7 +423,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -487,7 +472,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -512,7 +496,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -530,7 +513,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -585,7 +567,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -618,7 +599,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -673,7 +653,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -698,7 +677,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5/input.ts.json index e8bbd258f780..b6678df3e54a 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -192,7 +187,6 @@ "ctxt": 0 }, "value": "NotOptional", - "typeAnnotation": null, "optional": false }, "body": { @@ -218,7 +212,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -248,7 +241,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -277,7 +269,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -298,7 +289,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -324,7 +314,6 @@ "ctxt": 0 }, "value": "fooo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -350,7 +339,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -387,7 +375,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -409,7 +396,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -466,7 +452,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -487,7 +472,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -537,7 +521,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -574,7 +557,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -596,7 +578,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -658,7 +639,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -679,7 +659,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -734,7 +713,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -771,7 +749,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -798,7 +775,6 @@ "ctxt": 0 }, "value": "Optional", - "typeAnnotation": null, "optional": false }, "body": { @@ -824,7 +800,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -854,7 +829,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -883,7 +857,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -904,7 +877,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -930,7 +902,6 @@ "ctxt": 0 }, "value": "fooo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -956,7 +927,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -993,7 +963,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1015,7 +984,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1072,7 +1040,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1093,7 +1060,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1143,7 +1109,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1180,7 +1145,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1202,7 +1166,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1264,7 +1227,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1285,7 +1247,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1340,7 +1301,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1377,7 +1337,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "typeArguments": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersAccessibility/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersAccessibility/input.ts.json index 6658da2b499d..4c1475433001 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersAccessibility/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersAccessibility/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -226,7 +219,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -259,7 +251,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -285,7 +276,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -311,7 +301,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -336,7 +325,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -354,7 +342,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -404,7 +391,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -437,7 +423,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -487,7 +472,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -512,7 +496,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -530,7 +513,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -585,7 +567,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -618,7 +599,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -673,7 +653,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -698,7 +677,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersAccessibility2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersAccessibility2/input.ts.json index 59fe56629bbd..b62f99da6f63 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersAccessibility2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersAccessibility2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -181,7 +176,6 @@ "ctxt": 0 }, "value": "ExplicitPublic", - "typeAnnotation": null, "optional": false }, "body": { @@ -202,7 +196,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -228,7 +221,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -254,7 +246,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -287,7 +278,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -313,7 +303,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -339,7 +328,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -364,7 +352,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -382,7 +369,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -432,7 +418,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -465,7 +450,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -515,7 +499,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -540,7 +523,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -558,7 +540,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -613,7 +594,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -646,7 +626,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -701,7 +680,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -726,7 +704,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -754,7 +731,6 @@ "ctxt": 0 }, "value": "ImplicitPublic", - "typeAnnotation": null, "optional": false }, "body": { @@ -775,7 +751,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -801,7 +776,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -827,7 +801,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -860,7 +833,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -886,7 +858,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -912,7 +883,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -937,7 +907,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -955,7 +924,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1005,7 +973,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1038,7 +1005,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1088,7 +1054,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1113,7 +1078,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1131,7 +1095,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1186,7 +1149,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1219,7 +1181,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1274,7 +1235,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1299,7 +1259,6 @@ "ctxt": 0 }, "value": "A3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersOptionality/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersOptionality/input.ts.json index d19bea5dd35e..f6927c522872 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersOptionality/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersOptionality/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -241,7 +234,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -285,7 +277,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -315,7 +306,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -344,7 +334,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -370,7 +359,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -391,7 +379,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -421,7 +408,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -450,7 +436,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -476,7 +461,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -533,7 +517,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -559,7 +542,6 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -580,7 +562,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -637,7 +618,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -663,7 +643,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -725,7 +704,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -751,7 +729,6 @@ "ctxt": 0 }, "value": "S3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -772,7 +749,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -834,7 +810,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -870,6 +845,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -901,7 +877,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -930,7 +905,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -940,8 +914,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -973,8 +946,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -994,7 +967,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1027,7 +999,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1065,8 +1036,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1092,7 +1063,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1103,7 +1073,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1128,7 +1097,6 @@ "ctxt": 0 }, "value": "TwoLevels", - "typeAnnotation": null, "optional": false }, "body": { @@ -1154,7 +1122,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1184,7 +1151,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1213,7 +1179,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1239,7 +1204,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1260,7 +1224,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1290,7 +1253,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1319,7 +1281,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1345,7 +1306,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1402,7 +1362,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1428,7 +1387,6 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1449,7 +1407,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1506,7 +1463,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1532,7 +1488,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1594,7 +1549,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1620,7 +1574,6 @@ "ctxt": 0 }, "value": "S3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1641,7 +1594,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -1703,7 +1655,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1739,6 +1690,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1770,7 +1722,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1799,7 +1750,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1809,8 +1759,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1842,8 +1791,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1863,7 +1812,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1896,7 +1844,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1934,8 +1881,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1961,7 +1908,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1972,7 +1918,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersOptionality2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersOptionality2/input.ts.json index 699712a9dc0d..4fbbc9bfe378 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersOptionality2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersOptionality2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -220,7 +214,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -249,7 +242,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -275,7 +267,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -296,7 +287,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -326,7 +316,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,7 +344,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -381,7 +369,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -438,7 +425,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -464,7 +450,6 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -485,7 +470,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -542,7 +526,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -568,7 +551,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -630,7 +612,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -656,7 +637,6 @@ "ctxt": 0 }, "value": "S3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -677,7 +657,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -739,7 +718,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -775,6 +753,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -806,7 +785,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -835,7 +813,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -845,8 +822,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -878,6 +854,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -909,7 +886,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -938,7 +914,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -948,8 +923,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -981,8 +955,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1008,7 +982,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1019,7 +992,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersOptionality3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersOptionality3/input.ts.json index 49d095a87c8d..5bab95a792b0 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersOptionality3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersOptionality3/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -220,7 +214,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -249,7 +242,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -275,7 +267,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -296,7 +287,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -326,7 +316,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,7 +344,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -381,7 +369,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -438,7 +425,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -464,7 +450,6 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -485,7 +470,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -542,7 +526,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -568,7 +551,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -630,7 +612,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -656,7 +637,6 @@ "ctxt": 0 }, "value": "S3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -677,7 +657,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -739,7 +718,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -775,6 +753,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -806,7 +785,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -835,7 +813,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -845,8 +822,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -878,6 +854,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -909,7 +886,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -938,7 +914,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -948,8 +923,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -981,8 +955,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1008,7 +982,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1019,7 +992,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersOptionality4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersOptionality4/input.ts.json index 204789e42ee5..1a1e2ee14fad 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersOptionality4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersOptionality4/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -220,7 +214,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -249,7 +242,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -275,7 +267,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -296,7 +287,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -326,7 +316,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -355,7 +344,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -381,7 +369,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -438,7 +425,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -464,7 +450,6 @@ "ctxt": 0 }, "value": "S2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -485,7 +470,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -542,7 +526,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -568,7 +551,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -630,7 +612,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -656,7 +637,6 @@ "ctxt": 0 }, "value": "S3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -677,7 +657,6 @@ "ctxt": 0 }, "value": "T3", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -739,7 +718,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -775,6 +753,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -806,7 +785,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -835,7 +813,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -845,8 +822,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -878,6 +854,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -909,7 +886,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -938,7 +914,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -948,8 +923,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -981,8 +955,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1008,7 +982,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1019,7 +992,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithOptionalProperties/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithOptionalProperties/input.ts.json index 5f6e7f0fbcb9..77e1508460e9 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithOptionalProperties/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithOptionalProperties/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -108,6 +106,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -139,7 +138,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -167,8 +165,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -178,7 +175,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "definite": false @@ -200,7 +196,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -231,7 +226,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -266,8 +260,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -284,7 +278,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -308,7 +301,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": { @@ -326,7 +318,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -373,7 +364,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -384,7 +374,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -418,7 +407,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "property": { @@ -429,7 +417,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -442,7 +429,6 @@ "ctxt": 0 }, "value": "toFixed", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer/input.ts.json index 265c3f397b2a..be225925ec3c 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -241,7 +234,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -280,7 +272,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -302,6 +293,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -318,8 +310,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -344,7 +335,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -374,7 +364,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -396,6 +385,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -412,8 +402,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -438,7 +427,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -460,7 +448,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -478,7 +465,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -500,6 +486,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -516,8 +503,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -542,7 +528,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -564,7 +549,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -589,7 +573,6 @@ "ctxt": 0 }, "value": "Generics", - "typeAnnotation": null, "optional": false }, "body": { @@ -610,7 +593,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -632,6 +614,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -648,8 +631,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -674,7 +656,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -713,7 +694,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -731,7 +711,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -753,7 +732,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -775,6 +753,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -791,8 +770,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -817,7 +795,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -839,7 +816,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -867,7 +843,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -886,7 +861,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -908,6 +882,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -924,8 +899,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -950,7 +924,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -972,7 +945,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1000,7 +972,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1019,7 +990,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1041,6 +1011,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1057,8 +1028,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1083,7 +1053,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1105,7 +1074,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1132,7 +1100,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1150,7 +1117,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1182,7 +1148,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1201,7 +1166,6 @@ "ctxt": 0 }, "value": "B4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1223,6 +1187,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1239,8 +1204,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1265,7 +1229,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1287,7 +1250,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1314,7 +1276,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1332,7 +1293,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1364,7 +1324,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer2/input.ts.json index ac5858e137cd..c7adf514e2ac 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -241,7 +234,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -285,7 +277,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -310,6 +301,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -326,8 +318,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -352,7 +343,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -383,7 +373,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -404,7 +393,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -429,6 +417,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -445,8 +434,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -471,7 +459,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -502,7 +489,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -523,7 +509,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -548,6 +533,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -564,8 +550,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -590,7 +575,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -623,7 +607,6 @@ "ctxt": 0 }, "value": "Generics", - "typeAnnotation": null, "optional": false }, "body": { @@ -649,7 +632,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -676,7 +658,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -694,7 +675,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -723,6 +703,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -739,8 +720,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -765,7 +745,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -796,7 +775,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -817,7 +795,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -843,7 +820,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -871,6 +847,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -887,8 +864,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -913,7 +889,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -944,7 +919,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -965,7 +939,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -991,7 +964,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1019,6 +991,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1035,8 +1008,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1061,7 +1033,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1092,7 +1063,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1119,7 +1089,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1137,7 +1106,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1162,7 +1130,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1188,7 +1155,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1216,6 +1182,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1232,8 +1199,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1258,7 +1224,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1289,7 +1254,6 @@ "ctxt": 0 }, "value": "B4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1316,7 +1280,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1334,7 +1297,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1359,7 +1321,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1385,7 +1346,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1413,6 +1373,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1429,8 +1390,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1455,7 +1415,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1486,7 +1445,6 @@ "ctxt": 0 }, "value": "B5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1513,7 +1471,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1531,7 +1488,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1556,7 +1512,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -1582,7 +1537,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1610,6 +1564,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1626,8 +1581,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1652,7 +1606,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer3/input.ts.json index fa93ccc7db6e..e9d96d165c08 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer3/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -241,7 +234,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -280,7 +272,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -302,6 +293,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -318,8 +310,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -344,7 +335,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -374,7 +364,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -396,6 +385,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -412,8 +402,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -438,7 +427,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -460,7 +448,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -478,7 +465,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -500,6 +486,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -516,8 +503,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -542,7 +528,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -564,7 +549,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -589,7 +573,6 @@ "ctxt": 0 }, "value": "Generics", - "typeAnnotation": null, "optional": false }, "body": { @@ -610,7 +593,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -632,6 +614,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -648,8 +631,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -674,7 +656,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -713,7 +694,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -731,7 +711,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -753,7 +732,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -775,6 +753,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -791,8 +770,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -817,7 +795,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -839,7 +816,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -867,7 +843,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -886,7 +861,6 @@ "ctxt": 0 }, "value": "B2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -908,6 +882,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -924,8 +899,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -950,7 +924,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -972,7 +945,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1000,7 +972,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1019,7 +990,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1041,6 +1011,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1057,8 +1028,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1083,7 +1053,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1105,7 +1074,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1132,7 +1100,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1150,7 +1117,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1182,7 +1148,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1201,7 +1166,6 @@ "ctxt": 0 }, "value": "B4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1223,6 +1187,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1239,8 +1204,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1265,7 +1229,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1287,7 +1250,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1314,7 +1276,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1332,7 +1293,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1364,7 +1324,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1383,7 +1342,6 @@ "ctxt": 0 }, "value": "B5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1405,6 +1363,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1421,8 +1380,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1447,7 +1405,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1469,7 +1426,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1496,7 +1452,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1514,7 +1469,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1546,7 +1500,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer4/input.ts.json index 471f56287c53..f2bd978e9aee 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer4/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -146,7 +142,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -211,7 +205,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -241,7 +234,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -280,7 +272,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -302,6 +293,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -318,8 +310,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -344,7 +335,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -374,7 +364,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -396,6 +385,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -412,8 +402,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -449,7 +438,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -474,7 +462,6 @@ "ctxt": 0 }, "value": "Generics", - "typeAnnotation": null, "optional": false }, "body": { @@ -495,7 +482,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -517,6 +503,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -533,8 +520,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -559,7 +545,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -598,7 +583,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -616,7 +600,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -638,7 +621,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -660,6 +642,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -676,8 +659,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -713,7 +695,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -741,7 +722,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -760,7 +740,6 @@ "ctxt": 0 }, "value": "B3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -782,6 +761,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -798,8 +778,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -835,7 +814,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -862,7 +840,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -880,7 +857,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -912,7 +888,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/undefinedIsSubtypeOfEverything/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/undefinedIsSubtypeOfEverything/input.ts.json index 37c457595829..0be74004f671 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/undefinedIsSubtypeOfEverything/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/undefinedIsSubtypeOfEverything/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -100,7 +97,6 @@ "ctxt": 0 }, "value": "D0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -126,7 +122,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -166,7 +161,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -184,7 +178,6 @@ "ctxt": 0 }, "value": "DA", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -210,7 +203,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -236,7 +228,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -260,7 +251,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -278,7 +268,6 @@ "ctxt": 0 }, "value": "D1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -304,7 +293,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -344,7 +332,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -362,7 +349,6 @@ "ctxt": 0 }, "value": "D1A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -388,7 +374,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -414,7 +399,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -439,7 +423,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -457,7 +440,6 @@ "ctxt": 0 }, "value": "D2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -483,7 +465,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -523,7 +504,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -541,7 +521,6 @@ "ctxt": 0 }, "value": "D2A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -567,7 +546,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -593,7 +571,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -618,7 +595,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -636,7 +612,6 @@ "ctxt": 0 }, "value": "D3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -662,7 +637,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -702,7 +676,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -720,7 +693,6 @@ "ctxt": 0 }, "value": "D3A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -746,7 +718,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -772,7 +743,6 @@ "ctxt": 0 }, "value": "Boolean", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -797,7 +767,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -815,7 +784,6 @@ "ctxt": 0 }, "value": "D4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -841,7 +809,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -867,7 +834,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -892,7 +858,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -910,7 +875,6 @@ "ctxt": 0 }, "value": "D5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -936,7 +900,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -962,7 +925,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -987,7 +949,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1005,7 +966,6 @@ "ctxt": 0 }, "value": "D6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1031,7 +991,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1079,7 +1038,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1097,7 +1055,6 @@ "ctxt": 0 }, "value": "D7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1123,7 +1080,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1158,7 +1114,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1206,7 +1161,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1224,7 +1178,6 @@ "ctxt": 0 }, "value": "D8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1250,7 +1203,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1276,7 +1228,6 @@ "ctxt": 0 }, "value": "D7", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1301,7 +1252,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1324,7 +1274,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1354,7 +1303,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1393,7 +1341,6 @@ "ctxt": 0 }, "value": "D9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1419,7 +1366,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1445,7 +1391,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1470,7 +1415,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1488,7 +1432,6 @@ "ctxt": 0 }, "value": "D10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1514,7 +1457,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1572,7 +1514,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1597,7 +1538,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -1616,7 +1556,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -1633,7 +1572,6 @@ "ctxt": 0 }, "value": "D11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1659,7 +1597,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1685,7 +1622,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1710,7 +1646,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1728,7 +1663,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1770,7 +1704,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "body": { @@ -1813,8 +1746,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -1843,7 +1776,6 @@ "ctxt": 0 }, "value": "D12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1869,7 +1801,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1895,7 +1826,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -1919,7 +1849,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1937,7 +1866,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1963,7 +1891,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2018,7 +1945,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "body": { @@ -2061,8 +1987,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -2091,7 +2017,6 @@ "ctxt": 0 }, "value": "D13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2117,7 +2042,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2143,7 +2067,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -2167,7 +2090,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2185,7 +2107,6 @@ "ctxt": 0 }, "value": "D14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2211,7 +2132,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2237,7 +2157,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2262,7 +2181,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2289,7 +2207,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2310,7 +2227,6 @@ "ctxt": 0 }, "value": "D15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2336,7 +2252,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2362,7 +2277,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2387,7 +2301,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2414,7 +2327,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2435,7 +2347,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2456,7 +2367,6 @@ "ctxt": 0 }, "value": "D16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2482,7 +2392,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2508,7 +2417,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2533,7 +2441,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -2551,7 +2458,6 @@ "ctxt": 0 }, "value": "D17", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2577,7 +2483,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2617,7 +2522,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/unionSubtypeIfEveryConstituentTypeIsSubtype/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/unionSubtypeIfEveryConstituentTypeIsSubtype/input.ts.json index ec2ae33b2413..964e3fffc79f 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/unionSubtypeIfEveryConstituentTypeIsSubtype/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/subtypesAndSuperTypes/unionSubtypeIfEveryConstituentTypeIsSubtype/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "members": [ @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, "optional": false }, "init": null @@ -62,7 +60,6 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, "optional": false }, "init": null @@ -84,7 +81,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -109,6 +105,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -125,8 +122,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -230,7 +225,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -267,7 +261,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -304,7 +297,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -329,6 +321,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -345,8 +338,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -389,7 +381,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -450,7 +441,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -487,7 +477,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -524,7 +513,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -549,6 +537,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -565,8 +554,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -609,7 +597,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -670,7 +657,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -707,7 +693,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -744,7 +729,6 @@ "ctxt": 0 }, "value": "I4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -769,6 +753,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,8 +770,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -829,7 +813,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -890,7 +873,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -927,7 +909,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -964,7 +945,6 @@ "ctxt": 0 }, "value": "I5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -989,6 +969,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1005,8 +986,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1031,7 +1011,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1060,7 +1039,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1121,7 +1099,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1158,7 +1135,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1195,7 +1171,6 @@ "ctxt": 0 }, "value": "I6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1220,6 +1195,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1236,8 +1212,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1262,7 +1237,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1291,7 +1265,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1352,7 +1325,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1389,7 +1361,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1426,7 +1397,6 @@ "ctxt": 0 }, "value": "I7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1451,6 +1421,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1467,8 +1438,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1502,7 +1472,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1554,7 +1523,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1615,7 +1583,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1652,7 +1619,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1689,7 +1655,6 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1714,6 +1679,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1730,8 +1696,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1782,7 +1747,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1843,7 +1807,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1880,7 +1843,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1917,7 +1879,6 @@ "ctxt": 0 }, "value": "I9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1942,6 +1903,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1958,8 +1920,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1984,7 +1945,6 @@ "ctxt": 0 }, "value": "I8", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2013,7 +1973,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2074,7 +2033,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2111,7 +2069,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2143,7 +2100,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2169,7 +2125,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2222,7 +2177,6 @@ "ctxt": 0 }, "value": "I10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2247,6 +2201,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2263,8 +2218,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2289,7 +2243,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2318,7 +2271,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2379,7 +2331,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2416,7 +2367,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2448,7 +2398,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2474,7 +2423,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2500,7 +2448,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2542,7 +2489,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2568,7 +2514,6 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2593,6 +2538,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2609,8 +2555,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2635,7 +2580,6 @@ "ctxt": 0 }, "value": "A2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2682,7 +2626,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2743,7 +2686,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2780,7 +2722,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2817,7 +2758,6 @@ "ctxt": 0 }, "value": "I12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2842,6 +2782,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2858,8 +2799,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2885,8 +2825,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeParams": null, @@ -2932,7 +2872,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2993,7 +2932,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3030,7 +2968,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3067,7 +3004,6 @@ "ctxt": 0 }, "value": "I13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3092,6 +3028,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3108,8 +3045,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3135,6 +3071,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3157,13 +3094,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3189,7 +3124,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3219,7 +3153,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3250,7 +3183,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3311,7 +3243,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3348,7 +3279,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3387,7 +3317,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "members": [ @@ -3406,7 +3335,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -3428,7 +3356,6 @@ "ctxt": 0 }, "value": "I14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3453,6 +3380,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3469,8 +3397,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3495,7 +3422,6 @@ "ctxt": 0 }, "value": "E2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3524,7 +3450,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3585,7 +3510,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3622,7 +3546,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3654,7 +3577,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3696,7 +3618,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "body": { @@ -3739,8 +3660,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -3774,7 +3695,6 @@ "ctxt": 0 }, "value": "I15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3799,6 +3719,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3815,8 +3736,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3841,7 +3761,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -3869,7 +3788,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3930,7 +3848,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3967,7 +3884,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3999,7 +3915,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4025,7 +3940,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -4080,7 +3994,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "body": { @@ -4123,8 +4036,8 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NumericLiteral", @@ -4158,7 +4071,6 @@ "ctxt": 0 }, "value": "I16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4183,6 +4095,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4199,8 +4112,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4225,7 +4137,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -4253,7 +4164,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4314,7 +4224,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4351,7 +4260,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4388,7 +4296,6 @@ "ctxt": 0 }, "value": "I17", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4415,7 +4322,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4443,6 +4349,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4459,8 +4366,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4485,7 +4391,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4514,7 +4419,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4575,7 +4479,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4612,7 +4515,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4649,7 +4551,6 @@ "ctxt": 0 }, "value": "I19", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4674,6 +4575,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4690,8 +4592,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4716,7 +4617,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4745,7 +4645,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4806,7 +4705,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4843,7 +4741,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4880,7 +4777,6 @@ "ctxt": 0 }, "value": "I20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4905,6 +4801,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4921,8 +4818,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4965,7 +4861,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5026,7 +4921,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5063,7 +4957,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity/input.ts.json index 17367a038838..f856ab1b9f27 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -216,7 +210,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -258,7 +251,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -284,7 +276,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -314,7 +305,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -368,6 +358,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -399,7 +390,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -427,8 +417,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -460,8 +449,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -481,7 +470,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -515,7 +503,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -536,6 +523,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -558,13 +546,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -590,7 +576,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -611,6 +596,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -633,13 +619,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -665,7 +649,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -686,6 +669,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -702,8 +686,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -737,7 +720,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -758,6 +740,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -780,13 +763,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -812,7 +793,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -833,6 +813,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -855,13 +836,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -887,7 +866,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -908,6 +886,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -924,8 +903,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -959,7 +937,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -980,6 +957,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1002,7 +980,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1025,8 +1002,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1052,7 +1028,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1073,6 +1048,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1095,7 +1071,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1118,8 +1093,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1145,7 +1119,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1166,6 +1139,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1182,8 +1156,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1217,7 +1190,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1238,6 +1210,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1260,13 +1233,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1292,7 +1263,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1313,6 +1283,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1335,13 +1306,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1367,7 +1336,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1388,6 +1356,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1404,8 +1373,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1439,7 +1407,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1460,6 +1427,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1482,12 +1450,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1513,7 +1479,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1534,6 +1499,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1556,12 +1522,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1587,7 +1551,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1608,6 +1571,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1624,8 +1588,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1659,7 +1622,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1680,6 +1642,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1702,12 +1665,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1733,7 +1694,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1754,6 +1714,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1776,12 +1737,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1807,7 +1766,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1828,6 +1786,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1844,8 +1803,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1879,7 +1837,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1900,6 +1857,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1922,13 +1880,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1954,7 +1910,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1975,6 +1930,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1997,13 +1953,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2029,7 +1983,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2050,6 +2003,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2066,8 +2020,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2101,7 +2054,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2122,6 +2074,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2144,13 +2097,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2176,7 +2127,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2197,6 +2147,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2219,7 +2170,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2242,8 +2192,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2269,7 +2218,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2290,6 +2238,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2306,8 +2255,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2341,7 +2289,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2362,6 +2309,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2384,13 +2332,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2416,7 +2362,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2437,6 +2382,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2459,13 +2405,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2491,7 +2435,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2512,6 +2455,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2528,8 +2472,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2563,7 +2506,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2584,6 +2526,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2606,13 +2549,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2638,7 +2579,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2659,6 +2599,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2681,12 +2622,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2712,7 +2651,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2733,6 +2671,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2749,8 +2688,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2784,7 +2722,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2805,6 +2742,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2827,13 +2765,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2859,7 +2795,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2880,6 +2815,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2902,13 +2838,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2934,7 +2868,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2955,6 +2888,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2971,8 +2905,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3006,7 +2939,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3027,6 +2959,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3049,13 +2982,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3081,7 +3012,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3102,6 +3032,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3124,7 +3055,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3147,8 +3077,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3174,7 +3103,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3195,6 +3123,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3211,8 +3140,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3246,7 +3174,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3267,6 +3194,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3289,13 +3217,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3321,7 +3247,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3342,6 +3267,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3364,12 +3290,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3395,7 +3319,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3416,6 +3339,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3432,8 +3356,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3467,7 +3390,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3488,6 +3410,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3510,13 +3433,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3542,7 +3463,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3563,6 +3483,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3585,12 +3506,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3616,7 +3535,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3637,6 +3555,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3653,8 +3572,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3688,7 +3606,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3709,6 +3626,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3731,13 +3649,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3763,7 +3679,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3784,6 +3699,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3806,7 +3722,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3829,8 +3744,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3856,7 +3770,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3877,6 +3790,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3893,8 +3807,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3928,7 +3841,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3949,6 +3861,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3971,13 +3884,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4003,7 +3914,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4024,6 +3934,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4046,12 +3957,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4077,7 +3986,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4098,6 +4006,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4114,8 +4023,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4149,7 +4057,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4170,6 +4077,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4192,13 +4100,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4224,7 +4130,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4245,6 +4150,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4267,12 +4173,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4298,7 +4202,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4319,6 +4222,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4335,8 +4239,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity2/input.ts.json index 697db7a2fed1..32a2b592e5f8 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -216,7 +210,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -258,7 +251,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -284,7 +276,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -314,7 +305,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -343,7 +333,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -379,6 +368,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -410,7 +400,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -439,7 +428,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -449,8 +437,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -474,7 +461,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -493,7 +479,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -525,8 +510,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -546,7 +531,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -564,7 +548,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -575,7 +558,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -597,7 +579,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -618,6 +599,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -640,13 +622,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -672,7 +652,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -693,6 +672,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -715,13 +695,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -747,7 +725,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -768,6 +745,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -784,8 +762,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -819,7 +796,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -840,6 +816,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -862,13 +839,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -894,7 +869,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -915,6 +889,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -937,7 +912,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -960,8 +934,7 @@ ] } } - }, - "optional": false + } } } ], @@ -987,7 +960,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1008,6 +980,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1024,8 +997,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1059,7 +1031,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1080,6 +1051,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1102,13 +1074,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1134,7 +1104,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1155,6 +1124,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1177,13 +1147,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1209,7 +1177,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1230,6 +1197,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1246,8 +1214,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1281,7 +1248,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1302,6 +1268,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1324,13 +1291,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1356,7 +1321,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1377,6 +1341,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1399,12 +1364,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1430,7 +1393,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1451,6 +1413,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1467,8 +1430,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1502,7 +1464,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1523,6 +1484,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1545,13 +1507,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1577,7 +1537,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1598,6 +1557,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1620,13 +1580,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1652,7 +1610,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1673,6 +1630,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1689,8 +1647,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1724,7 +1681,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1745,6 +1701,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1767,13 +1724,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1799,7 +1754,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1820,6 +1774,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1842,7 +1797,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1865,8 +1819,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1892,7 +1845,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1913,6 +1865,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1929,8 +1882,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1964,7 +1916,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1985,6 +1936,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2007,13 +1959,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2039,7 +1989,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2060,6 +2009,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2082,12 +2032,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2113,7 +2061,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2134,6 +2081,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2150,8 +2098,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2185,7 +2132,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2206,6 +2152,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2228,13 +2175,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2260,7 +2205,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2281,6 +2225,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2303,12 +2248,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2334,7 +2277,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2355,6 +2297,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2371,8 +2314,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2406,7 +2348,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2427,6 +2368,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2449,13 +2391,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2481,7 +2421,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2502,6 +2441,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2524,7 +2464,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2547,8 +2486,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2574,7 +2512,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2595,6 +2532,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2611,8 +2549,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2646,7 +2583,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2667,6 +2603,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2689,13 +2626,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2721,7 +2656,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2742,6 +2676,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2764,12 +2699,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2795,7 +2728,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2816,6 +2748,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2832,8 +2765,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2867,7 +2799,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2888,6 +2819,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2910,13 +2842,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2942,7 +2872,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2963,6 +2892,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2985,12 +2915,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3016,7 +2944,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3037,6 +2964,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3053,8 +2981,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures/input.ts.json index 8545cf48d1ea..7fe44ca38250 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -79,8 +78,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -160,7 +158,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -186,7 +183,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -207,6 +203,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -223,8 +220,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -304,7 +300,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -330,7 +325,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -351,6 +345,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -373,13 +368,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -440,7 +433,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -479,7 +471,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -505,7 +496,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -535,7 +525,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -549,6 +538,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -565,8 +555,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -606,7 +595,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -633,7 +621,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -666,7 +653,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -680,6 +666,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -702,13 +689,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -733,7 +718,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -769,6 +753,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -800,7 +785,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -814,6 +798,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -830,8 +815,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -855,8 +839,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -888,8 +871,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -909,7 +892,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -929,6 +911,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -945,8 +928,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1009,7 +991,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1030,6 +1011,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1052,13 +1034,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1084,7 +1064,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1105,6 +1084,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1127,13 +1107,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1159,7 +1137,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1180,6 +1157,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1196,8 +1174,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1231,7 +1208,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1252,6 +1228,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1274,13 +1251,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1306,7 +1281,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1327,6 +1301,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1349,13 +1324,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1381,7 +1354,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1402,6 +1374,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1418,8 +1391,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1453,7 +1425,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1474,6 +1445,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1496,7 +1468,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1519,8 +1490,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1546,7 +1516,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1567,6 +1536,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1589,7 +1559,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1612,8 +1581,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1639,7 +1607,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1660,6 +1627,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1676,8 +1644,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1711,7 +1678,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1732,6 +1698,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1754,13 +1721,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1786,7 +1751,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1807,6 +1771,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1829,13 +1794,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1861,7 +1824,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1882,6 +1844,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1898,8 +1861,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1933,7 +1895,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1954,6 +1915,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1976,12 +1938,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2007,7 +1967,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2028,6 +1987,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2050,12 +2010,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2081,7 +2039,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2102,6 +2059,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2118,8 +2076,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2153,7 +2110,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2174,6 +2130,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2196,12 +2153,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2227,7 +2182,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2248,6 +2202,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2270,12 +2225,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2301,7 +2254,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2322,6 +2274,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2338,8 +2291,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2373,7 +2325,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2394,6 +2345,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2416,13 +2368,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2448,7 +2398,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2469,6 +2418,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2491,13 +2441,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2523,7 +2471,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2544,6 +2491,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2560,8 +2508,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2595,7 +2542,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2616,6 +2562,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2638,13 +2585,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2670,7 +2615,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2691,6 +2635,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2713,7 +2658,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2736,8 +2680,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2763,7 +2706,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2784,6 +2726,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2800,8 +2743,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2835,7 +2777,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2856,6 +2797,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2878,13 +2820,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2910,7 +2850,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2931,6 +2870,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2953,13 +2893,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2985,7 +2923,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3006,6 +2943,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3022,8 +2960,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3057,7 +2994,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3078,6 +3014,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3100,13 +3037,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3132,7 +3067,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3153,6 +3087,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3175,12 +3110,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3206,7 +3139,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3227,6 +3159,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3243,8 +3176,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3278,7 +3210,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3299,6 +3230,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3321,13 +3253,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3353,7 +3283,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3374,6 +3303,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3396,13 +3326,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3428,7 +3356,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3449,6 +3376,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3465,8 +3393,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3500,7 +3427,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3521,6 +3447,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3543,13 +3470,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3575,7 +3500,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3596,6 +3520,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3618,7 +3543,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3641,8 +3565,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3668,7 +3591,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3689,6 +3611,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3705,8 +3628,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3740,7 +3662,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3761,6 +3682,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3783,13 +3705,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3815,7 +3735,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3836,6 +3755,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3858,12 +3778,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3889,7 +3807,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3910,6 +3827,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3926,8 +3844,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3961,7 +3878,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3982,6 +3898,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4004,13 +3921,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4036,7 +3951,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4057,6 +3971,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4079,12 +3994,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4110,7 +4023,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4131,6 +4043,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4147,8 +4060,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4182,7 +4094,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4203,6 +4114,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4225,13 +4137,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4257,7 +4167,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4278,6 +4187,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4300,7 +4210,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4323,8 +4232,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4350,7 +4258,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4371,6 +4278,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4387,8 +4295,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4422,7 +4329,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4443,6 +4349,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4465,7 +4372,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4488,8 +4394,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4515,7 +4420,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4536,6 +4440,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4558,7 +4463,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4581,8 +4485,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4608,7 +4511,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4629,6 +4531,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4645,8 +4548,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4680,7 +4582,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4701,6 +4602,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4723,13 +4625,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4755,7 +4655,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4776,6 +4675,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4798,12 +4698,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4829,7 +4727,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4850,6 +4747,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4866,8 +4764,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4901,7 +4798,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4922,6 +4818,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4944,13 +4841,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4976,7 +4871,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4997,6 +4891,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5019,12 +4914,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5050,7 +4943,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5071,6 +4963,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5087,8 +4980,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5122,7 +5014,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5143,6 +5034,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5165,7 +5057,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5188,8 +5079,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5215,7 +5105,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5236,6 +5125,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5258,7 +5148,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5281,8 +5170,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5308,7 +5196,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5329,6 +5216,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5345,8 +5233,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures2/input.ts.json index 1221a1c23aca..f9a129e03658 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -79,8 +78,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -160,7 +158,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -186,7 +183,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -207,6 +203,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -223,8 +220,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -304,7 +300,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -330,7 +325,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -351,6 +345,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -373,13 +368,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -440,7 +433,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -479,7 +471,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -505,7 +496,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -535,7 +525,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -549,6 +538,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -565,8 +555,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnn": { @@ -606,7 +595,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -633,7 +621,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -666,7 +653,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -680,6 +666,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -702,13 +689,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -733,7 +718,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -769,6 +753,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -800,7 +785,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -814,6 +798,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -836,13 +821,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -866,8 +849,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -899,8 +881,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -920,7 +902,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -940,6 +921,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -962,13 +944,11 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1031,7 +1011,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1052,6 +1031,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1074,13 +1054,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1106,7 +1084,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1127,6 +1104,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1149,13 +1127,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1181,7 +1157,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1202,6 +1177,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1218,8 +1194,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1253,7 +1228,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1274,6 +1248,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1296,13 +1271,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1328,7 +1301,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1349,6 +1321,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1371,13 +1344,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1403,7 +1374,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1424,6 +1394,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1440,8 +1411,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1475,7 +1445,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1496,6 +1465,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1518,7 +1488,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1541,8 +1510,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1568,7 +1536,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1589,6 +1556,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1611,7 +1579,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1634,8 +1601,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1661,7 +1627,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1682,6 +1647,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1698,8 +1664,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1733,7 +1698,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1754,6 +1718,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1776,13 +1741,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1808,7 +1771,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1829,6 +1791,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1851,13 +1814,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1883,7 +1844,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1904,6 +1864,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1920,8 +1881,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1955,7 +1915,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1976,6 +1935,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1998,12 +1958,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2029,7 +1987,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2050,6 +2007,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2072,12 +2030,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2103,7 +2059,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2124,6 +2079,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2140,8 +2096,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2175,7 +2130,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2196,6 +2150,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2218,12 +2173,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2249,7 +2202,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2270,6 +2222,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2292,12 +2245,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2323,7 +2274,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2344,6 +2294,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2360,8 +2311,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2395,7 +2345,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2416,6 +2365,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2438,13 +2388,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2470,7 +2418,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2491,6 +2438,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2513,13 +2461,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2545,7 +2491,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2566,6 +2511,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2582,8 +2528,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2617,7 +2562,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2638,6 +2582,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2660,13 +2605,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2692,7 +2635,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2713,6 +2655,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2735,7 +2678,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2758,8 +2700,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2785,7 +2726,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2806,6 +2746,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2822,8 +2763,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2857,7 +2797,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2878,6 +2817,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2900,13 +2840,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2932,7 +2870,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2953,6 +2890,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2975,13 +2913,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3007,7 +2943,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3028,6 +2963,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3044,8 +2980,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3079,7 +3014,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3100,6 +3034,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3122,13 +3057,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3154,7 +3087,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3175,6 +3107,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3197,12 +3130,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3228,7 +3159,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3249,6 +3179,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3265,8 +3196,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3300,7 +3230,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3321,6 +3250,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3343,13 +3273,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3375,7 +3303,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3396,6 +3323,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3418,13 +3346,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3450,7 +3376,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3471,6 +3396,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3487,8 +3413,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3522,7 +3447,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3543,6 +3467,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3565,13 +3490,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3597,7 +3520,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3618,6 +3540,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3640,7 +3563,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3663,8 +3585,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3690,7 +3611,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3711,6 +3631,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3727,8 +3648,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3762,7 +3682,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3783,6 +3702,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3805,13 +3725,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3837,7 +3755,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3858,6 +3775,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3880,12 +3798,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3911,7 +3827,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3932,6 +3847,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3948,8 +3864,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3983,7 +3898,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4004,6 +3918,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4026,13 +3941,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4058,7 +3971,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4079,6 +3991,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4101,12 +4014,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4132,7 +4043,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4153,6 +4063,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4169,8 +4080,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4204,7 +4114,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4225,6 +4134,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4247,13 +4157,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4279,7 +4187,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4300,6 +4207,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4322,7 +4230,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4345,8 +4252,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4372,7 +4278,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4393,6 +4298,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4409,8 +4315,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4444,7 +4349,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4465,6 +4369,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4487,7 +4392,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4510,8 +4414,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4537,7 +4440,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4558,6 +4460,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4580,7 +4483,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4603,8 +4505,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4630,7 +4531,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4651,6 +4551,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4667,8 +4568,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4702,7 +4602,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4723,6 +4622,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4745,13 +4645,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4777,7 +4675,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4798,6 +4695,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4820,12 +4718,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4851,7 +4747,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4872,6 +4767,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4888,8 +4784,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4923,7 +4818,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4944,6 +4838,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4966,13 +4861,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4998,7 +4891,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5019,6 +4911,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5041,12 +4934,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5072,7 +4963,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5093,6 +4983,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5109,8 +5000,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5144,7 +5034,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5165,6 +5054,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5187,7 +5077,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5210,8 +5099,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5237,7 +5125,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5258,6 +5145,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5280,7 +5168,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5303,8 +5190,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5330,7 +5216,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5351,6 +5236,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5367,8 +5253,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures3/input.ts.json index 0d29ff570311..441517183393 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures3/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,6 +50,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -67,8 +67,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -108,7 +107,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -135,7 +133,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -168,6 +165,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -190,13 +188,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -221,7 +217,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -257,6 +252,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -288,6 +284,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -304,8 +301,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -329,8 +325,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -347,7 +342,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -368,6 +362,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -390,13 +385,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -422,7 +415,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -443,6 +435,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -465,13 +458,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -497,7 +488,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -518,6 +508,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -534,8 +525,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -569,7 +559,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -590,6 +579,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -612,12 +602,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -643,7 +631,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -664,6 +651,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -686,12 +674,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -717,7 +703,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -738,6 +723,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -754,8 +740,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -789,7 +774,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -810,6 +794,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -832,12 +817,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -863,7 +846,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -884,6 +866,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -906,12 +889,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -937,7 +918,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -958,6 +938,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -974,8 +955,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1009,7 +989,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1030,6 +1009,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1052,13 +1032,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1084,7 +1062,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1105,6 +1082,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1127,12 +1105,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1158,7 +1134,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1179,6 +1154,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1195,8 +1171,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1230,7 +1205,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1251,6 +1225,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1273,13 +1248,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1305,7 +1278,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1326,6 +1298,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1348,7 +1321,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1371,8 +1343,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1398,7 +1369,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1419,6 +1389,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1435,8 +1406,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1470,7 +1440,6 @@ "ctxt": 0 }, "value": "foo14b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1491,6 +1460,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1513,12 +1483,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1544,7 +1512,6 @@ "ctxt": 0 }, "value": "foo14b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1565,6 +1532,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1587,7 +1555,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1610,8 +1577,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1637,7 +1603,6 @@ "ctxt": 0 }, "value": "foo14b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1658,6 +1623,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1674,8 +1640,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1709,7 +1674,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1730,6 +1694,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1752,13 +1717,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1784,7 +1747,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1805,6 +1767,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1827,7 +1790,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1850,8 +1812,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1877,7 +1838,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1898,6 +1858,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1914,8 +1875,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesDifferingParamCounts/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesDifferingParamCounts/input.ts.json index 26c7a6c26acc..56f863e977a4 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesDifferingParamCounts/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesDifferingParamCounts/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -79,8 +78,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -160,7 +158,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -186,7 +183,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -207,6 +203,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -223,8 +220,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -243,6 +239,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -259,8 +256,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -340,7 +336,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -366,7 +361,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -387,6 +381,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -409,13 +404,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -434,6 +427,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -456,13 +450,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -523,7 +515,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -562,7 +553,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -588,7 +578,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -618,7 +607,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -632,6 +620,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -648,8 +637,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -689,7 +677,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -716,7 +703,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -749,7 +735,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -763,6 +748,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -785,13 +771,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -816,7 +800,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -852,6 +835,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -883,7 +867,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -897,6 +880,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -913,8 +897,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -924,6 +907,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -940,8 +924,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -965,8 +948,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -998,8 +980,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1019,7 +1001,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1039,6 +1020,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1055,8 +1037,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1119,7 +1100,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1140,6 +1120,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1162,13 +1143,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1194,7 +1173,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1215,6 +1193,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1237,13 +1216,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1269,7 +1246,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1290,6 +1266,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1306,8 +1283,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1341,7 +1317,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1362,6 +1337,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1384,13 +1360,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1416,7 +1390,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1437,6 +1410,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1459,13 +1433,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1491,7 +1463,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1512,6 +1483,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1528,8 +1500,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1563,7 +1534,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1584,6 +1554,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1606,7 +1577,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1629,8 +1599,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1656,7 +1625,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1677,6 +1645,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1699,7 +1668,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1722,8 +1690,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1749,7 +1716,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1770,6 +1736,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1786,8 +1753,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1821,7 +1787,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1842,6 +1807,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1864,13 +1830,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1896,7 +1860,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1917,6 +1880,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1939,13 +1903,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1971,7 +1933,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1992,6 +1953,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2008,8 +1970,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2043,7 +2004,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2064,6 +2024,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2086,12 +2047,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2117,7 +2076,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2138,6 +2096,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2160,12 +2119,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2191,7 +2148,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2212,6 +2168,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2228,8 +2185,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2263,7 +2219,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2284,6 +2239,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2306,12 +2262,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2337,7 +2291,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2358,6 +2311,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2380,12 +2334,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2411,7 +2363,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2432,6 +2383,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2448,8 +2400,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2483,7 +2434,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2504,6 +2454,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2526,13 +2477,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2558,7 +2507,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2579,6 +2527,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2601,13 +2550,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2633,7 +2580,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2654,6 +2600,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2670,8 +2617,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2705,7 +2651,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2726,6 +2671,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2748,13 +2694,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2780,7 +2724,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2801,6 +2744,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2823,7 +2767,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2846,8 +2789,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2873,7 +2815,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2894,6 +2835,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2910,8 +2852,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2945,7 +2886,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2966,6 +2906,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2988,13 +2929,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3020,7 +2959,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3041,6 +2979,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3063,13 +3002,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3095,7 +3032,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3116,6 +3052,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3132,8 +3069,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3167,7 +3103,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3188,6 +3123,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3210,13 +3146,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3242,7 +3176,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3263,6 +3196,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3285,12 +3219,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3316,7 +3248,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3337,6 +3268,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3353,8 +3285,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3388,7 +3319,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3409,6 +3339,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3431,13 +3362,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3463,7 +3392,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3484,6 +3412,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3506,13 +3435,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3538,7 +3465,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3559,6 +3485,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3575,8 +3502,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3610,7 +3536,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3631,6 +3556,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3653,13 +3579,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3685,7 +3609,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3706,6 +3629,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3728,7 +3652,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3751,8 +3674,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3778,7 +3700,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3799,6 +3720,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3815,8 +3737,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3850,7 +3771,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3871,6 +3791,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3893,13 +3814,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3925,7 +3844,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3946,6 +3864,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3968,12 +3887,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3999,7 +3916,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4020,6 +3936,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4036,8 +3953,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4071,7 +3987,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4092,6 +4007,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4114,13 +4030,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4146,7 +4060,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4167,6 +4080,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4189,12 +4103,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4220,7 +4132,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4241,6 +4152,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4257,8 +4169,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4292,7 +4203,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4313,6 +4223,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4335,13 +4246,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4367,7 +4276,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4388,6 +4296,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4410,7 +4319,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4433,8 +4341,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4460,7 +4367,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4481,6 +4387,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4497,8 +4404,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4532,7 +4438,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4553,6 +4458,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4575,7 +4481,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4598,8 +4503,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4625,7 +4529,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4646,6 +4549,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4668,7 +4572,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4691,8 +4594,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4718,7 +4620,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4739,6 +4640,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4755,8 +4657,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4790,7 +4691,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4811,6 +4711,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4833,13 +4734,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4865,7 +4764,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4886,6 +4784,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4908,12 +4807,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4939,7 +4836,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4960,6 +4856,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4976,8 +4873,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5011,7 +4907,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5032,6 +4927,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5054,13 +4950,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5086,7 +4980,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5107,6 +5000,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5129,12 +5023,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5160,7 +5052,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5181,6 +5072,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5197,8 +5089,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5232,7 +5123,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5253,6 +5143,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5275,7 +5166,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5298,8 +5188,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5325,7 +5214,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5346,6 +5234,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5368,7 +5257,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5391,8 +5279,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5418,7 +5305,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5439,6 +5325,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5455,8 +5342,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesDifferingParamCounts2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesDifferingParamCounts2/input.ts.json index eee4f642ef98..9bb93b7f1939 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesDifferingParamCounts2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesDifferingParamCounts2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,6 +50,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -67,8 +67,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -108,7 +107,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -135,7 +133,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -168,6 +165,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -190,13 +188,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -221,7 +217,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -257,6 +252,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -288,6 +284,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -304,8 +301,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -315,6 +311,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -331,8 +328,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -356,8 +352,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -374,7 +369,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -395,6 +389,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -417,13 +412,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -449,7 +442,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -470,6 +462,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -492,13 +485,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -524,7 +515,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -545,6 +535,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -561,8 +552,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -596,7 +586,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -617,6 +606,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -639,12 +629,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -670,7 +658,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -691,6 +678,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -713,12 +701,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -744,7 +730,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -765,6 +750,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -781,8 +767,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -816,7 +801,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -837,6 +821,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -859,7 +844,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -882,8 +866,7 @@ ] } } - }, - "optional": false + } } } ], @@ -909,7 +892,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -930,6 +912,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -952,7 +935,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -975,8 +957,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1002,7 +983,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1023,6 +1003,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1039,8 +1020,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1074,7 +1054,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1095,6 +1074,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1117,7 +1097,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1140,8 +1119,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1167,7 +1145,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1188,6 +1165,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1210,7 +1188,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1233,8 +1210,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1260,7 +1236,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1281,6 +1256,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1297,8 +1273,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1332,7 +1307,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1353,6 +1327,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1375,13 +1350,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1407,7 +1380,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1428,6 +1400,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1450,12 +1423,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1481,7 +1452,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1502,6 +1472,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1518,8 +1489,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1553,7 +1523,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1574,6 +1543,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1596,13 +1566,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1628,7 +1596,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1649,6 +1616,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1671,7 +1639,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1694,8 +1661,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1721,7 +1687,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1742,6 +1707,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1758,8 +1724,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1793,7 +1758,6 @@ "ctxt": 0 }, "value": "foo14b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1814,6 +1778,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1836,12 +1801,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1867,7 +1830,6 @@ "ctxt": 0 }, "value": "foo14b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1888,6 +1850,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1910,7 +1873,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1933,8 +1895,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1960,7 +1921,6 @@ "ctxt": 0 }, "value": "foo14b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1981,6 +1941,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1997,8 +1958,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2032,7 +1992,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2053,6 +2012,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2075,13 +2035,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2107,7 +2065,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2128,6 +2085,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2150,7 +2108,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2173,8 +2130,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2200,7 +2156,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2221,6 +2176,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2237,8 +2193,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesWithOverloads/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesWithOverloads/input.ts.json index 71ce5a16366f..160d8e104e9e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesWithOverloads/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesWithOverloads/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -79,8 +78,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -133,7 +131,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -154,6 +151,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -170,8 +168,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -224,7 +221,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -245,6 +241,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -261,8 +258,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -342,7 +338,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -368,7 +363,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -389,6 +383,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -405,8 +400,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -459,7 +453,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -480,6 +473,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -496,8 +490,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -550,7 +543,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -571,6 +563,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -587,8 +580,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -668,7 +660,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -694,7 +685,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -715,6 +705,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -731,8 +722,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -785,7 +775,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -806,6 +795,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -822,8 +812,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -876,7 +865,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -897,6 +885,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -919,13 +908,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -961,7 +948,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -989,7 +975,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -1010,6 +995,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1026,8 +1012,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1116,7 +1101,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1142,7 +1126,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1172,7 +1155,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1186,6 +1168,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1202,8 +1185,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -1241,7 +1223,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1255,6 +1236,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1271,8 +1253,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -1312,7 +1293,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1339,7 +1319,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1372,7 +1351,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1386,6 +1364,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1402,8 +1381,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -1441,7 +1419,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1455,6 +1432,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1471,8 +1449,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -1510,7 +1487,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1524,6 +1500,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1546,13 +1523,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1577,7 +1552,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1613,6 +1587,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1644,7 +1619,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1658,6 +1632,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1674,8 +1649,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -1713,7 +1687,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1727,6 +1700,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1743,8 +1717,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -1768,8 +1741,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1801,8 +1773,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1822,7 +1794,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1842,6 +1813,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1858,8 +1830,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1939,7 +1910,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1960,6 +1930,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1982,13 +1953,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2014,7 +1983,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2035,6 +2003,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2057,13 +2026,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2089,7 +2056,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2110,6 +2076,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2126,8 +2093,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2161,7 +2127,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2182,6 +2147,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2204,13 +2170,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2236,7 +2200,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2257,6 +2220,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2279,13 +2243,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2311,7 +2273,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2332,6 +2293,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2348,8 +2310,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2383,7 +2344,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2404,6 +2364,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2426,7 +2387,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2449,8 +2409,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2476,7 +2435,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2497,6 +2455,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2519,7 +2478,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2542,8 +2500,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2569,7 +2526,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2590,6 +2546,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2606,8 +2563,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2641,7 +2597,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2662,6 +2617,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2684,13 +2640,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2716,7 +2670,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2737,6 +2690,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2759,13 +2713,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2791,7 +2743,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2812,6 +2763,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2828,8 +2780,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2863,7 +2814,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2884,6 +2834,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2906,12 +2857,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2937,7 +2886,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2958,6 +2906,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2980,12 +2929,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3011,7 +2958,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3032,6 +2978,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3048,8 +2995,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3083,7 +3029,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3104,6 +3049,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3126,12 +3072,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3157,7 +3101,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3178,6 +3121,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3200,12 +3144,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3231,7 +3173,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3252,6 +3193,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3268,8 +3210,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3303,7 +3244,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3324,6 +3264,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3346,13 +3287,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3378,7 +3317,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3399,6 +3337,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3421,13 +3360,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3453,7 +3390,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3474,6 +3410,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3490,8 +3427,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3525,7 +3461,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3546,6 +3481,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3568,13 +3504,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3600,7 +3534,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3621,6 +3554,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3643,7 +3577,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3666,8 +3599,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3693,7 +3625,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3714,6 +3645,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3730,8 +3662,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3765,7 +3696,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3786,6 +3716,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3808,13 +3739,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3840,7 +3769,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3861,6 +3789,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3883,13 +3812,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3915,7 +3842,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3936,6 +3862,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3952,8 +3879,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3987,7 +3913,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4008,6 +3933,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4030,13 +3956,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4062,7 +3986,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4083,6 +4006,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4105,12 +4029,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4136,7 +4058,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4157,6 +4078,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4173,8 +4095,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4208,7 +4129,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4229,6 +4149,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4251,13 +4172,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4283,7 +4202,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4304,6 +4222,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4326,13 +4245,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4358,7 +4275,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4379,6 +4295,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4395,8 +4312,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4430,7 +4346,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4451,6 +4366,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4473,13 +4389,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4505,7 +4419,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4526,6 +4439,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4548,7 +4462,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4571,8 +4484,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4598,7 +4510,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4619,6 +4530,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4635,8 +4547,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4670,7 +4581,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4691,6 +4601,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4713,13 +4624,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4745,7 +4654,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4766,6 +4674,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4788,12 +4697,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4819,7 +4726,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4840,6 +4746,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4856,8 +4763,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4891,7 +4797,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4912,6 +4817,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4934,13 +4840,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4966,7 +4870,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4987,6 +4890,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5009,12 +4913,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5040,7 +4942,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5061,6 +4962,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5077,8 +4979,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5112,7 +5013,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5133,6 +5033,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5155,13 +5056,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5187,7 +5086,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5208,6 +5106,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5230,7 +5129,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5253,8 +5151,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5280,7 +5177,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5301,6 +5197,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5317,8 +5214,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5352,7 +5248,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5373,6 +5268,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5395,7 +5291,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5418,8 +5313,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5445,7 +5339,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5466,6 +5359,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5488,7 +5382,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5511,8 +5404,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5538,7 +5430,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5559,6 +5450,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5575,8 +5467,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5610,7 +5501,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5631,6 +5521,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5653,13 +5544,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5685,7 +5574,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5706,6 +5594,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5728,12 +5617,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5759,7 +5646,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5780,6 +5666,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5796,8 +5683,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5831,7 +5717,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5852,6 +5737,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5874,13 +5760,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5906,7 +5790,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5927,6 +5810,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5949,12 +5833,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5980,7 +5862,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6001,6 +5882,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6017,8 +5899,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -6052,7 +5933,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6073,6 +5953,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6095,7 +5976,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6118,8 +5998,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6145,7 +6024,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6166,6 +6044,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6188,7 +6067,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6211,8 +6089,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6238,7 +6115,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6259,6 +6135,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6275,8 +6152,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithComplexConstraints/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithComplexConstraints/input.ts.json index 5205ca48c34b..77f71f908642 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithComplexConstraints/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithComplexConstraints/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,6 +50,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -73,13 +73,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -89,6 +87,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -111,13 +110,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -160,7 +157,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -187,6 +183,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -209,13 +206,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -225,6 +220,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -247,13 +243,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -296,7 +290,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -314,7 +307,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -349,7 +341,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -379,6 +370,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -401,13 +393,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -417,6 +407,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -439,13 +430,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -488,7 +477,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -506,7 +494,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -529,7 +516,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -550,6 +536,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -572,13 +559,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -604,7 +589,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -625,6 +609,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -647,13 +632,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -679,7 +662,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -700,6 +682,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -716,8 +699,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures/input.ts.json index 7fc14d794878..ba576689eff6 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -78,8 +77,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -112,7 +110,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -138,7 +135,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -158,6 +154,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -174,8 +171,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -208,7 +204,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -234,7 +229,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -254,6 +248,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -276,13 +271,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -324,7 +317,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -350,7 +342,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -380,6 +371,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -396,8 +388,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -421,7 +412,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -448,7 +438,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -481,6 +470,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -503,13 +493,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -534,7 +522,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -570,6 +557,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -601,6 +589,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -617,8 +606,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -626,8 +614,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -644,7 +631,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -665,6 +651,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -687,13 +674,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -719,7 +704,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -740,6 +724,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -762,13 +747,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -794,7 +777,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -815,6 +797,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -831,8 +814,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -866,7 +848,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -887,6 +868,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -909,13 +891,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -941,7 +921,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -962,6 +941,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -984,13 +964,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1016,7 +994,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1037,6 +1014,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1053,8 +1031,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1088,7 +1065,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1109,6 +1085,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1131,7 +1108,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1154,8 +1130,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1181,7 +1156,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1202,6 +1176,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1224,7 +1199,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1247,8 +1221,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1274,7 +1247,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1295,6 +1267,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1311,8 +1284,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1346,7 +1318,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1367,6 +1338,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1389,13 +1361,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1421,7 +1391,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1442,6 +1411,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1464,13 +1434,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1496,7 +1464,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1517,6 +1484,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1533,8 +1501,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1568,7 +1535,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1589,6 +1555,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1611,12 +1578,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1642,7 +1607,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1663,6 +1627,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1685,12 +1650,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1716,7 +1679,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1737,6 +1699,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1753,8 +1716,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1788,7 +1750,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1809,6 +1770,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1831,13 +1793,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1863,7 +1823,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1884,6 +1843,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1906,13 +1866,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1938,7 +1896,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1959,6 +1916,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1975,8 +1933,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2010,7 +1967,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2031,6 +1987,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2053,13 +2010,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2085,7 +2040,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2106,6 +2060,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2128,7 +2083,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2151,8 +2105,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2178,7 +2131,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2199,6 +2151,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2215,8 +2168,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2250,7 +2202,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2271,6 +2222,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2293,13 +2245,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2325,7 +2275,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2346,6 +2295,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2368,13 +2318,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2400,7 +2348,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2421,6 +2368,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2437,8 +2385,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2472,7 +2419,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2493,6 +2439,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2515,13 +2462,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2547,7 +2492,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2568,6 +2512,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2590,12 +2535,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2621,7 +2564,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2642,6 +2584,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2658,8 +2601,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2693,7 +2635,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2714,6 +2655,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2736,13 +2678,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2768,7 +2708,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2789,6 +2728,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2811,13 +2751,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2843,7 +2781,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2864,6 +2801,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2880,8 +2818,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2915,7 +2852,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2936,6 +2872,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2958,13 +2895,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2990,7 +2925,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3011,6 +2945,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3033,7 +2968,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3056,8 +2990,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3083,7 +3016,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3104,6 +3036,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3120,8 +3053,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3155,7 +3087,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3176,6 +3107,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3198,13 +3130,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3230,7 +3160,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3251,6 +3180,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3273,12 +3203,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3304,7 +3232,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3325,6 +3252,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3341,8 +3269,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3376,7 +3303,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3397,6 +3323,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3419,13 +3346,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3451,7 +3376,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3472,6 +3396,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3494,7 +3419,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3517,8 +3441,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3544,7 +3467,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3565,6 +3487,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3581,8 +3504,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3616,7 +3538,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3637,6 +3558,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3659,7 +3581,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3682,8 +3603,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3709,7 +3629,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3730,6 +3649,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3752,7 +3672,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3775,8 +3694,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3802,7 +3720,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3823,6 +3740,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3839,8 +3757,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3874,7 +3791,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3895,6 +3811,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3917,13 +3834,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3949,7 +3864,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3970,6 +3884,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3992,12 +3907,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4023,7 +3936,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4044,6 +3956,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4060,8 +3973,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4095,7 +4007,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4116,6 +4027,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4138,7 +4050,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4161,8 +4072,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4188,7 +4098,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4209,6 +4118,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4231,7 +4141,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4254,8 +4163,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4281,7 +4189,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4302,6 +4209,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4318,8 +4226,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures2/input.ts.json index 1ad4ef57c79e..799b853ff0af 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -78,8 +77,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -129,7 +127,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -155,7 +152,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -175,6 +171,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -197,13 +194,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -262,7 +257,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -288,7 +282,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -318,6 +311,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -334,8 +328,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -375,7 +368,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -402,7 +394,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -435,6 +426,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -457,13 +449,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -488,7 +478,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -524,6 +513,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -555,6 +545,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -577,13 +568,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -607,8 +596,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -640,8 +628,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -661,7 +649,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "params": [ @@ -681,6 +668,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -703,13 +691,11 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -772,7 +758,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -793,6 +778,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -815,13 +801,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -847,7 +831,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -868,6 +851,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -890,13 +874,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -922,7 +904,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -943,6 +924,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -959,8 +941,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -994,7 +975,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1015,6 +995,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1037,7 +1018,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1060,8 +1040,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1087,7 +1066,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1108,6 +1086,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1130,7 +1109,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1153,8 +1131,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1180,7 +1157,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1201,6 +1177,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1217,8 +1194,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1252,7 +1228,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1273,6 +1248,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1295,13 +1271,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1327,7 +1301,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1348,6 +1321,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1370,13 +1344,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1402,7 +1374,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1423,6 +1394,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1439,8 +1411,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1474,7 +1445,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1495,6 +1465,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1517,12 +1488,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1548,7 +1517,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1569,6 +1537,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1591,12 +1560,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1622,7 +1589,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1643,6 +1609,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1659,8 +1626,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1694,7 +1660,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1715,6 +1680,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1737,12 +1703,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1768,7 +1732,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1789,6 +1752,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1811,12 +1775,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1842,7 +1804,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1863,6 +1824,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1879,8 +1841,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1914,7 +1875,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1935,6 +1895,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1957,13 +1918,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1989,7 +1948,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2010,6 +1968,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2032,13 +1991,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2064,7 +2021,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2085,6 +2041,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2101,8 +2058,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2136,7 +2092,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2157,6 +2112,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2179,13 +2135,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2211,7 +2165,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2232,6 +2185,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2254,7 +2208,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2277,8 +2230,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2304,7 +2256,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2325,6 +2276,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2341,8 +2293,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2376,7 +2327,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2397,6 +2347,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2419,13 +2370,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2451,7 +2400,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2472,6 +2420,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2494,12 +2443,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2525,7 +2472,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2546,6 +2492,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2562,8 +2509,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2597,7 +2543,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2618,6 +2563,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2640,13 +2586,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2672,7 +2616,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2693,6 +2636,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2715,12 +2659,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2746,7 +2688,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2767,6 +2708,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2783,8 +2725,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2818,7 +2759,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2839,6 +2779,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2861,13 +2802,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2893,7 +2832,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2914,6 +2852,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2936,7 +2875,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2959,8 +2897,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2986,7 +2923,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3007,6 +2943,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3023,8 +2960,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3058,7 +2994,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3079,6 +3014,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3101,7 +3037,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3124,8 +3059,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3151,7 +3085,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3172,6 +3105,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3194,7 +3128,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3217,8 +3150,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3244,7 +3176,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3265,6 +3196,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3281,8 +3213,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3316,7 +3247,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3337,6 +3267,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3359,13 +3290,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3391,7 +3320,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3412,6 +3340,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3434,12 +3363,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3465,7 +3392,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3486,6 +3412,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3502,8 +3429,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3537,7 +3463,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3558,6 +3483,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3580,13 +3506,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3612,7 +3536,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3633,6 +3556,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3655,12 +3579,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3686,7 +3608,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3707,6 +3628,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3723,8 +3645,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3758,7 +3679,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3779,6 +3699,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3801,7 +3722,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3824,8 +3744,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3851,7 +3770,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3872,6 +3790,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3894,7 +3813,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3917,8 +3835,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3944,7 +3861,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3965,6 +3881,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3981,8 +3898,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignaturesDifferingParamCounts/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignaturesDifferingParamCounts/input.ts.json index a65edd87179f..926b8fa36cf6 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignaturesDifferingParamCounts/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignaturesDifferingParamCounts/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -78,8 +77,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -98,6 +96,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -114,8 +113,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -165,7 +163,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -191,7 +188,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -211,6 +207,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -233,13 +230,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -258,6 +253,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -280,13 +276,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -345,7 +339,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -371,7 +364,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -401,6 +393,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -417,8 +410,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -458,7 +450,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -485,7 +476,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -518,6 +508,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -540,13 +531,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -571,7 +560,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -607,6 +595,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -638,6 +627,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -654,8 +644,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -665,6 +654,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -681,8 +671,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -706,8 +695,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -739,8 +727,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -760,7 +748,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "params": [ @@ -780,6 +767,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -796,8 +784,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -860,7 +847,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -881,6 +867,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -903,13 +890,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -935,7 +920,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -956,6 +940,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -978,13 +963,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1010,7 +993,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1031,6 +1013,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1047,8 +1030,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1082,7 +1064,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1103,6 +1084,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1125,7 +1107,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1148,8 +1129,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1175,7 +1155,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1196,6 +1175,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1218,7 +1198,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1241,8 +1220,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1268,7 +1246,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1289,6 +1266,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1305,8 +1283,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1340,7 +1317,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1361,6 +1337,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1383,13 +1360,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1415,7 +1390,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1436,6 +1410,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1458,13 +1433,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1490,7 +1463,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1511,6 +1483,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1527,8 +1500,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1562,7 +1534,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1583,6 +1554,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1605,12 +1577,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1636,7 +1606,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1657,6 +1626,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1679,12 +1649,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1710,7 +1678,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1731,6 +1698,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1747,8 +1715,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1782,7 +1749,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1803,6 +1769,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1825,12 +1792,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1856,7 +1821,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1877,6 +1841,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1899,12 +1864,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1930,7 +1893,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1951,6 +1913,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1967,8 +1930,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2002,7 +1964,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2023,6 +1984,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2045,13 +2007,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2077,7 +2037,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2098,6 +2057,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2120,13 +2080,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2152,7 +2110,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2173,6 +2130,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2189,8 +2147,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2224,7 +2181,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2245,6 +2201,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2267,13 +2224,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2299,7 +2254,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2320,6 +2274,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2342,7 +2297,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2365,8 +2319,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2392,7 +2345,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2413,6 +2365,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2429,8 +2382,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2464,7 +2416,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2485,6 +2436,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2507,13 +2459,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2539,7 +2489,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2560,6 +2509,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2582,12 +2532,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2613,7 +2561,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2634,6 +2581,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2650,8 +2598,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2685,7 +2632,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2706,6 +2652,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2728,13 +2675,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2760,7 +2705,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2781,6 +2725,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2803,12 +2748,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2834,7 +2777,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2855,6 +2797,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2871,8 +2814,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2906,7 +2848,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2927,6 +2868,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2949,13 +2891,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2981,7 +2921,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3002,6 +2941,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3024,7 +2964,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3047,8 +2986,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3074,7 +3012,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3095,6 +3032,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3111,8 +3049,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3146,7 +3083,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3167,6 +3103,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3189,7 +3126,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3212,8 +3148,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3239,7 +3174,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3260,6 +3194,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3282,7 +3217,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3305,8 +3239,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3332,7 +3265,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3353,6 +3285,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3369,8 +3302,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3404,7 +3336,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3425,6 +3356,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3447,13 +3379,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3479,7 +3409,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3500,6 +3429,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3522,12 +3452,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3553,7 +3481,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3574,6 +3501,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3590,8 +3518,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3625,7 +3552,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3646,6 +3572,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3668,13 +3595,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3700,7 +3625,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3721,6 +3645,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3743,12 +3668,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3774,7 +3697,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3795,6 +3717,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3811,8 +3734,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3846,7 +3768,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3867,6 +3788,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3889,7 +3811,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3912,8 +3833,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3939,7 +3859,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3960,6 +3879,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3982,7 +3902,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4005,8 +3924,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4032,7 +3950,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4053,6 +3970,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4069,8 +3987,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures/input.ts.json index 3914a04c1bcc..c617e1e8a0f9 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -85,13 +84,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -152,7 +149,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -212,7 +207,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -238,7 +232,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -259,6 +252,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -281,13 +275,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -348,7 +340,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -387,7 +378,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -408,7 +398,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -434,7 +423,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -455,6 +443,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -477,13 +466,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -544,7 +531,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -583,7 +569,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -609,7 +594,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -636,7 +620,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -669,7 +652,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -683,6 +665,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -705,13 +688,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -736,7 +717,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -762,7 +742,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -792,7 +771,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -806,6 +784,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -828,13 +807,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -859,7 +836,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -888,7 +864,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -925,6 +900,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -956,7 +932,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -970,6 +945,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -992,13 +968,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1023,7 +997,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1052,7 +1025,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1063,8 +1035,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1096,8 +1067,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1117,7 +1088,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1137,6 +1107,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1159,13 +1130,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1198,7 +1167,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1229,7 +1197,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1255,7 +1222,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1276,6 +1242,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1298,13 +1265,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1330,7 +1295,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1351,6 +1315,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1373,13 +1338,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1405,7 +1368,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1426,6 +1388,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1442,8 +1405,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1477,7 +1439,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1498,6 +1459,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1520,7 +1482,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1543,8 +1504,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1570,7 +1530,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1591,6 +1550,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1613,7 +1573,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1636,8 +1595,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1663,7 +1621,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1684,6 +1641,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1700,8 +1658,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1735,7 +1692,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1756,6 +1712,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1778,7 +1735,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1801,8 +1757,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1828,7 +1783,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1849,6 +1803,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1871,7 +1826,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1894,8 +1848,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1921,7 +1874,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1942,6 +1894,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1958,8 +1911,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1993,7 +1945,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2014,6 +1965,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2036,7 +1988,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2059,8 +2010,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2086,7 +2036,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2107,6 +2056,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2129,7 +2079,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2152,8 +2101,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2179,7 +2127,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2200,6 +2147,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2216,8 +2164,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2251,7 +2198,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2272,6 +2218,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2294,12 +2241,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2325,7 +2270,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2346,6 +2290,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2368,12 +2313,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2399,7 +2342,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2420,6 +2362,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2436,8 +2379,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2471,7 +2413,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2492,6 +2433,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2514,12 +2456,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2545,7 +2485,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2566,6 +2505,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2588,12 +2528,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2619,7 +2557,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2640,6 +2577,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2656,8 +2594,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2691,7 +2628,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2712,6 +2648,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2734,13 +2671,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2766,7 +2701,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2787,6 +2721,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2809,7 +2744,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2832,8 +2766,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2859,7 +2792,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2880,6 +2812,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2896,8 +2829,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2931,7 +2863,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2952,6 +2883,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2974,13 +2906,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3006,7 +2936,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3027,6 +2956,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3049,7 +2979,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3072,8 +3001,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3099,7 +3027,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3120,6 +3047,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3136,8 +3064,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3171,7 +3098,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3192,6 +3118,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3214,13 +3141,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3246,7 +3171,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3267,6 +3191,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3289,7 +3214,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3312,8 +3236,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3339,7 +3262,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3360,6 +3282,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3376,8 +3299,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3411,7 +3333,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3432,6 +3353,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3454,13 +3376,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3486,7 +3406,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3507,6 +3426,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3529,12 +3449,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3560,7 +3478,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3581,6 +3498,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3597,8 +3515,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3632,7 +3549,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3653,6 +3569,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3675,7 +3592,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3698,8 +3614,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3725,7 +3640,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3746,6 +3660,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3768,7 +3683,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3791,8 +3705,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3818,7 +3731,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3839,6 +3751,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3855,8 +3768,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3890,7 +3802,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3911,6 +3822,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3933,7 +3845,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3956,8 +3867,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3983,7 +3893,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4004,6 +3913,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4026,7 +3936,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4049,8 +3958,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4076,7 +3984,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4097,6 +4004,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4113,8 +4021,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4148,7 +4055,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4169,6 +4075,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4191,7 +4098,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4214,8 +4120,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4241,7 +4146,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4262,6 +4166,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4284,12 +4189,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4315,7 +4218,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4336,6 +4238,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4352,8 +4255,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4387,7 +4289,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4408,6 +4309,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4430,7 +4332,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4453,8 +4354,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4480,7 +4380,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4501,6 +4400,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4523,12 +4423,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4554,7 +4452,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4575,6 +4472,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4591,8 +4489,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4626,7 +4523,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4647,6 +4543,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4669,7 +4566,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4692,8 +4588,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4719,7 +4614,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4740,6 +4634,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4762,7 +4657,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4785,8 +4679,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4812,7 +4705,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4833,6 +4725,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4849,8 +4742,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4884,7 +4776,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4905,6 +4796,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4927,13 +4819,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4959,7 +4849,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4980,6 +4869,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5002,7 +4892,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5025,8 +4914,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5052,7 +4940,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5073,6 +4960,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5089,8 +4977,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5124,7 +5011,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5145,6 +5031,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5167,7 +5054,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5190,8 +5076,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5217,7 +5102,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5238,6 +5122,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5260,12 +5145,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5291,7 +5174,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5312,6 +5194,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5328,8 +5211,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5363,7 +5245,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5384,6 +5265,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5406,7 +5288,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5429,8 +5310,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5456,7 +5336,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5477,6 +5356,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5499,12 +5379,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5530,7 +5408,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5551,6 +5428,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5567,8 +5445,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5602,7 +5479,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5623,6 +5499,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5645,13 +5522,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5677,7 +5552,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5698,6 +5572,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5720,7 +5595,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5743,8 +5617,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5770,7 +5643,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5791,6 +5663,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5807,8 +5680,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures2/input.ts.json index 312eb5a80299..19f3e335ae8c 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -85,13 +84,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -110,6 +107,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -132,13 +130,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -199,7 +195,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -220,7 +215,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -250,7 +244,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -280,7 +273,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -306,7 +298,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -327,6 +318,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -349,13 +341,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -374,6 +364,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -396,13 +387,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -463,7 +452,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -502,7 +490,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -523,7 +510,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -544,7 +530,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -570,7 +555,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -591,6 +575,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -613,13 +598,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -638,6 +621,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -660,13 +644,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -727,7 +709,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -766,7 +747,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -787,7 +767,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -813,7 +792,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -840,7 +818,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -861,7 +838,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -894,7 +870,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -908,6 +883,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -930,13 +906,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -946,6 +920,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -968,13 +943,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -999,7 +972,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1025,7 +997,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1055,7 +1026,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1069,6 +1039,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1091,13 +1062,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1107,6 +1076,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1129,13 +1099,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1160,7 +1128,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1189,7 +1156,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1210,7 +1176,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1247,6 +1212,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1278,7 +1244,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1292,6 +1257,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1314,13 +1280,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1330,6 +1294,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1352,13 +1317,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1383,7 +1346,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1412,7 +1374,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1433,7 +1394,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1444,8 +1404,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1477,8 +1436,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1498,7 +1457,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1518,6 +1476,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1540,13 +1499,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1565,6 +1522,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1587,13 +1545,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1626,7 +1582,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1657,7 +1612,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1678,7 +1632,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1704,7 +1657,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1725,6 +1677,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1747,13 +1700,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1779,7 +1730,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1800,6 +1750,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1822,13 +1773,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1854,7 +1803,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1875,6 +1823,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1891,8 +1840,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1926,7 +1874,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1947,6 +1894,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1969,7 +1917,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2001,8 +1948,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2028,7 +1974,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2049,6 +1994,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2071,7 +2017,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2103,8 +2048,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2130,7 +2074,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2151,6 +2094,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2167,8 +2111,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2202,7 +2145,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2223,6 +2165,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2245,7 +2188,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2277,8 +2219,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2304,7 +2245,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2325,6 +2265,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2347,7 +2288,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2379,8 +2319,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2406,7 +2345,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2427,6 +2365,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2443,8 +2382,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2478,7 +2416,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2499,6 +2436,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2521,7 +2459,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2553,8 +2490,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2580,7 +2516,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2601,6 +2536,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2623,7 +2559,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2655,8 +2590,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2682,7 +2616,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2703,6 +2636,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2719,8 +2653,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2754,7 +2687,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2775,6 +2707,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2797,12 +2730,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2828,7 +2759,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2849,6 +2779,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2871,12 +2802,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2902,7 +2831,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2923,6 +2851,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2939,8 +2868,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2974,7 +2902,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2995,6 +2922,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3017,12 +2945,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3048,7 +2974,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3069,6 +2994,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3091,12 +3017,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3122,7 +3046,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3143,6 +3066,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3159,8 +3083,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3194,7 +3117,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3215,6 +3137,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3237,13 +3160,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3269,7 +3190,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3290,6 +3210,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3312,7 +3233,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3344,8 +3264,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3371,7 +3290,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3392,6 +3310,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3408,8 +3327,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3443,7 +3361,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3464,6 +3381,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3486,13 +3404,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3518,7 +3434,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3539,6 +3454,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3561,7 +3477,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3593,8 +3508,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3620,7 +3534,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3641,6 +3554,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3657,8 +3571,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3692,7 +3605,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3713,6 +3625,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3735,13 +3648,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3767,7 +3678,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3788,6 +3698,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3810,7 +3721,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3842,8 +3752,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3869,7 +3778,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3890,6 +3798,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3906,8 +3815,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3941,7 +3849,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3962,6 +3869,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3984,13 +3892,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4016,7 +3922,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4037,6 +3942,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4059,12 +3965,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4090,7 +3994,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4111,6 +4014,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4127,8 +4031,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4162,7 +4065,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4183,6 +4085,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4205,7 +4108,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4237,8 +4139,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4264,7 +4165,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4285,6 +4185,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4307,7 +4208,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4339,8 +4239,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4366,7 +4265,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4387,6 +4285,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4403,8 +4302,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4438,7 +4336,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4459,6 +4356,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4481,7 +4379,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4513,8 +4410,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4540,7 +4436,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4561,6 +4456,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4583,7 +4479,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4615,8 +4510,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4642,7 +4536,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4663,6 +4556,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4679,8 +4573,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4714,7 +4607,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4735,6 +4627,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4757,7 +4650,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4789,8 +4681,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4816,7 +4707,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4837,6 +4727,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4859,12 +4750,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4890,7 +4779,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4911,6 +4799,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4927,8 +4816,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4962,7 +4850,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4983,6 +4870,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5005,7 +4893,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5037,8 +4924,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5064,7 +4950,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5085,6 +4970,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5107,12 +4993,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5138,7 +5022,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5159,6 +5042,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5175,8 +5059,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5210,7 +5093,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5231,6 +5113,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5253,7 +5136,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5285,8 +5167,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5312,7 +5193,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5333,6 +5213,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5355,7 +5236,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5387,8 +5267,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5414,7 +5293,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5435,6 +5313,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5451,8 +5330,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5486,7 +5364,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5507,6 +5384,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5529,13 +5407,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5561,7 +5437,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5582,6 +5457,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5604,7 +5480,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5636,8 +5511,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5663,7 +5537,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5684,6 +5557,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5700,8 +5574,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5735,7 +5608,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5756,6 +5628,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5778,7 +5651,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5810,8 +5682,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5837,7 +5708,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5858,6 +5728,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5880,12 +5751,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5911,7 +5780,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5932,6 +5800,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5948,8 +5817,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5983,7 +5851,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6004,6 +5871,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6026,7 +5894,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6058,8 +5925,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6085,7 +5951,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6106,6 +5971,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6128,12 +5994,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -6159,7 +6023,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6180,6 +6043,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6196,8 +6060,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -6231,7 +6094,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6252,6 +6114,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6274,13 +6137,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6306,7 +6167,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6327,6 +6187,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6349,7 +6210,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6381,8 +6241,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6408,7 +6267,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6429,6 +6287,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6445,8 +6304,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints/input.ts.json index cfc4a988984f..9784f9793af4 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -85,13 +84,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -152,7 +149,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -170,7 +166,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -220,7 +215,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -246,7 +240,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -267,6 +260,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -289,13 +283,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -384,7 +376,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -402,7 +393,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -442,7 +432,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -468,7 +457,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -489,6 +477,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -511,13 +500,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -606,7 +593,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -624,7 +610,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -651,7 +636,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -678,7 +662,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -696,7 +679,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -730,7 +712,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -744,6 +725,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -766,13 +748,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -812,7 +792,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -842,7 +821,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -856,6 +834,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -878,13 +857,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -927,7 +904,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -945,7 +921,6 @@ "ctxt": 0 }, "value": "Boolean", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -983,6 +958,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1014,7 +990,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1028,6 +1003,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1050,13 +1026,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1099,7 +1073,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1117,7 +1090,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1147,8 +1119,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1180,8 +1151,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1201,7 +1172,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1221,6 +1191,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1243,13 +1214,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1316,7 +1285,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1334,7 +1302,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1361,7 +1328,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1382,6 +1348,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1404,13 +1371,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1436,7 +1401,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1457,6 +1421,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1479,13 +1444,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1511,7 +1474,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1532,6 +1494,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1548,8 +1511,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1583,7 +1545,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1604,6 +1565,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1626,7 +1588,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1652,7 +1613,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1678,8 +1638,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1705,7 +1664,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1726,6 +1684,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1748,7 +1707,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1774,7 +1732,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1800,8 +1757,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1827,7 +1783,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1848,6 +1803,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1864,8 +1820,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1899,7 +1854,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1920,6 +1874,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1942,7 +1897,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1968,7 +1922,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1976,8 +1929,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2003,7 +1955,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2024,6 +1975,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2046,7 +1998,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2072,7 +2023,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2080,8 +2030,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2107,7 +2056,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2128,6 +2076,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2144,8 +2093,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2179,7 +2127,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2200,6 +2147,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2222,7 +2170,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2248,7 +2195,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2256,8 +2202,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2283,7 +2228,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2304,6 +2248,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2326,7 +2271,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2352,7 +2296,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2360,8 +2303,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2387,7 +2329,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2408,6 +2349,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2424,8 +2366,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2459,7 +2400,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2480,6 +2420,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2502,12 +2443,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2533,7 +2472,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2554,6 +2492,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2576,12 +2515,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2607,7 +2544,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2628,6 +2564,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2644,8 +2581,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2679,7 +2615,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2700,6 +2635,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2722,12 +2658,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2753,7 +2687,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2774,6 +2707,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2796,12 +2730,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2827,7 +2759,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2848,6 +2779,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2864,8 +2796,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2899,7 +2830,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2920,6 +2850,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2942,13 +2873,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2974,7 +2903,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2995,6 +2923,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3017,7 +2946,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3043,7 +2971,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3069,8 +2996,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3096,7 +3022,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3117,6 +3042,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3133,8 +3059,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3168,7 +3093,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3189,6 +3113,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3211,13 +3136,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3243,7 +3166,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3264,6 +3186,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3286,7 +3209,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3312,7 +3234,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3320,8 +3241,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3347,7 +3267,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3368,6 +3287,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3384,8 +3304,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3419,7 +3338,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3440,6 +3358,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3462,13 +3381,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3494,7 +3411,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3515,6 +3431,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3537,7 +3454,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3563,7 +3479,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3571,8 +3486,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3598,7 +3512,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3619,6 +3532,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3635,8 +3549,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3670,7 +3583,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3691,6 +3603,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3713,13 +3626,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3745,7 +3656,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3766,6 +3676,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3788,12 +3699,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3819,7 +3728,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3840,6 +3748,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3856,8 +3765,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3891,7 +3799,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3912,6 +3819,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3934,7 +3842,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3960,7 +3867,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3986,8 +3892,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4013,7 +3918,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4034,6 +3938,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4056,7 +3961,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4082,7 +3986,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4090,8 +3993,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4117,7 +4019,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4138,6 +4039,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4154,8 +4056,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4189,7 +4090,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4210,6 +4110,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4232,7 +4133,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4258,7 +4158,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4284,8 +4183,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4311,7 +4209,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4332,6 +4229,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4354,7 +4252,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4380,7 +4277,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4388,8 +4284,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4415,7 +4310,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4436,6 +4330,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4452,8 +4347,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4487,7 +4381,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4508,6 +4401,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4530,7 +4424,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4556,7 +4449,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4582,8 +4474,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4609,7 +4500,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4630,6 +4520,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4652,12 +4543,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4683,7 +4572,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4704,6 +4592,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4720,8 +4609,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4755,7 +4643,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4776,6 +4663,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4798,7 +4686,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4824,7 +4711,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4850,8 +4736,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4877,7 +4762,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4898,6 +4782,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4920,12 +4805,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4951,7 +4834,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4972,6 +4854,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4988,8 +4871,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5023,7 +4905,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5044,6 +4925,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5066,7 +4948,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5092,7 +4973,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5100,8 +4980,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5127,7 +5006,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5148,6 +5026,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5170,7 +5049,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5196,7 +5074,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5204,8 +5081,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5231,7 +5107,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5252,6 +5127,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5268,8 +5144,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5303,7 +5178,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5324,6 +5198,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5346,13 +5221,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5378,7 +5251,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5399,6 +5271,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5421,7 +5294,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5447,7 +5319,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5455,8 +5326,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5482,7 +5352,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5503,6 +5372,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5519,8 +5389,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5554,7 +5423,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5575,6 +5443,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5597,7 +5466,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5623,7 +5491,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5631,8 +5498,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5658,7 +5524,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5679,6 +5544,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5701,12 +5567,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5732,7 +5596,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5753,6 +5616,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5769,8 +5633,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5804,7 +5667,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5825,6 +5687,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5847,7 +5710,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5873,7 +5735,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5881,8 +5742,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5908,7 +5768,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5929,6 +5788,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5951,12 +5811,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5982,7 +5840,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6003,6 +5860,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6019,8 +5877,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -6054,7 +5911,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6075,6 +5931,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6097,13 +5954,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6129,7 +5984,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6150,6 +6004,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6172,7 +6027,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6198,7 +6052,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6206,8 +6059,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6233,7 +6085,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6254,6 +6105,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6270,8 +6122,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2/input.ts.json index 84de70c89806..6b3c38128b3a 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -85,13 +84,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -110,6 +107,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -132,13 +130,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -199,7 +195,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -217,7 +212,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -239,7 +233,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -257,7 +250,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -307,7 +299,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -333,7 +324,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -354,6 +344,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -376,13 +367,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -401,6 +390,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -423,13 +413,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -518,7 +506,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -536,7 +523,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -558,7 +544,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -576,7 +561,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -616,7 +600,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -642,7 +625,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -663,6 +645,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -685,13 +668,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -710,6 +691,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -732,13 +714,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -827,7 +807,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -845,7 +824,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -867,7 +845,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -885,7 +862,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -907,7 +883,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -933,7 +908,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -954,6 +928,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -976,13 +951,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1001,6 +974,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1023,13 +997,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1118,7 +1090,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1136,7 +1107,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1158,7 +1128,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1176,7 +1145,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1203,7 +1171,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1230,7 +1197,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1248,7 +1214,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1270,7 +1235,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1288,7 +1252,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1322,7 +1285,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1336,6 +1298,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1358,13 +1321,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1374,6 +1335,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1396,13 +1358,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1442,7 +1402,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1472,7 +1431,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1486,6 +1444,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1508,13 +1467,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1524,6 +1481,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1546,13 +1504,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1595,7 +1551,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1613,7 +1568,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1635,7 +1589,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1653,7 +1606,6 @@ "ctxt": 0 }, "value": "Boolean", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1691,6 +1643,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1722,7 +1675,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1736,6 +1688,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1758,13 +1711,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1774,6 +1725,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1796,13 +1748,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1845,7 +1795,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1863,7 +1812,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1885,7 +1833,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1903,7 +1850,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1933,8 +1879,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1966,8 +1911,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1987,7 +1932,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2007,6 +1951,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2029,13 +1974,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2054,6 +1997,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2076,13 +2020,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2149,7 +2091,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2167,7 +2108,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2189,7 +2129,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2207,7 +2146,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2234,7 +2172,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2255,6 +2192,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2277,13 +2215,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2309,7 +2245,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2330,6 +2265,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2352,13 +2288,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2384,7 +2318,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2405,6 +2338,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2421,8 +2355,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2456,7 +2389,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2477,6 +2409,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2499,7 +2432,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2525,7 +2457,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2563,7 +2494,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2589,8 +2519,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2616,7 +2545,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2637,6 +2565,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2659,7 +2588,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2685,7 +2613,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2723,7 +2650,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2749,8 +2675,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2776,7 +2701,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2797,6 +2721,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2813,8 +2738,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2848,7 +2772,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2869,6 +2792,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2891,7 +2815,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2917,7 +2840,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2937,7 +2859,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2945,8 +2866,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2972,7 +2892,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2993,6 +2912,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3015,7 +2935,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3041,7 +2960,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3061,7 +2979,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3069,8 +2986,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3096,7 +3012,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3117,6 +3032,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3133,8 +3049,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3168,7 +3083,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3189,6 +3103,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3211,7 +3126,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3237,7 +3151,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3257,7 +3170,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3265,8 +3177,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3292,7 +3203,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3313,6 +3223,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3335,7 +3246,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3361,7 +3271,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3381,7 +3290,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3389,8 +3297,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3416,7 +3323,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3437,6 +3343,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3453,8 +3360,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3488,7 +3394,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3509,6 +3414,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3531,12 +3437,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3562,7 +3466,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3583,6 +3486,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3605,12 +3509,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3636,7 +3538,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3657,6 +3558,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3673,8 +3575,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3708,7 +3609,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3729,6 +3629,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3751,12 +3652,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3782,7 +3681,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3803,6 +3701,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3825,12 +3724,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3856,7 +3753,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3877,6 +3773,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3893,8 +3790,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3928,7 +3824,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3949,6 +3844,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3971,13 +3867,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4003,7 +3897,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4024,6 +3917,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4046,7 +3940,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4072,7 +3965,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4110,7 +4002,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4136,8 +4027,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4163,7 +4053,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4184,6 +4073,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4200,8 +4090,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4235,7 +4124,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4256,6 +4144,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4278,13 +4167,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4310,7 +4197,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4331,6 +4217,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4353,7 +4240,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4379,7 +4265,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4399,7 +4284,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4407,8 +4291,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4434,7 +4317,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4455,6 +4337,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4471,8 +4354,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4506,7 +4388,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4527,6 +4408,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4549,7 +4431,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4575,7 +4456,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4595,7 +4475,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4603,8 +4482,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4630,7 +4508,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4651,6 +4528,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4673,7 +4551,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4699,7 +4576,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4719,7 +4595,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4727,8 +4602,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4754,7 +4628,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4775,6 +4648,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4791,8 +4665,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4826,7 +4699,6 @@ "ctxt": 0 }, "value": "foo6c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4847,6 +4719,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4869,7 +4742,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4895,7 +4767,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4915,7 +4786,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4923,8 +4793,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4950,7 +4819,6 @@ "ctxt": 0 }, "value": "foo6c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4971,6 +4839,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4993,7 +4862,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5028,7 +4896,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5036,8 +4903,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5063,7 +4929,6 @@ "ctxt": 0 }, "value": "foo6c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5084,6 +4949,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5100,8 +4966,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5135,7 +5000,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5156,6 +5020,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5178,13 +5043,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5210,7 +5073,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5231,6 +5093,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5253,7 +5116,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5279,7 +5141,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5299,7 +5160,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5307,8 +5167,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5334,7 +5193,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5355,6 +5213,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5371,8 +5230,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5406,7 +5264,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5427,6 +5284,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5449,13 +5307,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5481,7 +5337,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5502,6 +5357,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5524,12 +5380,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5555,7 +5409,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5576,6 +5429,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5592,8 +5446,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5627,7 +5480,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5648,6 +5500,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5670,7 +5523,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5696,7 +5548,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5734,7 +5585,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5760,8 +5610,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5787,7 +5636,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5808,6 +5656,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5830,7 +5679,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5856,7 +5704,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5876,7 +5723,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5884,8 +5730,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5911,7 +5756,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5932,6 +5776,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5948,8 +5793,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5983,7 +5827,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6004,6 +5847,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6026,7 +5870,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6052,7 +5895,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6090,7 +5932,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6116,8 +5957,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6143,7 +5983,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6164,6 +6003,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6186,7 +6026,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6212,7 +6051,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6232,7 +6070,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6240,8 +6077,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6267,7 +6103,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6288,6 +6123,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6304,8 +6140,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -6339,7 +6174,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6360,6 +6194,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6382,7 +6217,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6408,7 +6242,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6446,7 +6279,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6472,8 +6304,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6499,7 +6330,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6520,6 +6350,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6542,12 +6373,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -6573,7 +6402,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6594,6 +6422,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6610,8 +6439,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -6645,7 +6473,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6666,6 +6493,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6688,7 +6516,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6714,7 +6541,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6752,7 +6578,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6778,8 +6603,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6805,7 +6629,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6826,6 +6649,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6848,12 +6672,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -6879,7 +6701,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6900,6 +6721,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6916,8 +6738,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -6951,7 +6772,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6972,6 +6792,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6994,7 +6815,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7020,7 +6840,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7040,7 +6859,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7048,8 +6866,7 @@ ] } } - }, - "optional": false + } } } ], @@ -7075,7 +6892,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7096,6 +6912,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7118,7 +6935,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7144,7 +6960,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7164,7 +6979,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7172,8 +6986,7 @@ ] } } - }, - "optional": false + } } } ], @@ -7199,7 +7012,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7220,6 +7032,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7236,8 +7049,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -7271,7 +7083,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7292,6 +7103,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7314,13 +7126,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -7346,7 +7156,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7367,6 +7176,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7389,7 +7199,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7415,7 +7224,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7435,7 +7243,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7443,8 +7250,7 @@ ] } } - }, - "optional": false + } } } ], @@ -7470,7 +7276,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7491,6 +7296,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7507,8 +7313,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -7542,7 +7347,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7563,6 +7367,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7585,7 +7390,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7611,7 +7415,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7631,7 +7434,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7639,8 +7441,7 @@ ] } } - }, - "optional": false + } } } ], @@ -7666,7 +7467,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7687,6 +7487,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7709,12 +7510,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -7740,7 +7539,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7761,6 +7559,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7777,8 +7576,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -7812,7 +7610,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7833,6 +7630,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7855,7 +7653,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7881,7 +7678,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7901,7 +7697,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7909,8 +7704,7 @@ ] } } - }, - "optional": false + } } } ], @@ -7936,7 +7730,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7957,6 +7750,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7979,12 +7773,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -8010,7 +7802,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8031,6 +7822,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8047,8 +7839,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -8082,7 +7873,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8103,6 +7893,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8125,13 +7916,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -8157,7 +7946,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8178,6 +7966,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8200,7 +7989,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8226,7 +8014,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8246,7 +8033,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8254,8 +8040,7 @@ ] } } - }, - "optional": false + } } } ], @@ -8281,7 +8066,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8302,6 +8086,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8318,8 +8103,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3/input.ts.json index dc6e979b222d..c3ca4041b6f0 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "One", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -199,7 +194,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -243,7 +237,6 @@ "ctxt": 0 }, "value": "Four", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -270,7 +263,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -303,7 +295,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -332,7 +323,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -358,7 +348,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -385,7 +374,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -409,7 +397,6 @@ "ctxt": 0 }, "value": "Four", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -435,7 +422,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -469,7 +455,6 @@ "ctxt": 0 }, "value": "Six", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -496,7 +481,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -517,7 +501,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -550,7 +533,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -579,7 +561,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -600,7 +581,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -626,7 +606,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -647,6 +626,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -669,13 +649,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -694,6 +672,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -716,13 +695,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -783,7 +760,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -801,7 +777,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -823,7 +798,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -841,7 +815,6 @@ "ctxt": 0 }, "value": "One", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -891,7 +864,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -917,7 +889,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -938,6 +909,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -960,13 +932,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -985,6 +955,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1007,13 +978,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1102,7 +1071,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1120,7 +1088,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1142,7 +1109,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1160,7 +1126,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1182,7 +1147,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1208,7 +1172,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -1229,6 +1192,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1251,13 +1215,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1276,6 +1238,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1298,13 +1261,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1393,7 +1354,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1411,7 +1371,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1433,7 +1392,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1451,7 +1409,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1473,7 +1430,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1499,7 +1455,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -1520,6 +1475,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1542,13 +1498,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1567,6 +1521,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1589,13 +1544,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1684,7 +1637,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1702,7 +1654,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1724,7 +1675,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1742,7 +1692,6 @@ "ctxt": 0 }, "value": "Four", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1787,7 +1736,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1814,7 +1762,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1832,7 +1779,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1854,7 +1800,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1872,7 +1817,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1924,7 +1868,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1938,6 +1881,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1960,13 +1904,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1976,6 +1918,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1998,13 +1941,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -2044,7 +1985,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2074,7 +2014,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2088,6 +2027,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2110,13 +2050,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2126,6 +2064,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2148,13 +2087,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -2197,7 +2134,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2215,7 +2151,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2237,7 +2172,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2255,7 +2189,6 @@ "ctxt": 0 }, "value": "Six", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2320,6 +2253,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2351,7 +2285,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2365,6 +2298,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2387,13 +2321,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2403,6 +2335,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2425,13 +2358,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -2474,7 +2405,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2492,7 +2422,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2514,7 +2443,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2532,7 +2460,6 @@ "ctxt": 0 }, "value": "One", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2544,8 +2471,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2577,8 +2503,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -2598,7 +2524,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2618,6 +2543,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2640,13 +2566,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2665,6 +2589,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2687,13 +2612,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2760,7 +2683,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2778,7 +2700,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2800,7 +2721,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2818,7 +2738,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2845,7 +2764,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2866,6 +2784,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2888,13 +2807,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2920,7 +2837,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2941,6 +2857,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2963,13 +2880,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2995,7 +2910,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3016,6 +2930,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3032,8 +2947,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3067,7 +2981,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3088,6 +3001,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3110,7 +3024,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3136,7 +3049,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3156,7 +3068,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3164,8 +3075,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3191,7 +3101,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3212,6 +3121,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3234,7 +3144,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3260,7 +3169,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3280,7 +3188,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3288,8 +3195,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3315,7 +3221,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3336,6 +3241,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3352,8 +3258,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3387,7 +3292,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3408,6 +3312,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3430,7 +3335,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3456,7 +3360,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3476,7 +3379,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3484,8 +3386,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3511,7 +3412,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3532,6 +3432,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3554,7 +3455,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3580,7 +3480,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3600,7 +3499,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3608,8 +3506,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3635,7 +3532,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3656,6 +3552,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3672,8 +3569,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3707,7 +3603,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3728,6 +3623,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3750,7 +3646,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3776,7 +3671,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3814,7 +3708,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3840,8 +3733,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3867,7 +3759,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3888,6 +3779,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3910,7 +3802,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3936,7 +3827,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3974,7 +3864,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4000,8 +3889,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4027,7 +3915,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4048,6 +3935,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4064,8 +3952,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4099,7 +3986,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4120,6 +4006,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4142,12 +4029,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4173,7 +4058,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4194,6 +4078,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4216,12 +4101,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4247,7 +4130,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4268,6 +4150,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4284,8 +4167,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4319,7 +4201,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4340,6 +4221,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4362,12 +4244,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4393,7 +4273,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4414,6 +4293,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4436,12 +4316,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4467,7 +4345,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4488,6 +4365,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4504,8 +4382,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4539,7 +4416,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4560,6 +4436,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4582,13 +4459,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4614,7 +4489,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4635,6 +4509,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4657,7 +4532,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4683,7 +4557,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4703,7 +4576,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4711,8 +4583,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4738,7 +4609,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4759,6 +4629,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4775,8 +4646,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4810,7 +4680,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4831,6 +4700,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4853,13 +4723,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4885,7 +4753,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4906,6 +4773,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4928,7 +4796,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4954,7 +4821,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4974,7 +4840,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4982,8 +4847,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5009,7 +4873,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5030,6 +4893,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5046,8 +4910,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5081,7 +4944,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5102,6 +4964,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5124,7 +4987,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5150,7 +5012,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5170,7 +5031,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5178,8 +5038,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5205,7 +5064,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5226,6 +5084,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5248,7 +5107,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5274,7 +5132,6 @@ "ctxt": 0 }, "value": "Four", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5312,7 +5169,6 @@ "ctxt": 0 }, "value": "Four", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5338,8 +5194,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5365,7 +5220,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5386,6 +5240,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5402,8 +5257,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5437,7 +5291,6 @@ "ctxt": 0 }, "value": "foo6c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5458,6 +5311,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5480,7 +5334,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5506,7 +5359,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5526,7 +5378,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5534,8 +5385,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5561,7 +5411,6 @@ "ctxt": 0 }, "value": "foo6c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5582,6 +5431,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5604,7 +5454,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5630,7 +5479,6 @@ "ctxt": 0 }, "value": "Four", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5668,7 +5516,6 @@ "ctxt": 0 }, "value": "Four", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5694,8 +5541,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5721,7 +5567,6 @@ "ctxt": 0 }, "value": "foo6c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5742,6 +5587,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5758,8 +5604,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5793,7 +5638,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5814,6 +5658,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5836,13 +5681,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5868,7 +5711,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5889,6 +5731,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5911,7 +5754,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5937,7 +5779,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5975,7 +5816,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6001,8 +5841,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6028,7 +5867,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6049,6 +5887,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6065,8 +5904,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -6100,7 +5938,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6121,6 +5958,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6143,13 +5981,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6175,7 +6011,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6196,6 +6031,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6218,12 +6054,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -6249,7 +6083,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6270,6 +6103,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6286,8 +6120,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -6321,7 +6154,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6342,6 +6174,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6364,7 +6197,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6390,7 +6222,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6410,7 +6241,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6418,8 +6248,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6445,7 +6274,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6466,6 +6294,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6488,7 +6317,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6514,7 +6342,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6552,7 +6379,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6578,8 +6404,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6605,7 +6430,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6626,6 +6450,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6642,8 +6467,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -6677,7 +6501,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6698,6 +6521,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6720,7 +6544,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6746,7 +6569,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6766,7 +6588,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6774,8 +6595,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6801,7 +6621,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6822,6 +6641,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6844,7 +6664,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6870,7 +6689,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6890,7 +6708,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6898,8 +6715,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6925,7 +6741,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6946,6 +6761,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6962,8 +6778,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -6997,7 +6812,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7018,6 +6832,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7040,7 +6855,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7066,7 +6880,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7086,7 +6899,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7094,8 +6906,7 @@ ] } } - }, - "optional": false + } } } ], @@ -7121,7 +6932,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7142,6 +6952,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7164,12 +6975,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -7195,7 +7004,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7216,6 +7024,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7232,8 +7041,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -7267,7 +7075,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7288,6 +7095,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7310,7 +7118,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7336,7 +7143,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7356,7 +7162,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7364,8 +7169,7 @@ ] } } - }, - "optional": false + } } } ], @@ -7391,7 +7195,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7412,6 +7215,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7434,12 +7238,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -7465,7 +7267,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7486,6 +7287,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7502,8 +7304,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -7537,7 +7338,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7558,6 +7358,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7580,7 +7381,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7606,7 +7406,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7644,7 +7443,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7670,8 +7468,7 @@ ] } } - }, - "optional": false + } } } ], @@ -7697,7 +7494,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7718,6 +7514,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7740,7 +7537,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7766,7 +7562,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7786,7 +7581,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7794,8 +7588,7 @@ ] } } - }, - "optional": false + } } } ], @@ -7821,7 +7614,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7842,6 +7634,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7858,8 +7651,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -7893,7 +7685,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7914,6 +7705,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7936,13 +7728,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -7968,7 +7758,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7989,6 +7778,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8011,7 +7801,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8037,7 +7826,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8057,7 +7845,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8065,8 +7852,7 @@ ] } } - }, - "optional": false + } } } ], @@ -8092,7 +7878,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8113,6 +7898,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8129,8 +7915,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -8164,7 +7949,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8185,6 +7969,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8207,7 +7992,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8233,7 +8017,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8271,7 +8054,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8297,8 +8079,7 @@ ] } } - }, - "optional": false + } } } ], @@ -8324,7 +8105,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8345,6 +8125,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8367,12 +8148,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -8398,7 +8177,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8419,6 +8197,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8435,8 +8214,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -8470,7 +8248,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8491,6 +8268,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8513,7 +8291,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8539,7 +8316,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8577,7 +8353,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8603,8 +8378,7 @@ ] } } - }, - "optional": false + } } } ], @@ -8630,7 +8404,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8651,6 +8424,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8673,12 +8447,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -8704,7 +8476,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8725,6 +8496,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8741,8 +8513,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -8776,7 +8547,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8797,6 +8567,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8819,13 +8590,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -8851,7 +8620,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8872,6 +8640,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8894,7 +8663,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8920,7 +8688,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8940,7 +8707,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8948,8 +8714,7 @@ ] } } - }, - "optional": false + } } } ], @@ -8975,7 +8740,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8996,6 +8760,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9012,8 +8777,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType/input.ts.json index b7e32a0507a2..56fd6e1e8dd5 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -85,13 +84,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -152,7 +149,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -201,7 +197,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -227,7 +222,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -248,6 +242,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -270,13 +265,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -365,7 +358,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -386,7 +378,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -412,7 +403,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -433,6 +423,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -455,13 +446,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -550,7 +539,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -576,7 +564,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -603,7 +590,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -636,7 +622,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -650,6 +635,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -672,13 +658,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -703,7 +687,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -729,7 +712,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -759,7 +741,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -773,6 +754,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -795,13 +777,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -826,7 +806,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -855,7 +834,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -892,6 +870,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -923,7 +902,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -937,6 +915,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -959,13 +938,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -990,7 +967,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1019,7 +995,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1030,8 +1005,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1063,8 +1037,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1084,7 +1058,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1104,6 +1077,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1126,13 +1100,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1193,7 +1165,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1219,7 +1190,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1240,6 +1210,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1262,13 +1233,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1294,7 +1263,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1315,6 +1283,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1337,13 +1306,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1369,7 +1336,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1390,6 +1356,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1406,8 +1373,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1441,7 +1407,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1462,6 +1427,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1484,7 +1450,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1507,8 +1472,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1534,7 +1498,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1555,6 +1518,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1577,7 +1541,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1600,8 +1563,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1627,7 +1589,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1648,6 +1609,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1664,8 +1626,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1699,7 +1660,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1720,6 +1680,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1742,7 +1703,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1765,8 +1725,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1792,7 +1751,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1813,6 +1771,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1835,7 +1794,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1858,8 +1816,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1885,7 +1842,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1906,6 +1862,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1922,8 +1879,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1957,7 +1913,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1978,6 +1933,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2000,7 +1956,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2023,8 +1978,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2050,7 +2004,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2071,6 +2024,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2093,7 +2047,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2116,8 +2069,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2143,7 +2095,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2164,6 +2115,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2180,8 +2132,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2215,7 +2166,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2236,6 +2186,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2258,12 +2209,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2289,7 +2238,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2310,6 +2258,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2332,12 +2281,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2363,7 +2310,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2384,6 +2330,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2400,8 +2347,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2435,7 +2381,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2456,6 +2401,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2478,12 +2424,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2509,7 +2453,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2530,6 +2473,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2552,12 +2496,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2583,7 +2525,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2604,6 +2545,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2620,8 +2562,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2655,7 +2596,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2676,6 +2616,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2698,13 +2639,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2730,7 +2669,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2751,6 +2689,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2773,7 +2712,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2796,8 +2734,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2823,7 +2760,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2844,6 +2780,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2860,8 +2797,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2895,7 +2831,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2916,6 +2851,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2938,13 +2874,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2970,7 +2904,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2991,6 +2924,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3013,7 +2947,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3036,8 +2969,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3063,7 +2995,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3084,6 +3015,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3100,8 +3032,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3135,7 +3066,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3156,6 +3086,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3178,13 +3109,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3210,7 +3139,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3231,6 +3159,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3253,7 +3182,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3276,8 +3204,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3303,7 +3230,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3324,6 +3250,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3340,8 +3267,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3375,7 +3301,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3396,6 +3321,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3418,13 +3344,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3450,7 +3374,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3471,6 +3394,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3493,12 +3417,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3524,7 +3446,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3545,6 +3466,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3561,8 +3483,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3596,7 +3517,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3617,6 +3537,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3639,7 +3560,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3662,8 +3582,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3689,7 +3608,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3710,6 +3628,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3732,7 +3651,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3755,8 +3673,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3782,7 +3699,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3803,6 +3719,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3819,8 +3736,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3854,7 +3770,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3875,6 +3790,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3897,7 +3813,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3920,8 +3835,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3947,7 +3861,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3968,6 +3881,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3990,7 +3904,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4013,8 +3926,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4040,7 +3952,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4061,6 +3972,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4077,8 +3989,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4112,7 +4023,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4133,6 +4043,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4155,7 +4066,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4178,8 +4088,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4205,7 +4114,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4226,6 +4134,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4248,12 +4157,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4279,7 +4186,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4300,6 +4206,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4316,8 +4223,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4351,7 +4257,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4372,6 +4277,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4394,7 +4300,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4417,8 +4322,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4444,7 +4348,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4465,6 +4368,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4487,12 +4391,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4518,7 +4420,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4539,6 +4440,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4555,8 +4457,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4590,7 +4491,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4611,6 +4511,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4633,7 +4534,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4656,8 +4556,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4683,7 +4582,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4704,6 +4602,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4726,7 +4625,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4749,8 +4647,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4776,7 +4673,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4797,6 +4693,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4813,8 +4710,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4848,7 +4744,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4869,6 +4764,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4891,13 +4787,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4923,7 +4817,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4944,6 +4837,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4966,7 +4860,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4989,8 +4882,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5016,7 +4908,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5037,6 +4928,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5053,8 +4945,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5088,7 +4979,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5109,6 +4999,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5131,7 +5022,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5154,8 +5044,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5181,7 +5070,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5202,6 +5090,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5224,12 +5113,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5255,7 +5142,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5276,6 +5162,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5292,8 +5179,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5327,7 +5213,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5348,6 +5233,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5370,7 +5256,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5393,8 +5278,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5420,7 +5304,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5441,6 +5324,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5463,12 +5347,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5494,7 +5376,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5515,6 +5396,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5531,8 +5413,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5566,7 +5447,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5587,6 +5467,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5609,13 +5490,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5641,7 +5520,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5662,6 +5540,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5684,7 +5563,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5707,8 +5585,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5734,7 +5611,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5755,6 +5631,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5771,8 +5648,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2/input.ts.json index 3a446a3f76ff..408d876be314 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -85,13 +84,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -152,7 +149,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -170,7 +166,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -220,7 +215,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -246,7 +240,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -267,6 +260,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -289,13 +283,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -384,7 +376,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -402,7 +393,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -424,7 +414,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -450,7 +439,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -471,6 +459,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -493,13 +482,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -588,7 +575,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -606,7 +592,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -633,7 +618,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -660,7 +644,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -678,7 +661,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -712,7 +694,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -726,6 +707,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -748,13 +730,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -779,7 +759,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -805,7 +784,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -835,7 +813,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -849,6 +826,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -871,13 +849,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -902,7 +878,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -931,7 +906,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -949,7 +923,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -987,6 +960,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1018,7 +992,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1032,6 +1005,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1054,13 +1028,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1085,7 +1057,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1114,7 +1085,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1132,7 +1102,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1144,8 +1113,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1177,8 +1145,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1198,7 +1166,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1218,6 +1185,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1240,13 +1208,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1307,7 +1273,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1325,7 +1290,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1352,7 +1316,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1373,6 +1336,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1395,13 +1359,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1427,7 +1389,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1448,6 +1409,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1470,13 +1432,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1502,7 +1462,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1523,6 +1482,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1539,8 +1499,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1574,7 +1533,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1595,6 +1553,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1617,7 +1576,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1643,7 +1601,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1651,8 +1608,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1678,7 +1634,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1699,6 +1654,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1721,7 +1677,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1747,7 +1702,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1755,8 +1709,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1782,7 +1735,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1803,6 +1755,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1819,8 +1772,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1854,7 +1806,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1875,6 +1826,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1897,7 +1849,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1923,7 +1874,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1931,8 +1881,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1958,7 +1907,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1979,6 +1927,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2001,7 +1950,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2027,7 +1975,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2035,8 +1982,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2062,7 +2008,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2083,6 +2028,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2099,8 +2045,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2134,7 +2079,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2155,6 +2099,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2177,7 +2122,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2203,7 +2147,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2211,8 +2154,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2238,7 +2180,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2259,6 +2200,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2281,7 +2223,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2307,7 +2248,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2315,8 +2255,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2342,7 +2281,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2363,6 +2301,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2379,8 +2318,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2414,7 +2352,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2435,6 +2372,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2457,12 +2395,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2488,7 +2424,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2509,6 +2444,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2531,12 +2467,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2562,7 +2496,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2583,6 +2516,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2599,8 +2533,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2634,7 +2567,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2655,6 +2587,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2677,12 +2610,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2708,7 +2639,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2729,6 +2659,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2751,12 +2682,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2782,7 +2711,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2803,6 +2731,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2819,8 +2748,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2854,7 +2782,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2875,6 +2802,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2897,13 +2825,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2929,7 +2855,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2950,6 +2875,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2972,7 +2898,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2998,7 +2923,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3006,8 +2930,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3033,7 +2956,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3054,6 +2976,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3070,8 +2993,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3105,7 +3027,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3126,6 +3047,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3148,13 +3070,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3180,7 +3100,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3201,6 +3120,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3223,7 +3143,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3249,7 +3168,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3257,8 +3175,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3284,7 +3201,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3305,6 +3221,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3321,8 +3238,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3356,7 +3272,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3377,6 +3292,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3399,13 +3315,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3431,7 +3345,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3452,6 +3365,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3474,7 +3388,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3500,7 +3413,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3508,8 +3420,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3535,7 +3446,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3556,6 +3466,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3572,8 +3483,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3607,7 +3517,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3628,6 +3537,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3650,13 +3560,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3682,7 +3590,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3703,6 +3610,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3725,12 +3633,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3756,7 +3662,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3777,6 +3682,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3793,8 +3699,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3828,7 +3733,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3849,6 +3753,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3871,7 +3776,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3897,7 +3801,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3905,8 +3808,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3932,7 +3834,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3953,6 +3854,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3975,7 +3877,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4001,7 +3902,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4009,8 +3909,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4036,7 +3935,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4057,6 +3955,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4073,8 +3972,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4108,7 +4006,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4129,6 +4026,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4151,7 +4049,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4177,7 +4074,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4185,8 +4081,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4212,7 +4107,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4233,6 +4127,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4255,7 +4150,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4281,7 +4175,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4289,8 +4182,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4316,7 +4208,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4337,6 +4228,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4353,8 +4245,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4388,7 +4279,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4409,6 +4299,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4431,7 +4322,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4457,7 +4347,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4465,8 +4354,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4492,7 +4380,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4513,6 +4400,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4535,12 +4423,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4566,7 +4452,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4587,6 +4472,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4603,8 +4489,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4638,7 +4523,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4659,6 +4543,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4681,7 +4566,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4707,7 +4591,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4715,8 +4598,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4742,7 +4624,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4763,6 +4644,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4785,12 +4667,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4816,7 +4696,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4837,6 +4716,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4853,8 +4733,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4888,7 +4767,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4909,6 +4787,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4931,7 +4810,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4957,7 +4835,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4965,8 +4842,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4992,7 +4868,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5013,6 +4888,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5035,7 +4911,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5061,7 +4936,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5069,8 +4943,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5096,7 +4969,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5117,6 +4989,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5133,8 +5006,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5168,7 +5040,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5189,6 +5060,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5211,13 +5083,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5243,7 +5113,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5264,6 +5133,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5286,7 +5156,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5312,7 +5181,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5320,8 +5188,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5347,7 +5214,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5368,6 +5234,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5384,8 +5251,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5419,7 +5285,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5440,6 +5305,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5462,7 +5328,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5488,7 +5353,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5496,8 +5360,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5523,7 +5386,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5544,6 +5406,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5566,12 +5429,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5597,7 +5458,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5618,6 +5478,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5634,8 +5495,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5669,7 +5529,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5690,6 +5549,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5712,7 +5572,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5738,7 +5597,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5746,8 +5604,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5773,7 +5630,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5794,6 +5650,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5816,12 +5673,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5847,7 +5702,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5868,6 +5722,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5884,8 +5739,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5919,7 +5773,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5940,6 +5793,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5962,13 +5816,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5994,7 +5846,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6015,6 +5866,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6037,7 +5889,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6063,7 +5914,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6071,8 +5921,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6098,7 +5947,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6119,6 +5967,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6135,8 +5984,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts/input.ts.json index 607b64f90f2e..91b913202b53 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -85,13 +84,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -152,7 +149,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -212,7 +207,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -238,7 +232,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -259,6 +252,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -281,13 +275,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -348,7 +340,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -387,7 +378,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -408,7 +398,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -429,7 +418,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -455,7 +443,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -476,6 +463,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -498,13 +486,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -565,7 +551,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -604,7 +589,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -625,7 +609,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -646,7 +629,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -672,7 +654,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -699,7 +680,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -720,7 +700,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -741,7 +720,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -762,7 +740,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -795,7 +772,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -809,6 +785,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -831,13 +808,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -862,7 +837,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -888,7 +862,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -918,7 +891,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -932,6 +904,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -954,13 +927,11 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -985,7 +956,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1014,7 +984,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1035,7 +1004,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1056,7 +1024,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1077,7 +1044,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1114,6 +1080,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1145,7 +1112,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1159,6 +1125,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1181,13 +1148,11 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1212,7 +1177,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1241,7 +1205,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1262,7 +1225,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1283,7 +1245,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1304,7 +1265,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1325,7 +1285,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1336,8 +1295,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1369,8 +1327,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1390,7 +1348,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1410,6 +1367,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1432,13 +1390,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1471,7 +1427,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1502,7 +1457,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1523,7 +1477,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1544,7 +1497,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1565,7 +1517,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1586,7 +1537,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1607,7 +1557,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1633,7 +1582,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1654,6 +1602,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1676,13 +1625,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1708,7 +1655,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1729,6 +1675,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1751,13 +1698,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1783,7 +1728,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1804,6 +1748,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1820,8 +1765,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1855,7 +1799,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1876,6 +1819,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1898,7 +1842,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1930,8 +1873,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1957,7 +1899,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1978,6 +1919,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2000,7 +1942,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2032,8 +1973,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2059,7 +1999,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2080,6 +2019,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2096,8 +2036,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2131,7 +2070,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2152,6 +2090,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2174,7 +2113,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2215,8 +2153,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2242,7 +2179,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2263,6 +2199,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2285,7 +2222,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2326,8 +2262,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2353,7 +2288,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2374,6 +2308,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2390,8 +2325,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2425,7 +2359,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2446,6 +2379,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2468,7 +2402,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2518,8 +2451,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2545,7 +2477,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2566,6 +2497,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2588,7 +2520,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2638,8 +2569,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2665,7 +2595,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2686,6 +2615,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2702,8 +2632,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2737,7 +2666,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2758,6 +2686,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2780,12 +2709,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2811,7 +2738,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2832,6 +2758,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2854,12 +2781,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2885,7 +2810,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2906,6 +2830,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2922,8 +2847,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2957,7 +2881,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2978,6 +2901,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3000,12 +2924,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3031,7 +2953,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3052,6 +2973,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3074,12 +2996,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3105,7 +3025,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3126,6 +3045,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3142,8 +3062,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3177,7 +3096,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3198,6 +3116,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3220,13 +3139,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3252,7 +3169,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3273,6 +3189,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3295,7 +3212,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3327,8 +3243,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3354,7 +3269,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3375,6 +3289,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3391,8 +3306,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3426,7 +3340,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3447,6 +3360,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3469,13 +3383,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3501,7 +3413,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3522,6 +3433,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3544,7 +3456,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3585,8 +3496,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3612,7 +3522,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3633,6 +3542,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3649,8 +3559,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3684,7 +3593,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3705,6 +3613,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3727,13 +3636,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3759,7 +3666,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3780,6 +3686,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3802,7 +3709,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3855,7 +3761,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3863,8 +3768,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3890,7 +3794,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3911,6 +3814,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3927,8 +3831,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3962,7 +3865,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3983,6 +3885,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4005,13 +3908,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4037,7 +3938,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4058,6 +3958,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4080,12 +3981,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4111,7 +4010,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4132,6 +4030,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4148,8 +4047,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4183,7 +4081,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4204,6 +4101,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4226,7 +4124,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4258,8 +4155,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4285,7 +4181,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4306,6 +4201,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4328,7 +4224,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4381,7 +4276,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4389,8 +4283,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4416,7 +4309,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4437,6 +4329,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4453,8 +4346,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4488,7 +4380,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4509,6 +4400,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4531,7 +4423,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4563,8 +4454,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4590,7 +4480,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4611,6 +4500,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4633,7 +4523,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4677,7 +4566,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4712,8 +4600,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4739,7 +4626,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4760,6 +4646,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4776,8 +4663,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4811,7 +4697,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4832,6 +4717,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4854,7 +4740,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4886,8 +4771,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4913,7 +4797,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4934,6 +4817,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4956,12 +4840,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4987,7 +4869,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5008,6 +4889,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5024,8 +4906,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5059,7 +4940,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5080,6 +4960,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5102,7 +4983,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5134,8 +5014,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5161,7 +5040,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5182,6 +5060,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5204,12 +5083,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5235,7 +5112,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5256,6 +5132,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5272,8 +5149,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5307,7 +5183,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5328,6 +5203,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5350,7 +5226,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5376,7 +5251,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5432,7 +5306,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5449,8 +5322,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5476,7 +5348,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5497,6 +5368,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5519,7 +5391,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5545,7 +5416,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5601,7 +5471,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5609,8 +5478,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5636,7 +5504,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5657,6 +5524,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5673,8 +5541,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5708,7 +5575,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5729,6 +5595,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5751,13 +5618,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5783,7 +5648,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5804,6 +5668,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5826,7 +5691,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5867,8 +5731,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5894,7 +5757,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5915,6 +5777,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5931,8 +5794,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5966,7 +5828,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5987,6 +5848,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6009,7 +5871,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6044,7 +5905,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6064,7 +5924,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6084,7 +5943,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6092,8 +5950,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6119,7 +5976,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6140,6 +5996,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6162,12 +6019,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -6193,7 +6048,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6214,6 +6068,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6230,8 +6085,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -6265,7 +6119,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6286,6 +6139,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6308,7 +6162,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6343,7 +6196,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6363,7 +6215,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6380,8 +6231,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6407,7 +6257,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6428,6 +6277,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6450,12 +6300,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -6481,7 +6329,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6502,6 +6349,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6518,8 +6366,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -6553,7 +6400,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6574,6 +6420,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6596,13 +6443,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6628,7 +6473,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6649,6 +6493,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6671,7 +6516,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6706,7 +6550,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6753,7 +6596,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6788,8 +6630,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6815,7 +6656,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6836,6 +6676,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6852,8 +6693,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2/input.ts.json index eb5386e9af92..adf8df7f7ecd 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -90,7 +87,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -111,7 +107,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -144,6 +139,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -166,13 +162,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -197,7 +191,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -223,7 +216,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -253,6 +245,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -275,13 +268,11 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -306,7 +297,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -335,7 +325,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -356,7 +345,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -377,7 +365,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -398,7 +385,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -435,6 +421,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -466,6 +453,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -488,13 +476,11 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -519,7 +505,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -548,7 +533,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -569,7 +553,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -590,7 +573,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -611,7 +593,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -632,7 +613,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -643,8 +623,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -661,7 +640,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -682,6 +660,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -704,7 +683,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -754,8 +732,7 @@ ] } } - }, - "optional": false + } } } ], @@ -781,7 +758,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -802,6 +778,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -824,7 +801,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -874,8 +850,7 @@ ] } } - }, - "optional": false + } } } ], @@ -901,7 +876,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -922,6 +896,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -938,8 +913,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -973,7 +947,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -994,6 +967,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1016,13 +990,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1048,7 +1020,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1069,6 +1040,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1091,13 +1063,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1123,7 +1093,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1144,6 +1113,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1160,8 +1130,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1195,7 +1164,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1216,6 +1184,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1238,12 +1207,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1269,7 +1236,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1290,6 +1256,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1312,12 +1279,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1343,7 +1308,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1364,6 +1328,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1380,8 +1345,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1415,7 +1379,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1436,6 +1399,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1458,7 +1422,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1511,7 +1474,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1519,8 +1481,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1546,7 +1507,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1567,6 +1527,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1589,12 +1550,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1620,7 +1579,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1641,6 +1599,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1657,8 +1616,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1692,7 +1650,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1713,6 +1670,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1735,7 +1693,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1788,7 +1745,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1796,8 +1752,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1823,7 +1778,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1844,6 +1798,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1866,13 +1821,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1898,7 +1851,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1919,6 +1871,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1935,8 +1888,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1970,7 +1922,6 @@ "ctxt": 0 }, "value": "foo14b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1991,6 +1942,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2013,12 +1965,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2044,7 +1994,6 @@ "ctxt": 0 }, "value": "foo14b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2065,6 +2014,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2087,13 +2037,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2119,7 +2067,6 @@ "ctxt": 0 }, "value": "foo14b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2140,6 +2087,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2156,8 +2104,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2191,7 +2138,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2212,6 +2158,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2234,7 +2181,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2287,7 +2233,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2295,8 +2240,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2322,7 +2266,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2343,6 +2286,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2365,13 +2309,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2397,7 +2339,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2418,6 +2359,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2434,8 +2376,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames/input.ts.json index 400d2a0d129d..9a8c66e0b2a6 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -85,13 +84,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -152,7 +149,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -212,7 +207,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -238,7 +232,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -259,6 +252,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -281,13 +275,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -348,7 +340,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -387,7 +378,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -408,7 +398,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -434,7 +423,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -455,6 +443,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -477,13 +466,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -544,7 +531,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -583,7 +569,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -609,7 +594,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -636,7 +620,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -669,7 +652,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -683,6 +665,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -705,13 +688,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -736,7 +717,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -762,7 +742,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -792,7 +771,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -806,6 +784,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -828,13 +807,11 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -859,7 +836,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -888,7 +864,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -925,6 +900,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -956,7 +932,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -970,6 +945,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -992,13 +968,11 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1023,7 +997,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1052,7 +1025,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1063,8 +1035,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1096,8 +1067,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1117,7 +1088,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1137,6 +1107,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1159,13 +1130,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1198,7 +1167,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1229,7 +1197,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1255,7 +1222,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1276,6 +1242,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1298,13 +1265,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1330,7 +1295,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1351,6 +1315,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1373,13 +1338,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1405,7 +1368,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1426,6 +1388,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1442,8 +1405,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1477,7 +1439,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1498,6 +1459,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1520,7 +1482,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1543,8 +1504,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1570,7 +1530,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1591,6 +1550,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1613,7 +1573,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1636,8 +1595,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1663,7 +1621,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1684,6 +1641,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1700,8 +1658,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1735,7 +1692,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1756,6 +1712,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1778,7 +1735,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1801,8 +1757,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1828,7 +1783,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1849,6 +1803,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1871,7 +1826,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1894,8 +1848,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1921,7 +1874,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1942,6 +1894,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1958,8 +1911,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1993,7 +1945,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2014,6 +1965,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2036,7 +1988,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2059,8 +2010,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2086,7 +2036,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2107,6 +2056,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2129,7 +2079,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2152,8 +2101,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2179,7 +2127,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2200,6 +2147,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2216,8 +2164,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2251,7 +2198,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2272,6 +2218,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2294,12 +2241,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2325,7 +2270,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2346,6 +2290,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2368,12 +2313,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2399,7 +2342,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2420,6 +2362,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2436,8 +2379,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2471,7 +2413,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2492,6 +2433,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2514,12 +2456,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2545,7 +2485,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2566,6 +2505,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2588,12 +2528,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2619,7 +2557,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2640,6 +2577,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2656,8 +2594,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2691,7 +2628,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2712,6 +2648,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2734,13 +2671,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2766,7 +2701,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2787,6 +2721,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2809,7 +2744,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2832,8 +2766,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2859,7 +2792,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2880,6 +2812,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2896,8 +2829,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2931,7 +2863,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2952,6 +2883,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2974,13 +2906,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3006,7 +2936,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3027,6 +2956,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3049,7 +2979,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3072,8 +3001,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3099,7 +3027,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3120,6 +3047,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3136,8 +3064,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3171,7 +3098,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3192,6 +3118,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3214,13 +3141,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3246,7 +3171,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3267,6 +3191,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3289,7 +3214,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3312,8 +3236,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3339,7 +3262,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3360,6 +3282,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3376,8 +3299,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3411,7 +3333,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3432,6 +3353,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3454,13 +3376,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3486,7 +3406,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3507,6 +3426,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3529,12 +3449,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3560,7 +3478,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3581,6 +3498,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3597,8 +3515,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3632,7 +3549,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3653,6 +3569,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3675,7 +3592,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3698,8 +3614,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3725,7 +3640,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3746,6 +3660,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3768,7 +3683,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3791,8 +3705,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3818,7 +3731,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3839,6 +3751,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3855,8 +3768,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3890,7 +3802,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3911,6 +3822,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3933,7 +3845,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3956,8 +3867,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3983,7 +3893,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4004,6 +3913,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4026,7 +3936,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4049,8 +3958,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4076,7 +3984,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4097,6 +4004,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4113,8 +4021,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4148,7 +4055,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4169,6 +4075,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4191,7 +4098,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4214,8 +4120,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4241,7 +4146,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4262,6 +4166,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4284,12 +4189,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4315,7 +4218,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4336,6 +4238,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4352,8 +4255,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4387,7 +4289,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4408,6 +4309,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4430,7 +4332,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4453,8 +4354,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4480,7 +4380,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4501,6 +4400,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4523,12 +4423,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4554,7 +4452,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4575,6 +4472,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4591,8 +4489,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4626,7 +4523,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4647,6 +4543,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4669,7 +4566,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4692,8 +4588,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4719,7 +4614,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4740,6 +4634,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4762,7 +4657,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4785,8 +4679,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4812,7 +4705,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4833,6 +4725,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4849,8 +4742,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4884,7 +4776,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4905,6 +4796,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4927,13 +4819,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4959,7 +4849,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4980,6 +4869,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5002,7 +4892,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5025,8 +4914,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5052,7 +4940,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5073,6 +4960,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5089,8 +4977,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5124,7 +5011,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5145,6 +5031,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5167,7 +5054,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5190,8 +5076,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5217,7 +5102,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5238,6 +5122,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5260,12 +5145,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5291,7 +5174,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5312,6 +5194,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5328,8 +5211,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5363,7 +5245,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5384,6 +5265,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5406,7 +5288,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5429,8 +5310,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5456,7 +5336,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5477,6 +5356,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5499,12 +5379,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5530,7 +5408,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5551,6 +5428,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5567,8 +5445,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5602,7 +5479,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5623,6 +5499,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5645,13 +5522,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5677,7 +5552,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5698,6 +5572,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5720,7 +5595,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5743,8 +5617,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5770,7 +5643,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5791,6 +5663,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5807,8 +5680,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams/input.ts.json index 79518a01f707..f70487c51633 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -85,13 +84,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -110,6 +107,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -132,13 +130,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } } ], @@ -199,7 +195,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -229,7 +224,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -259,7 +253,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -285,7 +278,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -306,6 +298,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -328,13 +321,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -353,6 +344,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -375,13 +367,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } } ], @@ -442,7 +432,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -481,7 +470,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -502,7 +490,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -528,7 +515,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -549,6 +535,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -571,13 +558,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -596,6 +581,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -618,13 +604,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } } ], @@ -685,7 +669,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -724,7 +707,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -750,7 +732,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -777,7 +758,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -810,7 +790,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -824,6 +803,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -846,13 +826,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -862,6 +840,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -884,13 +863,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnn": { @@ -915,7 +892,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -941,7 +917,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -971,7 +946,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -985,6 +959,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1007,13 +982,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1023,6 +996,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1045,13 +1019,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnn": { @@ -1076,7 +1048,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1105,7 +1076,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1142,6 +1112,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1173,7 +1144,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1187,6 +1157,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1209,13 +1180,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1225,6 +1194,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1247,13 +1217,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnn": { @@ -1278,7 +1246,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1307,7 +1274,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1318,8 +1284,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1351,8 +1316,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1372,7 +1337,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1392,6 +1356,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1414,13 +1379,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1439,6 +1402,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1461,13 +1425,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } } ], @@ -1500,7 +1462,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1531,7 +1492,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1557,7 +1517,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1578,6 +1537,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1600,13 +1560,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1632,7 +1590,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1653,6 +1610,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1675,13 +1633,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1707,7 +1663,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1728,6 +1683,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1744,8 +1700,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1779,7 +1734,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1800,6 +1754,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1822,7 +1777,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1845,8 +1799,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1872,7 +1825,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1893,6 +1845,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1915,7 +1868,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1938,8 +1890,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1965,7 +1916,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1986,6 +1936,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2002,8 +1953,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2037,7 +1987,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2058,6 +2007,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2080,7 +2030,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2103,8 +2052,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2130,7 +2078,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2151,6 +2098,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2173,7 +2121,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2196,8 +2143,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2223,7 +2169,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2244,6 +2189,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2260,8 +2206,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2295,7 +2240,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2316,6 +2260,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2338,7 +2283,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2361,8 +2305,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2388,7 +2331,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2409,6 +2351,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2431,7 +2374,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2454,8 +2396,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2481,7 +2422,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2502,6 +2442,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2518,8 +2459,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2553,7 +2493,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2574,6 +2513,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2596,12 +2536,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2627,7 +2565,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2648,6 +2585,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2670,12 +2608,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2701,7 +2637,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2722,6 +2657,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2738,8 +2674,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2773,7 +2708,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2794,6 +2728,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2816,12 +2751,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2847,7 +2780,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2868,6 +2800,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2890,12 +2823,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2921,7 +2852,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2942,6 +2872,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2958,8 +2889,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2993,7 +2923,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3014,6 +2943,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3036,13 +2966,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3068,7 +2996,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3089,6 +3016,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3111,7 +3039,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3134,8 +3061,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3161,7 +3087,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3182,6 +3107,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3198,8 +3124,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3233,7 +3158,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3254,6 +3178,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3276,13 +3201,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3308,7 +3231,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3329,6 +3251,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3351,7 +3274,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3374,8 +3296,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3401,7 +3322,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3422,6 +3342,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3438,8 +3359,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3473,7 +3393,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3494,6 +3413,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3516,13 +3436,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3548,7 +3466,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3569,6 +3486,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3591,7 +3509,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3614,8 +3531,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3641,7 +3557,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3662,6 +3577,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3678,8 +3594,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3713,7 +3628,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3734,6 +3648,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3756,13 +3671,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3788,7 +3701,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3809,6 +3721,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3831,12 +3744,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3862,7 +3773,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3883,6 +3793,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3899,8 +3810,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3934,7 +3844,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3955,6 +3864,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3977,7 +3887,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4000,8 +3909,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4027,7 +3935,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4048,6 +3955,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4070,7 +3978,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4093,8 +4000,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4120,7 +4026,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4141,6 +4046,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4157,8 +4063,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4192,7 +4097,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4213,6 +4117,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4235,7 +4140,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4258,8 +4162,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4285,7 +4188,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4306,6 +4208,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4328,7 +4231,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4351,8 +4253,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4378,7 +4279,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4399,6 +4299,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4415,8 +4316,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4450,7 +4350,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4471,6 +4370,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4493,7 +4393,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4516,8 +4415,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4543,7 +4441,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4564,6 +4461,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4586,12 +4484,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4617,7 +4513,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4638,6 +4533,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4654,8 +4550,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4689,7 +4584,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4710,6 +4604,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4732,7 +4627,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4755,8 +4649,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4782,7 +4675,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4803,6 +4695,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4825,12 +4718,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4856,7 +4747,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4877,6 +4767,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4893,8 +4784,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4928,7 +4818,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4949,6 +4838,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4971,7 +4861,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4994,8 +4883,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5021,7 +4909,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5042,6 +4929,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5064,7 +4952,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5087,8 +4974,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5114,7 +5000,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5135,6 +5020,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5151,8 +5037,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5186,7 +5071,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5207,6 +5091,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5229,13 +5114,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5261,7 +5144,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5282,6 +5164,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5304,7 +5187,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5327,8 +5209,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5354,7 +5235,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5375,6 +5255,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5391,8 +5272,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5426,7 +5306,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5447,6 +5326,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5469,7 +5349,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5492,8 +5371,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5519,7 +5397,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5540,6 +5417,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5562,12 +5440,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5593,7 +5469,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5614,6 +5489,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5630,8 +5506,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5665,7 +5540,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5686,6 +5560,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5708,7 +5583,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5731,8 +5605,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5758,7 +5631,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5779,6 +5651,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5801,12 +5674,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5832,7 +5703,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5853,6 +5723,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5869,8 +5740,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5904,7 +5774,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5925,6 +5794,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5947,13 +5817,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5979,7 +5847,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6000,6 +5867,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6022,7 +5890,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6045,8 +5912,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6072,7 +5938,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6093,6 +5958,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6109,8 +5975,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams2/input.ts.json index 9d1ad7935fb7..7cf265104c6e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -85,13 +84,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -110,6 +107,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -132,13 +130,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } } ], @@ -199,7 +195,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -220,7 +215,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -250,7 +244,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -280,7 +273,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -306,7 +298,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -327,6 +318,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -349,13 +341,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -374,6 +364,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -396,13 +387,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } } ], @@ -463,7 +452,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -502,7 +490,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -523,7 +510,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -544,7 +530,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -570,7 +555,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -591,6 +575,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -613,13 +598,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -638,6 +621,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -660,13 +644,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } } ], @@ -727,7 +709,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -766,7 +747,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -787,7 +767,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -813,7 +792,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -840,7 +818,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -861,7 +838,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -894,7 +870,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -908,6 +883,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -930,13 +906,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -946,6 +920,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -968,13 +943,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnn": { @@ -999,7 +972,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1025,7 +997,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1055,7 +1026,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1069,6 +1039,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1091,13 +1062,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1107,6 +1076,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1129,13 +1099,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnn": { @@ -1160,7 +1128,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1189,7 +1156,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1210,7 +1176,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1247,6 +1212,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1278,7 +1244,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1292,6 +1257,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1314,13 +1280,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1330,6 +1294,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1352,13 +1317,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnn": { @@ -1383,7 +1346,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1412,7 +1374,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1433,7 +1394,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1444,8 +1404,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1477,8 +1436,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1498,7 +1457,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1518,6 +1476,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1540,13 +1499,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1565,6 +1522,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1587,13 +1545,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } } ], @@ -1626,7 +1582,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1657,7 +1612,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1678,7 +1632,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1704,7 +1657,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1725,6 +1677,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1747,13 +1700,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1779,7 +1730,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1800,6 +1750,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1822,13 +1773,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1854,7 +1803,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1875,6 +1823,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1891,8 +1840,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1926,7 +1874,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1947,6 +1894,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1969,7 +1917,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2001,8 +1948,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2028,7 +1974,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2049,6 +1994,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2071,7 +2017,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2103,8 +2048,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2130,7 +2074,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2151,6 +2094,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2167,8 +2111,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2202,7 +2145,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2223,6 +2165,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2245,7 +2188,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2277,8 +2219,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2304,7 +2245,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2325,6 +2265,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2347,7 +2288,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2379,8 +2319,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2406,7 +2345,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2427,6 +2365,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2443,8 +2382,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2478,7 +2416,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2499,6 +2436,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2521,7 +2459,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2553,8 +2490,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2580,7 +2516,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2601,6 +2536,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2623,7 +2559,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2655,8 +2590,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2682,7 +2616,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2703,6 +2636,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2719,8 +2653,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2754,7 +2687,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2775,6 +2707,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2797,12 +2730,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2828,7 +2759,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2849,6 +2779,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2871,12 +2802,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2902,7 +2831,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2923,6 +2851,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2939,8 +2868,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2974,7 +2902,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2995,6 +2922,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3017,12 +2945,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3048,7 +2974,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3069,6 +2994,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3091,12 +3017,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3122,7 +3046,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3143,6 +3066,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3159,8 +3083,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3194,7 +3117,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3215,6 +3137,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3237,13 +3160,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3269,7 +3190,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3290,6 +3210,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3312,7 +3233,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3344,8 +3264,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3371,7 +3290,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3392,6 +3310,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3408,8 +3327,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3443,7 +3361,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3464,6 +3381,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3486,13 +3404,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3518,7 +3434,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3539,6 +3454,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3561,7 +3477,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3593,8 +3508,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3620,7 +3534,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3641,6 +3554,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3657,8 +3571,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3692,7 +3605,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3713,6 +3625,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3735,13 +3648,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3767,7 +3678,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3788,6 +3698,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3810,7 +3721,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3842,8 +3752,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3869,7 +3778,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3890,6 +3798,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3906,8 +3815,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3941,7 +3849,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3962,6 +3869,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3984,13 +3892,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4016,7 +3922,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4037,6 +3942,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4059,12 +3965,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4090,7 +3994,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4111,6 +4014,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4127,8 +4031,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4162,7 +4065,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4183,6 +4085,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4205,7 +4108,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4237,8 +4139,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4264,7 +4165,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4285,6 +4185,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4307,7 +4208,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4339,8 +4239,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4366,7 +4265,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4387,6 +4285,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4403,8 +4302,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4438,7 +4336,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4459,6 +4356,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4481,7 +4379,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4513,8 +4410,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4540,7 +4436,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4561,6 +4456,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4583,7 +4479,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4615,8 +4510,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4642,7 +4536,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4663,6 +4556,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4679,8 +4573,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4714,7 +4607,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4735,6 +4627,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4757,7 +4650,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4789,8 +4681,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4816,7 +4707,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4837,6 +4727,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4859,12 +4750,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4890,7 +4779,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4911,6 +4799,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4927,8 +4816,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4962,7 +4850,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4983,6 +4870,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5005,7 +4893,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5037,8 +4924,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5064,7 +4950,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5085,6 +4970,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5107,12 +4993,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5138,7 +5022,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5159,6 +5042,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5175,8 +5059,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5210,7 +5093,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5231,6 +5113,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5253,7 +5136,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5285,8 +5167,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5312,7 +5193,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5333,6 +5213,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5355,7 +5236,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5387,8 +5267,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5414,7 +5293,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5435,6 +5313,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5451,8 +5330,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5486,7 +5364,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5507,6 +5384,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5529,13 +5407,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5561,7 +5437,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5582,6 +5457,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5604,7 +5480,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5636,8 +5511,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5663,7 +5537,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5684,6 +5557,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5700,8 +5574,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5735,7 +5608,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5756,6 +5628,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5778,7 +5651,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5810,8 +5682,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5837,7 +5708,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5858,6 +5728,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5880,12 +5751,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5911,7 +5780,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5932,6 +5800,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5948,8 +5817,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5983,7 +5851,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6004,6 +5871,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6026,7 +5894,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6058,8 +5925,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6085,7 +5951,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6106,6 +5971,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6128,12 +5994,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -6159,7 +6023,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6180,6 +6043,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6196,8 +6060,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -6231,7 +6094,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6252,6 +6114,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6274,13 +6137,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6306,7 +6167,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6327,6 +6187,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6349,7 +6210,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6381,8 +6241,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6408,7 +6267,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6429,6 +6287,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6445,8 +6304,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams3/input.ts.json index 5b8521933233..5ea3c5760198 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -63,6 +61,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -85,13 +84,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -110,6 +107,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -132,13 +130,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } } ], @@ -199,7 +195,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -220,7 +215,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -250,7 +244,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -280,7 +273,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -306,7 +298,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -327,6 +318,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -349,13 +341,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -374,6 +364,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -396,13 +387,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -463,7 +452,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -502,7 +490,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -523,7 +510,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -544,7 +530,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -570,7 +555,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -591,6 +575,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -613,13 +598,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -638,6 +621,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -660,13 +644,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } } ], @@ -727,7 +709,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -766,7 +747,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -787,7 +767,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -813,7 +792,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -840,7 +818,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -861,7 +838,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -894,7 +870,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -908,6 +883,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -930,13 +906,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -946,6 +920,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -968,13 +943,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnn": { @@ -999,7 +972,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1025,7 +997,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1055,7 +1026,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1069,6 +1039,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1091,13 +1062,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1107,6 +1076,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1129,13 +1099,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1160,7 +1128,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1189,7 +1156,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1210,7 +1176,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1247,6 +1212,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1278,7 +1244,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1292,6 +1257,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1314,13 +1280,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1330,6 +1294,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1352,13 +1317,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnn": { @@ -1383,7 +1346,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1412,7 +1374,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1433,7 +1394,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1444,8 +1404,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1477,8 +1436,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1498,7 +1457,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1518,6 +1476,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1540,13 +1499,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1565,6 +1522,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1587,13 +1545,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1626,7 +1582,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1657,7 +1612,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1678,7 +1632,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1704,7 +1657,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1725,6 +1677,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1747,13 +1700,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1779,7 +1730,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1800,6 +1750,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1822,13 +1773,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1854,7 +1803,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1875,6 +1823,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1891,8 +1840,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1926,7 +1874,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1947,6 +1894,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1969,7 +1917,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2001,8 +1948,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2028,7 +1974,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2049,6 +1994,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2071,7 +2017,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2103,8 +2048,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2130,7 +2074,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2151,6 +2094,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2167,8 +2111,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2202,7 +2145,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2223,6 +2165,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2245,7 +2188,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2277,8 +2219,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2304,7 +2245,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2325,6 +2265,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2347,7 +2288,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2379,8 +2319,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2406,7 +2345,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2427,6 +2365,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2443,8 +2382,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2478,7 +2416,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2499,6 +2436,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2521,7 +2459,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2553,8 +2490,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2580,7 +2516,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2601,6 +2536,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2623,7 +2559,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2655,8 +2590,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2682,7 +2616,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2703,6 +2636,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2719,8 +2653,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2754,7 +2687,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2775,6 +2707,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2797,12 +2730,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2828,7 +2759,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2849,6 +2779,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2871,12 +2802,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2902,7 +2831,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2923,6 +2851,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2939,8 +2868,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2974,7 +2902,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2995,6 +2922,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3017,12 +2945,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3048,7 +2974,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3069,6 +2994,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3091,12 +3017,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3122,7 +3046,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3143,6 +3066,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3159,8 +3083,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3194,7 +3117,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3215,6 +3137,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3237,13 +3160,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3269,7 +3190,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3290,6 +3210,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3312,7 +3233,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3344,8 +3264,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3371,7 +3290,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3392,6 +3310,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3408,8 +3327,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3443,7 +3361,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3464,6 +3381,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3486,13 +3404,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3518,7 +3434,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3539,6 +3454,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3561,7 +3477,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3593,8 +3508,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3620,7 +3534,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3641,6 +3554,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3657,8 +3571,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3692,7 +3605,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3713,6 +3625,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3735,13 +3648,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3767,7 +3678,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3788,6 +3698,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3810,7 +3721,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3842,8 +3752,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3869,7 +3778,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3890,6 +3798,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3906,8 +3815,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3941,7 +3849,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3962,6 +3869,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3984,13 +3892,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4016,7 +3922,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4037,6 +3942,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4059,12 +3965,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4090,7 +3994,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4111,6 +4014,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4127,8 +4031,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4162,7 +4065,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4183,6 +4085,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4205,7 +4108,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4237,8 +4139,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4264,7 +4165,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4285,6 +4185,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4307,7 +4208,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4339,8 +4239,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4366,7 +4265,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4387,6 +4285,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4403,8 +4302,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4438,7 +4336,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4459,6 +4356,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4481,7 +4379,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4513,8 +4410,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4540,7 +4436,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4561,6 +4456,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4583,7 +4479,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4615,8 +4510,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4642,7 +4536,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4663,6 +4556,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4679,8 +4573,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4714,7 +4607,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4735,6 +4627,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4757,7 +4650,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4789,8 +4681,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4816,7 +4707,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4837,6 +4727,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4859,12 +4750,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4890,7 +4779,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4911,6 +4799,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4927,8 +4816,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4962,7 +4850,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4983,6 +4870,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5005,7 +4893,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5037,8 +4924,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5064,7 +4950,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5085,6 +4970,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5107,12 +4993,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5138,7 +5022,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5159,6 +5042,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5175,8 +5059,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5210,7 +5093,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5231,6 +5113,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5253,7 +5136,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5285,8 +5167,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5312,7 +5193,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5333,6 +5213,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5355,7 +5236,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5387,8 +5267,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5414,7 +5293,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5435,6 +5313,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5451,8 +5330,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5486,7 +5364,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5507,6 +5384,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5529,13 +5407,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5561,7 +5437,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5582,6 +5457,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5604,7 +5480,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5636,8 +5511,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5663,7 +5537,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5684,6 +5557,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5700,8 +5574,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5735,7 +5608,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5756,6 +5628,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5778,7 +5651,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5810,8 +5682,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5837,7 +5708,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5858,6 +5728,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5880,12 +5751,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5911,7 +5780,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5932,6 +5800,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5948,8 +5817,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5983,7 +5851,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6004,6 +5871,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6026,7 +5894,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6058,8 +5925,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6085,7 +5951,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6106,6 +5971,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6128,12 +5994,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -6159,7 +6023,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6180,6 +6043,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6196,8 +6060,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -6231,7 +6094,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6252,6 +6114,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6274,13 +6137,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6306,7 +6167,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6327,6 +6187,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6349,7 +6210,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6381,8 +6241,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6408,7 +6267,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6429,6 +6287,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6445,8 +6304,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints/input.ts.json index 2339dfb87451..aaa849bca8b3 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,13 +83,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -149,7 +146,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -167,7 +163,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -207,7 +202,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -233,7 +227,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -253,6 +246,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -275,13 +269,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -340,7 +332,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -358,7 +349,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -385,7 +375,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -412,7 +401,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -430,7 +418,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -464,6 +451,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -486,13 +474,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -532,7 +518,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -562,6 +547,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -584,13 +570,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -633,7 +617,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -651,7 +634,6 @@ "ctxt": 0 }, "value": "Boolean", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -689,6 +671,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -720,6 +703,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -742,13 +726,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -791,7 +773,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -809,7 +790,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -839,8 +819,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -872,8 +851,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -893,7 +872,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "params": [ @@ -913,6 +891,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -935,13 +914,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1008,7 +985,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1026,7 +1002,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1053,7 +1028,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1074,6 +1048,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1096,7 +1071,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1122,7 +1096,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1148,8 +1121,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1175,7 +1147,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1196,6 +1167,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1218,7 +1190,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1244,7 +1215,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1270,8 +1240,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1297,7 +1266,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1318,6 +1286,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1334,8 +1303,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1369,7 +1337,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1390,6 +1357,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1412,7 +1380,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1438,7 +1405,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1446,8 +1412,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1473,7 +1438,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1494,6 +1458,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1516,7 +1481,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1542,7 +1506,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1550,8 +1513,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1577,7 +1539,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1598,6 +1559,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1614,8 +1576,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1649,7 +1610,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1670,6 +1630,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1692,7 +1653,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1718,7 +1678,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1726,8 +1685,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1753,7 +1711,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1774,6 +1731,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1796,7 +1754,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1822,7 +1779,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1830,8 +1786,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1857,7 +1812,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1878,6 +1832,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1894,8 +1849,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1929,7 +1883,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1950,6 +1903,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1972,12 +1926,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2003,7 +1955,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2024,6 +1975,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2046,12 +1998,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2077,7 +2027,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2098,6 +2047,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2114,8 +2064,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2149,7 +2098,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2170,6 +2118,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2192,12 +2141,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2223,7 +2170,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2244,6 +2190,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2266,12 +2213,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2297,7 +2242,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2318,6 +2262,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2334,8 +2279,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2369,7 +2313,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2390,6 +2333,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2412,7 +2356,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2438,7 +2381,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2464,8 +2406,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2491,7 +2432,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2512,6 +2452,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2534,7 +2475,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2560,7 +2500,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2568,8 +2507,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2595,7 +2533,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2616,6 +2553,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2632,8 +2570,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2667,7 +2604,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2688,6 +2624,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2710,7 +2647,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2736,7 +2672,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2762,8 +2697,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2789,7 +2723,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2810,6 +2743,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2832,7 +2766,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2858,7 +2791,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2866,8 +2798,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2893,7 +2824,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2914,6 +2844,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2930,8 +2861,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2965,7 +2895,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2986,6 +2915,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3008,7 +2938,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3034,7 +2963,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3060,8 +2988,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3087,7 +3014,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3108,6 +3034,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3130,12 +3057,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3161,7 +3086,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3182,6 +3106,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3198,8 +3123,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3233,7 +3157,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3254,6 +3177,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3276,7 +3200,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3302,7 +3225,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3328,8 +3250,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3355,7 +3276,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3376,6 +3296,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3398,12 +3319,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3429,7 +3348,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3450,6 +3368,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3466,8 +3385,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3501,7 +3419,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3522,6 +3439,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3544,7 +3462,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3570,7 +3487,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3578,8 +3494,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3605,7 +3520,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3626,6 +3540,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3648,7 +3563,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3674,7 +3588,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3682,8 +3595,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3709,7 +3621,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3730,6 +3641,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3746,8 +3658,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3781,7 +3692,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3802,6 +3712,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3824,13 +3735,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3856,7 +3765,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3877,6 +3785,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3899,7 +3808,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3925,7 +3833,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3933,8 +3840,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3960,7 +3866,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3981,6 +3886,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3997,8 +3903,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4032,7 +3937,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4053,6 +3957,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4075,7 +3980,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4101,7 +4005,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4109,8 +4012,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4136,7 +4038,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4157,6 +4058,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4179,12 +4081,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4210,7 +4110,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4231,6 +4130,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4247,8 +4147,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4282,7 +4181,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4303,6 +4201,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4325,7 +4224,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4351,7 +4249,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4359,8 +4256,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4386,7 +4282,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4407,6 +4302,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4429,12 +4325,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4460,7 +4354,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4481,6 +4374,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4497,8 +4391,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2/input.ts.json index c0de10cc45b0..c1e97d2ad7ee 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,13 +83,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -109,6 +106,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -131,13 +129,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -196,7 +192,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -214,7 +209,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -236,7 +230,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -254,7 +247,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -294,7 +286,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -320,7 +311,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -340,6 +330,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -362,13 +353,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -387,6 +376,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -409,13 +399,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -474,7 +462,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -492,7 +479,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -514,7 +500,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -532,7 +517,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -554,7 +538,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -580,7 +563,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -600,6 +582,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -622,13 +605,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -647,6 +628,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -669,13 +651,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -734,7 +714,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -752,7 +731,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -774,7 +752,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -792,7 +769,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -819,7 +795,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -846,7 +821,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -864,7 +838,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -886,7 +859,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -904,7 +876,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -938,6 +909,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -960,13 +932,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -976,6 +946,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -998,13 +969,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1044,7 +1013,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1074,6 +1042,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1096,13 +1065,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1112,6 +1079,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1134,13 +1102,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1183,7 +1149,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1201,7 +1166,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1223,7 +1187,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1241,7 +1204,6 @@ "ctxt": 0 }, "value": "Boolean", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1279,6 +1241,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1310,6 +1273,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1332,13 +1296,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1348,6 +1310,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1370,13 +1333,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1419,7 +1380,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1437,7 +1397,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1459,7 +1418,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1477,7 +1435,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1507,8 +1464,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1540,8 +1496,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1561,7 +1517,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1581,6 +1536,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1603,13 +1559,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1628,6 +1582,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1650,13 +1605,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1723,7 +1676,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1741,7 +1693,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1763,7 +1714,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1781,7 +1731,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1808,7 +1757,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1829,6 +1777,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1851,7 +1800,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1877,7 +1825,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1915,7 +1862,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1941,8 +1887,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1968,7 +1913,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1989,6 +1933,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2011,7 +1956,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2037,7 +1981,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2075,7 +2018,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2101,8 +2043,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2128,7 +2069,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2149,6 +2089,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2165,8 +2106,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2200,7 +2140,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2221,6 +2160,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2243,7 +2183,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2269,7 +2208,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2289,7 +2227,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2297,8 +2234,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2324,7 +2260,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2345,6 +2280,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2367,7 +2303,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2393,7 +2328,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2413,7 +2347,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2421,8 +2354,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2448,7 +2380,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2469,6 +2400,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2485,8 +2417,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2520,7 +2451,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2541,6 +2471,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2563,7 +2494,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2589,7 +2519,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2609,7 +2538,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2617,8 +2545,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2644,7 +2571,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2665,6 +2591,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2687,7 +2614,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2713,7 +2639,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2733,7 +2658,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2741,8 +2665,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2768,7 +2691,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2789,6 +2711,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2805,8 +2728,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2840,7 +2762,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2861,6 +2782,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2883,12 +2805,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2914,7 +2834,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2935,6 +2854,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2957,12 +2877,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2988,7 +2906,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3009,6 +2926,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3025,8 +2943,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3060,7 +2977,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3081,6 +2997,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3103,12 +3020,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3134,7 +3049,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3155,6 +3069,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3177,12 +3092,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3208,7 +3121,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3229,6 +3141,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3245,8 +3158,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3280,7 +3192,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3301,6 +3212,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3323,7 +3235,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3349,7 +3260,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3369,7 +3279,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3377,8 +3286,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3404,7 +3312,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3425,6 +3332,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3447,7 +3355,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3473,7 +3380,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3493,7 +3399,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3501,8 +3406,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3528,7 +3432,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3549,6 +3452,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3565,8 +3469,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3600,7 +3503,6 @@ "ctxt": 0 }, "value": "foo6c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3621,6 +3523,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3643,7 +3546,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3669,7 +3571,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3689,7 +3590,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3697,8 +3597,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3724,7 +3623,6 @@ "ctxt": 0 }, "value": "foo6c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3745,6 +3643,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3767,7 +3666,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3802,7 +3700,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3810,8 +3707,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3837,7 +3733,6 @@ "ctxt": 0 }, "value": "foo6c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3858,6 +3753,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3874,8 +3770,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3909,7 +3804,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3930,6 +3824,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3952,7 +3847,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3978,7 +3872,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4016,7 +3909,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4042,8 +3934,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4069,7 +3960,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4090,6 +3980,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4112,7 +4003,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4138,7 +4028,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4158,7 +4047,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4166,8 +4054,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4193,7 +4080,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4214,6 +4100,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4230,8 +4117,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4265,7 +4151,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4286,6 +4171,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4308,7 +4194,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4334,7 +4219,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4372,7 +4256,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4398,8 +4281,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4425,7 +4307,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4446,6 +4327,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4468,7 +4350,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4494,7 +4375,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4514,7 +4394,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4522,8 +4401,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4549,7 +4427,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4570,6 +4447,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4586,8 +4464,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4621,7 +4498,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4642,6 +4518,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4664,7 +4541,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4690,7 +4566,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4728,7 +4603,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4754,8 +4628,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4781,7 +4654,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4802,6 +4674,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4824,12 +4697,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4855,7 +4726,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4876,6 +4746,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4892,8 +4763,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4927,7 +4797,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4948,6 +4817,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4970,7 +4840,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4996,7 +4865,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5034,7 +4902,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5060,8 +4927,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5087,7 +4953,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5108,6 +4973,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5130,12 +4996,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5161,7 +5025,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5182,6 +5045,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5198,8 +5062,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5233,7 +5096,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5254,6 +5116,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5276,7 +5139,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5302,7 +5164,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5322,7 +5183,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5330,8 +5190,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5357,7 +5216,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5378,6 +5236,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5400,7 +5259,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5426,7 +5284,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5446,7 +5303,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5454,8 +5310,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5481,7 +5336,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5502,6 +5356,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5518,8 +5373,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5553,7 +5407,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5574,6 +5427,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5596,13 +5450,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5628,7 +5480,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5649,6 +5500,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5671,7 +5523,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5697,7 +5548,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5717,7 +5567,6 @@ "ctxt": 0 }, "value": "String", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5725,8 +5574,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5752,7 +5600,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5773,6 +5620,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5789,8 +5637,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5824,7 +5671,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5845,6 +5691,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5867,7 +5714,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5893,7 +5739,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5913,7 +5758,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5921,8 +5765,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5948,7 +5791,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5969,6 +5811,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5991,12 +5834,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -6022,7 +5863,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6043,6 +5883,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6059,8 +5900,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -6094,7 +5934,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6115,6 +5954,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6137,7 +5977,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6163,7 +6002,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6183,7 +6021,6 @@ "ctxt": 0 }, "value": "Number", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6191,8 +6028,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6218,7 +6054,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6239,6 +6074,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6261,12 +6097,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -6292,7 +6126,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6313,6 +6146,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6329,8 +6163,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3/input.ts.json index 7113cf9c16bb..1c80105ad613 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "One", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -199,7 +194,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -243,7 +237,6 @@ "ctxt": 0 }, "value": "Four", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -270,7 +263,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -303,7 +295,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -332,7 +323,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -358,7 +348,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -385,7 +374,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -409,7 +397,6 @@ "ctxt": 0 }, "value": "Four", - "typeAnnotation": null, "optional": false }, "typeArguments": { @@ -435,7 +422,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -469,7 +455,6 @@ "ctxt": 0 }, "value": "Six", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -496,7 +481,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -517,7 +501,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -550,7 +533,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -579,7 +561,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -600,7 +581,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -626,7 +606,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -646,6 +625,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -668,13 +648,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -693,6 +671,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -715,13 +694,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -780,7 +757,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -798,7 +774,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -820,7 +795,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -838,7 +812,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -860,7 +833,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -886,7 +858,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -906,6 +877,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -928,13 +900,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -953,6 +923,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -975,13 +946,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1040,7 +1009,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1058,7 +1026,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1080,7 +1047,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1098,7 +1064,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1120,7 +1085,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1146,7 +1110,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1166,6 +1129,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1188,13 +1152,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1213,6 +1175,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1235,13 +1198,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1300,7 +1261,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1318,7 +1278,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1340,7 +1299,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1358,7 +1316,6 @@ "ctxt": 0 }, "value": "Four", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1403,7 +1360,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1430,7 +1386,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1448,7 +1403,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1470,7 +1424,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1488,7 +1441,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1540,6 +1492,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1562,13 +1515,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1578,6 +1529,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1600,13 +1552,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1646,7 +1596,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1676,6 +1625,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1698,13 +1648,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1714,6 +1662,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1736,13 +1685,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1785,7 +1732,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1803,7 +1749,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1825,7 +1770,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1843,7 +1787,6 @@ "ctxt": 0 }, "value": "Six", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1908,6 +1851,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1939,6 +1883,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1961,13 +1906,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1977,6 +1920,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1999,13 +1943,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2048,7 +1990,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2066,7 +2007,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2088,7 +2028,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2106,7 +2045,6 @@ "ctxt": 0 }, "value": "One", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2118,8 +2056,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2151,8 +2088,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -2172,7 +2109,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "params": [ @@ -2192,6 +2128,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2214,13 +2151,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2239,6 +2174,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2261,13 +2197,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2334,7 +2268,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2352,7 +2285,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2374,7 +2306,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2392,7 +2323,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2419,7 +2349,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2440,6 +2369,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2462,7 +2392,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2488,7 +2417,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2508,7 +2436,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2516,8 +2443,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2543,7 +2469,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2564,6 +2489,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2586,7 +2512,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2612,7 +2537,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2632,7 +2556,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2640,8 +2563,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2667,7 +2589,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2688,6 +2609,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2704,8 +2626,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2739,7 +2660,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2760,6 +2680,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2782,7 +2703,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2808,7 +2728,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2828,7 +2747,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2836,8 +2754,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2863,7 +2780,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2884,6 +2800,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2906,7 +2823,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2932,7 +2848,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2952,7 +2867,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2960,8 +2874,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2987,7 +2900,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3008,6 +2920,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3024,8 +2937,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3059,7 +2971,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3080,6 +2991,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3102,7 +3014,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3128,7 +3039,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3166,7 +3076,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3192,8 +3101,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3219,7 +3127,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3240,6 +3147,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3262,7 +3170,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3288,7 +3195,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3326,7 +3232,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3352,8 +3257,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3379,7 +3283,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3400,6 +3303,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3416,8 +3320,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3451,7 +3354,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3472,6 +3374,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3494,12 +3397,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3525,7 +3426,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3546,6 +3446,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3568,12 +3469,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3599,7 +3498,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3620,6 +3518,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3636,8 +3535,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3671,7 +3569,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3692,6 +3589,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3714,12 +3612,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3745,7 +3641,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3766,6 +3661,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3788,12 +3684,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3819,7 +3713,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3840,6 +3733,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3856,8 +3750,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3891,7 +3784,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3912,6 +3804,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3934,7 +3827,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3960,7 +3852,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3980,7 +3871,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3988,8 +3878,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4015,7 +3904,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4036,6 +3924,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4058,7 +3947,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4084,7 +3972,6 @@ "ctxt": 0 }, "value": "Four", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4122,7 +4009,6 @@ "ctxt": 0 }, "value": "Four", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4148,8 +4034,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4175,7 +4060,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4196,6 +4080,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4212,8 +4097,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4247,7 +4131,6 @@ "ctxt": 0 }, "value": "foo6c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4268,6 +4151,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4290,7 +4174,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4316,7 +4199,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4336,7 +4218,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4344,8 +4225,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4371,7 +4251,6 @@ "ctxt": 0 }, "value": "foo6c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4392,6 +4271,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4414,7 +4294,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4440,7 +4319,6 @@ "ctxt": 0 }, "value": "Four", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4478,7 +4356,6 @@ "ctxt": 0 }, "value": "Four", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4504,8 +4381,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4531,7 +4407,6 @@ "ctxt": 0 }, "value": "foo6c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4552,6 +4427,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4568,8 +4444,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4603,7 +4478,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4624,6 +4498,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4646,7 +4521,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4672,7 +4546,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4692,7 +4565,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4700,8 +4572,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4727,7 +4598,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4748,6 +4618,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4770,7 +4641,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4796,7 +4666,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4834,7 +4703,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4860,8 +4728,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4887,7 +4754,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4908,6 +4774,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4924,8 +4791,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4959,7 +4825,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4980,6 +4845,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5002,7 +4868,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5028,7 +4893,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5048,7 +4912,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5056,8 +4919,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5083,7 +4945,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5104,6 +4965,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5126,7 +4988,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5152,7 +5013,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5172,7 +5032,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5180,8 +5039,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5207,7 +5065,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5228,6 +5085,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5244,8 +5102,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5279,7 +5136,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5300,6 +5156,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5322,7 +5179,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5348,7 +5204,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5368,7 +5223,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5376,8 +5230,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5403,7 +5256,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5424,6 +5276,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5446,12 +5299,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5477,7 +5328,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5498,6 +5348,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5514,8 +5365,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5549,7 +5399,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5570,6 +5419,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5592,7 +5442,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5618,7 +5467,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5638,7 +5486,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5646,8 +5493,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5673,7 +5519,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5694,6 +5539,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5716,12 +5562,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5747,7 +5591,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5768,6 +5611,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5784,8 +5628,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5819,7 +5662,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5840,6 +5682,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5862,7 +5705,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5888,7 +5730,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5926,7 +5767,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5952,8 +5792,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5979,7 +5818,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6000,6 +5838,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6022,7 +5861,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6048,7 +5886,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6068,7 +5905,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6076,8 +5912,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6103,7 +5938,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6124,6 +5958,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6140,8 +5975,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -6175,7 +6009,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6196,6 +6029,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6218,13 +6052,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6250,7 +6082,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6271,6 +6102,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6293,7 +6125,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6319,7 +6150,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6339,7 +6169,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6347,8 +6176,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6374,7 +6202,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6395,6 +6222,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6411,8 +6239,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -6446,7 +6273,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6467,6 +6293,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6489,7 +6316,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6515,7 +6341,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6553,7 +6378,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6579,8 +6403,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6606,7 +6429,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6627,6 +6449,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6649,12 +6472,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -6680,7 +6501,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6701,6 +6521,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6717,8 +6538,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -6752,7 +6572,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6773,6 +6592,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6795,7 +6615,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6821,7 +6640,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6859,7 +6677,6 @@ "ctxt": 0 }, "value": "Five", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6885,8 +6702,7 @@ ] } } - }, - "optional": false + } } } ], @@ -6912,7 +6728,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6933,6 +6748,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6955,12 +6771,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -6986,7 +6800,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7007,6 +6820,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7023,8 +6837,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType/input.ts.json index 01bef04bcec6..f04767b385d2 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,13 +83,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -149,7 +146,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -170,7 +166,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -196,7 +191,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -216,6 +210,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -238,13 +233,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -303,7 +296,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -329,7 +321,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -356,7 +347,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -389,6 +379,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -411,13 +402,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -442,7 +431,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -468,7 +456,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -498,6 +485,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -520,13 +508,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -551,7 +537,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -580,7 +565,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -617,6 +601,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -648,6 +633,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -670,13 +656,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -701,7 +685,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -730,7 +713,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -741,8 +723,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -774,8 +755,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -795,7 +776,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "params": [ @@ -815,6 +795,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -837,13 +818,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -904,7 +883,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -934,7 +912,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -957,7 +934,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -978,6 +954,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1000,7 +977,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1023,8 +999,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1050,7 +1025,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1071,6 +1045,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1093,7 +1068,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1116,8 +1090,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1143,7 +1116,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1164,6 +1136,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1180,8 +1153,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1215,7 +1187,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1236,6 +1207,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1258,7 +1230,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1281,8 +1252,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1308,7 +1278,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1329,6 +1298,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1351,7 +1321,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1374,8 +1343,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1401,7 +1369,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1422,6 +1389,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1438,8 +1406,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1473,7 +1440,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1494,6 +1460,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1516,7 +1483,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1539,8 +1505,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1566,7 +1531,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1587,6 +1551,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1609,7 +1574,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1632,8 +1596,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1659,7 +1622,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1680,6 +1642,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1696,8 +1659,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1731,7 +1693,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1752,6 +1713,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1774,12 +1736,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1805,7 +1765,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1826,6 +1785,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1848,12 +1808,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1879,7 +1837,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1900,6 +1857,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1916,8 +1874,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1951,7 +1908,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1972,6 +1928,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1994,12 +1951,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2025,7 +1980,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2046,6 +2000,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2068,12 +2023,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2099,7 +2052,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2120,6 +2072,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2136,8 +2089,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2171,7 +2123,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2192,6 +2143,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2214,12 +2166,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2261,7 +2211,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2282,6 +2231,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2304,12 +2254,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2351,7 +2299,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2372,6 +2319,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2388,8 +2336,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2439,7 +2386,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2460,6 +2406,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2482,7 +2429,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2505,8 +2451,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2532,7 +2477,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2553,6 +2497,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2575,7 +2520,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2598,8 +2542,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2625,7 +2568,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2646,6 +2588,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2662,8 +2605,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2697,7 +2639,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2718,6 +2659,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2740,7 +2682,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2763,8 +2704,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2790,7 +2730,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2811,6 +2750,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2833,7 +2773,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2856,8 +2795,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2883,7 +2821,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2904,6 +2841,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2920,8 +2858,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2955,7 +2892,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2976,6 +2912,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2998,7 +2935,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3021,8 +2957,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3048,7 +2983,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3069,6 +3003,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3091,12 +3026,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3122,7 +3055,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3143,6 +3075,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3159,8 +3092,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3194,7 +3126,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3215,6 +3146,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3237,7 +3169,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3260,8 +3191,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3287,7 +3217,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3308,6 +3237,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3330,12 +3260,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3361,7 +3289,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3382,6 +3309,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3398,8 +3326,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3433,7 +3360,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3454,6 +3380,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3476,7 +3403,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3499,8 +3425,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3526,7 +3451,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3547,6 +3471,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3569,7 +3494,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3592,8 +3516,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3619,7 +3542,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3640,6 +3562,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3656,8 +3579,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3691,7 +3613,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3712,6 +3633,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3734,13 +3656,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3766,7 +3686,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3787,6 +3706,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3809,7 +3729,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3832,8 +3751,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3859,7 +3777,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3880,6 +3797,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3896,8 +3814,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3931,7 +3848,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3952,6 +3868,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3974,7 +3891,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3997,8 +3913,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4024,7 +3939,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4045,6 +3959,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4067,12 +3982,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4098,7 +4011,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4119,6 +4031,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4135,8 +4048,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4170,7 +4082,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4191,6 +4102,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4213,7 +4125,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4236,8 +4147,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4263,7 +4173,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4284,6 +4193,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4306,12 +4216,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4337,7 +4245,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4358,6 +4265,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4374,8 +4282,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4409,7 +4316,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4430,6 +4336,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4452,13 +4359,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4484,7 +4389,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4505,6 +4409,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4527,7 +4432,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4550,8 +4454,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4577,7 +4480,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4598,6 +4500,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4614,8 +4517,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2/input.ts.json index a07cac1b9345..d471fd7efbf6 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,13 +83,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -149,7 +146,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -167,7 +163,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -189,7 +184,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -215,7 +209,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -235,6 +228,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -257,13 +251,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -322,7 +314,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -340,7 +331,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -367,7 +357,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -394,7 +383,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -412,7 +400,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -446,6 +433,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -468,13 +456,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -499,7 +485,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -525,7 +510,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -555,6 +539,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -577,13 +562,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -608,7 +591,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -637,7 +619,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -655,7 +636,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -693,6 +673,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -724,6 +705,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -746,13 +728,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -777,7 +757,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -806,7 +785,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -824,7 +802,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -836,8 +813,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -869,8 +845,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -890,7 +866,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "params": [ @@ -910,6 +885,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -932,13 +908,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -999,7 +973,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1017,7 +990,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1044,7 +1016,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1065,6 +1036,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1087,7 +1059,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1113,7 +1084,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1121,8 +1091,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1148,7 +1117,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1169,6 +1137,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1191,7 +1160,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1217,7 +1185,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1225,8 +1192,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1252,7 +1218,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1273,6 +1238,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1289,8 +1255,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1324,7 +1289,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1345,6 +1309,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1367,7 +1332,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1393,7 +1357,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1401,8 +1364,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1428,7 +1390,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1449,6 +1410,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1471,7 +1433,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1497,7 +1458,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1505,8 +1465,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1532,7 +1491,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1553,6 +1511,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1569,8 +1528,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1604,7 +1562,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1625,6 +1582,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1647,7 +1605,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1673,7 +1630,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1681,8 +1637,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1708,7 +1663,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1729,6 +1683,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1751,7 +1706,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1777,7 +1731,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1785,8 +1738,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1812,7 +1764,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1833,6 +1784,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1849,8 +1801,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1884,7 +1835,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1905,6 +1855,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1927,12 +1878,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1958,7 +1907,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1979,6 +1927,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2001,12 +1950,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2032,7 +1979,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2053,6 +1999,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2069,8 +2016,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2104,7 +2050,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2125,6 +2070,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2147,12 +2093,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2178,7 +2122,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2199,6 +2142,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2221,12 +2165,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2252,7 +2194,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2273,6 +2214,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2289,8 +2231,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2324,7 +2265,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2345,6 +2285,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2367,7 +2308,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2393,7 +2333,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2401,8 +2340,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2428,7 +2366,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2449,6 +2386,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2471,7 +2409,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2497,7 +2434,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2505,8 +2441,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2532,7 +2467,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2553,6 +2487,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2569,8 +2504,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2604,7 +2538,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2625,6 +2558,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2647,7 +2581,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2673,7 +2606,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2681,8 +2613,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2708,7 +2639,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2729,6 +2659,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2751,7 +2682,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2777,7 +2707,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2785,8 +2714,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2812,7 +2740,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2833,6 +2760,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2849,8 +2777,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2884,7 +2811,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2905,6 +2831,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2927,7 +2854,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2953,7 +2879,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2961,8 +2886,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2988,7 +2912,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3009,6 +2932,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3031,12 +2955,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3062,7 +2984,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3083,6 +3004,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3099,8 +3021,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3134,7 +3055,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3155,6 +3075,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3177,7 +3098,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3203,7 +3123,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3211,8 +3130,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3238,7 +3156,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3259,6 +3176,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3281,12 +3199,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3312,7 +3228,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3333,6 +3248,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3349,8 +3265,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3384,7 +3299,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3405,6 +3319,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3427,7 +3342,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3453,7 +3367,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3461,8 +3374,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3488,7 +3400,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3509,6 +3420,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3531,7 +3443,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3557,7 +3468,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3565,8 +3475,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3592,7 +3501,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3613,6 +3521,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3629,8 +3538,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3664,7 +3572,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3685,6 +3592,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3707,13 +3615,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3739,7 +3645,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3760,6 +3665,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3782,7 +3688,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3808,7 +3713,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3816,8 +3720,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3843,7 +3746,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3864,6 +3766,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3880,8 +3783,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3915,7 +3817,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3936,6 +3837,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3958,7 +3860,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3984,7 +3885,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3992,8 +3892,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4019,7 +3918,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4040,6 +3938,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4062,12 +3961,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4093,7 +3990,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4114,6 +4010,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4130,8 +4027,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4165,7 +4061,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4186,6 +4081,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4208,7 +4104,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4234,7 +4129,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4242,8 +4136,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4269,7 +4162,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4290,6 +4182,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4312,12 +4205,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4343,7 +4234,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4364,6 +4254,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4380,8 +4271,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4415,7 +4305,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4436,6 +4325,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4458,13 +4348,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4490,7 +4378,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4511,6 +4398,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4533,7 +4421,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4559,7 +4446,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4567,8 +4453,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4594,7 +4479,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4615,6 +4499,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4631,8 +4516,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts/input.ts.json index f6e41f20e854..0dbda47dda92 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,13 +83,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -149,7 +146,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -170,7 +166,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -191,7 +186,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -217,7 +211,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -237,6 +230,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -259,13 +253,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -324,7 +316,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -345,7 +336,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -366,7 +356,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -392,7 +381,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -419,7 +407,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -440,7 +427,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -461,7 +447,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -482,7 +467,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -515,6 +499,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -537,13 +522,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -568,7 +551,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -594,7 +576,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -614,7 +595,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -643,7 +623,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -673,6 +652,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -695,13 +675,11 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -726,7 +704,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -752,7 +729,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -772,7 +748,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -792,7 +767,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -824,7 +798,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -845,7 +818,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -866,7 +838,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -887,7 +858,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -924,6 +894,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -955,6 +926,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -977,13 +949,11 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1008,7 +978,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1034,7 +1003,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1054,7 +1022,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1074,7 +1041,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1106,7 +1072,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1127,7 +1092,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1148,7 +1112,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1169,7 +1132,6 @@ "ctxt": 0 }, "value": "CC", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1190,7 +1152,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1201,8 +1162,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1234,8 +1194,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1255,7 +1215,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1275,6 +1234,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1297,13 +1257,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1336,7 +1294,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1367,7 +1324,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1388,7 +1344,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1409,7 +1364,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1430,7 +1384,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1451,7 +1404,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1472,7 +1424,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1498,7 +1449,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1519,6 +1469,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1541,7 +1492,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1573,8 +1523,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1600,7 +1549,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1621,6 +1569,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1643,7 +1592,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1675,8 +1623,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1702,7 +1649,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1723,6 +1669,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1739,8 +1686,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1774,7 +1720,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1795,6 +1740,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1817,7 +1763,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1858,8 +1803,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1885,7 +1829,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1906,6 +1849,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1928,7 +1872,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1969,8 +1912,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1996,7 +1938,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2017,6 +1958,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2033,8 +1975,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2068,7 +2009,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2089,6 +2029,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2111,7 +2052,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2161,8 +2101,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2188,7 +2127,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2209,6 +2147,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2231,7 +2170,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2281,8 +2219,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2308,7 +2245,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2329,6 +2265,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2345,8 +2282,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2380,7 +2316,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2401,6 +2336,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2423,12 +2359,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2454,7 +2388,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2475,6 +2408,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2497,12 +2431,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2528,7 +2460,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2549,6 +2480,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2565,8 +2497,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2600,7 +2531,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2621,6 +2551,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2643,12 +2574,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2674,7 +2603,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2695,6 +2623,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2717,12 +2646,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2748,7 +2675,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2769,6 +2695,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2785,8 +2712,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2820,7 +2746,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2841,6 +2766,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2863,7 +2789,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2895,8 +2820,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2922,7 +2846,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2943,6 +2866,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2965,7 +2889,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3018,7 +2941,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3026,8 +2948,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3053,7 +2974,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3074,6 +2994,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3090,8 +3011,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3125,7 +3045,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3146,6 +3065,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3168,7 +3088,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3200,8 +3119,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3227,7 +3145,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3248,6 +3165,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3270,7 +3188,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3314,7 +3231,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3349,8 +3265,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3376,7 +3291,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3397,6 +3311,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3413,8 +3328,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3448,7 +3362,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3469,6 +3382,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3491,7 +3405,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3523,8 +3436,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3550,7 +3462,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3571,6 +3482,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3593,12 +3505,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3624,7 +3534,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3645,6 +3554,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3661,8 +3571,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3696,7 +3605,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3717,6 +3625,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3739,7 +3648,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3771,8 +3679,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3798,7 +3705,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3819,6 +3725,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3841,12 +3748,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3872,7 +3777,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3893,6 +3797,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3909,8 +3814,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3944,7 +3848,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3965,6 +3868,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3987,7 +3891,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4013,7 +3916,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4069,7 +3971,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4086,8 +3987,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4113,7 +4013,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4134,6 +4033,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4156,7 +4056,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4182,7 +4081,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4238,7 +4136,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4246,8 +4143,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4273,7 +4169,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4294,6 +4189,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4310,8 +4206,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4345,7 +4240,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4366,6 +4260,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4388,13 +4283,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4420,7 +4313,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4441,6 +4333,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4463,7 +4356,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4504,8 +4396,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4531,7 +4422,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4552,6 +4442,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4568,8 +4459,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4603,7 +4493,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4624,6 +4513,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4646,7 +4536,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4681,7 +4570,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4701,7 +4589,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4721,7 +4608,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4729,8 +4615,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4756,7 +4641,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4777,6 +4661,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4799,12 +4684,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4830,7 +4713,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4851,6 +4733,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4867,8 +4750,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4902,7 +4784,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4923,6 +4804,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4945,7 +4827,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4980,7 +4861,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5000,7 +4880,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5017,8 +4896,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5044,7 +4922,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5065,6 +4942,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5087,12 +4965,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5118,7 +4994,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5139,6 +5014,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5155,8 +5031,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames/input.ts.json index 8a197ee34bd2..64b6e9230fbe 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,13 +83,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -149,7 +146,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -170,7 +166,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -196,7 +191,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -216,6 +210,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -238,13 +233,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -303,7 +296,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -329,7 +321,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -356,7 +347,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -389,6 +379,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -411,13 +402,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -442,7 +431,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -468,7 +456,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -497,7 +484,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -527,6 +513,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -549,13 +536,11 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -580,7 +565,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -606,7 +590,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -638,7 +621,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -675,6 +657,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -706,6 +689,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -728,13 +712,11 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -759,7 +741,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -785,7 +766,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -817,7 +797,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -828,8 +807,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -861,8 +839,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -882,7 +860,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "params": [ @@ -902,6 +879,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -924,13 +902,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -970,7 +946,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -984,7 +959,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1012,7 +986,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1048,7 +1021,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1074,7 +1046,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1095,6 +1066,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1117,7 +1089,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1140,8 +1111,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1167,7 +1137,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1188,6 +1157,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1210,7 +1180,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1233,8 +1202,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1260,7 +1228,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1281,6 +1248,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1297,8 +1265,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1332,7 +1299,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1353,6 +1319,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1375,7 +1342,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1398,8 +1364,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1425,7 +1390,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1446,6 +1410,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1468,7 +1433,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1491,8 +1455,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1518,7 +1481,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1539,6 +1501,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1555,8 +1518,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1590,7 +1552,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1611,6 +1572,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1633,7 +1595,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1656,8 +1617,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1683,7 +1643,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1704,6 +1663,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1726,7 +1686,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1749,8 +1708,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1776,7 +1734,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1797,6 +1754,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1813,8 +1771,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1848,7 +1805,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1869,6 +1825,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1891,12 +1848,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1922,7 +1877,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1943,6 +1897,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1965,12 +1920,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1996,7 +1949,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2017,6 +1969,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2033,8 +1986,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2068,7 +2020,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2089,6 +2040,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2111,12 +2063,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2142,7 +2092,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2163,6 +2112,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2185,12 +2135,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2216,7 +2164,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2237,6 +2184,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2253,8 +2201,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2288,7 +2235,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2309,6 +2255,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2331,7 +2278,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2354,8 +2300,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2381,7 +2326,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2402,6 +2346,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2424,7 +2369,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2447,8 +2391,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2474,7 +2417,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2495,6 +2437,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2511,8 +2454,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2546,7 +2488,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2567,6 +2508,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2589,7 +2531,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2612,8 +2553,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2639,7 +2579,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2660,6 +2599,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2682,7 +2622,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2705,8 +2644,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2732,7 +2670,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2753,6 +2690,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2769,8 +2707,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2804,7 +2741,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2825,6 +2761,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2847,7 +2784,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2870,8 +2806,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2897,7 +2832,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2918,6 +2852,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2940,12 +2875,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2971,7 +2904,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2992,6 +2924,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3008,8 +2941,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3043,7 +2975,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3064,6 +2995,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3086,7 +3018,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3109,8 +3040,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3136,7 +3066,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3157,6 +3086,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3179,12 +3109,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3210,7 +3138,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3231,6 +3158,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3247,8 +3175,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3282,7 +3209,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3303,6 +3229,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3325,7 +3252,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3348,8 +3274,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3375,7 +3300,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3396,6 +3320,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3418,7 +3343,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3441,8 +3365,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3468,7 +3391,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3489,6 +3411,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3505,8 +3428,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3540,7 +3462,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3561,6 +3482,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3583,13 +3505,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3615,7 +3535,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3636,6 +3555,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3658,7 +3578,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3681,8 +3600,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3708,7 +3626,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3729,6 +3646,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3745,8 +3663,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3780,7 +3697,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3801,6 +3717,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3823,7 +3740,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3846,8 +3762,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3873,7 +3788,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3894,6 +3808,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3916,12 +3831,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3947,7 +3860,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3968,6 +3880,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3984,8 +3897,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4019,7 +3931,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4040,6 +3951,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4062,7 +3974,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4085,8 +3996,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4112,7 +4022,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4133,6 +4042,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4155,12 +4065,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4186,7 +4094,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4207,6 +4114,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4223,8 +4131,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams/input.ts.json index f9e03ddf2278..a7b9acc4b718 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,13 +83,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -109,6 +106,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -131,13 +129,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } } ], @@ -196,7 +192,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -217,7 +212,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -243,7 +237,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -263,6 +256,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -285,13 +279,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -310,6 +302,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -332,13 +325,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } } ], @@ -397,7 +388,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -423,7 +413,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -450,7 +439,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -483,6 +471,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -505,13 +494,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -521,6 +508,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -543,13 +531,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnnotation": { @@ -574,7 +560,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -600,7 +585,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -629,7 +613,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -659,6 +642,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -681,13 +665,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -697,6 +679,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -719,13 +702,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnnotation": { @@ -750,7 +731,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -776,7 +756,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -808,7 +787,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -845,6 +823,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -876,6 +855,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -898,13 +878,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -914,6 +892,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -936,13 +915,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnnotation": { @@ -967,7 +944,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -993,7 +969,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1025,7 +1000,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1036,8 +1010,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1069,8 +1042,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1090,7 +1063,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1110,6 +1082,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1132,13 +1105,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1157,6 +1128,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1179,13 +1151,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } } ], @@ -1225,7 +1195,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1239,7 +1208,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1253,7 +1221,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1281,7 +1248,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1317,7 +1283,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1343,7 +1308,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1364,6 +1328,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1386,7 +1351,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1409,8 +1373,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1436,7 +1399,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1457,6 +1419,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1479,7 +1442,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1502,8 +1464,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1529,7 +1490,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1550,6 +1510,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1566,8 +1527,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1601,7 +1561,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1622,6 +1581,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1644,7 +1604,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1667,8 +1626,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1694,7 +1652,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1715,6 +1672,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1737,7 +1695,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1760,8 +1717,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1787,7 +1743,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1808,6 +1763,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1824,8 +1780,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1859,7 +1814,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1880,6 +1834,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1902,7 +1857,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1925,8 +1879,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1952,7 +1905,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1973,6 +1925,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1995,7 +1948,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2018,8 +1970,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2045,7 +1996,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2066,6 +2016,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2082,8 +2033,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2117,7 +2067,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2138,6 +2087,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2160,12 +2110,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2191,7 +2139,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2212,6 +2159,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2234,12 +2182,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2265,7 +2211,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2286,6 +2231,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2302,8 +2248,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2337,7 +2282,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2358,6 +2302,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2380,12 +2325,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2411,7 +2354,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2432,6 +2374,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2454,12 +2397,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2485,7 +2426,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2506,6 +2446,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2522,8 +2463,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2557,7 +2497,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2578,6 +2517,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2600,7 +2540,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2623,8 +2562,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2666,7 +2604,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2687,6 +2624,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2709,7 +2647,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2732,8 +2669,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2775,7 +2711,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2796,6 +2731,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2812,8 +2748,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2863,7 +2798,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2884,6 +2818,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2906,7 +2841,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2929,8 +2863,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2956,7 +2889,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2977,6 +2909,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2999,7 +2932,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3022,8 +2954,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3049,7 +2980,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3070,6 +3000,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3086,8 +3017,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3121,7 +3051,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3142,6 +3071,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3164,7 +3094,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3187,8 +3116,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3214,7 +3142,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3235,6 +3162,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3257,12 +3185,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3288,7 +3214,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3309,6 +3234,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3325,8 +3251,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3360,7 +3285,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3381,6 +3305,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3403,7 +3328,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3426,8 +3350,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3453,7 +3376,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3474,6 +3396,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3496,12 +3419,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3527,7 +3448,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3548,6 +3468,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3564,8 +3485,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3599,7 +3519,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3620,6 +3539,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3642,7 +3562,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3665,8 +3584,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3692,7 +3610,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3713,6 +3630,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3735,7 +3653,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3758,8 +3675,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3785,7 +3701,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3806,6 +3721,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3822,8 +3738,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3857,7 +3772,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3878,6 +3792,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3900,13 +3815,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3932,7 +3845,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3953,6 +3865,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3975,7 +3888,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3998,8 +3910,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4025,7 +3936,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4046,6 +3956,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4062,8 +3973,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4097,7 +4007,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4118,6 +4027,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4140,7 +4050,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4163,8 +4072,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4190,7 +4098,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4211,6 +4118,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4233,12 +4141,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4264,7 +4170,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4285,6 +4190,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4301,8 +4207,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4336,7 +4241,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4357,6 +4261,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4379,7 +4284,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4402,8 +4306,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4429,7 +4332,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4450,6 +4352,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4472,12 +4375,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4503,7 +4404,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4524,6 +4424,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4540,8 +4441,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2/input.ts.json index beffaa7b24fc..4977d12523f8 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,13 +83,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -109,6 +106,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -131,13 +129,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } } ], @@ -196,7 +192,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -217,7 +212,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -238,7 +232,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -264,7 +257,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -284,6 +276,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -306,13 +299,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -331,6 +322,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -353,13 +345,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } } ], @@ -418,7 +408,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -439,7 +428,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -465,7 +453,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -492,7 +479,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -513,7 +499,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -546,6 +531,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -568,13 +554,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -584,6 +568,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -606,13 +591,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnnotation": { @@ -637,7 +620,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -663,7 +645,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -683,7 +664,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -712,7 +692,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -742,6 +721,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -764,13 +744,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -780,6 +758,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -802,13 +781,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnnotation": { @@ -833,7 +810,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -859,7 +835,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -879,7 +854,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -911,7 +885,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -932,7 +905,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -969,6 +941,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1000,6 +973,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1022,13 +996,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1038,6 +1010,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1060,13 +1033,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnnotation": { @@ -1091,7 +1062,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1117,7 +1087,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1137,7 +1106,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1169,7 +1137,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1190,7 +1157,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1201,8 +1167,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1234,8 +1199,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1255,7 +1220,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1275,6 +1239,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1297,13 +1262,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1322,6 +1285,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1344,13 +1308,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } } ], @@ -1390,7 +1352,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1404,7 +1365,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1418,7 +1378,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1446,7 +1405,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1466,7 +1424,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1502,7 +1459,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1523,7 +1479,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1549,7 +1504,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1570,6 +1524,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1592,7 +1547,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1624,8 +1578,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1651,7 +1604,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1672,6 +1624,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1694,7 +1647,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1726,8 +1678,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1753,7 +1704,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1774,6 +1724,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1790,8 +1741,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1825,7 +1775,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1846,6 +1795,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1868,7 +1818,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1900,8 +1849,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1927,7 +1875,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1948,6 +1895,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1970,7 +1918,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2002,8 +1949,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2029,7 +1975,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2050,6 +1995,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2066,8 +2012,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2101,7 +2046,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2122,6 +2066,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2144,7 +2089,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2176,8 +2120,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2203,7 +2146,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2224,6 +2166,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2246,7 +2189,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2278,8 +2220,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2305,7 +2246,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2326,6 +2266,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2342,8 +2283,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2377,7 +2317,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2398,6 +2337,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2420,12 +2360,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2451,7 +2389,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2472,6 +2409,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2494,12 +2432,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2525,7 +2461,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2546,6 +2481,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2562,8 +2498,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2597,7 +2532,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2618,6 +2552,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2640,12 +2575,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2671,7 +2604,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2692,6 +2624,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2714,12 +2647,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2745,7 +2676,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2766,6 +2696,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2782,8 +2713,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2817,7 +2747,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2838,6 +2767,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2860,7 +2790,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2892,8 +2821,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2919,7 +2847,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2940,6 +2867,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2962,7 +2890,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2994,8 +2921,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3021,7 +2947,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3042,6 +2967,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3058,8 +2984,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3093,7 +3018,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3114,6 +3038,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3136,7 +3061,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3168,8 +3092,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3195,7 +3118,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3216,6 +3138,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3238,7 +3161,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3270,8 +3192,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3297,7 +3218,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3318,6 +3238,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3334,8 +3255,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3369,7 +3289,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3390,6 +3309,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3412,7 +3332,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3444,8 +3363,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3471,7 +3389,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3492,6 +3409,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3514,12 +3432,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3545,7 +3461,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3566,6 +3481,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3582,8 +3498,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3617,7 +3532,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3638,6 +3552,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3660,7 +3575,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3692,8 +3606,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3719,7 +3632,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3740,6 +3652,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3762,12 +3675,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3793,7 +3704,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3814,6 +3724,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3830,8 +3741,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3865,7 +3775,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3886,6 +3795,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3908,7 +3818,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3940,8 +3849,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3967,7 +3875,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3988,6 +3895,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4010,7 +3918,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4042,8 +3949,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4069,7 +3975,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4090,6 +3995,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4106,8 +4012,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4141,7 +4046,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4162,6 +4066,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4184,13 +4089,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4216,7 +4119,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4237,6 +4139,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4259,7 +4162,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4291,8 +4193,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4318,7 +4219,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4339,6 +4239,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4355,8 +4256,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4390,7 +4290,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4411,6 +4310,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4433,7 +4333,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4465,8 +4364,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4492,7 +4390,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4513,6 +4410,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4535,12 +4433,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4566,7 +4462,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4587,6 +4482,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4603,8 +4499,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4638,7 +4533,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4659,6 +4553,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4681,7 +4576,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4713,8 +4607,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4740,7 +4633,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4761,6 +4653,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4783,12 +4676,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4814,7 +4705,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4835,6 +4725,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4851,8 +4742,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3/input.ts.json index 6fe75215fc9c..3ffe640bbda9 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -62,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -84,13 +83,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -109,6 +106,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -131,13 +129,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -196,7 +192,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -217,7 +212,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -238,7 +232,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -264,7 +257,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -284,6 +276,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -306,13 +299,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -331,6 +322,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -353,13 +345,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } } ], @@ -418,7 +408,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -439,7 +428,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -465,7 +453,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -492,7 +479,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -513,7 +499,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -546,6 +531,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -568,13 +554,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -584,6 +568,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -606,13 +591,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnnotation": { @@ -637,7 +620,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -663,7 +645,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -683,7 +664,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -712,7 +692,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -742,6 +721,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -764,13 +744,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -780,6 +758,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -802,13 +781,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -833,7 +810,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -859,7 +835,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -879,7 +854,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -911,7 +885,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -932,7 +905,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -969,6 +941,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1000,6 +973,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1022,13 +996,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1038,6 +1010,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1060,13 +1033,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnnotation": { @@ -1091,7 +1062,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1117,7 +1087,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1137,7 +1106,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1169,7 +1137,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1190,7 +1157,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1201,8 +1167,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1234,8 +1199,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -1255,7 +1220,6 @@ "ctxt": 0 }, "value": "new", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1275,6 +1239,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1297,13 +1262,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1322,6 +1285,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1344,13 +1308,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1390,7 +1352,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1404,7 +1365,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1418,7 +1378,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1446,7 +1405,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1466,7 +1424,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1502,7 +1459,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1523,7 +1479,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1549,7 +1504,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1570,6 +1524,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1592,7 +1547,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1624,8 +1578,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1651,7 +1604,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1672,6 +1624,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1694,7 +1647,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1726,8 +1678,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1753,7 +1704,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1774,6 +1724,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1790,8 +1741,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1825,7 +1775,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1846,6 +1795,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1868,7 +1818,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1900,8 +1849,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1927,7 +1875,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1948,6 +1895,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1970,7 +1918,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2002,8 +1949,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2029,7 +1975,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2050,6 +1995,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2066,8 +2012,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2101,7 +2046,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2122,6 +2066,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2144,7 +2089,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2176,8 +2120,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2203,7 +2146,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2224,6 +2166,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2246,7 +2189,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2278,8 +2220,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2305,7 +2246,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2326,6 +2266,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2342,8 +2283,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2377,7 +2317,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2398,6 +2337,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2420,12 +2360,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2451,7 +2389,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2472,6 +2409,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2494,12 +2432,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2525,7 +2461,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2546,6 +2481,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2562,8 +2498,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2597,7 +2532,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2618,6 +2552,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2640,12 +2575,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2671,7 +2604,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2692,6 +2624,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2714,12 +2647,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2745,7 +2676,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2766,6 +2696,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2782,8 +2713,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2817,7 +2747,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2838,6 +2767,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2860,7 +2790,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2892,8 +2821,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2919,7 +2847,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2940,6 +2867,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2962,7 +2890,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2994,8 +2921,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3021,7 +2947,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3042,6 +2967,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3058,8 +2984,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3093,7 +3018,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3114,6 +3038,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3136,7 +3061,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3168,8 +3092,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3195,7 +3118,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3216,6 +3138,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3238,7 +3161,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3270,8 +3192,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3297,7 +3218,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3318,6 +3238,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3334,8 +3255,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3369,7 +3289,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3390,6 +3309,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3412,7 +3332,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3444,8 +3363,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3471,7 +3389,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3492,6 +3409,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3514,12 +3432,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3545,7 +3461,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3566,6 +3481,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3582,8 +3498,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3617,7 +3532,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3638,6 +3552,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3660,7 +3575,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3692,8 +3606,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3719,7 +3632,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3740,6 +3652,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3762,12 +3675,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3793,7 +3704,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3814,6 +3724,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3830,8 +3741,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3865,7 +3775,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3886,6 +3795,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3908,7 +3818,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3940,8 +3849,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3967,7 +3875,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3988,6 +3895,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4010,7 +3918,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4042,8 +3949,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4069,7 +3975,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4090,6 +3995,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4106,8 +4012,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4141,7 +4046,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4162,6 +4066,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4184,13 +4089,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4216,7 +4119,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4237,6 +4139,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4259,7 +4162,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4291,8 +4193,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4318,7 +4219,6 @@ "ctxt": 0 }, "value": "foo12b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4339,6 +4239,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4355,8 +4256,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4390,7 +4290,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4411,6 +4310,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4433,7 +4333,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4465,8 +4364,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4492,7 +4390,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4513,6 +4410,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4535,12 +4433,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4566,7 +4462,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4587,6 +4482,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4603,8 +4499,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4638,7 +4533,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4659,6 +4553,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4681,7 +4576,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4713,8 +4607,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4740,7 +4633,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4761,6 +4653,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4783,12 +4676,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4814,7 +4705,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4835,6 +4725,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4851,8 +4742,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithNumericIndexers1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithNumericIndexers1/input.ts.json index 01f063e68780..94448f4420d7 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithNumericIndexers1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithNumericIndexers1/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -38,6 +37,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,8 +54,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -99,7 +98,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -121,6 +119,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -137,8 +136,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -182,7 +180,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -204,6 +201,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -220,8 +218,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -246,7 +243,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -285,7 +281,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -311,7 +306,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -336,6 +330,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -352,8 +347,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -393,7 +387,6 @@ "ctxt": 0 }, "value": "PA", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -412,7 +405,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -430,7 +422,6 @@ "ctxt": 0 }, "value": "PB", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -449,7 +440,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -482,6 +472,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -508,6 +499,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -524,8 +516,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -554,8 +545,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -587,6 +577,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -613,6 +604,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -629,8 +621,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -659,8 +650,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -712,7 +702,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -733,6 +722,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -755,13 +745,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -787,7 +775,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -808,6 +795,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -830,13 +818,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -862,7 +848,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -883,6 +868,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -899,8 +885,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -934,7 +919,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -955,6 +939,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -977,13 +962,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1009,7 +992,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1030,6 +1012,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1052,13 +1035,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1084,7 +1065,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1105,6 +1085,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1121,8 +1102,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1156,7 +1136,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1177,6 +1156,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1199,7 +1179,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1222,8 +1201,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1249,7 +1227,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1270,6 +1247,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1292,7 +1270,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1315,8 +1292,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1342,7 +1318,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1363,6 +1338,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1379,8 +1355,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1414,7 +1389,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1435,6 +1409,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1457,13 +1432,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1489,7 +1462,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1510,6 +1482,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1532,13 +1505,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1564,7 +1535,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1585,6 +1555,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1601,8 +1572,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1636,7 +1606,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1657,6 +1626,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1679,12 +1649,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1710,7 +1678,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1731,6 +1698,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1753,12 +1721,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1784,7 +1750,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1805,6 +1770,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1821,8 +1787,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1856,7 +1821,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1877,6 +1841,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1899,12 +1864,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1930,7 +1893,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1951,6 +1913,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1973,12 +1936,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2004,7 +1965,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2025,6 +1985,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2041,8 +2002,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2076,7 +2036,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2097,6 +2056,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2119,13 +2079,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2151,7 +2109,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2172,6 +2129,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2194,13 +2152,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2226,7 +2182,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2247,6 +2202,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2263,8 +2219,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2298,7 +2253,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2319,6 +2273,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2341,13 +2296,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2373,7 +2326,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2394,6 +2346,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2416,7 +2369,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2439,8 +2391,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2466,7 +2417,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2487,6 +2437,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2503,8 +2454,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2538,7 +2488,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2559,6 +2508,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2581,13 +2531,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2613,7 +2561,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2634,6 +2581,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2656,13 +2604,11 @@ "ctxt": 0 }, "value": "PA", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2688,7 +2634,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2709,6 +2654,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2725,8 +2671,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2760,7 +2705,6 @@ "ctxt": 0 }, "value": "foo5d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2781,6 +2725,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2803,13 +2748,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2835,7 +2778,6 @@ "ctxt": 0 }, "value": "foo5d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2856,6 +2798,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2878,13 +2821,11 @@ "ctxt": 0 }, "value": "PB", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2910,7 +2851,6 @@ "ctxt": 0 }, "value": "foo5d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2931,6 +2871,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2947,8 +2888,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2982,7 +2922,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3003,6 +2942,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3025,13 +2965,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3057,7 +2995,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3078,6 +3015,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3100,13 +3038,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3132,7 +3068,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3153,6 +3088,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3169,8 +3105,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3204,7 +3139,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3225,6 +3159,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3247,13 +3182,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3279,7 +3212,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3300,6 +3232,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3322,12 +3255,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3353,7 +3284,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3374,6 +3304,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3390,8 +3321,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3425,7 +3355,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3446,6 +3375,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3468,13 +3398,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3500,7 +3428,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3521,6 +3448,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3543,13 +3471,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3575,7 +3501,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3596,6 +3521,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3612,8 +3538,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3647,7 +3572,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3668,6 +3592,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3690,13 +3615,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3722,7 +3645,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3743,6 +3665,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3765,7 +3688,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3788,8 +3710,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3815,7 +3736,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3836,6 +3756,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3852,8 +3773,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3887,7 +3807,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3908,6 +3827,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3930,13 +3850,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3962,7 +3880,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3983,6 +3900,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4005,12 +3923,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4036,7 +3952,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4057,6 +3972,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4073,8 +3989,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4108,7 +4023,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4129,6 +4043,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4151,13 +4066,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4183,7 +4096,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4204,6 +4116,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4226,12 +4139,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4257,7 +4168,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4278,6 +4188,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4294,8 +4205,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4329,7 +4239,6 @@ "ctxt": 0 }, "value": "foo11b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4350,6 +4259,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4372,13 +4282,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4404,7 +4312,6 @@ "ctxt": 0 }, "value": "foo11b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4425,6 +4332,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4447,13 +4355,11 @@ "ctxt": 0 }, "value": "PA", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4479,7 +4385,6 @@ "ctxt": 0 }, "value": "foo11b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4500,6 +4405,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4516,8 +4422,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4551,7 +4456,6 @@ "ctxt": 0 }, "value": "foo11c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4572,6 +4476,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4594,13 +4499,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4626,7 +4529,6 @@ "ctxt": 0 }, "value": "foo11c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4647,6 +4549,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4669,13 +4572,11 @@ "ctxt": 0 }, "value": "PB", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4701,7 +4602,6 @@ "ctxt": 0 }, "value": "foo11c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4722,6 +4622,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4738,8 +4639,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4773,7 +4673,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4794,6 +4693,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4816,13 +4716,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4848,7 +4746,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4869,6 +4766,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4891,7 +4789,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4914,8 +4811,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4941,7 +4837,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4962,6 +4857,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4978,8 +4874,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5013,7 +4908,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5034,6 +4928,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5056,13 +4951,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5088,7 +4981,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5109,6 +5001,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5131,12 +5024,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5162,7 +5053,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5183,6 +5073,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5199,8 +5090,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5234,7 +5124,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5255,6 +5144,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5277,13 +5167,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5309,7 +5197,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5330,6 +5217,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5352,12 +5240,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5383,7 +5269,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5404,6 +5289,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5420,8 +5306,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5455,7 +5340,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5476,6 +5360,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5498,13 +5383,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5530,7 +5413,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5551,6 +5433,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5573,13 +5456,11 @@ "ctxt": 0 }, "value": "PA", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5605,7 +5486,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5626,6 +5506,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5642,8 +5523,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5677,7 +5557,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5698,6 +5577,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5720,13 +5600,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5752,7 +5630,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5773,6 +5650,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5795,13 +5673,11 @@ "ctxt": 0 }, "value": "PB", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5827,7 +5703,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5848,6 +5723,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5864,8 +5740,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithNumericIndexers2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithNumericIndexers2/input.ts.json index 0b409bb8585f..e5eedc80e19c 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithNumericIndexers2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithNumericIndexers2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -196,6 +190,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -212,8 +207,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -238,7 +232,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -268,7 +261,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -290,6 +282,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -306,8 +299,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -332,7 +324,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -362,7 +353,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -384,6 +374,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -400,8 +391,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -426,7 +416,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -465,7 +454,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -491,7 +479,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -516,6 +503,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -532,8 +520,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -558,7 +545,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -584,7 +570,6 @@ "ctxt": 0 }, "value": "PA", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -603,7 +588,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -621,7 +605,6 @@ "ctxt": 0 }, "value": "PB", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -640,7 +623,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -673,6 +655,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -699,6 +682,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -715,8 +699,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -741,7 +724,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -756,8 +738,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -789,6 +770,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -815,6 +797,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -831,8 +814,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -857,7 +839,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -872,8 +853,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -924,7 +904,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -947,7 +926,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -968,6 +946,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -990,13 +969,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1022,7 +999,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1043,6 +1019,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1065,13 +1042,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1097,7 +1072,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1118,6 +1092,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1134,8 +1109,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1169,7 +1143,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1190,6 +1163,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1212,13 +1186,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1244,7 +1216,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1265,6 +1236,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1287,13 +1259,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1319,7 +1289,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1340,6 +1309,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1356,8 +1326,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1391,7 +1360,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1412,6 +1380,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1434,7 +1403,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1457,8 +1425,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1484,7 +1451,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1505,6 +1471,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1527,7 +1494,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1550,8 +1516,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1577,7 +1542,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1598,6 +1562,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1614,8 +1579,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1649,7 +1613,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1670,6 +1633,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1692,13 +1656,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1724,7 +1686,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1745,6 +1706,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1767,13 +1729,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1799,7 +1759,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1820,6 +1779,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1836,8 +1796,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1871,7 +1830,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1892,6 +1850,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1914,12 +1873,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1945,7 +1902,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1966,6 +1922,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1988,12 +1945,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2019,7 +1974,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2040,6 +1994,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2056,8 +2011,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2091,7 +2045,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2112,6 +2065,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2134,12 +2088,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2165,7 +2117,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2186,6 +2137,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2208,12 +2160,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2239,7 +2189,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2260,6 +2209,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2276,8 +2226,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2311,7 +2260,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2332,6 +2280,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2354,13 +2303,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2386,7 +2333,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2407,6 +2353,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2429,13 +2376,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2461,7 +2406,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2482,6 +2426,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2498,8 +2443,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2533,7 +2477,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2554,6 +2497,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2576,13 +2520,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2608,7 +2550,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2629,6 +2570,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2651,7 +2593,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2677,7 +2618,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2685,8 +2625,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2712,7 +2651,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2733,6 +2671,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2749,8 +2688,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2784,7 +2722,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2805,6 +2742,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2827,13 +2765,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2859,7 +2795,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2880,6 +2815,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2902,13 +2838,11 @@ "ctxt": 0 }, "value": "PA", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2934,7 +2868,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2955,6 +2888,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2971,8 +2905,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3006,7 +2939,6 @@ "ctxt": 0 }, "value": "foo5d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3027,6 +2959,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3049,13 +2982,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3081,7 +3012,6 @@ "ctxt": 0 }, "value": "foo5d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3102,6 +3032,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3124,13 +3055,11 @@ "ctxt": 0 }, "value": "PB", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3156,7 +3085,6 @@ "ctxt": 0 }, "value": "foo5d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3177,6 +3105,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3193,8 +3122,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3228,7 +3156,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3249,6 +3176,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3271,13 +3199,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3303,7 +3229,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3324,6 +3249,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3346,13 +3272,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3378,7 +3302,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3399,6 +3322,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3415,8 +3339,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3450,7 +3373,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3471,6 +3393,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3493,13 +3416,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3525,7 +3446,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3546,6 +3466,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3568,12 +3489,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3599,7 +3518,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3620,6 +3538,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3636,8 +3555,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3671,7 +3589,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3692,6 +3609,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3714,13 +3632,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3746,7 +3662,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3767,6 +3682,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3789,13 +3705,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3821,7 +3735,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3842,6 +3755,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3858,8 +3772,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3893,7 +3806,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3914,6 +3826,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3936,13 +3849,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3968,7 +3879,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3989,6 +3899,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4011,7 +3922,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4037,7 +3947,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4045,8 +3954,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4072,7 +3980,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4093,6 +4000,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4109,8 +4017,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4144,7 +4051,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4165,6 +4071,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4187,13 +4094,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4219,7 +4124,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4240,6 +4144,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4262,12 +4167,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4293,7 +4196,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4314,6 +4216,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4330,8 +4233,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4365,7 +4267,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4386,6 +4287,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4408,13 +4310,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4440,7 +4340,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4461,6 +4360,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4483,12 +4383,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4514,7 +4412,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4535,6 +4432,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4551,8 +4449,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4586,7 +4483,6 @@ "ctxt": 0 }, "value": "foo11b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4607,6 +4503,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4629,13 +4526,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4661,7 +4556,6 @@ "ctxt": 0 }, "value": "foo11b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4682,6 +4576,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4704,13 +4599,11 @@ "ctxt": 0 }, "value": "PA", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4736,7 +4629,6 @@ "ctxt": 0 }, "value": "foo11b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4757,6 +4649,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4773,8 +4666,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4808,7 +4700,6 @@ "ctxt": 0 }, "value": "foo11c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4829,6 +4720,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4851,13 +4743,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4883,7 +4773,6 @@ "ctxt": 0 }, "value": "foo11c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4904,6 +4793,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4926,13 +4816,11 @@ "ctxt": 0 }, "value": "PB", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4958,7 +4846,6 @@ "ctxt": 0 }, "value": "foo11c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4979,6 +4866,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4995,8 +4883,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5030,7 +4917,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5051,6 +4937,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5073,13 +4960,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5105,7 +4990,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5126,6 +5010,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5148,7 +5033,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5174,7 +5058,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5182,8 +5065,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5209,7 +5091,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5230,6 +5111,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5246,8 +5128,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5281,7 +5162,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5302,6 +5182,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5324,13 +5205,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5356,7 +5235,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5377,6 +5255,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5399,12 +5278,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5430,7 +5307,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5451,6 +5327,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5467,8 +5344,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5502,7 +5378,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5523,6 +5398,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5545,13 +5421,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5577,7 +5451,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5598,6 +5471,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5620,12 +5494,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5651,7 +5523,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5672,6 +5543,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5688,8 +5560,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5723,7 +5594,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5744,6 +5614,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5766,13 +5637,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5798,7 +5667,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5819,6 +5687,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5841,13 +5710,11 @@ "ctxt": 0 }, "value": "PA", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5873,7 +5740,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5894,6 +5760,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5910,8 +5777,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5945,7 +5811,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5966,6 +5831,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5988,13 +5854,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6020,7 +5884,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6041,6 +5904,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6063,13 +5927,11 @@ "ctxt": 0 }, "value": "PB", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6095,7 +5957,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6116,6 +5977,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6132,8 +5994,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithNumericIndexers3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithNumericIndexers3/input.ts.json index 6736f8f07d19..5c606e80b816 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithNumericIndexers3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithNumericIndexers3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -38,6 +37,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,8 +54,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -99,7 +98,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -121,6 +119,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -137,8 +136,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -182,7 +180,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -204,6 +201,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -220,8 +218,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -246,7 +243,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -285,7 +281,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -311,7 +306,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -336,6 +330,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -352,8 +347,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -393,7 +387,6 @@ "ctxt": 0 }, "value": "PA", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -412,7 +405,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -430,7 +422,6 @@ "ctxt": 0 }, "value": "PB", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -449,7 +440,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -482,6 +472,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -508,6 +499,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -524,8 +516,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -554,8 +545,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -587,6 +577,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -613,6 +604,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -629,8 +621,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -659,8 +650,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -712,7 +702,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -733,6 +722,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -755,13 +745,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -787,7 +775,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -808,6 +795,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -830,13 +818,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -862,7 +848,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -883,6 +868,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -899,8 +885,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -934,7 +919,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -955,6 +939,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -977,13 +962,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1009,7 +992,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1030,6 +1012,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1052,13 +1035,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1084,7 +1065,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1105,6 +1085,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1121,8 +1102,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1156,7 +1136,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1177,6 +1156,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1199,7 +1179,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1222,8 +1201,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1249,7 +1227,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1270,6 +1247,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1292,7 +1270,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1315,8 +1292,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1342,7 +1318,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1363,6 +1338,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1379,8 +1355,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1414,7 +1389,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1435,6 +1409,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1457,13 +1432,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1489,7 +1462,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1510,6 +1482,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1532,13 +1505,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1564,7 +1535,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1585,6 +1555,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1601,8 +1572,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1636,7 +1606,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1657,6 +1626,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1679,12 +1649,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1710,7 +1678,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1731,6 +1698,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1753,12 +1721,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1784,7 +1750,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1805,6 +1770,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1821,8 +1787,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1856,7 +1821,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1877,6 +1841,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1899,12 +1864,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1930,7 +1893,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1951,6 +1913,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1973,12 +1936,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2004,7 +1965,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2025,6 +1985,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2041,8 +2002,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2076,7 +2036,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2097,6 +2056,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2119,13 +2079,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2151,7 +2109,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2172,6 +2129,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2194,13 +2152,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2226,7 +2182,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2247,6 +2202,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2263,8 +2219,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2298,7 +2253,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2319,6 +2273,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2341,13 +2296,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2373,7 +2326,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2394,6 +2346,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2416,7 +2369,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2439,8 +2391,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2466,7 +2417,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2487,6 +2437,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2503,8 +2454,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2538,7 +2488,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2559,6 +2508,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2581,13 +2531,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2613,7 +2561,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2634,6 +2581,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2656,13 +2604,11 @@ "ctxt": 0 }, "value": "PA", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2688,7 +2634,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2709,6 +2654,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2725,8 +2671,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2760,7 +2705,6 @@ "ctxt": 0 }, "value": "foo5d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2781,6 +2725,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2803,13 +2748,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2835,7 +2778,6 @@ "ctxt": 0 }, "value": "foo5d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2856,6 +2798,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2878,13 +2821,11 @@ "ctxt": 0 }, "value": "PB", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2910,7 +2851,6 @@ "ctxt": 0 }, "value": "foo5d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2931,6 +2871,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2947,8 +2888,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2982,7 +2922,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3003,6 +2942,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3025,13 +2965,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3057,7 +2995,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3078,6 +3015,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3100,13 +3038,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3132,7 +3068,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3153,6 +3088,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3169,8 +3105,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3204,7 +3139,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3225,6 +3159,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3247,13 +3182,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3279,7 +3212,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3300,6 +3232,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3322,12 +3255,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3353,7 +3284,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3374,6 +3304,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3390,8 +3321,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3425,7 +3355,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3446,6 +3375,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3468,13 +3398,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3500,7 +3428,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3521,6 +3448,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3543,13 +3471,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3575,7 +3501,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3596,6 +3521,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3612,8 +3538,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3647,7 +3572,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3668,6 +3592,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3690,13 +3615,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3722,7 +3645,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3743,6 +3665,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3765,7 +3688,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3788,8 +3710,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3815,7 +3736,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3836,6 +3756,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3852,8 +3773,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3887,7 +3807,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3908,6 +3827,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3930,13 +3850,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3962,7 +3880,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3983,6 +3900,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4005,12 +3923,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4036,7 +3952,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4057,6 +3972,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4073,8 +3989,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4108,7 +4023,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4129,6 +4043,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4151,13 +4066,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4183,7 +4096,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4204,6 +4116,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4226,12 +4139,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4257,7 +4168,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4278,6 +4188,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4294,8 +4205,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4329,7 +4239,6 @@ "ctxt": 0 }, "value": "foo11b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4350,6 +4259,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4372,13 +4282,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4404,7 +4312,6 @@ "ctxt": 0 }, "value": "foo11b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4425,6 +4332,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4447,13 +4355,11 @@ "ctxt": 0 }, "value": "PA", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4479,7 +4385,6 @@ "ctxt": 0 }, "value": "foo11b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4500,6 +4405,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4516,8 +4422,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4551,7 +4456,6 @@ "ctxt": 0 }, "value": "foo11c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4572,6 +4476,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4594,13 +4499,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4626,7 +4529,6 @@ "ctxt": 0 }, "value": "foo11c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4647,6 +4549,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4669,13 +4572,11 @@ "ctxt": 0 }, "value": "PB", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4701,7 +4602,6 @@ "ctxt": 0 }, "value": "foo11c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4722,6 +4622,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4738,8 +4639,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4773,7 +4673,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4794,6 +4693,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4816,13 +4716,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4848,7 +4746,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4869,6 +4766,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4891,7 +4789,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4914,8 +4811,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4941,7 +4837,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4962,6 +4857,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4978,8 +4874,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5013,7 +4908,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5034,6 +4928,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5056,13 +4951,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5088,7 +4981,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5109,6 +5001,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5131,12 +5024,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5162,7 +5053,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5183,6 +5073,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5199,8 +5090,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5234,7 +5124,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5255,6 +5144,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5277,13 +5167,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5309,7 +5197,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5330,6 +5217,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5352,12 +5240,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5383,7 +5269,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5404,6 +5289,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5420,8 +5306,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5455,7 +5340,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5476,6 +5360,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5498,13 +5383,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5530,7 +5413,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5551,6 +5433,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5573,13 +5456,11 @@ "ctxt": 0 }, "value": "PA", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5605,7 +5486,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5626,6 +5506,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5642,8 +5523,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5677,7 +5557,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5698,6 +5577,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5720,13 +5600,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5752,7 +5630,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5773,6 +5650,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5795,13 +5673,11 @@ "ctxt": 0 }, "value": "PB", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5827,7 +5703,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5848,6 +5723,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5864,8 +5740,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithOptionality/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithOptionality/input.ts.json index a53126095f70..4962611d5928 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithOptionality/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithOptionality/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -216,7 +210,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -258,7 +251,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -284,7 +276,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -314,7 +305,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -368,6 +358,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -399,7 +390,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -427,8 +417,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -460,8 +449,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -481,7 +470,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -515,7 +503,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -536,6 +523,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -558,13 +546,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -590,7 +576,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -611,6 +596,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -633,13 +619,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -665,7 +649,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -686,6 +669,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -702,8 +686,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -737,7 +720,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -758,6 +740,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -780,12 +763,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -811,7 +792,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -832,6 +812,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -854,12 +835,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -885,7 +864,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -906,6 +884,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -922,8 +901,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -957,7 +935,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -978,6 +955,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1000,13 +978,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1032,7 +1008,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1053,6 +1028,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1075,13 +1051,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1107,7 +1081,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1128,6 +1101,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1144,8 +1118,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1179,7 +1152,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1200,6 +1172,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1222,13 +1195,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1254,7 +1225,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1275,6 +1245,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1297,12 +1268,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1328,7 +1297,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1349,6 +1317,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1365,8 +1334,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1400,7 +1368,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1421,6 +1388,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1443,13 +1411,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1475,7 +1441,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1496,6 +1461,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1518,13 +1484,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1550,7 +1514,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1571,6 +1534,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1587,8 +1551,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1622,7 +1585,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1643,6 +1605,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1665,13 +1628,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1697,7 +1658,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1718,6 +1678,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1740,12 +1701,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1771,7 +1730,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1792,6 +1750,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1808,8 +1767,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1843,7 +1801,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1864,6 +1821,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1886,13 +1844,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1918,7 +1874,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1939,6 +1894,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1961,7 +1917,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1984,8 +1939,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2011,7 +1965,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2032,6 +1985,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2048,8 +2002,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2083,7 +2036,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2104,6 +2056,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2126,13 +2079,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2158,7 +2109,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2179,6 +2129,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2201,12 +2152,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2232,7 +2181,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2253,6 +2201,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2269,8 +2218,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2304,7 +2252,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2325,6 +2272,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2347,13 +2295,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2379,7 +2325,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2400,6 +2345,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2422,12 +2368,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2453,7 +2397,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2474,6 +2417,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2490,8 +2434,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates/input.ts.json index 7df9b1342e17..547ebb9b782d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -216,7 +210,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -258,7 +251,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -284,7 +276,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -314,7 +305,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -353,7 +343,6 @@ "ctxt": 0 }, "value": "PA", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -372,7 +361,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -390,7 +378,6 @@ "ctxt": 0 }, "value": "PB", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -409,7 +396,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -442,6 +428,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -473,7 +460,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -501,8 +487,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -534,8 +519,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -555,7 +540,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -589,7 +573,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -610,6 +593,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -632,13 +616,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -664,7 +646,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -685,6 +666,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -707,13 +689,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -739,7 +719,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -760,6 +739,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -776,8 +756,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -811,7 +790,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -832,6 +810,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -854,13 +833,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -886,7 +863,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -907,6 +883,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -929,13 +906,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -961,7 +936,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -982,6 +956,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -998,8 +973,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1033,7 +1007,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1054,6 +1027,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1076,7 +1050,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1099,8 +1072,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1126,7 +1098,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1147,6 +1118,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1169,7 +1141,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1192,8 +1163,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1219,7 +1189,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1240,6 +1209,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1256,8 +1226,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1291,7 +1260,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1312,6 +1280,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1334,13 +1303,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1366,7 +1333,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1387,6 +1353,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1409,13 +1376,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1441,7 +1406,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1462,6 +1426,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1478,8 +1443,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1513,7 +1477,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1534,6 +1497,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1556,12 +1520,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1587,7 +1549,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1608,6 +1569,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1630,12 +1592,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1661,7 +1621,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1682,6 +1641,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1698,8 +1658,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1733,7 +1692,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1754,6 +1712,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1776,12 +1735,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1807,7 +1764,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1828,6 +1784,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1850,12 +1807,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1881,7 +1836,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1902,6 +1856,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1918,8 +1873,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1953,7 +1907,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1974,6 +1927,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1996,13 +1950,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2028,7 +1980,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2049,6 +2000,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2071,13 +2023,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2103,7 +2053,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2124,6 +2073,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2140,8 +2090,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2175,7 +2124,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2196,6 +2144,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2218,13 +2167,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2250,7 +2197,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2271,6 +2217,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2293,7 +2240,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2316,8 +2262,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2343,7 +2288,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2364,6 +2308,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2380,8 +2325,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2415,7 +2359,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2436,6 +2379,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2458,13 +2402,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2490,7 +2432,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2511,6 +2452,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2533,13 +2475,11 @@ "ctxt": 0 }, "value": "PA", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2565,7 +2505,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2586,6 +2525,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2602,8 +2542,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2637,7 +2576,6 @@ "ctxt": 0 }, "value": "foo5d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2658,6 +2596,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2680,13 +2619,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2712,7 +2649,6 @@ "ctxt": 0 }, "value": "foo5d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2733,6 +2669,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2755,13 +2692,11 @@ "ctxt": 0 }, "value": "PB", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2787,7 +2722,6 @@ "ctxt": 0 }, "value": "foo5d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2808,6 +2742,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2824,8 +2759,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2859,7 +2793,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2880,6 +2813,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2902,13 +2836,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2934,7 +2866,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2955,6 +2886,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2977,13 +2909,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3009,7 +2939,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3030,6 +2959,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3046,8 +2976,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3081,7 +3010,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3102,6 +3030,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3124,13 +3053,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3156,7 +3083,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3177,6 +3103,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3199,12 +3126,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3230,7 +3155,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3251,6 +3175,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3267,8 +3192,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3302,7 +3226,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3323,6 +3246,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3345,13 +3269,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3377,7 +3299,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3398,6 +3319,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3420,13 +3342,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3452,7 +3372,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3473,6 +3392,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3489,8 +3409,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3524,7 +3443,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3545,6 +3463,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3567,13 +3486,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3599,7 +3516,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3620,6 +3536,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3642,7 +3559,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3665,8 +3581,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3692,7 +3607,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3713,6 +3627,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3729,8 +3644,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3764,7 +3678,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3785,6 +3698,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3807,13 +3721,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3839,7 +3751,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3860,6 +3771,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3882,12 +3794,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3913,7 +3823,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3934,6 +3843,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3950,8 +3860,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3985,7 +3894,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4006,6 +3914,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4028,13 +3937,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4060,7 +3967,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4081,6 +3987,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4103,12 +4010,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4134,7 +4039,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4155,6 +4059,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4171,8 +4076,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4206,7 +4110,6 @@ "ctxt": 0 }, "value": "foo11b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4227,6 +4130,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4249,13 +4153,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4281,7 +4183,6 @@ "ctxt": 0 }, "value": "foo11b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4302,6 +4203,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4324,13 +4226,11 @@ "ctxt": 0 }, "value": "PA", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4356,7 +4256,6 @@ "ctxt": 0 }, "value": "foo11b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4377,6 +4276,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4393,8 +4293,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4428,7 +4327,6 @@ "ctxt": 0 }, "value": "foo11c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4449,6 +4347,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4471,13 +4370,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4503,7 +4400,6 @@ "ctxt": 0 }, "value": "foo11c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4524,6 +4420,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4546,13 +4443,11 @@ "ctxt": 0 }, "value": "PB", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4578,7 +4473,6 @@ "ctxt": 0 }, "value": "foo11c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4599,6 +4493,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4615,8 +4510,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4650,7 +4544,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4671,6 +4564,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4693,13 +4587,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4725,7 +4617,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4746,6 +4637,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4768,7 +4660,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4791,8 +4682,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4818,7 +4708,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4839,6 +4728,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4855,8 +4745,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4890,7 +4779,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4911,6 +4799,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4933,13 +4822,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4965,7 +4852,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4986,6 +4872,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5008,12 +4895,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5039,7 +4924,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5060,6 +4944,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5076,8 +4961,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5111,7 +4995,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5132,6 +5015,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5154,13 +5038,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5186,7 +5068,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5207,6 +5088,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5229,12 +5111,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5260,7 +5140,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5281,6 +5160,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5297,8 +5177,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5332,7 +5211,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5353,6 +5231,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5375,13 +5254,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5407,7 +5284,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5428,6 +5304,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5450,13 +5327,11 @@ "ctxt": 0 }, "value": "PA", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5482,7 +5357,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5503,6 +5377,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5519,8 +5394,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5554,7 +5428,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5575,6 +5448,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5597,13 +5471,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5629,7 +5501,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5650,6 +5521,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5672,13 +5544,11 @@ "ctxt": 0 }, "value": "PB", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5704,7 +5574,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5725,6 +5594,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5741,8 +5611,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates2/input.ts.json index d9bd7e1a1678..f0d7d70c7c6d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -110,7 +107,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -150,7 +145,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -177,7 +171,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -208,7 +201,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -227,7 +219,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -248,6 +239,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -270,7 +262,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -293,8 +284,7 @@ ] } } - }, - "optional": false + } } } ], @@ -320,7 +310,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -341,6 +330,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -363,7 +353,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -386,8 +375,7 @@ ] } } - }, - "optional": false + } } } ], @@ -413,7 +401,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -434,6 +421,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -450,8 +438,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -485,7 +472,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -506,6 +492,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -528,7 +515,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -551,8 +537,7 @@ ] } } - }, - "optional": false + } } } ], @@ -578,7 +563,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -599,6 +583,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -621,7 +606,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -644,8 +628,7 @@ ] } } - }, - "optional": false + } } } ], @@ -671,7 +654,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -692,6 +674,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -708,8 +691,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -743,7 +725,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -764,6 +745,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -786,7 +768,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -809,8 +790,7 @@ ] } } - }, - "optional": false + } } } ], @@ -836,7 +816,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -857,6 +836,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -879,7 +859,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -902,8 +881,7 @@ ] } } - }, - "optional": false + } } } ], @@ -929,7 +907,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -950,6 +927,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -966,8 +944,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1001,7 +978,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1022,6 +998,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1044,7 +1021,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1067,8 +1043,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1110,7 +1085,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1131,6 +1105,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1153,7 +1128,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1176,8 +1150,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1219,7 +1192,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1240,6 +1212,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1256,8 +1229,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1322,8 +1294,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1340,7 +1312,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1361,7 +1332,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1418,8 +1388,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1436,7 +1406,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1457,7 +1426,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1499,7 +1467,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1520,6 +1487,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1542,7 +1510,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1565,8 +1532,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1608,7 +1574,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1629,6 +1594,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1651,7 +1617,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1674,8 +1639,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1717,7 +1681,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1738,6 +1701,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1754,8 +1718,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1805,7 +1768,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1826,6 +1788,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1848,7 +1811,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1871,8 +1833,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1914,7 +1875,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1935,6 +1895,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1957,7 +1918,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1980,8 +1940,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2023,7 +1982,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2044,6 +2002,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2060,8 +2019,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates3/input.ts.json index eaf879f04c0c..08309ea77081 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates3/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -52,7 +51,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -82,7 +80,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -105,7 +102,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -131,7 +127,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -172,7 +167,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -193,7 +187,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -219,7 +212,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -243,7 +235,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -271,7 +262,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -305,6 +295,7 @@ "ctxt": 0 }, "value": "c1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -327,7 +318,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -353,7 +343,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -361,8 +350,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -391,7 +379,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -409,7 +396,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -426,7 +412,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -452,7 +437,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -478,7 +462,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -520,7 +503,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -541,7 +523,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -567,7 +548,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -591,7 +571,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -619,7 +598,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -653,6 +631,7 @@ "ctxt": 0 }, "value": "c3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -675,7 +654,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -701,7 +679,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -709,8 +686,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -739,7 +715,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -757,7 +732,6 @@ "ctxt": 0 }, "value": "C4", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPublics/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPublics/input.ts.json index 448db4377fcb..ea4291366dc0 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPublics/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPublics/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -216,7 +210,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -258,7 +251,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -284,7 +276,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -314,7 +305,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -368,6 +358,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -399,7 +390,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -427,8 +417,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -460,8 +449,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -481,7 +470,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -515,7 +503,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -536,6 +523,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -558,13 +546,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -590,7 +576,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -611,6 +596,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -633,13 +619,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -665,7 +649,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -686,6 +669,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -702,8 +686,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -737,7 +720,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -758,6 +740,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -780,13 +763,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -812,7 +793,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -833,6 +813,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -855,13 +836,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -887,7 +866,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -908,6 +886,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -924,8 +903,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -959,7 +937,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -980,6 +957,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1002,7 +980,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1025,8 +1002,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1052,7 +1028,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1073,6 +1048,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1095,7 +1071,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1118,8 +1093,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1145,7 +1119,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1166,6 +1139,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1182,8 +1156,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1217,7 +1190,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1238,6 +1210,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1260,13 +1233,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1292,7 +1263,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1313,6 +1283,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1335,13 +1306,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1367,7 +1336,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1388,6 +1356,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1404,8 +1373,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1439,7 +1407,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1460,6 +1427,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1482,12 +1450,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1513,7 +1479,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1534,6 +1499,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1556,12 +1522,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1587,7 +1551,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1608,6 +1571,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1624,8 +1588,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1659,7 +1622,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1680,6 +1642,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1702,12 +1665,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1733,7 +1694,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1754,6 +1714,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1776,12 +1737,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1807,7 +1766,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1828,6 +1786,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1844,8 +1803,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1879,7 +1837,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1900,6 +1857,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1922,13 +1880,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1954,7 +1910,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1975,6 +1930,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1997,13 +1953,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2029,7 +1983,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2050,6 +2003,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2066,8 +2020,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2101,7 +2054,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2122,6 +2074,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2144,13 +2097,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2176,7 +2127,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2197,6 +2147,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2219,7 +2170,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2242,8 +2192,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2269,7 +2218,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2290,6 +2238,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2306,8 +2255,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2341,7 +2289,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2362,6 +2309,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2384,13 +2332,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2416,7 +2362,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2437,6 +2382,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2459,13 +2405,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2491,7 +2435,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2512,6 +2455,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2528,8 +2472,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2563,7 +2506,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2584,6 +2526,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2606,13 +2549,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2638,7 +2579,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2659,6 +2599,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2681,12 +2622,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2712,7 +2651,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2733,6 +2671,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2749,8 +2688,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2784,7 +2722,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2805,6 +2742,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2827,13 +2765,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2859,7 +2795,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2880,6 +2815,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2902,13 +2838,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2934,7 +2868,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2955,6 +2888,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2971,8 +2905,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3006,7 +2939,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3027,6 +2959,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3049,13 +2982,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3081,7 +3012,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3102,6 +3032,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3124,7 +3055,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3147,8 +3077,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3174,7 +3103,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3195,6 +3123,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3211,8 +3140,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3246,7 +3174,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3267,6 +3194,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3289,13 +3217,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3321,7 +3247,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3342,6 +3267,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3364,12 +3290,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3395,7 +3319,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3416,6 +3339,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3432,8 +3356,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3467,7 +3390,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3488,6 +3410,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3510,13 +3433,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3542,7 +3463,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3563,6 +3483,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3585,12 +3506,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3616,7 +3535,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3637,6 +3555,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3653,8 +3572,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3688,7 +3606,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3709,6 +3626,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3731,13 +3649,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3763,7 +3679,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3784,6 +3699,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3806,7 +3722,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3829,8 +3744,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3856,7 +3770,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3877,6 +3790,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3893,8 +3807,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3928,7 +3841,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3949,6 +3861,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3971,13 +3884,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4003,7 +3914,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4024,6 +3934,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4046,12 +3957,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4077,7 +3986,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4098,6 +4006,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4114,8 +4023,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4149,7 +4057,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4170,6 +4077,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4192,13 +4100,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4224,7 +4130,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4245,6 +4150,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4267,12 +4173,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4298,7 +4202,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4319,6 +4222,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4335,8 +4239,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithStringIndexers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithStringIndexers/input.ts.json index 7f4ba989fafc..91f60633e2b3 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithStringIndexers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithStringIndexers/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -38,6 +37,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,8 +54,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -99,7 +98,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -121,6 +119,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -137,8 +136,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -182,7 +180,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -204,6 +201,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -220,8 +218,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -246,7 +243,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -285,7 +281,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -311,7 +306,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -336,6 +330,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -352,8 +347,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -393,7 +387,6 @@ "ctxt": 0 }, "value": "PA", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -412,7 +405,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -430,7 +422,6 @@ "ctxt": 0 }, "value": "PB", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -449,7 +440,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -482,6 +472,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -508,6 +499,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -524,8 +516,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -554,8 +545,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -587,6 +577,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -613,6 +604,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -629,8 +621,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -659,8 +650,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -680,7 +670,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -714,7 +703,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -735,6 +723,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -757,13 +746,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -789,7 +776,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -810,6 +796,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -832,13 +819,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -864,7 +849,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -885,6 +869,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -901,8 +886,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -936,7 +920,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -957,6 +940,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -979,13 +963,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1011,7 +993,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1032,6 +1013,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1054,13 +1036,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1086,7 +1066,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1107,6 +1086,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1123,8 +1103,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1158,7 +1137,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1179,6 +1157,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1201,7 +1180,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1224,8 +1202,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1251,7 +1228,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1272,6 +1248,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1294,7 +1271,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1317,8 +1293,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1344,7 +1319,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1365,6 +1339,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1381,8 +1356,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1416,7 +1390,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1437,6 +1410,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1459,13 +1433,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1491,7 +1463,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1512,6 +1483,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1534,13 +1506,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1566,7 +1536,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1587,6 +1556,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1603,8 +1573,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1638,7 +1607,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1659,6 +1627,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1681,12 +1650,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1712,7 +1679,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1733,6 +1699,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1755,12 +1722,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1786,7 +1751,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1807,6 +1771,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1823,8 +1788,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1858,7 +1822,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1879,6 +1842,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1901,12 +1865,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1932,7 +1894,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1953,6 +1914,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1975,12 +1937,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2006,7 +1966,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2027,6 +1986,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2043,8 +2003,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2078,7 +2037,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2099,6 +2057,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2121,13 +2080,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2153,7 +2110,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2174,6 +2130,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2196,13 +2153,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2228,7 +2183,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2249,6 +2203,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2265,8 +2220,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2300,7 +2254,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2321,6 +2274,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2343,13 +2297,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2375,7 +2327,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2396,6 +2347,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2418,7 +2370,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2441,8 +2392,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2468,7 +2418,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2489,6 +2438,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2505,8 +2455,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2540,7 +2489,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2561,6 +2509,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2583,13 +2532,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2615,7 +2562,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2636,6 +2582,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2658,13 +2605,11 @@ "ctxt": 0 }, "value": "PA", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2690,7 +2635,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2711,6 +2655,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2727,8 +2672,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2762,7 +2706,6 @@ "ctxt": 0 }, "value": "foo5d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2783,6 +2726,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2805,13 +2749,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2837,7 +2779,6 @@ "ctxt": 0 }, "value": "foo5d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2858,6 +2799,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2880,13 +2822,11 @@ "ctxt": 0 }, "value": "PB", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2912,7 +2852,6 @@ "ctxt": 0 }, "value": "foo5d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2933,6 +2872,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2949,8 +2889,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2984,7 +2923,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3005,6 +2943,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3027,13 +2966,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3059,7 +2996,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3080,6 +3016,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3102,13 +3039,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3134,7 +3069,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3155,6 +3089,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3171,8 +3106,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3206,7 +3140,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3227,6 +3160,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3249,13 +3183,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3281,7 +3213,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3302,6 +3233,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3324,12 +3256,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3355,7 +3285,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3376,6 +3305,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3392,8 +3322,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3427,7 +3356,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3448,6 +3376,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3470,13 +3399,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3502,7 +3429,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3523,6 +3449,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3545,13 +3472,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3577,7 +3502,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3598,6 +3522,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3614,8 +3539,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3649,7 +3573,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3670,6 +3593,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3692,13 +3616,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3724,7 +3646,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3745,6 +3666,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3767,7 +3689,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3790,8 +3711,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3817,7 +3737,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3838,6 +3757,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3854,8 +3774,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3889,7 +3808,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3910,6 +3828,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3932,13 +3851,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3964,7 +3881,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3985,6 +3901,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4007,12 +3924,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4038,7 +3953,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4059,6 +3973,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4075,8 +3990,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4110,7 +4024,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4131,6 +4044,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4153,13 +4067,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4185,7 +4097,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4206,6 +4117,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4228,12 +4140,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4259,7 +4169,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4280,6 +4189,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4296,8 +4206,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4331,7 +4240,6 @@ "ctxt": 0 }, "value": "foo11b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4352,6 +4260,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4374,13 +4283,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4406,7 +4313,6 @@ "ctxt": 0 }, "value": "foo11b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4427,6 +4333,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4449,13 +4356,11 @@ "ctxt": 0 }, "value": "PA", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4481,7 +4386,6 @@ "ctxt": 0 }, "value": "foo11b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4502,6 +4406,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4518,8 +4423,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4553,7 +4457,6 @@ "ctxt": 0 }, "value": "foo11c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4574,6 +4477,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4596,13 +4500,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4628,7 +4530,6 @@ "ctxt": 0 }, "value": "foo11c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4649,6 +4550,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4671,13 +4573,11 @@ "ctxt": 0 }, "value": "PB", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4703,7 +4603,6 @@ "ctxt": 0 }, "value": "foo11c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4724,6 +4623,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4740,8 +4640,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4775,7 +4674,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4796,6 +4694,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4818,13 +4717,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4850,7 +4747,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4871,6 +4767,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4893,7 +4790,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4916,8 +4812,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4943,7 +4838,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4964,6 +4858,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4980,8 +4875,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5015,7 +4909,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5036,6 +4929,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5058,13 +4952,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5090,7 +4982,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5111,6 +5002,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5133,12 +5025,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5164,7 +5054,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5185,6 +5074,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5201,8 +5091,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5236,7 +5125,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5257,6 +5145,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5279,13 +5168,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5311,7 +5198,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5332,6 +5218,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5354,12 +5241,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5385,7 +5270,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5406,6 +5290,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5422,8 +5307,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5457,7 +5341,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5478,6 +5361,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5500,13 +5384,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5532,7 +5414,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5553,6 +5434,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5575,13 +5457,11 @@ "ctxt": 0 }, "value": "PA", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5607,7 +5487,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5628,6 +5507,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5644,8 +5524,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5679,7 +5558,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5700,6 +5578,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5722,13 +5601,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5754,7 +5631,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5775,6 +5651,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5797,13 +5674,11 @@ "ctxt": 0 }, "value": "PB", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5829,7 +5704,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5850,6 +5724,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5866,8 +5741,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithStringIndexers2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithStringIndexers2/input.ts.json index 30ba5a6d3b04..05531294286e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithStringIndexers2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithStringIndexers2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -196,6 +190,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -212,8 +207,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -238,7 +232,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -268,7 +261,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -290,6 +282,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -306,8 +299,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -332,7 +324,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -362,7 +353,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -384,6 +374,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -400,8 +391,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -426,7 +416,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -465,7 +454,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -491,7 +479,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -516,6 +503,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -532,8 +520,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -558,7 +545,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -584,7 +570,6 @@ "ctxt": 0 }, "value": "PA", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -603,7 +588,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -621,7 +605,6 @@ "ctxt": 0 }, "value": "PB", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -640,7 +623,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -673,6 +655,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -699,6 +682,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -715,8 +699,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -741,7 +724,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -756,8 +738,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -789,6 +770,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -815,6 +797,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -831,8 +814,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -857,7 +839,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -872,8 +853,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -893,7 +873,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -926,7 +905,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -949,7 +927,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -970,6 +947,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -992,13 +970,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1024,7 +1000,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1045,6 +1020,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1067,13 +1043,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1099,7 +1073,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1120,6 +1093,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1136,8 +1110,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1171,7 +1144,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1192,6 +1164,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1214,13 +1187,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1246,7 +1217,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1267,6 +1237,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1289,13 +1260,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1321,7 +1290,6 @@ "ctxt": 0 }, "value": "foo1b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1342,6 +1310,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1358,8 +1327,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1393,7 +1361,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1414,6 +1381,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1436,7 +1404,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1459,8 +1426,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1486,7 +1452,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1507,6 +1472,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1529,7 +1495,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1552,8 +1517,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1579,7 +1543,6 @@ "ctxt": 0 }, "value": "foo1c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1600,6 +1563,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1616,8 +1580,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1651,7 +1614,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1672,6 +1634,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1694,13 +1657,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1726,7 +1687,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1747,6 +1707,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1769,13 +1730,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1801,7 +1760,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1822,6 +1780,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1838,8 +1797,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1873,7 +1831,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1894,6 +1851,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1916,12 +1874,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -1947,7 +1903,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1968,6 +1923,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1990,12 +1946,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2021,7 +1975,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2042,6 +1995,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2058,8 +2012,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2093,7 +2046,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2114,6 +2066,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2136,12 +2089,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2167,7 +2118,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2188,6 +2138,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2210,12 +2161,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -2241,7 +2190,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2262,6 +2210,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2278,8 +2227,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2313,7 +2261,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2334,6 +2281,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2356,13 +2304,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2388,7 +2334,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2409,6 +2354,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2431,13 +2377,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2463,7 +2407,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2484,6 +2427,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2500,8 +2444,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2535,7 +2478,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2556,6 +2498,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2578,13 +2521,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2610,7 +2551,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2631,6 +2571,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2653,7 +2594,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2679,7 +2619,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2687,8 +2626,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2714,7 +2652,6 @@ "ctxt": 0 }, "value": "foo5b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2735,6 +2672,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2751,8 +2689,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -2786,7 +2723,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2807,6 +2743,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2829,13 +2766,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2861,7 +2796,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2882,6 +2816,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2904,13 +2839,11 @@ "ctxt": 0 }, "value": "PA", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2936,7 +2869,6 @@ "ctxt": 0 }, "value": "foo5c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2957,6 +2889,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2973,8 +2906,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3008,7 +2940,6 @@ "ctxt": 0 }, "value": "foo5d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3029,6 +2960,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3051,13 +2983,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3083,7 +3013,6 @@ "ctxt": 0 }, "value": "foo5d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3104,6 +3033,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3126,13 +3056,11 @@ "ctxt": 0 }, "value": "PB", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3158,7 +3086,6 @@ "ctxt": 0 }, "value": "foo5d", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3179,6 +3106,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3195,8 +3123,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3230,7 +3157,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3251,6 +3177,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3273,13 +3200,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3305,7 +3230,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3326,6 +3250,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3348,13 +3273,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3380,7 +3303,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3401,6 +3323,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3417,8 +3340,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3452,7 +3374,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3473,6 +3394,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3495,13 +3417,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3527,7 +3447,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3548,6 +3467,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3570,12 +3490,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -3601,7 +3519,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3622,6 +3539,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3638,8 +3556,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3673,7 +3590,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3694,6 +3610,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3716,13 +3633,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3748,7 +3663,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3769,6 +3683,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3791,13 +3706,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3823,7 +3736,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3844,6 +3756,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3860,8 +3773,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -3895,7 +3807,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3916,6 +3827,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3938,13 +3850,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3970,7 +3880,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3991,6 +3900,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4013,7 +3923,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4039,7 +3948,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4047,8 +3955,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4074,7 +3981,6 @@ "ctxt": 0 }, "value": "foo9", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4095,6 +4001,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4111,8 +4018,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4146,7 +4052,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4167,6 +4072,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4189,13 +4095,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4221,7 +4125,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4242,6 +4145,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4264,12 +4168,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4295,7 +4197,6 @@ "ctxt": 0 }, "value": "foo10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4316,6 +4217,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4332,8 +4234,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4367,7 +4268,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4388,6 +4288,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4410,13 +4311,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4442,7 +4341,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4463,6 +4361,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4485,12 +4384,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -4516,7 +4413,6 @@ "ctxt": 0 }, "value": "foo11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4537,6 +4433,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4553,8 +4450,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4588,7 +4484,6 @@ "ctxt": 0 }, "value": "foo11b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4609,6 +4504,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4631,13 +4527,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4663,7 +4557,6 @@ "ctxt": 0 }, "value": "foo11b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4684,6 +4577,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4706,13 +4600,11 @@ "ctxt": 0 }, "value": "PA", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4738,7 +4630,6 @@ "ctxt": 0 }, "value": "foo11b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4759,6 +4650,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4775,8 +4667,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -4810,7 +4701,6 @@ "ctxt": 0 }, "value": "foo11c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4831,6 +4721,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4853,13 +4744,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4885,7 +4774,6 @@ "ctxt": 0 }, "value": "foo11c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4906,6 +4794,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4928,13 +4817,11 @@ "ctxt": 0 }, "value": "PB", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4960,7 +4847,6 @@ "ctxt": 0 }, "value": "foo11c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4981,6 +4867,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4997,8 +4884,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5032,7 +4918,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5053,6 +4938,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5075,13 +4961,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5107,7 +4991,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5128,6 +5011,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5150,7 +5034,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5176,7 +5059,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5184,8 +5066,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5211,7 +5092,6 @@ "ctxt": 0 }, "value": "foo12", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5232,6 +5112,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5248,8 +5129,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5283,7 +5163,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5304,6 +5183,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5326,13 +5206,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5358,7 +5236,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5379,6 +5256,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5401,12 +5279,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5432,7 +5308,6 @@ "ctxt": 0 }, "value": "foo13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5453,6 +5328,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5469,8 +5345,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5504,7 +5379,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5525,6 +5399,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5547,13 +5422,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5579,7 +5452,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5600,6 +5472,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5622,12 +5495,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5653,7 +5524,6 @@ "ctxt": 0 }, "value": "foo14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5674,6 +5544,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5690,8 +5561,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5725,7 +5595,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5746,6 +5615,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5768,13 +5638,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5800,7 +5668,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5821,6 +5688,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5843,13 +5711,11 @@ "ctxt": 0 }, "value": "PA", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5875,7 +5741,6 @@ "ctxt": 0 }, "value": "foo15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5896,6 +5761,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5912,8 +5778,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5947,7 +5812,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5968,6 +5832,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5990,13 +5855,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6022,7 +5885,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6043,6 +5905,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6065,13 +5928,11 @@ "ctxt": 0 }, "value": "PB", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6097,7 +5958,6 @@ "ctxt": 0 }, "value": "foo16", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6118,6 +5978,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6134,8 +5995,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/primtiveTypesAreIdentical/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/primtiveTypesAreIdentical/input.ts.json index c06bfaedc431..0f6b3ca9589c 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/primtiveTypesAreIdentical/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/primtiveTypesAreIdentical/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -80,7 +79,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -101,6 +99,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -117,8 +116,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -144,7 +142,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -165,6 +162,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -181,8 +179,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -216,7 +213,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -237,6 +233,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -253,8 +250,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -280,7 +276,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -301,6 +296,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -317,8 +313,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -344,7 +339,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -365,6 +359,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -381,8 +376,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -416,7 +410,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -437,6 +430,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -453,8 +447,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -480,7 +473,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -501,6 +493,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -517,8 +510,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -544,7 +536,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -565,6 +556,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -581,8 +573,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -616,7 +607,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -637,6 +627,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -653,8 +644,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -680,7 +670,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -701,6 +690,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -717,8 +707,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -744,7 +733,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -765,6 +753,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -781,8 +770,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -816,7 +804,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -837,6 +824,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -866,8 +854,7 @@ } } } - }, - "optional": false + } } } ], @@ -893,7 +880,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -914,6 +900,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -943,8 +930,7 @@ } } } - }, - "optional": false + } } } ], @@ -970,7 +956,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -991,6 +976,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1007,8 +993,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1034,7 +1019,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1055,6 +1039,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1071,8 +1056,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1113,7 +1097,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -1132,7 +1115,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -1149,7 +1131,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1170,6 +1151,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1192,13 +1174,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1224,7 +1204,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1245,6 +1224,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1267,13 +1247,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1299,7 +1277,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1320,6 +1297,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1336,8 +1314,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1371,7 +1348,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1392,6 +1368,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1408,8 +1385,7 @@ }, "kind": "void" } - }, - "optional": false + } } } ], @@ -1435,7 +1411,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1456,6 +1431,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1472,8 +1448,7 @@ }, "kind": "void" } - }, - "optional": false + } } } ], @@ -1499,7 +1474,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1520,6 +1494,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1536,8 +1511,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/typeParametersAreIdenticalToThemselves/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/typeParametersAreIdenticalToThemselves/input.ts.json index 3b32aca73ba8..741a8f912f7e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/typeParametersAreIdenticalToThemselves/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/typeParametersAreIdenticalToThemselves/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -101,7 +99,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -121,7 +118,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -142,6 +138,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -164,13 +161,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -206,7 +201,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -226,7 +220,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -247,6 +240,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -269,13 +263,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -319,7 +311,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -339,7 +330,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -360,6 +350,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -382,13 +373,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -424,7 +413,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -445,7 +433,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -465,7 +452,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -486,6 +472,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -508,13 +495,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -550,7 +535,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -571,7 +555,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -591,7 +574,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -612,6 +594,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -634,13 +617,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -684,7 +665,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -705,7 +685,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -725,7 +704,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -746,6 +724,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -768,13 +747,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -793,6 +770,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -815,13 +793,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -849,7 +825,6 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -870,6 +845,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -892,13 +868,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -924,7 +898,6 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -945,6 +918,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -967,13 +941,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -999,7 +971,6 @@ "ctxt": 0 }, "value": "inner", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1020,6 +991,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1042,13 +1014,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1082,7 +1052,6 @@ "ctxt": 0 }, "value": "inner2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1103,6 +1072,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1125,13 +1095,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1157,7 +1125,6 @@ "ctxt": 0 }, "value": "inner2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1178,6 +1145,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1200,13 +1168,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1242,7 +1208,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1262,7 +1227,6 @@ "ctxt": 0 }, "value": "inner2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1283,6 +1247,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1299,8 +1264,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1351,7 +1315,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1372,7 +1335,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1392,7 +1354,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1418,7 +1379,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "function": { @@ -1439,6 +1399,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1461,13 +1422,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1504,7 +1463,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "function": { @@ -1525,6 +1483,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1547,13 +1506,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1590,7 +1547,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "function": { @@ -1611,6 +1567,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1633,13 +1590,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1684,7 +1639,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "function": { @@ -1705,6 +1659,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1727,13 +1682,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1752,6 +1705,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1774,13 +1728,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1816,7 +1768,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1847,7 +1798,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "function": { @@ -1868,6 +1818,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1890,13 +1841,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1915,6 +1864,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1937,13 +1887,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1979,7 +1927,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2010,7 +1957,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "function": { @@ -2031,6 +1977,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2053,13 +2000,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2078,6 +2023,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2100,13 +2046,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2150,7 +2094,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2181,7 +2124,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "function": { @@ -2202,6 +2144,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2224,13 +2167,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2266,7 +2207,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2297,7 +2237,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "function": { @@ -2318,6 +2257,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2340,13 +2280,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2382,7 +2320,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2413,7 +2350,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "function": { @@ -2434,6 +2370,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2456,13 +2393,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2506,7 +2441,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2537,7 +2471,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "function": { @@ -2558,6 +2491,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2580,13 +2514,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2622,7 +2554,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2640,7 +2571,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2672,7 +2602,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "function": { @@ -2693,6 +2622,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2715,13 +2645,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2757,7 +2685,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2775,7 +2702,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2807,7 +2733,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "function": { @@ -2828,6 +2753,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2850,13 +2776,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2900,7 +2824,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2918,7 +2841,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2961,7 +2883,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2982,7 +2903,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3008,7 +2928,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "function": { @@ -3029,6 +2948,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3051,13 +2971,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3094,7 +3012,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "function": { @@ -3115,6 +3032,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3137,13 +3055,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3180,7 +3096,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "function": { @@ -3201,6 +3116,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3223,13 +3139,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3274,7 +3188,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "function": { @@ -3295,6 +3208,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3317,13 +3231,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3342,6 +3254,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3364,13 +3277,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3406,7 +3317,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3437,7 +3347,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "function": { @@ -3458,6 +3367,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3480,13 +3390,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3505,6 +3413,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3527,13 +3436,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3569,7 +3476,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3600,7 +3506,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "function": { @@ -3621,6 +3526,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3643,13 +3549,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3668,6 +3572,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3690,13 +3595,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3740,7 +3643,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3771,7 +3673,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "function": { @@ -3792,6 +3693,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3814,13 +3716,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3856,7 +3756,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3887,7 +3786,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "function": { @@ -3908,6 +3806,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3930,13 +3829,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3972,7 +3869,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4003,7 +3899,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "function": { @@ -4024,6 +3919,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4046,13 +3942,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4096,7 +3990,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4138,7 +4031,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4156,7 +4048,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4183,7 +4074,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4210,7 +4100,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4243,7 +4132,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4257,6 +4145,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4279,13 +4168,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": null, @@ -4307,7 +4194,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4321,6 +4207,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4343,13 +4230,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": null, @@ -4371,7 +4256,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4385,6 +4269,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4407,13 +4292,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -4423,6 +4306,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4445,13 +4329,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": null, @@ -4478,7 +4360,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4503,7 +4384,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4517,6 +4397,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4539,13 +4420,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -4555,6 +4434,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4577,13 +4457,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": null, @@ -4610,7 +4488,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4635,7 +4512,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4649,6 +4525,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4671,13 +4548,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": null, @@ -4704,7 +4579,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4729,7 +4603,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4743,6 +4616,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4765,13 +4639,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": null, @@ -4798,7 +4670,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4823,7 +4694,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4837,6 +4707,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4859,13 +4730,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": null, @@ -4892,7 +4761,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4910,7 +4778,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4936,7 +4803,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4950,6 +4816,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4972,13 +4839,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": null, @@ -5005,7 +4870,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5023,7 +4887,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5051,7 +4914,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5078,7 +4940,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5096,7 +4957,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5130,7 +4990,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5144,6 +5003,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5166,13 +5026,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": null, @@ -5194,7 +5052,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5208,6 +5065,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5230,13 +5088,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": null, @@ -5258,7 +5114,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5272,6 +5127,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5294,13 +5150,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -5310,6 +5164,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5332,13 +5187,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": null, @@ -5365,7 +5218,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5390,7 +5242,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5404,6 +5255,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5426,13 +5278,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -5442,6 +5292,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5464,13 +5315,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": null, @@ -5497,7 +5346,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5522,7 +5370,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5536,6 +5383,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5558,13 +5406,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": null, @@ -5591,7 +5437,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5616,7 +5461,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5630,6 +5474,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5652,13 +5497,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": null, @@ -5685,7 +5528,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/unionTypeIdentity/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/unionTypeIdentity/input.ts.json index 800b506245ba..9a6ff5810458 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/unionTypeIdentity/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeAndMemberIdentity/unionTypeIdentity/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -66,8 +67,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -99,6 +99,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -134,8 +135,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -167,6 +167,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -211,8 +212,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -244,6 +244,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -260,8 +261,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -293,6 +293,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -309,8 +310,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -342,6 +342,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -358,8 +359,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/bivariantInferences/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/bivariantInferences/input.ts.json index a0281be19ff1..f5a1c7a756ba 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/bivariantInferences/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/bivariantInferences/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "equalsShallow", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,6 +92,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -117,7 +115,6 @@ "ctxt": 0 }, "value": "ReadonlyArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -143,7 +140,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -151,8 +147,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -162,6 +157,7 @@ "ctxt": 0 }, "value": "other", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -184,7 +180,6 @@ "ctxt": 0 }, "value": "ReadonlyArray", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -210,7 +205,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -218,8 +212,7 @@ ] } } - }, - "optional": false + } } ], "typeAnn": { @@ -262,7 +255,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -299,6 +291,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -411,8 +404,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -444,6 +436,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,8 +549,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -589,8 +581,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -614,7 +606,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -625,7 +616,6 @@ "ctxt": 0 }, "value": "equalsShallow", - "typeAnnotation": null, "optional": false }, "computed": false @@ -641,7 +631,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/contextualSignatureInstantiation/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/contextualSignatureInstantiation/input.ts.json index f9a6c01e2ebe..15b8699b9036 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/contextualSignatureInstantiation/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/contextualSignatureInstantiation/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -76,8 +77,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -87,6 +87,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -103,8 +104,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -130,15 +130,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -174,7 +172,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -204,7 +201,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -221,7 +217,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -242,6 +237,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -264,13 +260,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -289,6 +283,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -311,13 +306,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -336,6 +329,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -359,6 +353,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -381,13 +376,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -397,6 +390,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -419,13 +413,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -451,15 +443,13 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -495,7 +485,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -516,7 +505,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -537,7 +525,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -567,7 +554,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -584,7 +570,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -605,6 +590,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -627,13 +613,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -652,6 +636,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -674,13 +659,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -699,6 +682,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -722,6 +706,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -744,13 +729,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -760,6 +743,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -782,13 +766,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -814,15 +796,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -858,7 +838,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -879,7 +858,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -909,7 +887,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -926,7 +903,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -947,6 +923,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -969,13 +946,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -994,6 +969,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1016,13 +992,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1058,7 +1032,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1088,7 +1061,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1105,7 +1077,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1126,6 +1097,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1148,13 +1120,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1173,6 +1143,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1195,13 +1166,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1237,7 +1206,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1258,7 +1226,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1303,7 +1270,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1331,7 +1297,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1366,6 +1331,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1382,8 +1348,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1415,8 +1380,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1433,7 +1398,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1471,7 +1435,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } } @@ -1507,8 +1470,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1525,7 +1488,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1563,7 +1525,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } } @@ -1599,6 +1560,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1634,8 +1596,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1667,8 +1628,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1685,7 +1646,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1699,7 +1659,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } } @@ -1735,8 +1694,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1753,7 +1712,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1796,7 +1754,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } } @@ -1832,8 +1789,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1850,7 +1807,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1893,7 +1849,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } } @@ -1929,8 +1884,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1947,7 +1902,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1961,7 +1915,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1975,7 +1928,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -1989,7 +1941,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } } @@ -2025,6 +1976,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2076,8 +2028,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2109,8 +2060,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2127,7 +2078,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2141,7 +2091,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false } } @@ -2177,8 +2126,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2195,7 +2144,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2238,7 +2186,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false } } @@ -2274,8 +2221,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2292,7 +2239,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2335,7 +2281,6 @@ "ctxt": 0 }, "value": "h", - "typeAnnotation": null, "optional": false } } @@ -2371,8 +2316,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2389,7 +2334,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2403,7 +2347,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -2417,7 +2360,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -2431,7 +2373,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/discriminatedUnionInference/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/discriminatedUnionInference/input.ts.json index 911cd0c16234..cdeffb798c2a 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/discriminatedUnionInference/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/discriminatedUnionInference/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -156,7 +153,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -184,7 +180,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -210,7 +205,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -242,7 +236,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -311,7 +304,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -338,7 +330,6 @@ "ctxt": 0 }, "value": "FooBar", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -364,7 +355,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -395,7 +385,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -421,7 +410,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -444,7 +432,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -470,7 +457,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -497,7 +483,6 @@ "ctxt": 0 }, "value": "InferA", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -523,7 +508,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -553,7 +537,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -573,7 +556,6 @@ "ctxt": 0 }, "value": "FooBar", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -606,7 +588,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -631,7 +612,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -663,7 +643,6 @@ "ctxt": 0 }, "value": "FooA", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -682,7 +661,6 @@ "ctxt": 0 }, "value": "InferA", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -708,7 +686,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -751,7 +728,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -777,7 +753,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -817,7 +792,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -872,7 +846,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -901,7 +874,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -935,7 +907,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -990,7 +961,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1026,7 +996,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1050,7 +1019,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1071,6 +1039,7 @@ "ctxt": 0 }, "value": "item", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1093,7 +1062,6 @@ "ctxt": 0 }, "value": "Item", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1119,7 +1087,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1127,8 +1094,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1164,7 +1130,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1194,7 +1159,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1226,8 +1190,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1244,7 +1208,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1268,7 +1231,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "value": { @@ -1296,7 +1258,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "value": { @@ -1344,8 +1305,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1362,7 +1323,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1386,7 +1346,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "value": { @@ -1414,7 +1373,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallToOverloadedMethodWithOverloadedArguments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallToOverloadedMethodWithOverloadedArguments/input.ts.json index 1732fa503cd2..835c5284b5c5 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallToOverloadedMethodWithOverloadedArguments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallToOverloadedMethodWithOverloadedArguments/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "m1", - "typeAnnotation": null, "optional": false }, "body": { @@ -49,7 +48,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -76,7 +74,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "then", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -123,6 +119,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -146,6 +143,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -168,13 +166,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -200,7 +196,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -226,7 +221,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -236,8 +230,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": { @@ -262,7 +255,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -288,7 +280,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -320,7 +311,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -342,7 +332,6 @@ "ctxt": 0 }, "value": "testFunction", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -363,6 +352,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -379,8 +369,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -416,7 +405,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -466,6 +454,7 @@ "ctxt": 0 }, "value": "numPromise", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -488,7 +477,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -511,8 +499,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -544,8 +531,8 @@ "ctxt": 0 }, "value": "newPromise", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -569,7 +556,6 @@ "ctxt": 0 }, "value": "numPromise", - "typeAnnotation": null, "optional": false }, "property": { @@ -580,7 +566,6 @@ "ctxt": 0 }, "value": "then", - "typeAnnotation": null, "optional": false }, "computed": false @@ -596,7 +581,6 @@ "ctxt": 0 }, "value": "testFunction", - "typeAnnotation": null, "optional": false } } @@ -627,7 +611,6 @@ "ctxt": 0 }, "value": "m2", - "typeAnnotation": null, "optional": false }, "body": { @@ -653,7 +636,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -680,7 +662,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -713,7 +694,6 @@ "ctxt": 0 }, "value": "then", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -727,6 +707,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -750,6 +731,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -772,13 +754,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -804,7 +784,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -830,7 +809,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -840,8 +818,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": { @@ -866,7 +843,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -892,7 +868,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -924,7 +899,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -946,7 +920,6 @@ "ctxt": 0 }, "value": "testFunction", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -967,6 +940,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -983,8 +957,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -1020,7 +993,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1055,7 +1027,6 @@ "ctxt": 0 }, "value": "testFunction", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1076,6 +1047,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1092,8 +1064,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -1129,7 +1100,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1179,6 +1149,7 @@ "ctxt": 0 }, "value": "numPromise", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1201,7 +1172,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1224,8 +1194,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1257,8 +1226,8 @@ "ctxt": 0 }, "value": "newPromise", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1282,7 +1251,6 @@ "ctxt": 0 }, "value": "numPromise", - "typeAnnotation": null, "optional": false }, "property": { @@ -1293,7 +1261,6 @@ "ctxt": 0 }, "value": "then", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1309,7 +1276,6 @@ "ctxt": 0 }, "value": "testFunction", - "typeAnnotation": null, "optional": false } } @@ -1340,7 +1306,6 @@ "ctxt": 0 }, "value": "m3", - "typeAnnotation": null, "optional": false }, "body": { @@ -1366,7 +1331,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1393,7 +1357,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1426,7 +1389,6 @@ "ctxt": 0 }, "value": "then", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1440,6 +1402,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1463,6 +1426,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1485,13 +1449,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1517,7 +1479,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1543,7 +1504,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1553,8 +1513,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": { @@ -1579,7 +1538,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1605,7 +1563,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1637,7 +1594,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1662,7 +1618,6 @@ "ctxt": 0 }, "value": "then", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1676,6 +1631,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1699,6 +1655,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1721,13 +1678,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1753,7 +1708,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1779,7 +1733,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1789,8 +1742,7 @@ } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -1800,6 +1752,7 @@ "ctxt": 0 }, "value": "error", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1823,6 +1776,7 @@ "ctxt": 0 }, "value": "error", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1839,8 +1793,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "typeParams": null, @@ -1866,7 +1819,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1892,7 +1844,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1902,8 +1853,7 @@ } } } - }, - "optional": true + } } ], "typeAnn": { @@ -1928,7 +1878,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1954,7 +1903,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1986,7 +1934,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2008,7 +1955,6 @@ "ctxt": 0 }, "value": "testFunction", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2029,6 +1975,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2045,8 +1992,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -2082,7 +2028,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2132,6 +2077,7 @@ "ctxt": 0 }, "value": "numPromise", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2154,7 +2100,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2177,8 +2122,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2210,8 +2154,8 @@ "ctxt": 0 }, "value": "newPromise", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2235,7 +2179,6 @@ "ctxt": 0 }, "value": "numPromise", - "typeAnnotation": null, "optional": false }, "property": { @@ -2246,7 +2189,6 @@ "ctxt": 0 }, "value": "then", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2262,7 +2204,6 @@ "ctxt": 0 }, "value": "testFunction", - "typeAnnotation": null, "optional": false } } @@ -2293,7 +2234,6 @@ "ctxt": 0 }, "value": "m4", - "typeAnnotation": null, "optional": false }, "body": { @@ -2319,7 +2259,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2346,7 +2285,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2379,7 +2317,6 @@ "ctxt": 0 }, "value": "then", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2393,6 +2330,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2416,6 +2354,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2438,13 +2377,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2470,7 +2407,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2496,7 +2432,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2506,8 +2441,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": { @@ -2532,7 +2466,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2558,7 +2491,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2590,7 +2522,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2615,7 +2546,6 @@ "ctxt": 0 }, "value": "then", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2629,6 +2559,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2652,6 +2583,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2674,13 +2606,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2706,7 +2636,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2732,7 +2661,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2742,8 +2670,7 @@ } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -2753,6 +2680,7 @@ "ctxt": 0 }, "value": "error", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2776,6 +2704,7 @@ "ctxt": 0 }, "value": "error", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2792,8 +2721,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "typeParams": null, @@ -2819,7 +2747,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2845,7 +2772,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2855,8 +2781,7 @@ } } } - }, - "optional": true + } } ], "typeAnn": { @@ -2881,7 +2806,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2907,7 +2831,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2939,7 +2862,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2961,7 +2883,6 @@ "ctxt": 0 }, "value": "testFunction", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2982,6 +2903,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2998,8 +2920,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -3035,7 +2956,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3070,7 +2990,6 @@ "ctxt": 0 }, "value": "testFunction", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3091,6 +3010,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3107,8 +3027,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -3144,7 +3063,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3194,6 +3112,7 @@ "ctxt": 0 }, "value": "numPromise", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3216,7 +3135,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3239,8 +3157,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3272,8 +3189,8 @@ "ctxt": 0 }, "value": "newPromise", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3297,7 +3214,6 @@ "ctxt": 0 }, "value": "numPromise", - "typeAnnotation": null, "optional": false }, "property": { @@ -3308,7 +3224,6 @@ "ctxt": 0 }, "value": "then", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3324,7 +3239,6 @@ "ctxt": 0 }, "value": "testFunction", - "typeAnnotation": null, "optional": false } } @@ -3355,7 +3269,6 @@ "ctxt": 0 }, "value": "m5", - "typeAnnotation": null, "optional": false }, "body": { @@ -3381,7 +3294,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3408,7 +3320,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3441,7 +3352,6 @@ "ctxt": 0 }, "value": "then", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3455,6 +3365,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3478,6 +3389,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3500,13 +3412,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3532,7 +3442,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3558,7 +3467,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3568,8 +3476,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": { @@ -3594,7 +3501,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3620,7 +3526,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3652,7 +3557,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3677,7 +3581,6 @@ "ctxt": 0 }, "value": "then", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3691,6 +3594,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3714,6 +3618,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3736,13 +3641,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3768,7 +3671,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3794,7 +3696,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3804,8 +3705,7 @@ } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -3815,6 +3715,7 @@ "ctxt": 0 }, "value": "error", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3838,6 +3739,7 @@ "ctxt": 0 }, "value": "error", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3854,8 +3756,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "typeParams": null, @@ -3881,7 +3782,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3907,7 +3807,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3917,8 +3816,7 @@ } } } - }, - "optional": true + } } ], "typeAnn": { @@ -3943,7 +3841,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3969,7 +3866,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4001,7 +3897,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4026,7 +3921,6 @@ "ctxt": 0 }, "value": "then", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4040,6 +3934,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4063,6 +3958,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4085,13 +3981,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4117,7 +4011,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4143,7 +4036,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4153,8 +4045,7 @@ } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -4164,6 +4055,7 @@ "ctxt": 0 }, "value": "error", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4187,6 +4079,7 @@ "ctxt": 0 }, "value": "error", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4203,8 +4096,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "typeParams": null, @@ -4230,15 +4122,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": true + } }, { "type": "Identifier", @@ -4248,6 +4138,7 @@ "ctxt": 0 }, "value": "progress", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4271,6 +4162,7 @@ "ctxt": 0 }, "value": "preservation", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4287,8 +4179,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "typeParams": null, @@ -4310,8 +4201,7 @@ } } } - }, - "optional": true + } } ], "typeAnn": { @@ -4336,7 +4226,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4362,7 +4251,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4394,7 +4282,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4416,7 +4303,6 @@ "ctxt": 0 }, "value": "testFunction", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4437,6 +4323,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4453,8 +4340,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -4490,7 +4376,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4525,7 +4410,6 @@ "ctxt": 0 }, "value": "testFunction", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4546,6 +4430,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4562,8 +4447,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -4599,7 +4483,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4649,6 +4532,7 @@ "ctxt": 0 }, "value": "numPromise", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4671,7 +4555,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4694,8 +4577,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4727,8 +4609,8 @@ "ctxt": 0 }, "value": "newPromise", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4752,7 +4634,6 @@ "ctxt": 0 }, "value": "numPromise", - "typeAnnotation": null, "optional": false }, "property": { @@ -4763,7 +4644,6 @@ "ctxt": 0 }, "value": "then", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4779,7 +4659,6 @@ "ctxt": 0 }, "value": "testFunction", - "typeAnnotation": null, "optional": false } } @@ -4810,7 +4689,6 @@ "ctxt": 0 }, "value": "m6", - "typeAnnotation": null, "optional": false }, "body": { @@ -4836,7 +4714,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4863,7 +4740,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4896,7 +4772,6 @@ "ctxt": 0 }, "value": "then", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4910,6 +4785,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4933,6 +4809,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4955,13 +4832,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4987,7 +4862,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5013,7 +4887,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5023,8 +4896,7 @@ } } } - }, - "optional": false + } } ], "typeAnn": { @@ -5049,7 +4921,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5075,7 +4946,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5107,7 +4977,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5132,7 +5001,6 @@ "ctxt": 0 }, "value": "then", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5146,6 +5014,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5169,6 +5038,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5191,13 +5061,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5223,7 +5091,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5249,7 +5116,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5259,8 +5125,7 @@ } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -5270,6 +5135,7 @@ "ctxt": 0 }, "value": "error", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5293,6 +5159,7 @@ "ctxt": 0 }, "value": "error", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5309,8 +5176,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "typeParams": null, @@ -5336,7 +5202,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5362,7 +5227,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5372,8 +5236,7 @@ } } } - }, - "optional": true + } } ], "typeAnn": { @@ -5398,7 +5261,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5424,7 +5286,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5456,7 +5317,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5478,7 +5338,6 @@ "ctxt": 0 }, "value": "testFunction", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5499,6 +5358,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5515,8 +5375,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -5552,7 +5411,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5587,7 +5445,6 @@ "ctxt": 0 }, "value": "testFunction", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5608,6 +5465,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5624,8 +5482,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -5661,7 +5518,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5696,7 +5552,6 @@ "ctxt": 0 }, "value": "testFunction", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5717,6 +5572,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5733,8 +5589,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } } ], @@ -5770,7 +5625,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5820,6 +5674,7 @@ "ctxt": 0 }, "value": "numPromise", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5842,7 +5697,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5865,8 +5719,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5898,8 +5751,8 @@ "ctxt": 0 }, "value": "newPromise", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5923,7 +5776,6 @@ "ctxt": 0 }, "value": "numPromise", - "typeAnnotation": null, "optional": false }, "property": { @@ -5934,7 +5786,6 @@ "ctxt": 0 }, "value": "then", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5950,7 +5801,6 @@ "ctxt": 0 }, "value": "testFunction", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallTypeArgumentInference/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallTypeArgumentInference/input.ts.json index 2181bf83e2c4..a443535796ac 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallTypeArgumentInference/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallTypeArgumentInference/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -98,7 +96,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -129,7 +126,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -164,8 +160,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -220,7 +215,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -241,6 +235,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -263,13 +258,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -288,6 +281,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -310,13 +304,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -349,7 +341,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -380,7 +371,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -401,7 +391,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -421,7 +410,6 @@ "ctxt": 0 }, "value": "foo2b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -442,6 +430,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -464,13 +453,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -513,6 +500,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -535,13 +523,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -563,7 +549,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -594,7 +579,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -615,7 +599,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -650,8 +633,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -668,7 +651,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -733,8 +715,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -751,7 +733,6 @@ "ctxt": 0 }, "value": "foo2b", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -784,7 +765,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -810,7 +790,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -832,6 +811,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -854,13 +834,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -881,6 +859,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -903,13 +882,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -940,7 +917,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -961,6 +937,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -983,13 +960,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1008,6 +983,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1030,13 +1006,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1069,7 +1043,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -1101,7 +1074,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "function": { @@ -1122,6 +1094,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1144,13 +1117,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1169,6 +1140,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1191,13 +1163,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1230,7 +1200,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -1262,7 +1231,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "function": { @@ -1283,6 +1251,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1305,13 +1274,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1330,6 +1297,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1352,13 +1320,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1391,7 +1357,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -1422,7 +1387,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1453,7 +1417,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "function": { @@ -1474,6 +1437,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1496,13 +1460,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1521,6 +1483,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1543,13 +1506,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1582,7 +1543,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -1613,7 +1573,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1644,7 +1603,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "function": { @@ -1665,6 +1623,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1687,13 +1646,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1712,6 +1669,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1734,13 +1692,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1773,7 +1729,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -1804,7 +1759,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1825,7 +1779,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1856,7 +1809,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "function": { @@ -1900,6 +1852,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1922,13 +1875,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1950,7 +1901,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1981,7 +1931,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2002,7 +1951,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2033,7 +1981,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "function": { @@ -2054,6 +2001,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2076,13 +2024,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2125,6 +2071,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2147,13 +2094,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2175,7 +2120,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2206,7 +2150,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2227,7 +2170,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2258,7 +2200,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "function": { @@ -2302,6 +2243,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2324,13 +2266,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2352,7 +2292,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2383,7 +2322,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2404,7 +2342,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2446,7 +2383,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2467,7 +2403,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2503,8 +2438,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2521,7 +2456,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2586,8 +2520,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2611,7 +2545,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -2622,7 +2555,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2689,8 +2621,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2714,7 +2646,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -2725,7 +2656,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2792,8 +2722,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2817,7 +2747,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -2828,7 +2757,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2890,8 +2818,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2915,7 +2843,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -2926,7 +2853,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2993,8 +2919,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3018,7 +2944,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3029,7 +2954,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3091,8 +3015,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3116,7 +3040,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3127,7 +3050,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3164,8 +3086,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3189,7 +3111,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3200,7 +3121,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3255,8 +3175,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3280,7 +3200,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3291,7 +3210,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3318,7 +3236,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3345,7 +3262,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3366,7 +3282,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3399,6 +3314,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3421,13 +3337,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -3437,6 +3351,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3459,13 +3374,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -3487,7 +3400,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3501,6 +3413,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3523,13 +3436,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -3539,6 +3450,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3561,13 +3473,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -3592,7 +3502,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3616,7 +3525,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3630,6 +3538,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3652,13 +3561,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -3668,6 +3575,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3690,13 +3598,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -3721,7 +3627,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3745,7 +3650,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3759,6 +3663,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3781,13 +3686,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -3797,6 +3700,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3819,13 +3723,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -3850,7 +3752,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3879,7 +3780,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3904,7 +3804,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3918,6 +3817,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3940,13 +3840,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -3956,6 +3854,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3978,13 +3877,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -4009,7 +3906,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4038,7 +3934,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4063,7 +3958,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4077,6 +3971,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4099,13 +3994,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -4115,6 +4008,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4137,13 +4031,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -4168,7 +4060,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4197,7 +4088,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4218,7 +4108,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4243,7 +4132,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4271,7 +4159,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4300,7 +4187,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4321,7 +4207,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4346,7 +4231,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4360,6 +4244,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4382,13 +4267,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -4413,7 +4296,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4442,7 +4324,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4463,7 +4344,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4488,7 +4368,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4516,7 +4395,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4545,7 +4423,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4566,7 +4443,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4603,6 +4479,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4625,7 +4502,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4657,8 +4533,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4690,8 +4565,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4715,7 +4590,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -4726,7 +4600,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4793,8 +4666,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4818,7 +4691,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -4829,7 +4701,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4896,8 +4767,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4921,7 +4792,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -4932,7 +4802,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4994,8 +4863,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5019,7 +4888,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -5030,7 +4898,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5097,8 +4964,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5122,7 +4989,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -5133,7 +4999,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5195,8 +5060,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5220,7 +5085,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -5231,7 +5095,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5268,8 +5131,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5293,7 +5156,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -5304,7 +5166,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5359,8 +5220,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5384,7 +5245,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -5395,7 +5255,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithArrayLiteralArgs/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithArrayLiteralArgs/input.ts.json index cc192d3e0ba4..fa516f8c2199 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithArrayLiteralArgs/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithArrayLiteralArgs/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -98,7 +96,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -129,7 +126,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -164,8 +160,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -255,8 +250,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -273,7 +268,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -372,8 +366,8 @@ "ctxt": 0 }, "value": "ra", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -390,7 +384,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -489,8 +482,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -507,7 +500,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -555,8 +547,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -573,7 +565,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -647,8 +638,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -665,7 +656,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -743,8 +733,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -761,7 +751,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -865,8 +854,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -883,7 +872,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -960,7 +948,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference/input.ts.json index 3819f82c4c4d..cfcfdbdd867b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -273,6 +265,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -295,13 +288,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -333,6 +324,7 @@ "ctxt": 0 }, "value": "d1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -355,13 +347,11 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -393,6 +383,7 @@ "ctxt": 0 }, "value": "d2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -415,13 +406,11 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -438,7 +427,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -459,6 +447,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -481,13 +470,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -520,7 +507,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -551,7 +537,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -569,7 +554,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -605,8 +589,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -623,7 +607,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -637,7 +620,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -673,8 +655,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -691,7 +673,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -705,7 +686,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } } @@ -726,7 +706,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -747,6 +726,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -769,13 +749,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -794,6 +772,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -816,13 +795,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -855,7 +832,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -886,7 +862,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -904,7 +879,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -926,7 +900,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -944,7 +917,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -965,7 +937,6 @@ "ctxt": 0 }, "value": "foo2b", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -986,6 +957,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1008,13 +980,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1057,6 +1027,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1079,13 +1050,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1107,7 +1076,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1138,7 +1106,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1156,7 +1123,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1178,7 +1144,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1196,7 +1161,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1217,7 +1181,6 @@ "ctxt": 0 }, "value": "foo2c", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1261,6 +1224,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1283,13 +1247,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1311,7 +1273,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1342,7 +1303,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1360,7 +1320,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1382,7 +1341,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1400,7 +1358,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1436,8 +1393,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1454,7 +1411,6 @@ "ctxt": 0 }, "value": "foo2b", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1468,7 +1424,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } } @@ -1504,8 +1459,8 @@ "ctxt": 0 }, "value": "r3b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1522,7 +1477,6 @@ "ctxt": 0 }, "value": "foo2c", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1542,7 +1496,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1568,7 +1521,6 @@ "ctxt": 0 }, "value": "constructor", - "typeAnnotation": null, "optional": false }, "params": [ @@ -1590,6 +1542,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1612,13 +1565,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1639,6 +1590,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1661,13 +1613,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1698,7 +1648,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -1719,6 +1668,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1741,13 +1691,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1766,6 +1714,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1788,13 +1737,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1827,7 +1774,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -1859,7 +1805,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "function": { @@ -1880,6 +1825,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1902,13 +1848,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1927,6 +1871,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1949,13 +1894,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1988,7 +1931,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -2020,7 +1962,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "function": { @@ -2041,6 +1982,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2063,13 +2005,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2088,6 +2028,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2110,13 +2051,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2149,7 +2088,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -2180,7 +2118,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2198,7 +2135,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2230,7 +2166,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "function": { @@ -2251,6 +2186,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2273,13 +2209,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2298,6 +2232,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2320,13 +2255,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2359,7 +2292,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -2390,7 +2322,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2408,7 +2339,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2440,7 +2370,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "function": { @@ -2461,6 +2390,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2483,13 +2413,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2508,6 +2436,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2530,13 +2459,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2569,7 +2496,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false } } @@ -2600,7 +2526,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2618,7 +2543,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2640,7 +2564,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2658,7 +2581,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2690,7 +2612,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "function": { @@ -2734,6 +2655,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2756,13 +2678,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2784,7 +2704,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2815,7 +2734,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2833,7 +2751,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2855,7 +2772,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2873,7 +2789,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2905,7 +2820,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "function": { @@ -2926,6 +2840,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2948,13 +2863,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2997,6 +2910,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3019,13 +2933,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3047,7 +2959,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3078,7 +2989,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3096,7 +3006,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3118,7 +3027,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3136,7 +3044,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3168,7 +3075,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "function": { @@ -3212,6 +3118,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3234,13 +3141,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3262,7 +3167,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3293,7 +3197,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3311,7 +3214,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3333,7 +3235,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3351,7 +3252,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3394,7 +3294,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3412,7 +3311,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3434,7 +3332,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3452,7 +3349,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3489,8 +3385,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -3507,7 +3403,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3521,7 +3416,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3535,7 +3429,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } } @@ -3571,8 +3464,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3596,7 +3489,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3607,7 +3499,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3623,7 +3514,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -3637,7 +3527,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -3673,8 +3562,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3698,7 +3587,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3709,7 +3597,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3725,7 +3612,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -3739,7 +3625,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -3775,8 +3660,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3800,7 +3685,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3811,7 +3695,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3827,7 +3710,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -3841,7 +3723,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } } @@ -3877,8 +3758,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3902,7 +3783,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3913,7 +3793,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3929,7 +3808,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -3943,7 +3821,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -3979,8 +3856,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4004,7 +3881,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4015,7 +3891,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4031,7 +3906,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -4045,7 +3919,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -4081,8 +3954,8 @@ "ctxt": 0 }, "value": "r8b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4106,7 +3979,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4117,7 +3989,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4133,7 +4004,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } }, @@ -4147,7 +4017,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -4183,8 +4052,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4208,7 +4077,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4219,7 +4087,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4256,8 +4123,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4281,7 +4148,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4292,7 +4158,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4308,7 +4173,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } } @@ -4344,8 +4208,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4369,7 +4233,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4380,7 +4243,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4407,7 +4269,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4434,7 +4295,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4452,7 +4312,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4474,7 +4333,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4492,7 +4350,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4526,6 +4383,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4548,13 +4406,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -4564,6 +4420,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4586,13 +4443,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": null, @@ -4614,7 +4469,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4628,6 +4482,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4650,13 +4505,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -4666,6 +4519,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4688,13 +4542,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -4719,7 +4571,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4743,7 +4594,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4757,6 +4607,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4779,13 +4630,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -4795,6 +4644,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4817,13 +4667,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -4848,7 +4696,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4872,7 +4719,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4886,6 +4732,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4908,13 +4755,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -4924,6 +4769,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4946,13 +4792,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -4977,7 +4821,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5006,7 +4849,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5024,7 +4866,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5050,7 +4891,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5064,6 +4904,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5086,13 +4927,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -5102,6 +4941,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5124,13 +4964,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -5155,7 +4993,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5184,7 +5021,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5202,7 +5038,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5228,7 +5063,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5242,6 +5076,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5264,13 +5099,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -5280,6 +5113,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5302,13 +5136,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -5333,7 +5165,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5362,7 +5193,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5380,7 +5210,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5402,7 +5231,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5420,7 +5248,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5446,7 +5273,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5474,7 +5300,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5503,7 +5328,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5521,7 +5345,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5543,7 +5366,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5561,7 +5383,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5587,7 +5408,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5601,6 +5421,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5623,13 +5444,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -5654,7 +5473,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5683,7 +5501,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5701,7 +5518,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5723,7 +5539,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5741,7 +5556,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5767,7 +5581,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5795,7 +5608,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5824,7 +5636,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5842,7 +5653,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5864,7 +5674,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -5882,7 +5691,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5920,6 +5728,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5942,7 +5751,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5968,7 +5776,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5988,7 +5795,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5996,8 +5802,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -6029,8 +5834,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6054,7 +5859,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6065,7 +5869,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6081,7 +5884,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -6095,7 +5897,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -6131,8 +5932,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6156,7 +5957,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6167,7 +5967,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6183,7 +5982,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -6197,7 +5995,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -6233,8 +6030,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6258,7 +6055,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6269,7 +6065,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6285,7 +6080,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -6299,7 +6093,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } } @@ -6335,8 +6128,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6360,7 +6153,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6371,7 +6163,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6387,7 +6178,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -6401,7 +6191,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -6437,8 +6226,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6462,7 +6251,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6473,7 +6261,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6489,7 +6276,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } }, @@ -6503,7 +6289,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -6539,8 +6324,8 @@ "ctxt": 0 }, "value": "r8b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6564,7 +6349,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6575,7 +6359,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6591,7 +6374,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } }, @@ -6605,7 +6387,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } @@ -6641,8 +6422,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6666,7 +6447,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6677,7 +6457,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6714,8 +6493,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6739,7 +6518,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6750,7 +6528,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6766,7 +6543,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } } @@ -6802,8 +6578,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -6827,7 +6603,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -6838,7 +6613,6 @@ "ctxt": 0 }, "value": "foo8", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference2/input.ts.json index d16dc0808978..8f691d90eb56 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -108,6 +106,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -130,13 +129,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -158,7 +155,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -189,7 +185,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -210,7 +205,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -228,7 +222,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -264,8 +257,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -282,7 +275,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -330,8 +322,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -348,7 +340,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -395,8 +386,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -413,7 +404,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -434,7 +424,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -473,8 +462,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -491,7 +480,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -531,7 +519,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -551,7 +538,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -588,8 +574,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -606,7 +592,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -627,7 +612,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -658,7 +642,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -678,7 +661,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithConstructorTypedArguments5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithConstructorTypedArguments5/input.ts.json index b6584cf84ba2..1747b85af1c3 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithConstructorTypedArguments5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithConstructorTypedArguments5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -68,7 +68,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -98,6 +97,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -120,13 +120,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -152,7 +150,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -165,8 +162,7 @@ } ] } - }, - "optional": false + } } } ], @@ -213,7 +209,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "property": { @@ -224,7 +219,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "computed": false @@ -272,7 +266,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -293,7 +286,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -328,6 +320,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -359,7 +352,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -389,6 +381,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -411,13 +404,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -443,7 +434,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -475,8 +465,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -508,8 +497,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -526,7 +515,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -540,7 +528,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false } } @@ -576,6 +563,7 @@ "ctxt": 0 }, "value": "arg2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -607,7 +595,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -637,6 +624,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -659,13 +647,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -675,6 +661,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -697,13 +684,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -729,7 +714,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -761,8 +745,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -794,8 +777,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -812,7 +795,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -826,7 +808,6 @@ "ctxt": 0 }, "value": "arg2", - "typeAnnotation": null, "optional": false } } @@ -862,6 +843,7 @@ "ctxt": 0 }, "value": "arg3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -893,7 +875,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -923,6 +904,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -939,8 +921,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -950,6 +931,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -966,8 +948,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -995,8 +976,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1028,8 +1008,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1046,7 +1026,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1060,7 +1039,6 @@ "ctxt": 0 }, "value": "arg3", - "typeAnnotation": null, "optional": false } } @@ -1081,7 +1059,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1102,6 +1079,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1133,7 +1111,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1163,6 +1140,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1185,13 +1163,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1201,6 +1177,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1223,13 +1200,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1255,7 +1230,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1268,8 +1242,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1316,7 +1289,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "property": { @@ -1327,7 +1299,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1386,7 +1357,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1407,7 +1377,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1442,8 +1411,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1460,7 +1429,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1474,7 +1442,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false } } @@ -1510,6 +1477,7 @@ "ctxt": 0 }, "value": "arg4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1541,7 +1509,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1571,6 +1538,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1587,8 +1555,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -1616,8 +1583,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1649,8 +1615,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1667,7 +1633,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1681,7 +1646,6 @@ "ctxt": 0 }, "value": "arg4", - "typeAnnotation": null, "optional": false } } @@ -1717,6 +1681,7 @@ "ctxt": 0 }, "value": "arg5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1748,7 +1713,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1795,8 +1759,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1828,8 +1791,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1846,7 +1809,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1860,7 +1822,6 @@ "ctxt": 0 }, "value": "arg5", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithFunctionTypedArguments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithFunctionTypedArguments/input.ts.json index 8af848feee89..03e606ef5bac 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithFunctionTypedArguments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithFunctionTypedArguments/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,6 +60,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -82,13 +83,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -114,15 +113,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -162,7 +159,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -208,7 +204,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -243,8 +238,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -261,7 +256,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -283,6 +277,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -305,13 +300,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -353,7 +346,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -396,8 +388,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -414,7 +406,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -436,6 +427,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -458,13 +450,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -506,7 +496,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -567,8 +556,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -585,7 +574,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -607,8 +595,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -648,7 +636,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -669,6 +656,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -691,13 +679,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -716,6 +702,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -739,6 +726,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -761,13 +749,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -793,15 +779,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -841,7 +825,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -855,7 +838,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -890,7 +872,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -911,7 +892,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -946,8 +926,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -964,7 +944,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1002,6 +981,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1024,13 +1004,11 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1097,7 +1075,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1140,8 +1117,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1158,7 +1135,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1192,8 +1168,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1248,8 +1224,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1266,7 +1242,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1305,6 +1280,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1327,13 +1303,11 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1370,7 +1344,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1425,7 +1398,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1446,6 +1418,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1468,13 +1441,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1493,6 +1464,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1516,6 +1488,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1538,13 +1511,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1570,15 +1541,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -1597,6 +1566,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1619,13 +1589,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1665,7 +1633,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1679,7 +1646,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1714,7 +1680,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1735,7 +1700,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1770,8 +1734,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1788,7 +1752,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1822,6 +1785,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1844,13 +1808,11 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1892,7 +1854,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1952,8 +1913,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1970,7 +1931,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2008,8 +1968,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -2101,8 +2061,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2119,7 +2079,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2153,8 +2112,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2238,7 +2197,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2259,6 +2217,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2281,13 +2240,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2306,6 +2263,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2328,13 +2286,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2377,8 +2333,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2395,7 +2351,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2429,6 +2384,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2451,13 +2407,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2512,8 +2466,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2530,7 +2484,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2564,8 +2517,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2620,8 +2573,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2638,7 +2591,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2672,6 +2624,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2694,13 +2647,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2772,8 +2723,8 @@ "ctxt": 0 }, "value": "r11b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2790,7 +2741,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2824,6 +2774,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2846,13 +2797,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2919,8 +2868,8 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2937,7 +2886,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2975,8 +2923,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -3070,7 +3018,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3091,7 +3038,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithFunctionTypedArguments2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithFunctionTypedArguments2/input.ts.json index 55c5ad5d416a..7c69733869ac 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithFunctionTypedArguments2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithFunctionTypedArguments2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,6 +60,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -82,13 +83,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -114,7 +113,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -122,8 +120,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -163,7 +160,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -209,7 +205,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -234,7 +229,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -264,6 +258,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -286,13 +281,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -317,7 +310,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -346,7 +338,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -373,7 +364,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -400,7 +390,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -433,6 +422,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -455,13 +445,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -486,7 +474,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -522,6 +509,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -544,13 +532,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -582,6 +568,7 @@ "ctxt": 0 }, "value": "i2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -604,7 +591,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -627,8 +613,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -660,6 +645,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -691,6 +677,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -713,13 +700,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -744,7 +729,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -773,7 +757,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -784,8 +767,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -817,8 +799,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -835,7 +817,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -849,7 +830,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -885,8 +865,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -903,7 +883,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -917,7 +896,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -971,8 +949,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -989,7 +967,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1003,7 +980,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false } } @@ -1039,8 +1015,8 @@ "ctxt": 0 }, "value": "r3b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1057,7 +1033,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1071,7 +1046,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1092,7 +1066,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1113,6 +1086,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1135,13 +1109,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1160,6 +1132,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1183,6 +1156,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1205,13 +1179,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1237,7 +1209,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1245,8 +1216,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -1286,7 +1256,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1300,7 +1269,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1335,7 +1303,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1356,7 +1323,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1391,8 +1357,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1409,7 +1375,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1435,7 +1400,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false } } @@ -1471,8 +1435,8 @@ "ctxt": 0 }, "value": "r4b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1489,7 +1453,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1515,7 +1478,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1551,8 +1513,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1569,7 +1531,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1595,7 +1556,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -1631,8 +1591,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1649,7 +1609,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1680,7 +1639,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false } } @@ -1728,7 +1686,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1749,6 +1706,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1771,13 +1729,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1796,6 +1752,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1819,6 +1776,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1841,13 +1799,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1873,7 +1829,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1881,8 +1836,7 @@ }, "isAbstract": false } - }, - "optional": false + } } }, { @@ -1901,6 +1855,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1923,13 +1878,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1969,7 +1922,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1983,7 +1935,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2018,7 +1969,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2039,7 +1989,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2074,8 +2023,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2092,7 +2041,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2117,7 +2065,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } }, @@ -2170,8 +2117,8 @@ "ctxt": 0 }, "value": "r7b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2188,7 +2135,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2213,7 +2159,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -2266,8 +2211,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2284,7 +2229,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2310,7 +2254,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false } }, @@ -2358,8 +2301,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2376,7 +2319,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2407,7 +2349,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithFunctionTypedArguments3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithFunctionTypedArguments3/input.ts.json index c307db7f6914..54d1fd1186d7 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithFunctionTypedArguments3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithFunctionTypedArguments3/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,6 +63,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -78,8 +80,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -117,6 +118,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -133,8 +135,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -158,8 +159,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -176,7 +176,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -197,6 +196,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -220,6 +220,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -242,13 +243,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -274,15 +273,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -325,6 +322,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -347,13 +345,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -375,7 +371,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -406,7 +401,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -427,7 +421,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -462,8 +455,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -480,7 +473,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -494,7 +486,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -530,6 +521,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -561,6 +553,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -577,8 +570,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -603,7 +595,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -632,7 +623,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -657,6 +647,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -679,13 +670,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -728,7 +717,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -739,8 +727,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -772,8 +759,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -790,7 +777,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -804,7 +790,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithFunctionTypedArguments4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithFunctionTypedArguments4/input.ts.json index 2e0a225be037..cdebf8fd1633 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithFunctionTypedArguments4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithFunctionTypedArguments4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": null, @@ -179,6 +175,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -210,6 +207,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -226,8 +224,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -252,7 +249,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -276,6 +272,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -292,8 +289,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -318,7 +314,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -328,8 +323,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -346,7 +340,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -367,6 +360,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -390,6 +384,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -412,13 +407,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -444,7 +437,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -452,8 +444,7 @@ }, "isAbstract": false } - }, - "optional": false + } } } ], @@ -496,6 +487,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -518,13 +510,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -546,7 +536,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -577,7 +566,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -598,7 +586,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -633,8 +620,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -651,7 +638,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -665,7 +651,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -701,6 +686,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -732,6 +718,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -748,8 +735,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -774,7 +760,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -803,7 +788,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -828,6 +812,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -850,13 +835,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -899,7 +882,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -910,8 +892,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -943,8 +924,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -961,7 +942,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -975,7 +955,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithFunctionTypedArguments5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithFunctionTypedArguments5/input.ts.json index 917899701942..fc974a4c73f2 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithFunctionTypedArguments5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithFunctionTypedArguments5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -68,7 +68,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -98,6 +97,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -120,13 +120,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -152,7 +150,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -164,8 +161,7 @@ } ] } - }, - "optional": false + } } } ], @@ -212,7 +208,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "property": { @@ -223,7 +218,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "computed": false @@ -271,7 +265,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -292,7 +285,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -327,8 +319,8 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -348,7 +340,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "value": { @@ -367,6 +358,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -389,13 +381,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -437,7 +427,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -479,8 +468,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -497,7 +486,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -511,7 +499,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false } } @@ -547,8 +534,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -565,7 +552,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -589,7 +575,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "value": { @@ -608,6 +593,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -630,13 +616,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -646,6 +630,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -668,13 +653,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -716,7 +699,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -762,8 +744,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -780,7 +762,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -804,7 +785,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "value": { @@ -823,6 +803,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -839,8 +820,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -850,6 +830,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -866,8 +847,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -910,7 +890,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -931,6 +910,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -962,7 +942,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -992,6 +971,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1014,13 +994,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1030,6 +1008,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1052,13 +1031,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1084,7 +1061,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1096,8 +1072,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1144,7 +1119,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false }, "property": { @@ -1155,7 +1129,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1214,7 +1187,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1235,7 +1207,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1270,8 +1241,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1288,7 +1259,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1302,7 +1272,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false } } @@ -1338,8 +1307,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1356,7 +1325,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1380,7 +1348,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "value": { @@ -1399,6 +1366,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1421,13 +1389,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1469,7 +1435,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1515,8 +1480,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1533,7 +1498,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1557,7 +1521,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "value": { @@ -1576,6 +1539,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1592,8 +1556,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -1651,8 +1614,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1669,7 +1632,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1693,7 +1655,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments/input.ts.json index 14ab647f2dd9..e641a91f9ac0 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -82,13 +83,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -114,15 +113,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -141,6 +138,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -164,6 +162,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -186,13 +185,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -218,15 +215,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -269,6 +264,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -292,6 +288,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -314,13 +311,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -346,15 +341,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -376,7 +369,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false } } @@ -407,7 +399,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -442,8 +433,8 @@ "ctxt": 0 }, "value": "r1b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -460,7 +451,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -482,8 +472,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -519,8 +509,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -575,8 +565,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -593,7 +583,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -615,6 +604,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -637,13 +627,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -678,6 +666,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -694,8 +683,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -750,8 +738,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -768,7 +756,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -790,6 +777,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -806,8 +794,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -843,6 +830,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -865,13 +853,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -920,8 +906,8 @@ "ctxt": 0 }, "value": "r3ii", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -938,7 +924,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -960,6 +945,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -976,8 +962,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1013,6 +998,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1029,8 +1015,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1080,6 +1065,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1111,7 +1097,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1153,7 +1138,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1181,8 +1165,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1214,6 +1197,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1245,7 +1229,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1287,7 +1270,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1315,8 +1297,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1348,8 +1329,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1366,7 +1347,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1388,6 +1368,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1410,12 +1391,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } ], "body": { @@ -1426,7 +1405,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1453,6 +1431,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1475,12 +1454,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } ], "body": { @@ -1491,7 +1468,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1532,8 +1508,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1550,7 +1526,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1572,6 +1547,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1594,12 +1570,10 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } ], "body": { @@ -1610,7 +1584,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1637,6 +1610,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1659,12 +1633,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } ], "body": { @@ -1675,7 +1647,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1701,7 +1672,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1722,6 +1692,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1744,13 +1715,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1793,8 +1762,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1811,7 +1780,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1833,6 +1801,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1855,13 +1824,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1872,7 +1839,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1899,6 +1865,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1921,13 +1888,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1938,7 +1903,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1979,8 +1943,8 @@ "ctxt": 0 }, "value": "r6b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1997,7 +1961,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2019,8 +1982,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2031,7 +1994,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2058,8 +2020,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2070,7 +2032,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2113,7 +2074,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2133,7 +2093,6 @@ "ctxt": 0 }, "value": "other2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2154,6 +2113,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2176,13 +2136,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2225,8 +2183,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2243,7 +2201,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2265,6 +2222,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2287,13 +2245,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2304,7 +2260,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2331,6 +2286,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2353,13 +2309,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2370,7 +2324,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2411,8 +2364,8 @@ "ctxt": 0 }, "value": "r7b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2429,7 +2382,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2451,8 +2403,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2463,7 +2415,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2490,8 +2441,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2502,7 +2453,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2543,8 +2493,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2561,7 +2511,6 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2610,7 +2559,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2628,7 +2576,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2649,7 +2596,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2670,6 +2616,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2693,6 +2640,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2715,13 +2663,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2747,15 +2693,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -2774,6 +2718,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2797,6 +2742,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2819,13 +2765,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2851,15 +2795,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -2902,6 +2844,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2925,6 +2868,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2947,13 +2891,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2979,15 +2921,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3009,7 +2949,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false } } @@ -3040,7 +2979,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3058,7 +2996,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3079,7 +3016,6 @@ "ctxt": 0 }, "value": "other3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3100,6 +3036,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3122,13 +3059,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3171,8 +3106,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3189,7 +3124,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3211,6 +3145,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3233,13 +3168,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -3250,7 +3183,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3277,6 +3209,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3299,13 +3232,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -3316,7 +3247,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3359,7 +3289,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3377,7 +3306,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2/input.ts.json index e854c538634e..c5b19e0b3937 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "onlyT", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -65,6 +63,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -88,6 +87,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -110,13 +110,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -142,15 +140,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -169,6 +165,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -192,6 +189,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -214,13 +212,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -246,15 +242,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -297,6 +291,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -320,6 +315,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -342,13 +338,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -374,15 +368,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -404,7 +396,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false } } @@ -435,7 +426,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -470,6 +460,7 @@ "ctxt": 0 }, "value": "r1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -493,6 +484,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -509,8 +501,7 @@ }, "members": [] } - }, - "optional": false + } } ], "typeParams": null, @@ -532,8 +523,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -550,7 +540,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -572,6 +561,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -588,8 +578,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -625,6 +614,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -641,8 +631,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -682,7 +671,6 @@ "ctxt": 0 }, "value": "other2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -703,6 +691,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -725,13 +714,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -774,8 +761,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -792,7 +779,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -814,6 +800,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -836,13 +823,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -853,7 +838,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -880,6 +864,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -902,13 +887,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -919,7 +902,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "async": false, @@ -960,8 +942,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -978,7 +960,6 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -999,7 +980,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1038,8 +1018,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1056,7 +1036,6 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1106,7 +1085,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1124,7 +1102,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1145,7 +1122,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1166,6 +1142,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1189,6 +1166,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1211,13 +1189,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1243,15 +1219,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -1270,6 +1244,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1293,6 +1268,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1315,13 +1291,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1347,15 +1321,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -1398,6 +1370,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1421,6 +1394,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1443,13 +1417,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1475,15 +1447,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1505,7 +1475,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false } } @@ -1536,7 +1505,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1554,7 +1522,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1575,7 +1542,6 @@ "ctxt": 0 }, "value": "other3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1596,6 +1562,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1618,13 +1585,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1667,8 +1632,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1685,7 +1650,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1707,6 +1671,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1729,13 +1694,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1746,7 +1709,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1773,6 +1735,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1795,13 +1758,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1812,7 +1773,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1853,8 +1813,8 @@ "ctxt": 0 }, "value": "r7b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1871,7 +1831,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1893,8 +1852,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1905,7 +1864,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1932,8 +1890,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1944,7 +1902,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1987,7 +1944,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2005,7 +1961,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2033,7 +1988,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -2052,7 +2006,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -2076,7 +2029,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "members": [ @@ -2095,7 +2047,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -2112,7 +2063,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2133,6 +2083,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2155,13 +2106,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2180,6 +2129,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2203,6 +2153,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2225,13 +2176,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2257,15 +2206,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -2284,6 +2231,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2307,6 +2255,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2329,13 +2278,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2361,15 +2308,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -2412,6 +2357,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2435,6 +2381,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2457,13 +2404,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2489,15 +2434,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2519,7 +2462,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false } } @@ -2550,7 +2492,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2585,8 +2526,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2603,7 +2544,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2624,7 +2564,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2635,7 +2574,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2659,8 +2597,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2678,7 +2616,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -2689,7 +2626,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2718,8 +2654,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2737,7 +2673,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "property": { @@ -2748,7 +2683,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2786,7 +2720,6 @@ "ctxt": 0 }, "value": "TU", - "typeAnnotation": null, "optional": false }, "body": { @@ -2807,7 +2740,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2828,6 +2760,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2851,6 +2784,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2873,13 +2807,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2905,15 +2837,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -2932,6 +2862,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2955,6 +2886,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2977,13 +2909,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3009,15 +2939,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -3060,6 +2988,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3083,6 +3012,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3105,13 +3035,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3137,15 +3065,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3167,7 +3093,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false } } @@ -3198,7 +3123,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3219,7 +3143,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3254,6 +3177,7 @@ "ctxt": 0 }, "value": "r1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3277,6 +3201,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3293,8 +3218,7 @@ }, "members": [] } - }, - "optional": false + } } ], "typeParams": null, @@ -3316,8 +3240,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -3334,7 +3257,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3356,6 +3278,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3372,8 +3295,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -3409,6 +3331,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3425,8 +3348,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -3466,7 +3388,6 @@ "ctxt": 0 }, "value": "other2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3487,6 +3408,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3509,13 +3431,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3558,8 +3478,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3576,7 +3496,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3598,6 +3517,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3620,13 +3540,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -3637,7 +3555,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3664,6 +3581,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3686,13 +3604,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -3703,7 +3619,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3744,8 +3659,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3762,7 +3677,6 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3783,7 +3697,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3822,8 +3735,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3840,7 +3753,6 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3890,7 +3802,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3908,7 +3819,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3929,7 +3839,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3950,6 +3859,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3973,6 +3883,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3995,13 +3906,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4027,15 +3936,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -4054,6 +3961,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4077,6 +3985,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4099,13 +4008,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4131,15 +4038,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -4182,6 +4087,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4205,6 +4111,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4227,13 +4134,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4259,15 +4164,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -4289,7 +4192,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false } } @@ -4320,7 +4222,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4338,7 +4239,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4360,7 +4260,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4378,7 +4277,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4399,7 +4297,6 @@ "ctxt": 0 }, "value": "other3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4420,6 +4317,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4442,13 +4340,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4491,8 +4387,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4509,7 +4405,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4531,6 +4426,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4553,13 +4449,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -4570,7 +4464,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4597,6 +4490,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4619,13 +4513,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -4636,7 +4528,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4677,8 +4568,8 @@ "ctxt": 0 }, "value": "r7b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4695,7 +4586,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4717,8 +4607,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4729,7 +4619,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4756,8 +4645,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4768,7 +4657,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "async": false, @@ -4811,7 +4699,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4829,7 +4716,6 @@ "ctxt": 0 }, "value": "RegExp", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4857,7 +4743,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -4876,7 +4761,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -4900,7 +4784,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "members": [ @@ -4919,7 +4802,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -4936,7 +4818,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4957,6 +4838,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4979,13 +4861,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -5004,6 +4884,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5027,6 +4908,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5049,13 +4931,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5081,15 +4961,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -5108,6 +4986,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5131,6 +5010,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5153,13 +5033,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5185,15 +5063,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -5236,6 +5112,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5259,6 +5136,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5281,13 +5159,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -5313,15 +5189,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5343,7 +5217,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false } } @@ -5374,7 +5247,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5409,8 +5281,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5427,7 +5299,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5448,7 +5319,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -5459,7 +5329,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5483,8 +5352,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5502,7 +5371,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -5513,7 +5381,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5542,8 +5409,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5561,7 +5428,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "property": { @@ -5572,7 +5438,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments3/input.ts.json index 99de676596fe..7619c7fd8ad5 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -107,6 +106,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -129,13 +129,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -161,15 +159,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -188,6 +184,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -211,6 +208,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -233,13 +231,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -265,15 +261,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -316,6 +310,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -339,6 +334,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -361,13 +357,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -393,15 +387,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -423,7 +415,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false } } @@ -454,7 +445,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -489,8 +479,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -507,7 +497,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -546,6 +535,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -562,8 +552,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -604,6 +593,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -626,13 +616,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -681,8 +669,8 @@ "ctxt": 0 }, "value": "r1ii", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -699,7 +687,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -738,8 +725,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -780,8 +767,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -830,8 +817,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -848,7 +835,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -887,6 +873,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -903,8 +890,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -945,6 +931,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -967,13 +954,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1028,8 +1013,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1046,7 +1031,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1079,6 +1063,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1101,13 +1086,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1148,6 +1131,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1164,8 +1148,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -1220,8 +1203,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1238,7 +1221,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1271,8 +1253,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1313,8 +1295,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1369,8 +1351,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1387,7 +1369,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1408,7 +1389,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1433,8 +1413,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1475,8 +1455,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1523,7 +1503,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "members": [ @@ -1542,7 +1521,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -1566,7 +1544,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "members": [ @@ -1585,7 +1562,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -1617,8 +1593,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1635,7 +1611,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1656,7 +1631,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1667,7 +1641,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1691,6 +1664,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1707,8 +1681,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "body": { @@ -1726,7 +1699,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "property": { @@ -1737,7 +1709,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1766,6 +1737,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1788,13 +1760,11 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1812,7 +1782,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "property": { @@ -1823,7 +1792,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1851,7 +1819,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1872,6 +1839,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1894,13 +1862,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1919,6 +1885,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1942,6 +1909,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1964,13 +1932,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1996,15 +1962,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -2023,6 +1987,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2046,6 +2011,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2068,13 +2034,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2100,15 +2064,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -2151,6 +2113,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2174,6 +2137,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2196,13 +2160,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2228,15 +2190,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2258,7 +2218,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false } } @@ -2289,7 +2248,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2310,7 +2268,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2345,8 +2302,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2363,7 +2320,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2402,8 +2358,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2444,8 +2400,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2494,8 +2450,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2512,7 +2468,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2545,8 +2500,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2587,8 +2542,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2643,8 +2598,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2661,7 +2616,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2694,6 +2648,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2716,13 +2671,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2763,6 +2716,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2779,8 +2733,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "body": { @@ -2835,6 +2788,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2858,6 +2812,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2874,8 +2829,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -2897,8 +2851,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2930,8 +2883,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2948,7 +2901,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2962,7 +2914,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2984,6 +2935,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3007,6 +2959,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3023,8 +2976,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -3046,8 +2998,7 @@ } } } - }, - "optional": false + } } ], "body": { @@ -3066,6 +3017,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3088,13 +3040,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -3135,6 +3085,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3158,6 +3109,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3174,8 +3126,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -3197,8 +3148,7 @@ } } } - }, - "optional": false + } } ], "body": { @@ -3248,8 +3198,8 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3266,7 +3216,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3280,7 +3229,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -3302,6 +3250,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3325,6 +3274,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3341,8 +3291,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -3364,8 +3313,7 @@ } } } - }, - "optional": false + } } ], "body": { @@ -3384,6 +3332,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3406,13 +3355,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -3453,6 +3400,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3476,6 +3424,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3492,8 +3441,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -3515,8 +3463,7 @@ } } } - }, - "optional": false + } } ], "body": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithNonSymmetricSubtypes/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithNonSymmetricSubtypes/input.ts.json index fc899bd84d38..5bd74042aa6f 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithNonSymmetricSubtypes/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithNonSymmetricSubtypes/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -84,6 +82,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -106,13 +105,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -155,6 +152,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -177,13 +175,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -205,7 +201,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false } } @@ -236,7 +231,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -271,6 +265,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -302,7 +297,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -344,7 +338,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -372,8 +365,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -405,6 +397,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -436,7 +429,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -478,7 +470,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -506,8 +497,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -539,8 +529,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -557,7 +547,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -571,7 +560,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -585,7 +573,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -621,8 +608,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -639,7 +626,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -653,7 +639,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -667,7 +652,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -703,6 +687,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -734,7 +719,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -762,8 +746,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -795,6 +778,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -826,7 +810,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -854,8 +837,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -887,8 +869,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -905,7 +887,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -919,7 +900,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -933,7 +913,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -969,8 +948,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -987,7 +966,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1001,7 +979,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1015,7 +992,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1051,8 +1027,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1069,7 +1045,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1083,7 +1058,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -1097,7 +1071,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1133,8 +1106,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1151,7 +1124,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1165,7 +1137,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -1179,7 +1150,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1215,8 +1185,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1233,7 +1203,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1247,7 +1216,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -1261,7 +1229,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -1297,8 +1264,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1315,7 +1282,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1329,7 +1295,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -1343,7 +1308,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1379,6 +1343,7 @@ "ctxt": 0 }, "value": "s1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1402,6 +1367,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1424,13 +1390,11 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1452,8 +1416,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1485,6 +1448,7 @@ "ctxt": 0 }, "value": "s2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1508,6 +1472,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1524,8 +1489,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -1547,8 +1511,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1580,8 +1543,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1598,7 +1561,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1612,7 +1574,6 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, "optional": false } }, @@ -1626,7 +1587,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } } @@ -1662,8 +1622,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1680,7 +1640,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1694,7 +1653,6 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, "optional": false } }, @@ -1708,7 +1666,6 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectLiteralArgs/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectLiteralArgs/input.ts.json index 9ffef1ed6b92..71b91765f54b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectLiteralArgs/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectLiteralArgs/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -68,7 +68,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -97,7 +96,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -121,7 +119,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -150,7 +147,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -160,8 +156,7 @@ } ] } - }, - "optional": false + } } } ], @@ -194,7 +189,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -225,7 +219,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -260,8 +253,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -278,7 +271,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -302,7 +294,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -325,7 +316,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -378,8 +368,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -396,7 +386,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -420,7 +409,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -443,7 +431,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -491,8 +478,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -509,7 +496,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -533,7 +519,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -544,7 +529,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } }, @@ -558,7 +542,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -569,7 +552,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -608,8 +590,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -626,7 +608,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -650,7 +631,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -673,7 +653,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -718,7 +697,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgs/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgs/input.ts.json index 54d3c473c4cf..8318a1b36f78 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgs/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgs/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -216,7 +210,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -258,7 +251,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -279,7 +271,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -300,6 +291,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -322,7 +314,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -348,7 +339,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -356,8 +346,7 @@ ] } } - }, - "optional": false + } } }, { @@ -376,6 +365,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -398,7 +388,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -424,7 +413,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -432,8 +420,7 @@ ] } } - }, - "optional": false + } } } ], @@ -476,6 +463,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -498,13 +486,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -526,7 +512,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -557,7 +542,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -592,8 +576,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -610,7 +594,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -637,7 +620,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -674,8 +656,8 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -692,7 +674,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -719,7 +700,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -756,8 +736,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -774,7 +754,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -788,7 +767,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } }, @@ -802,7 +780,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } } @@ -838,8 +815,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -856,7 +833,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -870,7 +846,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } }, @@ -884,7 +859,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgs2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgs2/input.ts.json index c4251bd9dc13..9a5754d6c012 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgs2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgs2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -279,6 +270,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -310,7 +302,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -339,7 +330,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -363,7 +353,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -392,7 +381,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -402,8 +390,7 @@ } ] } - }, - "optional": false + } } } ], @@ -453,7 +440,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -464,7 +450,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -487,7 +472,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -498,7 +482,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -534,7 +517,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -552,7 +534,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -574,7 +555,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -592,7 +572,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -628,8 +607,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -646,7 +625,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -670,7 +648,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -688,7 +665,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -705,7 +681,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -723,7 +698,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -765,8 +739,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -783,7 +757,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -807,7 +780,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -825,7 +797,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -842,7 +813,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -860,7 +830,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -887,7 +856,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -908,6 +876,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -939,7 +908,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -968,7 +936,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -992,7 +959,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1021,7 +987,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1031,8 +996,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1073,6 +1037,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1095,13 +1060,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1119,7 +1082,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1130,7 +1092,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1168,7 +1129,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1186,7 +1146,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1208,7 +1167,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1226,7 +1184,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1262,8 +1219,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1280,7 +1237,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1304,7 +1260,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1322,7 +1277,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1339,7 +1293,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1357,7 +1310,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1389,7 +1341,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1416,7 +1367,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1437,7 +1387,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1470,7 +1419,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1499,7 +1447,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1523,7 +1470,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1552,7 +1498,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1588,6 +1533,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1610,7 +1556,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1636,7 +1581,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1656,7 +1600,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1664,8 +1607,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1697,8 +1639,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1715,7 +1657,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1729,7 +1670,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints/input.ts.json index ddec5435b7a3..12b79a99842f 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +158,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -210,7 +205,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -236,7 +230,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -262,7 +255,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -304,7 +296,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -325,7 +316,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -346,6 +336,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -368,7 +359,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -394,7 +384,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -402,8 +391,7 @@ ] } } - }, - "optional": false + } } }, { @@ -422,6 +410,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -444,7 +433,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -470,7 +458,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -478,8 +465,7 @@ ] } } - }, - "optional": false + } } } ], @@ -522,6 +508,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -544,13 +531,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -572,7 +557,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -603,7 +587,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -630,7 +613,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -689,8 +671,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -707,7 +689,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -734,7 +715,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -771,8 +751,8 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -789,7 +769,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -816,7 +795,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -853,8 +831,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -871,7 +849,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -885,7 +862,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } }, @@ -899,7 +875,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } } @@ -935,8 +910,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -953,7 +928,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -967,7 +941,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } }, @@ -981,7 +954,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } } @@ -1002,7 +974,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1023,6 +994,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1045,7 +1017,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1071,7 +1042,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1079,8 +1049,7 @@ ] } } - }, - "optional": false + } } }, { @@ -1099,6 +1068,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1121,7 +1091,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1147,7 +1116,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1155,8 +1123,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1199,6 +1166,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1221,13 +1189,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1249,7 +1215,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1280,7 +1245,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1298,7 +1262,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1334,8 +1297,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1352,7 +1315,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1366,7 +1328,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } }, @@ -1380,7 +1341,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } } @@ -1416,8 +1376,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1434,7 +1394,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1448,7 +1407,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } }, @@ -1462,7 +1420,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints2/input.ts.json index 05cd05f6baf8..099cf5bffeb9 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -195,6 +189,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -226,7 +221,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -255,7 +249,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -279,7 +272,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -308,7 +300,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -318,8 +309,7 @@ } ] } - }, - "optional": false + } } } ], @@ -362,6 +352,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -384,13 +375,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -412,7 +401,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false } } @@ -443,7 +431,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -461,7 +448,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -497,8 +483,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -515,7 +501,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -539,7 +524,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -557,7 +541,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -574,7 +557,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -592,7 +574,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -634,8 +615,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -652,7 +633,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -676,7 +656,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -694,7 +673,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -711,7 +689,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -729,7 +706,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -761,7 +737,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -788,7 +763,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -821,7 +795,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -850,7 +823,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -871,7 +843,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -892,6 +863,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -914,7 +886,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -940,7 +911,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -948,8 +918,7 @@ ] } } - }, - "optional": false + } } } ], @@ -992,6 +961,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1014,13 +984,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1042,7 +1010,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false } } @@ -1073,7 +1040,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1091,7 +1057,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1127,6 +1092,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1149,7 +1115,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1175,7 +1140,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1183,8 +1147,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1216,8 +1179,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1234,7 +1197,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1248,7 +1210,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false } } @@ -1269,7 +1230,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1290,6 +1250,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1312,13 +1273,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1337,6 +1296,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1360,6 +1320,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1382,13 +1343,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1414,15 +1373,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -1462,7 +1419,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1508,7 +1464,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1526,7 +1481,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1562,8 +1516,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1580,7 +1534,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1601,7 +1554,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1626,8 +1578,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1638,7 +1590,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1679,8 +1630,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1697,7 +1648,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1718,7 +1668,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1743,8 +1692,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1755,7 +1704,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1796,8 +1744,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1814,7 +1762,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1872,8 +1819,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1890,7 +1837,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1923,8 +1869,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1935,7 +1881,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3/input.ts.json index 1b10147bcfcd..e63d33b4c416 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -174,7 +169,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -200,7 +194,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": null, @@ -240,7 +233,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -258,7 +250,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -279,6 +270,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -310,7 +302,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -339,7 +330,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -363,7 +353,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -392,7 +381,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -402,8 +390,7 @@ } ] } - }, - "optional": false + } } } ], @@ -446,6 +433,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -468,13 +456,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -496,7 +482,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false } } @@ -527,7 +512,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -545,7 +529,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -581,8 +564,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -599,7 +582,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -623,7 +605,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -641,7 +622,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -658,7 +638,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -676,7 +655,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -703,7 +681,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -724,6 +701,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -746,13 +724,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -795,6 +771,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -817,13 +794,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -845,7 +820,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false } } @@ -876,7 +850,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -894,7 +867,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -916,7 +888,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -943,7 +914,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -972,7 +942,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -996,7 +965,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1025,7 +993,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1066,8 +1033,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1084,7 +1051,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1108,7 +1074,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1126,7 +1091,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1143,7 +1107,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1161,7 +1124,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1203,8 +1165,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1221,7 +1183,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1245,7 +1206,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -1263,7 +1223,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1280,7 +1239,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": { @@ -1298,7 +1256,6 @@ "ctxt": 0 }, "value": "Derived2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1325,7 +1282,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1346,6 +1302,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1369,6 +1326,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1391,13 +1349,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1423,15 +1379,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -1450,6 +1404,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1472,13 +1427,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1518,7 +1471,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1564,7 +1516,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1582,7 +1533,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1618,8 +1568,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1636,7 +1586,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1658,8 +1607,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1670,7 +1619,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1696,7 +1644,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1735,8 +1682,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1753,7 +1700,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1775,8 +1721,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1787,7 +1733,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1813,7 +1758,6 @@ "ctxt": 0 }, "value": "Derived", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1852,8 +1796,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1870,7 +1814,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1892,8 +1835,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1904,7 +1847,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4/input.ts.json index 24e4bbfd00fb..895bc0941b8f 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints4/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +158,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -210,7 +205,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -231,6 +225,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -253,13 +248,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -278,6 +271,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -300,13 +294,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -347,6 +339,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -369,13 +362,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -386,7 +377,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "async": false, @@ -422,7 +412,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -443,7 +432,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -461,7 +449,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -497,6 +484,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -519,13 +507,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -557,6 +543,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -579,13 +566,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -617,8 +602,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -635,7 +620,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -649,7 +633,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -663,7 +646,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -699,8 +681,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -717,7 +699,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -731,7 +712,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -745,7 +725,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -781,8 +760,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -799,7 +778,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -813,7 +791,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -837,7 +814,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -865,7 +841,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -876,7 +851,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -915,8 +889,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -933,7 +907,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -991,8 +964,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1009,7 +982,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1068,8 +1040,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1086,7 +1058,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1145,8 +1116,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1163,7 +1134,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1223,8 +1193,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1241,7 +1211,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1327,8 +1296,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1345,7 +1314,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1416,7 +1384,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1460,8 +1427,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1478,7 +1445,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1492,7 +1458,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1506,7 +1471,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -1542,8 +1506,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1560,7 +1524,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1574,7 +1537,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1588,7 +1550,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -1616,7 +1577,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1636,7 +1596,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1675,7 +1634,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1696,7 +1654,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1714,7 +1671,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5/input.ts.json index 604332fe659c..32f165f5bfc6 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndConstraints5/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +158,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -210,7 +205,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -231,6 +225,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -253,13 +248,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -278,6 +271,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -300,13 +294,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -347,6 +339,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -369,13 +362,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -386,7 +377,6 @@ "ctxt": 0 }, "value": "t2", - "typeAnnotation": null, "optional": false }, "async": false, @@ -422,7 +412,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -443,7 +432,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -461,7 +449,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -497,6 +484,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -519,13 +507,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -557,6 +543,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -579,13 +566,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -617,8 +602,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -635,7 +620,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -649,7 +633,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -663,7 +646,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -699,8 +681,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -717,7 +699,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -788,7 +769,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -832,8 +812,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -850,7 +830,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -864,7 +843,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -878,7 +856,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -906,7 +883,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -926,7 +902,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -965,7 +940,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -986,7 +960,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1004,7 +977,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndIndexers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndIndexers/input.ts.json index 705abc1ce187..cbbf9f6df2b7 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndIndexers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndIndexers/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -98,7 +96,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -129,7 +126,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -164,6 +160,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -190,6 +187,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -206,8 +204,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -232,7 +229,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -256,6 +252,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -272,8 +269,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -298,7 +294,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -313,8 +308,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -346,8 +340,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -364,7 +358,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -378,7 +371,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -399,7 +391,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -420,6 +411,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -442,13 +434,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -491,6 +481,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -517,6 +508,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -533,8 +525,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -559,7 +550,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -583,6 +573,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -599,8 +590,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -625,7 +615,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -640,8 +629,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -673,8 +661,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -691,7 +679,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -705,7 +692,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -741,8 +727,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -759,7 +745,6 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, "optional": false }, "property": { @@ -802,8 +787,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -820,7 +805,6 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, "optional": false }, "property": { @@ -870,7 +854,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -888,7 +871,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndIndexersErrors/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndIndexersErrors/input.ts.json index 775117ad6c11..02029b03fb5d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndIndexersErrors/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndIndexersErrors/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -98,7 +96,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -129,7 +126,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -149,7 +145,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -170,6 +165,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -192,13 +188,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -241,6 +235,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -267,6 +262,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -283,8 +279,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -309,7 +304,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -333,6 +327,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -349,8 +344,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -375,7 +369,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -390,8 +383,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -423,8 +415,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -441,7 +433,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -455,7 +446,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -493,7 +483,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -513,7 +502,6 @@ "ctxt": 0 }, "value": "other3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -534,6 +522,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -556,13 +545,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -605,6 +592,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -631,6 +619,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -647,8 +636,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -673,7 +661,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -697,6 +684,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -713,8 +701,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -739,7 +726,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -754,8 +740,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -787,8 +772,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -805,7 +790,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -819,7 +803,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -855,8 +838,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -873,7 +856,6 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, "optional": false }, "property": { @@ -916,8 +898,8 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -934,7 +916,6 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, "optional": false }, "property": { @@ -982,6 +963,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1004,13 +986,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -1027,7 +1007,6 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1072,7 +1051,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1090,7 +1068,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1112,7 +1089,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1130,7 +1106,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndNumericIndexer/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndNumericIndexer/input.ts.json index dab9fd67ebd6..b963b20e34d1 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndNumericIndexer/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndNumericIndexer/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -98,7 +96,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -129,7 +126,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -164,6 +160,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -190,6 +187,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -206,8 +204,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -232,7 +229,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -247,8 +243,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -280,8 +275,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -298,7 +293,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -312,7 +306,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -333,7 +326,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -354,6 +346,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -376,13 +369,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -425,6 +416,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -451,6 +443,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -467,8 +460,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -493,7 +485,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -508,8 +499,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -541,8 +531,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -559,7 +549,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -573,7 +562,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -611,7 +599,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -631,7 +618,6 @@ "ctxt": 0 }, "value": "other2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -652,6 +638,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -674,13 +661,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -723,6 +708,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -749,6 +735,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -765,8 +752,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -791,7 +777,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -806,8 +791,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -839,8 +823,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -857,7 +841,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -871,7 +854,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -907,8 +889,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -925,7 +907,6 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, "optional": false }, "property": { @@ -970,7 +951,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -988,7 +968,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1009,7 +988,6 @@ "ctxt": 0 }, "value": "other3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1030,6 +1008,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1052,13 +1031,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1101,6 +1078,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1127,6 +1105,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1143,8 +1122,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1169,7 +1147,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1184,8 +1161,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1217,8 +1193,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1235,7 +1211,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1249,7 +1224,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1285,8 +1259,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -1303,7 +1277,6 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1348,7 +1321,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1366,7 +1338,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1388,7 +1359,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1406,7 +1376,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndStringIndexer/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndStringIndexer/input.ts.json index 71aa3c4efd5a..e3a363a55fcf 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndStringIndexer/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithObjectTypeArgsAndStringIndexer/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -59,13 +59,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -98,7 +96,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -129,7 +126,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -164,6 +160,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -190,6 +187,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -206,8 +204,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -232,7 +229,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -247,8 +243,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -280,8 +275,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -298,7 +293,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -312,7 +306,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -333,7 +326,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -354,6 +346,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -376,13 +369,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -425,6 +416,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -451,6 +443,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -467,8 +460,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -493,7 +485,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -508,8 +499,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -541,8 +531,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -559,7 +549,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -573,7 +562,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -611,7 +599,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -631,7 +618,6 @@ "ctxt": 0 }, "value": "other2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -652,6 +638,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -674,13 +661,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -723,6 +708,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -749,6 +735,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -765,8 +752,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -791,7 +777,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -806,8 +791,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -839,8 +823,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -857,7 +841,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -871,7 +854,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -907,6 +889,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -929,13 +912,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -952,7 +933,6 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1002,7 +982,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1020,7 +999,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1041,7 +1019,6 @@ "ctxt": 0 }, "value": "other3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1062,6 +1039,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1084,13 +1062,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1133,6 +1109,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1159,6 +1136,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1175,8 +1153,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1201,7 +1178,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1216,8 +1192,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1249,8 +1224,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1267,7 +1242,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1281,7 +1255,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1317,6 +1290,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1339,13 +1313,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -1362,7 +1334,6 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1412,7 +1383,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1430,7 +1400,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1452,7 +1421,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1470,7 +1438,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments/input.ts.json index 2aefdb41183e..e1a0835151dd 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "NonGenericParameter", - "typeAnnotation": null, "optional": false }, "body": { @@ -59,6 +58,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -90,6 +90,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -106,8 +107,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -145,6 +145,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -161,8 +162,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -186,8 +186,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -204,7 +203,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -225,6 +223,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -247,12 +246,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -292,7 +289,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -343,8 +339,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -361,7 +357,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -375,7 +370,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -411,6 +405,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -442,6 +437,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -464,13 +460,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -495,7 +489,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -524,7 +517,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -535,8 +527,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -568,8 +559,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -586,7 +577,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -600,7 +590,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -631,7 +620,6 @@ "ctxt": 0 }, "value": "GenericParameter", - "typeAnnotation": null, "optional": false }, "body": { @@ -652,7 +640,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -673,6 +660,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -704,6 +692,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -726,13 +715,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -770,6 +757,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -786,8 +774,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -812,7 +799,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -822,8 +808,7 @@ } ] } - }, - "optional": false + } } } ], @@ -856,7 +841,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false } } @@ -887,7 +871,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -922,6 +905,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -953,6 +937,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -969,8 +954,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1008,6 +992,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1024,8 +1009,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1049,8 +1033,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1082,8 +1065,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1100,7 +1083,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1114,7 +1096,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1150,6 +1131,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1181,6 +1163,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1203,13 +1186,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1252,7 +1233,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1277,6 +1257,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1293,8 +1274,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1319,7 +1299,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1348,7 +1327,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1359,8 +1337,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1392,8 +1369,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1410,7 +1387,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1424,7 +1400,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1445,7 +1420,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1466,6 +1440,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1497,6 +1472,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1519,13 +1495,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1563,6 +1537,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1585,13 +1560,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1601,6 +1574,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1623,13 +1597,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnnotation": { @@ -1653,8 +1625,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1687,7 +1658,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false } } @@ -1718,7 +1688,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1753,8 +1722,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1771,7 +1740,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1785,7 +1753,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1821,8 +1788,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1839,7 +1806,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1853,7 +1819,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1874,7 +1839,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1895,6 +1859,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1917,13 +1882,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1942,6 +1905,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1973,6 +1937,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1995,13 +1960,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2039,6 +2002,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2061,13 +2025,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2077,6 +2039,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2099,13 +2062,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnnotation": { @@ -2129,8 +2090,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2163,7 +2123,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false } } @@ -2194,7 +2153,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2229,8 +2187,8 @@ "ctxt": 0 }, "value": "r13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2247,7 +2205,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2273,7 +2230,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2309,6 +2265,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2340,6 +2297,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2362,13 +2320,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2411,7 +2367,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2436,6 +2391,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2452,8 +2408,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2478,7 +2433,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2507,7 +2461,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2518,8 +2471,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2551,6 +2503,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2582,6 +2535,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2604,13 +2558,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2653,7 +2605,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2678,6 +2629,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2694,8 +2646,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2720,7 +2671,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2749,7 +2699,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2760,8 +2709,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2793,8 +2741,8 @@ "ctxt": 0 }, "value": "r14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2811,7 +2759,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2837,7 +2784,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } @@ -2873,8 +2819,8 @@ "ctxt": 0 }, "value": "r15", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2891,7 +2837,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2917,7 +2862,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments2/input.ts.json index 8b37469ce717..43cb5f8d958b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments2/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "NonGenericParameter", - "typeAnnotation": null, "optional": false }, "body": { @@ -59,6 +58,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -90,6 +90,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -106,8 +107,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -145,6 +145,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -161,8 +162,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -186,8 +186,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -204,7 +203,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -225,6 +223,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -247,12 +246,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -285,7 +282,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false } } @@ -321,6 +317,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -352,6 +349,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -374,13 +372,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -405,7 +401,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -434,7 +429,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -455,7 +449,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -466,8 +459,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -499,8 +491,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -517,7 +509,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -531,7 +522,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -562,7 +552,6 @@ "ctxt": 0 }, "value": "GenericParameter", - "typeAnnotation": null, "optional": false }, "body": { @@ -583,7 +572,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -604,6 +592,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -635,6 +624,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -657,13 +647,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -701,6 +689,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -717,8 +706,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -743,7 +731,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -753,8 +740,7 @@ } ] } - }, - "optional": false + } } } ], @@ -787,7 +773,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false } } @@ -818,7 +803,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -853,6 +837,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -884,6 +869,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -906,13 +892,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -937,7 +921,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -966,7 +949,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -977,8 +959,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1010,8 +991,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1028,7 +1009,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1042,7 +1022,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1063,7 +1042,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1084,6 +1062,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1115,6 +1094,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1137,13 +1117,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1181,6 +1159,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1203,13 +1182,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1219,6 +1196,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1241,13 +1219,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnnotation": { @@ -1271,8 +1247,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1305,7 +1280,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false } } @@ -1336,7 +1310,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1371,6 +1344,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1402,6 +1376,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1424,13 +1399,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1440,6 +1413,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1462,13 +1436,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1511,7 +1483,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1522,8 +1493,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1555,8 +1525,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1573,7 +1543,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1587,7 +1556,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1608,7 +1576,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1629,6 +1596,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1651,13 +1619,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1676,6 +1642,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1707,6 +1674,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1729,13 +1697,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1773,6 +1739,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1795,13 +1762,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1811,6 +1776,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1833,13 +1799,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnnotation": { @@ -1863,8 +1827,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1897,7 +1860,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false } } @@ -1928,7 +1890,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1963,8 +1924,8 @@ "ctxt": 0 }, "value": "r13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1981,7 +1942,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2007,7 +1967,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -2043,6 +2002,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2074,6 +2034,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2096,13 +2057,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2145,7 +2104,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2170,6 +2128,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2186,8 +2145,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2212,7 +2170,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2241,7 +2198,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2252,8 +2208,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2285,8 +2240,8 @@ "ctxt": 0 }, "value": "r14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2303,7 +2258,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2329,7 +2283,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithOverloadedFunctionTypedArguments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithOverloadedFunctionTypedArguments/input.ts.json index 9f46a8d3bc8d..e77cf7684da2 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithOverloadedFunctionTypedArguments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithOverloadedFunctionTypedArguments/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "NonGenericParameter", - "typeAnnotation": null, "optional": false }, "body": { @@ -59,6 +58,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -90,6 +90,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -106,8 +107,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -145,6 +145,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -161,8 +162,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -186,8 +186,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -204,7 +203,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -225,6 +223,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -247,12 +246,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -285,7 +282,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false } } @@ -321,8 +317,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -339,7 +335,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -353,7 +348,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -389,8 +383,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -407,7 +401,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -429,6 +422,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -451,13 +445,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -468,7 +460,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -496,7 +487,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -539,8 +529,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -557,7 +547,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -579,8 +568,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -591,7 +580,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -627,7 +615,6 @@ "ctxt": 0 }, "value": "GenericParameter", - "typeAnnotation": null, "optional": false }, "body": { @@ -648,7 +635,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -669,6 +655,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -700,6 +687,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -722,13 +710,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -766,6 +752,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -782,8 +769,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -808,7 +794,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -818,8 +803,7 @@ } ] } - }, - "optional": false + } } } ], @@ -852,7 +836,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false } } @@ -883,7 +866,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -918,8 +900,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -936,7 +918,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -958,8 +939,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -970,7 +951,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1011,6 +991,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1042,6 +1023,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1064,13 +1046,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1113,7 +1093,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1138,6 +1117,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1154,8 +1134,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1180,7 +1159,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1209,7 +1187,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1220,8 +1197,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1253,8 +1229,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1271,7 +1247,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1285,7 +1260,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -1306,7 +1280,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1327,6 +1300,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1358,6 +1332,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1380,13 +1355,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1424,6 +1397,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1446,13 +1420,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1462,6 +1434,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1484,13 +1457,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnnotation": { @@ -1514,8 +1485,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1548,7 +1518,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false } } @@ -1579,7 +1548,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1614,8 +1582,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1632,7 +1600,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1654,8 +1621,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1666,7 +1633,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1707,8 +1673,8 @@ "ctxt": 0 }, "value": "r9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1725,7 +1691,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1747,6 +1712,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1769,13 +1735,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1817,7 +1781,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1860,8 +1823,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1878,7 +1841,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1900,6 +1862,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1922,13 +1885,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1938,6 +1899,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1960,13 +1922,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "body": { @@ -2008,7 +1968,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2036,7 +1995,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2057,6 +2015,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2079,13 +2038,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2104,6 +2061,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2135,6 +2093,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2157,13 +2116,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2201,6 +2158,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2223,13 +2181,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2239,6 +2195,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2261,13 +2218,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnnotation": { @@ -2291,8 +2246,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2325,7 +2279,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false } } @@ -2356,7 +2309,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2391,8 +2343,8 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2409,7 +2361,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2443,8 +2394,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2455,7 +2406,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2496,8 +2446,8 @@ "ctxt": 0 }, "value": "r13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2514,7 +2464,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2548,6 +2497,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2570,13 +2520,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2618,7 +2566,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2661,6 +2608,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2692,6 +2640,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2714,13 +2663,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2763,7 +2710,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2788,6 +2734,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2804,8 +2751,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2830,7 +2776,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2859,7 +2804,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2870,8 +2814,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2903,8 +2846,8 @@ "ctxt": 0 }, "value": "r14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2921,7 +2864,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2947,7 +2889,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithOverloadedFunctionTypedArguments2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithOverloadedFunctionTypedArguments2/input.ts.json index 5d46f829f422..29e300a5787d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithOverloadedFunctionTypedArguments2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithOverloadedFunctionTypedArguments2/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "NonGenericParameter", - "typeAnnotation": null, "optional": false }, "body": { @@ -59,6 +58,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -90,6 +90,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -106,8 +107,7 @@ }, "kind": "boolean" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -145,6 +145,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -161,8 +162,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -186,8 +186,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -204,7 +203,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -225,6 +223,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -247,12 +246,10 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -285,7 +282,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false } } @@ -321,8 +317,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -339,7 +335,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -361,6 +356,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -383,13 +379,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -425,6 +419,7 @@ "ctxt": 0 }, "value": "r", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -447,13 +442,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -475,7 +468,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false } } @@ -506,7 +498,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -527,7 +518,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -565,7 +555,6 @@ "ctxt": 0 }, "value": "GenericParameter", - "typeAnnotation": null, "optional": false }, "body": { @@ -586,7 +575,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -607,6 +595,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -638,6 +627,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -660,13 +650,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -704,6 +692,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -720,8 +709,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -746,7 +734,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -756,8 +743,7 @@ } ] } - }, - "optional": false + } } } ], @@ -790,7 +776,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false } } @@ -821,7 +806,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -856,8 +840,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -874,7 +858,6 @@ "ctxt": 0 }, "value": "foo5", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -896,6 +879,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -918,13 +902,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -935,7 +917,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -963,7 +944,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -991,7 +971,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1012,6 +991,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1043,6 +1023,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1065,13 +1046,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1109,6 +1088,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1131,13 +1111,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1147,6 +1125,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1169,13 +1148,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnnotation": { @@ -1199,8 +1176,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1233,7 +1209,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false } } @@ -1264,7 +1239,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1299,8 +1273,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1317,7 +1291,6 @@ "ctxt": 0 }, "value": "foo6", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1339,6 +1312,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1361,13 +1335,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1377,6 +1349,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1399,13 +1372,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1447,7 +1418,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1475,7 +1445,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1496,6 +1465,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1518,13 +1488,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1543,6 +1511,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1574,6 +1543,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1596,13 +1566,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1640,6 +1608,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1662,13 +1631,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -1678,6 +1645,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1700,13 +1668,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": true + } } ], "typeAnnotation": { @@ -1730,8 +1696,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1764,7 +1729,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false } } @@ -1795,7 +1759,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1830,8 +1793,8 @@ "ctxt": 0 }, "value": "r13", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1848,7 +1811,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1882,6 +1844,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1904,13 +1867,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1921,7 +1882,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1949,7 +1909,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1992,6 +1951,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2023,6 +1983,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2045,13 +2006,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2094,7 +2053,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2119,6 +2077,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2135,8 +2094,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2161,7 +2119,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2190,7 +2147,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2201,8 +2157,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2234,8 +2189,8 @@ "ctxt": 0 }, "value": "r14", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2252,7 +2207,6 @@ "ctxt": 0 }, "value": "foo7", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2278,7 +2232,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithTupleType/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithTupleType/input.ts.json index e6155f4c1e36..5b4255f2757b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithTupleType/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericCallWithTupleType/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -102,7 +99,6 @@ "ctxt": 0 }, "value": "tuple1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -147,7 +143,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -176,7 +171,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -215,6 +209,7 @@ "ctxt": 0 }, "value": "i1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -237,7 +232,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -269,8 +263,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -302,6 +295,7 @@ "ctxt": 0 }, "value": "i2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -324,7 +318,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -356,8 +349,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -394,7 +386,6 @@ "ctxt": 0 }, "value": "i1", - "typeAnnotation": null, "optional": false }, "property": { @@ -405,7 +396,6 @@ "ctxt": 0 }, "value": "tuple1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -476,8 +466,8 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -501,7 +491,6 @@ "ctxt": 0 }, "value": "i1", - "typeAnnotation": null, "optional": false }, "property": { @@ -512,7 +501,6 @@ "ctxt": 0 }, "value": "tuple1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -557,8 +545,8 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -582,7 +570,6 @@ "ctxt": 0 }, "value": "i1", - "typeAnnotation": null, "optional": false }, "property": { @@ -593,7 +580,6 @@ "ctxt": 0 }, "value": "tuple1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -643,7 +629,6 @@ "ctxt": 0 }, "value": "i1", - "typeAnnotation": null, "optional": false }, "property": { @@ -654,7 +639,6 @@ "ctxt": 0 }, "value": "tuple1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -749,8 +733,8 @@ "ctxt": 0 }, "value": "e3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -774,7 +758,6 @@ "ctxt": 0 }, "value": "i1", - "typeAnnotation": null, "optional": false }, "property": { @@ -785,7 +768,6 @@ "ctxt": 0 }, "value": "tuple1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -842,7 +824,6 @@ "ctxt": 0 }, "value": "i1", - "typeAnnotation": null, "optional": false }, "property": { @@ -853,7 +834,6 @@ "ctxt": 0 }, "value": "tuple1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -887,7 +867,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -934,8 +913,8 @@ "ctxt": 0 }, "value": "e4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -959,7 +938,6 @@ "ctxt": 0 }, "value": "i1", - "typeAnnotation": null, "optional": false }, "property": { @@ -970,7 +948,6 @@ "ctxt": 0 }, "value": "tuple1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1020,7 +997,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1031,7 +1007,6 @@ "ctxt": 0 }, "value": "tuple1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1107,7 +1082,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1118,7 +1092,6 @@ "ctxt": 0 }, "value": "tuple1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1199,7 +1172,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1210,7 +1182,6 @@ "ctxt": 0 }, "value": "tuple1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1286,7 +1257,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1297,7 +1267,6 @@ "ctxt": 0 }, "value": "tuple1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1368,7 +1337,6 @@ "ctxt": 0 }, "value": "i1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1379,7 +1347,6 @@ "ctxt": 0 }, "value": "tuple1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1455,7 +1422,6 @@ "ctxt": 0 }, "value": "i1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1466,7 +1432,6 @@ "ctxt": 0 }, "value": "tuple1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1537,7 +1502,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1548,7 +1512,6 @@ "ctxt": 0 }, "value": "tuple1", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericClassWithFunctionTypedMemberArguments/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericClassWithFunctionTypedMemberArguments/input.ts.json index b53c1b7fdf3d..153d9580c077 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericClassWithFunctionTypedMemberArguments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericClassWithFunctionTypedMemberArguments/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "ImmediatelyFix", - "typeAnnotation": null, "optional": false }, "body": { @@ -44,7 +43,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -70,7 +68,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -91,6 +88,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -114,6 +112,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -136,13 +135,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -168,15 +165,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -216,7 +211,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -262,7 +256,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -304,7 +297,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -340,8 +332,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -358,7 +350,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -411,8 +402,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -436,7 +427,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -447,7 +437,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -471,6 +460,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -493,13 +483,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -541,7 +529,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -584,8 +571,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -609,7 +596,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -620,7 +606,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -644,6 +629,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -666,13 +652,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -714,7 +698,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -775,8 +758,8 @@ "ctxt": 0 }, "value": "r3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -800,7 +783,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -811,7 +793,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -835,8 +816,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -876,7 +857,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -902,7 +882,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -923,6 +902,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -946,6 +926,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -968,13 +949,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1000,15 +979,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -1048,7 +1025,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1106,7 +1082,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1142,8 +1117,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -1160,7 +1135,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1213,8 +1187,8 @@ "ctxt": 0 }, "value": "ra", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1238,7 +1212,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1249,7 +1222,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1273,6 +1245,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1295,13 +1268,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -1338,7 +1309,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1381,8 +1351,8 @@ "ctxt": 0 }, "value": "r3a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1406,7 +1376,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1417,7 +1386,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1441,8 +1409,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1487,7 +1455,6 @@ "ctxt": 0 }, "value": "WithCandidates", - "typeAnnotation": null, "optional": false }, "body": { @@ -1508,7 +1475,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1534,7 +1500,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "function": { @@ -1555,6 +1520,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1577,13 +1543,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1602,6 +1566,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1625,6 +1590,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1647,13 +1613,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1679,15 +1643,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -1727,7 +1689,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1741,7 +1702,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1776,7 +1736,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1797,7 +1756,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1839,7 +1797,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1875,6 +1832,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1897,7 +1855,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1920,8 +1877,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1953,8 +1909,8 @@ "ctxt": 0 }, "value": "r4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1978,7 +1934,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -1989,7 +1944,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2029,6 +1983,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2051,13 +2006,11 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2124,7 +2077,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2167,8 +2119,8 @@ "ctxt": 0 }, "value": "r5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2192,7 +2144,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -2203,7 +2154,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2239,8 +2189,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2295,8 +2245,8 @@ "ctxt": 0 }, "value": "r6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2320,7 +2270,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -2331,7 +2280,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2372,6 +2320,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2394,13 +2343,11 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -2437,7 +2384,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2492,7 +2438,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2518,7 +2463,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "function": { @@ -2539,6 +2483,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2561,13 +2506,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2586,6 +2529,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2609,6 +2553,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2631,13 +2576,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2663,15 +2606,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -2690,6 +2631,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2712,13 +2654,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2758,7 +2698,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2772,7 +2711,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2819,7 +2757,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2840,7 +2777,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2876,6 +2812,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2898,7 +2835,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2930,8 +2866,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2963,8 +2898,8 @@ "ctxt": 0 }, "value": "r7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2988,7 +2923,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2999,7 +2933,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3035,6 +2968,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3057,13 +2991,11 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -3105,7 +3037,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3165,8 +3096,8 @@ "ctxt": 0 }, "value": "r8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3190,7 +3121,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false }, "property": { @@ -3201,7 +3131,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3241,8 +3170,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -3324,7 +3253,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3350,7 +3278,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "function": { @@ -3371,6 +3298,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3393,13 +3321,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3418,6 +3344,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3441,6 +3368,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3463,13 +3391,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -3495,15 +3421,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -3522,6 +3446,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3544,13 +3469,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3590,7 +3513,6 @@ "ctxt": 0 }, "value": "cb", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3604,7 +3526,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3639,7 +3560,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3660,7 +3580,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3702,7 +3621,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3723,7 +3641,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3759,6 +3676,7 @@ "ctxt": 0 }, "value": "c3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3781,7 +3699,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3813,8 +3730,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3831,7 +3747,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3852,6 +3767,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3874,13 +3790,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3899,6 +3813,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3921,13 +3836,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3970,8 +3883,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3995,7 +3908,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4006,7 +3918,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4042,6 +3953,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4064,13 +3976,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -4125,8 +4035,8 @@ "ctxt": 0 }, "value": "r10", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4150,7 +4060,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -4161,7 +4070,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4197,8 +4105,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4253,8 +4161,8 @@ "ctxt": 0 }, "value": "r11", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4278,7 +4186,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "property": { @@ -4289,7 +4196,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4325,6 +4231,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4347,13 +4254,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -4425,8 +4330,8 @@ "ctxt": 0 }, "value": "r11b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4450,7 +4355,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "property": { @@ -4461,7 +4365,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4497,6 +4400,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4519,13 +4423,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -4592,8 +4494,8 @@ "ctxt": 0 }, "value": "r12", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4617,7 +4519,6 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, "optional": false }, "property": { @@ -4628,7 +4529,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4668,8 +4568,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } } ], @@ -4763,7 +4663,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4784,7 +4683,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericClassWithObjectTypeArgsAndConstraints/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericClassWithObjectTypeArgsAndConstraints/input.ts.json index f0971111d7b0..2c8ecb131e53 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericClassWithObjectTypeArgsAndConstraints/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericClassWithObjectTypeArgsAndConstraints/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -162,7 +158,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "value": null, @@ -210,7 +205,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -236,7 +230,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": null, @@ -262,7 +255,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -304,7 +296,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -332,7 +323,6 @@ "ctxt": 0 }, "value": "Class", - "typeAnnotation": null, "optional": false }, "body": { @@ -353,7 +343,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -379,7 +368,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -400,6 +388,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -422,7 +411,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -448,7 +436,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -456,8 +443,7 @@ ] } } - }, - "optional": false + } } }, { @@ -476,6 +462,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -498,7 +485,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -524,7 +510,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -532,8 +517,7 @@ ] } } - }, - "optional": false + } } } ], @@ -576,6 +560,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -598,13 +583,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -626,7 +609,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -657,7 +639,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -684,7 +665,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -750,7 +730,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -777,7 +756,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -837,8 +815,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -855,7 +833,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -882,7 +859,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -919,8 +895,8 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -937,7 +913,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -964,7 +939,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1001,6 +975,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1023,7 +998,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1058,7 +1032,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1100,7 +1073,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1131,8 +1103,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1164,8 +1135,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1189,7 +1160,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "property": { @@ -1200,7 +1170,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1216,7 +1185,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } }, @@ -1230,7 +1198,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } } @@ -1266,8 +1233,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1291,7 +1258,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "property": { @@ -1302,7 +1268,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1318,7 +1283,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } }, @@ -1332,7 +1296,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } } @@ -1353,7 +1316,6 @@ "ctxt": 0 }, "value": "G2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1379,7 +1341,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "function": { @@ -1400,6 +1361,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1422,7 +1384,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1448,7 +1409,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1456,8 +1416,7 @@ ] } } - }, - "optional": false + } } }, { @@ -1476,6 +1435,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1498,7 +1458,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1524,7 +1483,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1532,8 +1490,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1576,6 +1533,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1598,13 +1556,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1626,7 +1582,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1657,7 +1612,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1675,7 +1629,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1718,7 +1671,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -1736,7 +1688,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1773,6 +1724,7 @@ "ctxt": 0 }, "value": "g2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1795,7 +1747,6 @@ "ctxt": 0 }, "value": "G2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1821,7 +1772,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1829,8 +1779,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1862,8 +1811,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1887,7 +1836,6 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1898,7 +1846,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1914,7 +1861,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } }, @@ -1928,7 +1874,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } } @@ -1964,8 +1909,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1989,7 +1934,6 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2000,7 +1944,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2016,7 +1959,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } }, @@ -2030,7 +1972,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } } @@ -2061,7 +2002,6 @@ "ctxt": 0 }, "value": "Interface", - "typeAnnotation": null, "optional": false }, "body": { @@ -2087,7 +2027,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2114,7 +2053,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2141,7 +2079,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2198,7 +2135,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2212,6 +2148,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2234,7 +2171,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2260,7 +2196,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2268,8 +2203,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -2279,6 +2213,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2301,7 +2236,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2327,7 +2261,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2335,8 +2268,7 @@ ] } } - }, - "optional": false + } } ], "typeAnn": { @@ -2361,7 +2293,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2390,7 +2321,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2417,7 +2347,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2478,8 +2407,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2496,7 +2425,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2523,7 +2451,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2560,8 +2487,8 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NewExpression", @@ -2578,7 +2505,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2605,7 +2531,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2642,6 +2567,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2664,7 +2590,6 @@ "ctxt": 0 }, "value": "G", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2699,7 +2624,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2741,7 +2665,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2772,8 +2695,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2805,8 +2727,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2830,7 +2752,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "property": { @@ -2841,7 +2762,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2857,7 +2777,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } }, @@ -2871,7 +2790,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } } @@ -2907,8 +2825,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2932,7 +2850,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "property": { @@ -2943,7 +2860,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2959,7 +2875,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } }, @@ -2973,7 +2888,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } } @@ -2999,7 +2913,6 @@ "ctxt": 0 }, "value": "G2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3026,7 +2939,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3044,7 +2956,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3078,7 +2989,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3092,6 +3002,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3114,7 +3025,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3140,7 +3050,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3148,8 +3057,7 @@ ] } } - }, - "optional": false + } }, { "type": "Identifier", @@ -3159,6 +3067,7 @@ "ctxt": 0 }, "value": "t2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3181,7 +3090,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3207,7 +3115,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3215,8 +3122,7 @@ ] } } - }, - "optional": false + } } ], "typeAnn": { @@ -3241,7 +3147,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3270,7 +3175,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3288,7 +3192,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3326,6 +3229,7 @@ "ctxt": 0 }, "value": "g2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3348,7 +3252,6 @@ "ctxt": 0 }, "value": "G2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3374,7 +3277,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3382,8 +3284,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3415,8 +3316,8 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3440,7 +3341,6 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, "optional": false }, "property": { @@ -3451,7 +3351,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3467,7 +3366,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } }, @@ -3481,7 +3379,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } } @@ -3517,8 +3414,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3542,7 +3439,6 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, "optional": false }, "property": { @@ -3553,7 +3449,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3569,7 +3464,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } }, @@ -3583,7 +3477,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericContextualTypes1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericContextualTypes1/input.ts.json index 20010165dd03..3c75f1965bcc 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericContextualTypes1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericContextualTypes1/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -80,7 +78,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -130,7 +126,6 @@ "ctxt": 0 }, "value": "wrap", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -151,6 +146,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -174,6 +170,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -196,13 +193,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -228,15 +223,13 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -272,7 +265,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -293,7 +285,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -324,6 +315,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -346,13 +338,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -378,7 +368,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -397,7 +386,6 @@ "ctxt": 0 }, "value": "compose", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -418,6 +406,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -441,6 +430,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -463,13 +453,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -495,15 +483,13 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -522,6 +508,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -545,6 +532,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -567,13 +555,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -599,15 +585,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -643,7 +627,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -664,7 +647,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -685,7 +667,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -716,6 +697,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -738,13 +720,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -770,7 +750,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -789,7 +768,6 @@ "ctxt": 0 }, "value": "list", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -810,6 +788,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -832,13 +811,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -874,7 +851,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -911,7 +887,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -929,7 +904,6 @@ "ctxt": 0 }, "value": "unlist", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -950,6 +924,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -979,14 +954,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -1022,7 +995,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1052,7 +1024,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1069,7 +1040,6 @@ "ctxt": 0 }, "value": "box", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1090,6 +1060,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1112,13 +1083,11 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1154,7 +1123,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1184,7 +1152,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1210,7 +1177,6 @@ "ctxt": 0 }, "value": "V", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1230,7 +1196,6 @@ "ctxt": 0 }, "value": "unbox", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1251,6 +1216,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1273,7 +1239,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1299,7 +1264,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1307,8 +1271,7 @@ ] } } - }, - "optional": false + } } } ], @@ -1344,7 +1307,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1374,7 +1336,6 @@ "ctxt": 0 }, "value": "W", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1391,7 +1352,6 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1412,6 +1372,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1441,14 +1402,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } }, { @@ -1467,6 +1426,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1490,6 +1450,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1512,13 +1473,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -1544,15 +1503,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -1588,7 +1545,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1609,7 +1565,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1646,7 +1601,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1664,7 +1618,6 @@ "ctxt": 0 }, "value": "identity", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1685,6 +1638,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1707,13 +1661,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1749,7 +1701,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1779,7 +1730,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1796,7 +1746,6 @@ "ctxt": 0 }, "value": "zip", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1817,6 +1766,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1839,13 +1789,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -1864,6 +1812,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1886,13 +1835,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1928,7 +1875,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1949,7 +1895,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1995,7 +1940,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2024,7 +1968,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2044,7 +1987,6 @@ "ctxt": 0 }, "value": "flip", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2065,6 +2007,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2088,6 +2031,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2110,13 +2054,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2126,6 +2068,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2148,13 +2091,11 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2180,15 +2121,13 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -2224,7 +2163,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2245,7 +2183,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2266,7 +2203,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2297,6 +2233,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2319,13 +2256,11 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -2335,6 +2270,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2357,13 +2293,11 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2389,7 +2323,6 @@ "ctxt": 0 }, "value": "Z", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2423,6 +2356,7 @@ "ctxt": 0 }, "value": "f00", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2446,6 +2380,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2468,13 +2403,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -2500,7 +2433,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2537,7 +2469,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2545,8 +2476,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2556,7 +2486,6 @@ "ctxt": 0 }, "value": "list", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2588,6 +2517,7 @@ "ctxt": 0 }, "value": "f01", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2611,6 +2541,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2633,13 +2564,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -2665,7 +2594,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2702,7 +2630,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2710,8 +2637,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -2729,8 +2655,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2751,7 +2677,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2791,6 +2716,7 @@ "ctxt": 0 }, "value": "f02", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2814,6 +2740,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2836,13 +2763,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -2868,7 +2793,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2905,7 +2829,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2913,8 +2836,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -2931,7 +2853,6 @@ "ctxt": 0 }, "value": "wrap", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2945,7 +2866,6 @@ "ctxt": 0 }, "value": "list", - "typeAnnotation": null, "optional": false } } @@ -2981,6 +2901,7 @@ "ctxt": 0 }, "value": "f03", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3004,6 +2925,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3026,13 +2948,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3058,7 +2978,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3095,7 +3014,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3103,8 +3021,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -3121,7 +3038,6 @@ "ctxt": 0 }, "value": "wrap", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3143,8 +3059,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3165,7 +3081,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3209,6 +3124,7 @@ "ctxt": 0 }, "value": "f10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3232,6 +3148,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3254,13 +3171,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3286,7 +3201,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3316,7 +3230,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3349,7 +3262,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3360,8 +3272,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -3378,7 +3289,6 @@ "ctxt": 0 }, "value": "compose", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3400,8 +3310,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3419,7 +3329,6 @@ "ctxt": 0 }, "value": "list", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3433,7 +3342,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -3464,8 +3372,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3483,7 +3391,6 @@ "ctxt": 0 }, "value": "box", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3497,7 +3404,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -3542,6 +3448,7 @@ "ctxt": 0 }, "value": "f11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3565,6 +3472,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3587,13 +3495,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -3619,7 +3525,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3649,7 +3554,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3682,7 +3586,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3693,8 +3596,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -3711,7 +3613,6 @@ "ctxt": 0 }, "value": "compose", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3725,7 +3626,6 @@ "ctxt": 0 }, "value": "list", - "typeAnnotation": null, "optional": false } }, @@ -3739,7 +3639,6 @@ "ctxt": 0 }, "value": "box", - "typeAnnotation": null, "optional": false } } @@ -3775,6 +3674,7 @@ "ctxt": 0 }, "value": "f12", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3798,6 +3698,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3820,7 +3721,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3853,7 +3753,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3862,8 +3761,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": { @@ -3889,7 +3787,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3919,15 +3816,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -3944,7 +3839,6 @@ "ctxt": 0 }, "value": "compose", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3966,8 +3860,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3985,7 +3879,6 @@ "ctxt": 0 }, "value": "unbox", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3999,7 +3892,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } } @@ -4030,8 +3922,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4049,7 +3941,6 @@ "ctxt": 0 }, "value": "unlist", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4063,7 +3954,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -4108,6 +3998,7 @@ "ctxt": 0 }, "value": "f13", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4131,6 +4022,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4153,7 +4045,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4186,7 +4077,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4195,8 +4085,7 @@ ] } } - }, - "optional": false + } } ], "typeParams": { @@ -4222,7 +4111,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4252,15 +4140,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -4277,7 +4163,6 @@ "ctxt": 0 }, "value": "compose", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4291,7 +4176,6 @@ "ctxt": 0 }, "value": "unbox", - "typeAnnotation": null, "optional": false } }, @@ -4305,7 +4189,6 @@ "ctxt": 0 }, "value": "unlist", - "typeAnnotation": null, "optional": false } } @@ -4341,8 +4224,8 @@ "ctxt": 0 }, "value": "arrayMap", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -4360,6 +4243,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4383,6 +4267,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4405,13 +4290,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4437,15 +4320,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "body": { @@ -4464,6 +4345,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4493,14 +4375,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "body": { @@ -4525,7 +4405,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -4536,7 +4415,6 @@ "ctxt": 0 }, "value": "map", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4552,7 +4430,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -4589,7 +4466,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4610,7 +4486,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4649,8 +4524,8 @@ "ctxt": 0 }, "value": "arrayFilter", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -4668,6 +4543,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4691,6 +4567,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4713,13 +4590,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4741,8 +4616,7 @@ } } } - }, - "optional": false + } } ], "body": { @@ -4761,6 +4635,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4790,14 +4665,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "body": { @@ -4822,7 +4695,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -4833,7 +4705,6 @@ "ctxt": 0 }, "value": "filter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4849,7 +4720,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } @@ -4886,7 +4756,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4925,6 +4794,7 @@ "ctxt": 0 }, "value": "f20", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4948,6 +4818,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4972,8 +4843,7 @@ "kind": "string" } } - }, - "optional": false + } } ], "typeParams": null, @@ -5003,8 +4873,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -5021,7 +4890,6 @@ "ctxt": 0 }, "value": "arrayMap", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5043,8 +4911,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5062,7 +4930,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -5073,7 +4940,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5116,6 +4982,7 @@ "ctxt": 0 }, "value": "f21", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5139,6 +5006,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5168,14 +5036,12 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": { @@ -5201,7 +5067,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5245,7 +5110,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5254,8 +5118,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -5272,7 +5135,6 @@ "ctxt": 0 }, "value": "arrayMap", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5294,8 +5156,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5316,7 +5178,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5360,6 +5221,7 @@ "ctxt": 0 }, "value": "f22", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5383,6 +5245,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5412,14 +5275,12 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": { @@ -5445,7 +5306,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5482,7 +5342,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5490,8 +5349,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -5508,7 +5366,6 @@ "ctxt": 0 }, "value": "arrayMap", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5522,7 +5379,6 @@ "ctxt": 0 }, "value": "identity", - "typeAnnotation": null, "optional": false } } @@ -5558,6 +5414,7 @@ "ctxt": 0 }, "value": "f23", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5581,6 +5438,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5610,14 +5468,12 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": { @@ -5643,7 +5499,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5680,7 +5535,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5706,7 +5560,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5717,8 +5570,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -5735,7 +5587,6 @@ "ctxt": 0 }, "value": "arrayMap", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5757,8 +5608,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5784,7 +5635,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } ] @@ -5828,6 +5678,7 @@ "ctxt": 0 }, "value": "f30", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5851,6 +5702,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5875,8 +5727,7 @@ "kind": "string" } } - }, - "optional": false + } } ], "typeParams": null, @@ -5906,8 +5757,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -5924,7 +5774,6 @@ "ctxt": 0 }, "value": "arrayFilter", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5946,8 +5795,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -5973,7 +5822,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -5984,7 +5832,6 @@ "ctxt": 0 }, "value": "length", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6037,6 +5884,7 @@ "ctxt": 0 }, "value": "f31", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6060,6 +5908,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6089,14 +5938,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeParams": { @@ -6122,7 +5969,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6140,7 +5986,6 @@ "ctxt": 0 }, "value": "Box", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6196,7 +6041,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6204,8 +6048,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -6222,7 +6065,6 @@ "ctxt": 0 }, "value": "arrayFilter", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6244,8 +6086,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -6271,7 +6113,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -6282,7 +6123,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6335,6 +6175,7 @@ "ctxt": 0 }, "value": "f40", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6358,6 +6199,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6380,13 +6222,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -6396,6 +6236,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6418,13 +6259,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6450,7 +6289,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6471,7 +6309,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6517,7 +6354,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6546,7 +6382,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6556,8 +6391,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -6574,7 +6408,6 @@ "ctxt": 0 }, "value": "flip", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -6588,7 +6421,6 @@ "ctxt": 0 }, "value": "zip", - "typeAnnotation": null, "optional": false } } @@ -6615,7 +6447,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -6635,6 +6466,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6657,13 +6489,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -6689,7 +6519,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6719,7 +6548,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6752,6 +6580,7 @@ "ctxt": 0 }, "value": "fn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6774,13 +6603,11 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -6798,8 +6625,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -6810,7 +6637,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericFunctionParameters/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericFunctionParameters/input.ts.json index fbbbfee64c02..7fe06c1d7d0d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericFunctionParameters/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/genericFunctionParameters/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,6 +60,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -82,13 +83,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -114,7 +113,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -144,15 +142,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -188,7 +184,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -218,7 +213,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -235,7 +229,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -256,6 +249,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -279,6 +273,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -301,13 +296,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -333,7 +326,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -371,15 +363,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -415,7 +405,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -445,7 +434,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -462,7 +450,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -483,6 +470,7 @@ "ctxt": 0 }, "value": "cb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -506,6 +494,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -528,13 +517,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -560,7 +547,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -578,7 +564,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -604,7 +589,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -638,15 +622,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -682,7 +664,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -712,7 +693,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -744,8 +724,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -762,7 +742,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -784,8 +763,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -796,7 +775,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -837,8 +815,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -855,7 +833,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -877,8 +854,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -889,7 +866,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -930,8 +906,8 @@ "ctxt": 0 }, "value": "x3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -948,7 +924,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -970,8 +945,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -982,7 +957,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1023,6 +997,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1046,6 +1021,7 @@ "ctxt": 0 }, "value": "go", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1069,6 +1045,7 @@ "ctxt": 0 }, "value": "ops", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1100,7 +1077,6 @@ "ctxt": 0 }, "value": "init", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1128,7 +1104,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1138,8 +1113,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -1165,7 +1139,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1195,15 +1168,13 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } ], "typeParams": { @@ -1229,7 +1200,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1259,15 +1229,13 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1299,8 +1267,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1317,7 +1285,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1339,8 +1306,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1365,7 +1332,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1376,7 +1342,6 @@ "ctxt": 0 }, "value": "init", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/indexSignatureTypeInference/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/indexSignatureTypeInference/input.ts.json index 83c71b7a9bf7..cbad1bc8c66f 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/indexSignatureTypeInference/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/indexSignatureTypeInference/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "NumberMap", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -76,6 +74,7 @@ "ctxt": 0 }, "value": "index", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -92,8 +91,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -118,7 +116,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -149,7 +146,6 @@ "ctxt": 0 }, "value": "StringMap", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -176,7 +172,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -204,6 +199,7 @@ "ctxt": 0 }, "value": "index", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -220,8 +216,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -246,7 +241,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -272,7 +266,6 @@ "ctxt": 0 }, "value": "numberMapToArray", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -293,6 +286,7 @@ "ctxt": 0 }, "value": "object", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -315,7 +309,6 @@ "ctxt": 0 }, "value": "NumberMap", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -341,7 +334,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -349,8 +341,7 @@ ] } } - }, - "optional": false + } } } ], @@ -386,7 +377,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -423,7 +413,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -441,7 +430,6 @@ "ctxt": 0 }, "value": "stringMapToArray", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -462,6 +450,7 @@ "ctxt": 0 }, "value": "object", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -484,7 +473,6 @@ "ctxt": 0 }, "value": "StringMap", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -510,7 +498,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -518,8 +505,7 @@ ] } } - }, - "optional": false + } } } ], @@ -555,7 +541,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -592,7 +577,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -625,6 +609,7 @@ "ctxt": 0 }, "value": "numberMap", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -647,7 +632,6 @@ "ctxt": 0 }, "value": "NumberMap", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -673,7 +657,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -681,8 +664,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -714,6 +696,7 @@ "ctxt": 0 }, "value": "stringMap", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -736,7 +719,6 @@ "ctxt": 0 }, "value": "StringMap", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -762,7 +744,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -770,8 +751,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -803,6 +783,7 @@ "ctxt": 0 }, "value": "v1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -832,14 +813,12 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -871,8 +850,8 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -889,7 +868,6 @@ "ctxt": 0 }, "value": "numberMapToArray", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -903,7 +881,6 @@ "ctxt": 0 }, "value": "numberMap", - "typeAnnotation": null, "optional": false } } @@ -939,8 +916,8 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -957,7 +934,6 @@ "ctxt": 0 }, "value": "numberMapToArray", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -971,7 +947,6 @@ "ctxt": 0 }, "value": "stringMap", - "typeAnnotation": null, "optional": false } } @@ -1007,8 +982,8 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1025,7 +1000,6 @@ "ctxt": 0 }, "value": "stringMapToArray", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1039,7 +1013,6 @@ "ctxt": 0 }, "value": "numberMap", - "typeAnnotation": null, "optional": false } } @@ -1075,8 +1048,8 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1093,7 +1066,6 @@ "ctxt": 0 }, "value": "stringMapToArray", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1107,7 +1079,6 @@ "ctxt": 0 }, "value": "stringMap", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/keyofInferenceIntersectsResults/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/keyofInferenceIntersectsResults/input.ts.json index 786b9065a22a..958b8e59994d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/keyofInferenceIntersectsResults/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/keyofInferenceIntersectsResults/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -93,7 +91,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -132,7 +129,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -153,6 +149,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -183,14 +180,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } }, { @@ -209,6 +204,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -239,14 +235,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -282,7 +276,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -301,7 +294,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -331,7 +323,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -348,7 +339,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -369,6 +359,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -399,14 +390,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } }, { @@ -425,6 +414,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -455,14 +445,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } } ], @@ -498,7 +486,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -528,7 +515,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -560,8 +546,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -578,7 +564,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -640,7 +625,6 @@ "ctxt": 0 }, "value": "X", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -677,8 +661,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -695,7 +679,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -765,8 +748,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -783,7 +766,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/keyofInferenceLowerPriorityThanReturn/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/keyofInferenceLowerPriorityThanReturn/input.ts.json index 3a4f6b3e454d..34ccdac1aa02 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/keyofInferenceLowerPriorityThanReturn/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/keyofInferenceLowerPriorityThanReturn/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Write", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "dummy", - "typeAnnotation": null, "optional": false }, "value": null, @@ -68,7 +66,6 @@ "ctxt": 0 }, "value": "Write", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -101,7 +98,6 @@ "ctxt": 0 }, "value": "Col", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -127,7 +123,6 @@ "ctxt": 0 }, "value": "dummy", - "typeAnnotation": null, "optional": false }, "value": null, @@ -169,7 +164,6 @@ "ctxt": 0 }, "value": "Col", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -195,7 +189,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -215,7 +208,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -247,7 +239,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -276,7 +267,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -321,7 +311,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -342,7 +331,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -363,7 +351,6 @@ "ctxt": 0 }, "value": "Table", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -389,7 +376,6 @@ "ctxt": 0 }, "value": "dummy", - "typeAnnotation": null, "optional": false }, "value": null, @@ -431,7 +417,6 @@ "ctxt": 0 }, "value": "Table", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -457,7 +442,6 @@ "ctxt": 0 }, "value": "Req", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -477,7 +461,6 @@ "ctxt": 0 }, "value": "Def", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -509,7 +492,6 @@ "ctxt": 0 }, "value": "Req", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -538,7 +520,6 @@ "ctxt": 0 }, "value": "Def", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -583,7 +564,6 @@ "ctxt": 0 }, "value": "Req", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -604,7 +584,6 @@ "ctxt": 0 }, "value": "Def", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -631,7 +610,6 @@ "ctxt": 0 }, "value": "MakeTable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -657,7 +635,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -686,7 +663,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -733,7 +709,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -759,7 +734,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -784,7 +758,6 @@ "ctxt": 0 }, "value": "Col", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -810,7 +783,6 @@ "ctxt": 0 }, "value": "Write", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -838,7 +810,6 @@ "ctxt": 0 }, "value": "T1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -858,7 +829,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -891,7 +861,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -917,7 +886,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -942,7 +910,6 @@ "ctxt": 0 }, "value": "Col", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -968,7 +935,6 @@ "ctxt": 0 }, "value": "Write", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -996,7 +962,6 @@ "ctxt": 0 }, "value": "T2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1016,7 +981,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1039,7 +1003,6 @@ "ctxt": 0 }, "value": "ConflictTarget", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1065,7 +1028,6 @@ "ctxt": 0 }, "value": "tableColumns", - "typeAnnotation": null, "optional": false }, "function": { @@ -1086,6 +1048,7 @@ "ctxt": 0 }, "value": "cols", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1130,7 +1093,6 @@ "ctxt": 0 }, "value": "Cols", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1138,8 +1100,7 @@ } } } - }, - "optional": false + } } } ], @@ -1175,7 +1136,6 @@ "ctxt": 0 }, "value": "Cols", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1205,7 +1165,6 @@ "ctxt": 0 }, "value": "ConflictTarget", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1231,7 +1190,6 @@ "ctxt": 0 }, "value": "Cols", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1262,7 +1220,6 @@ "ctxt": 0 }, "value": "dummy", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1304,7 +1261,6 @@ "ctxt": 0 }, "value": "ConflictTarget", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1330,7 +1286,6 @@ "ctxt": 0 }, "value": "Cols", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1362,7 +1317,6 @@ "ctxt": 0 }, "value": "Cols", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1407,7 +1361,6 @@ "ctxt": 0 }, "value": "Cols", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1443,6 +1396,7 @@ "ctxt": 0 }, "value": "bookTable", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1465,7 +1419,6 @@ "ctxt": 0 }, "value": "Table", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1491,7 +1444,6 @@ "ctxt": 0 }, "value": "BookReq", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1511,7 +1463,6 @@ "ctxt": 0 }, "value": "BookDef", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1519,8 +1470,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "TsAsExpression", @@ -1566,7 +1516,6 @@ "ctxt": 0 }, "value": "BookReq", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1596,7 +1545,6 @@ "ctxt": 0 }, "value": "title", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1638,7 +1586,6 @@ "ctxt": 0 }, "value": "serial", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1682,7 +1629,6 @@ "ctxt": 0 }, "value": "BookDef", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1712,7 +1658,6 @@ "ctxt": 0 }, "value": "author", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1754,7 +1699,6 @@ "ctxt": 0 }, "value": "numPages", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1812,7 +1756,6 @@ "ctxt": 0 }, "value": "insertOnConflictDoNothing", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1833,6 +1776,7 @@ "ctxt": 0 }, "value": "_table", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1855,7 +1799,6 @@ "ctxt": 0 }, "value": "Table", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1881,7 +1824,6 @@ "ctxt": 0 }, "value": "Req", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1901,7 +1843,6 @@ "ctxt": 0 }, "value": "Def", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1909,8 +1850,7 @@ ] } } - }, - "optional": false + } } }, { @@ -1929,6 +1869,7 @@ "ctxt": 0 }, "value": "_conflictTarget", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1951,7 +1892,6 @@ "ctxt": 0 }, "value": "ConflictTarget", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1985,7 +1925,6 @@ "ctxt": 0 }, "value": "Req", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2005,7 +1944,6 @@ "ctxt": 0 }, "value": "Def", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2015,8 +1953,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2056,7 +1993,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2090,7 +2026,6 @@ "ctxt": 0 }, "value": "Req", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2119,7 +2054,6 @@ "ctxt": 0 }, "value": "Def", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -2163,7 +2097,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2204,7 +2137,6 @@ "ctxt": 0 }, "value": "insertOnConflictDoNothing", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2218,7 +2150,6 @@ "ctxt": 0 }, "value": "bookTable", - "typeAnnotation": null, "optional": false } }, @@ -2246,7 +2177,6 @@ "ctxt": 0 }, "value": "ConflictTarget", - "typeAnnotation": null, "optional": false }, "property": { @@ -2257,7 +2187,6 @@ "ctxt": 0 }, "value": "tableColumns", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/unionAndIntersectionInference1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/unionAndIntersectionInference1/input.ts.json index 5b3b402cf911..78b85b368472 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/unionAndIntersectionInference1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/unionAndIntersectionInference1/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -83,7 +82,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -119,6 +117,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -141,13 +140,11 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "TsTypeAssertion", @@ -164,7 +161,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -182,7 +178,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -202,7 +197,6 @@ "ctxt": 0 }, "value": "destructure", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -223,6 +217,7 @@ "ctxt": 0 }, "value": "something", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -253,7 +248,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -273,15 +267,13 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } }, { @@ -300,6 +292,7 @@ "ctxt": 0 }, "value": "haveValue", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -323,6 +316,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -345,13 +339,11 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -377,15 +369,13 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } }, { @@ -404,6 +394,7 @@ "ctxt": 0 }, "value": "haveY", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -427,6 +418,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -449,13 +441,11 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -481,15 +471,13 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } } } ], @@ -537,7 +525,6 @@ "ctxt": 0 }, "value": "something", - "typeAnnotation": null, "optional": false }, "right": { @@ -548,7 +535,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -567,7 +553,6 @@ "ctxt": 0 }, "value": "haveY", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -581,7 +566,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -603,7 +587,6 @@ "ctxt": 0 }, "value": "haveValue", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -624,7 +607,6 @@ "ctxt": 0 }, "value": "something", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -642,7 +624,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -681,7 +662,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -702,7 +682,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -732,7 +711,6 @@ "ctxt": 0 }, "value": "r", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -764,8 +742,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -804,7 +782,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -815,7 +792,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -862,7 +838,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -880,7 +855,6 @@ "ctxt": 0 }, "value": "Y", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -916,8 +890,8 @@ "ctxt": 0 }, "value": "result", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -934,7 +908,6 @@ "ctxt": 0 }, "value": "destructure", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -948,7 +921,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } }, @@ -970,8 +942,8 @@ "ctxt": 0 }, "value": "text", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1012,8 +984,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1053,7 +1025,6 @@ "ctxt": 0 }, "value": "isVoid", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1074,6 +1045,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1113,15 +1085,13 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -1154,7 +1124,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1185,7 +1154,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1216,7 +1184,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1249,7 +1216,6 @@ "ctxt": 0 }, "value": "isNonVoid", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1270,6 +1236,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1309,15 +1276,13 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -1350,7 +1315,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1381,7 +1345,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1412,7 +1375,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -1437,7 +1399,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1456,7 +1417,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1477,6 +1437,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1516,15 +1477,13 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -1564,7 +1523,6 @@ "ctxt": 0 }, "value": "isVoid", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1578,7 +1536,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -1608,7 +1565,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -1637,7 +1593,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -1671,7 +1626,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1707,7 +1661,6 @@ "ctxt": 0 }, "value": "baz1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1728,6 +1681,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1767,15 +1721,13 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -1815,7 +1767,6 @@ "ctxt": 0 }, "value": "isNonVoid", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1829,7 +1780,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -1859,7 +1809,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -1888,7 +1837,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } } @@ -1922,7 +1870,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1964,7 +1911,6 @@ "ctxt": 0 }, "value": "Maybe", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1990,7 +1936,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2021,7 +1966,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2048,7 +1992,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2069,6 +2012,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2099,7 +2043,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2115,8 +2058,7 @@ } ] } - }, - "optional": false + } } } ], @@ -2177,7 +2119,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2207,7 +2148,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2239,6 +2179,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2261,7 +2202,6 @@ "ctxt": 0 }, "value": "Maybe", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2284,8 +2224,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2328,7 +2267,6 @@ "ctxt": 0 }, "value": "get", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2342,7 +2280,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -2357,7 +2294,6 @@ "ctxt": 0 }, "value": "toUpperCase", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2381,7 +2317,6 @@ "ctxt": 0 }, "value": "Man", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2411,7 +2346,6 @@ "ctxt": 0 }, "value": "walks", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2455,7 +2389,6 @@ "ctxt": 0 }, "value": "Bear", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2485,7 +2418,6 @@ "ctxt": 0 }, "value": "roars", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2529,7 +2461,6 @@ "ctxt": 0 }, "value": "Pig", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2559,7 +2490,6 @@ "ctxt": 0 }, "value": "oinks", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2598,7 +2528,6 @@ "ctxt": 0 }, "value": "pigify", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2619,6 +2548,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2649,7 +2579,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2669,15 +2598,13 @@ "ctxt": 0 }, "value": "Bear", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -2713,7 +2640,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2751,7 +2677,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2771,7 +2696,6 @@ "ctxt": 0 }, "value": "Pig", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2805,6 +2729,7 @@ "ctxt": 0 }, "value": "mbp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2835,7 +2760,6 @@ "ctxt": 0 }, "value": "Man", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2855,15 +2779,13 @@ "ctxt": 0 }, "value": "Bear", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2899,7 +2821,6 @@ "ctxt": 0 }, "value": "pigify", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2913,7 +2834,6 @@ "ctxt": 0 }, "value": "mbp", - "typeAnnotation": null, "optional": false } } @@ -2928,7 +2848,6 @@ "ctxt": 0 }, "value": "oinks", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2963,7 +2882,6 @@ "ctxt": 0 }, "value": "pigify", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2977,7 +2895,6 @@ "ctxt": 0 }, "value": "mbp", - "typeAnnotation": null, "optional": false } } @@ -2992,7 +2909,6 @@ "ctxt": 0 }, "value": "walks", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3013,7 +2929,6 @@ "ctxt": 0 }, "value": "ITest", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3043,7 +2958,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3110,8 +3024,8 @@ "ctxt": 0 }, "value": "createTestAsync", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -3157,7 +3071,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "property": { @@ -3168,7 +3081,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3184,7 +3096,6 @@ "ctxt": 0 }, "value": "then", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3225,7 +3136,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -3280,7 +3190,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3306,7 +3215,6 @@ "ctxt": 0 }, "value": "ITest", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3345,8 +3253,8 @@ "ctxt": 0 }, "value": "createTest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -3389,7 +3297,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "value": { @@ -3437,7 +3344,6 @@ "ctxt": 0 }, "value": "ITest", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3458,7 +3364,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3479,6 +3384,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3509,7 +3415,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3529,15 +3434,13 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -3573,7 +3476,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3594,7 +3496,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3632,7 +3533,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3652,7 +3552,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3671,7 +3570,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3692,6 +3590,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3714,13 +3613,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3739,6 +3636,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3761,13 +3659,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3803,7 +3699,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3824,7 +3719,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3862,7 +3756,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3882,7 +3775,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3916,6 +3808,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3932,8 +3825,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -3950,7 +3842,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4003,6 +3894,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4019,8 +3911,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -4037,7 +3928,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4107,8 +3997,8 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -4152,7 +4042,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4191,8 +4080,8 @@ "ctxt": 0 }, "value": "assign", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrowFunctionExpression", @@ -4210,6 +4099,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4232,13 +4122,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, { "type": "Identifier", @@ -4248,6 +4136,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4270,13 +4159,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "body": { @@ -4301,7 +4188,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -4312,7 +4198,6 @@ "ctxt": 0 }, "value": "assign", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4328,7 +4213,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false } }, @@ -4342,7 +4226,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -4374,7 +4257,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4395,7 +4277,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4434,6 +4315,7 @@ "ctxt": 0 }, "value": "res", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4508,7 +4390,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4538,8 +4419,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -4556,7 +4436,6 @@ "ctxt": 0 }, "value": "assign", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4603,7 +4482,6 @@ "ctxt": 0 }, "value": "func", - "typeAnnotation": null, "optional": false } ] diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/unionAndIntersectionInference2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/unionAndIntersectionInference2/input.ts.json index a89e281c62d1..f2b6735836e1 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/unionAndIntersectionInference2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/unionAndIntersectionInference2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -67,7 +67,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -83,8 +82,7 @@ } ] } - }, - "optional": false + } } } ], @@ -120,7 +118,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -150,7 +147,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -182,6 +178,7 @@ "ctxt": 0 }, "value": "a1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -198,8 +195,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -231,6 +227,7 @@ "ctxt": 0 }, "value": "b1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -274,8 +271,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -307,6 +303,7 @@ "ctxt": 0 }, "value": "c1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -350,8 +347,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -383,6 +379,7 @@ "ctxt": 0 }, "value": "d1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -431,7 +428,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -461,8 +457,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -494,6 +489,7 @@ "ctxt": 0 }, "value": "e1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -538,8 +534,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -568,7 +563,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -582,7 +576,6 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, "optional": false } } @@ -612,7 +605,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -626,7 +618,6 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, "optional": false } } @@ -656,7 +647,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -670,7 +660,6 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, "optional": false } } @@ -700,7 +689,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -714,7 +702,6 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, "optional": false } } @@ -744,7 +731,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -758,7 +744,6 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, "optional": false } } @@ -776,7 +761,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -797,6 +781,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -827,7 +812,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -856,7 +840,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -886,8 +869,7 @@ } ] } - }, - "optional": false + } } } ], @@ -923,7 +905,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -953,7 +934,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -985,6 +965,7 @@ "ctxt": 0 }, "value": "a2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1033,7 +1014,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1063,8 +1043,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1096,6 +1075,7 @@ "ctxt": 0 }, "value": "b2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1135,7 +1115,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1182,8 +1161,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1215,6 +1193,7 @@ "ctxt": 0 }, "value": "c2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1263,7 +1242,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1302,8 +1280,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1335,6 +1312,7 @@ "ctxt": 0 }, "value": "d2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1383,7 +1361,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1444,7 +1421,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1474,8 +1450,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1504,7 +1479,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1518,7 +1492,6 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, "optional": false } } @@ -1548,7 +1521,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1562,7 +1534,6 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, "optional": false } } @@ -1592,7 +1563,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1606,7 +1576,6 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, "optional": false } } @@ -1636,7 +1605,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1650,7 +1618,6 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/unionAndIntersectionInference3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/unionAndIntersectionInference3/input.ts.json index cc03a6a1fde5..2e3737483c91 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/unionAndIntersectionInference3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/unionAndIntersectionInference3/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "Maybe", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -79,7 +77,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -106,7 +103,6 @@ "ctxt": 0 }, "value": "concatMaybe", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -139,8 +135,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -186,7 +182,6 @@ "ctxt": 0 }, "value": "Maybe", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -212,7 +207,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -242,7 +236,6 @@ "ctxt": 0 }, "value": "Maybe", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -268,7 +261,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -317,7 +309,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -354,7 +345,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -384,7 +374,6 @@ "ctxt": 0 }, "value": "concatMaybe", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -478,6 +467,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -501,6 +491,7 @@ "ctxt": 0 }, "value": "com", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -547,7 +538,6 @@ "ctxt": 0 }, "value": "Iterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -573,7 +563,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -593,7 +582,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -613,7 +601,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -636,7 +623,6 @@ "ctxt": 0 }, "value": "AsyncIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -662,7 +648,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -682,7 +667,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -702,7 +686,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -714,8 +697,7 @@ } } } - }, - "optional": false + } } ], "typeParams": { @@ -741,7 +723,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -762,7 +743,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -783,7 +763,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -813,7 +792,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -839,7 +817,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -849,8 +826,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -868,6 +844,7 @@ "ctxt": 0 }, "value": "com", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -914,7 +891,6 @@ "ctxt": 0 }, "value": "Iterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -940,7 +916,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -960,7 +935,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -980,7 +954,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1003,7 +976,6 @@ "ctxt": 0 }, "value": "AsyncIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1029,7 +1001,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1049,7 +1020,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1069,7 +1039,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1081,8 +1050,7 @@ } } } - }, - "optional": false + } } ], "body": { @@ -1108,7 +1076,6 @@ "ctxt": 0 }, "value": "com", - "typeAnnotation": null, "optional": false } } @@ -1139,7 +1106,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1160,7 +1126,6 @@ "ctxt": 0 }, "value": "R", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1181,7 +1146,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1211,7 +1175,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1237,7 +1200,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1266,7 +1228,6 @@ "ctxt": 0 }, "value": "Foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1293,7 +1254,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1326,7 +1286,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1340,6 +1299,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1362,13 +1322,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1408,7 +1366,6 @@ "ctxt": 0 }, "value": "Bar1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1435,7 +1392,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1468,7 +1424,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1482,6 +1437,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1512,7 +1468,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1532,7 +1487,6 @@ "ctxt": 0 }, "value": "PromiseLike", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1558,7 +1512,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1568,8 +1521,7 @@ } ] } - }, - "optional": false + } } ], "typeAnn": { @@ -1619,6 +1571,7 @@ "ctxt": 0 }, "value": "f1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1642,6 +1595,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1672,7 +1626,6 @@ "ctxt": 0 }, "value": "Foo1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1698,7 +1651,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1721,7 +1673,6 @@ "ctxt": 0 }, "value": "Bar1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1747,7 +1698,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1757,8 +1707,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -1784,7 +1733,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1814,7 +1762,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1840,7 +1787,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1850,8 +1796,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -1883,6 +1828,7 @@ "ctxt": 0 }, "value": "f2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1906,6 +1852,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1936,7 +1883,6 @@ "ctxt": 0 }, "value": "Foo1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1962,7 +1908,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1985,7 +1930,6 @@ "ctxt": 0 }, "value": "Bar1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2011,7 +1955,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2021,8 +1964,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -2048,7 +1990,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2078,7 +2019,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2104,7 +2044,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2114,8 +2053,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2145,8 +2083,8 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2156,7 +2094,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false } } @@ -2184,8 +2121,8 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -2195,7 +2132,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } } @@ -2216,7 +2152,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2242,7 +2177,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2274,7 +2208,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2288,6 +2221,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2310,13 +2244,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -2357,7 +2289,6 @@ "ctxt": 0 }, "value": "Bar2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2383,7 +2314,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2415,7 +2345,6 @@ "ctxt": 0 }, "value": "test", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2429,6 +2358,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2459,7 +2389,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2479,7 +2408,6 @@ "ctxt": 0 }, "value": "PromiseLike", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2505,7 +2433,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2515,8 +2442,7 @@ } ] } - }, - "optional": false + } } ], "typeAnn": { @@ -2566,6 +2492,7 @@ "ctxt": 0 }, "value": "g1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2589,6 +2516,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2619,7 +2547,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2645,7 +2572,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2668,7 +2594,6 @@ "ctxt": 0 }, "value": "Bar2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2694,7 +2619,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2704,8 +2628,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -2731,7 +2654,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2761,7 +2683,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2787,7 +2708,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2797,8 +2717,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2830,6 +2749,7 @@ "ctxt": 0 }, "value": "g2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2853,6 +2773,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2883,7 +2804,6 @@ "ctxt": 0 }, "value": "Foo2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2909,7 +2829,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2932,7 +2851,6 @@ "ctxt": 0 }, "value": "Bar2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2958,7 +2876,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2968,8 +2885,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": { @@ -2995,7 +2911,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3025,7 +2940,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3051,7 +2965,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3061,8 +2974,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3092,8 +3004,8 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3103,7 +3015,6 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, "optional": false } } @@ -3131,8 +3042,8 @@ "ctxt": 0 }, "value": "g2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3142,7 +3053,6 @@ "ctxt": 0 }, "value": "g1", - "typeAnnotation": null, "optional": false } } @@ -3157,7 +3067,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3178,6 +3087,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3225,7 +3135,6 @@ "ctxt": 0 }, "value": "Iterable", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3251,7 +3160,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3261,8 +3169,7 @@ } ] } - }, - "optional": false + } } } ], @@ -3298,7 +3205,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3328,7 +3234,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3345,7 +3250,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3366,6 +3270,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3413,15 +3318,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -3457,7 +3360,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3487,7 +3389,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3519,6 +3420,7 @@ "ctxt": 0 }, "value": "sa", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3543,8 +3445,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -3576,6 +3477,7 @@ "ctxt": 0 }, "value": "sx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3632,7 +3534,6 @@ "ctxt": 0 }, "value": "extra", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3662,8 +3563,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3695,8 +3595,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3713,7 +3613,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3727,7 +3626,6 @@ "ctxt": 0 }, "value": "sa", - "typeAnnotation": null, "optional": false } } @@ -3763,8 +3661,8 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3781,7 +3679,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3795,7 +3692,6 @@ "ctxt": 0 }, "value": "sx", - "typeAnnotation": null, "optional": false } } @@ -3831,8 +3727,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3849,7 +3745,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3863,7 +3758,6 @@ "ctxt": 0 }, "value": "sa", - "typeAnnotation": null, "optional": false } } @@ -3899,8 +3793,8 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3917,7 +3811,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3931,7 +3824,6 @@ "ctxt": 0 }, "value": "sx", - "typeAnnotation": null, "optional": false } } @@ -3952,7 +3844,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3978,7 +3869,6 @@ "ctxt": 0 }, "value": "props", - "typeAnnotation": null, "optional": false }, "value": null, @@ -4004,7 +3894,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4046,7 +3935,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4080,7 +3968,6 @@ "ctxt": 0 }, "value": "ComponentClass", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4106,7 +3993,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4130,6 +4016,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4152,13 +4039,11 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4184,7 +4069,6 @@ "ctxt": 0 }, "value": "Component", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4210,7 +4094,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4246,7 +4129,6 @@ "ctxt": 0 }, "value": "FunctionComponent", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4272,7 +4154,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4296,6 +4177,7 @@ "ctxt": 0 }, "value": "props", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4318,13 +4200,11 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -4371,7 +4251,6 @@ "ctxt": 0 }, "value": "ComponentType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4397,7 +4276,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4428,7 +4306,6 @@ "ctxt": 0 }, "value": "FunctionComponent", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4454,7 +4331,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4477,7 +4353,6 @@ "ctxt": 0 }, "value": "ComponentClass", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4503,7 +4378,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4537,7 +4411,6 @@ "ctxt": 0 }, "value": "RouteComponentProps", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4567,7 +4440,6 @@ "ctxt": 0 }, "value": "route", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4607,7 +4479,6 @@ "ctxt": 0 }, "value": "withRouter", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4628,6 +4499,7 @@ "ctxt": 0 }, "value": "component", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4658,7 +4530,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4678,7 +4549,6 @@ "ctxt": 0 }, "value": "ComponentType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4704,7 +4574,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4714,8 +4583,7 @@ } ] } - }, - "optional": false + } } } ], @@ -4751,7 +4619,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4769,7 +4636,6 @@ "ctxt": 0 }, "value": "RouteComponentProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4791,7 +4657,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4809,7 +4674,6 @@ "ctxt": 0 }, "value": "ComponentType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4835,7 +4699,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4869,7 +4732,6 @@ "ctxt": 0 }, "value": "ComponentClass", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4895,7 +4757,6 @@ "ctxt": 0 }, "value": "Omit", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4921,7 +4782,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4949,7 +4809,6 @@ "ctxt": 0 }, "value": "RouteComponentProps", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4978,7 +4837,6 @@ "ctxt": 0 }, "value": "Props", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4999,7 +4857,6 @@ "ctxt": 0 }, "value": "RouteComponentProps", - "typeAnnotation": null, "optional": false }, "typeArguments": null @@ -5029,7 +4886,6 @@ "ctxt": 0 }, "value": "username", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5083,6 +4939,7 @@ "ctxt": 0 }, "value": "MyComponent", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5105,7 +4962,6 @@ "ctxt": 0 }, "value": "ComponentType", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5131,7 +4987,6 @@ "ctxt": 0 }, "value": "Props", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5139,8 +4994,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5169,7 +5023,6 @@ "ctxt": 0 }, "value": "withRouter", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5183,7 +5036,6 @@ "ctxt": 0 }, "value": "MyComponent", - "typeAnnotation": null, "optional": false } } @@ -5207,7 +5059,6 @@ "ctxt": 0 }, "value": "AB", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5233,7 +5084,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5273,7 +5123,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5302,7 +5151,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5336,7 +5184,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5365,7 +5212,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5388,7 +5234,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5409,6 +5254,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5439,7 +5285,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5459,7 +5304,6 @@ "ctxt": 0 }, "value": "AB", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5485,7 +5329,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5495,8 +5338,7 @@ } ] } - }, - "optional": false + } } } ], @@ -5532,7 +5374,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5553,7 +5394,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5599,7 +5439,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5628,7 +5467,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5663,6 +5501,7 @@ "ctxt": 0 }, "value": "ab", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5685,7 +5524,6 @@ "ctxt": 0 }, "value": "AB", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5708,8 +5546,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5741,8 +5578,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5759,7 +5596,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5773,7 +5609,6 @@ "ctxt": 0 }, "value": "ab", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/unionTypeInference/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/unionTypeInference/input.ts.json index f1dd965b8f30..f409119853d9 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/unionTypeInference/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/typeInference/unionTypeInference/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "sn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -164,8 +165,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -182,7 +182,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -203,6 +202,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -225,13 +225,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -250,6 +248,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -289,15 +288,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -333,7 +330,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -363,7 +359,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -395,8 +390,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -413,7 +408,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -473,8 +467,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -491,7 +485,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -556,8 +549,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -574,7 +567,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -600,7 +592,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false } } @@ -636,8 +627,8 @@ "ctxt": 0 }, "value": "a4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -654,7 +645,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -668,7 +658,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -721,8 +710,8 @@ "ctxt": 0 }, "value": "a5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -739,7 +728,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -809,8 +797,8 @@ "ctxt": 0 }, "value": "a6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -827,7 +815,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -887,8 +874,8 @@ "ctxt": 0 }, "value": "a7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -905,7 +892,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -955,7 +941,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -976,6 +961,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1032,7 +1018,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1040,8 +1025,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1077,7 +1061,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1107,7 +1090,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1139,8 +1121,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1157,7 +1139,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1220,7 +1201,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1241,6 +1221,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1297,15 +1278,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -1341,7 +1320,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1371,7 +1349,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1403,8 +1380,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1421,7 +1398,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1469,8 +1445,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1487,7 +1463,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1501,7 +1476,6 @@ "ctxt": 0 }, "value": "sn", - "typeAnnotation": null, "optional": false } } @@ -1537,8 +1511,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1555,7 +1529,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1603,8 +1576,8 @@ "ctxt": 0 }, "value": "c4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1621,7 +1594,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1635,7 +1607,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -1671,8 +1642,8 @@ "ctxt": 0 }, "value": "c5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1689,7 +1660,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1727,7 +1697,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -1748,6 +1717,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1787,15 +1757,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -1831,7 +1799,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1861,7 +1828,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1893,8 +1859,8 @@ "ctxt": 0 }, "value": "d1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1911,7 +1877,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1964,8 +1929,8 @@ "ctxt": 0 }, "value": "d2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1982,7 +1947,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1996,7 +1960,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -2032,8 +1995,8 @@ "ctxt": 0 }, "value": "d3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2050,7 +2013,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2095,7 +2057,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2122,7 +2083,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2155,7 +2115,6 @@ "ctxt": 0 }, "value": "then", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2169,6 +2128,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2192,6 +2152,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2214,13 +2175,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2254,7 +2213,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2274,7 +2232,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2300,7 +2257,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2312,8 +2268,7 @@ } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -2323,6 +2278,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2345,13 +2301,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -2376,7 +2330,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2402,7 +2355,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2434,7 +2386,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2469,7 +2420,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2496,7 +2446,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2529,7 +2478,6 @@ "ctxt": 0 }, "value": "then", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2543,6 +2491,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2566,6 +2515,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2588,13 +2538,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -2628,7 +2576,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2648,7 +2595,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2674,7 +2620,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2686,8 +2631,7 @@ } } } - }, - "optional": false + } }, { "type": "Identifier", @@ -2697,6 +2641,7 @@ "ctxt": 0 }, "value": "g", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2719,13 +2664,11 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -2750,7 +2693,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2776,7 +2718,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2808,7 +2749,6 @@ "ctxt": 0 }, "value": "S", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2831,7 +2771,6 @@ "ctxt": 0 }, "value": "qux", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2852,6 +2791,7 @@ "ctxt": 0 }, "value": "p1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2874,7 +2814,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2897,8 +2836,7 @@ ] } } - }, - "optional": false + } } }, { @@ -2917,6 +2855,7 @@ "ctxt": 0 }, "value": "p2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2939,7 +2878,6 @@ "ctxt": 0 }, "value": "Bar", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2962,8 +2900,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3004,8 +2941,8 @@ "ctxt": 0 }, "value": "p1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3015,7 +2952,6 @@ "ctxt": 0 }, "value": "p2", - "typeAnnotation": null, "optional": false } } @@ -3037,7 +2973,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3058,6 +2993,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3088,7 +3024,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3108,7 +3043,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3134,7 +3068,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3144,8 +3077,7 @@ } ] } - }, - "optional": false + } } } ], @@ -3181,7 +3113,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3232,6 +3163,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3279,7 +3211,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3312,8 +3243,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3342,7 +3272,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3356,7 +3285,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3374,7 +3302,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -3395,6 +3322,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3417,13 +3345,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3442,6 +3368,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3481,15 +3408,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } } ], @@ -3525,7 +3450,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3555,7 +3479,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3587,8 +3510,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3605,7 +3528,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3665,6 +3587,7 @@ "ctxt": 0 }, "value": "containsPromises", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3690,8 +3613,7 @@ "kind": "symbol" } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -3708,7 +3630,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3734,7 +3655,6 @@ "ctxt": 0 }, "value": "DeepPromised", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3760,7 +3680,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3800,7 +3719,6 @@ "ctxt": 0 }, "value": "containsPromises", - "typeAnnotation": null, "optional": false }, "computed": true, @@ -3859,7 +3777,6 @@ "ctxt": 0 }, "value": "TKey", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3885,7 +3802,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3926,7 +3842,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3946,7 +3861,6 @@ "ctxt": 0 }, "value": "TKey", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3967,7 +3881,6 @@ "ctxt": 0 }, "value": "DeepPromised", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4001,7 +3914,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4021,7 +3933,6 @@ "ctxt": 0 }, "value": "TKey", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4045,7 +3956,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4071,7 +3981,6 @@ "ctxt": 0 }, "value": "DeepPromised", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4105,7 +4014,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4125,7 +4033,6 @@ "ctxt": 0 }, "value": "TKey", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4153,7 +4060,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4174,6 +4080,7 @@ "ctxt": 0 }, "value": "deepPromised", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4196,7 +4103,6 @@ "ctxt": 0 }, "value": "DeepPromised", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4222,7 +4128,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4230,8 +4135,7 @@ ] } } - }, - "optional": false + } } } ], @@ -4274,6 +4178,7 @@ "ctxt": 0 }, "value": "deepPromisedWithIndexer", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4296,7 +4201,6 @@ "ctxt": 0 }, "value": "DeepPromised", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4326,6 +4230,7 @@ "ctxt": 0 }, "value": "name", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4342,8 +4247,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4403,8 +4307,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -4414,7 +4317,6 @@ "ctxt": 0 }, "value": "deepPromised", - "typeAnnotation": null, "optional": false }, "definite": false @@ -4454,8 +4356,8 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": null, "definite": false @@ -4484,7 +4386,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false }, "property": { @@ -4495,7 +4396,6 @@ "ctxt": 0 }, "value": "values", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4511,7 +4411,6 @@ "ctxt": 0 }, "value": "deepPromisedWithIndexer", - "typeAnnotation": null, "optional": false } } @@ -4551,8 +4450,8 @@ "ctxt": 0 }, "value": "awaitedValue", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "AwaitExpression", @@ -4569,7 +4468,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false } }, @@ -4592,7 +4490,6 @@ "ctxt": 0 }, "value": "awaitedValue", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -4624,7 +4521,6 @@ "ctxt": 0 }, "value": "fun", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4638,7 +4534,6 @@ "ctxt": 0 }, "value": "awaitedValue", - "typeAnnotation": null, "optional": false } } @@ -4679,7 +4574,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4705,7 +4599,6 @@ "ctxt": 0 }, "value": "Deep", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4731,7 +4624,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -4762,7 +4654,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4788,7 +4679,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4829,7 +4719,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4849,7 +4738,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4870,7 +4758,6 @@ "ctxt": 0 }, "value": "Deep", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4904,7 +4791,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4924,7 +4810,6 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4947,7 +4832,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -4968,6 +4852,7 @@ "ctxt": 0 }, "value": "dp", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4990,7 +4875,6 @@ "ctxt": 0 }, "value": "Deep", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5016,7 +4900,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5024,8 +4907,7 @@ ] } } - }, - "optional": false + } } } ], @@ -5061,7 +4943,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5091,7 +4972,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5123,6 +5003,7 @@ "ctxt": 0 }, "value": "xx", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5154,7 +5035,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5201,8 +5081,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -5231,7 +5110,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5245,7 +5123,6 @@ "ctxt": 0 }, "value": "xx", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/widenedTypes/arrayLiteralWidened/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/widenedTypes/arrayLiteralWidened/input.ts.json index e08355ffc5b1..6c5ed8b64b94 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/widenedTypes/arrayLiteralWidened/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/widenedTypes/arrayLiteralWidened/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -72,8 +72,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -116,8 +116,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -180,8 +180,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -201,7 +201,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -215,7 +214,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -250,8 +248,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -339,8 +337,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -405,8 +403,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -436,7 +434,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -450,7 +447,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -488,8 +484,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -555,8 +551,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -623,7 +619,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -661,6 +656,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -677,8 +673,7 @@ }, "kind": "undefined" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -688,7 +683,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -720,8 +714,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -741,7 +735,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -776,8 +769,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -798,7 +791,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -833,8 +825,8 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -854,7 +846,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -868,7 +859,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/widenedTypes/initializersWidened/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/widenedTypes/initializersWidened/input.ts.json index 76ca2f497263..9620e667b37b 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/widenedTypes/initializersWidened/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/widenedTypes/initializersWidened/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NullLiteral", @@ -71,8 +71,8 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -82,7 +82,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -114,8 +113,8 @@ "ctxt": 0 }, "value": "z1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -164,6 +163,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -180,8 +180,7 @@ }, "kind": "null" } - }, - "optional": false + } }, "init": null, "definite": false @@ -213,6 +212,7 @@ "ctxt": 0 }, "value": "y2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -229,8 +229,7 @@ }, "kind": "undefined" } - }, - "optional": false + } }, "init": null, "definite": false @@ -262,6 +261,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -278,8 +278,7 @@ }, "kind": "null" } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -318,6 +317,7 @@ "ctxt": 0 }, "value": "y3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -334,8 +334,7 @@ }, "kind": "undefined" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -345,7 +344,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -377,6 +375,7 @@ "ctxt": 0 }, "value": "z3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -393,8 +392,7 @@ }, "kind": "undefined" } - }, - "optional": false + } }, "init": { "type": "UnaryExpression", @@ -443,8 +441,8 @@ "ctxt": 0 }, "value": "x4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -500,8 +498,8 @@ "ctxt": 0 }, "value": "y4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -519,7 +517,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -530,7 +527,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -563,8 +559,8 @@ "ctxt": 0 }, "value": "z4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -640,8 +636,8 @@ "ctxt": 0 }, "value": "x5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -667,7 +663,6 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, "optional": false } }, @@ -700,8 +695,8 @@ "ctxt": 0 }, "value": "y5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -719,7 +714,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "right": { @@ -730,7 +724,6 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, "optional": false } }, @@ -763,8 +756,8 @@ "ctxt": 0 }, "value": "z5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -800,7 +793,6 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, "optional": false } }, diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/widenedTypes/objectLiteralWidened/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/widenedTypes/objectLiteralWidened/input.ts.json index ce3ff39b917f..5b5fd4bd51e8 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/widenedTypes/objectLiteralWidened/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/widenedTypes/objectLiteralWidened/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -74,7 +73,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -85,7 +83,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -120,8 +117,8 @@ "ctxt": 0 }, "value": "y1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -141,7 +138,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -163,7 +159,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -184,7 +179,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -206,7 +200,6 @@ "ctxt": 0 }, "value": "boo", - "typeAnnotation": null, "optional": false }, "value": { @@ -217,7 +210,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -255,6 +247,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -271,8 +264,7 @@ }, "kind": "undefined" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -282,7 +274,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -314,6 +305,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -330,8 +322,7 @@ }, "kind": "null" } - }, - "optional": false + } }, "init": { "type": "NullLiteral", @@ -370,8 +361,8 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -391,7 +382,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -402,7 +392,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } }, @@ -416,7 +405,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -427,7 +415,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -462,8 +449,8 @@ "ctxt": 0 }, "value": "y2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -483,7 +470,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -494,7 +480,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } }, @@ -508,7 +493,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "value": { @@ -529,7 +513,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "value": { @@ -540,7 +523,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false } }, @@ -554,7 +536,6 @@ "ctxt": 0 }, "value": "boo", - "typeAnnotation": null, "optional": false }, "value": { @@ -565,7 +546,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/widenedTypes/strictNullChecksNoWidening/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/widenedTypes/strictNullChecksNoWidening/input.ts.json index 030357b31ff9..7b9fadf60db3 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/widenedTypes/strictNullChecksNoWidening/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/typeRelationships/widenedTypes/strictNullChecksNoWidening/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "NullLiteral", @@ -71,8 +71,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -82,7 +82,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -114,8 +113,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "UnaryExpression", @@ -164,8 +163,8 @@ "ctxt": 0 }, "value": "b1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -205,8 +204,8 @@ "ctxt": 0 }, "value": "b2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -248,8 +247,8 @@ "ctxt": 0 }, "value": "b3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -269,7 +268,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -304,8 +302,8 @@ "ctxt": 0 }, "value": "b4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -370,8 +368,8 @@ "ctxt": 0 }, "value": "b5", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -423,7 +421,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -444,6 +441,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -466,13 +464,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -508,7 +504,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -538,7 +533,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -570,8 +564,8 @@ "ctxt": 0 }, "value": "c1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -588,7 +582,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -635,8 +628,8 @@ "ctxt": 0 }, "value": "c2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -653,7 +646,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -667,7 +659,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -703,8 +694,8 @@ "ctxt": 0 }, "value": "c3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -721,7 +712,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/types/union/contextualTypeWithUnionTypeCallSignatures/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/union/contextualTypeWithUnionTypeCallSignatures/input.ts.json index 4454eac4950e..88a2d2115daa 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/union/contextualTypeWithUnionTypeCallSignatures/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/union/contextualTypeWithUnionTypeCallSignatures/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "IWithNoCallSignatures", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "IWithCallSignatures", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -125,6 +122,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -141,8 +139,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -182,7 +179,6 @@ "ctxt": 0 }, "value": "IWithCallSignatures2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -212,6 +208,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -228,8 +225,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -269,7 +265,6 @@ "ctxt": 0 }, "value": "IWithCallSignatures3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -299,6 +294,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -315,8 +311,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -356,7 +351,6 @@ "ctxt": 0 }, "value": "IWithCallSignatures4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -386,6 +380,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -402,8 +397,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -441,6 +435,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -457,8 +452,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -468,6 +462,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -484,8 +479,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -535,6 +529,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -565,7 +560,6 @@ "ctxt": 0 }, "value": "IWithNoCallSignatures", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -585,15 +579,13 @@ "ctxt": 0 }, "value": "IWithCallSignatures", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -611,8 +603,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -637,7 +629,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -648,7 +639,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -690,6 +680,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -720,7 +711,6 @@ "ctxt": 0 }, "value": "IWithCallSignatures", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -740,15 +730,13 @@ "ctxt": 0 }, "value": "IWithCallSignatures2", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -766,8 +754,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -792,7 +780,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -803,7 +790,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -845,6 +831,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -875,7 +862,6 @@ "ctxt": 0 }, "value": "IWithCallSignatures", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -895,15 +881,13 @@ "ctxt": 0 }, "value": "IWithCallSignatures2", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -921,8 +905,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -933,7 +917,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -970,6 +953,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1000,7 +984,6 @@ "ctxt": 0 }, "value": "IWithCallSignatures", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1020,15 +1003,13 @@ "ctxt": 0 }, "value": "IWithCallSignatures3", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -1046,8 +1027,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1072,7 +1053,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1083,7 +1063,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1125,6 +1104,7 @@ "ctxt": 0 }, "value": "x4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1155,7 +1135,6 @@ "ctxt": 0 }, "value": "IWithCallSignatures", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1175,15 +1154,13 @@ "ctxt": 0 }, "value": "IWithCallSignatures4", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -1201,8 +1178,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1227,7 +1204,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1238,7 +1214,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/union/contextualTypeWithUnionTypeIndexSignatures/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/union/contextualTypeWithUnionTypeIndexSignatures/input.ts.json index df9d3877fc52..7be39124f8e5 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/union/contextualTypeWithUnionTypeIndexSignatures/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/union/contextualTypeWithUnionTypeIndexSignatures/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "SomeType", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,6 +50,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -67,8 +67,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -108,7 +107,6 @@ "ctxt": 0 }, "value": "SomeType2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -138,6 +136,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -154,8 +153,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -195,7 +193,6 @@ "ctxt": 0 }, "value": "IWithNoStringIndexSignature", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -225,7 +222,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -269,7 +265,6 @@ "ctxt": 0 }, "value": "IWithNoNumberIndexSignature", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -341,7 +336,6 @@ "ctxt": 0 }, "value": "IWithStringIndexSignature1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -366,6 +360,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -382,8 +377,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -408,7 +402,6 @@ "ctxt": 0 }, "value": "SomeType", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -439,7 +432,6 @@ "ctxt": 0 }, "value": "IWithStringIndexSignature2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -464,6 +456,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -480,8 +473,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -506,7 +498,6 @@ "ctxt": 0 }, "value": "SomeType2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -537,7 +528,6 @@ "ctxt": 0 }, "value": "IWithNumberIndexSignature1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -562,6 +552,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -578,8 +569,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -604,7 +594,6 @@ "ctxt": 0 }, "value": "SomeType", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -635,7 +624,6 @@ "ctxt": 0 }, "value": "IWithNumberIndexSignature2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -660,6 +648,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -676,8 +665,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -702,7 +690,6 @@ "ctxt": 0 }, "value": "SomeType2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -743,6 +730,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -773,7 +761,6 @@ "ctxt": 0 }, "value": "IWithNoStringIndexSignature", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -793,15 +780,13 @@ "ctxt": 0 }, "value": "IWithStringIndexSignature1", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -821,7 +806,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -840,8 +824,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -852,7 +836,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -892,6 +875,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -922,7 +906,6 @@ "ctxt": 0 }, "value": "IWithNoStringIndexSignature", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -942,15 +925,13 @@ "ctxt": 0 }, "value": "IWithStringIndexSignature1", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -970,7 +951,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -989,8 +969,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1001,7 +981,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1041,6 +1020,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1071,7 +1051,6 @@ "ctxt": 0 }, "value": "IWithNoStringIndexSignature", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1091,15 +1070,13 @@ "ctxt": 0 }, "value": "IWithStringIndexSignature1", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1119,7 +1096,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "value": { @@ -1168,6 +1144,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1198,7 +1175,6 @@ "ctxt": 0 }, "value": "IWithStringIndexSignature1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1218,15 +1194,13 @@ "ctxt": 0 }, "value": "IWithStringIndexSignature2", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1246,7 +1220,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -1265,8 +1238,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1291,7 +1264,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -1302,7 +1274,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1347,6 +1318,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1377,7 +1349,6 @@ "ctxt": 0 }, "value": "IWithStringIndexSignature1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1397,15 +1368,13 @@ "ctxt": 0 }, "value": "IWithStringIndexSignature2", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1425,7 +1394,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "value": { @@ -1444,8 +1412,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1456,7 +1424,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1496,6 +1463,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1526,7 +1494,6 @@ "ctxt": 0 }, "value": "IWithNoNumberIndexSignature", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1546,15 +1513,13 @@ "ctxt": 0 }, "value": "IWithNumberIndexSignature1", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1591,8 +1556,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1603,7 +1568,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1643,6 +1607,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1673,7 +1638,6 @@ "ctxt": 0 }, "value": "IWithNoNumberIndexSignature", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1693,15 +1657,13 @@ "ctxt": 0 }, "value": "IWithNumberIndexSignature1", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1738,8 +1700,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1750,7 +1712,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1790,6 +1751,7 @@ "ctxt": 0 }, "value": "x3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1820,7 +1782,6 @@ "ctxt": 0 }, "value": "IWithNoNumberIndexSignature", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1840,15 +1801,13 @@ "ctxt": 0 }, "value": "IWithNumberIndexSignature1", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1915,6 +1874,7 @@ "ctxt": 0 }, "value": "x4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1945,7 +1905,6 @@ "ctxt": 0 }, "value": "IWithNumberIndexSignature1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1965,15 +1924,13 @@ "ctxt": 0 }, "value": "IWithNumberIndexSignature2", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -2010,8 +1967,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2036,7 +1993,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -2047,7 +2003,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2092,6 +2047,7 @@ "ctxt": 0 }, "value": "x4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2122,7 +2078,6 @@ "ctxt": 0 }, "value": "IWithNumberIndexSignature1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2142,15 +2097,13 @@ "ctxt": 0 }, "value": "IWithNumberIndexSignature2", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -2187,8 +2140,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2199,7 +2152,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/union/contextualTypeWithUnionTypeMembers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/union/contextualTypeWithUnionTypeMembers/input.ts.json index 9dac333012bb..c7d774b3cdd4 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/union/contextualTypeWithUnionTypeMembers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/union/contextualTypeWithUnionTypeMembers/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "commonMethodType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,6 +92,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -111,8 +109,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -150,7 +147,6 @@ "ctxt": 0 }, "value": "commonPropertyType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -192,7 +188,6 @@ "ctxt": 0 }, "value": "commonMethodWithTypeParameter", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -206,6 +201,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -228,13 +224,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -259,7 +253,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -283,7 +276,6 @@ "ctxt": 0 }, "value": "methodOnlyInI1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -297,6 +289,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -313,8 +306,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -352,7 +344,6 @@ "ctxt": 0 }, "value": "propertyOnlyInI1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -396,7 +387,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -423,7 +413,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -456,7 +445,6 @@ "ctxt": 0 }, "value": "commonMethodType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -470,6 +458,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -486,8 +475,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -525,7 +513,6 @@ "ctxt": 0 }, "value": "commonPropertyType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -567,7 +554,6 @@ "ctxt": 0 }, "value": "commonMethodWithTypeParameter", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -581,6 +567,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -603,13 +590,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -634,7 +619,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -658,7 +642,6 @@ "ctxt": 0 }, "value": "methodOnlyInI2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -672,6 +655,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -688,8 +672,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -727,7 +710,6 @@ "ctxt": 0 }, "value": "propertyOnlyInI2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -781,6 +763,7 @@ "ctxt": 0 }, "value": "i1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -803,7 +786,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -826,8 +808,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -859,6 +840,7 @@ "ctxt": 0 }, "value": "i2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -881,7 +863,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -904,8 +885,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false @@ -937,6 +917,7 @@ "ctxt": 0 }, "value": "i1Ori2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -967,7 +948,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1005,7 +985,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1030,8 +1009,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1041,7 +1019,6 @@ "ctxt": 0 }, "value": "i1", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1073,6 +1050,7 @@ "ctxt": 0 }, "value": "i1Ori2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1103,7 +1081,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1141,7 +1118,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1166,8 +1142,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1177,7 +1152,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1209,6 +1183,7 @@ "ctxt": 0 }, "value": "i1Ori2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1239,7 +1214,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1277,7 +1251,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1302,8 +1275,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1323,7 +1295,6 @@ "ctxt": 0 }, "value": "commonPropertyType", - "typeAnnotation": null, "optional": false }, "value": { @@ -1351,7 +1322,6 @@ "ctxt": 0 }, "value": "commonMethodType", - "typeAnnotation": null, "optional": false }, "value": { @@ -1370,8 +1340,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1382,7 +1352,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1401,7 +1370,6 @@ "ctxt": 0 }, "value": "commonMethodWithTypeParameter", - "typeAnnotation": null, "optional": false }, "value": { @@ -1420,8 +1388,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1432,7 +1400,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1451,7 +1418,6 @@ "ctxt": 0 }, "value": "methodOnlyInI1", - "typeAnnotation": null, "optional": false }, "value": { @@ -1470,8 +1436,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1482,7 +1448,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1501,7 +1466,6 @@ "ctxt": 0 }, "value": "propertyOnlyInI1", - "typeAnnotation": null, "optional": false }, "value": { @@ -1550,6 +1514,7 @@ "ctxt": 0 }, "value": "i1Ori2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1580,7 +1545,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1618,7 +1582,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1643,8 +1606,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1664,7 +1626,6 @@ "ctxt": 0 }, "value": "commonPropertyType", - "typeAnnotation": null, "optional": false }, "value": { @@ -1692,7 +1653,6 @@ "ctxt": 0 }, "value": "commonMethodType", - "typeAnnotation": null, "optional": false }, "value": { @@ -1711,8 +1671,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1723,7 +1683,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1742,7 +1701,6 @@ "ctxt": 0 }, "value": "commonMethodWithTypeParameter", - "typeAnnotation": null, "optional": false }, "value": { @@ -1761,8 +1719,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1773,7 +1731,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1792,7 +1749,6 @@ "ctxt": 0 }, "value": "methodOnlyInI2", - "typeAnnotation": null, "optional": false }, "value": { @@ -1811,8 +1767,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -1823,7 +1779,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -1842,7 +1797,6 @@ "ctxt": 0 }, "value": "propertyOnlyInI2", - "typeAnnotation": null, "optional": false }, "value": { @@ -1891,6 +1845,7 @@ "ctxt": 0 }, "value": "i1Ori2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1921,7 +1876,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1959,7 +1913,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1984,8 +1937,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -2005,7 +1957,6 @@ "ctxt": 0 }, "value": "commonPropertyType", - "typeAnnotation": null, "optional": false }, "value": { @@ -2033,7 +1984,6 @@ "ctxt": 0 }, "value": "commonMethodType", - "typeAnnotation": null, "optional": false }, "value": { @@ -2052,8 +2002,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2064,7 +2014,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2083,7 +2032,6 @@ "ctxt": 0 }, "value": "commonMethodWithTypeParameter", - "typeAnnotation": null, "optional": false }, "value": { @@ -2102,8 +2050,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2114,7 +2062,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2133,7 +2080,6 @@ "ctxt": 0 }, "value": "methodOnlyInI1", - "typeAnnotation": null, "optional": false }, "value": { @@ -2152,8 +2098,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2164,7 +2110,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2183,7 +2128,6 @@ "ctxt": 0 }, "value": "propertyOnlyInI1", - "typeAnnotation": null, "optional": false }, "value": { @@ -2211,7 +2155,6 @@ "ctxt": 0 }, "value": "methodOnlyInI2", - "typeAnnotation": null, "optional": false }, "value": { @@ -2230,8 +2173,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2242,7 +2185,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2261,7 +2203,6 @@ "ctxt": 0 }, "value": "propertyOnlyInI2", - "typeAnnotation": null, "optional": false }, "value": { @@ -2310,6 +2251,7 @@ "ctxt": 0 }, "value": "arrayI1OrI2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2332,7 +2274,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2366,7 +2307,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2404,7 +2344,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2432,8 +2371,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -2453,7 +2391,6 @@ "ctxt": 0 }, "value": "i1", - "typeAnnotation": null, "optional": false } }, @@ -2467,7 +2404,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false } }, @@ -2491,7 +2427,6 @@ "ctxt": 0 }, "value": "commonPropertyType", - "typeAnnotation": null, "optional": false }, "value": { @@ -2519,7 +2454,6 @@ "ctxt": 0 }, "value": "commonMethodType", - "typeAnnotation": null, "optional": false }, "value": { @@ -2538,8 +2472,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2550,7 +2484,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2569,7 +2502,6 @@ "ctxt": 0 }, "value": "commonMethodWithTypeParameter", - "typeAnnotation": null, "optional": false }, "value": { @@ -2588,8 +2520,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2600,7 +2532,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2619,7 +2550,6 @@ "ctxt": 0 }, "value": "methodOnlyInI1", - "typeAnnotation": null, "optional": false }, "value": { @@ -2638,8 +2568,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2650,7 +2580,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2669,7 +2598,6 @@ "ctxt": 0 }, "value": "propertyOnlyInI1", - "typeAnnotation": null, "optional": false }, "value": { @@ -2710,7 +2638,6 @@ "ctxt": 0 }, "value": "commonPropertyType", - "typeAnnotation": null, "optional": false }, "value": { @@ -2738,7 +2665,6 @@ "ctxt": 0 }, "value": "commonMethodType", - "typeAnnotation": null, "optional": false }, "value": { @@ -2757,8 +2683,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2769,7 +2695,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2788,7 +2713,6 @@ "ctxt": 0 }, "value": "commonMethodWithTypeParameter", - "typeAnnotation": null, "optional": false }, "value": { @@ -2807,8 +2731,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2819,7 +2743,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2838,7 +2761,6 @@ "ctxt": 0 }, "value": "methodOnlyInI2", - "typeAnnotation": null, "optional": false }, "value": { @@ -2857,8 +2779,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2869,7 +2791,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -2888,7 +2809,6 @@ "ctxt": 0 }, "value": "propertyOnlyInI2", - "typeAnnotation": null, "optional": false }, "value": { @@ -2929,7 +2849,6 @@ "ctxt": 0 }, "value": "commonPropertyType", - "typeAnnotation": null, "optional": false }, "value": { @@ -2957,7 +2876,6 @@ "ctxt": 0 }, "value": "commonMethodType", - "typeAnnotation": null, "optional": false }, "value": { @@ -2976,8 +2894,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2988,7 +2906,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3007,7 +2924,6 @@ "ctxt": 0 }, "value": "commonMethodWithTypeParameter", - "typeAnnotation": null, "optional": false }, "value": { @@ -3026,8 +2942,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3038,7 +2954,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3057,7 +2972,6 @@ "ctxt": 0 }, "value": "methodOnlyInI1", - "typeAnnotation": null, "optional": false }, "value": { @@ -3076,8 +2990,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3088,7 +3002,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3107,7 +3020,6 @@ "ctxt": 0 }, "value": "propertyOnlyInI1", - "typeAnnotation": null, "optional": false }, "value": { @@ -3135,7 +3047,6 @@ "ctxt": 0 }, "value": "methodOnlyInI2", - "typeAnnotation": null, "optional": false }, "value": { @@ -3154,8 +3065,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3166,7 +3077,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "async": false, @@ -3185,7 +3095,6 @@ "ctxt": 0 }, "value": "propertyOnlyInI2", - "typeAnnotation": null, "optional": false }, "value": { @@ -3227,7 +3136,6 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3257,7 +3165,6 @@ "ctxt": 0 }, "value": "commonMethodDifferentReturnType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3271,6 +3178,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3287,8 +3195,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -3298,6 +3205,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3314,8 +3222,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -3353,7 +3260,6 @@ "ctxt": 0 }, "value": "commonPropertyDifferentType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3397,7 +3303,6 @@ "ctxt": 0 }, "value": "I21", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3427,7 +3332,6 @@ "ctxt": 0 }, "value": "commonMethodDifferentReturnType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3441,6 +3345,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3457,8 +3362,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -3468,6 +3372,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3484,8 +3389,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -3523,7 +3427,6 @@ "ctxt": 0 }, "value": "commonPropertyDifferentType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3577,6 +3480,7 @@ "ctxt": 0 }, "value": "i11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3599,13 +3503,11 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3637,6 +3539,7 @@ "ctxt": 0 }, "value": "i21", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3659,13 +3562,11 @@ "ctxt": 0 }, "value": "I21", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3697,6 +3598,7 @@ "ctxt": 0 }, "value": "i11Ori21", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3727,7 +3629,6 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3747,15 +3648,13 @@ "ctxt": 0 }, "value": "I21", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -3765,7 +3664,6 @@ "ctxt": 0 }, "value": "i11", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3797,6 +3695,7 @@ "ctxt": 0 }, "value": "i11Ori21", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3827,7 +3726,6 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3847,15 +3745,13 @@ "ctxt": 0 }, "value": "I21", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -3865,7 +3761,6 @@ "ctxt": 0 }, "value": "i21", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3897,6 +3792,7 @@ "ctxt": 0 }, "value": "i11Ori21", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3927,7 +3823,6 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3947,15 +3842,13 @@ "ctxt": 0 }, "value": "I21", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -3975,7 +3868,6 @@ "ctxt": 0 }, "value": "commonMethodDifferentReturnType", - "typeAnnotation": null, "optional": false }, "value": { @@ -3994,8 +3886,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4005,8 +3897,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4042,8 +3934,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4067,7 +3959,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -4078,7 +3969,6 @@ "ctxt": 0 }, "value": "charAt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4094,7 +3984,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -4120,7 +4009,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -4142,7 +4030,6 @@ "ctxt": 0 }, "value": "commonPropertyDifferentType", - "typeAnnotation": null, "optional": false }, "value": { @@ -4191,6 +4078,7 @@ "ctxt": 0 }, "value": "i11Ori21", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4221,7 +4109,6 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4241,15 +4128,13 @@ "ctxt": 0 }, "value": "I21", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -4269,7 +4154,6 @@ "ctxt": 0 }, "value": "commonMethodDifferentReturnType", - "typeAnnotation": null, "optional": false }, "value": { @@ -4288,8 +4172,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4299,8 +4183,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4336,8 +4220,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4361,7 +4245,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -4372,7 +4255,6 @@ "ctxt": 0 }, "value": "charCodeAt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4388,7 +4270,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -4414,7 +4295,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -4436,7 +4316,6 @@ "ctxt": 0 }, "value": "commonPropertyDifferentType", - "typeAnnotation": null, "optional": false }, "value": { @@ -4480,6 +4359,7 @@ "ctxt": 0 }, "value": "arrayOrI11OrI21", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4502,7 +4382,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4536,7 +4415,6 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4556,7 +4434,6 @@ "ctxt": 0 }, "value": "I21", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4566,8 +4443,7 @@ ] } } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -4587,7 +4463,6 @@ "ctxt": 0 }, "value": "i11", - "typeAnnotation": null, "optional": false } }, @@ -4601,7 +4476,6 @@ "ctxt": 0 }, "value": "i21", - "typeAnnotation": null, "optional": false } }, @@ -4623,7 +4497,6 @@ "ctxt": 0 }, "value": "i11", - "typeAnnotation": null, "optional": false }, "right": { @@ -4634,7 +4507,6 @@ "ctxt": 0 }, "value": "i21", - "typeAnnotation": null, "optional": false } } @@ -4659,7 +4531,6 @@ "ctxt": 0 }, "value": "commonMethodDifferentReturnType", - "typeAnnotation": null, "optional": false }, "value": { @@ -4678,8 +4549,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4689,8 +4560,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4726,8 +4597,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4751,7 +4622,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -4762,7 +4632,6 @@ "ctxt": 0 }, "value": "charAt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4778,7 +4647,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -4804,7 +4672,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -4826,7 +4693,6 @@ "ctxt": 0 }, "value": "commonPropertyDifferentType", - "typeAnnotation": null, "optional": false }, "value": { @@ -4867,7 +4733,6 @@ "ctxt": 0 }, "value": "commonMethodDifferentReturnType", - "typeAnnotation": null, "optional": false }, "value": { @@ -4886,8 +4751,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -4897,8 +4762,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -4934,8 +4799,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4959,7 +4824,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -4970,7 +4834,6 @@ "ctxt": 0 }, "value": "charCodeAt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4986,7 +4849,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -5012,7 +4874,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -5034,7 +4895,6 @@ "ctxt": 0 }, "value": "commonPropertyDifferentType", - "typeAnnotation": null, "optional": false }, "value": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/union/contextualTypeWithUnionTypeObjectLiteral/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/union/contextualTypeWithUnionTypeObjectLiteral/input.ts.json index 2fcf137b0e2c..f0ce95268381 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/union/contextualTypeWithUnionTypeObjectLiteral/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/union/contextualTypeWithUnionTypeObjectLiteral/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "str", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "strOrNumber", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -164,8 +165,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -183,7 +183,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false }, "right": { @@ -194,7 +193,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false } }, @@ -227,6 +225,7 @@ "ctxt": 0 }, "value": "objStr", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -258,7 +257,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -286,8 +284,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -319,6 +316,7 @@ "ctxt": 0 }, "value": "objNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -350,7 +348,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -378,8 +375,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -411,6 +407,7 @@ "ctxt": 0 }, "value": "objStrOrNum1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -450,7 +447,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -502,7 +498,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -532,8 +527,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -551,7 +545,6 @@ "ctxt": 0 }, "value": "objStr", - "typeAnnotation": null, "optional": false }, "right": { @@ -562,7 +555,6 @@ "ctxt": 0 }, "value": "objNum", - "typeAnnotation": null, "optional": false } }, @@ -595,6 +587,7 @@ "ctxt": 0 }, "value": "objStrOrNum2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -626,7 +619,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -673,8 +665,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "BinaryExpression", @@ -692,7 +683,6 @@ "ctxt": 0 }, "value": "objStr", - "typeAnnotation": null, "optional": false }, "right": { @@ -703,7 +693,6 @@ "ctxt": 0 }, "value": "objNum", - "typeAnnotation": null, "optional": false } }, @@ -736,6 +725,7 @@ "ctxt": 0 }, "value": "objStrOrNum3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -775,7 +765,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -827,7 +816,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -857,8 +845,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -878,7 +865,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": { @@ -889,7 +875,6 @@ "ctxt": 0 }, "value": "strOrNumber", - "typeAnnotation": null, "optional": false } } @@ -924,6 +909,7 @@ "ctxt": 0 }, "value": "objStrOrNum4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -955,7 +941,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1002,8 +987,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1023,7 +1007,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": { @@ -1034,7 +1017,6 @@ "ctxt": 0 }, "value": "strOrNumber", - "typeAnnotation": null, "optional": false } } @@ -1069,6 +1051,7 @@ "ctxt": 0 }, "value": "objStrOrNum5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1108,7 +1091,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1150,7 +1132,6 @@ "ctxt": 0 }, "value": "anotherP", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1202,7 +1183,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1232,8 +1212,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1253,7 +1232,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": { @@ -1264,7 +1242,6 @@ "ctxt": 0 }, "value": "strOrNumber", - "typeAnnotation": null, "optional": false } } @@ -1299,6 +1276,7 @@ "ctxt": 0 }, "value": "objStrOrNum6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1338,7 +1316,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1380,7 +1357,6 @@ "ctxt": 0 }, "value": "anotherP", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1432,7 +1408,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1462,8 +1437,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1483,7 +1457,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": { @@ -1494,7 +1467,6 @@ "ctxt": 0 }, "value": "strOrNumber", - "typeAnnotation": null, "optional": false } }, @@ -1508,7 +1480,6 @@ "ctxt": 0 }, "value": "anotherP", - "typeAnnotation": null, "optional": false }, "value": { @@ -1519,7 +1490,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false } } @@ -1554,6 +1524,7 @@ "ctxt": 0 }, "value": "objStrOrNum7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1593,7 +1564,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1635,7 +1605,6 @@ "ctxt": 0 }, "value": "anotherP", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1687,7 +1656,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1729,7 +1697,6 @@ "ctxt": 0 }, "value": "anotherP1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1759,8 +1726,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -1780,7 +1746,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": { @@ -1791,7 +1756,6 @@ "ctxt": 0 }, "value": "strOrNumber", - "typeAnnotation": null, "optional": false } }, @@ -1805,7 +1769,6 @@ "ctxt": 0 }, "value": "anotherP", - "typeAnnotation": null, "optional": false }, "value": { @@ -1816,7 +1779,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false } } @@ -1851,6 +1813,7 @@ "ctxt": 0 }, "value": "objStrOrNum8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1890,7 +1853,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1932,7 +1894,6 @@ "ctxt": 0 }, "value": "anotherP", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1984,7 +1945,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2026,7 +1986,6 @@ "ctxt": 0 }, "value": "anotherP1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2056,8 +2015,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -2077,7 +2035,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "value": { @@ -2088,7 +2045,6 @@ "ctxt": 0 }, "value": "strOrNumber", - "typeAnnotation": null, "optional": false } }, @@ -2102,7 +2058,6 @@ "ctxt": 0 }, "value": "anotherP", - "typeAnnotation": null, "optional": false }, "value": { @@ -2113,7 +2068,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false } }, @@ -2127,7 +2081,6 @@ "ctxt": 0 }, "value": "anotherP1", - "typeAnnotation": null, "optional": false }, "value": { @@ -2138,7 +2091,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false } } @@ -2163,7 +2115,6 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2193,7 +2144,6 @@ "ctxt": 0 }, "value": "commonMethodDifferentReturnType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2207,6 +2157,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2223,8 +2174,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2234,6 +2184,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2250,8 +2201,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -2291,7 +2241,6 @@ "ctxt": 0 }, "value": "I21", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2321,7 +2270,6 @@ "ctxt": 0 }, "value": "commonMethodDifferentReturnType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2335,6 +2283,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2351,8 +2300,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2362,6 +2310,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2378,8 +2327,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -2429,6 +2377,7 @@ "ctxt": 0 }, "value": "i11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2451,13 +2400,11 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2489,6 +2436,7 @@ "ctxt": 0 }, "value": "i21", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2511,13 +2459,11 @@ "ctxt": 0 }, "value": "I21", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2549,6 +2495,7 @@ "ctxt": 0 }, "value": "i11Ori21", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2579,7 +2526,6 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2599,15 +2545,13 @@ "ctxt": 0 }, "value": "I21", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2617,7 +2561,6 @@ "ctxt": 0 }, "value": "i11", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2649,6 +2592,7 @@ "ctxt": 0 }, "value": "i11Ori21", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2679,7 +2623,6 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2699,15 +2642,13 @@ "ctxt": 0 }, "value": "I21", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2717,7 +2658,6 @@ "ctxt": 0 }, "value": "i21", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2749,6 +2689,7 @@ "ctxt": 0 }, "value": "i11Ori21", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2779,7 +2720,6 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2799,15 +2739,13 @@ "ctxt": 0 }, "value": "I21", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -2827,7 +2765,6 @@ "ctxt": 0 }, "value": "commonMethodDifferentReturnType", - "typeAnnotation": null, "optional": false }, "value": { @@ -2846,8 +2783,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -2857,8 +2794,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -2894,8 +2831,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2919,7 +2856,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -2930,7 +2866,6 @@ "ctxt": 0 }, "value": "charAt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2946,7 +2881,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -2972,7 +2906,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -3015,6 +2948,7 @@ "ctxt": 0 }, "value": "i11Ori21", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3045,7 +2979,6 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3065,15 +2998,13 @@ "ctxt": 0 }, "value": "I21", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -3093,7 +3024,6 @@ "ctxt": 0 }, "value": "commonMethodDifferentReturnType", - "typeAnnotation": null, "optional": false }, "value": { @@ -3112,8 +3042,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3123,8 +3053,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3160,8 +3090,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3185,7 +3115,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "property": { @@ -3196,7 +3125,6 @@ "ctxt": 0 }, "value": "charCodeAt", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3212,7 +3140,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -3238,7 +3165,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -3281,6 +3207,7 @@ "ctxt": 0 }, "value": "strOrNumber", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3316,8 +3243,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3349,6 +3275,7 @@ "ctxt": 0 }, "value": "i11Ori21", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3379,7 +3306,6 @@ "ctxt": 0 }, "value": "I11", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3399,15 +3325,13 @@ "ctxt": 0 }, "value": "I21", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -3427,7 +3351,6 @@ "ctxt": 0 }, "value": "commonMethodDifferentReturnType", - "typeAnnotation": null, "optional": false }, "value": { @@ -3446,8 +3369,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, { "type": "Identifier", @@ -3457,8 +3380,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -3469,7 +3392,6 @@ "ctxt": 0 }, "value": "strOrNumber", - "typeAnnotation": null, "optional": false }, "async": false, diff --git a/ecmascript/parser/tests/typescript/tsc/types/union/discriminatedUnionTypes1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/union/discriminatedUnionTypes1/input.ts.json index 266b2d1c3353..aa9a928e0746 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/union/discriminatedUnionTypes1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/union/discriminatedUnionTypes1/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Square", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -106,7 +104,6 @@ "ctxt": 0 }, "value": "size", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -150,7 +147,6 @@ "ctxt": 0 }, "value": "Rectangle", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -180,7 +176,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -235,7 +230,6 @@ "ctxt": 0 }, "value": "width", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -277,7 +271,6 @@ "ctxt": 0 }, "value": "height", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -321,7 +314,6 @@ "ctxt": 0 }, "value": "Circle", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -351,7 +343,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -406,7 +397,6 @@ "ctxt": 0 }, "value": "radius", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -451,7 +441,6 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -478,7 +467,6 @@ "ctxt": 0 }, "value": "Square", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -498,7 +486,6 @@ "ctxt": 0 }, "value": "Rectangle", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -518,7 +505,6 @@ "ctxt": 0 }, "value": "Circle", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -536,7 +522,6 @@ "ctxt": 0 }, "value": "area1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -557,6 +542,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -579,13 +565,11 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -633,7 +617,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -644,7 +627,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -702,7 +684,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -713,7 +694,6 @@ "ctxt": 0 }, "value": "size", - "typeAnnotation": null, "optional": false }, "computed": false @@ -733,7 +713,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -744,7 +723,6 @@ "ctxt": 0 }, "value": "size", - "typeAnnotation": null, "optional": false }, "computed": false @@ -783,7 +761,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -794,7 +771,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -860,7 +836,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -871,7 +846,6 @@ "ctxt": 0 }, "value": "PI", - "typeAnnotation": null, "optional": false }, "computed": false @@ -891,7 +865,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -902,7 +875,6 @@ "ctxt": 0 }, "value": "radius", - "typeAnnotation": null, "optional": false }, "computed": false @@ -923,7 +895,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -934,7 +905,6 @@ "ctxt": 0 }, "value": "radius", - "typeAnnotation": null, "optional": false }, "computed": false @@ -973,7 +943,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -984,7 +953,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1042,7 +1010,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -1053,7 +1020,6 @@ "ctxt": 0 }, "value": "width", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1073,7 +1039,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -1084,7 +1049,6 @@ "ctxt": 0 }, "value": "height", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1140,7 +1104,6 @@ "ctxt": 0 }, "value": "area2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1161,6 +1124,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1183,13 +1147,11 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1229,7 +1191,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -1240,7 +1201,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1298,7 +1258,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -1309,7 +1268,6 @@ "ctxt": 0 }, "value": "size", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1329,7 +1287,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -1340,7 +1297,6 @@ "ctxt": 0 }, "value": "size", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1401,7 +1357,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -1412,7 +1367,6 @@ "ctxt": 0 }, "value": "width", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1432,7 +1386,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -1443,7 +1396,6 @@ "ctxt": 0 }, "value": "height", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1512,7 +1464,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -1523,7 +1474,6 @@ "ctxt": 0 }, "value": "PI", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1543,7 +1493,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -1554,7 +1503,6 @@ "ctxt": 0 }, "value": "radius", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1575,7 +1523,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -1586,7 +1533,6 @@ "ctxt": 0 }, "value": "radius", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1614,7 +1560,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1635,6 +1580,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1651,8 +1597,7 @@ }, "kind": "never" } - }, - "optional": false + } } } ], @@ -1692,7 +1637,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1728,7 +1672,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -1770,7 +1713,6 @@ "ctxt": 0 }, "value": "area3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1791,6 +1733,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1813,13 +1756,11 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -1859,7 +1800,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -1870,7 +1810,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1928,7 +1867,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -1939,7 +1877,6 @@ "ctxt": 0 }, "value": "size", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1959,7 +1896,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -1970,7 +1906,6 @@ "ctxt": 0 }, "value": "size", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2031,7 +1966,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -2042,7 +1976,6 @@ "ctxt": 0 }, "value": "width", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2062,7 +1995,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -2073,7 +2005,6 @@ "ctxt": 0 }, "value": "height", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2142,7 +2073,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -2153,7 +2083,6 @@ "ctxt": 0 }, "value": "PI", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2173,7 +2102,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -2184,7 +2112,6 @@ "ctxt": 0 }, "value": "radius", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2205,7 +2132,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -2216,7 +2142,6 @@ "ctxt": 0 }, "value": "radius", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2256,7 +2181,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2270,7 +2194,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -2299,7 +2222,6 @@ "ctxt": 0 }, "value": "area4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2320,6 +2242,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2342,13 +2265,11 @@ "ctxt": 0 }, "value": "Shape", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2388,7 +2309,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -2399,7 +2319,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2457,7 +2376,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -2468,7 +2386,6 @@ "ctxt": 0 }, "value": "size", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2488,7 +2405,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -2499,7 +2415,6 @@ "ctxt": 0 }, "value": "size", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2560,7 +2475,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -2571,7 +2485,6 @@ "ctxt": 0 }, "value": "width", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2591,7 +2504,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -2602,7 +2514,6 @@ "ctxt": 0 }, "value": "height", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2671,7 +2582,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -2682,7 +2592,6 @@ "ctxt": 0 }, "value": "PI", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2702,7 +2611,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -2713,7 +2621,6 @@ "ctxt": 0 }, "value": "radius", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2734,7 +2641,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "property": { @@ -2745,7 +2651,6 @@ "ctxt": 0 }, "value": "radius", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2778,7 +2683,6 @@ "ctxt": 0 }, "value": "assertNever", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2792,7 +2696,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -2823,7 +2726,6 @@ "ctxt": 0 }, "value": "Message", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2859,7 +2761,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2914,7 +2815,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2966,7 +2866,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3053,7 +2952,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3105,7 +3003,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3159,7 +3056,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3180,6 +3076,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3202,13 +3099,11 @@ "ctxt": 0 }, "value": "Message", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3256,7 +3151,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -3267,7 +3161,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3310,7 +3203,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -3346,7 +3238,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -3357,7 +3248,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3400,7 +3290,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -3429,7 +3318,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -3454,7 +3342,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3475,6 +3362,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3497,13 +3385,11 @@ "ctxt": 0 }, "value": "Message", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3551,7 +3437,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -3562,7 +3447,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3618,7 +3502,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -3639,7 +3522,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3660,6 +3542,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3682,13 +3565,11 @@ "ctxt": 0 }, "value": "Message", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3736,7 +3617,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -3747,7 +3627,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3790,7 +3669,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -3815,7 +3693,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3836,6 +3713,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3858,13 +3736,11 @@ "ctxt": 0 }, "value": "Message", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -3883,6 +3759,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3944,8 +3821,7 @@ } ] } - }, - "optional": false + } } } ], @@ -3993,7 +3869,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -4004,7 +3879,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4017,7 +3891,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -4044,7 +3917,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -4069,7 +3941,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4090,6 +3961,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4112,13 +3984,11 @@ "ctxt": 0 }, "value": "Message", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4158,7 +4028,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -4169,7 +4038,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4212,7 +4080,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } }, @@ -4264,7 +4131,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } }, @@ -4303,7 +4169,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -4328,7 +4193,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4349,6 +4213,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4371,13 +4236,11 @@ "ctxt": 0 }, "value": "Message", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4417,7 +4280,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -4428,7 +4290,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4471,7 +4332,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -4514,7 +4374,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } }, @@ -4553,7 +4412,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -4578,7 +4436,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4599,6 +4456,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4621,13 +4479,11 @@ "ctxt": 0 }, "value": "Message", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4667,7 +4523,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -4678,7 +4533,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4757,7 +4611,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } @@ -4778,7 +4631,6 @@ "ctxt": 0 }, "value": "f8", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4799,6 +4651,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4821,13 +4674,11 @@ "ctxt": 0 }, "value": "Message", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4867,7 +4718,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -4878,7 +4728,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4961,7 +4810,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4987,7 +4835,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/union/discriminatedUnionTypes2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/union/discriminatedUnionTypes2/input.ts.json index fcb8dad5a3ee..9508deee41d5 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/union/discriminatedUnionTypes2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/union/discriminatedUnionTypes2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -76,7 +76,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -126,7 +125,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -178,7 +176,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -228,7 +225,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -280,7 +276,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -322,7 +317,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -352,8 +346,7 @@ } ] } - }, - "optional": false + } } } ], @@ -401,7 +394,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -412,7 +404,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -457,7 +448,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -468,7 +458,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -506,7 +495,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -517,7 +505,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -562,7 +549,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -573,7 +559,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -611,7 +596,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -622,7 +606,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -649,7 +632,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -670,6 +652,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -709,7 +692,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -759,7 +741,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -811,7 +792,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -861,7 +841,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -913,7 +892,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -955,7 +933,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -985,8 +962,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1026,7 +1002,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1037,7 +1012,6 @@ "ctxt": 0 }, "value": "kind", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1082,7 +1056,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1093,7 +1066,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1149,7 +1121,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1160,7 +1131,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1208,7 +1178,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1219,7 +1188,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1246,7 +1214,6 @@ "ctxt": 0 }, "value": "f13", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1267,6 +1234,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1306,7 +1274,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1348,7 +1315,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1400,7 +1366,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1442,7 +1407,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1472,8 +1436,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1514,8 +1477,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -1535,7 +1498,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -1557,7 +1519,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -1585,7 +1546,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -1619,7 +1579,6 @@ "ctxt": 0 }, "value": "f14", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1640,6 +1599,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1679,7 +1639,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1729,7 +1688,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1781,7 +1739,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1810,7 +1767,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1834,7 +1790,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1864,8 +1819,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1913,7 +1867,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1924,7 +1877,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1969,7 +1921,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1980,7 +1931,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2017,7 +1967,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2043,7 +1992,6 @@ "ctxt": 0 }, "value": "Result", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2069,7 +2017,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2109,7 +2056,6 @@ "ctxt": 0 }, "value": "error", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2151,7 +2097,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2180,7 +2125,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2214,7 +2158,6 @@ "ctxt": 0 }, "value": "error", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2243,7 +2186,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2266,7 +2208,6 @@ "ctxt": 0 }, "value": "f15", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2287,6 +2228,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2309,7 +2251,6 @@ "ctxt": 0 }, "value": "Result", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2332,8 +2273,7 @@ ] } } - }, - "optional": false + } } } ], @@ -2381,7 +2321,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2392,7 +2331,6 @@ "ctxt": 0 }, "value": "error", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2428,7 +2366,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2439,7 +2376,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2484,7 +2420,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2495,7 +2430,6 @@ "ctxt": 0 }, "value": "error", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2508,7 +2442,6 @@ "ctxt": 0 }, "value": "message", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2546,7 +2479,6 @@ "ctxt": 0 }, "value": "f15", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2570,7 +2502,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "value": { @@ -2612,7 +2543,6 @@ "ctxt": 0 }, "value": "f15", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2636,7 +2566,6 @@ "ctxt": 0 }, "value": "error", - "typeAnnotation": null, "optional": false }, "value": { @@ -2654,7 +2583,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2701,7 +2629,6 @@ "ctxt": 0 }, "value": "WithError", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2731,7 +2658,6 @@ "ctxt": 0 }, "value": "error", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2760,7 +2686,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2784,7 +2709,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2828,7 +2752,6 @@ "ctxt": 0 }, "value": "WithoutError", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2855,7 +2778,6 @@ "ctxt": 0 }, "value": "Data", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -2888,7 +2810,6 @@ "ctxt": 0 }, "value": "error", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2930,7 +2851,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2959,7 +2879,6 @@ "ctxt": 0 }, "value": "Data", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2986,7 +2905,6 @@ "ctxt": 0 }, "value": "DataCarrier", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3012,7 +2930,6 @@ "ctxt": 0 }, "value": "Data", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3043,7 +2960,6 @@ "ctxt": 0 }, "value": "WithError", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3063,7 +2979,6 @@ "ctxt": 0 }, "value": "WithoutError", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3089,7 +3004,6 @@ "ctxt": 0 }, "value": "Data", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3110,7 +3024,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3131,6 +3044,7 @@ "ctxt": 0 }, "value": "carrier", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3153,7 +3067,6 @@ "ctxt": 0 }, "value": "DataCarrier", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3179,7 +3092,6 @@ "ctxt": 0 }, "value": "Data", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3187,8 +3099,7 @@ ] } } - }, - "optional": false + } } } ], @@ -3236,7 +3147,6 @@ "ctxt": 0 }, "value": "carrier", - "typeAnnotation": null, "optional": false }, "property": { @@ -3247,7 +3157,6 @@ "ctxt": 0 }, "value": "error", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3294,6 +3203,7 @@ "ctxt": 0 }, "value": "error", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3310,8 +3220,7 @@ }, "kind": "null" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -3328,7 +3237,6 @@ "ctxt": 0 }, "value": "carrier", - "typeAnnotation": null, "optional": false }, "property": { @@ -3339,7 +3247,6 @@ "ctxt": 0 }, "value": "error", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3373,6 +3280,7 @@ "ctxt": 0 }, "value": "data", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3395,13 +3303,11 @@ "ctxt": 0 }, "value": "Data", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -3418,7 +3324,6 @@ "ctxt": 0 }, "value": "carrier", - "typeAnnotation": null, "optional": false }, "property": { @@ -3429,7 +3334,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3473,6 +3377,7 @@ "ctxt": 0 }, "value": "error", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3495,13 +3400,11 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -3518,7 +3421,6 @@ "ctxt": 0 }, "value": "carrier", - "typeAnnotation": null, "optional": false }, "property": { @@ -3529,7 +3431,6 @@ "ctxt": 0 }, "value": "error", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3563,6 +3464,7 @@ "ctxt": 0 }, "value": "data", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3579,8 +3481,7 @@ }, "kind": "null" } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -3597,7 +3498,6 @@ "ctxt": 0 }, "value": "carrier", - "typeAnnotation": null, "optional": false }, "property": { @@ -3608,7 +3508,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3647,7 +3546,6 @@ "ctxt": 0 }, "value": "Data", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3673,7 +3571,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3709,7 +3606,6 @@ "ctxt": 0 }, "value": "tag", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3759,7 +3655,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3811,7 +3706,6 @@ "ctxt": 0 }, "value": "tag", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3861,7 +3755,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3908,6 +3801,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3924,8 +3818,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3967,7 +3860,6 @@ "ctxt": 0 }, "value": "f30", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3988,6 +3880,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4010,13 +3903,11 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4056,7 +3947,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -4067,7 +3957,6 @@ "ctxt": 0 }, "value": "tag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4095,7 +3984,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -4124,7 +4012,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -4148,7 +4035,6 @@ "ctxt": 0 }, "value": "f31", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4169,6 +4055,7 @@ "ctxt": 0 }, "value": "foo", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4191,13 +4078,11 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4245,7 +4130,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "property": { @@ -4256,7 +4140,6 @@ "ctxt": 0 }, "value": "tag", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4294,7 +4177,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -4323,7 +4205,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false } } @@ -4353,7 +4234,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -4381,7 +4261,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4436,7 +4315,6 @@ "ctxt": 0 }, "value": "data", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4481,7 +4359,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -4509,7 +4386,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4564,7 +4440,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4609,7 +4484,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -4637,7 +4511,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4692,7 +4565,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4737,7 +4609,6 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -4764,7 +4635,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4784,7 +4654,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4804,7 +4673,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4822,7 +4690,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4843,6 +4710,7 @@ "ctxt": 0 }, "value": "problem", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4873,7 +4741,6 @@ "ctxt": 0 }, "value": "abc", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4908,7 +4775,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4928,7 +4794,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4938,8 +4803,7 @@ } ] } - }, - "optional": false + } } } ], @@ -4987,7 +4851,6 @@ "ctxt": 0 }, "value": "problem", - "typeAnnotation": null, "optional": false }, "property": { @@ -4998,7 +4861,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5048,7 +4910,6 @@ "ctxt": 0 }, "value": "problem", - "typeAnnotation": null, "optional": false }, "property": { @@ -5059,7 +4920,6 @@ "ctxt": 0 }, "value": "name", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5097,7 +4957,6 @@ "ctxt": 0 }, "value": "problem", - "typeAnnotation": null, "optional": false }, "property": { @@ -5108,7 +4967,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5140,7 +4998,6 @@ "ctxt": 0 }, "value": "RuntimeValue", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -5176,7 +5033,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5231,7 +5087,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5283,7 +5138,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5338,7 +5192,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5390,7 +5243,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5445,7 +5297,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5486,7 +5337,6 @@ "ctxt": 0 }, "value": "foo1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5507,6 +5357,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5537,7 +5388,6 @@ "ctxt": 0 }, "value": "RuntimeValue", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5566,7 +5416,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5609,8 +5458,7 @@ } ] } - }, - "optional": false + } } } ], @@ -5658,7 +5506,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -5669,7 +5516,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5719,7 +5565,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -5730,7 +5575,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5768,7 +5612,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -5779,7 +5622,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5805,7 +5647,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5826,6 +5667,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5856,7 +5698,6 @@ "ctxt": 0 }, "value": "RuntimeValue", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5900,7 +5741,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -5965,7 +5805,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -6011,8 +5850,7 @@ } ] } - }, - "optional": false + } } } ], @@ -6060,7 +5898,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -6071,7 +5908,6 @@ "ctxt": 0 }, "value": "type", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6121,7 +5957,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -6132,7 +5967,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6170,7 +6004,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -6181,7 +6014,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeCallSignatures/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeCallSignatures/input.ts.json index 5109407ca716..c974f393be9a 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeCallSignatures/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeCallSignatures/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "numOrDate", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -70,15 +71,13 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -110,6 +109,7 @@ "ctxt": 0 }, "value": "strOrBoolean", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +145,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,6 +177,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -213,8 +213,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -246,6 +245,7 @@ "ctxt": 0 }, "value": "unionOfDifferentReturnType", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -285,6 +285,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -301,8 +302,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -350,6 +350,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -366,8 +367,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -392,7 +392,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -404,8 +403,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -435,8 +433,8 @@ "ctxt": 0 }, "value": "numOrDate", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -453,7 +451,6 @@ "ctxt": 0 }, "value": "unionOfDifferentReturnType", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -497,8 +494,8 @@ "ctxt": 0 }, "value": "strOrBoolean", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -515,7 +512,6 @@ "ctxt": 0 }, "value": "unionOfDifferentReturnType", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -563,7 +559,6 @@ "ctxt": 0 }, "value": "unionOfDifferentReturnType1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -608,6 +603,7 @@ "ctxt": 0 }, "value": "unionOfDifferentReturnType1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -647,6 +643,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -663,8 +660,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -702,6 +698,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -718,8 +715,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -767,6 +763,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -783,8 +780,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -809,7 +805,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -833,6 +828,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -849,8 +845,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -876,8 +871,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -907,8 +901,8 @@ "ctxt": 0 }, "value": "numOrDate", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -925,7 +919,6 @@ "ctxt": 0 }, "value": "unionOfDifferentReturnType1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -969,8 +962,8 @@ "ctxt": 0 }, "value": "strOrBoolean", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -987,7 +980,6 @@ "ctxt": 0 }, "value": "unionOfDifferentReturnType1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1035,7 +1027,6 @@ "ctxt": 0 }, "value": "unionOfDifferentReturnType1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1077,7 +1068,6 @@ "ctxt": 0 }, "value": "unionOfDifferentReturnType1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1109,6 +1099,7 @@ "ctxt": 0 }, "value": "unionOfDifferentParameterTypes", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1148,6 +1139,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1164,8 +1156,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1213,6 +1204,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1229,8 +1221,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1255,7 +1246,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1267,8 +1257,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1297,7 +1286,6 @@ "ctxt": 0 }, "value": "unionOfDifferentParameterTypes", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1339,7 +1327,6 @@ "ctxt": 0 }, "value": "unionOfDifferentParameterTypes", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1386,7 +1373,6 @@ "ctxt": 0 }, "value": "unionOfDifferentParameterTypes", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1418,6 +1404,7 @@ "ctxt": 0 }, "value": "unionOfDifferentNumberOfSignatures", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1457,6 +1444,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1473,8 +1461,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1522,6 +1509,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1538,8 +1526,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1564,7 +1551,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1588,6 +1574,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1604,8 +1591,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1631,8 +1617,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1661,7 +1646,6 @@ "ctxt": 0 }, "value": "unionOfDifferentNumberOfSignatures", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1690,7 +1674,6 @@ "ctxt": 0 }, "value": "unionOfDifferentNumberOfSignatures", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1732,7 +1715,6 @@ "ctxt": 0 }, "value": "unionOfDifferentNumberOfSignatures", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1782,6 +1764,7 @@ "ctxt": 0 }, "value": "unionWithDifferentParameterCount", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1821,6 +1804,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1837,8 +1821,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1886,6 +1869,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1902,8 +1886,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1913,6 +1896,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1929,8 +1913,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1956,8 +1939,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1986,7 +1968,6 @@ "ctxt": 0 }, "value": "unionWithDifferentParameterCount", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2015,7 +1996,6 @@ "ctxt": 0 }, "value": "unionWithDifferentParameterCount", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2062,7 +2042,6 @@ "ctxt": 0 }, "value": "unionWithDifferentParameterCount", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2124,6 +2103,7 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2163,6 +2143,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2179,8 +2160,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2190,6 +2170,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2206,8 +2187,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -2255,6 +2235,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2271,8 +2252,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2282,6 +2262,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2298,8 +2279,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -2325,8 +2305,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2356,8 +2335,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -2374,7 +2353,6 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2423,8 +2401,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -2441,7 +2419,6 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2502,8 +2479,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -2520,7 +2497,6 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2586,8 +2562,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -2604,7 +2580,6 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2637,6 +2612,7 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2676,6 +2652,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2692,8 +2669,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2703,6 +2679,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2719,8 +2696,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -2768,6 +2744,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2784,8 +2761,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2795,6 +2771,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2811,8 +2788,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2838,8 +2814,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2869,8 +2844,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -2887,7 +2862,6 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2936,8 +2910,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -2954,7 +2928,6 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3015,8 +2988,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -3033,7 +3006,6 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3099,8 +3071,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -3117,7 +3089,6 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3150,6 +3121,7 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3189,6 +3161,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3205,8 +3178,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -3216,6 +3188,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3232,8 +3205,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -3281,6 +3253,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3297,8 +3270,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3324,8 +3296,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3355,8 +3326,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -3373,7 +3344,6 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3422,8 +3392,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -3440,7 +3410,6 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3501,8 +3470,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -3519,7 +3488,6 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3585,8 +3553,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -3603,7 +3571,6 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter3", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3636,6 +3603,7 @@ "ctxt": 0 }, "value": "unionWithRestParameter1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3675,6 +3643,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3691,8 +3660,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "RestElement", @@ -3714,8 +3682,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -3789,6 +3757,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3805,8 +3774,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "RestElement", @@ -3828,8 +3796,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -3881,8 +3849,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3912,8 +3879,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -3930,7 +3897,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3979,8 +3945,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -3997,7 +3963,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4058,8 +4023,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -4076,7 +4041,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4149,8 +4113,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -4167,7 +4131,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4233,8 +4196,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -4251,7 +4214,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4284,6 +4246,7 @@ "ctxt": 0 }, "value": "unionWithRestParameter2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4323,6 +4286,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4339,8 +4303,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "RestElement", @@ -4362,8 +4325,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -4437,6 +4400,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4453,8 +4417,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -4464,6 +4427,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4480,8 +4444,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4507,8 +4470,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -4538,8 +4500,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -4556,7 +4518,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4605,8 +4566,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -4623,7 +4584,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4684,8 +4644,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -4702,7 +4662,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4775,8 +4734,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -4793,7 +4752,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4859,8 +4817,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -4877,7 +4835,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4910,6 +4867,7 @@ "ctxt": 0 }, "value": "unionWithRestParameter3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4949,6 +4907,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4965,8 +4924,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "RestElement", @@ -4988,8 +4946,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -5063,6 +5021,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5079,8 +5038,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -5106,8 +5064,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -5137,8 +5094,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -5155,7 +5112,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5204,8 +5160,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -5222,7 +5178,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5283,8 +5238,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -5301,7 +5256,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5374,8 +5328,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -5392,7 +5346,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5458,8 +5411,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -5476,7 +5429,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter3", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -5509,6 +5461,7 @@ "ctxt": 0 }, "value": "unionWithRestParameter4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5560,8 +5513,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -5635,6 +5588,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5651,8 +5605,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -5662,6 +5615,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5678,8 +5632,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -5705,8 +5658,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -5736,8 +5688,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -5754,7 +5706,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter4", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5803,8 +5754,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -5821,7 +5772,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter4", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeCallSignatures2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeCallSignatures2/input.ts.json index 36ad126726ab..c47bab6b6870 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeCallSignatures2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeCallSignatures2/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,6 +50,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -67,8 +67,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -106,6 +105,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -122,8 +122,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -133,6 +132,7 @@ "ctxt": 0 }, "value": "y", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -149,8 +149,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -188,6 +187,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -210,13 +210,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -254,6 +252,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -283,14 +282,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -322,7 +319,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -352,7 +348,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -379,7 +374,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -409,6 +403,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -425,8 +420,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -464,6 +458,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -480,8 +475,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -519,6 +513,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -541,13 +536,11 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -585,6 +578,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -614,14 +608,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -653,7 +645,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -683,7 +674,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -710,7 +700,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -740,6 +729,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -756,8 +746,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "RestElement", @@ -779,8 +768,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -844,6 +833,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -860,8 +850,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -871,6 +860,7 @@ "ctxt": 0 }, "value": "s", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -887,8 +877,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -926,6 +915,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -955,14 +945,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } } ], "typeAnnotation": { @@ -994,7 +982,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1024,7 +1011,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1061,6 +1047,7 @@ "ctxt": 0 }, "value": "f1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1091,7 +1078,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1111,7 +1097,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1131,15 +1116,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1171,8 +1154,8 @@ "ctxt": 0 }, "value": "n1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1189,7 +1172,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1237,8 +1219,8 @@ "ctxt": 0 }, "value": "s1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1255,7 +1237,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1308,8 +1289,8 @@ "ctxt": 0 }, "value": "a1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1326,7 +1307,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1399,6 +1379,7 @@ "ctxt": 0 }, "value": "f2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1429,7 +1410,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1449,7 +1429,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1469,15 +1448,13 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1509,8 +1486,8 @@ "ctxt": 0 }, "value": "n2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1527,7 +1504,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1575,8 +1551,8 @@ "ctxt": 0 }, "value": "s2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1593,7 +1569,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1646,8 +1621,8 @@ "ctxt": 0 }, "value": "a2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1664,7 +1639,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1737,6 +1711,7 @@ "ctxt": 0 }, "value": "f3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1767,7 +1742,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1787,7 +1761,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1807,15 +1780,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1847,8 +1818,8 @@ "ctxt": 0 }, "value": "n3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1865,7 +1836,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1913,8 +1883,8 @@ "ctxt": 0 }, "value": "s3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1931,7 +1901,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1984,8 +1953,8 @@ "ctxt": 0 }, "value": "a3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2002,7 +1971,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeCallSignatures3/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeCallSignatures3/input.ts.json index a6203bb54be3..3e84c2b5cf15 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeCallSignatures3/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeCallSignatures3/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +53,7 @@ }, "kind": "string" } - }, - "optional": false + } } } ], @@ -88,7 +87,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -109,6 +107,7 @@ "ctxt": 0 }, "value": "s", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -125,8 +124,7 @@ }, "kind": "string" } - }, - "optional": true + } } } ], @@ -160,7 +158,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -193,8 +190,8 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -254,7 +251,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -275,6 +271,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -291,8 +288,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -311,6 +307,7 @@ "ctxt": 0 }, "value": "s2", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -327,8 +324,7 @@ }, "kind": "string" } - }, - "optional": true + } } } ], @@ -362,7 +358,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -383,6 +378,7 @@ "ctxt": 0 }, "value": "s", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -399,8 +395,7 @@ }, "kind": "string" } - }, - "optional": true + } } }, { @@ -419,6 +414,7 @@ "ctxt": 0 }, "value": "n", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -435,8 +431,7 @@ }, "kind": "number" } - }, - "optional": true + } } } ], @@ -470,7 +465,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -491,6 +485,7 @@ "ctxt": 0 }, "value": "s", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -507,8 +502,7 @@ }, "kind": "string" } - }, - "optional": true + } } }, { @@ -539,8 +533,8 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -600,7 +594,6 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -621,6 +614,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -637,8 +631,7 @@ }, "kind": "string" } - }, - "optional": false + } } }, { @@ -669,8 +662,8 @@ "ctxt": 0 }, "value": "sRest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -745,6 +738,7 @@ "ctxt": 0 }, "value": "fUnion", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -775,7 +769,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false } }, @@ -794,7 +787,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false } }, @@ -813,7 +805,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false } }, @@ -832,7 +823,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false } }, @@ -851,7 +841,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false } }, @@ -870,7 +859,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false } }, @@ -889,14 +877,12 @@ "ctxt": 0 }, "value": "f7", - "typeAnnotation": null, "optional": false } } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -925,7 +911,6 @@ "ctxt": 0 }, "value": "fUnion", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeCallSignatures4/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeCallSignatures4/input.ts.json index 70e33ad58ab5..98cc25fb1bf6 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeCallSignatures4/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeCallSignatures4/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "F1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -42,6 +41,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -58,8 +58,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -69,6 +68,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -85,8 +85,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "typeParams": null, @@ -125,7 +124,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -145,6 +143,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -161,8 +160,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -172,6 +170,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -188,8 +187,7 @@ }, "kind": "string" } - }, - "optional": true + } }, { "type": "Identifier", @@ -199,6 +197,7 @@ "ctxt": 0 }, "value": "c", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -215,8 +214,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "typeParams": null, @@ -255,7 +253,6 @@ "ctxt": 0 }, "value": "F3", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -275,6 +272,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -291,8 +289,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "RestElement", @@ -314,8 +311,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -380,7 +377,6 @@ "ctxt": 0 }, "value": "F4", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -400,6 +396,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -416,8 +413,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -427,6 +423,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -443,8 +440,7 @@ }, "kind": "string" } - }, - "optional": true + } }, { "type": "RestElement", @@ -466,8 +462,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -532,7 +528,6 @@ "ctxt": 0 }, "value": "F5", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -552,6 +547,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -568,8 +564,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -579,6 +574,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -595,8 +591,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -644,6 +639,7 @@ "ctxt": 0 }, "value": "f12", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -674,7 +670,6 @@ "ctxt": 0 }, "value": "F1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -694,15 +689,13 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -731,7 +724,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -778,7 +770,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -842,7 +833,6 @@ "ctxt": 0 }, "value": "f12", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -926,6 +916,7 @@ "ctxt": 0 }, "value": "f34", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -956,7 +947,6 @@ "ctxt": 0 }, "value": "F3", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -976,15 +966,13 @@ "ctxt": 0 }, "value": "F4", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1013,7 +1001,6 @@ "ctxt": 0 }, "value": "f34", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1060,7 +1047,6 @@ "ctxt": 0 }, "value": "f34", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1124,7 +1110,6 @@ "ctxt": 0 }, "value": "f34", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1208,6 +1193,7 @@ "ctxt": 0 }, "value": "f1234", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1238,7 +1224,6 @@ "ctxt": 0 }, "value": "F1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1258,7 +1243,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1278,7 +1262,6 @@ "ctxt": 0 }, "value": "F3", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1298,15 +1281,13 @@ "ctxt": 0 }, "value": "F4", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1335,7 +1316,6 @@ "ctxt": 0 }, "value": "f1234", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1382,7 +1362,6 @@ "ctxt": 0 }, "value": "f1234", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1446,7 +1425,6 @@ "ctxt": 0 }, "value": "f1234", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1530,6 +1508,7 @@ "ctxt": 0 }, "value": "f12345", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1560,7 +1539,6 @@ "ctxt": 0 }, "value": "F1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1580,7 +1558,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1600,7 +1577,6 @@ "ctxt": 0 }, "value": "F3", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1620,7 +1596,6 @@ "ctxt": 0 }, "value": "F4", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1640,15 +1615,13 @@ "ctxt": 0 }, "value": "F5", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1677,7 +1650,6 @@ "ctxt": 0 }, "value": "f12345", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1724,7 +1696,6 @@ "ctxt": 0 }, "value": "f12345", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1788,7 +1759,6 @@ "ctxt": 0 }, "value": "f12345", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeCallSignatures5/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeCallSignatures5/input.ts.json index 13303953a834..d980f1eea033 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeCallSignatures5/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeCallSignatures5/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,6 +50,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -67,8 +67,7 @@ }, "kind": "void" } - }, - "optional": false + } }, { "type": "Identifier", @@ -78,6 +77,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -94,8 +94,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -135,7 +134,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -165,6 +163,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -181,8 +180,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -192,6 +190,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -208,8 +207,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -249,7 +247,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -279,6 +276,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -295,8 +293,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -346,6 +343,7 @@ "ctxt": 0 }, "value": "fn", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -376,7 +374,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -396,7 +393,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -416,15 +412,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -453,7 +447,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeCallSignatures6/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeCallSignatures6/input.ts.json index c57ee356305b..63652ad24982 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeCallSignatures6/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeCallSignatures6/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -123,7 +120,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -168,7 +164,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -196,7 +191,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -241,7 +235,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -269,7 +262,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -314,7 +306,6 @@ "ctxt": 0 }, "value": "F0", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -362,7 +353,6 @@ "ctxt": 0 }, "value": "F1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -382,6 +372,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -404,13 +395,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -449,7 +438,6 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -469,6 +457,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -491,13 +480,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": null, @@ -545,6 +532,7 @@ "ctxt": 0 }, "value": "f1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -575,7 +563,6 @@ "ctxt": 0 }, "value": "F1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -595,15 +582,13 @@ "ctxt": 0 }, "value": "F2", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -632,7 +617,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -664,6 +648,7 @@ "ctxt": 0 }, "value": "f2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -694,7 +679,6 @@ "ctxt": 0 }, "value": "F0", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -714,15 +698,13 @@ "ctxt": 0 }, "value": "F1", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -751,7 +733,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -773,7 +754,6 @@ "ctxt": 0 }, "value": "F3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -803,6 +783,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -825,13 +806,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -869,6 +848,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -891,13 +871,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -937,7 +915,6 @@ "ctxt": 0 }, "value": "F4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -967,6 +944,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -989,13 +967,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1033,6 +1009,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1055,13 +1032,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1101,7 +1076,6 @@ "ctxt": 0 }, "value": "F5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1131,6 +1105,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1153,13 +1128,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1197,6 +1170,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1219,13 +1193,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1275,6 +1247,7 @@ "ctxt": 0 }, "value": "x1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1305,7 +1278,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1325,7 +1297,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1354,7 +1325,6 @@ "ctxt": 0 }, "value": "f0", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1391,7 +1361,6 @@ "ctxt": 0 }, "value": "F0", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1411,7 +1380,6 @@ "ctxt": 0 }, "value": "F3", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1437,7 +1405,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1474,7 +1441,6 @@ "ctxt": 0 }, "value": "F1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1494,7 +1460,6 @@ "ctxt": 0 }, "value": "F3", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1520,7 +1485,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1557,7 +1521,6 @@ "ctxt": 0 }, "value": "F1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1577,7 +1540,6 @@ "ctxt": 0 }, "value": "F4", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1603,7 +1565,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1640,7 +1601,6 @@ "ctxt": 0 }, "value": "F3", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1660,7 +1620,6 @@ "ctxt": 0 }, "value": "F4", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1686,7 +1645,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1723,7 +1681,6 @@ "ctxt": 0 }, "value": "F3", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1743,7 +1700,6 @@ "ctxt": 0 }, "value": "F5", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1757,8 +1713,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1794,7 +1749,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1805,7 +1759,6 @@ "ctxt": 0 }, "value": "f0", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1843,7 +1796,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1854,7 +1806,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1892,7 +1843,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1903,7 +1853,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1941,7 +1890,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1952,7 +1900,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1990,7 +1937,6 @@ "ctxt": 0 }, "value": "x1", - "typeAnnotation": null, "optional": false }, "property": { @@ -2001,7 +1947,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2035,6 +1980,7 @@ "ctxt": 0 }, "value": "x2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2065,7 +2011,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2085,7 +2030,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2114,7 +2058,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2151,7 +2094,6 @@ "ctxt": 0 }, "value": "F3", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2171,7 +2113,6 @@ "ctxt": 0 }, "value": "F5", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2185,8 +2126,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2222,7 +2162,6 @@ "ctxt": 0 }, "value": "x2", - "typeAnnotation": null, "optional": false }, "property": { @@ -2233,7 +2172,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2258,7 +2196,6 @@ "ctxt": 0 }, "value": "F6", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2278,6 +2215,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2308,7 +2246,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2328,15 +2265,13 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -2384,6 +2319,7 @@ "ctxt": 0 }, "value": "f3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2414,7 +2350,6 @@ "ctxt": 0 }, "value": "F1", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2434,15 +2369,13 @@ "ctxt": 0 }, "value": "F6", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2471,7 +2404,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2493,7 +2425,6 @@ "ctxt": 0 }, "value": "F7", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2523,6 +2454,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2553,7 +2485,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2573,7 +2504,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2593,15 +2523,13 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2639,6 +2567,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2669,7 +2598,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2689,15 +2617,13 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2747,6 +2673,7 @@ "ctxt": 0 }, "value": "f4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2777,7 +2704,6 @@ "ctxt": 0 }, "value": "F6", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2797,15 +2723,13 @@ "ctxt": 0 }, "value": "F7", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2834,7 +2758,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeConstructSignatures/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeConstructSignatures/input.ts.json index 60013bdc043e..6a2235c4f77d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeConstructSignatures/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeConstructSignatures/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "numOrDate", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -70,15 +71,13 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -110,6 +109,7 @@ "ctxt": 0 }, "value": "strOrBoolean", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +145,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,6 +177,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -213,8 +213,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -246,6 +245,7 @@ "ctxt": 0 }, "value": "unionOfDifferentReturnType", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -285,6 +285,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -301,8 +302,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -350,6 +350,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -366,8 +367,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -392,7 +392,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -404,8 +403,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -435,8 +433,8 @@ "ctxt": 0 }, "value": "numOrDate", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -453,7 +451,6 @@ "ctxt": 0 }, "value": "unionOfDifferentReturnType", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -497,8 +494,8 @@ "ctxt": 0 }, "value": "strOrBoolean", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -515,7 +512,6 @@ "ctxt": 0 }, "value": "unionOfDifferentReturnType", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -563,7 +559,6 @@ "ctxt": 0 }, "value": "unionOfDifferentReturnType1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -608,6 +603,7 @@ "ctxt": 0 }, "value": "unionOfDifferentReturnType1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -647,6 +643,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -663,8 +660,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -702,6 +698,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -718,8 +715,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -767,6 +763,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -783,8 +780,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -809,7 +805,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -833,6 +828,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -849,8 +845,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -876,8 +871,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -907,8 +901,8 @@ "ctxt": 0 }, "value": "numOrDate", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -925,7 +919,6 @@ "ctxt": 0 }, "value": "unionOfDifferentReturnType1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -969,8 +962,8 @@ "ctxt": 0 }, "value": "strOrBoolean", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -987,7 +980,6 @@ "ctxt": 0 }, "value": "unionOfDifferentReturnType1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1035,7 +1027,6 @@ "ctxt": 0 }, "value": "unionOfDifferentReturnType1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1077,7 +1068,6 @@ "ctxt": 0 }, "value": "unionOfDifferentReturnType1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1109,6 +1099,7 @@ "ctxt": 0 }, "value": "unionOfDifferentParameterTypes", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1148,6 +1139,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1164,8 +1156,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1213,6 +1204,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1229,8 +1221,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1255,7 +1246,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1267,8 +1257,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1297,7 +1286,6 @@ "ctxt": 0 }, "value": "unionOfDifferentParameterTypes", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1339,7 +1327,6 @@ "ctxt": 0 }, "value": "unionOfDifferentParameterTypes", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1386,7 +1373,6 @@ "ctxt": 0 }, "value": "unionOfDifferentParameterTypes", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1418,6 +1404,7 @@ "ctxt": 0 }, "value": "unionOfDifferentNumberOfSignatures", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1457,6 +1444,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1473,8 +1461,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1522,6 +1509,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1538,8 +1526,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1564,7 +1551,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1588,6 +1574,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1604,8 +1591,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1631,8 +1617,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1661,7 +1646,6 @@ "ctxt": 0 }, "value": "unionOfDifferentNumberOfSignatures", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1690,7 +1674,6 @@ "ctxt": 0 }, "value": "unionOfDifferentNumberOfSignatures", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1732,7 +1715,6 @@ "ctxt": 0 }, "value": "unionOfDifferentNumberOfSignatures", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1782,6 +1764,7 @@ "ctxt": 0 }, "value": "unionWithDifferentParameterCount", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1821,6 +1804,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1837,8 +1821,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1886,6 +1869,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1902,8 +1886,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -1913,6 +1896,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1929,8 +1913,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1956,8 +1939,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1986,7 +1968,6 @@ "ctxt": 0 }, "value": "unionWithDifferentParameterCount", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2015,7 +1996,6 @@ "ctxt": 0 }, "value": "unionWithDifferentParameterCount", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2062,7 +2042,6 @@ "ctxt": 0 }, "value": "unionWithDifferentParameterCount", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2124,6 +2103,7 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2163,6 +2143,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2179,8 +2160,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2190,6 +2170,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2206,8 +2187,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -2255,6 +2235,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2271,8 +2252,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2282,6 +2262,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2298,8 +2279,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -2325,8 +2305,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2356,8 +2335,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -2374,7 +2353,6 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2423,8 +2401,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -2441,7 +2419,6 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2502,8 +2479,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -2520,7 +2497,6 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2586,8 +2562,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -2604,7 +2580,6 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2637,6 +2612,7 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2676,6 +2652,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2692,8 +2669,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2703,6 +2679,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2719,8 +2696,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -2768,6 +2744,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2784,8 +2761,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -2795,6 +2771,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2811,8 +2788,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2838,8 +2814,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2869,8 +2844,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -2887,7 +2862,6 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2936,8 +2910,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -2954,7 +2928,6 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3015,8 +2988,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -3033,7 +3006,6 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3099,8 +3071,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -3117,7 +3089,6 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3150,6 +3121,7 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3189,6 +3161,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3205,8 +3178,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -3216,6 +3188,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3232,8 +3205,7 @@ }, "kind": "number" } - }, - "optional": true + } } ], "typeAnnotation": { @@ -3281,6 +3253,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3297,8 +3270,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -3324,8 +3296,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3355,8 +3326,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -3373,7 +3344,6 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3422,8 +3392,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -3440,7 +3410,6 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3501,8 +3470,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -3519,7 +3488,6 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3585,8 +3553,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -3603,7 +3571,6 @@ "ctxt": 0 }, "value": "unionWithOptionalParameter3", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3636,6 +3603,7 @@ "ctxt": 0 }, "value": "unionWithRestParameter1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3675,6 +3643,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3691,8 +3660,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "RestElement", @@ -3714,8 +3682,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -3789,6 +3757,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3805,8 +3774,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "RestElement", @@ -3828,8 +3796,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -3881,8 +3849,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -3912,8 +3879,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -3930,7 +3897,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3979,8 +3945,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -3997,7 +3963,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4058,8 +4023,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -4076,7 +4041,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4149,8 +4113,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -4167,7 +4131,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4233,8 +4196,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -4251,7 +4214,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4284,6 +4246,7 @@ "ctxt": 0 }, "value": "unionWithRestParameter2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4323,6 +4286,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4339,8 +4303,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "RestElement", @@ -4362,8 +4325,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -4437,6 +4400,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4453,8 +4417,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "Identifier", @@ -4464,6 +4427,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4480,8 +4444,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4507,8 +4470,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -4538,8 +4500,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -4556,7 +4518,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4605,8 +4566,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -4623,7 +4584,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4684,8 +4644,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -4702,7 +4662,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4775,8 +4734,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -4793,7 +4752,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter2", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4859,8 +4817,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -4877,7 +4835,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4910,6 +4867,7 @@ "ctxt": 0 }, "value": "unionWithRestParameter3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4949,6 +4907,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4965,8 +4924,7 @@ }, "kind": "string" } - }, - "optional": false + } }, { "type": "RestElement", @@ -4988,8 +4946,8 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -5063,6 +5021,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5079,8 +5038,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -5106,8 +5064,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -5137,8 +5094,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -5155,7 +5112,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5204,8 +5160,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -5222,7 +5178,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5283,8 +5238,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -5301,7 +5256,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5374,8 +5328,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -5392,7 +5346,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter3", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5458,8 +5411,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -5476,7 +5429,6 @@ "ctxt": 0 }, "value": "unionWithRestParameter3", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -5509,6 +5461,7 @@ "ctxt": 0 }, "value": "unionWithAbstractSignature", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5547,6 +5500,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5563,8 +5517,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -5611,6 +5564,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5627,8 +5581,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -5654,8 +5607,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -5684,7 +5636,6 @@ "ctxt": 0 }, "value": "unionWithAbstractSignature", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeEquivalence/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeEquivalence/input.ts.json index 5633f2f5cec3..0bd2da5d52dc 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeEquivalence/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeEquivalence/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -43,7 +42,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -69,7 +67,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -109,7 +106,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -142,6 +138,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -164,13 +161,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -202,6 +197,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -232,7 +228,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -252,15 +247,13 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -292,6 +285,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -327,8 +321,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -360,6 +353,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -395,8 +389,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -428,6 +421,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -472,8 +466,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -505,6 +498,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -567,8 +561,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -600,6 +593,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -662,8 +656,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -695,6 +688,7 @@ "ctxt": 0 }, "value": "AB", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -730,8 +724,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -763,6 +756,7 @@ "ctxt": 0 }, "value": "BC", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -798,8 +792,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -831,6 +824,7 @@ "ctxt": 0 }, "value": "z1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -861,7 +855,6 @@ "ctxt": 0 }, "value": "AB", - "typeAnnotation": null, "optional": false } }, @@ -876,8 +869,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -909,6 +901,7 @@ "ctxt": 0 }, "value": "z1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -948,14 +941,12 @@ "ctxt": 0 }, "value": "BC", - "typeAnnotation": null, "optional": false } } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeFromArrayLiteral/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeFromArrayLiteral/input.ts.json index 8491435b6534..778e46d26dd4 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeFromArrayLiteral/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeFromArrayLiteral/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "arr1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -97,8 +97,8 @@ "ctxt": 0 }, "value": "arr2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -168,6 +168,7 @@ "ctxt": 0 }, "value": "arr3Tuple", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -221,8 +222,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -292,6 +292,7 @@ "ctxt": 0 }, "value": "arr4Tuple", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -345,8 +346,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -433,8 +433,8 @@ "ctxt": 0 }, "value": "arrEmpty", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -474,6 +474,7 @@ "ctxt": 0 }, "value": "arr5Tuple", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -571,8 +572,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "ArrayExpression", @@ -697,7 +697,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -723,7 +722,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "function": { @@ -771,7 +769,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -797,7 +794,6 @@ "ctxt": 0 }, "value": "foo2", - "typeAnnotation": null, "optional": false }, "function": { @@ -845,7 +841,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -871,7 +866,6 @@ "ctxt": 0 }, "value": "foo3", - "typeAnnotation": null, "optional": false }, "function": { @@ -911,7 +905,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -929,7 +922,6 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -955,7 +947,6 @@ "ctxt": 0 }, "value": "foo4", - "typeAnnotation": null, "optional": false }, "function": { @@ -995,7 +986,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -1028,6 +1018,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1050,13 +1041,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1076,6 +1065,7 @@ "ctxt": 0 }, "value": "d", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1098,13 +1088,11 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1124,6 +1112,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1146,13 +1135,11 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1172,6 +1159,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1194,13 +1182,11 @@ "ctxt": 0 }, "value": "F", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1232,8 +1218,8 @@ "ctxt": 0 }, "value": "arr6", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1253,7 +1239,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1267,7 +1252,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } } @@ -1302,8 +1286,8 @@ "ctxt": 0 }, "value": "arr7", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1323,7 +1307,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1337,7 +1320,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false } }, @@ -1351,7 +1333,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -1386,8 +1367,8 @@ "ctxt": 0 }, "value": "arr8", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1407,7 +1388,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false } }, @@ -1421,7 +1401,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } } @@ -1456,8 +1435,8 @@ "ctxt": 0 }, "value": "arr9", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -1477,7 +1456,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false } }, @@ -1491,7 +1469,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeIndexSignature/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeIndexSignature/input.ts.json index 3030b9a0ac99..438f3808bc08 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeIndexSignature/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeIndexSignature/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "numOrDate", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -70,15 +71,13 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -110,6 +109,7 @@ "ctxt": 0 }, "value": "anyVar", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -126,8 +126,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -159,6 +158,7 @@ "ctxt": 0 }, "value": "unionOfDifferentReturnType", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -193,6 +193,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -209,8 +210,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -258,6 +258,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -274,8 +275,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -300,7 +300,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -317,8 +316,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -348,8 +346,8 @@ "ctxt": 0 }, "value": "numOrDate", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -366,7 +364,6 @@ "ctxt": 0 }, "value": "unionOfDifferentReturnType", - "typeAnnotation": null, "optional": false }, "property": { @@ -410,8 +407,8 @@ "ctxt": 0 }, "value": "numOrDate", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -428,7 +425,6 @@ "ctxt": 0 }, "value": "unionOfDifferentReturnType", - "typeAnnotation": null, "optional": false }, "property": { @@ -469,6 +465,7 @@ "ctxt": 0 }, "value": "unionOfTypesWithAndWithoutStringSignature", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -503,6 +500,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -519,8 +517,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -560,8 +557,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -591,8 +587,8 @@ "ctxt": 0 }, "value": "anyVar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -609,7 +605,6 @@ "ctxt": 0 }, "value": "unionOfTypesWithAndWithoutStringSignature", - "typeAnnotation": null, "optional": false }, "property": { @@ -653,8 +648,8 @@ "ctxt": 0 }, "value": "anyVar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -671,7 +666,6 @@ "ctxt": 0 }, "value": "unionOfTypesWithAndWithoutStringSignature", - "typeAnnotation": null, "optional": false }, "property": { @@ -712,6 +706,7 @@ "ctxt": 0 }, "value": "unionOfDifferentReturnType1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -746,6 +741,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -762,8 +758,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -811,6 +806,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -827,8 +823,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -853,7 +848,6 @@ "ctxt": 0 }, "value": "Date", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -870,8 +864,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -901,8 +894,8 @@ "ctxt": 0 }, "value": "numOrDate", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -919,7 +912,6 @@ "ctxt": 0 }, "value": "unionOfDifferentReturnType1", - "typeAnnotation": null, "optional": false }, "property": { @@ -963,8 +955,8 @@ "ctxt": 0 }, "value": "numOrDate", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -981,7 +973,6 @@ "ctxt": 0 }, "value": "unionOfDifferentReturnType1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1022,6 +1013,7 @@ "ctxt": 0 }, "value": "unionOfTypesWithAndWithoutStringSignature1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1056,6 +1048,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1072,8 +1065,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1113,8 +1105,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1144,8 +1135,8 @@ "ctxt": 0 }, "value": "anyVar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1162,7 +1153,6 @@ "ctxt": 0 }, "value": "unionOfTypesWithAndWithoutStringSignature1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1206,8 +1196,8 @@ "ctxt": 0 }, "value": "anyVar", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1224,7 +1214,6 @@ "ctxt": 0 }, "value": "unionOfTypesWithAndWithoutStringSignature1", - "typeAnnotation": null, "optional": false }, "property": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeMembers/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeMembers/input.ts.json index d73da56147b5..36f5f3f0f025 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeMembers/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeMembers/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -81,7 +79,6 @@ "ctxt": 0 }, "value": "commonMethodType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,6 +92,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -111,8 +109,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -150,7 +147,6 @@ "ctxt": 0 }, "value": "commonPropertyType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -192,7 +188,6 @@ "ctxt": 0 }, "value": "commonMethodDifferentParameterType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -206,6 +201,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -222,8 +218,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -261,7 +256,6 @@ "ctxt": 0 }, "value": "commonMethodDifferentReturnType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -275,6 +269,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -291,8 +286,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -330,7 +324,6 @@ "ctxt": 0 }, "value": "commonPropertyDifferenType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -372,7 +365,6 @@ "ctxt": 0 }, "value": "commonMethodWithTypeParameter", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -386,6 +378,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -408,13 +401,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -439,7 +430,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -463,7 +453,6 @@ "ctxt": 0 }, "value": "commonMethodWithOwnTypeParameter", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -477,6 +466,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -499,13 +489,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -530,7 +518,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -559,7 +546,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -584,7 +570,6 @@ "ctxt": 0 }, "value": "methodOnlyInI1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -598,6 +583,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -614,8 +600,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -653,7 +638,6 @@ "ctxt": 0 }, "value": "propertyOnlyInI1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -697,7 +681,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -724,7 +707,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -757,7 +739,6 @@ "ctxt": 0 }, "value": "commonMethodType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -771,6 +752,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -787,8 +769,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -826,7 +807,6 @@ "ctxt": 0 }, "value": "commonPropertyType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -868,7 +848,6 @@ "ctxt": 0 }, "value": "commonMethodDifferentParameterType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -882,6 +861,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -898,8 +878,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnn": { @@ -937,7 +916,6 @@ "ctxt": 0 }, "value": "commonMethodDifferentReturnType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -951,6 +929,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -967,8 +946,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -1006,7 +984,6 @@ "ctxt": 0 }, "value": "commonPropertyDifferenType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1048,7 +1025,6 @@ "ctxt": 0 }, "value": "commonMethodWithTypeParameter", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1062,6 +1038,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1084,13 +1061,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1115,7 +1090,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1139,7 +1113,6 @@ "ctxt": 0 }, "value": "commonMethodWithOwnTypeParameter", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1153,6 +1126,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1175,13 +1149,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeAnn": { @@ -1206,7 +1178,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1235,7 +1206,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1260,7 +1230,6 @@ "ctxt": 0 }, "value": "methodOnlyInI2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1274,6 +1243,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1290,8 +1260,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnn": { @@ -1329,7 +1298,6 @@ "ctxt": 0 }, "value": "propertyOnlyInI2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1383,6 +1351,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1413,7 +1382,6 @@ "ctxt": 0 }, "value": "I1", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1451,7 +1419,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1476,8 +1443,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1509,6 +1475,7 @@ "ctxt": 0 }, "value": "str", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1525,8 +1492,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1558,6 +1524,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1574,8 +1541,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1607,6 +1573,7 @@ "ctxt": 0 }, "value": "strOrNum", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1642,8 +1609,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1673,8 +1639,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1691,7 +1657,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1702,7 +1667,6 @@ "ctxt": 0 }, "value": "commonPropertyType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1732,8 +1696,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -1757,7 +1721,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1768,7 +1731,6 @@ "ctxt": 0 }, "value": "commonMethodType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1784,7 +1746,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false } } @@ -1816,8 +1777,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "MemberExpression", @@ -1834,7 +1795,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1845,7 +1805,6 @@ "ctxt": 0 }, "value": "commonPropertyDifferenType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1875,8 +1834,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -1900,7 +1859,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1911,7 +1869,6 @@ "ctxt": 0 }, "value": "commonMethodDifferentReturnType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1927,7 +1884,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false } } @@ -1958,7 +1914,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -1969,7 +1924,6 @@ "ctxt": 0 }, "value": "commonMethodDifferentParameterType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2004,7 +1958,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2015,7 +1968,6 @@ "ctxt": 0 }, "value": "commonMethodDifferentParameterType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2031,7 +1983,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } } @@ -2062,8 +2013,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -2087,7 +2038,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2098,7 +2048,6 @@ "ctxt": 0 }, "value": "commonMethodWithTypeParameter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2114,7 +2063,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false } } @@ -2146,8 +2094,8 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -2171,7 +2119,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2182,7 +2129,6 @@ "ctxt": 0 }, "value": "commonMethodWithOwnTypeParameter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2198,7 +2144,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false } } @@ -2230,8 +2175,8 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -2255,7 +2200,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2266,7 +2210,6 @@ "ctxt": 0 }, "value": "commonMethodWithOwnTypeParameter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2282,7 +2225,6 @@ "ctxt": 0 }, "value": "str", - "typeAnnotation": null, "optional": false } } @@ -2314,8 +2256,8 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "CallExpression", @@ -2339,7 +2281,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2350,7 +2291,6 @@ "ctxt": 0 }, "value": "commonMethodWithOwnTypeParameter", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2366,7 +2306,6 @@ "ctxt": 0 }, "value": "strOrNum", - "typeAnnotation": null, "optional": false } } @@ -2397,7 +2336,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2408,7 +2346,6 @@ "ctxt": 0 }, "value": "propertyOnlyInI1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2436,7 +2373,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2447,7 +2383,6 @@ "ctxt": 0 }, "value": "propertyOnlyInI2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2482,7 +2417,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2493,7 +2427,6 @@ "ctxt": 0 }, "value": "methodOnlyInI1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2549,7 +2482,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2560,7 +2492,6 @@ "ctxt": 0 }, "value": "methodOnlyInI2", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypePropertyAccessibility/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypePropertyAccessibility/input.ts.json index 7456f255644c..58fd95f1d690 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypePropertyAccessibility/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypePropertyAccessibility/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "Default", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": null, @@ -90,7 +88,6 @@ "ctxt": 0 }, "value": "Public", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -116,7 +113,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": null, @@ -164,7 +160,6 @@ "ctxt": 0 }, "value": "Protected", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -190,7 +185,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": null, @@ -238,7 +232,6 @@ "ctxt": 0 }, "value": "Private", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -264,7 +257,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "value": null, @@ -327,6 +319,7 @@ "ctxt": 0 }, "value": "v1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -349,13 +342,11 @@ "ctxt": 0 }, "value": "Default", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -387,6 +378,7 @@ "ctxt": 0 }, "value": "v2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -409,13 +401,11 @@ "ctxt": 0 }, "value": "Public", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -447,6 +437,7 @@ "ctxt": 0 }, "value": "v3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -469,13 +460,11 @@ "ctxt": 0 }, "value": "Protected", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -507,6 +496,7 @@ "ctxt": 0 }, "value": "v4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -529,13 +519,11 @@ "ctxt": 0 }, "value": "Private", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -567,6 +555,7 @@ "ctxt": 0 }, "value": "v5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -597,7 +586,6 @@ "ctxt": 0 }, "value": "Default", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -617,15 +605,13 @@ "ctxt": 0 }, "value": "Public", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -657,6 +643,7 @@ "ctxt": 0 }, "value": "v6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -687,7 +674,6 @@ "ctxt": 0 }, "value": "Default", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -707,15 +693,13 @@ "ctxt": 0 }, "value": "Protected", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -747,6 +731,7 @@ "ctxt": 0 }, "value": "v7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -777,7 +762,6 @@ "ctxt": 0 }, "value": "Default", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -797,15 +781,13 @@ "ctxt": 0 }, "value": "Private", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -837,6 +819,7 @@ "ctxt": 0 }, "value": "v8", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -867,7 +850,6 @@ "ctxt": 0 }, "value": "Public", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -887,15 +869,13 @@ "ctxt": 0 }, "value": "Protected", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -927,6 +907,7 @@ "ctxt": 0 }, "value": "v9", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -957,7 +938,6 @@ "ctxt": 0 }, "value": "Public", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -977,15 +957,13 @@ "ctxt": 0 }, "value": "Private", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1017,6 +995,7 @@ "ctxt": 0 }, "value": "v10", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1047,7 +1026,6 @@ "ctxt": 0 }, "value": "Protected", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1067,15 +1045,13 @@ "ctxt": 0 }, "value": "Private", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1107,6 +1083,7 @@ "ctxt": 0 }, "value": "v11", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1137,7 +1114,6 @@ "ctxt": 0 }, "value": "Default", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1157,7 +1133,6 @@ "ctxt": 0 }, "value": "Public", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1177,15 +1152,13 @@ "ctxt": 0 }, "value": "Protected", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1217,6 +1190,7 @@ "ctxt": 0 }, "value": "v12", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1247,7 +1221,6 @@ "ctxt": 0 }, "value": "Default", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1267,7 +1240,6 @@ "ctxt": 0 }, "value": "Public", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1287,15 +1259,13 @@ "ctxt": 0 }, "value": "Private", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1327,6 +1297,7 @@ "ctxt": 0 }, "value": "v13", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1357,7 +1328,6 @@ "ctxt": 0 }, "value": "Default", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1377,7 +1347,6 @@ "ctxt": 0 }, "value": "Protected", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1397,15 +1366,13 @@ "ctxt": 0 }, "value": "Private", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1437,6 +1404,7 @@ "ctxt": 0 }, "value": "v14", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1467,7 +1435,6 @@ "ctxt": 0 }, "value": "Public", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1487,7 +1454,6 @@ "ctxt": 0 }, "value": "Private", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1507,15 +1473,13 @@ "ctxt": 0 }, "value": "Protected", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1547,6 +1511,7 @@ "ctxt": 0 }, "value": "v15", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1577,7 +1542,6 @@ "ctxt": 0 }, "value": "Default", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1597,7 +1561,6 @@ "ctxt": 0 }, "value": "Public", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1617,7 +1580,6 @@ "ctxt": 0 }, "value": "Private", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1637,15 +1599,13 @@ "ctxt": 0 }, "value": "Protected", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1674,7 +1634,6 @@ "ctxt": 0 }, "value": "v1", - "typeAnnotation": null, "optional": false }, "property": { @@ -1685,7 +1644,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1713,7 +1671,6 @@ "ctxt": 0 }, "value": "v2", - "typeAnnotation": null, "optional": false }, "property": { @@ -1724,7 +1681,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1752,7 +1708,6 @@ "ctxt": 0 }, "value": "v3", - "typeAnnotation": null, "optional": false }, "property": { @@ -1763,7 +1718,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1791,7 +1745,6 @@ "ctxt": 0 }, "value": "v4", - "typeAnnotation": null, "optional": false }, "property": { @@ -1802,7 +1755,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1830,7 +1782,6 @@ "ctxt": 0 }, "value": "v5", - "typeAnnotation": null, "optional": false }, "property": { @@ -1841,7 +1792,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1869,7 +1819,6 @@ "ctxt": 0 }, "value": "v6", - "typeAnnotation": null, "optional": false }, "property": { @@ -1880,7 +1829,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1908,7 +1856,6 @@ "ctxt": 0 }, "value": "v7", - "typeAnnotation": null, "optional": false }, "property": { @@ -1919,7 +1866,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1947,7 +1893,6 @@ "ctxt": 0 }, "value": "v8", - "typeAnnotation": null, "optional": false }, "property": { @@ -1958,7 +1903,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1986,7 +1930,6 @@ "ctxt": 0 }, "value": "v9", - "typeAnnotation": null, "optional": false }, "property": { @@ -1997,7 +1940,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2025,7 +1967,6 @@ "ctxt": 0 }, "value": "v10", - "typeAnnotation": null, "optional": false }, "property": { @@ -2036,7 +1977,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2064,7 +2004,6 @@ "ctxt": 0 }, "value": "v11", - "typeAnnotation": null, "optional": false }, "property": { @@ -2075,7 +2014,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2103,7 +2041,6 @@ "ctxt": 0 }, "value": "v12", - "typeAnnotation": null, "optional": false }, "property": { @@ -2114,7 +2051,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2142,7 +2078,6 @@ "ctxt": 0 }, "value": "v13", - "typeAnnotation": null, "optional": false }, "property": { @@ -2153,7 +2088,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2181,7 +2115,6 @@ "ctxt": 0 }, "value": "v14", - "typeAnnotation": null, "optional": false }, "property": { @@ -2192,7 +2125,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2220,7 +2152,6 @@ "ctxt": 0 }, "value": "v15", - "typeAnnotation": null, "optional": false }, "property": { @@ -2231,7 +2162,6 @@ "ctxt": 0 }, "value": "member", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeReadonly/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeReadonly/input.ts.json index 6c22702c3c90..ea03e3fbb97d 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeReadonly/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeReadonly/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -51,7 +50,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,7 +93,6 @@ "ctxt": 0 }, "value": "Identical", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -125,7 +122,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -169,7 +165,6 @@ "ctxt": 0 }, "value": "Mutable", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -199,7 +194,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -243,7 +237,6 @@ "ctxt": 0 }, "value": "DifferentType", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -273,7 +266,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -317,7 +309,6 @@ "ctxt": 0 }, "value": "DifferentName", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -347,7 +338,6 @@ "ctxt": 0 }, "value": "other", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -401,6 +391,7 @@ "ctxt": 0 }, "value": "base", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -423,13 +414,11 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -466,7 +455,6 @@ "ctxt": 0 }, "value": "base", - "typeAnnotation": null, "optional": false }, "property": { @@ -477,7 +465,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false @@ -518,6 +505,7 @@ "ctxt": 0 }, "value": "identical", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -548,7 +536,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -568,15 +555,13 @@ "ctxt": 0 }, "value": "Identical", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -613,7 +598,6 @@ "ctxt": 0 }, "value": "identical", - "typeAnnotation": null, "optional": false }, "property": { @@ -624,7 +608,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false @@ -665,6 +648,7 @@ "ctxt": 0 }, "value": "mutable", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -695,7 +679,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -715,15 +698,13 @@ "ctxt": 0 }, "value": "Mutable", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -760,7 +741,6 @@ "ctxt": 0 }, "value": "mutable", - "typeAnnotation": null, "optional": false }, "property": { @@ -771,7 +751,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false @@ -812,6 +791,7 @@ "ctxt": 0 }, "value": "differentType", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -842,7 +822,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -862,15 +841,13 @@ "ctxt": 0 }, "value": "DifferentType", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -907,7 +884,6 @@ "ctxt": 0 }, "value": "differentType", - "typeAnnotation": null, "optional": false }, "property": { @@ -918,7 +894,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false @@ -959,6 +934,7 @@ "ctxt": 0 }, "value": "differentName", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -989,7 +965,6 @@ "ctxt": 0 }, "value": "Base", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1009,15 +984,13 @@ "ctxt": 0 }, "value": "DifferentName", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -1054,7 +1027,6 @@ "ctxt": 0 }, "value": "differentName", - "typeAnnotation": null, "optional": false }, "property": { @@ -1065,7 +1037,6 @@ "ctxt": 0 }, "value": "value", - "typeAnnotation": null, "optional": false }, "computed": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeReduction/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeReduction/input.ts.json index f2d508c30ed8..5aacf20d0740 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeReduction/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeReduction/input.ts.json @@ -21,7 +21,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -78,8 +77,8 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeAnnotation": { @@ -119,7 +118,6 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -188,6 +186,7 @@ "ctxt": 0 }, "value": "i2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -210,13 +209,11 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -236,6 +233,7 @@ "ctxt": 0 }, "value": "i3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -258,13 +256,11 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -296,6 +292,7 @@ "ctxt": 0 }, "value": "e1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -326,7 +323,6 @@ "ctxt": 0 }, "value": "I2", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -346,15 +342,13 @@ "ctxt": 0 }, "value": "I3", - "typeAnnotation": null, "optional": false }, "typeParams": null } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -386,8 +380,8 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -405,7 +399,6 @@ "ctxt": 0 }, "value": "i2", - "typeAnnotation": null, "optional": false }, "right": { @@ -416,7 +409,6 @@ "ctxt": 0 }, "value": "i3", - "typeAnnotation": null, "optional": false } }, @@ -449,8 +441,8 @@ "ctxt": 0 }, "value": "r1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -467,7 +459,6 @@ "ctxt": 0 }, "value": "e1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -502,8 +493,8 @@ "ctxt": 0 }, "value": "r2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -520,7 +511,6 @@ "ctxt": 0 }, "value": "e2", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeReduction2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeReduction2/input.ts.json index 086563006055..6f69b8070fe0 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeReduction2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeReduction2/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -37,6 +36,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -68,7 +68,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -95,8 +94,7 @@ } ] } - }, - "optional": false + } } }, { @@ -115,6 +113,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -146,7 +145,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -160,6 +158,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -176,8 +175,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "typeAnn": { @@ -201,8 +199,7 @@ } ] } - }, - "optional": false + } } } ], @@ -245,8 +242,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -290,7 +287,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -301,7 +297,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -338,7 +333,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "property": { @@ -349,7 +343,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -387,7 +380,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "property": { @@ -398,7 +390,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -442,7 +433,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -463,6 +453,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -494,7 +485,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -508,6 +498,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -543,8 +534,7 @@ } ] } - }, - "optional": false + } } ], "typeAnn": { @@ -568,8 +558,7 @@ } ] } - }, - "optional": false + } } }, { @@ -588,6 +577,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -619,7 +609,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -633,6 +622,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -649,8 +639,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "typeAnn": { @@ -674,8 +663,7 @@ } ] } - }, - "optional": false + } } } ], @@ -718,8 +706,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -763,7 +751,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -774,7 +761,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -811,7 +797,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "property": { @@ -822,7 +807,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -860,7 +844,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "property": { @@ -871,7 +854,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -915,7 +897,6 @@ "ctxt": 0 }, "value": "f3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -936,6 +917,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -970,8 +952,7 @@ } } } - }, - "optional": false + } } }, { @@ -990,6 +971,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1013,6 +995,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1029,8 +1012,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "typeParams": null, @@ -1052,8 +1034,7 @@ } } } - }, - "optional": false + } } } ], @@ -1096,8 +1077,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1141,7 +1122,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1152,7 +1132,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -1182,7 +1161,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1211,7 +1189,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1253,7 +1230,6 @@ "ctxt": 0 }, "value": "f4", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1274,6 +1250,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1297,6 +1274,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1332,8 +1310,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -1355,8 +1332,7 @@ } } } - }, - "optional": false + } } }, { @@ -1375,6 +1351,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1398,6 +1375,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1414,8 +1392,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "typeParams": null, @@ -1437,8 +1414,7 @@ } } } - }, - "optional": false + } } } ], @@ -1481,8 +1457,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1526,7 +1502,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1537,7 +1512,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -1567,7 +1541,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1596,7 +1569,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -1638,7 +1610,6 @@ "ctxt": 0 }, "value": "f5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1659,6 +1630,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1682,6 +1654,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1717,8 +1690,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -1740,8 +1712,7 @@ } } } - }, - "optional": false + } } }, { @@ -1760,6 +1731,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1783,6 +1755,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1812,8 +1785,7 @@ } } } - }, - "optional": true + } } ], "typeParams": null, @@ -1835,8 +1807,7 @@ } } } - }, - "optional": false + } } } ], @@ -1879,8 +1850,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1924,7 +1895,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -1935,7 +1905,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -1965,7 +1934,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1994,7 +1962,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2036,7 +2003,6 @@ "ctxt": 0 }, "value": "f6", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2057,6 +2023,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2080,6 +2047,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2128,8 +2096,7 @@ } ] } - }, - "optional": false + } } ], "typeParams": null, @@ -2151,8 +2118,7 @@ } } } - }, - "optional": false + } } }, { @@ -2171,6 +2137,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2194,6 +2161,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2210,8 +2178,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "typeParams": null, @@ -2233,8 +2200,7 @@ } } } - }, - "optional": false + } } } ], @@ -2277,8 +2243,8 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2322,7 +2288,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2333,7 +2298,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -2363,7 +2327,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2392,7 +2355,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2440,7 +2402,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2468,7 +2429,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2512,7 +2472,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2540,7 +2499,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2554,6 +2512,7 @@ "ctxt": 0 }, "value": "x", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2570,8 +2529,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "typeAnn": { @@ -2609,7 +2567,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2647,7 +2604,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2668,6 +2624,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2690,13 +2647,11 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -2715,6 +2670,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2737,13 +2693,11 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -2786,8 +2740,8 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -2831,7 +2785,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -2842,7 +2795,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } }, @@ -2879,7 +2831,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "property": { @@ -2890,7 +2841,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2928,7 +2878,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "property": { @@ -2939,7 +2888,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2988,7 +2936,6 @@ "ctxt": 0 }, "value": "ReturnVal", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3018,7 +2965,6 @@ "ctxt": 0 }, "value": "something", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3071,6 +3017,7 @@ "ctxt": 0 }, "value": "k", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3093,13 +3040,11 @@ "ctxt": 0 }, "value": "ReturnVal", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -3119,7 +3064,6 @@ "ctxt": 0 }, "value": "something", - "typeAnnotation": null, "optional": false }, "params": [], @@ -3174,6 +3118,7 @@ "ctxt": 0 }, "value": "val", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3196,13 +3141,11 @@ "ctxt": 0 }, "value": "ReturnVal", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3219,7 +3162,6 @@ "ctxt": 0 }, "value": "run", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3240,6 +3182,7 @@ "ctxt": 0 }, "value": "options", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3271,7 +3214,6 @@ "ctxt": 0 }, "value": "something", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3285,6 +3227,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3301,8 +3244,7 @@ }, "kind": "string" } - }, - "optional": true + } } ], "typeAnn": { @@ -3326,8 +3268,7 @@ } ] } - }, - "optional": false + } } } ], @@ -3370,8 +3311,8 @@ "ctxt": 0 }, "value": "something", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -3396,7 +3337,6 @@ "ctxt": 0 }, "value": "options", - "typeAnnotation": null, "optional": false }, "property": { @@ -3407,7 +3347,6 @@ "ctxt": 0 }, "value": "something", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3427,7 +3366,6 @@ "ctxt": 0 }, "value": "val", - "typeAnnotation": null, "optional": false }, "property": { @@ -3438,7 +3376,6 @@ "ctxt": 0 }, "value": "something", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3470,7 +3407,6 @@ "ctxt": 0 }, "value": "something", - "typeAnnotation": null, "optional": false }, "arguments": [ diff --git a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeWithIndexSignature/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeWithIndexSignature/input.ts.json index 1332732312f6..5acd44b7a691 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeWithIndexSignature/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/union/unionTypeWithIndexSignature/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -58,7 +57,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -96,7 +94,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -151,7 +148,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -206,6 +202,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -222,8 +219,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -280,6 +276,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -302,13 +299,11 @@ "ctxt": 0 }, "value": "Two", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -345,7 +340,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "property": { @@ -356,7 +350,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -407,7 +400,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "property": { @@ -418,7 +410,6 @@ "ctxt": 0 }, "value": "baz", - "typeAnnotation": null, "optional": false }, "computed": false @@ -455,7 +446,6 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -491,7 +481,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -538,6 +527,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -554,8 +544,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -603,6 +592,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -619,8 +609,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -677,6 +666,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -699,13 +689,11 @@ "ctxt": 0 }, "value": "Three", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -742,7 +730,6 @@ "ctxt": 0 }, "value": "v", - "typeAnnotation": null, "optional": false }, "property": { @@ -753,7 +740,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -785,7 +771,6 @@ "ctxt": 0 }, "value": "Missing", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -821,7 +806,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -863,7 +847,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -918,6 +901,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -934,8 +918,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -988,7 +971,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1044,6 +1026,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1066,13 +1049,11 @@ "ctxt": 0 }, "value": "Missing", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1109,7 +1090,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -1120,7 +1100,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1163,7 +1142,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "property": { @@ -1174,7 +1152,6 @@ "ctxt": 0 }, "value": "bar", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1196,7 +1173,6 @@ "ctxt": 0 }, "value": "RO", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1232,7 +1208,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1279,6 +1254,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1295,8 +1271,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1353,6 +1328,7 @@ "ctxt": 0 }, "value": "ro", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1375,13 +1351,11 @@ "ctxt": 0 }, "value": "RO", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1418,7 +1392,6 @@ "ctxt": 0 }, "value": "ro", - "typeAnnotation": null, "optional": false }, "property": { @@ -1429,7 +1402,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -1466,7 +1438,6 @@ "ctxt": 0 }, "value": "Num", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1552,6 +1523,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1568,8 +1540,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -1626,6 +1597,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1648,13 +1620,11 @@ "ctxt": 0 }, "value": "Num", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -1691,7 +1661,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false }, "property": { @@ -1746,7 +1715,6 @@ "ctxt": 0 }, "value": "num", - "typeAnnotation": null, "optional": false }, "property": { @@ -1806,8 +1774,8 @@ "ctxt": 0 }, "value": "sym", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -1824,7 +1792,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1850,7 +1817,6 @@ "ctxt": 0 }, "value": "Both", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1886,7 +1852,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1973,7 +1938,6 @@ "ctxt": 0 }, "value": "sym", - "typeAnnotation": null, "optional": false }, "computed": true, @@ -2020,6 +1984,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2036,8 +2001,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2075,6 +2039,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2091,8 +2056,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -2168,6 +2132,7 @@ "ctxt": 0 }, "value": "both", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2190,13 +2155,11 @@ "ctxt": 0 }, "value": "Both", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2233,7 +2196,6 @@ "ctxt": 0 }, "value": "both", - "typeAnnotation": null, "optional": false }, "property": { @@ -2298,7 +2260,6 @@ "ctxt": 0 }, "value": "both", - "typeAnnotation": null, "optional": false }, "property": { @@ -2353,7 +2314,6 @@ "ctxt": 0 }, "value": "both", - "typeAnnotation": null, "optional": false }, "property": { @@ -2408,7 +2368,6 @@ "ctxt": 0 }, "value": "both", - "typeAnnotation": null, "optional": false }, "property": { @@ -2468,7 +2427,6 @@ "ctxt": 0 }, "value": "both", - "typeAnnotation": null, "optional": false }, "property": { @@ -2479,7 +2437,6 @@ "ctxt": 0 }, "value": "sym", - "typeAnnotation": null, "optional": false }, "computed": true diff --git a/ecmascript/parser/tests/typescript/tsc/types/uniqueSymbol/uniqueSymbols/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/uniqueSymbol/uniqueSymbols/input.ts.json index 16cea1dc85df..6cea41331896 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/uniqueSymbol/uniqueSymbols/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/uniqueSymbol/uniqueSymbols/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -84,8 +83,8 @@ "ctxt": 0 }, "value": "letCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -102,7 +101,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -137,8 +135,8 @@ "ctxt": 0 }, "value": "varCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -155,7 +153,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -190,6 +187,7 @@ "ctxt": 0 }, "value": "constType", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -215,8 +213,7 @@ "kind": "symbol" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -248,6 +245,7 @@ "ctxt": 0 }, "value": "constTypeAndCall", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -273,8 +271,7 @@ "kind": "symbol" } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -291,7 +288,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -326,8 +322,8 @@ "ctxt": 0 }, "value": "constInitToConstCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -337,7 +333,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false }, "definite": false @@ -369,8 +364,8 @@ "ctxt": 0 }, "value": "constInitToLetCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -380,7 +375,6 @@ "ctxt": 0 }, "value": "letCall", - "typeAnnotation": null, "optional": false }, "definite": false @@ -412,8 +406,8 @@ "ctxt": 0 }, "value": "constInitToVarCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -423,7 +417,6 @@ "ctxt": 0 }, "value": "varCall", - "typeAnnotation": null, "optional": false }, "definite": false @@ -455,8 +448,8 @@ "ctxt": 0 }, "value": "constInitToConstDeclAmbient", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -466,7 +459,6 @@ "ctxt": 0 }, "value": "constType", - "typeAnnotation": null, "optional": false }, "definite": false @@ -498,8 +490,8 @@ "ctxt": 0 }, "value": "letInitToConstCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -509,7 +501,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false }, "definite": false @@ -541,8 +532,8 @@ "ctxt": 0 }, "value": "letInitToLetCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -552,7 +543,6 @@ "ctxt": 0 }, "value": "letCall", - "typeAnnotation": null, "optional": false }, "definite": false @@ -584,8 +574,8 @@ "ctxt": 0 }, "value": "letInitToVarCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -595,7 +585,6 @@ "ctxt": 0 }, "value": "varCall", - "typeAnnotation": null, "optional": false }, "definite": false @@ -627,8 +616,8 @@ "ctxt": 0 }, "value": "letInitToConstDeclAmbient", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -638,7 +627,6 @@ "ctxt": 0 }, "value": "constType", - "typeAnnotation": null, "optional": false }, "definite": false @@ -670,8 +658,8 @@ "ctxt": 0 }, "value": "varInitToConstCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -681,7 +669,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false }, "definite": false @@ -713,8 +700,8 @@ "ctxt": 0 }, "value": "varInitToLetCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -724,7 +711,6 @@ "ctxt": 0 }, "value": "letCall", - "typeAnnotation": null, "optional": false }, "definite": false @@ -756,8 +742,8 @@ "ctxt": 0 }, "value": "varInitToVarCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -767,7 +753,6 @@ "ctxt": 0 }, "value": "varCall", - "typeAnnotation": null, "optional": false }, "definite": false @@ -799,8 +784,8 @@ "ctxt": 0 }, "value": "varInitToConstDeclAmbient", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -810,7 +795,6 @@ "ctxt": 0 }, "value": "constType", - "typeAnnotation": null, "optional": false }, "definite": false @@ -842,6 +826,7 @@ "ctxt": 0 }, "value": "constInitToConstCallWithTypeQuery", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -864,12 +849,10 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -879,7 +862,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false }, "definite": false @@ -911,6 +893,7 @@ "ctxt": 0 }, "value": "constInitToConstDeclAmbientWithTypeQuery", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -933,12 +916,10 @@ "ctxt": 0 }, "value": "constType", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -948,7 +929,6 @@ "ctxt": 0 }, "value": "constType", - "typeAnnotation": null, "optional": false }, "definite": false @@ -980,6 +960,7 @@ "ctxt": 0 }, "value": "fromAny", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1005,8 +986,7 @@ "kind": "symbol" } } - }, - "optional": false + } }, "init": { "type": "TsAsExpression", @@ -1048,7 +1028,6 @@ "ctxt": 0 }, "value": "funcReturnConstCall", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1082,7 +1061,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false } } @@ -1103,7 +1081,6 @@ "ctxt": 0 }, "value": "funcReturnLetCall", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1137,7 +1114,6 @@ "ctxt": 0 }, "value": "letCall", - "typeAnnotation": null, "optional": false } } @@ -1158,7 +1134,6 @@ "ctxt": 0 }, "value": "funcReturnVarCall", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1192,7 +1167,6 @@ "ctxt": 0 }, "value": "varCall", - "typeAnnotation": null, "optional": false } } @@ -1213,7 +1187,6 @@ "ctxt": 0 }, "value": "funcReturnConstCallWithTypeQuery", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1247,7 +1220,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false } } @@ -1278,7 +1250,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false } } @@ -1294,7 +1265,6 @@ "ctxt": 0 }, "value": "genFuncYieldConstCall", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1335,7 +1305,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -1358,7 +1327,6 @@ "ctxt": 0 }, "value": "genFuncYieldLetCall", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1399,7 +1367,6 @@ "ctxt": 0 }, "value": "letCall", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -1422,7 +1389,6 @@ "ctxt": 0 }, "value": "genFuncYieldVarCall", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1463,7 +1429,6 @@ "ctxt": 0 }, "value": "varCall", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -1486,7 +1451,6 @@ "ctxt": 0 }, "value": "genFuncYieldConstCallWithTypeQuery", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1527,7 +1491,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -1560,7 +1523,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1586,7 +1548,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false } } @@ -1605,7 +1566,6 @@ "ctxt": 0 }, "value": "asyncFuncReturnConstCall", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1639,7 +1599,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false } } @@ -1660,7 +1619,6 @@ "ctxt": 0 }, "value": "asyncFuncReturnLetCall", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1694,7 +1652,6 @@ "ctxt": 0 }, "value": "letCall", - "typeAnnotation": null, "optional": false } } @@ -1715,7 +1672,6 @@ "ctxt": 0 }, "value": "asyncFuncReturnVarCall", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1749,7 +1705,6 @@ "ctxt": 0 }, "value": "varCall", - "typeAnnotation": null, "optional": false } } @@ -1770,7 +1725,6 @@ "ctxt": 0 }, "value": "asyncGenFuncYieldConstCall", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1811,7 +1765,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -1834,7 +1787,6 @@ "ctxt": 0 }, "value": "asyncGenFuncYieldLetCall", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1875,7 +1827,6 @@ "ctxt": 0 }, "value": "letCall", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -1898,7 +1849,6 @@ "ctxt": 0 }, "value": "asyncGenFuncYieldVarCall", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1939,7 +1889,6 @@ "ctxt": 0 }, "value": "varCall", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -1962,7 +1911,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1988,7 +1936,6 @@ "ctxt": 0 }, "value": "readonlyStaticCall", - "typeAnnotation": null, "optional": false }, "value": { @@ -2006,7 +1953,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2038,7 +1984,6 @@ "ctxt": 0 }, "value": "readonlyStaticType", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2093,7 +2038,6 @@ "ctxt": 0 }, "value": "readonlyStaticTypeAndCall", - "typeAnnotation": null, "optional": false }, "value": { @@ -2111,7 +2055,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2168,7 +2111,6 @@ "ctxt": 0 }, "value": "readwriteStaticCall", - "typeAnnotation": null, "optional": false }, "value": { @@ -2186,7 +2128,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2218,7 +2159,6 @@ "ctxt": 0 }, "value": "readonlyCall", - "typeAnnotation": null, "optional": false }, "value": { @@ -2236,7 +2176,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2268,7 +2207,6 @@ "ctxt": 0 }, "value": "readwriteCall", - "typeAnnotation": null, "optional": false }, "value": { @@ -2286,7 +2224,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2335,6 +2272,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2357,13 +2295,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2395,8 +2331,8 @@ "ctxt": 0 }, "value": "constInitToCReadonlyStaticCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2413,7 +2349,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -2424,7 +2359,6 @@ "ctxt": 0 }, "value": "readonlyStaticCall", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2458,8 +2392,8 @@ "ctxt": 0 }, "value": "constInitToCReadonlyStaticType", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2476,7 +2410,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -2487,7 +2420,6 @@ "ctxt": 0 }, "value": "readonlyStaticType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2521,8 +2453,8 @@ "ctxt": 0 }, "value": "constInitToCReadonlyStaticTypeAndCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2539,7 +2471,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -2550,7 +2481,6 @@ "ctxt": 0 }, "value": "readonlyStaticTypeAndCall", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2584,8 +2514,8 @@ "ctxt": 0 }, "value": "constInitToCReadwriteStaticCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2602,7 +2532,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -2613,7 +2542,6 @@ "ctxt": 0 }, "value": "readwriteStaticCall", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2647,6 +2575,7 @@ "ctxt": 0 }, "value": "constInitToCReadonlyStaticCallWithTypeQuery", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2671,7 +2600,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "right": { @@ -2682,13 +2610,11 @@ "ctxt": 0 }, "value": "readonlyStaticCall", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -2705,7 +2631,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -2716,7 +2641,6 @@ "ctxt": 0 }, "value": "readonlyStaticCall", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2750,6 +2674,7 @@ "ctxt": 0 }, "value": "constInitToCReadonlyStaticTypeWithTypeQuery", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2774,7 +2699,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "right": { @@ -2785,13 +2709,11 @@ "ctxt": 0 }, "value": "readonlyStaticType", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -2808,7 +2730,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -2819,7 +2740,6 @@ "ctxt": 0 }, "value": "readonlyStaticType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2853,6 +2773,7 @@ "ctxt": 0 }, "value": "constInitToCReadonlyStaticTypeAndCallWithTypeQuery", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2877,7 +2798,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "right": { @@ -2888,13 +2808,11 @@ "ctxt": 0 }, "value": "readonlyStaticTypeAndCall", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -2911,7 +2829,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -2922,7 +2839,6 @@ "ctxt": 0 }, "value": "readonlyStaticTypeAndCall", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2956,6 +2872,7 @@ "ctxt": 0 }, "value": "constInitToCReadwriteStaticCallWithTypeQuery", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2980,7 +2897,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "right": { @@ -2991,13 +2907,11 @@ "ctxt": 0 }, "value": "readwriteStaticCall", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -3014,7 +2928,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -3025,7 +2938,6 @@ "ctxt": 0 }, "value": "readwriteStaticCall", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3059,8 +2971,8 @@ "ctxt": 0 }, "value": "constInitToCReadonlyCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3077,7 +2989,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3088,7 +2999,6 @@ "ctxt": 0 }, "value": "readonlyCall", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3122,8 +3032,8 @@ "ctxt": 0 }, "value": "constInitToCReadwriteCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3140,7 +3050,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3151,7 +3060,6 @@ "ctxt": 0 }, "value": "readwriteCall", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3185,6 +3093,7 @@ "ctxt": 0 }, "value": "constInitToCReadonlyCallWithTypeQuery", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3209,7 +3118,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3220,13 +3128,11 @@ "ctxt": 0 }, "value": "readonlyCall", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -3243,7 +3149,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3254,7 +3159,6 @@ "ctxt": 0 }, "value": "readonlyCall", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3288,6 +3192,7 @@ "ctxt": 0 }, "value": "constInitToCReadwriteCallWithTypeQuery", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3312,7 +3217,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3323,13 +3227,11 @@ "ctxt": 0 }, "value": "readwriteCall", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -3346,7 +3248,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3357,7 +3258,6 @@ "ctxt": 0 }, "value": "readwriteCall", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3391,6 +3291,7 @@ "ctxt": 0 }, "value": "constInitToCReadonlyCallWithIndexedAccess", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3421,7 +3322,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3449,8 +3349,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -3467,7 +3366,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3478,7 +3376,6 @@ "ctxt": 0 }, "value": "readonlyCall", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3512,6 +3409,7 @@ "ctxt": 0 }, "value": "constInitToCReadwriteCallWithIndexedAccess", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3542,7 +3440,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3570,8 +3467,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -3588,7 +3484,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3599,7 +3494,6 @@ "ctxt": 0 }, "value": "readwriteCall", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3623,7 +3517,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3653,7 +3546,6 @@ "ctxt": 0 }, "value": "readonlyType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3716,6 +3608,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3738,13 +3631,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3776,8 +3667,8 @@ "ctxt": 0 }, "value": "constInitToIReadonlyType", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3794,7 +3685,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -3805,7 +3695,6 @@ "ctxt": 0 }, "value": "readonlyType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3839,6 +3728,7 @@ "ctxt": 0 }, "value": "constInitToIReadonlyTypeWithTypeQuery", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3863,7 +3753,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "right": { @@ -3874,13 +3763,11 @@ "ctxt": 0 }, "value": "readonlyType", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -3897,7 +3784,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -3908,7 +3794,6 @@ "ctxt": 0 }, "value": "readonlyType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3942,6 +3827,7 @@ "ctxt": 0 }, "value": "constInitToIReadonlyTypeWithIndexedAccess", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3972,7 +3858,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4000,8 +3885,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -4018,7 +3902,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -4029,7 +3912,6 @@ "ctxt": 0 }, "value": "readonlyType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4054,7 +3936,6 @@ "ctxt": 0 }, "value": "L", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -4082,7 +3963,6 @@ "ctxt": 0 }, "value": "readonlyType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4133,7 +4013,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4171,7 +4050,6 @@ "ctxt": 0 }, "value": "readonlyNestedType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4239,6 +4117,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4261,13 +4140,11 @@ "ctxt": 0 }, "value": "L", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -4299,8 +4176,8 @@ "ctxt": 0 }, "value": "constInitToLReadonlyType", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -4317,7 +4194,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "property": { @@ -4328,7 +4204,6 @@ "ctxt": 0 }, "value": "readonlyType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4362,8 +4237,8 @@ "ctxt": 0 }, "value": "constInitToLReadonlyNestedType", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -4387,7 +4262,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "property": { @@ -4398,7 +4272,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4411,7 +4284,6 @@ "ctxt": 0 }, "value": "readonlyNestedType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4445,6 +4317,7 @@ "ctxt": 0 }, "value": "constInitToLReadonlyTypeWithTypeQuery", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4469,7 +4342,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "right": { @@ -4480,13 +4352,11 @@ "ctxt": 0 }, "value": "readonlyType", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -4503,7 +4373,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "property": { @@ -4514,7 +4383,6 @@ "ctxt": 0 }, "value": "readonlyType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4548,6 +4416,7 @@ "ctxt": 0 }, "value": "constInitToLReadonlyNestedTypeWithTypeQuery", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4574,7 +4443,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "right": { @@ -4585,7 +4453,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false } }, @@ -4597,13 +4464,11 @@ "ctxt": 0 }, "value": "readonlyNestedType", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -4627,7 +4492,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "property": { @@ -4638,7 +4502,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4651,7 +4514,6 @@ "ctxt": 0 }, "value": "readonlyNestedType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4685,6 +4547,7 @@ "ctxt": 0 }, "value": "constInitToLReadonlyTypeWithIndexedAccess", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4715,7 +4578,6 @@ "ctxt": 0 }, "value": "L", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4743,8 +4605,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -4761,7 +4622,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "property": { @@ -4772,7 +4632,6 @@ "ctxt": 0 }, "value": "readonlyType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4806,6 +4665,7 @@ "ctxt": 0 }, "value": "constInitToLReadonlyNestedTypeWithIndexedAccess", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4844,7 +4704,6 @@ "ctxt": 0 }, "value": "L", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4895,8 +4754,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -4920,7 +4778,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "property": { @@ -4931,7 +4788,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4944,7 +4800,6 @@ "ctxt": 0 }, "value": "readonlyNestedType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4978,8 +4833,8 @@ "ctxt": 0 }, "value": "promiseForConstCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -5003,7 +4858,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "property": { @@ -5014,7 +4868,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5030,7 +4883,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false } } @@ -5066,8 +4918,8 @@ "ctxt": 0 }, "value": "arrayOfConstCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -5087,7 +4939,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false } } @@ -5122,6 +4973,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5147,8 +4999,7 @@ "kind": "symbol" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5172,7 +5023,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { @@ -5208,6 +5058,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5233,8 +5084,7 @@ "kind": "symbol" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5269,6 +5119,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5300,7 +5151,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": true, @@ -5362,7 +5212,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -5373,7 +5222,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5416,8 +5264,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -5434,7 +5281,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5455,6 +5301,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5477,13 +5324,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5519,7 +5364,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5549,7 +5393,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5566,7 +5409,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5587,6 +5429,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5609,12 +5452,10 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5656,7 +5497,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5677,6 +5517,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5701,7 +5542,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "right": { @@ -5712,13 +5552,11 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } } } ], @@ -5772,7 +5610,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5786,7 +5623,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -5816,7 +5652,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5837,7 +5672,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -5848,7 +5682,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5880,7 +5713,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5901,7 +5733,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -5950,7 +5781,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -5989,7 +5819,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -6000,7 +5829,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6041,7 +5869,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -6089,8 +5916,8 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -6110,7 +5937,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -6121,7 +5947,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -6135,7 +5960,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -6153,7 +5977,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -6164,7 +5987,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6180,7 +6002,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -6198,7 +6019,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -6228,7 +6048,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "params": [], @@ -6261,7 +6080,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -6282,7 +6100,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "params": [], @@ -6315,7 +6132,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -6336,7 +6152,6 @@ "ctxt": 0 }, "value": "method3", - "typeAnnotation": null, "optional": false }, "params": [], @@ -6376,7 +6191,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -6399,7 +6213,6 @@ "ctxt": 0 }, "value": "method4", - "typeAnnotation": null, "optional": false }, "params": [], @@ -6439,7 +6252,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -6462,7 +6274,6 @@ "ctxt": 0 }, "value": "method5", - "typeAnnotation": null, "optional": false }, "params": [ @@ -6489,8 +6300,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6500,7 +6311,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -6536,7 +6346,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -6563,7 +6372,6 @@ "ctxt": 0 }, "value": "C0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6589,7 +6397,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -6600,7 +6407,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -6629,7 +6435,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -6647,7 +6452,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -6658,7 +6462,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6689,7 +6492,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -6707,7 +6509,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -6752,7 +6553,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -6763,7 +6563,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -6792,7 +6591,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": { @@ -6810,7 +6608,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -6821,7 +6618,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6852,7 +6648,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -6870,7 +6665,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -6915,7 +6709,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -6926,7 +6719,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -6955,7 +6747,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -6973,7 +6764,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -6984,7 +6774,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7015,7 +6804,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -7033,7 +6821,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -7078,7 +6865,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -7089,7 +6875,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -7118,7 +6903,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": { @@ -7136,7 +6920,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -7147,7 +6930,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7178,7 +6960,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -7196,7 +6977,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -7241,7 +7021,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "function": { @@ -7275,7 +7054,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -7307,7 +7085,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "function": { @@ -7341,7 +7118,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -7373,7 +7149,6 @@ "ctxt": 0 }, "value": "method3", - "typeAnnotation": null, "optional": false }, "function": { @@ -7414,7 +7189,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -7448,7 +7222,6 @@ "ctxt": 0 }, "value": "method4", - "typeAnnotation": null, "optional": false }, "function": { @@ -7489,7 +7262,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -7523,7 +7295,6 @@ "ctxt": 0 }, "value": "method5", - "typeAnnotation": null, "optional": false }, "function": { @@ -7551,8 +7322,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -7562,7 +7333,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -7598,7 +7368,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -7644,7 +7413,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -7655,7 +7423,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": true @@ -7683,7 +7450,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -7701,7 +7467,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -7712,7 +7477,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7742,7 +7506,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -7760,7 +7523,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -7804,7 +7566,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7818,7 +7579,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -7846,7 +7606,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -7876,7 +7635,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7897,7 +7655,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -7908,7 +7665,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7940,7 +7696,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "right": { @@ -7951,7 +7706,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -7982,7 +7736,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8003,7 +7756,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -8049,7 +7801,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "right": { @@ -8060,7 +7811,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -8091,7 +7841,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8105,7 +7854,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -8135,7 +7883,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8156,7 +7903,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -8167,7 +7913,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8199,7 +7944,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8220,7 +7964,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -8267,7 +8010,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -8316,7 +8058,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -8327,7 +8068,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8378,7 +8118,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -8457,7 +8196,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -8468,7 +8206,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8494,7 +8231,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -8557,7 +8293,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -8568,7 +8303,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8601,7 +8335,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -8612,7 +8345,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8677,7 +8409,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -8688,7 +8419,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8721,7 +8451,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -8795,7 +8524,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -8838,7 +8566,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -8849,7 +8576,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8884,7 +8610,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8910,7 +8635,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": null, @@ -8976,7 +8700,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -8987,7 +8710,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9048,7 +8770,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": null, @@ -9114,7 +8835,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -9125,7 +8845,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9193,7 +8912,6 @@ "ctxt": 0 }, "value": "Context", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9223,7 +8941,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9251,7 +8968,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -9274,7 +8990,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9302,7 +9017,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9328,7 +9042,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -9354,7 +9067,6 @@ "ctxt": 0 }, "value": "method3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9382,7 +9094,6 @@ "ctxt": 0 }, "value": "AsyncIterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9408,7 +9119,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -9434,7 +9144,6 @@ "ctxt": 0 }, "value": "method4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9462,7 +9171,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9488,7 +9196,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -9514,7 +9221,6 @@ "ctxt": 0 }, "value": "method5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9528,6 +9234,7 @@ "ctxt": 0 }, "value": "p", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9550,12 +9257,10 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } - }, - "optional": true + } } ], "typeAnn": { @@ -9580,7 +9285,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -9615,6 +9319,7 @@ "ctxt": 0 }, "value": "o3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9637,13 +9342,11 @@ "ctxt": 0 }, "value": "Context", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -9663,7 +9366,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "params": [], @@ -9696,7 +9398,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -9717,7 +9418,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "params": [], @@ -9750,7 +9450,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -9771,7 +9470,6 @@ "ctxt": 0 }, "value": "method3", - "typeAnnotation": null, "optional": false }, "params": [], @@ -9811,7 +9509,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -9834,7 +9531,6 @@ "ctxt": 0 }, "value": "method4", - "typeAnnotation": null, "optional": false }, "params": [], @@ -9874,7 +9570,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -9897,7 +9592,6 @@ "ctxt": 0 }, "value": "method5", - "typeAnnotation": null, "optional": false }, "params": [ @@ -9924,8 +9618,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -9935,7 +9629,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -9971,7 +9664,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -10013,8 +9705,8 @@ "ctxt": 0 }, "value": "o4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -10034,7 +9726,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "params": [ @@ -10054,6 +9745,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10076,12 +9768,10 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -10114,7 +9804,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -10145,7 +9834,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -10161,7 +9849,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "params": [ @@ -10181,6 +9868,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10211,7 +9899,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10239,8 +9926,7 @@ } } } - }, - "optional": false + } } } ], @@ -10273,7 +9959,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -10312,7 +9997,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10373,8 +10057,8 @@ "ctxt": 0 }, "value": "ce0", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ClassExpression", @@ -10401,7 +10085,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "function": { @@ -10422,6 +10105,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10444,12 +10128,10 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -10482,7 +10164,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -10513,7 +10194,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -10540,7 +10220,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "function": { @@ -10561,6 +10240,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10591,7 +10271,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10619,8 +10298,7 @@ } } } - }, - "optional": false + } } } ], @@ -10653,7 +10331,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -10692,7 +10369,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -10749,7 +10425,6 @@ "ctxt": 0 }, "value": "funcInferredReturnType", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -10770,6 +10445,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10801,7 +10477,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -10815,6 +10490,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -10837,12 +10513,10 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } ], "typeAnn": { @@ -10866,8 +10540,7 @@ } ] } - }, - "optional": false + } } } ], @@ -10900,7 +10573,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/uniqueSymbol/uniqueSymbolsDeclarations/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/uniqueSymbol/uniqueSymbolsDeclarations/input.ts.json index d6ce841b38b7..6364b415f680 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/uniqueSymbol/uniqueSymbolsDeclarations/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/uniqueSymbol/uniqueSymbolsDeclarations/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -49,7 +49,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -84,8 +83,8 @@ "ctxt": 0 }, "value": "letCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -102,7 +101,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -137,8 +135,8 @@ "ctxt": 0 }, "value": "varCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -155,7 +153,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -190,6 +187,7 @@ "ctxt": 0 }, "value": "constType", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -215,8 +213,7 @@ "kind": "symbol" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -248,6 +245,7 @@ "ctxt": 0 }, "value": "constTypeAndCall", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -273,8 +271,7 @@ "kind": "symbol" } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -291,7 +288,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -326,8 +322,8 @@ "ctxt": 0 }, "value": "constInitToConstCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -337,7 +333,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false }, "definite": false @@ -369,8 +364,8 @@ "ctxt": 0 }, "value": "constInitToLetCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -380,7 +375,6 @@ "ctxt": 0 }, "value": "letCall", - "typeAnnotation": null, "optional": false }, "definite": false @@ -412,8 +406,8 @@ "ctxt": 0 }, "value": "constInitToVarCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -423,7 +417,6 @@ "ctxt": 0 }, "value": "varCall", - "typeAnnotation": null, "optional": false }, "definite": false @@ -455,8 +448,8 @@ "ctxt": 0 }, "value": "constInitToConstDeclAmbient", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -466,7 +459,6 @@ "ctxt": 0 }, "value": "constType", - "typeAnnotation": null, "optional": false }, "definite": false @@ -498,8 +490,8 @@ "ctxt": 0 }, "value": "letInitToConstCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -509,7 +501,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false }, "definite": false @@ -541,8 +532,8 @@ "ctxt": 0 }, "value": "letInitToLetCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -552,7 +543,6 @@ "ctxt": 0 }, "value": "letCall", - "typeAnnotation": null, "optional": false }, "definite": false @@ -584,8 +574,8 @@ "ctxt": 0 }, "value": "letInitToVarCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -595,7 +585,6 @@ "ctxt": 0 }, "value": "varCall", - "typeAnnotation": null, "optional": false }, "definite": false @@ -627,8 +616,8 @@ "ctxt": 0 }, "value": "letInitToConstDeclAmbient", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -638,7 +627,6 @@ "ctxt": 0 }, "value": "constType", - "typeAnnotation": null, "optional": false }, "definite": false @@ -670,8 +658,8 @@ "ctxt": 0 }, "value": "varInitToConstCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -681,7 +669,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false }, "definite": false @@ -713,8 +700,8 @@ "ctxt": 0 }, "value": "varInitToLetCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -724,7 +711,6 @@ "ctxt": 0 }, "value": "letCall", - "typeAnnotation": null, "optional": false }, "definite": false @@ -756,8 +742,8 @@ "ctxt": 0 }, "value": "varInitToVarCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -767,7 +753,6 @@ "ctxt": 0 }, "value": "varCall", - "typeAnnotation": null, "optional": false }, "definite": false @@ -799,8 +784,8 @@ "ctxt": 0 }, "value": "varInitToConstDeclAmbient", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -810,7 +795,6 @@ "ctxt": 0 }, "value": "constType", - "typeAnnotation": null, "optional": false }, "definite": false @@ -842,6 +826,7 @@ "ctxt": 0 }, "value": "constInitToConstCallWithTypeQuery", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -864,12 +849,10 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -879,7 +862,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false }, "definite": false @@ -911,6 +893,7 @@ "ctxt": 0 }, "value": "constInitToConstDeclAmbientWithTypeQuery", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -933,12 +916,10 @@ "ctxt": 0 }, "value": "constType", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -948,7 +929,6 @@ "ctxt": 0 }, "value": "constType", - "typeAnnotation": null, "optional": false }, "definite": false @@ -965,7 +945,6 @@ "ctxt": 0 }, "value": "funcReturnConstCall", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -999,7 +978,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false } } @@ -1020,7 +998,6 @@ "ctxt": 0 }, "value": "funcReturnLetCall", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1054,7 +1031,6 @@ "ctxt": 0 }, "value": "letCall", - "typeAnnotation": null, "optional": false } } @@ -1075,7 +1051,6 @@ "ctxt": 0 }, "value": "funcReturnVarCall", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1109,7 +1084,6 @@ "ctxt": 0 }, "value": "varCall", - "typeAnnotation": null, "optional": false } } @@ -1130,7 +1104,6 @@ "ctxt": 0 }, "value": "funcReturnConstCallWithTypeQuery", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1164,7 +1137,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false } } @@ -1195,7 +1167,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false } } @@ -1211,7 +1182,6 @@ "ctxt": 0 }, "value": "genFuncYieldConstCall", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1252,7 +1222,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -1275,7 +1244,6 @@ "ctxt": 0 }, "value": "genFuncYieldLetCall", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1316,7 +1284,6 @@ "ctxt": 0 }, "value": "letCall", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -1339,7 +1306,6 @@ "ctxt": 0 }, "value": "genFuncYieldVarCall", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1380,7 +1346,6 @@ "ctxt": 0 }, "value": "varCall", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -1403,7 +1368,6 @@ "ctxt": 0 }, "value": "genFuncYieldConstCallWithTypeQuery", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1444,7 +1408,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -1477,7 +1440,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1503,7 +1465,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false } } @@ -1522,7 +1483,6 @@ "ctxt": 0 }, "value": "asyncFuncReturnConstCall", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1556,7 +1516,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false } } @@ -1577,7 +1536,6 @@ "ctxt": 0 }, "value": "asyncFuncReturnLetCall", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1611,7 +1569,6 @@ "ctxt": 0 }, "value": "letCall", - "typeAnnotation": null, "optional": false } } @@ -1632,7 +1589,6 @@ "ctxt": 0 }, "value": "asyncFuncReturnVarCall", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1666,7 +1622,6 @@ "ctxt": 0 }, "value": "varCall", - "typeAnnotation": null, "optional": false } } @@ -1687,7 +1642,6 @@ "ctxt": 0 }, "value": "asyncGenFuncYieldConstCall", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1728,7 +1682,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -1751,7 +1704,6 @@ "ctxt": 0 }, "value": "asyncGenFuncYieldLetCall", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1792,7 +1744,6 @@ "ctxt": 0 }, "value": "letCall", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -1815,7 +1766,6 @@ "ctxt": 0 }, "value": "asyncGenFuncYieldVarCall", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1856,7 +1806,6 @@ "ctxt": 0 }, "value": "varCall", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -1879,7 +1828,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1905,7 +1853,6 @@ "ctxt": 0 }, "value": "readonlyStaticCall", - "typeAnnotation": null, "optional": false }, "value": { @@ -1923,7 +1870,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -1955,7 +1901,6 @@ "ctxt": 0 }, "value": "readonlyStaticType", - "typeAnnotation": null, "optional": false }, "value": null, @@ -2010,7 +1955,6 @@ "ctxt": 0 }, "value": "readonlyStaticTypeAndCall", - "typeAnnotation": null, "optional": false }, "value": { @@ -2028,7 +1972,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2085,7 +2028,6 @@ "ctxt": 0 }, "value": "readwriteStaticCall", - "typeAnnotation": null, "optional": false }, "value": { @@ -2103,7 +2045,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2135,7 +2076,6 @@ "ctxt": 0 }, "value": "readonlyCall", - "typeAnnotation": null, "optional": false }, "value": { @@ -2153,7 +2093,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2185,7 +2124,6 @@ "ctxt": 0 }, "value": "readwriteCall", - "typeAnnotation": null, "optional": false }, "value": { @@ -2203,7 +2141,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2252,6 +2189,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2274,13 +2212,11 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -2312,8 +2248,8 @@ "ctxt": 0 }, "value": "constInitToCReadonlyStaticCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2330,7 +2266,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -2341,7 +2276,6 @@ "ctxt": 0 }, "value": "readonlyStaticCall", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2375,8 +2309,8 @@ "ctxt": 0 }, "value": "constInitToCReadonlyStaticType", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2393,7 +2327,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -2404,7 +2337,6 @@ "ctxt": 0 }, "value": "readonlyStaticType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2438,8 +2370,8 @@ "ctxt": 0 }, "value": "constInitToCReadonlyStaticTypeAndCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2456,7 +2388,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -2467,7 +2398,6 @@ "ctxt": 0 }, "value": "readonlyStaticTypeAndCall", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2501,8 +2431,8 @@ "ctxt": 0 }, "value": "constInitToCReadwriteStaticCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2519,7 +2449,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -2530,7 +2459,6 @@ "ctxt": 0 }, "value": "readwriteStaticCall", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2564,6 +2492,7 @@ "ctxt": 0 }, "value": "constInitToCReadonlyStaticCallWithTypeQuery", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2588,7 +2517,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "right": { @@ -2599,13 +2527,11 @@ "ctxt": 0 }, "value": "readonlyStaticCall", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -2622,7 +2548,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -2633,7 +2558,6 @@ "ctxt": 0 }, "value": "readonlyStaticCall", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2667,6 +2591,7 @@ "ctxt": 0 }, "value": "constInitToCReadonlyStaticTypeWithTypeQuery", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2691,7 +2616,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "right": { @@ -2702,13 +2626,11 @@ "ctxt": 0 }, "value": "readonlyStaticType", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -2725,7 +2647,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -2736,7 +2657,6 @@ "ctxt": 0 }, "value": "readonlyStaticType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2770,6 +2690,7 @@ "ctxt": 0 }, "value": "constInitToCReadonlyStaticTypeAndCallWithTypeQuery", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2794,7 +2715,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "right": { @@ -2805,13 +2725,11 @@ "ctxt": 0 }, "value": "readonlyStaticTypeAndCall", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -2828,7 +2746,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -2839,7 +2756,6 @@ "ctxt": 0 }, "value": "readonlyStaticTypeAndCall", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2873,6 +2789,7 @@ "ctxt": 0 }, "value": "constInitToCReadwriteStaticCallWithTypeQuery", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2897,7 +2814,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "right": { @@ -2908,13 +2824,11 @@ "ctxt": 0 }, "value": "readwriteStaticCall", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -2931,7 +2845,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "property": { @@ -2942,7 +2855,6 @@ "ctxt": 0 }, "value": "readwriteStaticCall", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2976,8 +2888,8 @@ "ctxt": 0 }, "value": "constInitToCReadonlyCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -2994,7 +2906,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3005,7 +2916,6 @@ "ctxt": 0 }, "value": "readonlyCall", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3039,8 +2949,8 @@ "ctxt": 0 }, "value": "constInitToCReadwriteCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3057,7 +2967,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3068,7 +2977,6 @@ "ctxt": 0 }, "value": "readwriteCall", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3102,6 +3010,7 @@ "ctxt": 0 }, "value": "constInitToCReadonlyCallWithTypeQuery", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3126,7 +3035,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3137,13 +3045,11 @@ "ctxt": 0 }, "value": "readonlyCall", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -3160,7 +3066,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3171,7 +3076,6 @@ "ctxt": 0 }, "value": "readonlyCall", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3205,6 +3109,7 @@ "ctxt": 0 }, "value": "constInitToCReadwriteCallWithTypeQuery", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3229,7 +3134,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "right": { @@ -3240,13 +3144,11 @@ "ctxt": 0 }, "value": "readwriteCall", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -3263,7 +3165,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3274,7 +3175,6 @@ "ctxt": 0 }, "value": "readwriteCall", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3308,6 +3208,7 @@ "ctxt": 0 }, "value": "constInitToCReadonlyCallWithIndexedAccess", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3338,7 +3239,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3366,8 +3266,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -3384,7 +3283,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3395,7 +3293,6 @@ "ctxt": 0 }, "value": "readonlyCall", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3429,6 +3326,7 @@ "ctxt": 0 }, "value": "constInitToCReadwriteCallWithIndexedAccess", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3459,7 +3357,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3487,8 +3384,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -3505,7 +3401,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "property": { @@ -3516,7 +3411,6 @@ "ctxt": 0 }, "value": "readwriteCall", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3540,7 +3434,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3570,7 +3463,6 @@ "ctxt": 0 }, "value": "readonlyType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -3633,6 +3525,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3655,13 +3548,11 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -3693,8 +3584,8 @@ "ctxt": 0 }, "value": "constInitToIReadonlyType", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -3711,7 +3602,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -3722,7 +3612,6 @@ "ctxt": 0 }, "value": "readonlyType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3756,6 +3645,7 @@ "ctxt": 0 }, "value": "constInitToIReadonlyTypeWithTypeQuery", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3780,7 +3670,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "right": { @@ -3791,13 +3680,11 @@ "ctxt": 0 }, "value": "readonlyType", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -3814,7 +3701,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -3825,7 +3711,6 @@ "ctxt": 0 }, "value": "readonlyType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3859,6 +3744,7 @@ "ctxt": 0 }, "value": "constInitToIReadonlyTypeWithIndexedAccess", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3889,7 +3775,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3917,8 +3802,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -3935,7 +3819,6 @@ "ctxt": 0 }, "value": "i", - "typeAnnotation": null, "optional": false }, "property": { @@ -3946,7 +3829,6 @@ "ctxt": 0 }, "value": "readonlyType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3971,7 +3853,6 @@ "ctxt": 0 }, "value": "L", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3999,7 +3880,6 @@ "ctxt": 0 }, "value": "readonlyType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4050,7 +3930,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4088,7 +3967,6 @@ "ctxt": 0 }, "value": "readonlyNestedType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4156,6 +4034,7 @@ "ctxt": 0 }, "value": "l", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4178,13 +4057,11 @@ "ctxt": 0 }, "value": "L", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false @@ -4216,8 +4093,8 @@ "ctxt": 0 }, "value": "constInitToLReadonlyType", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -4234,7 +4111,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "property": { @@ -4245,7 +4121,6 @@ "ctxt": 0 }, "value": "readonlyType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4279,8 +4154,8 @@ "ctxt": 0 }, "value": "constInitToLReadonlyNestedType", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -4304,7 +4179,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "property": { @@ -4315,7 +4189,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4328,7 +4201,6 @@ "ctxt": 0 }, "value": "readonlyNestedType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4362,6 +4234,7 @@ "ctxt": 0 }, "value": "constInitToLReadonlyTypeWithTypeQuery", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4386,7 +4259,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "right": { @@ -4397,13 +4269,11 @@ "ctxt": 0 }, "value": "readonlyType", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -4420,7 +4290,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "property": { @@ -4431,7 +4300,6 @@ "ctxt": 0 }, "value": "readonlyType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4465,6 +4333,7 @@ "ctxt": 0 }, "value": "constInitToLReadonlyNestedTypeWithTypeQuery", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4491,7 +4360,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "right": { @@ -4502,7 +4370,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false } }, @@ -4514,13 +4381,11 @@ "ctxt": 0 }, "value": "readonlyNestedType", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -4544,7 +4409,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "property": { @@ -4555,7 +4419,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4568,7 +4431,6 @@ "ctxt": 0 }, "value": "readonlyNestedType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4602,6 +4464,7 @@ "ctxt": 0 }, "value": "constInitToLReadonlyTypeWithIndexedAccess", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4632,7 +4495,6 @@ "ctxt": 0 }, "value": "L", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4660,8 +4522,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -4678,7 +4539,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "property": { @@ -4689,7 +4549,6 @@ "ctxt": 0 }, "value": "readonlyType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4723,6 +4582,7 @@ "ctxt": 0 }, "value": "constInitToLReadonlyNestedTypeWithIndexedAccess", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4761,7 +4621,6 @@ "ctxt": 0 }, "value": "L", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -4812,8 +4671,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "MemberExpression", @@ -4837,7 +4695,6 @@ "ctxt": 0 }, "value": "l", - "typeAnnotation": null, "optional": false }, "property": { @@ -4848,7 +4705,6 @@ "ctxt": 0 }, "value": "nested", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4861,7 +4717,6 @@ "ctxt": 0 }, "value": "readonlyNestedType", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4895,8 +4750,8 @@ "ctxt": 0 }, "value": "promiseForConstCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4920,7 +4775,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "property": { @@ -4931,7 +4785,6 @@ "ctxt": 0 }, "value": "resolve", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4947,7 +4800,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false } } @@ -4983,8 +4835,8 @@ "ctxt": 0 }, "value": "arrayOfConstCall", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ArrayExpression", @@ -5004,7 +4856,6 @@ "ctxt": 0 }, "value": "constCall", - "typeAnnotation": null, "optional": false } } @@ -5039,6 +4890,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5064,8 +4916,7 @@ "kind": "symbol" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5089,7 +4940,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "body": { @@ -5125,6 +4975,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5150,8 +5001,7 @@ "kind": "symbol" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -5186,6 +5036,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5217,7 +5068,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": true, @@ -5279,7 +5129,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -5290,7 +5139,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5333,8 +5181,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -5351,7 +5198,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5372,6 +5218,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5394,13 +5241,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -5436,7 +5281,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -5466,7 +5310,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -5483,7 +5326,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5504,6 +5346,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5526,12 +5369,10 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -5573,7 +5414,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -5594,6 +5434,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5618,7 +5459,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "right": { @@ -5629,13 +5469,11 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } } } ], @@ -5689,7 +5527,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5703,7 +5540,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -5733,7 +5569,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5754,7 +5589,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -5765,7 +5599,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5797,7 +5630,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -5818,7 +5650,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -5867,7 +5698,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -5906,7 +5736,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -5917,7 +5746,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5958,7 +5786,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -6006,8 +5833,8 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -6027,7 +5854,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -6038,7 +5864,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -6052,7 +5877,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -6070,7 +5894,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -6081,7 +5904,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6097,7 +5919,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -6115,7 +5936,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -6145,7 +5965,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "params": [], @@ -6178,7 +5997,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -6199,7 +6017,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "params": [], @@ -6232,7 +6049,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -6253,7 +6069,6 @@ "ctxt": 0 }, "value": "method3", - "typeAnnotation": null, "optional": false }, "params": [], @@ -6293,7 +6108,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -6316,7 +6130,6 @@ "ctxt": 0 }, "value": "method4", - "typeAnnotation": null, "optional": false }, "params": [], @@ -6356,7 +6169,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -6379,7 +6191,6 @@ "ctxt": 0 }, "value": "method5", - "typeAnnotation": null, "optional": false }, "params": [ @@ -6406,8 +6217,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -6417,7 +6228,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -6453,7 +6263,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -6480,7 +6289,6 @@ "ctxt": 0 }, "value": "C0", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6506,7 +6314,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -6517,7 +6324,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -6546,7 +6352,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -6564,7 +6369,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -6575,7 +6379,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6606,7 +6409,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -6624,7 +6426,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -6669,7 +6470,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -6680,7 +6480,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -6709,7 +6508,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": { @@ -6727,7 +6525,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -6738,7 +6535,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6769,7 +6565,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -6787,7 +6582,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -6832,7 +6626,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -6843,7 +6636,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -6872,7 +6664,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": { @@ -6890,7 +6681,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -6901,7 +6691,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -6932,7 +6721,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": { @@ -6950,7 +6738,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -6995,7 +6782,6 @@ "ctxt": 0 }, "value": "d", - "typeAnnotation": null, "optional": false }, "value": { @@ -7006,7 +6792,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null, @@ -7035,7 +6820,6 @@ "ctxt": 0 }, "value": "e", - "typeAnnotation": null, "optional": false }, "value": { @@ -7053,7 +6837,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -7064,7 +6847,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7095,7 +6877,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "value": { @@ -7113,7 +6894,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -7158,7 +6938,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "function": { @@ -7192,7 +6971,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -7224,7 +7002,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "function": { @@ -7258,7 +7035,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -7290,7 +7066,6 @@ "ctxt": 0 }, "value": "method3", - "typeAnnotation": null, "optional": false }, "function": { @@ -7331,7 +7106,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -7365,7 +7139,6 @@ "ctxt": 0 }, "value": "method4", - "typeAnnotation": null, "optional": false }, "function": { @@ -7406,7 +7179,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -7440,7 +7212,6 @@ "ctxt": 0 }, "value": "method5", - "typeAnnotation": null, "optional": false }, "function": { @@ -7468,8 +7239,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -7479,7 +7250,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -7515,7 +7285,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -7561,7 +7330,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -7572,7 +7340,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": true @@ -7600,7 +7367,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -7618,7 +7384,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -7629,7 +7394,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7659,7 +7423,6 @@ "ctxt": 0 }, "value": "o", - "typeAnnotation": null, "optional": false }, "property": { @@ -7677,7 +7440,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -7721,7 +7483,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7735,7 +7496,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -7763,7 +7523,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -7793,7 +7552,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7814,7 +7572,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -7825,7 +7582,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -7857,7 +7613,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "right": { @@ -7868,7 +7623,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -7899,7 +7653,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7920,7 +7673,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -7966,7 +7718,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "right": { @@ -7977,7 +7728,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -8008,7 +7758,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8022,7 +7771,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -8052,7 +7800,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8073,7 +7820,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -8084,7 +7830,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8116,7 +7861,6 @@ "ctxt": 0 }, "value": "g", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8137,7 +7881,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -8184,7 +7927,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "right": { @@ -8233,7 +7975,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -8244,7 +7985,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8295,7 +8035,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -8374,7 +8113,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -8385,7 +8123,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8411,7 +8148,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -8474,7 +8210,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -8485,7 +8220,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8518,7 +8252,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -8529,7 +8262,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8594,7 +8326,6 @@ "ctxt": 0 }, "value": "Math", - "typeAnnotation": null, "optional": false }, "property": { @@ -8605,7 +8336,6 @@ "ctxt": 0 }, "value": "random", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8638,7 +8368,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -8712,7 +8441,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -8755,7 +8483,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -8766,7 +8493,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8801,7 +8527,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8827,7 +8552,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": null, @@ -8893,7 +8617,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -8904,7 +8627,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8965,7 +8687,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": null, @@ -9031,7 +8752,6 @@ "ctxt": 0 }, "value": "N", - "typeAnnotation": null, "optional": false }, "property": { @@ -9042,7 +8762,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9110,7 +8829,6 @@ "ctxt": 0 }, "value": "Context", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -9140,7 +8858,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9168,7 +8885,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -9191,7 +8907,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9219,7 +8934,6 @@ "ctxt": 0 }, "value": "Promise", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9245,7 +8959,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -9271,7 +8984,6 @@ "ctxt": 0 }, "value": "method3", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9299,7 +9011,6 @@ "ctxt": 0 }, "value": "AsyncIterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9325,7 +9036,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -9351,7 +9061,6 @@ "ctxt": 0 }, "value": "method4", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9379,7 +9088,6 @@ "ctxt": 0 }, "value": "IterableIterator", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -9405,7 +9113,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -9431,7 +9138,6 @@ "ctxt": 0 }, "value": "method5", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -9445,6 +9151,7 @@ "ctxt": 0 }, "value": "p", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9467,12 +9174,10 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } - }, - "optional": true + } } ], "typeAnn": { @@ -9497,7 +9202,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -9532,6 +9236,7 @@ "ctxt": 0 }, "value": "o4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9554,13 +9259,11 @@ "ctxt": 0 }, "value": "Context", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "ObjectExpression", @@ -9580,7 +9283,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "params": [], @@ -9613,7 +9315,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -9634,7 +9335,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "params": [], @@ -9667,7 +9367,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -9688,7 +9387,6 @@ "ctxt": 0 }, "value": "method3", - "typeAnnotation": null, "optional": false }, "params": [], @@ -9728,7 +9426,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -9751,7 +9448,6 @@ "ctxt": 0 }, "value": "method4", - "typeAnnotation": null, "optional": false }, "params": [], @@ -9791,7 +9487,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "delegate": false @@ -9814,7 +9509,6 @@ "ctxt": 0 }, "value": "method5", - "typeAnnotation": null, "optional": false }, "params": [ @@ -9841,8 +9535,8 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -9852,7 +9546,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -9888,7 +9581,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/tsc/types/uniqueSymbol/uniqueSymbolsDeclarationsErrors/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/uniqueSymbol/uniqueSymbolsDeclarationsErrors/input.ts.json index 6ab8e6125bba..bf03b851f0c8 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/uniqueSymbol/uniqueSymbolsDeclarationsErrors/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/uniqueSymbol/uniqueSymbolsDeclarationsErrors/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "s", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -56,8 +57,7 @@ "kind": "symbol" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -79,7 +79,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -109,7 +108,6 @@ "ctxt": 0 }, "value": "readonlyType", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -179,8 +177,8 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -200,7 +198,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "params": [ @@ -220,6 +217,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -242,12 +240,10 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -280,7 +276,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -311,7 +306,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -327,7 +321,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "params": [ @@ -347,6 +340,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -377,7 +371,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -405,8 +398,7 @@ } } } - }, - "optional": false + } } } ], @@ -439,7 +431,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -478,7 +469,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -547,8 +537,8 @@ "ctxt": 0 }, "value": "classExpression", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ClassExpression", @@ -575,7 +565,6 @@ "ctxt": 0 }, "value": "method1", - "typeAnnotation": null, "optional": false }, "function": { @@ -596,6 +585,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -618,12 +608,10 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } } ], @@ -656,7 +644,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -687,7 +674,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } @@ -714,7 +700,6 @@ "ctxt": 0 }, "value": "method2", - "typeAnnotation": null, "optional": false }, "function": { @@ -735,6 +720,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -765,7 +751,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -793,8 +778,7 @@ } } } - }, - "optional": false + } } } ], @@ -827,7 +811,6 @@ "ctxt": 0 }, "value": "p", - "typeAnnotation": null, "optional": false } } @@ -866,7 +849,6 @@ "ctxt": 0 }, "value": "I", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -931,7 +913,6 @@ "ctxt": 0 }, "value": "funcInferredReturnType", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -952,6 +933,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -983,7 +965,6 @@ "ctxt": 0 }, "value": "method", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -997,6 +978,7 @@ "ctxt": 0 }, "value": "p", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1019,12 +1001,10 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } ], "typeAnn": { @@ -1048,8 +1028,7 @@ } ] } - }, - "optional": false + } } } ], @@ -1082,7 +1061,6 @@ "ctxt": 0 }, "value": "obj", - "typeAnnotation": null, "optional": false } } @@ -1116,7 +1094,6 @@ "ctxt": 0 }, "value": "InterfaceWithPrivateNamedProperties", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1146,7 +1123,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": true, @@ -1198,7 +1174,6 @@ "ctxt": 0 }, "value": "InterfaceWithPrivateNamedMethods", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1228,7 +1203,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": true, @@ -1280,7 +1254,6 @@ "ctxt": 0 }, "value": "TypeLiteralWithPrivateNamedProperties", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1308,7 +1281,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": true, @@ -1361,7 +1333,6 @@ "ctxt": 0 }, "value": "TypeLiteralWithPrivateNamedMethods", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1389,7 +1360,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "computed": true, @@ -1435,7 +1405,6 @@ "ctxt": 0 }, "value": "ClassWithPrivateNamedProperties", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1461,7 +1430,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1507,7 +1475,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false }, "value": null, @@ -1563,7 +1530,6 @@ "ctxt": 0 }, "value": "ClassWithPrivateNamedMethods", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1596,7 +1562,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -1650,7 +1615,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -1707,7 +1671,6 @@ "ctxt": 0 }, "value": "ClassWithPrivateNamedAccessors", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -1740,7 +1703,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -1775,7 +1737,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -1830,7 +1791,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -1852,6 +1812,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1868,8 +1829,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -1921,7 +1881,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -1956,7 +1915,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -2011,7 +1969,6 @@ "ctxt": 0 }, "value": "s", - "typeAnnotation": null, "optional": false } }, @@ -2033,6 +1990,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2049,8 +2007,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], diff --git a/ecmascript/parser/tests/typescript/tsc/types/uniqueSymbol/uniqueSymbolsDeclarationsInJs/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/uniqueSymbol/uniqueSymbolsDeclarationsInJs/input.ts.json index 13fa7f5d0a41..c5740d2fa793 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/uniqueSymbol/uniqueSymbolsDeclarationsInJs/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/uniqueSymbol/uniqueSymbolsDeclarationsInJs/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "readonlyStaticCall", - "typeAnnotation": null, "optional": false }, "value": { @@ -60,7 +58,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -92,7 +89,6 @@ "ctxt": 0 }, "value": "readonlyStaticType", - "typeAnnotation": null, "optional": false }, "value": null, @@ -122,7 +118,6 @@ "ctxt": 0 }, "value": "readonlyStaticTypeAndCall", - "typeAnnotation": null, "optional": false }, "value": { @@ -140,7 +135,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -172,7 +166,6 @@ "ctxt": 0 }, "value": "readwriteStaticCall", - "typeAnnotation": null, "optional": false }, "value": { @@ -190,7 +183,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -222,7 +214,6 @@ "ctxt": 0 }, "value": "readonlyCall", - "typeAnnotation": null, "optional": false }, "value": { @@ -240,7 +231,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -272,7 +262,6 @@ "ctxt": 0 }, "value": "readwriteCall", - "typeAnnotation": null, "optional": false }, "value": { @@ -290,7 +279,6 @@ "ctxt": 0 }, "value": "Symbol", - "typeAnnotation": null, "optional": false }, "arguments": [], diff --git a/ecmascript/parser/tests/typescript/tsc/types/uniqueSymbol/uniqueSymbolsDeclarationsInJsErrors/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/uniqueSymbol/uniqueSymbolsDeclarationsInJsErrors/input.ts.json index cb145f6d3849..883b1b6cba0e 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/uniqueSymbol/uniqueSymbolsDeclarationsInJsErrors/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/uniqueSymbol/uniqueSymbolsDeclarationsInJsErrors/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -42,7 +41,6 @@ "ctxt": 0 }, "value": "readwriteStaticType", - "typeAnnotation": null, "optional": false }, "value": null, @@ -72,7 +70,6 @@ "ctxt": 0 }, "value": "readonlyType", - "typeAnnotation": null, "optional": false }, "value": null, @@ -102,7 +99,6 @@ "ctxt": 0 }, "value": "readwriteType", - "typeAnnotation": null, "optional": false }, "value": null, diff --git a/ecmascript/parser/tests/typescript/tsc/types/unknown/unknownType1/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/unknown/unknownType1/input.ts.json index 49c8b9bc10dc..20b3476e3cf4 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/unknown/unknownType1/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/unknown/unknownType1/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "T00", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -71,7 +70,6 @@ "ctxt": 0 }, "value": "T01", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -120,7 +118,6 @@ "ctxt": 0 }, "value": "T02", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -178,7 +175,6 @@ "ctxt": 0 }, "value": "T03", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -227,7 +223,6 @@ "ctxt": 0 }, "value": "T04", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -284,7 +279,6 @@ "ctxt": 0 }, "value": "T05", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -333,7 +327,6 @@ "ctxt": 0 }, "value": "T06", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -382,7 +375,6 @@ "ctxt": 0 }, "value": "T10", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -431,7 +423,6 @@ "ctxt": 0 }, "value": "T11", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -480,7 +471,6 @@ "ctxt": 0 }, "value": "T12", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -538,7 +528,6 @@ "ctxt": 0 }, "value": "T13", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -587,7 +576,6 @@ "ctxt": 0 }, "value": "T14", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -644,7 +632,6 @@ "ctxt": 0 }, "value": "T15", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -693,7 +680,6 @@ "ctxt": 0 }, "value": "T16", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -742,7 +728,6 @@ "ctxt": 0 }, "value": "T20", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -768,7 +753,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -799,7 +783,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -832,7 +815,6 @@ "ctxt": 0 }, "value": "T21", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -858,7 +840,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -889,7 +870,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -922,7 +902,6 @@ "ctxt": 0 }, "value": "T22", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -948,7 +927,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -979,7 +957,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1012,7 +989,6 @@ "ctxt": 0 }, "value": "T23", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1038,7 +1014,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1069,7 +1044,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1102,7 +1076,6 @@ "ctxt": 0 }, "value": "T30", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1128,7 +1101,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1167,7 +1139,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1224,7 +1195,6 @@ "ctxt": 0 }, "value": "T31", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1250,7 +1220,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1280,7 +1249,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1346,7 +1314,6 @@ "ctxt": 0 }, "value": "T32", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1372,7 +1339,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1411,7 +1377,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1468,7 +1433,6 @@ "ctxt": 0 }, "value": "T33", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1494,7 +1458,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1524,7 +1487,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1590,7 +1552,6 @@ "ctxt": 0 }, "value": "T35", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1616,7 +1577,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -1646,7 +1606,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1684,7 +1643,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -1713,7 +1671,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -1758,7 +1715,6 @@ "ctxt": 0 }, "value": "T36", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1777,7 +1733,6 @@ "ctxt": 0 }, "value": "T35", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1836,7 +1791,6 @@ "ctxt": 0 }, "value": "T37", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1855,7 +1809,6 @@ "ctxt": 0 }, "value": "T35", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1895,7 +1848,6 @@ "ctxt": 0 }, "value": "T38", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1914,7 +1866,6 @@ "ctxt": 0 }, "value": "T35", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1954,7 +1905,6 @@ "ctxt": 0 }, "value": "T40", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1993,7 +1943,6 @@ "ctxt": 0 }, "value": "T41", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2026,7 +1975,6 @@ "ctxt": 0 }, "value": "f10", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2047,6 +1995,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2063,8 +2012,7 @@ }, "kind": "unknown" } - }, - "optional": false + } } } ], @@ -2105,7 +2053,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2142,7 +2089,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2179,7 +2125,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2215,7 +2160,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2226,7 +2170,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2254,7 +2197,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2291,7 +2233,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2321,7 +2262,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2358,7 +2298,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2395,7 +2334,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2423,7 +2361,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2445,7 +2382,6 @@ "ctxt": 0 }, "value": "f11", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2466,6 +2402,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2482,8 +2419,7 @@ }, "kind": "unknown" } - }, - "optional": false + } } } ], @@ -2523,7 +2459,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2534,7 +2469,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "computed": false @@ -2562,7 +2496,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "property": { @@ -2599,7 +2532,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2628,7 +2560,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2652,7 +2583,6 @@ "ctxt": 0 }, "value": "isFunction", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -2673,6 +2603,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2689,8 +2620,7 @@ }, "kind": "unknown" } - }, - "optional": false + } } } ], @@ -2727,7 +2657,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "typeAnnotation": { @@ -2752,7 +2681,6 @@ "ctxt": 0 }, "value": "Function", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -2771,7 +2699,6 @@ "ctxt": 0 }, "value": "f20", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2792,6 +2719,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2808,8 +2736,7 @@ }, "kind": "unknown" } - }, - "optional": false + } } } ], @@ -2866,7 +2793,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2909,7 +2835,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -2952,7 +2877,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -2983,7 +2907,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -2994,7 +2917,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false } }, @@ -3021,7 +2943,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3051,7 +2972,6 @@ "ctxt": 0 }, "value": "isFunction", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3065,7 +2985,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3095,7 +3014,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3126,7 +3044,6 @@ "ctxt": 0 }, "value": "T50", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3152,7 +3069,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3183,7 +3099,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -3209,7 +3124,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -3246,7 +3160,6 @@ "ctxt": 0 }, "value": "T51", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3265,7 +3178,6 @@ "ctxt": 0 }, "value": "T50", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3305,7 +3217,6 @@ "ctxt": 0 }, "value": "T52", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3324,7 +3235,6 @@ "ctxt": 0 }, "value": "T50", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3358,7 +3268,6 @@ "ctxt": 0 }, "value": "f21", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3379,6 +3288,7 @@ "ctxt": 0 }, "value": "pAny", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3395,8 +3305,7 @@ }, "kind": "any" } - }, - "optional": false + } } }, { @@ -3415,6 +3324,7 @@ "ctxt": 0 }, "value": "pNever", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3431,8 +3341,7 @@ }, "kind": "never" } - }, - "optional": false + } } }, { @@ -3451,6 +3360,7 @@ "ctxt": 0 }, "value": "pT", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3473,13 +3383,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -3522,6 +3430,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3538,8 +3447,7 @@ }, "kind": "unknown" } - }, - "optional": false + } }, "init": null, "definite": false @@ -3569,8 +3477,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -3606,8 +3514,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "StringLiteral", @@ -3648,8 +3556,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -3722,8 +3630,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NewExpression", @@ -3740,7 +3648,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3771,8 +3678,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3782,7 +3689,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -3810,8 +3716,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3821,7 +3727,6 @@ "ctxt": 0 }, "value": "pAny", - "typeAnnotation": null, "optional": false } } @@ -3849,8 +3754,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3860,7 +3765,6 @@ "ctxt": 0 }, "value": "pNever", - "typeAnnotation": null, "optional": false } } @@ -3888,8 +3792,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -3899,7 +3803,6 @@ "ctxt": 0 }, "value": "pT", - "typeAnnotation": null, "optional": false } } @@ -3931,7 +3834,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -3951,7 +3853,6 @@ "ctxt": 0 }, "value": "f22", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3972,6 +3873,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3988,8 +3890,7 @@ }, "kind": "unknown" } - }, - "optional": false + } } } ], @@ -4032,6 +3933,7 @@ "ctxt": 0 }, "value": "v1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4048,8 +3950,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -4059,7 +3960,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -4091,6 +3991,7 @@ "ctxt": 0 }, "value": "v2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4107,8 +4008,7 @@ }, "kind": "unknown" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -4118,7 +4018,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -4150,6 +4049,7 @@ "ctxt": 0 }, "value": "v3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4166,8 +4066,7 @@ }, "kind": "object" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -4177,7 +4076,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -4209,6 +4107,7 @@ "ctxt": 0 }, "value": "v4", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4225,8 +4124,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -4236,7 +4134,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -4268,6 +4165,7 @@ "ctxt": 0 }, "value": "v5", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4292,8 +4190,7 @@ "kind": "string" } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -4303,7 +4200,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -4335,6 +4231,7 @@ "ctxt": 0 }, "value": "v6", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4351,8 +4248,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -4362,7 +4258,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -4394,6 +4289,7 @@ "ctxt": 0 }, "value": "v7", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4438,8 +4334,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -4449,7 +4344,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -4473,7 +4367,6 @@ "ctxt": 0 }, "value": "f23", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4494,6 +4387,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4516,13 +4410,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -4565,6 +4457,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4581,8 +4474,7 @@ }, "kind": "object" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -4592,7 +4484,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -4626,7 +4517,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -4654,7 +4544,6 @@ "ctxt": 0 }, "value": "f24", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4675,6 +4564,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4701,6 +4591,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4717,8 +4608,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeAnnotation": { @@ -4747,8 +4637,7 @@ } ] } - }, - "optional": false + } } } ], @@ -4789,8 +4678,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -4826,8 +4715,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ObjectExpression", @@ -4847,7 +4736,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -4887,8 +4775,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "ArrayExpression", @@ -4961,8 +4849,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -4992,7 +4880,6 @@ "ctxt": 0 }, "value": "f25", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5036,6 +4923,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5052,8 +4940,7 @@ }, "kind": "unknown" } - }, - "optional": false + } }, "init": null, "definite": false @@ -5085,8 +4972,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -5096,7 +4983,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -5120,7 +5006,6 @@ "ctxt": 0 }, "value": "f26", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5141,6 +5026,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5157,8 +5043,7 @@ }, "members": [] } - }, - "optional": false + } } }, { @@ -5177,6 +5062,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5193,8 +5079,7 @@ }, "kind": "unknown" } - }, - "optional": false + } } }, { @@ -5213,6 +5098,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5229,8 +5115,7 @@ }, "kind": "any" } - }, - "optional": false + } } } ], @@ -5273,8 +5158,8 @@ "ctxt": 0 }, "value": "o1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -5294,7 +5179,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -5322,7 +5206,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5357,8 +5240,8 @@ "ctxt": 0 }, "value": "o2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -5378,7 +5261,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -5406,7 +5288,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5425,7 +5306,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } } @@ -5460,8 +5340,8 @@ "ctxt": 0 }, "value": "o3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -5481,7 +5361,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -5509,7 +5388,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -5528,7 +5406,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false } }, @@ -5547,7 +5424,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -5582,8 +5458,8 @@ "ctxt": 0 }, "value": "o4", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -5603,7 +5479,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": { @@ -5631,7 +5506,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } @@ -5658,7 +5532,6 @@ "ctxt": 0 }, "value": "f27", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5709,7 +5582,6 @@ "ctxt": 0 }, "value": "f28", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5730,6 +5602,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5746,8 +5619,7 @@ }, "kind": "unknown" } - }, - "optional": false + } } } ], @@ -5810,8 +5682,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null } @@ -5827,7 +5699,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -5851,7 +5722,6 @@ "ctxt": 0 }, "value": "C1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5877,7 +5747,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "value": null, @@ -5923,7 +5792,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false }, "value": null, @@ -5969,7 +5837,6 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, "optional": false }, "value": null, @@ -6017,7 +5884,6 @@ "ctxt": 0 }, "value": "f30", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6038,6 +5904,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6060,13 +5927,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } }, { @@ -6085,6 +5950,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6107,13 +5973,11 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6156,6 +6020,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6172,8 +6037,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -6183,7 +6047,6 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, "optional": false }, "definite": false @@ -6215,6 +6078,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6231,8 +6095,7 @@ }, "members": [] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -6242,7 +6105,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "definite": false @@ -6276,7 +6138,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -6297,7 +6158,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6331,7 +6191,6 @@ "ctxt": 0 }, "value": "Test1", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -6450,7 +6309,6 @@ "ctxt": 0 }, "value": "IsDefinitelyDefined", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6476,7 +6334,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -6530,7 +6387,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -6618,7 +6474,6 @@ "ctxt": 0 }, "value": "Test2", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -6637,7 +6492,6 @@ "ctxt": 0 }, "value": "IsDefinitelyDefined", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6671,7 +6525,6 @@ "ctxt": 0 }, "value": "oops", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6692,6 +6545,7 @@ "ctxt": 0 }, "value": "arg", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6714,13 +6568,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -6753,7 +6605,6 @@ "ctxt": 0 }, "value": "arg", - "typeAnnotation": null, "optional": false } } @@ -6784,7 +6635,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { diff --git a/ecmascript/parser/tests/typescript/tsc/types/unknown/unknownType2/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/unknown/unknownType2/input.ts.json index c9bbf170a476..ff148e0e78ec 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/unknown/unknownType2/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/unknown/unknownType2/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "isUnknown", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -87,7 +85,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -144,7 +141,6 @@ "ctxt": 0 }, "value": "isTrue", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -170,7 +166,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -209,7 +204,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -231,7 +225,6 @@ "ctxt": 0 }, "value": "SomeResponse", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -337,6 +330,7 @@ "ctxt": 0 }, "value": "validate", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -360,6 +354,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -376,8 +371,7 @@ }, "kind": "unknown" } - }, - "optional": false + } } ], "typeParams": null, @@ -403,15 +397,13 @@ "ctxt": 0 }, "value": "SomeResponse", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": { "type": "ArrowFunctionExpression", @@ -429,8 +421,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "body": { @@ -471,7 +463,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -505,7 +496,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -533,7 +523,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "alternate": { @@ -585,6 +574,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -601,8 +591,7 @@ }, "kind": "unknown" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -612,7 +601,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "definite": false @@ -644,6 +632,7 @@ "ctxt": 0 }, "value": "symb", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -669,8 +658,7 @@ "kind": "symbol" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -702,6 +690,7 @@ "ctxt": 0 }, "value": "symbNonUnique", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -718,8 +707,7 @@ }, "kind": "symbol" } - }, - "optional": false + } }, "init": null, "definite": false @@ -749,7 +737,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -795,8 +782,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -820,7 +807,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "property": { @@ -831,7 +817,6 @@ "ctxt": 0 }, "value": "toString", - "typeAnnotation": null, "optional": false }, "computed": false @@ -891,7 +876,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -920,7 +904,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -967,6 +950,7 @@ "ctxt": 0 }, "value": "someBool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -983,8 +967,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -994,7 +977,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1028,7 +1010,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -1039,7 +1020,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -1076,6 +1056,7 @@ "ctxt": 0 }, "value": "undef", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1092,8 +1073,7 @@ }, "kind": "undefined" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1103,7 +1083,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1137,7 +1116,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -1182,6 +1160,7 @@ "ctxt": 0 }, "value": "someNull", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1198,8 +1177,7 @@ }, "kind": "null" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1209,7 +1187,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1243,7 +1220,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -1254,7 +1230,6 @@ "ctxt": 0 }, "value": "symb", - "typeAnnotation": null, "optional": false } }, @@ -1291,6 +1266,7 @@ "ctxt": 0 }, "value": "symbolAlias", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1313,12 +1289,10 @@ "ctxt": 0 }, "value": "symb", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -1328,7 +1302,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "definite": false @@ -1377,7 +1350,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -1416,7 +1388,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1435,7 +1406,6 @@ "ctxt": 0 }, "value": "isTrue", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1461,7 +1431,6 @@ "ctxt": 0 }, "value": "isUnknown", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1487,7 +1456,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -1525,7 +1493,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -1562,7 +1529,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1581,7 +1547,6 @@ "ctxt": 0 }, "value": "isTrue", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1607,7 +1572,6 @@ "ctxt": 0 }, "value": "isUnknown", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1633,7 +1597,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -1671,7 +1634,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -1708,7 +1670,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1727,7 +1688,6 @@ "ctxt": 0 }, "value": "isTrue", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1753,7 +1713,6 @@ "ctxt": 0 }, "value": "isUnknown", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1779,7 +1738,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -1817,7 +1775,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -1854,7 +1811,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -1873,7 +1829,6 @@ "ctxt": 0 }, "value": "isTrue", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1899,7 +1854,6 @@ "ctxt": 0 }, "value": "isUnknown", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -1925,7 +1879,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -1963,7 +1916,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -1974,7 +1926,6 @@ "ctxt": 0 }, "value": "Object", - "typeAnnotation": null, "optional": false } }, @@ -2002,7 +1953,6 @@ "ctxt": 0 }, "value": "E", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -2021,7 +1971,6 @@ "ctxt": 0 }, "value": "isTrue", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2047,7 +1996,6 @@ "ctxt": 0 }, "value": "isUnknown", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -2073,7 +2021,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -2113,6 +2060,7 @@ "ctxt": 0 }, "value": "aString", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2129,8 +2077,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2162,6 +2109,7 @@ "ctxt": 0 }, "value": "aBoolean", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2178,8 +2126,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2211,6 +2158,7 @@ "ctxt": 0 }, "value": "aNumber", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2227,8 +2175,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2260,6 +2207,7 @@ "ctxt": 0 }, "value": "anObject", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2276,8 +2224,7 @@ }, "kind": "object" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2309,6 +2256,7 @@ "ctxt": 0 }, "value": "anObjectLiteral", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2340,7 +2288,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2368,8 +2315,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2401,6 +2347,7 @@ "ctxt": 0 }, "value": "aUnion", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2440,7 +2387,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2492,7 +2438,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2522,8 +2467,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2555,6 +2499,7 @@ "ctxt": 0 }, "value": "anIntersection", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2594,7 +2539,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2646,7 +2590,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -2676,8 +2619,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -2709,6 +2651,7 @@ "ctxt": 0 }, "value": "aFunction", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2743,8 +2686,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2774,7 +2716,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -2785,7 +2726,6 @@ "ctxt": 0 }, "value": "aString", - "typeAnnotation": null, "optional": false } }, @@ -2822,6 +2762,7 @@ "ctxt": 0 }, "value": "uString", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2838,8 +2779,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2849,7 +2789,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2883,7 +2822,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -2894,7 +2832,6 @@ "ctxt": 0 }, "value": "aBoolean", - "typeAnnotation": null, "optional": false } }, @@ -2931,6 +2868,7 @@ "ctxt": 0 }, "value": "uString", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2947,8 +2885,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -2958,7 +2895,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "definite": false @@ -2992,7 +2928,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -3003,7 +2938,6 @@ "ctxt": 0 }, "value": "aNumber", - "typeAnnotation": null, "optional": false } }, @@ -3040,6 +2974,7 @@ "ctxt": 0 }, "value": "uNumber", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3056,8 +2991,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -3067,7 +3001,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3101,7 +3034,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -3112,7 +3044,6 @@ "ctxt": 0 }, "value": "anObject", - "typeAnnotation": null, "optional": false } }, @@ -3149,6 +3080,7 @@ "ctxt": 0 }, "value": "uObject", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3165,8 +3097,7 @@ }, "kind": "object" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -3176,7 +3107,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3210,7 +3140,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -3221,7 +3150,6 @@ "ctxt": 0 }, "value": "anObjectLiteral", - "typeAnnotation": null, "optional": false } }, @@ -3258,6 +3186,7 @@ "ctxt": 0 }, "value": "uObjectLiteral", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3274,8 +3203,7 @@ }, "kind": "object" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -3285,7 +3213,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3319,7 +3246,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -3330,7 +3256,6 @@ "ctxt": 0 }, "value": "aUnion", - "typeAnnotation": null, "optional": false } }, @@ -3358,7 +3283,6 @@ "ctxt": 0 }, "value": "unionDoesNotNarrow", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3377,7 +3301,6 @@ "ctxt": 0 }, "value": "isTrue", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3403,7 +3326,6 @@ "ctxt": 0 }, "value": "isUnknown", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3429,7 +3351,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -3467,7 +3388,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -3478,7 +3398,6 @@ "ctxt": 0 }, "value": "anIntersection", - "typeAnnotation": null, "optional": false } }, @@ -3506,7 +3425,6 @@ "ctxt": 0 }, "value": "intersectionDoesNotNarrow", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -3525,7 +3443,6 @@ "ctxt": 0 }, "value": "isTrue", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3551,7 +3468,6 @@ "ctxt": 0 }, "value": "isUnknown", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -3577,7 +3493,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false } } @@ -3615,7 +3530,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -3626,7 +3540,6 @@ "ctxt": 0 }, "value": "aFunction", - "typeAnnotation": null, "optional": false } }, @@ -3663,6 +3576,7 @@ "ctxt": 0 }, "value": "uFunction", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3679,8 +3593,7 @@ }, "kind": "object" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -3690,7 +3603,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "definite": false @@ -3718,7 +3630,6 @@ "ctxt": 0 }, "value": "NumberEnum", - "typeAnnotation": null, "optional": false }, "members": [ @@ -3737,7 +3648,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": null @@ -3757,7 +3667,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": null @@ -3777,7 +3686,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": null @@ -3801,7 +3709,6 @@ "ctxt": 0 }, "value": "StringEnum", - "typeAnnotation": null, "optional": false }, "members": [ @@ -3820,7 +3727,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "init": { @@ -3853,7 +3759,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "init": { @@ -3886,7 +3791,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "init": { @@ -3937,7 +3841,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -3948,7 +3851,6 @@ "ctxt": 0 }, "value": "NumberEnum", - "typeAnnotation": null, "optional": false } }, @@ -3968,7 +3870,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -3979,7 +3880,6 @@ "ctxt": 0 }, "value": "StringEnum", - "typeAnnotation": null, "optional": false } } @@ -4017,6 +3917,7 @@ "ctxt": 0 }, "value": "enumObj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4033,8 +3934,7 @@ }, "kind": "object" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -4044,7 +3944,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "definite": false @@ -4078,7 +3977,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -4096,7 +3994,6 @@ "ctxt": 0 }, "value": "NumberEnum", - "typeAnnotation": null, "optional": false }, "property": { @@ -4107,7 +4004,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4146,6 +4042,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4170,7 +4067,6 @@ "ctxt": 0 }, "value": "NumberEnum", - "typeAnnotation": null, "optional": false }, "right": { @@ -4181,14 +4077,12 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -4198,7 +4092,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "definite": false @@ -4232,7 +4125,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -4250,7 +4142,6 @@ "ctxt": 0 }, "value": "StringEnum", - "typeAnnotation": null, "optional": false }, "property": { @@ -4261,7 +4152,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4300,6 +4190,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4324,7 +4215,6 @@ "ctxt": 0 }, "value": "StringEnum", - "typeAnnotation": null, "optional": false }, "right": { @@ -4335,14 +4225,12 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -4352,7 +4240,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "definite": false @@ -4373,7 +4260,6 @@ "ctxt": 0 }, "value": "switchTestEnum", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4394,6 +4280,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4410,8 +4297,7 @@ }, "kind": "unknown" } - }, - "optional": false + } } } ], @@ -4444,7 +4330,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -4470,7 +4355,6 @@ "ctxt": 0 }, "value": "StringEnum", - "typeAnnotation": null, "optional": false }, "property": { @@ -4481,7 +4365,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4512,6 +4395,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4536,7 +4420,6 @@ "ctxt": 0 }, "value": "StringEnum", - "typeAnnotation": null, "optional": false }, "right": { @@ -4547,14 +4430,12 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -4564,7 +4445,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -4604,7 +4484,6 @@ "ctxt": 0 }, "value": "StringEnum", - "typeAnnotation": null, "optional": false }, "property": { @@ -4615,7 +4494,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4646,6 +4524,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4670,7 +4549,6 @@ "ctxt": 0 }, "value": "StringEnum", - "typeAnnotation": null, "optional": false }, "right": { @@ -4681,14 +4559,12 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -4698,7 +4574,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -4738,7 +4613,6 @@ "ctxt": 0 }, "value": "StringEnum", - "typeAnnotation": null, "optional": false }, "property": { @@ -4749,7 +4623,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4780,6 +4653,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4804,7 +4678,6 @@ "ctxt": 0 }, "value": "StringEnum", - "typeAnnotation": null, "optional": false }, "right": { @@ -4815,14 +4688,12 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -4832,7 +4703,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -4868,7 +4738,6 @@ "ctxt": 0 }, "value": "End", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -4887,7 +4756,6 @@ "ctxt": 0 }, "value": "isTrue", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4913,7 +4781,6 @@ "ctxt": 0 }, "value": "isUnknown", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -4939,7 +4806,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -4967,7 +4833,6 @@ "ctxt": 0 }, "value": "switchTestCollectEnum", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4988,6 +4853,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5004,8 +4870,7 @@ }, "kind": "unknown" } - }, - "optional": false + } } } ], @@ -5038,7 +4903,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -5064,7 +4928,6 @@ "ctxt": 0 }, "value": "StringEnum", - "typeAnnotation": null, "optional": false }, "property": { @@ -5075,7 +4938,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5106,6 +4968,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5130,7 +4993,6 @@ "ctxt": 0 }, "value": "StringEnum", - "typeAnnotation": null, "optional": false }, "right": { @@ -5141,14 +5003,12 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -5158,7 +5018,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -5189,7 +5048,6 @@ "ctxt": 0 }, "value": "StringEnum", - "typeAnnotation": null, "optional": false }, "property": { @@ -5200,7 +5058,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5231,6 +5088,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5263,7 +5121,6 @@ "ctxt": 0 }, "value": "StringEnum", - "typeAnnotation": null, "optional": false }, "right": { @@ -5274,7 +5131,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -5297,7 +5153,6 @@ "ctxt": 0 }, "value": "StringEnum", - "typeAnnotation": null, "optional": false }, "right": { @@ -5308,7 +5163,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -5316,8 +5170,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -5327,7 +5180,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -5358,7 +5210,6 @@ "ctxt": 0 }, "value": "StringEnum", - "typeAnnotation": null, "optional": false }, "property": { @@ -5369,7 +5220,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "computed": false @@ -5400,6 +5250,7 @@ "ctxt": 0 }, "value": "c", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5432,7 +5283,6 @@ "ctxt": 0 }, "value": "StringEnum", - "typeAnnotation": null, "optional": false }, "right": { @@ -5443,7 +5293,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -5466,7 +5315,6 @@ "ctxt": 0 }, "value": "StringEnum", - "typeAnnotation": null, "optional": false }, "right": { @@ -5477,7 +5325,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -5500,7 +5347,6 @@ "ctxt": 0 }, "value": "StringEnum", - "typeAnnotation": null, "optional": false }, "right": { @@ -5511,7 +5357,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } }, @@ -5519,8 +5364,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -5530,7 +5374,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -5562,6 +5405,7 @@ "ctxt": 0 }, "value": "all", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5584,13 +5428,11 @@ "ctxt": 0 }, "value": "StringEnum", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -5600,7 +5442,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -5636,7 +5477,6 @@ "ctxt": 0 }, "value": "End", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -5655,7 +5495,6 @@ "ctxt": 0 }, "value": "isTrue", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5681,7 +5520,6 @@ "ctxt": 0 }, "value": "isUnknown", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -5707,7 +5545,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -5735,7 +5572,6 @@ "ctxt": 0 }, "value": "switchTestLiterals", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -5756,6 +5592,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5772,8 +5609,7 @@ }, "kind": "unknown" } - }, - "optional": false + } } } ], @@ -5806,7 +5642,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -5852,6 +5687,7 @@ "ctxt": 0 }, "value": "one", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5876,8 +5712,7 @@ "value": 1.0 } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -5887,7 +5722,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -5947,6 +5781,7 @@ "ctxt": 0 }, "value": "two", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -5971,8 +5806,7 @@ "value": 2.0 } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -5982,7 +5816,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -6042,6 +5875,7 @@ "ctxt": 0 }, "value": "three", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6066,8 +5900,7 @@ "value": 3.0 } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -6077,7 +5910,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -6137,6 +5969,7 @@ "ctxt": 0 }, "value": "t", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6161,8 +5994,7 @@ "value": true } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -6172,7 +6004,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -6232,6 +6063,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6256,8 +6088,7 @@ "value": false } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -6267,7 +6098,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -6332,6 +6162,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6361,8 +6192,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -6372,7 +6202,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -6405,7 +6234,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false }, "consequent": [ @@ -6434,6 +6262,7 @@ "ctxt": 0 }, "value": "undef", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6450,8 +6279,7 @@ }, "kind": "undefined" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -6461,7 +6289,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -6520,6 +6347,7 @@ "ctxt": 0 }, "value": "llun", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6536,8 +6364,7 @@ }, "kind": "null" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -6547,7 +6374,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -6580,7 +6406,6 @@ "ctxt": 0 }, "value": "symb", - "typeAnnotation": null, "optional": false }, "consequent": [ @@ -6609,6 +6434,7 @@ "ctxt": 0 }, "value": "anotherSymbol", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6631,12 +6457,10 @@ "ctxt": 0 }, "value": "symb", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -6646,7 +6470,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -6679,7 +6502,6 @@ "ctxt": 0 }, "value": "symbNonUnique", - "typeAnnotation": null, "optional": false }, "consequent": [ @@ -6708,6 +6530,7 @@ "ctxt": 0 }, "value": "nonUniqueSymbol", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6724,8 +6547,7 @@ }, "kind": "symbol" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -6735,7 +6557,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -6771,7 +6592,6 @@ "ctxt": 0 }, "value": "End", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -6790,7 +6610,6 @@ "ctxt": 0 }, "value": "isTrue", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6816,7 +6635,6 @@ "ctxt": 0 }, "value": "isUnknown", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -6842,7 +6660,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -6870,7 +6687,6 @@ "ctxt": 0 }, "value": "switchTestObjects", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -6891,6 +6707,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6907,8 +6724,7 @@ }, "kind": "unknown" } - }, - "optional": false + } } }, { @@ -6927,6 +6743,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -6961,8 +6778,7 @@ } } } - }, - "optional": false + } } }, { @@ -6981,6 +6797,7 @@ "ctxt": 0 }, "value": "z", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7012,7 +6829,6 @@ "ctxt": 0 }, "value": "prop", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -7040,8 +6856,7 @@ } ] } - }, - "optional": false + } } } ], @@ -7074,7 +6889,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -7138,6 +6952,7 @@ "ctxt": 0 }, "value": "bool", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7154,8 +6969,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -7165,7 +6979,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -7198,7 +7011,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "consequent": [ @@ -7227,6 +7039,7 @@ "ctxt": 0 }, "value": "obj1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7243,8 +7056,7 @@ }, "kind": "object" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -7254,7 +7066,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -7287,7 +7098,6 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false }, "consequent": [ @@ -7316,6 +7126,7 @@ "ctxt": 0 }, "value": "obj2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7332,8 +7143,7 @@ }, "kind": "object" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -7343,7 +7153,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -7379,7 +7188,6 @@ "ctxt": 0 }, "value": "End", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -7398,7 +7206,6 @@ "ctxt": 0 }, "value": "isTrue", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7424,7 +7231,6 @@ "ctxt": 0 }, "value": "isUnknown", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7450,7 +7256,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -7478,7 +7283,6 @@ "ctxt": 0 }, "value": "switchResponse", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7499,6 +7303,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7515,8 +7320,7 @@ }, "kind": "unknown" } - }, - "optional": false + } } } ], @@ -7549,7 +7353,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -7636,7 +7439,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -7673,7 +7475,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -7718,7 +7519,6 @@ "ctxt": 0 }, "value": "End", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -7737,7 +7537,6 @@ "ctxt": 0 }, "value": "isTrue", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7763,7 +7562,6 @@ "ctxt": 0 }, "value": "isUnknown", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -7789,7 +7587,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -7827,7 +7624,6 @@ "ctxt": 0 }, "value": "SomeResponse", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -7844,7 +7640,6 @@ "ctxt": 0 }, "value": "switchResponseWrong", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -7865,6 +7660,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -7881,8 +7677,7 @@ }, "kind": "unknown" } - }, - "optional": false + } } } ], @@ -7915,7 +7710,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "cases": [ @@ -8002,7 +7796,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -8039,7 +7832,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -8084,7 +7876,6 @@ "ctxt": 0 }, "value": "End", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -8103,7 +7894,6 @@ "ctxt": 0 }, "value": "isTrue", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8129,7 +7919,6 @@ "ctxt": 0 }, "value": "isUnknown", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -8155,7 +7944,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -8193,7 +7981,6 @@ "ctxt": 0 }, "value": "SomeResponse", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -8210,7 +7997,6 @@ "ctxt": 0 }, "value": "f2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8231,6 +8017,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8247,8 +8034,7 @@ }, "kind": "unknown" } - }, - "optional": false + } } } ], @@ -8297,7 +8083,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "right": { @@ -8308,7 +8093,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } }, @@ -8336,7 +8120,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } }, @@ -8386,7 +8169,6 @@ "ctxt": 0 }, "value": "Error", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -8412,7 +8194,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false } } @@ -8468,7 +8249,6 @@ "ctxt": 0 }, "value": "notNotEquals", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -8489,6 +8269,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8505,8 +8286,7 @@ }, "kind": "unknown" } - }, - "optional": false + } } } ], @@ -8547,7 +8327,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -8558,7 +8337,6 @@ "ctxt": 0 }, "value": "NumberEnum", - "typeAnnotation": null, "optional": false } }, @@ -8604,6 +8382,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8620,8 +8399,7 @@ }, "kind": "object" } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -8631,7 +8409,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "definite": false @@ -8664,7 +8441,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -8682,7 +8458,6 @@ "ctxt": 0 }, "value": "NumberEnum", - "typeAnnotation": null, "optional": false }, "property": { @@ -8693,7 +8468,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8741,6 +8515,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -8765,7 +8540,6 @@ "ctxt": 0 }, "value": "NumberEnum", - "typeAnnotation": null, "optional": false }, "right": { @@ -8776,14 +8550,12 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, "typeParams": null } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -8793,7 +8565,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "definite": false @@ -8842,7 +8613,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -8860,7 +8630,6 @@ "ctxt": 0 }, "value": "NumberEnum", - "typeAnnotation": null, "optional": false }, "property": { @@ -8871,7 +8640,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8893,7 +8661,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -8911,7 +8678,6 @@ "ctxt": 0 }, "value": "NumberEnum", - "typeAnnotation": null, "optional": false }, "property": { @@ -8922,7 +8688,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -8945,7 +8710,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -8963,7 +8727,6 @@ "ctxt": 0 }, "value": "StringEnum", - "typeAnnotation": null, "optional": false }, "property": { @@ -8974,7 +8737,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9023,6 +8785,7 @@ "ctxt": 0 }, "value": "aOrB", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9055,7 +8818,6 @@ "ctxt": 0 }, "value": "NumberEnum", - "typeAnnotation": null, "optional": false }, "right": { @@ -9066,7 +8828,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -9089,7 +8850,6 @@ "ctxt": 0 }, "value": "NumberEnum", - "typeAnnotation": null, "optional": false }, "right": { @@ -9100,7 +8860,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -9123,7 +8882,6 @@ "ctxt": 0 }, "value": "StringEnum", - "typeAnnotation": null, "optional": false }, "right": { @@ -9134,7 +8892,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -9142,8 +8899,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -9153,7 +8909,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "definite": false @@ -9217,7 +8972,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -9235,7 +8989,6 @@ "ctxt": 0 }, "value": "NumberEnum", - "typeAnnotation": null, "optional": false }, "property": { @@ -9246,7 +8999,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9268,7 +9020,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -9286,7 +9037,6 @@ "ctxt": 0 }, "value": "NumberEnum", - "typeAnnotation": null, "optional": false }, "property": { @@ -9297,7 +9047,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9320,7 +9069,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "right": { @@ -9338,7 +9086,6 @@ "ctxt": 0 }, "value": "StringEnum", - "typeAnnotation": null, "optional": false }, "property": { @@ -9349,7 +9096,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "computed": false @@ -9400,6 +9146,7 @@ "ctxt": 0 }, "value": "aOrB", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -9432,7 +9179,6 @@ "ctxt": 0 }, "value": "NumberEnum", - "typeAnnotation": null, "optional": false }, "right": { @@ -9443,7 +9189,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -9466,7 +9211,6 @@ "ctxt": 0 }, "value": "NumberEnum", - "typeAnnotation": null, "optional": false }, "right": { @@ -9477,7 +9221,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false } }, @@ -9500,7 +9243,6 @@ "ctxt": 0 }, "value": "StringEnum", - "typeAnnotation": null, "optional": false }, "right": { @@ -9511,7 +9253,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false } }, @@ -9519,8 +9260,7 @@ } ] } - }, - "optional": false + } }, "init": { "type": "Identifier", @@ -9530,7 +9270,6 @@ "ctxt": 0 }, "value": "u", - "typeAnnotation": null, "optional": false }, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/types/witness/witness/input.ts.json b/ecmascript/parser/tests/typescript/tsc/types/witness/witness/input.ts.json index 0478fb410495..c0af099ed496 100644 --- a/ecmascript/parser/tests/typescript/tsc/types/witness/witness/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/types/witness/witness/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "varInit", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -42,7 +42,6 @@ "ctxt": 0 }, "value": "varInit", - "typeAnnotation": null, "optional": false }, "definite": false @@ -74,6 +73,7 @@ "ctxt": 0 }, "value": "pInit", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -90,8 +90,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -108,7 +107,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -136,8 +134,8 @@ "ctxt": 0 }, "value": "pInit", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -147,7 +145,6 @@ "ctxt": 0 }, "value": "pInit", - "typeAnnotation": null, "optional": false }, "typeAnnotation": null @@ -193,6 +190,7 @@ "ctxt": 0 }, "value": "pInit", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -209,8 +207,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -234,7 +231,6 @@ "ctxt": 0 }, "value": "InitClass", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -260,7 +256,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "value": { @@ -286,7 +281,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -317,7 +311,6 @@ "ctxt": 0 }, "value": "fn", - "typeAnnotation": null, "optional": false }, "function": { @@ -361,8 +354,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -387,7 +380,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -421,6 +413,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -437,8 +430,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -475,7 +467,6 @@ "ctxt": 0 }, "value": "fnReturn1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -516,7 +507,6 @@ "ctxt": 0 }, "value": "fnReturn1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -555,6 +545,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -571,8 +562,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -604,8 +594,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -622,7 +612,6 @@ "ctxt": 0 }, "value": "fnReturn1", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -642,7 +631,6 @@ "ctxt": 0 }, "value": "fnReturn2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -676,7 +664,6 @@ "ctxt": 0 }, "value": "fnReturn2", - "typeAnnotation": null, "optional": false } } @@ -712,6 +699,7 @@ "ctxt": 0 }, "value": "fnr2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -746,8 +734,7 @@ } } } - }, - "optional": false + } }, "init": { "type": "CallExpression", @@ -764,7 +751,6 @@ "ctxt": 0 }, "value": "fnReturn2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -799,8 +785,8 @@ "ctxt": 0 }, "value": "co1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -825,7 +811,6 @@ "ctxt": 0 }, "value": "co1", - "typeAnnotation": null, "optional": false }, { @@ -869,6 +854,7 @@ "ctxt": 0 }, "value": "co1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -885,8 +871,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -918,8 +903,8 @@ "ctxt": 0 }, "value": "co2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -962,7 +947,6 @@ "ctxt": 0 }, "value": "co2", - "typeAnnotation": null, "optional": false } ] @@ -997,6 +981,7 @@ "ctxt": 0 }, "value": "co2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1013,8 +998,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1046,8 +1030,8 @@ "ctxt": 0 }, "value": "co3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1072,7 +1056,6 @@ "ctxt": 0 }, "value": "co1", - "typeAnnotation": null, "optional": false }, { @@ -1083,7 +1066,6 @@ "ctxt": 0 }, "value": "co2", - "typeAnnotation": null, "optional": false }, { @@ -1094,7 +1076,6 @@ "ctxt": 0 }, "value": "co3", - "typeAnnotation": null, "optional": false }, { @@ -1105,7 +1086,6 @@ "ctxt": 0 }, "value": "co1", - "typeAnnotation": null, "optional": false } ] @@ -1140,6 +1120,7 @@ "ctxt": 0 }, "value": "co3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1156,8 +1137,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1189,8 +1169,8 @@ "ctxt": 0 }, "value": "as1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1215,8 +1195,8 @@ "ctxt": 0 }, "value": "as1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1258,6 +1238,7 @@ "ctxt": 0 }, "value": "as1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1274,8 +1255,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1307,8 +1287,8 @@ "ctxt": 0 }, "value": "as2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ParenthesisExpression", @@ -1333,8 +1313,8 @@ "ctxt": 0 }, "value": "as2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "AssignmentExpression", @@ -1352,8 +1332,8 @@ "ctxt": 0 }, "value": "as2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "NumericLiteral", @@ -1396,6 +1376,7 @@ "ctxt": 0 }, "value": "as2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1412,8 +1393,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1445,8 +1425,8 @@ "ctxt": 0 }, "value": "cnd1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1463,7 +1443,6 @@ "ctxt": 0 }, "value": "cnd1", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1514,6 +1493,7 @@ "ctxt": 0 }, "value": "cnd1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1530,8 +1510,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1563,8 +1542,8 @@ "ctxt": 0 }, "value": "cnd2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ConditionalExpression", @@ -1581,7 +1560,6 @@ "ctxt": 0 }, "value": "cnd1", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1599,7 +1577,6 @@ "ctxt": 0 }, "value": "cnd1", - "typeAnnotation": null, "optional": false }, "consequent": { @@ -1675,6 +1652,7 @@ "ctxt": 0 }, "value": "cnd2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1691,8 +1669,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1724,8 +1701,8 @@ "ctxt": 0 }, "value": "or1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1743,7 +1720,6 @@ "ctxt": 0 }, "value": "or1", - "typeAnnotation": null, "optional": false }, "right": { @@ -1790,6 +1766,7 @@ "ctxt": 0 }, "value": "or1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1806,8 +1783,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1839,8 +1815,8 @@ "ctxt": 0 }, "value": "or2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1872,7 +1848,6 @@ "ctxt": 0 }, "value": "or2", - "typeAnnotation": null, "optional": false } }, @@ -1905,6 +1880,7 @@ "ctxt": 0 }, "value": "or2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -1921,8 +1897,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -1954,8 +1929,8 @@ "ctxt": 0 }, "value": "or3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -1973,7 +1948,6 @@ "ctxt": 0 }, "value": "or3", - "typeAnnotation": null, "optional": false }, "right": { @@ -1984,7 +1958,6 @@ "ctxt": 0 }, "value": "or3", - "typeAnnotation": null, "optional": false } }, @@ -2017,6 +1990,7 @@ "ctxt": 0 }, "value": "or3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2033,8 +2007,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2066,8 +2039,8 @@ "ctxt": 0 }, "value": "and1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2085,7 +2058,6 @@ "ctxt": 0 }, "value": "and1", - "typeAnnotation": null, "optional": false }, "right": { @@ -2132,6 +2104,7 @@ "ctxt": 0 }, "value": "and1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2148,8 +2121,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2181,8 +2153,8 @@ "ctxt": 0 }, "value": "and2", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2214,7 +2186,6 @@ "ctxt": 0 }, "value": "and2", - "typeAnnotation": null, "optional": false } }, @@ -2247,6 +2218,7 @@ "ctxt": 0 }, "value": "and2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2263,8 +2235,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2296,8 +2267,8 @@ "ctxt": 0 }, "value": "and3", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "BinaryExpression", @@ -2315,7 +2286,6 @@ "ctxt": 0 }, "value": "and3", - "typeAnnotation": null, "optional": false }, "right": { @@ -2326,7 +2296,6 @@ "ctxt": 0 }, "value": "and3", - "typeAnnotation": null, "optional": false } }, @@ -2359,6 +2328,7 @@ "ctxt": 0 }, "value": "and3", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2375,8 +2345,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2393,7 +2362,6 @@ "ctxt": 0 }, "value": "fnCall", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2434,7 +2402,6 @@ "ctxt": 0 }, "value": "fnCall", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2473,8 +2440,8 @@ "ctxt": 0 }, "value": "fnCallResult", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -2491,7 +2458,6 @@ "ctxt": 0 }, "value": "fnCall", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -2526,6 +2492,7 @@ "ctxt": 0 }, "value": "fnCallResult", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2542,8 +2509,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -2560,7 +2526,6 @@ "ctxt": 0 }, "value": "fnArg1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2581,6 +2546,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2603,12 +2569,10 @@ "ctxt": 0 }, "value": "fnArg1", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } } }, { @@ -2627,6 +2591,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2643,8 +2608,7 @@ }, "kind": "number" } - }, - "optional": false + } } } ], @@ -2687,6 +2651,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2710,6 +2675,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2732,12 +2698,10 @@ "ctxt": 0 }, "value": "fnArg1", - "typeAnnotation": null, "optional": false } } - }, - "optional": false + } }, { "type": "Identifier", @@ -2747,6 +2711,7 @@ "ctxt": 0 }, "value": "m", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2763,8 +2728,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -2786,8 +2750,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false @@ -2816,7 +2779,6 @@ "ctxt": 0 }, "value": "fnArg1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -2830,7 +2792,6 @@ "ctxt": 0 }, "value": "fnArg1", - "typeAnnotation": null, "optional": false } }, @@ -2867,7 +2828,6 @@ "ctxt": 0 }, "value": "overload1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -2888,6 +2848,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2911,6 +2872,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -2927,8 +2889,7 @@ }, "kind": "string" } - }, - "optional": false + } } ], "typeParams": null, @@ -2950,8 +2911,7 @@ } } } - }, - "optional": false + } } } ], @@ -2993,7 +2953,6 @@ "ctxt": 0 }, "value": "overload1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3014,6 +2973,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3037,6 +2997,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3053,8 +3014,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -3076,8 +3036,7 @@ } } } - }, - "optional": false + } } } ], @@ -3119,7 +3078,6 @@ "ctxt": 0 }, "value": "overload1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3140,6 +3098,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3163,6 +3122,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3179,8 +3139,7 @@ }, "kind": "any" } - }, - "optional": false + } } ], "typeParams": null, @@ -3202,8 +3161,7 @@ } } } - }, - "optional": false + } } } ], @@ -3245,7 +3203,6 @@ "ctxt": 0 }, "value": "overload1", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3279,7 +3236,6 @@ "ctxt": 0 }, "value": "undefined", - "typeAnnotation": null, "optional": false } } @@ -3308,7 +3264,6 @@ "ctxt": 0 }, "value": "fnArg2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3349,7 +3304,6 @@ "ctxt": 0 }, "value": "overload1", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3363,7 +3317,6 @@ "ctxt": 0 }, "value": "fnArg2", - "typeAnnotation": null, "optional": false } } @@ -3403,8 +3356,8 @@ "ctxt": 0 }, "value": "t", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -3421,7 +3374,6 @@ "ctxt": 0 }, "value": "fnArg2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -3441,7 +3393,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3467,7 +3418,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "function": { @@ -3537,7 +3487,6 @@ "ctxt": 0 }, "value": "fn1", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3578,7 +3527,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "function": { @@ -3648,7 +3596,6 @@ "ctxt": 0 }, "value": "fn2", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3689,7 +3636,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "function": { @@ -3733,6 +3679,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3756,8 +3703,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeParams": null, @@ -3780,8 +3727,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -3810,7 +3756,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -3839,7 +3784,6 @@ "ctxt": 0 }, "value": "fn3", - "typeAnnotation": null, "optional": false }, "computed": false @@ -3879,7 +3823,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -3923,6 +3866,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -3946,8 +3890,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null } ], "typeParams": null, @@ -3970,8 +3914,7 @@ }, "isAbstract": false } - }, - "optional": false + } }, "init": null, "definite": false @@ -4000,7 +3943,6 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, "optional": false }, "arguments": [ @@ -4014,7 +3956,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false } } @@ -4054,8 +3995,8 @@ "ctxt": 0 }, "value": "fn5r", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "CallExpression", @@ -4072,7 +4013,6 @@ "ctxt": 0 }, "value": "fn5", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4107,8 +4047,8 @@ "ctxt": 0 }, "value": "propAcc1", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -4128,7 +4068,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "value": { @@ -4146,7 +4085,6 @@ "ctxt": 0 }, "value": "propAcc1", - "typeAnnotation": null, "optional": false }, "property": { @@ -4157,7 +4095,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4194,6 +4131,7 @@ "ctxt": 0 }, "value": "propAcc1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4225,7 +4163,6 @@ "ctxt": 0 }, "value": "m", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -4253,8 +4190,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -4278,7 +4214,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "body": { @@ -4321,8 +4256,8 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -4339,7 +4274,6 @@ "ctxt": 0 }, "value": "M2", - "typeAnnotation": null, "optional": false }, "property": { @@ -4350,7 +4284,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4385,8 +4318,8 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "Identifier", @@ -4396,7 +4329,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "definite": false @@ -4428,6 +4360,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4444,8 +4377,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -4465,7 +4397,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4491,7 +4422,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "value": { @@ -4517,7 +4447,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4565,8 +4494,8 @@ "ctxt": 0 }, "value": "c2inst", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -4590,7 +4519,6 @@ "ctxt": 0 }, "value": "C2", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -4604,7 +4532,6 @@ "ctxt": 0 }, "value": "n", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4638,6 +4565,7 @@ "ctxt": 0 }, "value": "c2inst", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4654,8 +4582,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -4672,7 +4599,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -4698,7 +4624,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "value": { @@ -4716,7 +4641,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "property": { @@ -4727,7 +4651,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4775,8 +4698,8 @@ "ctxt": 0 }, "value": "qq", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "MemberExpression", @@ -4793,7 +4716,6 @@ "ctxt": 0 }, "value": "C3", - "typeAnnotation": null, "optional": false }, "property": { @@ -4804,7 +4726,6 @@ "ctxt": 0 }, "value": "q", - "typeAnnotation": null, "optional": false }, "computed": false @@ -4838,6 +4759,7 @@ "ctxt": 0 }, "value": "qq", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -4854,8 +4776,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/tsc/typings/typingsLookupAmd/input.ts.json b/ecmascript/parser/tests/typescript/tsc/typings/typingsLookupAmd/input.ts.json index acac3f3fe5b3..b669bd13ac08 100644 --- a/ecmascript/parser/tests/typescript/tsc/typings/typingsLookupAmd/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsc/typings/typingsLookupAmd/input.ts.json @@ -23,7 +23,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -64,7 +63,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "imported": null @@ -104,7 +102,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "declare": true, @@ -123,7 +120,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -155,7 +151,6 @@ "ctxt": 0 }, "value": "B", - "typeAnnotation": null, "optional": false }, "imported": null diff --git a/ecmascript/parser/tests/typescript/tsx/brace-is-block/input.ts.json b/ecmascript/parser/tests/typescript/tsx/brace-is-block/input.ts.json index 0ccc780c6631..1610838bb54b 100644 --- a/ecmascript/parser/tests/typescript/tsx/brace-is-block/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsx/brace-is-block/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -35,7 +34,6 @@ "ctxt": 0 }, "value": "D", - "typeAnnotation": null, "optional": false }, "isAbstract": false, @@ -63,7 +61,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -96,7 +93,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/tsx/type-arguments/input.ts.json b/ecmascript/parser/tests/typescript/tsx/type-arguments/input.ts.json index 46dbd095ee80..015fb95ba0e8 100644 --- a/ecmascript/parser/tests/typescript/tsx/type-arguments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsx/type-arguments/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -55,7 +54,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -113,7 +110,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -138,7 +134,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -157,7 +152,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -183,7 +177,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/tsx/type-parameters/input.ts.json b/ecmascript/parser/tests/typescript/tsx/type-parameters/input.ts.json index cddcc1b1a4ab..1e8e0b7d1b59 100644 --- a/ecmascript/parser/tests/typescript/tsx/type-parameters/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsx/type-parameters/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -77,7 +76,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/type-alias/declare/input.ts.json b/ecmascript/parser/tests/typescript/type-alias/declare/input.ts.json index e04531c1c261..fd725d60c532 100644 --- a/ecmascript/parser/tests/typescript/type-alias/declare/input.ts.json +++ b/ecmascript/parser/tests/typescript/type-alias/declare/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, diff --git a/ecmascript/parser/tests/typescript/type-alias/export/input.ts.json b/ecmascript/parser/tests/typescript/type-alias/export/input.ts.json index 9350356dfe2c..40108daaa780 100644 --- a/ecmascript/parser/tests/typescript/type-alias/export/input.ts.json +++ b/ecmascript/parser/tests/typescript/type-alias/export/input.ts.json @@ -29,7 +29,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, diff --git a/ecmascript/parser/tests/typescript/type-alias/generic-complex/input.ts.json b/ecmascript/parser/tests/typescript/type-alias/generic-complex/input.ts.json index 0ec83533a4a8..76a7659b0455 100644 --- a/ecmascript/parser/tests/typescript/type-alias/generic-complex/input.ts.json +++ b/ecmascript/parser/tests/typescript/type-alias/generic-complex/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -84,7 +82,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -130,7 +127,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -156,7 +152,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/type-alias/generic/input.ts.json b/ecmascript/parser/tests/typescript/type-alias/generic/input.ts.json index 84fbfcf6730b..7c705eb85f89 100644 --- a/ecmascript/parser/tests/typescript/type-alias/generic/input.ts.json +++ b/ecmascript/parser/tests/typescript/type-alias/generic/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -71,7 +69,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/type-alias/plain/input.ts.json b/ecmascript/parser/tests/typescript/type-alias/plain/input.ts.json index 7cc6cd17f645..90f094849ef9 100644 --- a/ecmascript/parser/tests/typescript/type-alias/plain/input.ts.json +++ b/ecmascript/parser/tests/typescript/type-alias/plain/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, diff --git a/ecmascript/parser/tests/typescript/type-arguments/call/input.ts.json b/ecmascript/parser/tests/typescript/type-arguments/call/input.ts.json index 1bcdcf49bcb8..063930ff3dee 100644 --- a/ecmascript/parser/tests/typescript/type-arguments/call/input.ts.json +++ b/ecmascript/parser/tests/typescript/type-arguments/call/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -55,7 +54,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -113,7 +110,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -133,7 +129,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/type-arguments/new-false-positive/input.ts.json b/ecmascript/parser/tests/typescript/type-arguments/new-false-positive/input.ts.json index 2b40f429a877..b30d8582aba2 100644 --- a/ecmascript/parser/tests/typescript/type-arguments/new-false-positive/input.ts.json +++ b/ecmascript/parser/tests/typescript/type-arguments/new-false-positive/input.ts.json @@ -36,7 +36,6 @@ "ctxt": 0 }, "value": "A", - "typeAnnotation": null, "optional": false }, "arguments": null, @@ -50,7 +49,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/type-arguments/new/input.ts.json b/ecmascript/parser/tests/typescript/type-arguments/new/input.ts.json index 23b379073868..47054c08c73e 100644 --- a/ecmascript/parser/tests/typescript/type-arguments/new/input.ts.json +++ b/ecmascript/parser/tests/typescript/type-arguments/new/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -55,7 +54,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -86,7 +84,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "arguments": [], @@ -113,7 +110,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -133,7 +129,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/type-arguments/tagged-template-no-asi/input.ts.json b/ecmascript/parser/tests/typescript/type-arguments/tagged-template-no-asi/input.ts.json index 4f353fff4914..1422df92c7b7 100644 --- a/ecmascript/parser/tests/typescript/type-arguments/tagged-template-no-asi/input.ts.json +++ b/ecmascript/parser/tests/typescript/type-arguments/tagged-template-no-asi/input.ts.json @@ -35,7 +35,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -101,7 +100,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/type-arguments/tagged-template/input.ts.json b/ecmascript/parser/tests/typescript/type-arguments/tagged-template/input.ts.json index 700d760805cb..2369810d63cd 100644 --- a/ecmascript/parser/tests/typescript/type-arguments/tagged-template/input.ts.json +++ b/ecmascript/parser/tests/typescript/type-arguments/tagged-template/input.ts.json @@ -28,7 +28,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "expressions": [], @@ -94,7 +93,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/type-arguments/tsx/input.ts.json b/ecmascript/parser/tests/typescript/type-arguments/tsx/input.ts.json index 0e64448cf8e3..c4a1edee2968 100644 --- a/ecmascript/parser/tests/typescript/type-arguments/tsx/input.ts.json +++ b/ecmascript/parser/tests/typescript/type-arguments/tsx/input.ts.json @@ -30,7 +30,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "span": { @@ -76,7 +75,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false } } @@ -106,7 +104,6 @@ "ctxt": 0 }, "value": "C", - "typeAnnotation": null, "optional": false }, "span": { diff --git a/ecmascript/parser/tests/typescript/type-arguments/whitespace/input.ts.json b/ecmascript/parser/tests/typescript/type-arguments/whitespace/input.ts.json index 875d079d9d6a..7a48bb8cec2e 100644 --- a/ecmascript/parser/tests/typescript/type-arguments/whitespace/input.ts.json +++ b/ecmascript/parser/tests/typescript/type-arguments/whitespace/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "f", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -61,7 +60,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, diff --git a/ecmascript/parser/tests/typescript/types/array/input.ts.json b/ecmascript/parser/tests/typescript/types/array/input.ts.json index 7f5a5ccbd3ae..e277c939c20d 100644 --- a/ecmascript/parser/tests/typescript/types/array/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/array/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "arr", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -63,8 +64,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/types/conditional-infer/input.ts.json b/ecmascript/parser/tests/typescript/types/conditional-infer/input.ts.json index fed86e403747..1ee2fccfca03 100644 --- a/ecmascript/parser/tests/typescript/types/conditional-infer/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/conditional-infer/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "Element", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -48,7 +47,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -78,7 +76,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -119,7 +116,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -143,7 +139,6 @@ "ctxt": 0 }, "value": "U", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -163,7 +158,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/types/conditional/input.ts.json b/ecmascript/parser/tests/typescript/types/conditional/input.ts.json index 2c44d21329f6..101cd16c3916 100644 --- a/ecmascript/parser/tests/typescript/types/conditional/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/conditional/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -82,8 +83,7 @@ "kind": "null" } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/types/function-generic/input.ts.json b/ecmascript/parser/tests/typescript/types/function-generic/input.ts.json index 34bd8ac566d3..d746972fe0cf 100644 --- a/ecmascript/parser/tests/typescript/types/function-generic/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/function-generic/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,6 +55,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -76,13 +78,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } ], "typeParams": { @@ -108,7 +108,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": null, @@ -138,15 +137,13 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/types/function-in-generic/input.ts.json b/ecmascript/parser/tests/typescript/types/function-in-generic/input.ts.json index 0743ec43afcd..ed56f5f538be 100644 --- a/ecmascript/parser/tests/typescript/types/function-in-generic/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/function-in-generic/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,7 +54,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -94,8 +94,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/types/function-with-this/input.ts.json b/ecmascript/parser/tests/typescript/types/function-with-this/input.ts.json index de0ac9be53d2..ea8206475b7a 100644 --- a/ecmascript/parser/tests/typescript/types/function-with-this/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/function-with-this/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,6 +55,7 @@ "ctxt": 0 }, "value": "this", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -70,8 +72,7 @@ }, "kind": "number" } - }, - "optional": false + } } ], "typeParams": null, @@ -93,8 +94,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/types/function/input.ts.json b/ecmascript/parser/tests/typescript/types/function/input.ts.json index e5b3380a223a..f9dd01d72419 100644 --- a/ecmascript/parser/tests/typescript/types/function/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/function/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "f", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -54,6 +55,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -70,8 +72,7 @@ }, "kind": "number" } - }, - "optional": false + } }, { "type": "Identifier", @@ -81,6 +82,7 @@ "ctxt": 0 }, "value": "b", + "optional": true, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -97,8 +99,7 @@ }, "kind": "number" } - }, - "optional": true + } }, { "type": "RestElement", @@ -120,8 +121,8 @@ "ctxt": 0 }, "value": "c", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", @@ -169,8 +170,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/types/indexed/input.ts.json b/ecmascript/parser/tests/typescript/types/indexed/input.ts.json index 51b6e8a323ab..e707e207f793 100644 --- a/ecmascript/parser/tests/typescript/types/indexed/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/indexed/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -61,7 +62,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -81,14 +81,12 @@ "ctxt": 0 }, "value": "K", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/types/keywords/input.ts.json b/ecmascript/parser/tests/typescript/types/keywords/input.ts.json index a3c22c483ed9..5b0a57f5c1e8 100644 --- a/ecmascript/parser/tests/typescript/types/keywords/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/keywords/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "a", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "any" } - }, - "optional": false + } }, "init": null, "definite": false @@ -80,6 +80,7 @@ "ctxt": 0 }, "value": "un", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -96,8 +97,7 @@ }, "kind": "unknown" } - }, - "optional": false + } }, "init": null, "definite": false @@ -129,6 +129,7 @@ "ctxt": 0 }, "value": "b", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ }, "kind": "boolean" } - }, - "optional": false + } }, "init": null, "definite": false @@ -178,6 +178,7 @@ "ctxt": 0 }, "value": "ne", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -194,8 +195,7 @@ }, "kind": "never" } - }, - "optional": false + } }, "init": null, "definite": false @@ -227,6 +227,7 @@ "ctxt": 0 }, "value": "nul", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -243,8 +244,7 @@ }, "kind": "null" } - }, - "optional": false + } }, "init": null, "definite": false @@ -276,6 +276,7 @@ "ctxt": 0 }, "value": "num", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -292,8 +293,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": false @@ -325,6 +325,7 @@ "ctxt": 0 }, "value": "o", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -341,8 +342,7 @@ }, "kind": "object" } - }, - "optional": false + } }, "init": null, "definite": false @@ -374,6 +374,7 @@ "ctxt": 0 }, "value": "st", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -390,8 +391,7 @@ }, "kind": "string" } - }, - "optional": false + } }, "init": null, "definite": false @@ -423,6 +423,7 @@ "ctxt": 0 }, "value": "sy", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -439,8 +440,7 @@ }, "kind": "symbol" } - }, - "optional": false + } }, "init": null, "definite": false @@ -472,6 +472,7 @@ "ctxt": 0 }, "value": "u", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -488,8 +489,7 @@ }, "kind": "undefined" } - }, - "optional": false + } }, "init": null, "definite": false @@ -521,6 +521,7 @@ "ctxt": 0 }, "value": "v", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -537,8 +538,7 @@ }, "kind": "void" } - }, - "optional": false + } }, "init": null, "definite": false @@ -570,6 +570,7 @@ "ctxt": 0 }, "value": "n", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -586,8 +587,7 @@ }, "kind": "bigint" } - }, - "optional": false + } }, "init": null, "definite": false @@ -619,6 +619,7 @@ "ctxt": 0 }, "value": "i", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -635,8 +636,7 @@ }, "kind": "intrinsic" } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/types/literal-boolean/input.ts.json b/ecmascript/parser/tests/typescript/types/literal-boolean/input.ts.json index 0bd0d5df28c4..86156b3c4a30 100644 --- a/ecmascript/parser/tests/typescript/types/literal-boolean/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/literal-boolean/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -55,8 +56,7 @@ "value": true } } - }, - "optional": false + } }, "init": null, "definite": false @@ -88,6 +88,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -112,8 +113,7 @@ "value": false } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/types/literal-number-negative/input.ts.json b/ecmascript/parser/tests/typescript/types/literal-number-negative/input.ts.json index 921864b827ce..0d591bae2377 100644 --- a/ecmascript/parser/tests/typescript/types/literal-number-negative/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/literal-number-negative/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -55,8 +56,7 @@ "value": -1.0 } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/types/literal-number/input.ts.json b/ecmascript/parser/tests/typescript/types/literal-number/input.ts.json index 78063378731e..59d48629d4cd 100644 --- a/ecmascript/parser/tests/typescript/types/literal-number/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/literal-number/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -55,8 +56,7 @@ "value": 0.0 } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/types/literal-string/input.ts.json b/ecmascript/parser/tests/typescript/types/literal-string/input.ts.json index 839d7bc6d9c1..0684595a5feb 100644 --- a/ecmascript/parser/tests/typescript/types/literal-string/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/literal-string/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -60,8 +61,7 @@ } } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/types/mapped/input.ts.json b/ecmascript/parser/tests/typescript/types/mapped/input.ts.json index 598410abc326..050c6f34a1f8 100644 --- a/ecmascript/parser/tests/typescript/types/mapped/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/mapped/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "map", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -61,7 +62,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -87,8 +87,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -120,6 +119,7 @@ "ctxt": 0 }, "value": "map", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -150,7 +150,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -176,8 +175,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -209,6 +207,7 @@ "ctxt": 0 }, "value": "map", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -239,7 +238,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -265,8 +263,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -298,6 +295,7 @@ "ctxt": 0 }, "value": "map", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -328,7 +326,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -354,8 +351,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": null, "definite": false @@ -387,6 +383,7 @@ "ctxt": 0 }, "value": "map", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -417,7 +414,6 @@ "ctxt": 0 }, "value": "P", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -451,8 +447,7 @@ "kind": "number" } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/types/object-shorthand/input.ts.json b/ecmascript/parser/tests/typescript/types/object-shorthand/input.ts.json index f47b44c9f369..afae04343a55 100644 --- a/ecmascript/parser/tests/typescript/types/object-shorthand/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/object-shorthand/input.ts.json @@ -31,8 +31,8 @@ "ctxt": 0 }, "value": "table", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "init": { "type": "ObjectExpression", @@ -52,7 +52,6 @@ "ctxt": 0 }, "value": "put", - "typeAnnotation": null, "optional": false }, "params": [ @@ -72,6 +71,7 @@ "ctxt": 0 }, "value": "value", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -94,13 +94,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } } } ], @@ -144,7 +142,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "constraint": { @@ -171,7 +168,6 @@ "ctxt": 0 }, "value": "id", - "typeAnnotation": null, "optional": false }, "computed": false, diff --git a/ecmascript/parser/tests/typescript/types/parenthesized/input.ts.json b/ecmascript/parser/tests/typescript/types/parenthesized/input.ts.json index ce6728a97935..a85a22c33cb9 100644 --- a/ecmascript/parser/tests/typescript/types/parenthesized/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/parenthesized/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null, diff --git a/ecmascript/parser/tests/typescript/types/reference-generic-nested/input.ts.json b/ecmascript/parser/tests/typescript/types/reference-generic-nested/input.ts.json index 402506348537..eb636a516f3d 100644 --- a/ecmascript/parser/tests/typescript/types/reference-generic-nested/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/reference-generic-nested/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,7 +54,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -79,7 +79,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -105,8 +104,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/types/reference-generic/input.ts.json b/ecmascript/parser/tests/typescript/types/reference-generic/input.ts.json index ad6b0a2c5fb6..df9ce0486ffa 100644 --- a/ecmascript/parser/tests/typescript/types/reference-generic/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/reference-generic/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,7 +54,6 @@ "ctxt": 0 }, "value": "Array", - "typeAnnotation": null, "optional": false }, "typeParams": { @@ -76,8 +76,7 @@ ] } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/types/reference/input.ts.json b/ecmascript/parser/tests/typescript/types/reference/input.ts.json index 01e7f8446b05..6c7f0d5e7874 100644 --- a/ecmascript/parser/tests/typescript/types/reference/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/reference/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,13 +54,11 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/types/tuple-empty/input.ts.json b/ecmascript/parser/tests/typescript/types/tuple-empty/input.ts.json index 56f079d74ae0..2e61a953aec4 100644 --- a/ecmascript/parser/tests/typescript/types/tuple-empty/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/tuple-empty/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "elemTypes": [] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/types/tuple-optional/input.ts.json b/ecmascript/parser/tests/typescript/types/tuple-optional/input.ts.json index 40493f0b1f42..06efbbaca751 100644 --- a/ecmascript/parser/tests/typescript/types/tuple-optional/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/tuple-optional/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -145,8 +146,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/types/tuple-rest-after-optional/input.ts.json b/ecmascript/parser/tests/typescript/types/tuple-rest-after-optional/input.ts.json index 61661f7e0670..86b3fceeecf6 100644 --- a/ecmascript/parser/tests/typescript/types/tuple-rest-after-optional/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/tuple-rest-after-optional/input.ts.json @@ -16,7 +16,6 @@ "ctxt": 0 }, "value": "foo", - "typeAnnotation": null, "optional": false }, "declare": false, @@ -49,8 +48,8 @@ "ctxt": 0 }, "value": "args", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": { "type": "TsTypeAnnotation", diff --git a/ecmascript/parser/tests/typescript/types/tuple-rest/input.ts.json b/ecmascript/parser/tests/typescript/types/tuple-rest/input.ts.json index c2bd62a8cbca..cf3b74f752a2 100644 --- a/ecmascript/parser/tests/typescript/types/tuple-rest/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/tuple-rest/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -100,8 +101,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/types/tuple/input.ts.json b/ecmascript/parser/tests/typescript/types/tuple/input.ts.json index 5a6dd90243b5..e76dc9e9830e 100644 --- a/ecmascript/parser/tests/typescript/types/tuple/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/tuple/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -102,8 +103,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/types/type-literal/input.ts.json b/ecmascript/parser/tests/typescript/types/type-literal/input.ts.json index c4d831b41bc5..257cc1be0ea7 100644 --- a/ecmascript/parser/tests/typescript/types/type-literal/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/type-literal/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "obj", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -62,7 +63,6 @@ "ctxt": 0 }, "value": "x", - "typeAnnotation": null, "optional": false }, "computed": false, @@ -90,8 +90,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/types/type-operator/input.ts.json b/ecmascript/parser/tests/typescript/types/type-operator/input.ts.json index 1bd917523453..e1aeb7ed08f6 100644 --- a/ecmascript/parser/tests/typescript/types/type-operator/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/type-operator/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -61,14 +62,12 @@ "ctxt": 0 }, "value": "T", - "typeAnnotation": null, "optional": false }, "typeParams": null } } - }, - "optional": false + } }, "init": null, "definite": false @@ -100,6 +99,7 @@ "ctxt": 0 }, "value": "y", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -125,8 +125,7 @@ "kind": "symbol" } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/types/typeof/input.ts.json b/ecmascript/parser/tests/typescript/types/typeof/input.ts.json index a70aa98acbe4..46fc76990257 100644 --- a/ecmascript/parser/tests/typescript/types/typeof/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/typeof/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -55,7 +56,6 @@ "ctxt": 0 }, "value": "y", - "typeAnnotation": null, "optional": false }, "right": { @@ -66,13 +66,11 @@ "ctxt": 0 }, "value": "z", - "typeAnnotation": null, "optional": false } } } - }, - "optional": false + } }, "init": null, "definite": false diff --git a/ecmascript/parser/tests/typescript/types/union-intersection/input.ts.json b/ecmascript/parser/tests/typescript/types/union-intersection/input.ts.json index 335ccc8452f7..35925813edaf 100644 --- a/ecmascript/parser/tests/typescript/types/union-intersection/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/union-intersection/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "union", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -75,8 +76,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -108,6 +108,7 @@ "ctxt": 0 }, "value": "intersection", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -143,8 +144,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -176,6 +176,7 @@ "ctxt": 0 }, "value": "precedence1", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -230,8 +231,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -263,6 +263,7 @@ "ctxt": 0 }, "value": "precedence2", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -317,8 +318,7 @@ } ] } - }, - "optional": false + } }, "init": null, "definite": false @@ -341,7 +341,6 @@ "ctxt": 0 }, "value": "LeadingUnion", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -390,7 +389,6 @@ "ctxt": 0 }, "value": "LeadingIntersection", - "typeAnnotation": null, "optional": false }, "typeParams": null, diff --git a/ecmascript/parser/tests/typescript/v4/issue-864/input.ts.json b/ecmascript/parser/tests/typescript/v4/issue-864/input.ts.json index cfb385f007d0..8c3fbe58aa6b 100644 --- a/ecmascript/parser/tests/typescript/v4/issue-864/input.ts.json +++ b/ecmascript/parser/tests/typescript/v4/issue-864/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "Strings", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -89,7 +88,6 @@ "ctxt": 0 }, "value": "Numbers", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -156,7 +154,6 @@ "ctxt": 0 }, "value": "StrStrNumNum", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -198,7 +195,6 @@ "ctxt": 0 }, "value": "Strings", - "typeAnnotation": null, "optional": false }, "typeParams": null @@ -235,7 +231,6 @@ "ctxt": 0 }, "value": "Numbers", - "typeAnnotation": null, "optional": false }, "typeParams": null diff --git a/ecmascript/parser/tests/typescript/v4/issue-865/input.ts.json b/ecmascript/parser/tests/typescript/v4/issue-865/input.ts.json index 0cbbfcbbba91..7a7407d775f3 100644 --- a/ecmascript/parser/tests/typescript/v4/issue-865/input.ts.json +++ b/ecmascript/parser/tests/typescript/v4/issue-865/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "Range", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -49,8 +48,8 @@ "ctxt": 0 }, "value": "start", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "ty": { "type": "TsKeywordType", @@ -77,8 +76,8 @@ "ctxt": 0 }, "value": "end", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "ty": { "type": "TsKeywordType", diff --git a/ecmascript/parser/tests/typescript/v4/issue-866/input.ts.json b/ecmascript/parser/tests/typescript/v4/issue-866/input.ts.json index 474573eef298..7720bc483add 100644 --- a/ecmascript/parser/tests/typescript/v4/issue-866/input.ts.json +++ b/ecmascript/parser/tests/typescript/v4/issue-866/input.ts.json @@ -29,8 +29,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -40,7 +40,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -68,8 +67,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -79,7 +78,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } @@ -107,8 +105,8 @@ "ctxt": 0 }, "value": "a", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "right": { "type": "Identifier", @@ -118,7 +116,6 @@ "ctxt": 0 }, "value": "b", - "typeAnnotation": null, "optional": false } } diff --git a/ecmascript/parser/tests/typescript/v4/issue-941/input.ts.json b/ecmascript/parser/tests/typescript/v4/issue-941/input.ts.json index 3d864b50cd71..3779e2e966b4 100644 --- a/ecmascript/parser/tests/typescript/v4/issue-941/input.ts.json +++ b/ecmascript/parser/tests/typescript/v4/issue-941/input.ts.json @@ -37,6 +37,7 @@ "ctxt": 0 }, "value": "e", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -53,8 +54,7 @@ }, "kind": "unknown" } - }, - "optional": false + } }, "body": { "type": "BlockStatement", diff --git a/ecmascript/parser/tests/typescript/v4/optional-tuple-element/input.ts.json b/ecmascript/parser/tests/typescript/v4/optional-tuple-element/input.ts.json index a0eb50616a20..507a5f1c0021 100644 --- a/ecmascript/parser/tests/typescript/v4/optional-tuple-element/input.ts.json +++ b/ecmascript/parser/tests/typescript/v4/optional-tuple-element/input.ts.json @@ -22,7 +22,6 @@ "ctxt": 0 }, "value": "Foo", - "typeAnnotation": null, "optional": false }, "typeParams": null, @@ -49,8 +48,8 @@ "ctxt": 0 }, "value": "first", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "ty": { "type": "TsKeywordType", @@ -77,8 +76,8 @@ "ctxt": 0 }, "value": "second", - "typeAnnotation": null, - "optional": true + "optional": true, + "typeAnnotation": null }, "ty": { "type": "TsKeywordType", @@ -117,8 +116,8 @@ "ctxt": 0 }, "value": "rest", - "typeAnnotation": null, - "optional": false + "optional": false, + "typeAnnotation": null }, "typeAnnotation": null }, diff --git a/ecmascript/parser/tests/typescript/variable-declarator/definite-assignment/input.ts.json b/ecmascript/parser/tests/typescript/variable-declarator/definite-assignment/input.ts.json index 22d84a219bab..92bb07e16d48 100644 --- a/ecmascript/parser/tests/typescript/variable-declarator/definite-assignment/input.ts.json +++ b/ecmascript/parser/tests/typescript/variable-declarator/definite-assignment/input.ts.json @@ -31,6 +31,7 @@ "ctxt": 0 }, "value": "x", + "optional": false, "typeAnnotation": { "type": "TsTypeAnnotation", "span": { @@ -47,8 +48,7 @@ }, "kind": "number" } - }, - "optional": false + } }, "init": null, "definite": true diff --git a/ecmascript/preset_env/Cargo.toml b/ecmascript/preset_env/Cargo.toml index 8764859a1297..a575db25adae 100644 --- a/ecmascript/preset_env/Cargo.toml +++ b/ecmascript/preset_env/Cargo.toml @@ -5,7 +5,7 @@ documentation = "https://swc.rs/rustdoc/swc_ecma_preset_env/" edition = "2018" license = "Apache-2.0/MIT" name = "swc_ecma_preset_env" -version = "0.6.0" +version = "0.7.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -20,14 +20,14 @@ st-map = "0.1.2" string_enum = {version = "0.3", path = "../../macros/string_enum"} swc_atoms = {version = "0.2", path = "../../atoms"} swc_common = {version = "0.10", path = "../../common"} -swc_ecma_ast = {version = "0.38.0", path = "../ast"} -swc_ecma_transforms = {version = "0.36.0", path = "../transforms", features = ["compat", "proposal"]} -swc_ecma_utils = {version = "0.28.0", path = "../utils"} -swc_ecma_visit = {version = "0.24.0", path = "../visit"} +swc_ecma_ast = {version = "0.39.0", path = "../ast"} +swc_ecma_transforms = {version = "0.37.0", path = "../transforms", features = ["compat", "proposal"]} +swc_ecma_utils = {version = "0.29.0", path = "../utils"} +swc_ecma_visit = {version = "0.25.0", path = "../visit"} walkdir = "2" [dev-dependencies] pretty_assertions = "0.6" -swc_ecma_codegen = {version = "0.45.0", path = "../codegen"} -swc_ecma_parser = {version = "0.47.0", path = "../parser"} +swc_ecma_codegen = {version = "0.46.0", path = "../codegen"} +swc_ecma_parser = {version = "0.48.0", path = "../parser"} testing = {version = "0.10", path = "../../testing"} diff --git a/ecmascript/transforms/Cargo.toml b/ecmascript/transforms/Cargo.toml index cb41608d05a5..186047e12ee8 100644 --- a/ecmascript/transforms/Cargo.toml +++ b/ecmascript/transforms/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" license = "Apache-2.0/MIT" name = "swc_ecma_transforms" repository = "https://github.com/swc-project/swc.git" -version = "0.36.0" +version = "0.37.0" [features] compat = ["swc_ecma_transforms_compat"] @@ -19,24 +19,24 @@ typescript = ["swc_ecma_transforms_typescript"] [dependencies] swc_atoms = {version = "0.2.0", path = "../../atoms"} swc_common = {version = "0.10.0", path = "../../common"} -swc_ecma_ast = {version = "0.38.0", path = "../ast"} -swc_ecma_parser = {version = "0.47.0", path = "../parser"} -swc_ecma_transforms_base = {version = "0.4.0", path = "./base"} -swc_ecma_transforms_compat = {version = "0.5.0", path = "./compat", optional = true} -swc_ecma_transforms_module = {version = "0.5.0", path = "./module", optional = true} -swc_ecma_transforms_optimization = {version = "0.6.0", path = "./optimization", optional = true} -swc_ecma_transforms_proposal = {version = "0.5.0", path = "./proposal", optional = true} -swc_ecma_transforms_react = {version = "0.6.0", path = "./react", optional = true} -swc_ecma_transforms_typescript = {version = "0.5.0", path = "./typescript", optional = true} -swc_ecma_utils = {version = "0.28.0", path = "../utils"} -swc_ecma_visit = {version = "0.24.0", path = "../visit"} +swc_ecma_ast = {version = "0.39.0", path = "../ast"} +swc_ecma_parser = {version = "0.48.0", path = "../parser"} +swc_ecma_transforms_base = {version = "0.5.0", path = "./base"} +swc_ecma_transforms_compat = {version = "0.6.0", path = "./compat", optional = true} +swc_ecma_transforms_module = {version = "0.6.0", path = "./module", optional = true} +swc_ecma_transforms_optimization = {version = "0.7.0", path = "./optimization", optional = true} +swc_ecma_transforms_proposal = {version = "0.6.0", path = "./proposal", optional = true} +swc_ecma_transforms_react = {version = "0.7.0", path = "./react", optional = true} +swc_ecma_transforms_typescript = {version = "0.6.0", path = "./typescript", optional = true} +swc_ecma_utils = {version = "0.29.0", path = "../utils"} +swc_ecma_visit = {version = "0.25.0", path = "../visit"} unicode-xid = "0.2" [dev-dependencies] pretty_assertions = "0.6" sourcemap = "6" -swc_ecma_codegen = {version = "0.45.0", path = "../codegen"} -swc_ecma_transforms_testing = {version = "0.4.0", path = "./testing"} +swc_ecma_codegen = {version = "0.46.0", path = "../codegen"} +swc_ecma_transforms_testing = {version = "0.5.0", path = "./testing"} tempfile = "3" testing = {version = "0.10.0", path = "../../testing"} walkdir = "2" diff --git a/ecmascript/transforms/base/Cargo.toml b/ecmascript/transforms/base/Cargo.toml index f549d2186e23..755ce5f40269 100644 --- a/ecmascript/transforms/base/Cargo.toml +++ b/ecmascript/transforms/base/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" license = "Apache-2.0/MIT" name = "swc_ecma_transforms_base" repository = "https://github.com/swc-project/swc.git" -version = "0.4.2" +version = "0.5.0" [dependencies] fxhash = "0.2.1" @@ -16,11 +16,11 @@ scoped-tls = "1.0.0" smallvec = "1.6.0" swc_atoms = {version = "0.2", path = "../../../atoms"} swc_common = {version = "0.10", path = "../../../common"} -swc_ecma_ast = {version = "0.38.0", path = "../../ast"} -swc_ecma_parser = {version = "0.47.0", path = "../../parser"} -swc_ecma_utils = {version = "0.28.0", path = "../../utils"} -swc_ecma_visit = {version = "0.24.0", path = "../../visit"} +swc_ecma_ast = {version = "0.39.0", path = "../../ast"} +swc_ecma_parser = {version = "0.48.0", path = "../../parser"} +swc_ecma_utils = {version = "0.29.0", path = "../../utils"} +swc_ecma_visit = {version = "0.25.0", path = "../../visit"} [dev-dependencies] -swc_ecma_codegen = {version = "0.45.0", path = "../../codegen"} +swc_ecma_codegen = {version = "0.46.0", path = "../../codegen"} testing = {version = "0.10", path = "../../../testing"} diff --git a/ecmascript/transforms/base/src/ext.rs b/ecmascript/transforms/base/src/ext.rs index 4c9dce4588dc..262459bd8304 100644 --- a/ecmascript/transforms/base/src/ext.rs +++ b/ecmascript/transforms/base/src/ext.rs @@ -96,6 +96,12 @@ impl MapWithMut for Ident { } } +impl MapWithMut for BindingIdent { + fn dummy() -> Self { + Ident::dummy().into() + } +} + impl MapWithMut for ObjectPatProp { fn dummy() -> Self { ObjectPatProp::Assign(AssignPatProp { @@ -108,7 +114,7 @@ impl MapWithMut for ObjectPatProp { impl MapWithMut for PatOrExpr { fn dummy() -> Self { - PatOrExpr::Pat(Box::new(Pat::Ident(Ident::dummy()))) + PatOrExpr::Pat(Box::new(Pat::Ident(BindingIdent::dummy()))) } } @@ -287,7 +293,7 @@ pub trait PatOrExprExt: AsOptExpr { _ => None, }, PatOrExpr::Pat(p) => match &**p { - Pat::Ident(i) => Some(i), + Pat::Ident(i) => Some(&i.id), _ => None, }, } @@ -296,7 +302,7 @@ pub trait PatOrExprExt: AsOptExpr { fn as_ident_mut(&mut self) -> Option<&mut Ident> { match self.as_mut() { PatOrExpr::Pat(p) => match **p { - Pat::Ident(ref mut i) => Some(i), + Pat::Ident(ref mut i) => Some(&mut i.id), Pat::Expr(ref mut e) => match e.deref_mut() { Expr::Ident(i) => Some(i), _ => None, @@ -337,12 +343,12 @@ impl PatOrExprExt for PatOrExpr { fn normalize_ident(self) -> Self { match self { PatOrExpr::Expr(expr) => match *expr { - Expr::Ident(i) => PatOrExpr::Pat(Box::new(Pat::Ident(i))), + Expr::Ident(i) => PatOrExpr::Pat(Box::new(Pat::Ident(i.into()))), _ => PatOrExpr::Expr(expr), }, PatOrExpr::Pat(pat) => match *pat { Pat::Expr(expr) => match *expr { - Expr::Ident(i) => PatOrExpr::Pat(Box::new(Pat::Ident(i))), + Expr::Ident(i) => PatOrExpr::Pat(Box::new(Pat::Ident(i.into()))), _ => PatOrExpr::Expr(expr), }, _ => PatOrExpr::Pat(pat), diff --git a/ecmascript/transforms/base/src/hygiene/ops.rs b/ecmascript/transforms/base/src/hygiene/ops.rs index 884e8e15f4a0..25ce5aeb46d7 100644 --- a/ecmascript/transforms/base/src/hygiene/ops.rs +++ b/ecmascript/transforms/base/src/hygiene/ops.rs @@ -232,11 +232,11 @@ impl<'a> VisitMut for Operator<'a> { value: match p.value.take() { Some(default_expr) => Box::new(Pat::Assign(AssignPat { span: p.span, - left: Box::new(Pat::Ident(renamed)), + left: Box::new(Pat::Ident(renamed.into())), right: default_expr, type_ann: None, })), - None => Box::new(Pat::Ident(renamed)), + None => Box::new(Pat::Ident(renamed.into())), }, } .into(); @@ -258,7 +258,6 @@ impl<'a> VisitMut for Operator<'a> { key: PropName::Ident(Ident { // clear mark span: i.span.with_ctxt(SyntaxContext::empty()), - type_ann: None, ..i.clone() }), value: Box::new(Expr::Ident(renamed)), diff --git a/ecmascript/transforms/base/src/hygiene/tests.rs b/ecmascript/transforms/base/src/hygiene/tests.rs index 93f881d80cc9..280077ec5699 100644 --- a/ecmascript/transforms/base/src/hygiene/tests.rs +++ b/ecmascript/transforms/base/src/hygiene/tests.rs @@ -509,7 +509,7 @@ fn fn_args() { params: vec![Param { span: DUMMY_SP, decorators: vec![], - pat: Pat::Ident(quote_ident!("force")), + pat: Pat::Ident(quote_ident!("force").into()), } .fold_with(&mut marker(&[("force", mark1)]))], type_params: Default::default(), @@ -635,12 +635,16 @@ fn params_in_fn() { Param { span: DUMMY_SP, decorators: Default::default(), - pat: Pat::Ident(Ident::new("param".into(), DUMMY_SP.apply_mark(mark1))), + pat: Pat::Ident( + Ident::new("param".into(), DUMMY_SP.apply_mark(mark1)).into(), + ), }, Param { span: DUMMY_SP, decorators: Default::default(), - pat: Pat::Ident(Ident::new("param".into(), DUMMY_SP.apply_mark(mark2))), + pat: Pat::Ident( + Ident::new("param".into(), DUMMY_SP.apply_mark(mark2)).into(), + ), }, ], type_params: Default::default(), diff --git a/ecmascript/transforms/base/src/resolver/mod.rs b/ecmascript/transforms/base/src/resolver/mod.rs index f720052fdbfc..d8ab795cb97a 100644 --- a/ecmascript/transforms/base/src/resolver/mod.rs +++ b/ecmascript/transforms/base/src/resolver/mod.rs @@ -973,6 +973,16 @@ impl<'a> VisitMut for Resolver<'a> { fn visit_mut_private_name(&mut self, _: &mut PrivateName) {} + fn visit_mut_binding_ident(&mut self, i: &mut BindingIdent) { + let ident_type = self.ident_type; + let in_type = self.in_type; + i.type_ann.visit_mut_with(self); + self.in_type = in_type; + self.ident_type = ident_type; + + i.id.visit_mut_with(self); + } + fn visit_mut_ident(&mut self, i: &mut Ident) { let ident_type = self.ident_type; let in_type = self.in_type; @@ -1111,7 +1121,10 @@ impl<'a> VisitMut for Resolver<'a> { self.ident_type = old_type; let cur_name = match decl.name { - Pat::Ident(Ident { ref sym, .. }) => Some((sym.clone(), self.mark)), + Pat::Ident(BindingIdent { + id: Ident { ref sym, .. }, + .. + }) => Some((sym.clone(), self.mark)), _ => None, }; @@ -1233,7 +1246,7 @@ impl VisitMut for Hoister<'_, '_> { fn visit_mut_pat(&mut self, node: &mut Pat) { self.resolver.in_type = false; match node { - Pat::Ident(i) => self.resolver.visit_mut_binding_ident(i, self.kind), + Pat::Ident(i) => self.resolver.visit_mut_binding_ident(&mut i.id, self.kind), _ => node.visit_mut_children_with(self), } } diff --git a/ecmascript/transforms/base/src/resolver/tests.rs b/ecmascript/transforms/base/src/resolver/tests.rs index 8e537acf2059..d0cea2701dd9 100644 --- a/ecmascript/transforms/base/src/resolver/tests.rs +++ b/ecmascript/transforms/base/src/resolver/tests.rs @@ -9,8 +9,6 @@ struct TsHygiene { impl VisitMut for TsHygiene { fn visit_mut_ident(&mut self, i: &mut Ident) { - i.type_ann.visit_mut_with(self); - if SyntaxContext::empty().apply_mark(self.top_level_mark) == i.span.ctxt { println!("ts_hygiene: {} is top-level", i.sym); return; @@ -2023,6 +2021,38 @@ to_ts!( " ); +to_ts!( + type_parameter_used_as_type_parameter_contrain_2, + " + var f3 = (x: T, y: U): T => { + x = y; + return y; + } + ", + " + var f3 = (x__2: T__2, y__2: U__2)=>{ + x__2 = y__2; + return y__2; + }; + " +); + +to_ts!( + type_parameter_used_as_type_parameter_contrain_3, + " + var f4 = (x: T, y: U): T => { + x = y; + return y; + } + ", + " + var f4 = (x__2: T__2, y__2: U__2)=>{ + x__2 = y__2; + return y__2; + }; + " +); + to_ts!( generic_call_type_argument_inference, " diff --git a/ecmascript/transforms/compat/Cargo.toml b/ecmascript/transforms/compat/Cargo.toml index f751778bd785..9f5cc63f8b45 100644 --- a/ecmascript/transforms/compat/Cargo.toml +++ b/ecmascript/transforms/compat/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" license = "Apache-2.0/MIT" name = "swc_ecma_transforms_compat" repository = "https://github.com/swc-project/swc.git" -version = "0.5.0" +version = "0.6.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] @@ -20,13 +20,13 @@ serde = {version = "1.0.118", features = ["derive"]} smallvec = "1.6.0" swc_atoms = {version = "0.2.5", path = "../../../atoms"} swc_common = {version = "0.10.8", path = "../../../common"} -swc_ecma_ast = {version = "0.38.0", path = "../../ast"} -swc_ecma_transforms_base = {version = "0.4.0", path = "../base"} +swc_ecma_ast = {version = "0.39.0", path = "../../ast"} +swc_ecma_transforms_base = {version = "0.5.0", path = "../base"} swc_ecma_transforms_macros = {version = "0.2.0", path = "../macros"} -swc_ecma_utils = {version = "0.28.0", path = "../../utils"} -swc_ecma_visit = {version = "0.24.0", path = "../../visit"} +swc_ecma_utils = {version = "0.29.0", path = "../../utils"} +swc_ecma_visit = {version = "0.25.0", path = "../../visit"} [dev-dependencies] -swc_ecma_parser = {version = "0.47.0", path = "../../parser"} -swc_ecma_transforms_testing = {version = "0.4.0", path = "../testing"} +swc_ecma_parser = {version = "0.48.0", path = "../../parser"} +swc_ecma_transforms_testing = {version = "0.5.0", path = "../testing"} testing = {version = "0.10.2", path = "../../../testing"} diff --git a/ecmascript/transforms/compat/src/es2015/block_scoped_fn.rs b/ecmascript/transforms/compat/src/es2015/block_scoped_fn.rs index 745e92403519..421d8f39890a 100644 --- a/ecmascript/transforms/compat/src/es2015/block_scoped_fn.rs +++ b/ecmascript/transforms/compat/src/es2015/block_scoped_fn.rs @@ -40,7 +40,7 @@ impl Fold for BlockScopedFns { kind: VarDeclKind::Let, decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(decl.ident.clone()), + name: Pat::Ident(decl.ident.clone().into()), init: Some(Box::new(Expr::Fn(FnExpr { ident: Some(decl.ident), function: decl.function, diff --git a/ecmascript/transforms/compat/src/es2015/block_scoping.rs b/ecmascript/transforms/compat/src/es2015/block_scoping.rs index ffe68c75d226..af7c3e319b0d 100644 --- a/ecmascript/transforms/compat/src/es2015/block_scoping.rs +++ b/ecmascript/transforms/compat/src/es2015/block_scoping.rs @@ -138,7 +138,7 @@ impl BlockScoping { let ident = private_ident!("_this"); self.vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(ident.clone()), + name: Pat::Ident(ident.clone().into()), init: Some(Box::new(Expr::This(ThisExpr { span: DUMMY_SP }))), definite: false, }); @@ -193,7 +193,7 @@ impl BlockScoping { self.vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(var_name.clone()), + name: Pat::Ident(var_name.clone().into()), init: Some(Box::new( FnExpr { ident: None, @@ -208,10 +208,10 @@ impl BlockScoping { Param { span: DUMMY_SP, decorators: Default::default(), - pat: Pat::Ident(Ident::new( - i.0.clone(), - DUMMY_SP.with_ctxt(ctxt), - )), + pat: Pat::Ident( + Ident::new(i.0.clone(), DUMMY_SP.with_ctxt(ctxt)) + .into(), + ), } }) .collect(), @@ -253,7 +253,7 @@ impl BlockScoping { declare: false, decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(ret.clone()), + name: Pat::Ident(ret.clone().into()), init: Some(Box::new(call.into())), definite: false, }], @@ -865,10 +865,9 @@ impl MutationHandler<'_> { for (id, ctxt) in &*self.map { exprs.push(Box::new(Expr::Assign(AssignExpr { span: DUMMY_SP, - left: PatOrExpr::Pat(Box::new(Pat::Ident(Ident::new( - id.0.clone(), - DUMMY_SP.with_ctxt(id.1), - )))), + left: PatOrExpr::Pat(Box::new(Pat::Ident( + Ident::new(id.0.clone(), DUMMY_SP.with_ctxt(id.1)).into(), + ))), op: op!("="), right: Box::new(Expr::Ident(Ident::new( id.0.clone(), diff --git a/ecmascript/transforms/compat/src/es2015/classes.rs b/ecmascript/transforms/compat/src/es2015/classes.rs index 94cf09f1aef3..7951917274a8 100644 --- a/ecmascript/transforms/compat/src/es2015/classes.rs +++ b/ecmascript/transforms/compat/src/es2015/classes.rs @@ -264,7 +264,7 @@ impl Classes { let params = vec![Param { span: DUMMY_SP, decorators: Default::default(), - pat: Pat::Ident(super_ident.clone()), + pat: Pat::Ident(super_ident.clone().into()), }]; let super_class = class.super_class.clone().unwrap(); @@ -505,7 +505,7 @@ impl Classes { kind: VarDeclKind::Var, decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(this.clone()), + name: Pat::Ident(this.clone().into()), init: None, definite: false, }], @@ -646,7 +646,7 @@ impl Classes { kind: VarDeclKind::Var, decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(quote_ident!(DUMMY_SP.apply_mark(mark), "_this")), + name: Pat::Ident(quote_ident!(DUMMY_SP.apply_mark(mark), "_this").into()), init: Some(Box::new(Expr::This(ThisExpr { span: DUMMY_SP }))), definite: false, }], @@ -787,7 +787,9 @@ impl Classes { kind: VarDeclKind::Var, decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(quote_ident!(DUMMY_SP.apply_mark(mark), "_this")), + name: Pat::Ident( + quote_ident!(DUMMY_SP.apply_mark(mark), "_this").into(), + ), init: Some(Box::new(Expr::This(ThisExpr { span: DUMMY_SP }))), definite: false, }], diff --git a/ecmascript/transforms/compat/src/es2015/classes/constructor.rs b/ecmascript/transforms/compat/src/es2015/classes/constructor.rs index 156fe91c215f..dfd9a1d971e8 100644 --- a/ecmascript/transforms/compat/src/es2015/classes/constructor.rs +++ b/ecmascript/transforms/compat/src/es2015/classes/constructor.rs @@ -209,10 +209,9 @@ impl Fold for ConstructorFolder<'_> { Expr::Assign(AssignExpr { span: DUMMY_SP, - left: PatOrExpr::Pat(Box::new(Pat::Ident(quote_ident!( - DUMMY_SP.apply_mark(self.mark), - "_this" - )))), + left: PatOrExpr::Pat(Box::new(Pat::Ident( + quote_ident!(DUMMY_SP.apply_mark(self.mark), "_this").into(), + ))), op: op!("="), right, }) @@ -257,10 +256,9 @@ impl Fold for ConstructorFolder<'_> { match self.mode { Some(SuperFoldingMode::Assign) => AssignExpr { span: DUMMY_SP, - left: PatOrExpr::Pat(Box::new(Pat::Ident(quote_ident!( - DUMMY_SP.apply_mark(self.mark), - "_this" - )))), + left: PatOrExpr::Pat(Box::new(Pat::Ident( + quote_ident!(DUMMY_SP.apply_mark(self.mark), "_this").into(), + ))), op: op!("="), right: expr.into(), } @@ -271,10 +269,9 @@ impl Fold for ConstructorFolder<'_> { kind: VarDeclKind::Var, decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(quote_ident!( - DUMMY_SP.apply_mark(self.mark), - "_this" - )), + name: Pat::Ident( + quote_ident!(DUMMY_SP.apply_mark(self.mark), "_this").into(), + ), init: Some(expr.into()), definite: false, }], @@ -495,11 +492,17 @@ impl<'a> Fold for VarRenamer<'a> { fn fold_pat(&mut self, pat: Pat) -> Pat { match pat { Pat::Ident(ident) => { - if *self.class_name == ident.sym { - Pat::Ident(Ident { - span: ident.span.apply_mark(self.mark), - ..ident - }) + if *self.class_name == ident.id.sym { + Pat::Ident( + BindingIdent { + id: Ident { + span: ident.id.span.apply_mark(self.mark), + ..ident.id + }, + ..ident + } + .into(), + ) } else { Pat::Ident(ident) } diff --git a/ecmascript/transforms/compat/src/es2015/classes/super_field.rs b/ecmascript/transforms/compat/src/es2015/classes/super_field.rs index f1e29ddf9418..5d26b73d6723 100644 --- a/ecmascript/transforms/compat/src/es2015/classes/super_field.rs +++ b/ecmascript/transforms/compat/src/es2015/classes/super_field.rs @@ -281,7 +281,7 @@ impl<'a> SuperCalleeFolder<'a> { // Memoize self.vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(ref_ident.clone()), + name: Pat::Ident(ref_ident.clone().into()), init: None, definite: false, }); @@ -289,7 +289,7 @@ impl<'a> SuperCalleeFolder<'a> { if is_update { self.vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(update_ident.clone()), + name: Pat::Ident(update_ident.clone().into()), init: None, definite: false, }); @@ -320,7 +320,7 @@ impl<'a> SuperCalleeFolder<'a> { op!("=") => prop_arg.as_arg(), _ => AssignExpr { span: DUMMY_SP, - left: PatOrExpr::Pat(Box::new(Pat::Ident(ref_ident.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(ref_ident.clone().into()))), op: op!("="), right: prop, } @@ -339,7 +339,7 @@ impl<'a> SuperCalleeFolder<'a> { Box::new( AssignExpr { span: DUMMY_SP, - left: PatOrExpr::Pat(Box::new(Pat::Ident(update_ident.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(update_ident.clone().into()))), op: op!("="), right: Box::new(Expr::Unary(UnaryExpr { span: DUMMY_SP, diff --git a/ecmascript/transforms/compat/src/es2015/computed_props.rs b/ecmascript/transforms/compat/src/es2015/computed_props.rs index a5804f90f769..6589fa159920 100644 --- a/ecmascript/transforms/compat/src/es2015/computed_props.rs +++ b/ecmascript/transforms/compat/src/es2015/computed_props.rs @@ -85,7 +85,7 @@ impl Fold for ObjectLitFolder { } else { Box::new(Expr::Assign(AssignExpr { span: DUMMY_SP, - left: PatOrExpr::Pat(Box::new(Pat::Ident(obj_ident.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(obj_ident.clone().into()))), op: op!("="), right: Box::new(Expr::Object(ObjectLit { span: DUMMY_SP, @@ -234,14 +234,14 @@ impl Fold for ObjectLitFolder { self.vars.push(VarDeclarator { span, - name: Pat::Ident(obj_ident.clone()), + name: Pat::Ident(obj_ident.clone().into()), init: None, definite: false, }); if self.used_define_enum_props { self.vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(mutator_map.clone()), + name: Pat::Ident(mutator_map.clone().into()), init: Some(Box::new(Expr::Object(ObjectLit { span: DUMMY_SP, props: vec![], diff --git a/ecmascript/transforms/compat/src/es2015/destructuring.rs b/ecmascript/transforms/compat/src/es2015/destructuring.rs index 21daa1586bc0..dd949bd626c9 100644 --- a/ecmascript/transforms/compat/src/es2015/destructuring.rs +++ b/ecmascript/transforms/compat/src/es2015/destructuring.rs @@ -71,7 +71,7 @@ macro_rules! impl_for_for_stmt { let left = VarDeclOrPat::VarDecl(VarDecl { decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(ref_ident.clone()), + name: Pat::Ident(ref_ident.clone().into()), init: None, definite: false, }], @@ -104,7 +104,7 @@ macro_rules! impl_for_for_stmt { } _ => { let left_ident = make_ref_ident_for_for_stmt(); - let left = VarDeclOrPat::Pat(Pat::Ident(left_ident.clone())); + let left = VarDeclOrPat::Pat(Pat::Ident(left_ident.clone().into())); // Unpack variables let stmt = AssignExpr { span: DUMMY_SP, @@ -266,7 +266,7 @@ impl AssignFolder { if aliased { decls.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(ident.clone()), + name: Pat::Ident(ident.clone().into()), init: decl.init, definite: false, }); @@ -283,7 +283,7 @@ impl AssignFolder { // decls.push(VarDeclarator { span, - name: Pat::Ident(ident.clone()), + name: Pat::Ident(ident.clone().into()), init: Some(Box::new(Expr::Cond(CondExpr { span: DUMMY_SP, test: Box::new(Expr::Bin(BinExpr { @@ -377,7 +377,7 @@ impl AssignFolder { let var_decl = VarDeclarator { span: prop_span, - name: Pat::Ident(key.clone()), + name: Pat::Ident(key.clone().into()), init: Some(Box::new(make_cond_expr(ref_ident, value))), definite: false, }; @@ -386,7 +386,7 @@ impl AssignFolder { None => { let var_decl = VarDeclarator { span: prop_span, - name: Pat::Ident(key.clone()), + name: Pat::Ident(key.clone().into()), init: Some(Box::new(make_ref_prop_expr( &ref_ident, Box::new(key.clone().into()), @@ -431,7 +431,7 @@ impl AssignFolder { let tmp_ident = private_ident!(span, "tmp"); decls.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(tmp_ident.clone()), + name: Pat::Ident(tmp_ident.clone().into()), init, definite: false, }); @@ -486,7 +486,7 @@ impl Destructuring { params.push(Param { span: DUMMY_SP, decorators: Default::default(), - pat: Pat::Ident(ref_ident.clone()), + pat: Pat::Ident(ref_ident.clone().into()), }); decls.push(VarDeclarator { span, @@ -635,7 +635,7 @@ impl Fold for AssignFolder { exprs.push(Box::new(Expr::Assign(AssignExpr { span: DUMMY_SP, op: op!("="), - left: PatOrExpr::Pat(Box::new(Pat::Ident(ref_ident.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(ref_ident.clone().into()))), right, }))); @@ -656,7 +656,7 @@ impl Fold for AssignFolder { exprs.push(Box::new(Expr::Assign(AssignExpr { span: DUMMY_SP, left: PatOrExpr::Pat(Box::new(Pat::Ident( - assign_ref_ident.clone(), + assign_ref_ident.clone().into(), ))), op: op!("="), right: Box::new( @@ -721,7 +721,7 @@ impl Fold for AssignFolder { exprs.push(Box::new(Expr::Assign(AssignExpr { span, - left: PatOrExpr::Pat(Box::new(Pat::Ident(ref_ident.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(ref_ident.clone().into()))), op: op!("="), right, }))); @@ -757,7 +757,7 @@ impl Fold for AssignFolder { exprs.push(Box::new(Expr::Assign(AssignExpr { span, left: PatOrExpr::Pat(Box::new(Pat::Ident( - prop_ident.clone(), + prop_ident.clone().into(), ))), op: op!("="), right: Box::new(make_ref_prop_expr( @@ -770,7 +770,7 @@ impl Fold for AssignFolder { exprs.push(Box::new(Expr::Assign(AssignExpr { span, left: PatOrExpr::Pat(Box::new(Pat::Ident( - key.clone(), + key.clone().into(), ))), op: op!("="), right: Box::new(make_cond_expr(prop_ident, value)), @@ -780,7 +780,7 @@ impl Fold for AssignFolder { exprs.push(Box::new(Expr::Assign(AssignExpr { span, left: PatOrExpr::Pat(Box::new(Pat::Ident( - key.clone(), + key.clone().into(), ))), op: op!("="), right: Box::new(make_ref_prop_expr( @@ -960,7 +960,7 @@ fn make_ref_ident_for_array( if aliased { decls.push(VarDeclarator { span, - name: Pat::Ident(ref_ident.clone()), + name: Pat::Ident(ref_ident.clone().into()), init: init.map(|v| { if c.loose || match *v { diff --git a/ecmascript/transforms/compat/src/es2015/for_of.rs b/ecmascript/transforms/compat/src/es2015/for_of.rs index 2c8648a36e04..d72c3730417a 100644 --- a/ecmascript/transforms/compat/src/es2015/for_of.rs +++ b/ecmascript/transforms/compat/src/es2015/for_of.rs @@ -113,7 +113,7 @@ impl Actual { let mut decls = Vec::with_capacity(2); decls.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(i.clone()), + name: Pat::Ident(i.clone().into()), init: Some(Box::new(Expr::Lit(Lit::Num(Number { span: DUMMY_SP, value: 0f64, @@ -124,7 +124,7 @@ impl Actual { if aliased { decls.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(arr.clone()), + name: Pat::Ident(arr.clone().into()), init: Some(right), definite: false, }); @@ -241,7 +241,7 @@ impl Actual { let normal_completion_ident = Ident::new("_iteratorNormalCompletion".into(), var_span); self.top_level_vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(normal_completion_ident.clone()), + name: Pat::Ident(normal_completion_ident.clone().into()), init: Some(Box::new(Expr::Lit(Lit::Bool(Bool { span: DUMMY_SP, value: true, @@ -251,7 +251,7 @@ impl Actual { let error_flag_ident = Ident::new("_didIteratorError".into(), var_span); self.top_level_vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(error_flag_ident.clone()), + name: Pat::Ident(error_flag_ident.clone().into()), init: Some(Box::new(Expr::Lit(Lit::Bool(Bool { span: DUMMY_SP, value: false, @@ -261,7 +261,7 @@ impl Actual { let error_ident = Ident::new("_iteratorError".into(), var_span); self.top_level_vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(error_ident.clone()), + name: Pat::Ident(error_ident.clone().into()), init: Some(Box::new(Expr::Ident(Ident::new( js_word!("undefined"), DUMMY_SP, @@ -278,7 +278,7 @@ impl Actual { decls: vec![ VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(iterator.clone()), + name: Pat::Ident(iterator.clone().into()), init: Some(Box::new(Expr::Call(CallExpr { span: DUMMY_SP, callee: right @@ -291,7 +291,7 @@ impl Actual { }, VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(step.clone()), + name: Pat::Ident(step.clone().into()), init: None, definite: false, }, @@ -304,7 +304,7 @@ impl Actual { arg: { let step_expr = Box::new(Expr::Assign(AssignExpr { span: DUMMY_SP, - left: PatOrExpr::Pat(Box::new(Pat::Ident(step))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(step.into()))), op: op!("="), // `_iterator.next()` right: Box::new(Expr::Call(CallExpr { @@ -318,7 +318,9 @@ impl Actual { let iteration_normal_completion = Box::new(Expr::Assign(AssignExpr { span: DUMMY_SP, - left: PatOrExpr::Pat(Box::new(Pat::Ident(normal_completion_ident.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident( + normal_completion_ident.clone().into(), + ))), op: op!("="), right: Box::new(step_expr.make_member(quote_ident!("done"))), })); @@ -330,7 +332,7 @@ impl Actual { // `_iteratorNormalCompletion = true` update: Some(Box::new(Expr::Assign(AssignExpr { span: DUMMY_SP, - left: PatOrExpr::Pat(Box::new(Pat::Ident(normal_completion_ident.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(normal_completion_ident.clone().into()))), op: op!("="), right: Box::new(Expr::Lit(Lit::Bool(Bool { span: DUMMY_SP, @@ -358,7 +360,7 @@ impl Actual { }, handler: Some(CatchClause { span: DUMMY_SP, - param: Some(Pat::Ident(quote_ident!("err"))), + param: Some(Pat::Ident(quote_ident!("err").into())), // _didIteratorError = true; // _iteratorError = err; body: BlockStmt { @@ -367,7 +369,9 @@ impl Actual { // _didIteratorError = true; AssignExpr { span: DUMMY_SP, - left: PatOrExpr::Pat(Box::new(Pat::Ident(error_flag_ident.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident( + error_flag_ident.clone().into(), + ))), op: op!("="), right: Box::new(Expr::Lit(Lit::Bool(Bool { span: DUMMY_SP, @@ -378,7 +382,7 @@ impl Actual { // _iteratorError = err; AssignExpr { span: DUMMY_SP, - left: PatOrExpr::Pat(Box::new(Pat::Ident(error_ident.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(error_ident.clone().into()))), op: op!("="), right: Box::new(Expr::Ident(quote_ident!("err"))), } diff --git a/ecmascript/transforms/compat/src/es2015/function_name.rs b/ecmascript/transforms/compat/src/es2015/function_name.rs index d52a9beead18..6b1d520c192e 100644 --- a/ecmascript/transforms/compat/src/es2015/function_name.rs +++ b/ecmascript/transforms/compat/src/es2015/function_name.rs @@ -97,7 +97,7 @@ impl Fold for FnName { match decl.name { Pat::Ident(ref mut ident) => { let mut folder = Renamer { - name: Some(prepare(ident.clone(), false)), + name: Some(prepare(ident.id.clone(), false)), }; let init = decl.init.fold_with(&mut folder); diff --git a/ecmascript/transforms/compat/src/es2015/parameters.rs b/ecmascript/transforms/compat/src/es2015/parameters.rs index 5ac06624a4eb..17a231372e49 100644 --- a/ecmascript/transforms/compat/src/es2015/parameters.rs +++ b/ecmascript/transforms/compat/src/es2015/parameters.rs @@ -32,7 +32,7 @@ impl Params { let binding = private_ident!(span, "param"); params.push(Param { - pat: Pat::Ident(binding.clone()), + pat: Pat::Ident(binding.clone().into()), ..param }); decls.push(VarDeclarator { @@ -48,7 +48,7 @@ impl Params { params.push(Param { span: DUMMY_SP, decorators: Default::default(), - pat: Pat::Ident(binding.clone()), + pat: Pat::Ident(binding.clone().into()), }); // This expands to invalid code, but is fixed by destructing pass decls.push(VarDeclarator { @@ -74,7 +74,7 @@ impl Params { let len_ident = quote_ident!(span.apply_mark(mark), "_len"); let arg = match *arg { - Pat::Ident(ident) => ident, + Pat::Ident(ident) => ident.id, arg => { let tmp_ident = quote_ident!(span.apply_mark(mark), "_tmp"); decls_after_unpack.push(VarDeclarator { @@ -136,14 +136,14 @@ impl Params { // _len = arguments.length - i VarDeclarator { span, - name: Pat::Ident(len_ident.clone()), + name: Pat::Ident(len_ident.clone().into()), init: Some(member_expr!(span, arguments.length)), definite: false, }, // a1 = new Array(_len - $i) VarDeclarator { span, - name: Pat::Ident(arg.clone()), + name: Pat::Ident(arg.clone().into()), init: Some(Box::new(Expr::New(NewExpr { span, callee: Box::new(quote_ident!("Array").into()), @@ -158,7 +158,7 @@ impl Params { // _key = 0 VarDeclarator { span, - name: Pat::Ident(idx_ident.clone()), + name: Pat::Ident(idx_ident.clone().into()), init: Some(Box::new(Expr::Lit(Lit::Num(Number { span, value: i as f64, diff --git a/ecmascript/transforms/compat/src/es2015/regenerator/case.rs b/ecmascript/transforms/compat/src/es2015/regenerator/case.rs index 075ed72c9021..4578063da02b 100644 --- a/ecmascript/transforms/compat/src/es2015/regenerator/case.rs +++ b/ecmascript/transforms/compat/src/es2015/regenerator/case.rs @@ -1561,7 +1561,7 @@ impl Fold for CatchParamHandler<'_> { None => return node, Some(Pat::Ident(i)) => match &node { Expr::Ident(r) => { - if r.sym == i.sym && i.span.ctxt() == r.span.ctxt() { + if r.sym == i.id.sym && i.id.span.ctxt() == r.span.ctxt() { return self.safe_param.clone(); } } diff --git a/ecmascript/transforms/compat/src/es2015/regenerator/mod.rs b/ecmascript/transforms/compat/src/es2015/regenerator/mod.rs index 2adcc5f7e2e9..69d2759f466d 100644 --- a/ecmascript/transforms/compat/src/es2015/regenerator/mod.rs +++ b/ecmascript/transforms/compat/src/es2015/regenerator/mod.rs @@ -44,7 +44,7 @@ fn rt(global_mark: Mark, rt: Ident) -> Stmt { declare: false, decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(rt), + name: Pat::Ident(rt.into()), init: Some(Box::new(Expr::Call(CallExpr { span: DUMMY_SP, callee: quote_ident!(DUMMY_SP.apply_mark(global_mark), "require").as_callee(), @@ -144,7 +144,7 @@ impl Fold for Regenerator { self.top_level_vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(marked.clone()), + name: Pat::Ident(marked.clone().into()), init: Some(Box::new(Expr::Call(CallExpr { span: DUMMY_SP, callee: self @@ -313,7 +313,7 @@ impl Regenerator { self.outer_fn_vars .extend(hoister.vars.into_iter().map(|id| VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(id), + name: Pat::Ident(id.into()), init: None, definite: false, })); @@ -321,7 +321,7 @@ impl Regenerator { .extend(hoister.arguments.into_iter().map(|id| { VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(id.clone()), + name: Pat::Ident(id.clone().into()), init: Some(Box::new( Ident { sym: js_word!("arguments"), @@ -434,7 +434,7 @@ impl Regenerator { params: vec![Param { span: DUMMY_SP, decorators: Default::default(), - pat: Pat::Ident(ctx.clone()), + pat: Pat::Ident(ctx.clone().into()), }], decorators: Default::default(), span: DUMMY_SP, diff --git a/ecmascript/transforms/compat/src/es2015/spread.rs b/ecmascript/transforms/compat/src/es2015/spread.rs index 71a98404432f..19fa427ecc32 100644 --- a/ecmascript/transforms/compat/src/es2015/spread.rs +++ b/ecmascript/transforms/compat/src/es2015/spread.rs @@ -144,7 +144,7 @@ impl Fold for ActualFolder { self.vars.push(VarDeclarator { span: DUMMY_SP, definite: false, - name: Pat::Ident(ident.clone()), + name: Pat::Ident(ident.clone().into()), // Initialized by paren exprssion. init: None, }); @@ -152,7 +152,7 @@ impl Fold for ActualFolder { let this = Box::new(Expr::Ident(ident.clone())); let callee = Expr::Assign(AssignExpr { span: DUMMY_SP, - left: PatOrExpr::Pat(Box::new(Pat::Ident(ident))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(ident.into()))), op: op!("="), right: expr, }); diff --git a/ecmascript/transforms/compat/src/es2017/async_to_generator.rs b/ecmascript/transforms/compat/src/es2017/async_to_generator.rs index 3f5b49088c37..df71ed0bf1cf 100644 --- a/ecmascript/transforms/compat/src/es2017/async_to_generator.rs +++ b/ecmascript/transforms/compat/src/es2017/async_to_generator.rs @@ -424,12 +424,12 @@ impl MethodFolder { self.vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(ident.clone()), + name: Pat::Ident(ident.clone().into()), init: Some(Box::new(Expr::Arrow(ArrowExpr { span: DUMMY_SP, is_async: false, is_generator: false, - params: vec![Pat::Ident(args_ident.clone())], + params: vec![Pat::Ident(args_ident.clone().into())], body: BlockStmtOrExpr::Expr(Box::new(Expr::Assign(AssignExpr { span: DUMMY_SP, left: PatOrExpr::Expr(Box::new( @@ -548,7 +548,7 @@ impl Fold for MethodFolder { self.vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(ident.clone()), + name: Pat::Ident(ident.clone().into()), init: Some(Box::new(Expr::Arrow(ArrowExpr { span: DUMMY_SP, is_async: false, @@ -556,7 +556,7 @@ impl Fold for MethodFolder { params: vec![Pat::Rest(RestPat { span: DUMMY_SP, dot3_token: DUMMY_SP, - arg: Box::new(Pat::Ident(args_ident.clone())), + arg: Box::new(Pat::Ident(args_ident.clone().into())), type_ann: Default::default(), })], body: BlockStmtOrExpr::Expr(Box::new(Expr::Call(CallExpr { @@ -597,7 +597,7 @@ impl Fold for MethodFolder { let (_, ident) = self.ident_for_super(&prop); self.vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(ident.clone()), + name: Pat::Ident(ident.clone().into()), init: Some(Box::new(Expr::Arrow(ArrowExpr { span: DUMMY_SP, is_async: false, @@ -678,7 +678,7 @@ impl Actual { match p.pat { Pat::Ident(..) => Some(p.clone()), Pat::Array(..) | Pat::Object(..) => Some(Param { - pat: Pat::Ident(private_ident!("_")), + pat: Pat::Ident(private_ident!("_").into()), ..p.clone() }), _ => { @@ -709,7 +709,9 @@ impl Actual { stmts: vec![ AssignExpr { span: DUMMY_SP, - left: PatOrExpr::Pat(Box::new(Pat::Ident(real_fn_ident.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident( + real_fn_ident.clone().into(), + ))), op: op!("="), right: Box::new(right), } @@ -739,7 +741,7 @@ impl Actual { kind: VarDeclKind::Var, decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(real_fn_ident.clone()), + name: Pat::Ident(real_fn_ident.clone().into()), init: Some(Box::new(right)), definite: false, }], diff --git a/ecmascript/transforms/compat/src/es2018/object_rest_spread.rs b/ecmascript/transforms/compat/src/es2018/object_rest_spread.rs index 82fcabae40fc..b4e9d046235b 100644 --- a/ecmascript/transforms/compat/src/es2018/object_rest_spread.rs +++ b/ecmascript/transforms/compat/src/es2018/object_rest_spread.rs @@ -46,7 +46,7 @@ macro_rules! impl_for_for_stmt { let left = VarDeclOrPat::VarDecl(VarDecl { decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(ref_ident.clone()), + name: Pat::Ident(ref_ident.clone().into()), init: None, definite: false, }], @@ -115,7 +115,7 @@ macro_rules! impl_for_for_stmt { kind: VarDeclKind::Var, decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(var_ident.clone()), + name: Pat::Ident(var_ident.clone().into()), init: None, definite: false, }], @@ -178,14 +178,14 @@ impl Fold for RestFolder { // println!("Var: var_ident = None"); self.mutable_vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(var_ident.clone()), + name: Pat::Ident(var_ident.clone().into()), init: None, definite: false, }); // println!("Expr: var_ident = right"); self.exprs.push(Box::new(Expr::Assign(AssignExpr { span: DUMMY_SP, - left: PatOrExpr::Pat(Box::new(Pat::Ident(var_ident.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(var_ident.clone().into()))), op: op!("="), right, }))); @@ -284,7 +284,7 @@ impl Fold for RestFolder { // } let (var_ident, _) = match decl.name { - Pat::Ident(ref i) => (i.clone(), false), + Pat::Ident(ref i) => (i.id.clone(), false), _ => match decl.init { Some(ref e) => alias_if_required(e, "_ref"), @@ -338,7 +338,7 @@ impl Fold for RestFolder { // println!("Var: var_ident = init",); self.push_var_if_not_empty(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(var_ident.clone()), + name: Pat::Ident(var_ident.clone().into()), init: Some(init), definite: false, }); @@ -560,7 +560,7 @@ impl RestFolder { if let Some(e1) = decl.init { if let Expr::Ident(ref i1) = *e1 { if let Pat::Ident(ref i2) = decl.name { - if *i1 == *i2 { + if *i1 == i2.id { return; } } @@ -580,7 +580,7 @@ impl RestFolder { if let Some(e1) = decl.init { if let Expr::Ident(ref i1) = *e1 { if let Pat::Ident(ref i2) = decl.name { - if *i1 == *i2 { + if *i1 == i2.id { return; } } @@ -638,7 +638,7 @@ impl RestFolder { }, ); index += 1; - Some(Pat::Ident(var_ident.clone())) + Some(Pat::Ident(var_ident.clone().into())) } _ => elem, }) @@ -668,7 +668,7 @@ impl RestFolder { decorators: Default::default(), pat: Pat::Assign(AssignPat { span, - left: Box::new(Pat::Ident(var_ident)), + left: Box::new(Pat::Ident(var_ident.into())), right, ..n }), @@ -688,7 +688,7 @@ impl RestFolder { Param { span: DUMMY_SP, decorators: Default::default(), - pat: Pat::Ident(var_ident), + pat: Pat::Ident(var_ident.into()), } } } @@ -856,7 +856,7 @@ impl RestFolder { *index += 1; self.vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(ident.clone()), + name: Pat::Ident(ident.clone().into()), init: Some(c.expr), definite: false, }); diff --git a/ecmascript/transforms/compat/src/es2020/class_properties.rs b/ecmascript/transforms/compat/src/es2020/class_properties.rs index c428f833bf58..76c2d3deb6b1 100644 --- a/ecmascript/transforms/compat/src/es2020/class_properties.rs +++ b/ecmascript/transforms/compat/src/es2020/class_properties.rs @@ -332,7 +332,7 @@ impl ClassProperties { // Handle computed property vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(ident.clone()), + name: Pat::Ident(ident.clone().into()), init: Some(expr), definite: false, }); @@ -408,7 +408,7 @@ impl ClassProperties { // Handle computed property vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(ident.clone()), + name: Pat::Ident(ident.clone().into()), init: Some(prop.key), definite: false, }); @@ -590,7 +590,7 @@ impl ClassProperties { decls: vec![VarDeclarator { span: DUMMY_SP, definite: false, - name: Pat::Ident(ident.clone()), + name: Pat::Ident(ident.clone().into()), init: Some(extra_init), }], }))); @@ -618,22 +618,16 @@ impl ClassProperties { c.params = c.params.move_map(|mut param| match &mut param { ParamOrTsParamProp::TsParamProp(p) => match &p.param { TsParamPropParam::Ident(i) => { - typescript_constructor_properties.push(store(&Ident { - type_ann: None, - ..i.clone() - })); + typescript_constructor_properties.push(store(&i.id)); ParamOrTsParamProp::Param(Param { span: p.span, decorators: take(&mut p.decorators), - pat: Pat::Ident(i.clone()), + pat: Pat::Ident(i.clone().into()), }) } TsParamPropParam::Assign(pat) => match &*pat.left { Pat::Ident(i) => { - typescript_constructor_properties.push(store(&Ident { - type_ann: None, - ..i.clone() - })); + typescript_constructor_properties.push(store(&i.id)); ParamOrTsParamProp::Param(Param { span: p.span, decorators: take(&mut p.decorators), diff --git a/ecmascript/transforms/compat/src/es2020/class_properties/private_field.rs b/ecmascript/transforms/compat/src/es2020/class_properties/private_field.rs index 15970629f27c..597f74f24879 100644 --- a/ecmascript/transforms/compat/src/es2020/class_properties/private_field.rs +++ b/ecmascript/transforms/compat/src/es2020/class_properties/private_field.rs @@ -105,13 +105,13 @@ impl<'a> Fold for FieldAccessFolder<'a> { } else { self.vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(var.clone()), + name: Pat::Ident(var.clone().into()), init: None, definite: false, }); AssignExpr { span: obj.span(), - left: PatOrExpr::Pat(Box::new(Pat::Ident(var.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(var.clone().into()))), op: op!("="), right: obj, } @@ -122,7 +122,7 @@ impl<'a> Fold for FieldAccessFolder<'a> { if !prefix { self.vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(old_var.clone()), + name: Pat::Ident(old_var.clone().into()), init: None, definite: false, }); @@ -140,7 +140,7 @@ impl<'a> Fold for FieldAccessFolder<'a> { } else { Box::new(Expr::Assign(AssignExpr { span: DUMMY_SP, - left: PatOrExpr::Pat(Box::new(Pat::Ident(old_var.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(old_var.clone().into()))), op: op!("="), right: left, })) @@ -254,13 +254,13 @@ impl<'a> Fold for FieldAccessFolder<'a> { } else { self.vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(var.clone()), + name: Pat::Ident(var.clone().into()), init: None, definite: false, }); AssignExpr { span: obj.span(), - left: PatOrExpr::Pat(Box::new(Pat::Ident(var.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(var.clone().into()))), op: op!("="), right: obj, } @@ -512,7 +512,7 @@ impl<'a> FieldAccessFolder<'a> { aliased = true; self.vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(var.clone()), + name: Pat::Ident(var.clone().into()), init: None, definite: false, }); @@ -531,7 +531,9 @@ impl<'a> FieldAccessFolder<'a> { if aliased { AssignExpr { span: DUMMY_SP, - left: PatOrExpr::Pat(Box::new(Pat::Ident(var.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident( + var.clone().into(), + ))), op: op!("="), right: obj, } diff --git a/ecmascript/transforms/compat/src/es2020/nullish_coalescing/mod.rs b/ecmascript/transforms/compat/src/es2020/nullish_coalescing/mod.rs index 99989f1c1aa2..67efb38f848f 100644 --- a/ecmascript/transforms/compat/src/es2020/nullish_coalescing/mod.rs +++ b/ecmascript/transforms/compat/src/es2020/nullish_coalescing/mod.rs @@ -83,7 +83,7 @@ impl Fold for NullishCoalescing { if aliased { self.vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(l.clone()), + name: Pat::Ident(l.clone().into()), init: None, definite: false, }); @@ -93,7 +93,7 @@ impl Fold for NullishCoalescing { Expr::Assign(AssignExpr { span: DUMMY_SP, op: op!("="), - left: PatOrExpr::Pat(Box::new(Pat::Ident(l.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(l.clone().into()))), right: left, }) } else { @@ -110,7 +110,7 @@ impl Fold for NullishCoalescing { if aliased { self.vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(alias.clone()), + name: Pat::Ident(alias.clone().into()), init: None, definite: false, }); @@ -120,7 +120,7 @@ impl Fold for NullishCoalescing { Expr::Assign(AssignExpr { span: DUMMY_SP, op: op!("="), - left: PatOrExpr::Pat(Box::new(Pat::Ident(alias.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(alias.clone().into()))), right: left.take(), }) } else { @@ -130,7 +130,7 @@ impl Fold for NullishCoalescing { return Expr::Assign(AssignExpr { span: assign.span, op: op!("="), - left: PatOrExpr::Pat(Box::new(Pat::Ident(alias.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(alias.clone().into()))), right: Box::new(make_cond( assign.span, &alias, @@ -147,8 +147,8 @@ impl Fold for NullishCoalescing { left: PatOrExpr::Pat(Box::new(Pat::Ident(i.clone()))), right: Box::new(make_cond( assign.span, - &i, - Expr::Ident(i.clone()), + &i.id, + Expr::Ident(i.id.clone()), assign.right.take(), )), }); diff --git a/ecmascript/transforms/compat/src/es2020/opt_chaining.rs b/ecmascript/transforms/compat/src/es2020/opt_chaining.rs index 2fa2d92a8cf4..c3bb109b63e7 100644 --- a/ecmascript/transforms/compat/src/es2020/opt_chaining.rs +++ b/ecmascript/transforms/compat/src/es2020/opt_chaining.rs @@ -354,14 +354,14 @@ impl OptChaining { self.vars_without_init.push(VarDeclarator { span: obj_span, definite: false, - name: Pat::Ident(i.clone()), + name: Pat::Ident(i.clone().into()), init: None, }); ( Box::new(Expr::Assign(AssignExpr { span: DUMMY_SP, - left: PatOrExpr::Pat(Box::new(Pat::Ident(i.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(i.clone().into()))), op: op!("="), right: Box::new(obj), })), @@ -439,7 +439,7 @@ impl OptChaining { self.vars_with_init.push(VarDeclarator { span: obj_span, definite: false, - name: Pat::Ident(this_obj.clone()), + name: Pat::Ident(this_obj.clone().into()), init: Some(obj), }); @@ -451,14 +451,14 @@ impl OptChaining { self.vars_without_init.push(VarDeclarator { span: obj_span, definite: false, - name: Pat::Ident(i.clone()), + name: Pat::Ident(i.clone().into()), init: None, }); ( Box::new(Expr::Assign(AssignExpr { span: DUMMY_SP, - left: PatOrExpr::Pat(Box::new(Pat::Ident(i.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(i.clone().into()))), op: op!("="), right: obj, })), diff --git a/ecmascript/transforms/module/Cargo.toml b/ecmascript/transforms/module/Cargo.toml index e138b9ea71e8..055837485975 100644 --- a/ecmascript/transforms/module/Cargo.toml +++ b/ecmascript/transforms/module/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" license = "Apache-2.0/MIT" name = "swc_ecma_transforms_module" repository = "https://github.com/swc-project/swc.git" -version = "0.5.0" +version = "0.6.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] @@ -16,13 +16,13 @@ indexmap = "1.6.1" serde = {version = "1.0.118", features = ["derive"]} swc_atoms = {version = "0.2", path = "../../../atoms"} swc_common = {version = "0.10", path = "../../../common"} -swc_ecma_ast = {version = "0.38.0", path = "../../ast"} -swc_ecma_parser = {version = "0.47.0", path = "../../parser"} -swc_ecma_transforms_base = {version = "0.4.0", path = "../base"} -swc_ecma_utils = {version = "0.28.0", path = "../../utils"} -swc_ecma_visit = {version = "0.24.0", path = "../../visit"} +swc_ecma_ast = {version = "0.39.0", path = "../../ast"} +swc_ecma_parser = {version = "0.48.0", path = "../../parser"} +swc_ecma_transforms_base = {version = "0.5.0", path = "../base"} +swc_ecma_utils = {version = "0.29.0", path = "../../utils"} +swc_ecma_visit = {version = "0.25.0", path = "../../visit"} [dev-dependencies] -swc_ecma_transforms_compat = {version = "0.5.0", path = "../compat"} -swc_ecma_transforms_testing = {version = "0.4.0", path = "../testing/"} +swc_ecma_transforms_compat = {version = "0.6.0", path = "../compat"} +swc_ecma_transforms_testing = {version = "0.5.0", path = "../testing/"} testing = {version = "0.10", path = "../../../testing/"} diff --git a/ecmascript/transforms/module/src/amd.rs b/ecmascript/transforms/module/src/amd.rs index 5acd6419392c..8e79df140c17 100644 --- a/ecmascript/transforms/module/src/amd.rs +++ b/ecmascript/transforms/module/src/amd.rs @@ -279,7 +279,7 @@ impl Fold for Amd { kind: VarDeclKind::Var, decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(ident.clone()), + name: Pat::Ident(ident.clone().into()), init: Some(expr.fold_with(self)), definite: false, }], @@ -430,7 +430,7 @@ impl Fold for Amd { factory_params.push(Param { span: DUMMY_SP, decorators: Default::default(), - pat: Pat::Ident(exports_ident.clone()), + pat: Pat::Ident(exports_ident.clone().into()), }); } @@ -443,7 +443,7 @@ impl Fold for Amd { kind: VarDeclKind::Var, decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(exported_names.clone()), + name: Pat::Ident(exported_names.clone().into()), init: Some(Box::new(Expr::Object(ObjectLit { span: DUMMY_SP, props: exports @@ -503,7 +503,7 @@ impl Fold for Amd { factory_params.push(Param { span: DUMMY_SP, decorators: Default::default(), - pat: Pat::Ident(ident.clone()), + pat: Pat::Ident(ident.clone().into()), }); { @@ -526,7 +526,7 @@ impl Fold for Amd { import_stmts.push( AssignExpr { span: DUMMY_SP, - left: PatOrExpr::Pat(Box::new(Pat::Ident(ident.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(ident.clone().into()))), op: op!("="), right, } @@ -664,13 +664,13 @@ pub(super) fn handle_dynamic_import(span: Span, args: Vec) -> Expr Param { span: DUMMY_SP, decorators: Default::default(), - pat: Pat::Ident(quote_ident!("resolve")), + pat: Pat::Ident(quote_ident!("resolve").into()), }, // reject Param { span: DUMMY_SP, decorators: Default::default(), - pat: Pat::Ident(quote_ident!("reject")), + pat: Pat::Ident(quote_ident!("reject").into()), }, ], @@ -711,7 +711,7 @@ pub(super) fn handle_dynamic_import(span: Span, args: Vec) -> Expr params: vec![Param { span: DUMMY_SP, decorators: Default::default(), - pat: Pat::Ident(quote_ident!("dep")), + pat: Pat::Ident(quote_ident!("dep").into()), }], body: Some(BlockStmt { span: DUMMY_SP, @@ -741,7 +741,7 @@ pub(super) fn handle_dynamic_import(span: Span, args: Vec) -> Expr params: vec![Param { span: DUMMY_SP, decorators: Default::default(), - pat: Pat::Ident(quote_ident!("err")), + pat: Pat::Ident(quote_ident!("err").into()), }], body: Some(BlockStmt { span: DUMMY_SP, diff --git a/ecmascript/transforms/module/src/common_js.rs b/ecmascript/transforms/module/src/common_js.rs index 9fde3c22a770..7aecb75ca182 100644 --- a/ecmascript/transforms/module/src/common_js.rs +++ b/ecmascript/transforms/module/src/common_js.rs @@ -284,7 +284,7 @@ impl Fold for CommonJs { kind: VarDeclKind::Var, decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(ident.clone()), + name: Pat::Ident(ident.clone().into()), init: Some(expr.expr.fold_with(self)), definite: false, }], @@ -457,7 +457,7 @@ impl Fold for CommonJs { kind: VarDeclKind::Var, decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(exported_names.clone()), + name: Pat::Ident(exported_names.clone().into()), init: Some(Box::new(Expr::Object(ObjectLit { span: DUMMY_SP, props: exports @@ -561,7 +561,7 @@ impl Fold for CommonJs { kind: VarDeclKind::Const, decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(quote_ident!("data")), + name: Pat::Ident(quote_ident!("data").into()), init: Some(rhs), definite: false, }], @@ -570,7 +570,9 @@ impl Fold for CommonJs { // foo = function() { return data; }; AssignExpr { span: DUMMY_SP, - left: PatOrExpr::Pat(Box::new(Pat::Ident(ident))), + left: PatOrExpr::Pat(Box::new(Pat::Ident( + ident.into(), + ))), op: op!("="), right: Box::new( FnExpr { @@ -609,7 +611,7 @@ impl Fold for CommonJs { kind: VarDeclKind::Var, decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(ident), + name: Pat::Ident(ident.into()), init: Some(rhs), definite: false, }], diff --git a/ecmascript/transforms/module/src/umd.rs b/ecmascript/transforms/module/src/umd.rs index fc07ca91a1df..40c4891bc4ae 100644 --- a/ecmascript/transforms/module/src/umd.rs +++ b/ecmascript/transforms/module/src/umd.rs @@ -272,7 +272,7 @@ impl Fold for Umd { kind: VarDeclKind::Var, decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(ident.clone()), + name: Pat::Ident(ident.clone().into()), init: Some(expr.expr.fold_with(self)), definite: false, }], @@ -425,7 +425,7 @@ impl Fold for Umd { factory_params.push(Param { span: DUMMY_SP, decorators: Default::default(), - pat: Pat::Ident(exports_ident.clone()), + pat: Pat::Ident(exports_ident.clone().into()), }); factory_args.push(quote_ident!("exports").as_arg()); global_factory_args.push(member_expr!(DUMMY_SP, mod.exports).as_arg()); @@ -440,7 +440,7 @@ impl Fold for Umd { kind: VarDeclKind::Var, decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(exported_names.clone()), + name: Pat::Ident(exported_names.clone().into()), init: Some(Box::new(Expr::Object(ObjectLit { span: DUMMY_SP, props: exports @@ -501,7 +501,7 @@ impl Fold for Umd { factory_params.push(Param { span: DUMMY_SP, decorators: Default::default(), - pat: Pat::Ident(ident.clone()), + pat: Pat::Ident(ident.clone().into()), }); factory_args.push(make_require_call(self.root_mark, src.clone()).as_arg()); global_factory_args.push(quote_ident!("global").make_member(global_ident).as_arg()); @@ -529,7 +529,9 @@ impl Fold for Umd { import_stmts.push( AssignExpr { span: DUMMY_SP, - left: PatOrExpr::Pat(Box::new(Pat::Ident(ident.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident( + ident.clone().into(), + ))), op: op!("="), right, } @@ -558,12 +560,12 @@ impl Fold for Umd { Param { span: DUMMY_SP, decorators: Default::default(), - pat: Pat::Ident(quote_ident!("global")), + pat: Pat::Ident(quote_ident!("global").into()), }, Param { span: DUMMY_SP, decorators: Default::default(), - pat: Pat::Ident(quote_ident!("factory")), + pat: Pat::Ident(quote_ident!("factory").into()), }, ], body: Some(BlockStmt { @@ -632,7 +634,7 @@ impl Fold for Umd { kind: VarDeclKind::Var, decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(quote_ident!("mod")), + name: Pat::Ident(quote_ident!("mod").into()), init: Some(Box::new(Expr::Object(ObjectLit { span: DUMMY_SP, props: vec![PropOrSpread::Prop(Box::new( diff --git a/ecmascript/transforms/module/src/util.rs b/ecmascript/transforms/module/src/util.rs index cbe6825f827e..18a39f4380a2 100644 --- a/ecmascript/transforms/module/src/util.rs +++ b/ecmascript/transforms/module/src/util.rs @@ -158,7 +158,7 @@ impl Scope { params: vec![Param { span: DUMMY_SP, decorators: Default::default(), - pat: Pat::Ident(key_ident.clone()), + pat: Pat::Ident(key_ident.clone().into()), }], body: Some(BlockStmt { span: DUMMY_SP, @@ -522,7 +522,7 @@ impl Scope { entry, Box::new(Expr::Assign(AssignExpr { span: DUMMY_SP, - left: PatOrExpr::Pat(Box::new(Pat::Ident(arg.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(arg.clone().into()))), op: op!("="), right: Box::new(Expr::Bin(BinExpr { span: DUMMY_SP, @@ -635,7 +635,7 @@ impl Scope { match expr.left { PatOrExpr::Pat(pat) if pat.is_ident() => { let i = pat.ident().unwrap(); - let entry = entry!(i); + let entry = entry!(i.id); match entry { Entry::Occupied(entry) => { diff --git a/ecmascript/transforms/optimization/Cargo.toml b/ecmascript/transforms/optimization/Cargo.toml index efddda78ab68..10bceccb0acd 100644 --- a/ecmascript/transforms/optimization/Cargo.toml +++ b/ecmascript/transforms/optimization/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" license = "Apache-2.0/MIT" name = "swc_ecma_transforms_optimization" repository = "https://github.com/swc-project/swc.git" -version = "0.6.0" +version = "0.7.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] @@ -19,16 +19,16 @@ retain_mut = "0.1.2" serde_json = "1.0.61" swc_atoms = {version = "0.2", path = "../../../atoms"} swc_common = {version = "0.10", path = "../../../common"} -swc_ecma_ast = {version = "0.38.0", path = "../../ast"} -swc_ecma_parser = {version = "0.47.0", path = "../../parser"} -swc_ecma_transforms_base = {version = "0.4.0", path = "../base"} -swc_ecma_utils = {version = "0.28.0", path = "../../utils"} -swc_ecma_visit = {version = "0.24.0", path = "../../visit"} +swc_ecma_ast = {version = "0.39.0", path = "../../ast"} +swc_ecma_parser = {version = "0.48.0", path = "../../parser"} +swc_ecma_transforms_base = {version = "0.5.0", path = "../base"} +swc_ecma_utils = {version = "0.29.0", path = "../../utils"} +swc_ecma_visit = {version = "0.25.0", path = "../../visit"} [dev-dependencies] -swc_ecma_transforms_compat = {version = "0.5.0", path = "../compat"} -swc_ecma_transforms_module = {version = "0.5.0", path = "../module"} -swc_ecma_transforms_proposal = {version = "0.5.0", path = "../proposal"} -swc_ecma_transforms_react = {version = "0.6.0", path = "../react"} -swc_ecma_transforms_testing = {version = "0.4.0", path = "../testing"} -swc_ecma_transforms_typescript = {version = "0.5.0", path = "../typescript"} +swc_ecma_transforms_compat = {version = "0.6.0", path = "../compat"} +swc_ecma_transforms_module = {version = "0.6.0", path = "../module"} +swc_ecma_transforms_proposal = {version = "0.6.0", path = "../proposal"} +swc_ecma_transforms_react = {version = "0.7.0", path = "../react"} +swc_ecma_transforms_testing = {version = "0.5.0", path = "../testing"} +swc_ecma_transforms_typescript = {version = "0.6.0", path = "../typescript"} diff --git a/ecmascript/transforms/optimization/src/simplify/branch/mod.rs b/ecmascript/transforms/optimization/src/simplify/branch/mod.rs index 39f2ca9eb1a2..09bcc1370186 100644 --- a/ecmascript/transforms/optimization/src/simplify/branch/mod.rs +++ b/ecmascript/transforms/optimization/src/simplify/branch/mod.rs @@ -92,7 +92,7 @@ impl Fold for Remover { .. }) if match &*l { Pat::Ident(l) => match &*r { - Expr::Ident(r) => l.sym == r.sym && l.span.ctxt() == r.span.ctxt(), + Expr::Ident(r) => l.id.sym == r.sym && l.id.span.ctxt() == r.span.ctxt(), _ => false, }, _ => false, @@ -627,7 +627,7 @@ impl Fold for Remover { .flat_map(|stmt| stmt.extract_var_ids()) .map(|i| VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(i), + name: Pat::Ident(i.into()), init: None, definite: false, }) @@ -776,7 +776,7 @@ impl Fold for Remover { .chain(var_ids) .map(|i| VarDeclarator { span: i.span, - name: Pat::Ident(i), + name: Pat::Ident(i.into()), init: None, definite: false, }) @@ -971,7 +971,7 @@ impl Remover { .flat_map(|t| extract_var_ids(&t)) .map(|i| VarDeclarator { span: i.span, - name: Pat::Ident(i), + name: Pat::Ident(i.into()), init: None, definite: false, }) @@ -1106,7 +1106,7 @@ fn ignore_result(e: Expr) -> Option { .. }) if match &*left { Pat::Ident(l) => match &*right { - Expr::Ident(r) => l.sym == r.sym && l.span.ctxt() == r.span.ctxt(), + Expr::Ident(r) => l.id.sym == r.sym && l.id.span.ctxt() == r.span.ctxt(), _ => false, }, _ => false, diff --git a/ecmascript/transforms/optimization/src/simplify/const_propgation.rs b/ecmascript/transforms/optimization/src/simplify/const_propgation.rs index 26980ce59bbd..83e5eac81448 100644 --- a/ecmascript/transforms/optimization/src/simplify/const_propgation.rs +++ b/ecmascript/transforms/optimization/src/simplify/const_propgation.rs @@ -67,7 +67,7 @@ impl VisitMut for ConstPropagation<'_> { } Expr::Ident(init) - if name.span.is_dummy() + if name.id.span.is_dummy() || var.span.is_dummy() || init.span.is_dummy() => { diff --git a/ecmascript/transforms/optimization/src/simplify/dce/side_effect.rs b/ecmascript/transforms/optimization/src/simplify/dce/side_effect.rs index 25e648389cd6..a1990f9146b9 100644 --- a/ecmascript/transforms/optimization/src/simplify/dce/side_effect.rs +++ b/ecmascript/transforms/optimization/src/simplify/dce/side_effect.rs @@ -253,7 +253,7 @@ impl Visit for SideEffectVisitor<'_> { match p { Pat::Ident(ref i) => { - if self.included.contains(&i.to_id()) || self.is_exported(&i.sym) { + if self.included.contains(&i.to_id()) || self.is_exported(&i.id.sym) { self.found = true; } } diff --git a/ecmascript/transforms/optimization/src/simplify/inlining/mod.rs b/ecmascript/transforms/optimization/src/simplify/inlining/mod.rs index 81793066c6d5..3e8b0da0135c 100644 --- a/ecmascript/transforms/optimization/src/simplify/inlining/mod.rs +++ b/ecmascript/transforms/optimization/src/simplify/inlining/mod.rs @@ -510,7 +510,7 @@ impl VisitMut for Inlining<'_> { PatFoldingMode::Param => { self.declare( i.to_id(), - Some(Cow::Owned(Expr::Ident(i.clone()))), + Some(Cow::Owned(Expr::Ident(i.id.clone().into()))), false, VarType::Param, ); @@ -518,7 +518,7 @@ impl VisitMut for Inlining<'_> { PatFoldingMode::CatchParam => { self.declare( i.to_id(), - Some(Cow::Owned(Expr::Ident(i.clone()))), + Some(Cow::Owned(Expr::Ident(i.id.clone().into()))), false, VarType::Var(VarDeclKind::Var), ); @@ -647,7 +647,9 @@ impl VisitMut for Inlining<'_> { log::trace!("Trying to optimize variable declaration: {:?}", id); - if self.scope.is_inline_prevented(&Expr::Ident(name.clone())) + if self + .scope + .is_inline_prevented(&Expr::Ident(name.id.clone().into())) || !self .scope .has_same_this(&id, node.init.as_ref().map(|v| &**v)) @@ -691,7 +693,10 @@ impl VisitMut for Inlining<'_> { Some(e) if e.is_lit() || e.is_ident() => Some(e), Some(e) => { let e = *e; - if self.scope.is_inline_prevented(&Expr::Ident(name.clone())) { + if self + .scope + .is_inline_prevented(&Expr::Ident(name.id.clone())) + { node.init = Some(Box::new(e)); return; } diff --git a/ecmascript/transforms/proposal/Cargo.toml b/ecmascript/transforms/proposal/Cargo.toml index f3d8f5e5e9e2..4d1a04763c07 100644 --- a/ecmascript/transforms/proposal/Cargo.toml +++ b/ecmascript/transforms/proposal/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" license = "Apache-2.0/MIT" name = "swc_ecma_transforms_proposal" repository = "https://github.com/swc-project/swc.git" -version = "0.5.0" +version = "0.6.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -17,13 +17,13 @@ serde = {version = "1.0.118", features = ["derive"]} smallvec = "1.6.0" swc_atoms = {version = "0.2", path = "../../../atoms"} swc_common = {version = "0.10", path = "../../../common"} -swc_ecma_ast = {version = "0.38.0", path = "../../ast"} -swc_ecma_parser = {version = "0.47.0", path = "../../parser"} -swc_ecma_transforms_base = {version = "0.4.0", path = "../base"} -swc_ecma_utils = {version = "0.28.0", path = "../../utils"} -swc_ecma_visit = {version = "0.24.0", path = "../../visit"} +swc_ecma_ast = {version = "0.39.0", path = "../../ast"} +swc_ecma_parser = {version = "0.48.0", path = "../../parser"} +swc_ecma_transforms_base = {version = "0.5.0", path = "../base"} +swc_ecma_utils = {version = "0.29.0", path = "../../utils"} +swc_ecma_visit = {version = "0.25.0", path = "../../visit"} [dev-dependencies] -swc_ecma_transforms_compat = {version = "0.5.0", path = "../compat"} -swc_ecma_transforms_module = {version = "0.5.0", path = "../module"} -swc_ecma_transforms_testing = {version = "0.4.0", path = "../testing"} +swc_ecma_transforms_compat = {version = "0.6.0", path = "../compat"} +swc_ecma_transforms_module = {version = "0.6.0", path = "../module"} +swc_ecma_transforms_testing = {version = "0.5.0", path = "../testing"} diff --git a/ecmascript/transforms/proposal/src/decorators.rs b/ecmascript/transforms/proposal/src/decorators.rs index 21e1faca3e91..5e985a30af67 100644 --- a/ecmascript/transforms/proposal/src/decorators.rs +++ b/ecmascript/transforms/proposal/src/decorators.rs @@ -111,7 +111,7 @@ impl Fold for Decorators { declare: false, decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(ident), + name: Pat::Ident(ident.into()), definite: false, init: Some(decorate_call), }], @@ -188,7 +188,7 @@ impl Fold for Decorators { declare: false, decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(ident.clone()), + name: Pat::Ident(ident.clone().into()), init: Some(decorate_call), definite: false, }], @@ -295,7 +295,7 @@ impl Decorators { pat: Pat::Rest(RestPat { span: DUMMY_SP, dot3_token: DUMMY_SP, - arg: Box::new(Pat::Ident(quote_ident!("args"))), + arg: Box::new(Pat::Ident(quote_ident!("args").into())), type_ann: Default::default(), }), })] @@ -548,8 +548,8 @@ impl Decorators { function: Function { span: DUMMY_SP, - params: iter::once(Pat::Ident(initialize)) - .chain(super_class_ident.map(Pat::Ident)) + params: iter::once(Pat::Ident(initialize.into())) + .chain(super_class_ident.map(BindingIdent::from).map(Pat::Ident)) .map(|pat| Param { span: DUMMY_SP, decorators: vec![], diff --git a/ecmascript/transforms/proposal/src/decorators/legacy.rs b/ecmascript/transforms/proposal/src/decorators/legacy.rs index 74e7afef63b6..570cd063d750 100644 --- a/ecmascript/transforms/proposal/src/decorators/legacy.rs +++ b/ecmascript/transforms/proposal/src/decorators/legacy.rs @@ -104,7 +104,7 @@ impl Fold for Legacy { declare: false, decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(c.ident), + name: Pat::Ident(c.ident.into()), init: Some(expr), definite: false, }], @@ -193,7 +193,7 @@ impl Fold for Legacy { declare: false, decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(export_ident), + name: Pat::Ident(export_ident.into()), init: Some(expr), definite: false, }], @@ -285,7 +285,7 @@ impl Legacy { self.uninitialized_vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(cls_ident.clone()), + name: Pat::Ident(cls_ident.clone().into()), init: None, definite: false, }); @@ -325,7 +325,7 @@ impl Legacy { if aliased { self.uninitialized_vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(i.clone()), + name: Pat::Ident(i.clone().into()), init: None, definite: false, }); @@ -354,7 +354,7 @@ impl Legacy { dec_inits.push(Box::new(Expr::Assign(AssignExpr { span: dec.span, op: op!("="), - left: PatOrExpr::Pat(Box::new(Pat::Ident(i.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(i.clone().into()))), right, }))); } @@ -368,7 +368,7 @@ impl Legacy { if aliased { self.initialized_vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(name.clone()), + name: Pat::Ident(name.clone().into()), init: Some(e.expr.clone()), definite: Default::default(), }) @@ -466,7 +466,7 @@ impl Legacy { if !p.is_static { self.uninitialized_vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(descriptor.clone()), + name: Pat::Ident(descriptor.clone().into()), init: None, definite: false, }); @@ -480,7 +480,7 @@ impl Legacy { if aliased { self.initialized_vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(i.clone()), + name: Pat::Ident(i.clone().into()), init: Some(dec.expr), definite: false, }); @@ -505,7 +505,7 @@ impl Legacy { if p.is_static { self.uninitialized_vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(init.clone()), + name: Pat::Ident(init.clone().into()), init: None, definite: false, }); @@ -584,7 +584,7 @@ impl Legacy { exprs: vec![ Box::new(Expr::Assign(AssignExpr { span: DUMMY_SP, - left: PatOrExpr::Pat(Box::new(Pat::Ident(init.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(init.clone().into()))), op: op!("="), // Object.getOwnPropertyDescriptor(_class, "enumconfwrite") right: Box::new(Expr::Call(CallExpr { @@ -598,7 +598,7 @@ impl Legacy { // _init = _init ? _init.value : void 0 Box::new(Expr::Assign(AssignExpr { span: DUMMY_SP, - left: PatOrExpr::Pat(Box::new(Pat::Ident(init.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(init.clone().into()))), op: op!("="), right: Box::new(Expr::Cond(CondExpr { span: DUMMY_SP, @@ -656,7 +656,7 @@ impl Legacy { extra_exprs.push(Box::new(Expr::Assign(AssignExpr { span: DUMMY_SP, op: op!("="), - left: PatOrExpr::Pat(Box::new(Pat::Ident(descriptor.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(descriptor.clone().into()))), right: call_expr, }))); } else { @@ -747,7 +747,7 @@ impl Legacy { let cls_assign = Box::new(Expr::Assign(AssignExpr { span: DUMMY_SP, op: op!("="), - left: PatOrExpr::Pat(Box::new(Pat::Ident(cls_ident.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(cls_ident.clone().into()))), right: Box::new(Expr::Class(ClassExpr { ident: c.ident.clone(), class: Class { @@ -796,7 +796,7 @@ impl Legacy { if aliased { self.initialized_vars.push(VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(i.clone()), + name: Pat::Ident(i.clone().into()), init: Some(dec.expr), definite: false, }); @@ -812,7 +812,7 @@ impl Legacy { // _class = dec(_class = funciton() {}) || _class let class_expr = Box::new(Expr::Assign(AssignExpr { span: DUMMY_SP, - left: PatOrExpr::Pat(Box::new(Pat::Ident(class_ident.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(class_ident.clone().into()))), op: op!("="), right: Box::new(Expr::Bin(BinExpr { span: DUMMY_SP, diff --git a/ecmascript/transforms/proposal/src/decorators/legacy/metadata.rs b/ecmascript/transforms/proposal/src/decorators/legacy/metadata.rs index d757791515cb..d1ae3d1b9613 100644 --- a/ecmascript/transforms/proposal/src/decorators/legacy/metadata.rs +++ b/ecmascript/transforms/proposal/src/decorators/legacy/metadata.rs @@ -77,12 +77,12 @@ impl ParamMetadata { Param { span: DUMMY_SP, decorators: Default::default(), - pat: Pat::Ident(quote_ident!("target")), + pat: Pat::Ident(quote_ident!("target").into()), }, Param { span: DUMMY_SP, decorators: Default::default(), - pat: Pat::Ident(quote_ident!("key")), + pat: Pat::Ident(quote_ident!("key").into()), }, ], body: Some(BlockStmt { diff --git a/ecmascript/transforms/react/Cargo.toml b/ecmascript/transforms/react/Cargo.toml index 5ddc0d8b2b0b..37d1e4513341 100644 --- a/ecmascript/transforms/react/Cargo.toml +++ b/ecmascript/transforms/react/Cargo.toml @@ -7,7 +7,7 @@ include = ["Cargo.toml", "src/**/*.rs"] license = "Apache-2.0/MIT" name = "swc_ecma_transforms_react" repository = "https://github.com/swc-project/swc.git" -version = "0.6.0" +version = "0.7.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] @@ -18,14 +18,14 @@ serde = {version = "1.0.118", features = ["derive"]} string_enum = {version = "0.3", path = "../../../macros/string_enum"} swc_atoms = {version = "0.2", path = "../../../atoms"} swc_common = {version = "0.10", path = "../../../common"} -swc_ecma_ast = {version = "0.38.0", path = "../../ast"} -swc_ecma_parser = {version = "0.47.0", path = "../../parser"} -swc_ecma_transforms_base = {version = "0.4.2", path = "../base"} -swc_ecma_utils = {version = "0.28.0", path = "../../utils"} -swc_ecma_visit = {version = "0.24.0", path = "../../visit"} +swc_ecma_ast = {version = "0.39.0", path = "../../ast"} +swc_ecma_parser = {version = "0.48.0", path = "../../parser"} +swc_ecma_transforms_base = {version = "0.5.0", path = "../base"} +swc_ecma_utils = {version = "0.29.0", path = "../../utils"} +swc_ecma_visit = {version = "0.25.0", path = "../../visit"} [dev-dependencies] -swc_ecma_transforms_compat = {version = "0.5.0", path = "../compat/"} -swc_ecma_transforms_module = {version = "0.5.0", path = "../module"} -swc_ecma_transforms_testing = {version = "0.4.0", path = "../testing/"} +swc_ecma_transforms_compat = {version = "0.6.0", path = "../compat/"} +swc_ecma_transforms_module = {version = "0.6.0", path = "../module"} +swc_ecma_transforms_testing = {version = "0.5.0", path = "../testing/"} testing = {version = "0.10.2", path = "../../../testing"} diff --git a/ecmascript/transforms/react/src/display_name/mod.rs b/ecmascript/transforms/react/src/display_name/mod.rs index 2e6ab06e58a9..77584b0631b7 100644 --- a/ecmascript/transforms/react/src/display_name/mod.rs +++ b/ecmascript/transforms/react/src/display_name/mod.rs @@ -114,8 +114,8 @@ impl Fold for DisplayName { Pat::Ident(ref ident) => { let init = decl.init.fold_with(&mut Folder { name: Some(Box::new(Expr::Lit(Lit::Str(Str { - span: ident.span, - value: ident.sym.clone(), + span: ident.id.span, + value: ident.id.sym.clone(), has_escape: false, kind: StrKind::Normal { contains_quote: false, diff --git a/ecmascript/transforms/testing/Cargo.toml b/ecmascript/transforms/testing/Cargo.toml index fec88b9a7de7..0c85d79e26af 100644 --- a/ecmascript/transforms/testing/Cargo.toml +++ b/ecmascript/transforms/testing/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" license = "Apache-2.0/MIT" name = "swc_ecma_transforms_testing" repository = "https://github.com/swc-project/swc.git" -version = "0.4.0" +version = "0.5.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -15,11 +15,11 @@ ansi_term = "0.12.1" serde = "1" serde_json = "1" swc_common = {version = "0.10", path = "../../../common"} -swc_ecma_ast = {version = "0.38.0", path = "../../ast"} -swc_ecma_codegen = {version = "0.45.0", path = "../../codegen"} -swc_ecma_parser = {version = "0.47.0", path = "../../parser"} -swc_ecma_transforms_base = {version = "0.4.0", path = "../base"} -swc_ecma_utils = {version = "0.28.0", path = "../../utils"} -swc_ecma_visit = {version = "0.24.0", path = "../../visit"} +swc_ecma_ast = {version = "0.39.0", path = "../../ast"} +swc_ecma_codegen = {version = "0.46.0", path = "../../codegen"} +swc_ecma_parser = {version = "0.48.0", path = "../../parser"} +swc_ecma_transforms_base = {version = "0.5.0", path = "../base"} +swc_ecma_utils = {version = "0.29.0", path = "../../utils"} +swc_ecma_visit = {version = "0.25.0", path = "../../visit"} tempfile = "3.1.0" testing = {version = "0.10.2", path = "../../../testing"} diff --git a/ecmascript/transforms/typescript/Cargo.toml b/ecmascript/transforms/typescript/Cargo.toml index c02eaf982500..f588f6dce45d 100644 --- a/ecmascript/transforms/typescript/Cargo.toml +++ b/ecmascript/transforms/typescript/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" license = "Apache-2.0/MIT" name = "swc_ecma_transforms_typescript" repository = "https://github.com/swc-project/swc.git" -version = "0.5.0" +version = "0.6.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] @@ -14,17 +14,17 @@ fxhash = "0.2.1" serde = {version = "1.0.118", features = ["derive"]} swc_atoms = {version = "0.2", path = "../../../atoms"} swc_common = {version = "0.10.9", path = "../../../common"} -swc_ecma_ast = {version = "0.38.0", path = "../../ast"} -swc_ecma_parser = {version = "0.47.0", path = "../../parser"} -swc_ecma_transforms_base = {version = "0.4.0", path = "../base"} -swc_ecma_utils = {version = "0.28.0", path = "../../utils"} -swc_ecma_visit = {version = "0.24.0", path = "../../visit"} +swc_ecma_ast = {version = "0.39.0", path = "../../ast"} +swc_ecma_parser = {version = "0.48.0", path = "../../parser"} +swc_ecma_transforms_base = {version = "0.5.0", path = "../base"} +swc_ecma_utils = {version = "0.29.0", path = "../../utils"} +swc_ecma_visit = {version = "0.25.0", path = "../../visit"} [dev-dependencies] -swc_ecma_codegen = {version = "0.45.0", path = "../../codegen"} -swc_ecma_transforms_compat = {version = "0.5.0", path = "../compat"} -swc_ecma_transforms_module = {version = "0.5.0", path = "../module"} -swc_ecma_transforms_proposal = {version = "0.5.0", path = "../proposal/"} -swc_ecma_transforms_testing = {version = "0.4.0", path = "../testing"} +swc_ecma_codegen = {version = "0.46.0", path = "../../codegen"} +swc_ecma_transforms_compat = {version = "0.6.0", path = "../compat"} +swc_ecma_transforms_module = {version = "0.6.0", path = "../module"} +swc_ecma_transforms_proposal = {version = "0.6.0", path = "../proposal/"} +swc_ecma_transforms_testing = {version = "0.5.0", path = "../testing"} testing = {version = "0.10.2", path = "../../../testing"} walkdir = "2.3.1" diff --git a/ecmascript/transforms/typescript/src/strip.rs b/ecmascript/transforms/typescript/src/strip.rs index 2c293e198d10..6fbfe2bb0b51 100644 --- a/ecmascript/transforms/typescript/src/strip.rs +++ b/ecmascript/transforms/typescript/src/strip.rs @@ -164,7 +164,6 @@ impl Strip { } else { match &mut **prop { Expr::Ident(i) => { - i.type_ann = None; i.optional = false; } _ => {} @@ -415,7 +414,7 @@ impl Strip { params: vec![Param { span: id.span, decorators: vec![], - pat: Pat::Ident(id.clone()), + pat: Pat::Ident(id.clone().into()), }], body: Some(BlockStmt { span: DUMMY_SP, @@ -488,7 +487,7 @@ impl Strip { op: op!("||"), right: Box::new(Expr::Assign(AssignExpr { span: DUMMY_SP, - left: PatOrExpr::Pat(Pat::Ident(id.clone()).into()), + left: PatOrExpr::Pat(Pat::Ident(id.clone().into()).into()), op: op!("="), right: Box::new(Expr::Object(ObjectLit { span: DUMMY_SP, @@ -523,7 +522,7 @@ impl Strip { let var = VarDeclarator { span: module_name.span, - name: Pat::Ident(module_name.clone()), + name: Pat::Ident(module_name.clone().into()), init: None, definite: false, }; @@ -557,7 +556,7 @@ impl Strip { match &decl.name { Pat::Ident(name) => { - delayed_vars.push(name.clone()); + delayed_vars.push(name.id.clone()); init_stmts.push(Stmt::Decl(Decl::Var(VarDecl { span: DUMMY_SP, kind: v.kind, @@ -578,7 +577,7 @@ impl Strip { PatOrExpr::Expr(Box::new(Expr::Member(MemberExpr { span: DUMMY_SP, obj: private_name.clone().as_obj(), - prop: Box::new(Expr::Ident(name.clone())), + prop: Box::new(Expr::Ident(name.id.clone())), computed: false, }))); @@ -687,7 +686,7 @@ impl Strip { params: vec![Param { span: DUMMY_SP, decorators: Default::default(), - pat: Pat::Ident(private_name.clone()), + pat: Pat::Ident(private_name.clone().into()), }], decorators: Default::default(), span: DUMMY_SP, @@ -709,7 +708,7 @@ impl Strip { right: Box::new(Expr::Assign(AssignExpr { span: DUMMY_SP, op: op!("="), - left: PatOrExpr::Pat(Box::new(Pat::Ident(module_name.clone()))), + left: PatOrExpr::Pat(Box::new(Pat::Ident(module_name.clone().into()))), right: Box::new(Expr::Object(ObjectLit { span: DUMMY_SP, props: Default::default(), @@ -881,10 +880,10 @@ impl VisitMut for Strip { AssignExpr { span: DUMMY_SP, left: PatOrExpr::Expr(Box::new( - ThisExpr { span: DUMMY_SP }.make_member(ident.clone()), + ThisExpr { span: DUMMY_SP }.make_member(ident.id.clone()), )), op: op!("="), - right: Box::new(Expr::Ident(ident)), + right: Box::new(Expr::Ident(ident.id)), } .into_stmt(), ); @@ -1045,7 +1044,7 @@ impl VisitMut for Strip { declare: false, decls: vec![VarDeclarator { span: e.span, - name: Pat::Ident(e.id.clone()), + name: Pat::Ident(e.id.clone().into()), definite: false, init: None, }], @@ -1118,8 +1117,12 @@ impl VisitMut for Strip { params.visit_mut_children_with(self); params.retain(|param| match param.pat { - Pat::Ident(Ident { - sym: js_word!("this"), + Pat::Ident(BindingIdent { + id: + Ident { + sym: js_word!("this"), + .. + }, .. }) => false, _ => true, @@ -1241,7 +1244,7 @@ impl VisitMut for Strip { declare: false, decls: vec![VarDeclarator { span: e.span, - name: Pat::Ident(e.id.clone()), + name: Pat::Ident(e.id.clone().into()), definite: false, init: None, }], @@ -1263,7 +1266,7 @@ impl VisitMut for Strip { declare: false, decls: vec![VarDeclarator { span: e.span, - name: Pat::Ident(e.id.clone()), + name: Pat::Ident(e.id.clone().into()), definite: false, init: None, }], @@ -1304,7 +1307,7 @@ impl VisitMut for Strip { kind: VarDeclKind::Var, decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(import.id), + name: Pat::Ident(import.id.into()), init: Some(Box::new(module_ref_to_expr(import.module_ref))), definite: false, }], @@ -1393,9 +1396,9 @@ fn create_prop_pat(obj: &Ident, pat: Pat) -> Pat { Pat::Invalid(_) => pat, Pat::Ident(i) => Pat::Expr(Box::new(Expr::Member(MemberExpr { - span: i.span, + span: i.id.span, obj: obj.clone().as_obj(), - prop: Box::new(Expr::Ident(i)), + prop: Box::new(Expr::Ident(i.id)), computed: false, }))), Pat::Array(p) => Pat::Array(ArrayPat { diff --git a/ecmascript/utils/Cargo.toml b/ecmascript/utils/Cargo.toml index 8dbae9c6e2ae..d606e3a44215 100644 --- a/ecmascript/utils/Cargo.toml +++ b/ecmascript/utils/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" license = "Apache-2.0/MIT" name = "swc_ecma_utils" repository = "https://github.com/swc-project/swc.git" -version = "0.28.0" +version = "0.29.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -15,8 +15,8 @@ once_cell = "1" scoped-tls = "1" swc_atoms = {version = "0.2.0", path = "../../atoms"} swc_common = {version = "0.10.0", path = "../../common"} -swc_ecma_ast = {version = "0.38.0", path = "../ast"} -swc_ecma_visit = {version = "0.24.0", path = "../visit"} +swc_ecma_ast = {version = "0.39.0", path = "../ast"} +swc_ecma_visit = {version = "0.25.0", path = "../visit"} unicode-xid = "0.2" [dev-dependencies] diff --git a/ecmascript/utils/src/constructor.rs b/ecmascript/utils/src/constructor.rs index 8640cd54a08c..6f260e76ce03 100644 --- a/ecmascript/utils/src/constructor.rs +++ b/ecmascript/utils/src/constructor.rs @@ -89,7 +89,7 @@ impl<'a> Fold for Injector<'a> { kind: VarDeclKind::Var, decls: vec![VarDeclarator { span: DUMMY_SP, - name: Pat::Ident(ident), + name: Pat::Ident(ident.into()), init: None, definite: false, }], @@ -141,7 +141,7 @@ impl VisitMut for ExprInjector<'_> { exprs: iter::once(Box::new(Expr::Assign(AssignExpr { span: DUMMY_SP, left: PatOrExpr::Pat(Box::new(Pat::Ident( - self.injected_tmp.as_ref().cloned().unwrap(), + self.injected_tmp.as_ref().cloned().unwrap().into(), ))), op: op!("="), right: Box::new(e), diff --git a/ecmascript/utils/src/ident.rs b/ecmascript/utils/src/ident.rs index 4a6632ea92dc..ba3f482410ff 100644 --- a/ecmascript/utils/src/ident.rs +++ b/ecmascript/utils/src/ident.rs @@ -1,5 +1,6 @@ use swc_atoms::JsWord; use swc_common::{Span, SyntaxContext}; +use swc_ecma_ast::BindingIdent; use swc_ecma_ast::Ident; pub trait IdentLike: Sized { @@ -8,6 +9,20 @@ pub trait IdentLike: Sized { fn into_id(self) -> Id; } +impl IdentLike for BindingIdent { + fn from_ident(i: &Ident) -> Self { + i.clone().into() + } + + fn to_id(&self) -> Id { + (self.id.sym.clone(), self.id.span.ctxt()) + } + + fn into_id(self) -> Id { + self.id.into_id() + } +} + impl IdentLike for (JsWord, Span) { #[inline] fn from_ident(i: &Ident) -> Self { diff --git a/ecmascript/utils/src/lib.rs b/ecmascript/utils/src/lib.rs index 33b0e5a49bf6..bc44a84b98b9 100644 --- a/ecmascript/utils/src/lib.rs +++ b/ecmascript/utils/src/lib.rs @@ -237,7 +237,7 @@ pub trait StmtExt { .into_iter() .map(|i| VarDeclarator { span: i.span, - name: Pat::Ident(i), + name: Pat::Ident(i.into()), init: None, definite: false, }) @@ -285,7 +285,7 @@ impl Visit for Hoister { p.visit_children_with(self); match *p { - Pat::Ident(ref i) => self.vars.push(i.clone()), + Pat::Ident(ref i) => self.vars.push(i.id.clone()), _ => {} } } @@ -1389,7 +1389,7 @@ pub fn default_constructor(has_super: bool) -> Constructor { pat: Pat::Rest(RestPat { span: DUMMY_SP, dot3_token: DUMMY_SP, - arg: Box::new(Pat::Ident(quote_ident!(span, "args"))), + arg: Box::new(Pat::Ident(quote_ident!(span, "args").into())), type_ann: Default::default(), }), })] diff --git a/ecmascript/visit/Cargo.toml b/ecmascript/visit/Cargo.toml index 5edaac26bdc9..815256b0799f 100644 --- a/ecmascript/visit/Cargo.toml +++ b/ecmascript/visit/Cargo.toml @@ -6,11 +6,11 @@ edition = "2018" license = "Apache-2.0/MIT" name = "swc_ecma_visit" repository = "https://github.com/swc-project/swc.git" -version = "0.24.0" +version = "0.25.0" [dependencies] num-bigint = {version = "0.2", features = ["serde"]} swc_atoms = {version = "0.2", path = "../../atoms"} swc_common = {version = "0.10.0", path = "../../common"} -swc_ecma_ast = {version = "0.38.0", path = "../ast"} +swc_ecma_ast = {version = "0.39.0", path = "../ast"} swc_visit = {version = "0.2.1", path = "../../visit"} diff --git a/ecmascript/visit/src/lib.rs b/ecmascript/visit/src/lib.rs index a05e11d974a5..b2b69e93402c 100644 --- a/ecmascript/visit/src/lib.rs +++ b/ecmascript/visit/src/lib.rs @@ -745,16 +745,22 @@ define!({ Param(Param), } + pub struct BindingIdent { + pub id: Ident, + pub type_ann: Option, + } + pub struct Ident { pub span: Span, pub sym: JsWord, - pub type_ann: Option, pub optional: bool, } + pub struct PrivateName { pub span: Span, pub id: Ident, } + pub enum JSXObject { JSXMemberExpr(Box), Ident(Ident), @@ -1045,7 +1051,7 @@ define!({ Delete, } pub enum Pat { - Ident(Ident), + Ident(BindingIdent), Array(ArrayPat), Rest(RestPat), Object(ObjectPat), @@ -1291,7 +1297,7 @@ define!({ pub param: TsParamPropParam, } pub enum TsParamPropParam { - Ident(Ident), + Ident(BindingIdent), Assign(AssignPat), } pub struct TsQualifiedName { @@ -1404,7 +1410,7 @@ define!({ pub span: Span, } pub enum TsFnParam { - Ident(Ident), + Ident(BindingIdent), Array(ArrayPat), Rest(RestPat), Object(ObjectPat), diff --git a/spack/benches/bench.rs b/spack/benches/bench.rs index b1a0b928e46a..dd44634b094e 100644 --- a/spack/benches/bench.rs +++ b/spack/benches/bench.rs @@ -18,7 +18,6 @@ use std::{ collections::HashMap, hint::black_box, path::{Path, PathBuf}, - process::{Command, Stdio}, }; use swc_atoms::js_word; use swc_bundler::{Bundler, Load, ModuleData, ModuleRecord}; @@ -31,34 +30,14 @@ use test::Bencher; #[bench] fn three_js(b: &mut Bencher) { - let dir = clone("https://github.com/mrdoob/three.js.git", "r123"); - + let dir = PathBuf::new() + .join("..") + .join("integration-tests") + .join("three-js") + .join("repo"); run_bench(b, &dir.join("src").join("Three.js")); } -fn clone(git_url: &str, tag: &str) -> PathBuf { - let dir = PathBuf::from(env!("OUT_DIR")) - .join(format!("bench-{}", git_url.split("/").last().unwrap())); - if dir.exists() { - return dir; - } - let mut c = Command::new("git"); - let status = c - .arg("clone") - .arg(git_url) - .arg("-b") - .arg(tag) - .arg(&dir) - .stderr(Stdio::inherit()) - .stdout(Stdio::inherit()) - .status() - .expect("git clone failed"); - - assert!(status.success()); - - dir -} - fn run_bench(b: &mut Bencher, entry: &Path) { ::testing::run_test2(false, |cm, _| { b.iter(|| {